diff --git a/build.gradle b/build.gradle index 37b872c25..8c5394ddd 100644 --- a/build.gradle +++ b/build.gradle @@ -23,8 +23,8 @@ buildscript { } dependencies { classpath 'gradle.plugin.ca.coglinc2:javacc-gradle-plugin:3.0.0' - classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.3' - classpath 'de.undercouch:gradle-download-task:3.4.3' + classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0' + classpath 'de.undercouch:gradle-download-task:4.0.4' } } @@ -42,11 +42,11 @@ allprojects { ext { scalaBinaryVersion = '2.11' - sparkVersion = '2.1.1' + sparkVersion = '2.4.5' springVersion = '3.2.18.RELEASE' springShellVersion = '1.0.0.RELEASE' log4jVersion = '1.2.17' - slf4jVersion = '1.7.25' + slf4jVersion = '1.7.30' junitVersion = '4.12' hamcrestVersion = '1.3' jmockVersion = '2.9.0' @@ -58,7 +58,7 @@ allprojects { antlr2Version = '2.7.7' pxfVersion = '2.5.1.0' osgiVersion = '6.0.0' - jettyVersion = '9.2.26.v20180806' + jettyVersion = '9.3.28.v20191105' hadoopVersion = '2.7.7' protobufVersion = '2.6.1' kryoVersion = '4.0.2' @@ -66,11 +66,11 @@ allprojects { jnaVersion = '4.5.2' jerseyVersion = '2.22.2' jsr305Version = '3.0.2' - servletAPIVersion = '3.1.0' + javaxServletVersion = '3.1.0' derbyVersion = '10.14.2.0' hibernateVersion = '4.3.11.Final' hibernateJpaVersion = '1.0.2.Final' - commonsBeanutilsVersion = '1.9.3' + commonsBeanutilsVersion = '1.9.4' commonsCliVersion = '1.4' commonsCodecVersion = '1.11' commonsConfigVersion = '1.10' @@ -94,12 +94,12 @@ allprojects { hadoopJettyVersion = '6.1.26' sunJerseyVersion = '1.19.4' guavaVersion = '14.0.1' - nettyAllVersion = '4.0.56.Final' + nettyAllVersion = '4.1.45.Final' jlineVersion = '2.14.6' jlineSfVersion = '1.0.S2-B' jackson1Version = '1.9.13' - eclipseCollectionsVersion = '9.2.0' - snappyJavaVersion = '1.1.7.2' + eclipseCollectionsVersion = '10.1.0' + snappyJavaVersion = '1.1.7.3' rsApiVersion = '2.1.1' htraceVersion = '3.2.0-incubating' clouderaHtraceVersion = '2.05' diff --git a/filehdr-mod.txt b/filehdr-mod.txt index 2347c8877..ad2a2c00a 100644 --- a/filehdr-mod.txt +++ b/filehdr-mod.txt @@ -1,7 +1,7 @@ /* * Changes for TIBCO ComputeDB data platform. * - * Portions Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved. + * Portions Copyright (c) 2017-2020 TIBCO Software Inc. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); you * may not use this file except in compliance with the License. You diff --git a/filehdr.txt b/filehdr.txt index 0dcbd010f..eda6fd14a 100644 --- a/filehdr.txt +++ b/filehdr.txt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved. + * Copyright (c) 2017-2020 TIBCO Software Inc. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); you * may not use this file except in compliance with the License. You diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/SystemFailure.java b/gemfire-core/src/main/java/com/gemstone/gemfire/SystemFailure.java index 634739e3f..f7851bb29 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/SystemFailure.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/SystemFailure.java @@ -317,7 +317,8 @@ public static void setSkipOOMEForThread(boolean skip) { public static boolean isJVMFailureError(Error err) { // all VirtualMachineErrors are not fatal to the JVM, in particular // StackOverflowError is not - if (err instanceof OutOfMemoryError) { + if (err instanceof OutOfMemoryError && + !err.getClass().getName().contains("SparkOutOfMemoryError")) { if (SKIP_OOME.get() == Boolean.TRUE) return false; // ignore OOMEs thrown by Spark String message = err.getMessage(); diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/jgroup/JGroupMembershipManager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/jgroup/JGroupMembershipManager.java index 3f7eb4e1d..e2510c851 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/jgroup/JGroupMembershipManager.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/jgroup/JGroupMembershipManager.java @@ -87,6 +87,8 @@ public final class JGroupMembershipManager implements MembershipManager { + public static final String DEFAULT_LEADER_MEMBER_WEIGHT_NAME = "gemfire.member-weight"; + /** product version to use for multicast serialization */ volatile boolean disableMulticastForRollingUpgrade; @@ -1506,7 +1508,7 @@ private JChannel createChannel(LogWriterI18n theLogger, properties = replaceStrings(properties, "PARTITION_THRESHOLD", String.valueOf(threshold)); - int weight = Integer.getInteger("gemfire.member-weight", 0); + int weight = Integer.getInteger(DEFAULT_LEADER_MEMBER_WEIGHT_NAME, 0); properties = replaceStrings(properties, "MEMBER_WEIGHT", String.valueOf(weight)); if (theLogger.fineEnabled()) { diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java index aecbea582..f1114e638 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java @@ -9596,11 +9596,14 @@ protected DiskRegion createDiskRegion(InternalRegionArguments internalRegionArgs final GemFireCacheImpl.StaticSystemCallbacks sysCb = GemFireCacheImpl.FactoryStatics.systemCallbacks; if (sysCb != null && sysCb.destroyExistingRegionInCreate(dsi, this)) { - LogWriter logger = getCache().getLogger(); - if (logger.infoEnabled()) { - logger.info("Destroying existing region: " + getFullPath() + " in create"); + try { + dsi.destroyRegion(getFullPath(), true); + LogWriter logger = getCache().getLogger(); + if (logger.infoEnabled()) { + logger.info("Destroyed existing disk region: " + this + " in create"); + } + } catch (IllegalArgumentException ignored) { } - dsi.destroyRegion(getFullPath(), false); } DiskRegionStats stats; diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java index 3a17f0752..136181984 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java @@ -10822,11 +10822,14 @@ protected DiskRegion createDiskRegion(InternalRegionArguments internalRegionArgs final GemFireCacheImpl.StaticSystemCallbacks sysCb = GemFireCacheImpl.FactoryStatics.systemCallbacks; if (sysCb != null && sysCb.destroyExistingRegionInCreate(dsi, this)) { - LogWriter logger = getCache().getLogger(); - if (logger.infoEnabled()) { - logger.info("Destroying existing region: " + this + " in create"); + try { + dsi.destroyRegion(getFullPath(), true); + LogWriter logger = getCache().getLogger(); + if (logger.infoEnabled()) { + logger.info("Destroyed existing disk region: " + this + " in create"); + } + } catch (IllegalArgumentException ignored) { } - dsi.destroyRegion(getFullPath(), false); } } return null; diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/offheap/UnsafeMemoryChunk.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/offheap/UnsafeMemoryChunk.java index e03a7b382..b77b6a305 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/offheap/UnsafeMemoryChunk.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/offheap/UnsafeMemoryChunk.java @@ -17,8 +17,8 @@ package com.gemstone.gemfire.internal.offheap; import com.gemstone.gemfire.internal.SharedLibrary; +import com.gemstone.gemfire.internal.shared.unsafe.UnsafeHolder; import com.gemstone.gemfire.pdx.internal.unsafe.UnsafeWrapper; -import org.apache.spark.unsafe.Platform; public final class UnsafeMemoryChunk implements MemoryChunk { private static final UnsafeWrapper unsafe; @@ -99,7 +99,8 @@ public static void readUnsafeBytes(final long addr, final byte[] bytes, assert SimpleMemoryAllocatorImpl.validateAddressAndSizeWithinSlab(addr, length); - Platform.copyMemory(null, addr, bytes, Platform.BYTE_ARRAY_OFFSET, length); + UnsafeHolder.copyMemory(null, addr, bytes, + UnsafeHolder.BYTE_ARRAY_OFFSET, length); } /** @@ -113,8 +114,8 @@ public static void readUnsafeBytes(long addr, int offset, final byte[] bytes, assert SimpleMemoryAllocatorImpl.validateAddressAndSizeWithinSlab(addr, length + offset); - Platform.copyMemory(null, addr + offset, bytes, - Platform.BYTE_ARRAY_OFFSET + bytesOffset, length); + UnsafeHolder.copyMemory(null, addr + offset, bytes, + UnsafeHolder.BYTE_ARRAY_OFFSET + bytesOffset, length); } public static byte readAbsoluteByte(long addr) { @@ -223,8 +224,8 @@ public static void readAbsoluteBytes(long addr, int addrOffset, byte[] bytes, assert SimpleMemoryAllocatorImpl.validateAddressAndSizeWithinSlab(addr, size + addrOffset); - Platform.copyMemory(null, addr + addrOffset, bytes, - Platform.BYTE_ARRAY_OFFSET + bytesOffset, size); + UnsafeHolder.copyMemory(null, addr + addrOffset, bytes, + UnsafeHolder.BYTE_ARRAY_OFFSET + bytesOffset, size); } @Override @@ -246,7 +247,7 @@ public static void writeAbsoluteBytes(long addr, byte[] bytes, int bytesOffset, } assert SimpleMemoryAllocatorImpl.validateAddressAndSizeWithinSlab(addr, size); - Platform.copyMemory(bytes, Platform.BYTE_ARRAY_OFFSET + bytesOffset, + UnsafeHolder.copyMemory(bytes, UnsafeHolder.BYTE_ARRAY_OFFSET + bytesOffset, null, addr, size); } diff --git a/gemfire-shared/build.gradle b/gemfire-shared/build.gradle index ad77ac0c3..e59a813f3 100644 --- a/gemfire-shared/build.gradle +++ b/gemfire-shared/build.gradle @@ -18,5 +18,4 @@ dependencies { compileOnly project(subprojectBase + 'gemfire-trove') compile "net.java.dev.jna:jna:${jnaVersion}" - compile "org.apache.spark:spark-unsafe_${scalaBinaryVersion}:${sparkVersion}" } diff --git a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/BufferAllocator.java b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/BufferAllocator.java index 62e0309c5..f99b94b5e 100644 --- a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/BufferAllocator.java +++ b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/BufferAllocator.java @@ -22,14 +22,20 @@ import com.gemstone.gemfire.internal.shared.unsafe.DirectBufferAllocator; import com.gemstone.gemfire.internal.shared.unsafe.FreeMemory; import com.gemstone.gemfire.internal.shared.unsafe.UnsafeHolder; -import org.apache.spark.unsafe.Platform; -import org.apache.spark.unsafe.memory.MemoryAllocator; /** * Allocate, release and expand ByteBuffers (in-place if possible). */ public abstract class BufferAllocator implements Closeable { + public static final boolean MEMORY_DEBUG_FILL_ENABLED = Boolean.parseBoolean( + System.getProperty("spark.memory.debugFill", "false")); + + // Same as jemalloc's debug fill values. + public static final byte MEMORY_DEBUG_FILL_CLEAN_VALUE = (byte)0xa5; + // @SuppressWarnings("WeakerAccess") + public static final byte MEMORY_DEBUG_FILL_FREED_VALUE = (byte)0x5a; + public static final String STORE_DATA_FRAME_OUTPUT = "STORE_DATA_FRAME_OUTPUT"; @@ -66,8 +72,8 @@ public ByteBuffer allocateWithFallback(int size, String owner) { * Fill the given portion of the buffer setting it with given byte. */ public final void fill(ByteBuffer buffer, byte b, int position, int numBytes) { - Platform.setMemory(baseObject(buffer), baseOffset(buffer) + position, - numBytes, b); + UnsafeHolder.getUnsafe().setMemory(baseObject(buffer), + baseOffset(buffer) + position, numBytes, b); } /** @@ -142,18 +148,18 @@ public final void release(ByteBuffer buffer) { */ public static boolean releaseBuffer(ByteBuffer buffer) { final boolean hasArray = buffer.hasArray(); - if (MemoryAllocator.MEMORY_DEBUG_FILL_ENABLED) { + if (MEMORY_DEBUG_FILL_ENABLED) { Object baseObject; long baseOffset; if (hasArray) { baseObject = buffer.array(); - baseOffset = Platform.BYTE_ARRAY_OFFSET + buffer.arrayOffset(); + baseOffset = UnsafeHolder.BYTE_ARRAY_OFFSET + buffer.arrayOffset(); } else { baseObject = null; baseOffset = UnsafeHolder.getDirectBufferAddress(buffer); } - Platform.setMemory(baseObject, baseOffset, buffer.capacity(), - MemoryAllocator.MEMORY_DEBUG_FILL_FREED_VALUE); + UnsafeHolder.getUnsafe().setMemory(baseObject, baseOffset, buffer.capacity(), + MEMORY_DEBUG_FILL_FREED_VALUE); } // Actual release should depend on buffer type and not allocator type. // Reserved off-heap space will be decremented by FreeMemory implementation. diff --git a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/ClientSharedUtils.java b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/ClientSharedUtils.java index 10b16f09b..5338050ee 100644 --- a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/ClientSharedUtils.java +++ b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/ClientSharedUtils.java @@ -70,11 +70,11 @@ import javax.naming.directory.InitialDirContext; import com.gemstone.gemfire.internal.shared.unsafe.DirectBufferAllocator; +import com.gemstone.gemfire.internal.shared.unsafe.UnsafeHolder; import org.apache.log4j.Appender; import org.apache.log4j.FileAppender; import org.apache.log4j.LogManager; import org.apache.log4j.PropertyConfigurator; -import org.apache.spark.unsafe.Platform; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1948,16 +1948,17 @@ public static boolean equalBuffers(final byte[] bytes, return false; } // read in longs to minimize ByteBuffer get() calls + final sun.misc.Unsafe unsafe = UnsafeHolder.getUnsafe(); int pos = buffer.position(); final int endPos = (pos + len); final boolean sameOrder = ByteOrder.nativeOrder() == buffer.order(); // round off to nearest factor of 8 to read in longs final int endRound8Pos = (len % 8) != 0 ? (endPos - 8) : endPos; - long indexPos = Platform.BYTE_ARRAY_OFFSET; + long indexPos = UnsafeHolder.BYTE_ARRAY_OFFSET; while (pos < endRound8Pos) { // splitting into longs is faster than reading one byte at a time even // though it costs more operations (about 20% in micro-benchmarks) - final long s = Platform.getLong(bytes, indexPos); + final long s = unsafe.getLong(bytes, indexPos); final long v = buffer.getLong(pos); if (sameOrder) { if (s != v) { @@ -1970,7 +1971,7 @@ public static boolean equalBuffers(final byte[] bytes, indexPos += 8; } while (pos < endPos) { - if (Platform.getByte(bytes, indexPos) != buffer.get(pos)) { + if (unsafe.getByte(bytes, indexPos) != buffer.get(pos)) { return false; } pos++; diff --git a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/HeapBufferAllocator.java b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/HeapBufferAllocator.java index cc8e28c03..0300986e2 100644 --- a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/HeapBufferAllocator.java +++ b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/HeapBufferAllocator.java @@ -18,8 +18,7 @@ import java.nio.ByteBuffer; -import org.apache.spark.unsafe.Platform; -import org.apache.spark.unsafe.memory.MemoryAllocator; +import com.gemstone.gemfire.internal.shared.unsafe.UnsafeHolder; /** * Heap ByteBuffer implementation of {@link BufferAllocator}. @@ -44,8 +43,8 @@ public ByteBuffer allocate(int size, String owner) { @Override public ByteBuffer allocateForStorage(int size) { ByteBuffer buffer = ByteBuffer.allocate(size); - if (MemoryAllocator.MEMORY_DEBUG_FILL_ENABLED) { - fill(buffer, MemoryAllocator.MEMORY_DEBUG_FILL_CLEAN_VALUE); + if (BufferAllocator.MEMORY_DEBUG_FILL_ENABLED) { + fill(buffer, BufferAllocator.MEMORY_DEBUG_FILL_CLEAN_VALUE); } return buffer; } @@ -53,7 +52,7 @@ public ByteBuffer allocateForStorage(int size) { @Override public void clearPostAllocate(ByteBuffer buffer, int position) { // JVM clears the allocated area, so only clear for DEBUG_FILL case - if (MemoryAllocator.MEMORY_DEBUG_FILL_ENABLED) { + if (BufferAllocator.MEMORY_DEBUG_FILL_ENABLED) { // clear till the capacity and not limit since former will be a factor // of 8 and hence more efficient in Unsafe.setMemory fill(buffer, (byte)0, position, buffer.capacity() - position); @@ -67,7 +66,7 @@ public Object baseObject(ByteBuffer buffer) { @Override public long baseOffset(ByteBuffer buffer) { - return Platform.BYTE_ARRAY_OFFSET + buffer.arrayOffset(); + return UnsafeHolder.BYTE_ARRAY_OFFSET + buffer.arrayOffset(); } @Override @@ -80,11 +79,11 @@ public ByteBuffer expand(ByteBuffer buffer, int required, String owner) { final int newLength = BufferAllocator.expandedSize(currentUsed, required); final byte[] newBytes = new byte[newLength]; System.arraycopy(bytes, buffer.arrayOffset(), newBytes, 0, currentUsed); - if (MemoryAllocator.MEMORY_DEBUG_FILL_ENABLED) { + if (BufferAllocator.MEMORY_DEBUG_FILL_ENABLED) { // fill the remaining bytes ByteBuffer buf = ByteBuffer.wrap(newBytes, currentUsed, newLength - currentUsed); - fill(buf, MemoryAllocator.MEMORY_DEBUG_FILL_CLEAN_VALUE); + fill(buf, BufferAllocator.MEMORY_DEBUG_FILL_CLEAN_VALUE); } return ByteBuffer.wrap(newBytes).order(buffer.order()); } else { diff --git a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/SystemProperties.java b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/SystemProperties.java index 1a9b591de..8a5addf32 100644 --- a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/SystemProperties.java +++ b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/SystemProperties.java @@ -207,6 +207,8 @@ public static boolean isUsingGemFireXDEntryPoint() { "io.snappydata.gemxd.SnappyDataVersion".equals(frameCls) || "org.apache.spark.sql.SnappySession$".equals(frameCls) || "org.apache.spark.sql.SnappySession".equals(frameCls) || + "org.apache.spark.sql.SparkSupport$".equals(frameCls) || + "org.apache.spark.sql.SparkSupport".equals(frameCls) || "io.snappydata.gemxd.ClusterCallbacksImpl$".equals(frameCls)) { return true; } diff --git a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeDataInputStream.java b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeDataInputStream.java index dbc5caa39..7e94e0ad0 100644 --- a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeDataInputStream.java +++ b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeDataInputStream.java @@ -42,8 +42,6 @@ import java.nio.channels.ReadableByteChannel; import javax.annotation.Nonnull; -import org.apache.spark.unsafe.Platform; - /** * A buffered DataInput abstraction over channel using direct byte buffers, and * using internal Unsafe class for best performance. @@ -128,7 +126,7 @@ public final byte readByte() throws IOException { if (this.addrPosition >= this.addrLimit) { refillBuffer(this.buffer, 1, "readByte: premature end of stream"); } - return Platform.getByte(null, this.addrPosition++); + return UnsafeHolder.getUnsafe().getByte(null, this.addrPosition++); } /** @@ -151,9 +149,9 @@ public final short readShort() throws IOException { } this.addrPosition += 2; if (UnsafeHolder.littleEndian) { - return Short.reverseBytes(Platform.getShort(null, addrPos)); + return Short.reverseBytes(UnsafeHolder.getUnsafe().getShort(null, addrPos)); } else { - return Platform.getShort(null, addrPos); + return UnsafeHolder.getUnsafe().getShort(null, addrPos); } } @@ -185,9 +183,9 @@ public final long readLong() throws IOException { } this.addrPosition += 8; if (UnsafeHolder.littleEndian) { - return Long.reverseBytes(Platform.getLong(null, addrPos)); + return Long.reverseBytes(UnsafeHolder.getUnsafe().getLong(null, addrPos)); } else { - return Platform.getLong(null, addrPos); + return UnsafeHolder.getUnsafe().getLong(null, addrPos); } } diff --git a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeDataOutputStream.java b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeDataOutputStream.java index 94dbf44c2..cf6a74435 100644 --- a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeDataOutputStream.java +++ b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeDataOutputStream.java @@ -25,7 +25,6 @@ import javax.annotation.Nonnull; import com.gemstone.gemfire.internal.shared.ClientSharedUtils; -import org.apache.spark.unsafe.Platform; /** * A buffered DataOutput abstraction over channel using direct byte buffers, and @@ -237,26 +236,27 @@ public final void writeUTF(@Nonnull String str) throws IOException { public static long writeUTFSegmentNoOverflow(String str, int offset, int length, final int utfLen, final Object target, long addrPos) { + final sun.misc.Unsafe unsafe = UnsafeHolder.getUnsafe(); final int end = (offset + length); // fast path for ASCII strings if (length == utfLen) { while (offset < end) { final char c = str.charAt(offset++); - Platform.putByte(target, addrPos++, (byte)c); + unsafe.putByte(target, addrPos++, (byte)c); } return addrPos; } while (offset < end) { final char c = str.charAt(offset++); if ((c >= 0x0001) && (c <= 0x007F)) { - Platform.putByte(target, addrPos++, (byte)c); + unsafe.putByte(target, addrPos++, (byte)c); } else if (c > 0x07FF) { - Platform.putByte(target, addrPos++, (byte)(0xE0 | ((c >> 12) & 0x0F))); - Platform.putByte(target, addrPos++, (byte)(0x80 | ((c >> 6) & 0x3F))); - Platform.putByte(target, addrPos++, (byte)(0x80 | (c & 0x3F))); + unsafe.putByte(target, addrPos++, (byte)(0xE0 | ((c >> 12) & 0x0F))); + unsafe.putByte(target, addrPos++, (byte)(0x80 | ((c >> 6) & 0x3F))); + unsafe.putByte(target, addrPos++, (byte)(0x80 | (c & 0x3F))); } else { - Platform.putByte(target, addrPos++, (byte)(0xC0 | ((c >> 6) & 0x1F))); - Platform.putByte(target, addrPos++, (byte)(0x80 | (c & 0x3F))); + unsafe.putByte(target, addrPos++, (byte)(0xC0 | ((c >> 6) & 0x1F))); + unsafe.putByte(target, addrPos++, (byte)(0x80 | (c & 0x3F))); } } return addrPos; @@ -265,9 +265,9 @@ public static long writeUTFSegmentNoOverflow(String str, int offset, /** Write a short in big-endian format on given off-heap address. */ protected static long putShort(long addrPos, final int v) { if (UnsafeHolder.littleEndian) { - Platform.putShort(null, addrPos, Short.reverseBytes((short)v)); + UnsafeHolder.getUnsafe().putShort(null, addrPos, Short.reverseBytes((short)v)); } else { - Platform.putShort(null, addrPos, (short)v); + UnsafeHolder.getUnsafe().putShort(null, addrPos, (short)v); } return addrPos + 2; } @@ -275,9 +275,9 @@ protected static long putShort(long addrPos, final int v) { /** Write a long in big-endian format on given off-heap address. */ protected static long putLong(long addrPos, final long v) { if (UnsafeHolder.littleEndian) { - Platform.putLong(null, addrPos, Long.reverseBytes(v)); + UnsafeHolder.getUnsafe().putLong(null, addrPos, Long.reverseBytes(v)); } else { - Platform.putLong(null, addrPos, v); + UnsafeHolder.getUnsafe().putLong(null, addrPos, v); } return addrPos + 8; } diff --git a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeInputStream.java b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeInputStream.java index e94060292..aae61de6b 100644 --- a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeInputStream.java +++ b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeInputStream.java @@ -44,7 +44,6 @@ import com.gemstone.gemfire.internal.shared.ChannelBufferInputStream; import com.gemstone.gemfire.internal.shared.ClientSharedUtils; import com.gemstone.gemfire.internal.shared.InputStreamChannel; -import org.apache.spark.unsafe.Platform; /** * A more efficient implementation of {@link ChannelBufferInputStream} @@ -118,7 +117,7 @@ public final int read() throws IOException { return -1; } } - return Platform.getByte(null, this.addrPosition++) & 0xff; + return UnsafeHolder.getUnsafe().getByte(null, this.addrPosition++) & 0xff; } private int read_(byte[] buf, int off, int len) throws IOException { @@ -136,8 +135,8 @@ private int read_(byte[] buf, int off, int len) throws IOException { final int remaining = (int)(this.addrLimit - this.addrPosition); if (len <= remaining) { if (len > 0) { - Platform.copyMemory(null, this.addrPosition, buf, - Platform.BYTE_ARRAY_OFFSET + off, len); + UnsafeHolder.copyMemory(null, this.addrPosition, buf, + UnsafeHolder.BYTE_ARRAY_OFFSET + off, len); this.addrPosition += len; return len; } else { @@ -148,8 +147,8 @@ private int read_(byte[] buf, int off, int len) throws IOException { // refill buffer once and read whatever available into buf; // caller should invoke in a loop if buffer is still not full if (remaining > 0) { - Platform.copyMemory(null, this.addrPosition, buf, - Platform.BYTE_ARRAY_OFFSET + off, remaining); + UnsafeHolder.copyMemory(null, this.addrPosition, buf, + UnsafeHolder.BYTE_ARRAY_OFFSET + off, remaining); this.addrPosition += remaining; return remaining; } @@ -158,8 +157,8 @@ private int read_(byte[] buf, int off, int len) throws IOException { if (len > bufBytes) { len = bufBytes; } - Platform.copyMemory(null, this.addrPosition, buf, - Platform.BYTE_ARRAY_OFFSET + off, len); + UnsafeHolder.copyMemory(null, this.addrPosition, buf, + UnsafeHolder.BYTE_ARRAY_OFFSET + off, len); this.addrPosition += len; return len; } else { @@ -221,9 +220,9 @@ public final int readInt() throws IOException { } this.addrPosition += 4; if (UnsafeHolder.littleEndian) { - return Integer.reverseBytes(Platform.getInt(null, addrPos)); + return Integer.reverseBytes(UnsafeHolder.getUnsafe().getInt(null, addrPos)); } else { - return Platform.getInt(null, addrPos); + return UnsafeHolder.getUnsafe().getInt(null, addrPos); } } diff --git a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeOutputStream.java b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeOutputStream.java index 16d5161c8..f22d63247 100644 --- a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeOutputStream.java +++ b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/ChannelBufferUnsafeOutputStream.java @@ -44,7 +44,6 @@ import com.gemstone.gemfire.internal.shared.ChannelBufferOutputStream; import com.gemstone.gemfire.internal.shared.ClientSharedUtils; import com.gemstone.gemfire.internal.shared.OutputStreamChannel; -import org.apache.spark.unsafe.Platform; /** * A somewhat more efficient implementation of {@link ChannelBufferOutputStream} @@ -146,14 +145,14 @@ protected final void write_(byte[] b, int off, int len) throws IOException { final long addrPos = this.addrPosition; final int remaining = (int)(this.addrLimit - addrPos); if (len <= remaining) { - Platform.copyMemory(b, Platform.BYTE_ARRAY_OFFSET + off, + UnsafeHolder.copyMemory(b, UnsafeHolder.BYTE_ARRAY_OFFSET + off, null, addrPos, len); this.addrPosition += len; return; } else { // copy b to buffer and flush if (remaining > 0) { - Platform.copyMemory(b, Platform.BYTE_ARRAY_OFFSET + off, + UnsafeHolder.copyMemory(b, UnsafeHolder.BYTE_ARRAY_OFFSET + off, null, addrPos, remaining); this.addrPosition += remaining; len -= remaining; @@ -176,7 +175,7 @@ protected final void putByte(byte b) throws IOException { if (this.addrPosition >= this.addrLimit) { flushBufferBlocking(this.buffer); } - Platform.putByte(null, this.addrPosition++, b); + UnsafeHolder.getUnsafe().putByte(null, this.addrPosition++, b); } /** @@ -298,9 +297,9 @@ protected void flushBufferBlocking(final ByteBuffer buffer) /** Write an integer in big-endian format on given off-heap address. */ protected static long putInt(long addrPos, final int v) { if (UnsafeHolder.littleEndian) { - Platform.putInt(null, addrPos, Integer.reverseBytes(v)); + UnsafeHolder.getUnsafe().putInt(null, addrPos, Integer.reverseBytes(v)); } else { - Platform.putInt(null, addrPos, v); + UnsafeHolder.getUnsafe().putInt(null, addrPos, v); } return addrPos + 4; } diff --git a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/DirectBufferAllocator.java b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/DirectBufferAllocator.java index 3dae5dcd6..36febc07c 100644 --- a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/DirectBufferAllocator.java +++ b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/DirectBufferAllocator.java @@ -21,7 +21,6 @@ import java.util.function.BiConsumer; import com.gemstone.gemfire.internal.shared.BufferAllocator; -import org.apache.spark.unsafe.memory.MemoryAllocator; /** * Generic implementation of {@link BufferAllocator} for direct ByteBuffers @@ -98,8 +97,8 @@ public ByteBuffer allocateWithFallback(int size, String owner) { @Override public ByteBuffer allocateForStorage(int size) { ByteBuffer buffer = ByteBuffer.allocateDirect(size); - if (MemoryAllocator.MEMORY_DEBUG_FILL_ENABLED) { - fill(buffer, MemoryAllocator.MEMORY_DEBUG_FILL_CLEAN_VALUE); + if (BufferAllocator.MEMORY_DEBUG_FILL_ENABLED) { + fill(buffer, BufferAllocator.MEMORY_DEBUG_FILL_CLEAN_VALUE); } return buffer; } @@ -134,11 +133,11 @@ public ByteBuffer expand(ByteBuffer buffer, int required, String owner) { newBuffer.put(buffer); UnsafeHolder.releaseDirectBuffer(buffer); newBuffer.rewind(); // position at start as per the contract of expand - if (MemoryAllocator.MEMORY_DEBUG_FILL_ENABLED) { + if (BufferAllocator.MEMORY_DEBUG_FILL_ENABLED) { // fill the remaining bytes ByteBuffer buf = newBuffer.duplicate(); buf.position(currentUsed); - fill(buf, MemoryAllocator.MEMORY_DEBUG_FILL_CLEAN_VALUE); + fill(buf, BufferAllocator.MEMORY_DEBUG_FILL_CLEAN_VALUE); } return newBuffer; } else { diff --git a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/FreeMemory.java b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/FreeMemory.java index faab10b03..f49d7d24c 100644 --- a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/FreeMemory.java +++ b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/FreeMemory.java @@ -18,8 +18,6 @@ import java.util.concurrent.atomic.AtomicLong; -import org.apache.spark.unsafe.Platform; - @SuppressWarnings("serial") public abstract class FreeMemory extends AtomicLong implements Runnable { @@ -39,7 +37,7 @@ protected final long tryFree() { public void run() { final long address = tryFree(); if (address != 0) { - Platform.freeMemory(address); + UnsafeHolder.getUnsafe().freeMemory(address); } } diff --git a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/UnsafeHolder.java b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/UnsafeHolder.java index 5bebc8267..a2dd121b3 100644 --- a/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/UnsafeHolder.java +++ b/gemfire-shared/src/main/java/com/gemstone/gemfire/internal/shared/unsafe/UnsafeHolder.java @@ -32,7 +32,24 @@ * permissions and limitations under the License. See accompanying * LICENSE file. */ - +/* + * Portions adapted from Apache Spark having license below. + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.gemstone.gemfire.internal.shared.unsafe; import java.io.IOException; @@ -54,7 +71,6 @@ import com.gemstone.gemfire.internal.shared.ChannelBufferOutputStream; import com.gemstone.gemfire.internal.shared.InputStreamChannel; import com.gemstone.gemfire.internal.shared.OutputStreamChannel; -import org.apache.spark.unsafe.Platform; /** * Holder for static sun.misc.Unsafe instance and some convenience methods. Use @@ -163,6 +179,15 @@ static void init() { } } + /** + * Limits the number of bytes to copy per sun.misc.Unsafe.copyMemory to + * allow safepoint polling during a large copy. + */ + private static final long UNSAFE_COPY_THRESHOLD = 1024L * 1024L; + + public static final int BYTE_ARRAY_OFFSET; + public static final int LONG_ARRAY_OFFSET; + private static final boolean hasUnsafe; // Limit to the chunk copied per Unsafe.copyMemory call to allow for // safepoint polling by JVM. @@ -179,6 +204,13 @@ static void init() { v = false; } hasUnsafe = v; + if (hasUnsafe) { + BYTE_ARRAY_OFFSET = getUnsafe().arrayBaseOffset(byte[].class); + LONG_ARRAY_OFFSET = getUnsafe().arrayBaseOffset(long[].class); + } else { + BYTE_ARRAY_OFFSET = 0; + LONG_ARRAY_OFFSET = 0; + } } private UnsafeHolder() { @@ -272,7 +304,7 @@ public static ByteBuffer reallocateDirectBuffer(ByteBuffer buffer, expectedClass.getName() + " in reallocate but was non-runnable"); } newAddress = allocateMemoryUnsafe(newSize); - Platform.copyMemory(null, directBuffer.address(), null, newAddress, + copyMemory(null, directBuffer.address(), null, newAddress, Math.min(newLength, buffer.limit())); } // clean only after copying is done @@ -429,4 +461,32 @@ public static void checkBounds(int arrayLength, int offset, int len) { "length=" + arrayLength + " offset=" + offset + " length=" + len); } } + + /** + * Taken from Apache Spark's org.apache.spark.unsafe.Platform.copyMemory + */ + public static void copyMemory(Object src, long srcOffset, Object dst, + long dstOffset, long length) { + // Check if dstOffset is before or after srcOffset to determine if we should copy + // forward or backwards. This is necessary in case src and dst overlap. + if (dstOffset < srcOffset) { + while (length > 0) { + long size = Math.min(length, UNSAFE_COPY_THRESHOLD); + getUnsafe().copyMemory(src, srcOffset, dst, dstOffset, size); + length -= size; + srcOffset += size; + dstOffset += size; + } + } else { + srcOffset += length; + dstOffset += length; + while (length > 0) { + long size = Math.min(length, UNSAFE_COPY_THRESHOLD); + srcOffset -= size; + dstOffset -= size; + getUnsafe().copyMemory(src, srcOffset, dst, dstOffset, size); + length -= size; + } + } + } } diff --git a/gemfirexd/core/build.gradle b/gemfirexd/core/build.gradle index c727e712e..18e5c5363 100644 --- a/gemfirexd/core/build.gradle +++ b/gemfirexd/core/build.gradle @@ -29,7 +29,7 @@ dependencies { compileOnly "com.pivotal:pxf-api:${pxfVersion}" compile "org.osgi:org.osgi.core:${osgiVersion}" compile "org.apache.ant:ant:${antVersion}" - compile "javax.servlet:javax.servlet-api:${servletAPIVersion}" + compile "javax.servlet:javax.servlet-api:${javaxServletVersion}" compile "org.apache.thrift:libthrift:${thriftVersion}" compile "com.esotericsoftware:kryo-shaded:${kryoVersion}" diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/Misc.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/Misc.java index 8b1192b4c..3f85ebb3b 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/Misc.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/Misc.java @@ -55,7 +55,6 @@ import com.gemstone.gemfire.i18n.LogWriterI18n; import com.gemstone.gemfire.internal.GemFireStatSampler; import com.gemstone.gemfire.internal.InsufficientDiskSpaceException; -import com.gemstone.gemfire.internal.LocalLogWriter; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.cache.LocalRegion; import com.gemstone.gemfire.internal.cache.NoDataStoreAvailableException; @@ -69,7 +68,6 @@ import com.gemstone.gemfire.internal.shared.SystemProperties; import com.gemstone.gemfire.internal.snappy.CallbackFactoryProvider; import com.gemstone.gemfire.internal.snappy.StoreCallbacks; -import com.gemstone.gemfire.internal.util.DebuggerSupport; import com.pivotal.gemfirexd.Attribute; import com.pivotal.gemfirexd.Constants; import com.pivotal.gemfirexd.auth.callback.UserAuthenticator; @@ -81,7 +79,6 @@ import com.pivotal.gemfirexd.internal.engine.store.GemFireStore; import com.pivotal.gemfirexd.internal.iapi.error.DerbySQLException; import com.pivotal.gemfirexd.internal.iapi.error.StandardException; -import com.pivotal.gemfirexd.internal.iapi.jdbc.AuthenticationService; import com.pivotal.gemfirexd.internal.iapi.reference.SQLState; import com.pivotal.gemfirexd.internal.iapi.services.context.ContextService; import com.pivotal.gemfirexd.internal.iapi.sql.conn.LanguageConnectionContext; @@ -111,14 +108,6 @@ public abstract class Misc { private Misc() { } - /** - * misc utilities - */ - public static void waitForDebugger() { - DebuggerSupport.waitForJavaDebugger(new LocalLogWriter( - LocalLogWriter.ALL_LEVEL)); - } - /** * Get the {@link LogWriter} for the cache/DS. */ @@ -756,14 +745,10 @@ public static int getUnifiedHashCodeFromDVD(DataValueDescriptor[] dvds, * Only LDAP scheme is supported currently. */ public static boolean isSecurityEnabled() { - AuthenticationService authService = Misc.getMemStoreBooting() + AuthenticationServiceBase authService = Misc.getMemStoreBooting() .getDatabase().getAuthenticationService(); - if (authService != null) { - UserAuthenticator auth = ((AuthenticationServiceBase)authService) - .getAuthenticationScheme(); - return auth instanceof LDAPAuthenticationSchemeImpl; - } - return false; + return authService != null && + authService.getAuthenticationScheme() instanceof LDAPAuthenticationSchemeImpl; } /* Returns true if LDAP Security is Enabled */ @@ -779,8 +764,8 @@ public static boolean checkLDAPAuthProvider(Map map) { public static boolean checkLDAPGroupOwnership(String schemaName, String ldapGroupName, String user) throws StandardException { if (ldapGroupName.startsWith(Constants.LDAP_GROUP_PREFIX)) { - UserAuthenticator auth = ((AuthenticationServiceBase)Misc.getMemStoreBooting() - .getDatabase().getAuthenticationService()).getAuthenticationScheme(); + UserAuthenticator auth = Misc.getMemStoreBooting() + .getDatabase().getAuthenticationService().getAuthenticationScheme(); if (auth instanceof LDAPAuthenticationSchemeImpl) { String group = ldapGroupName.substring(Constants.LDAP_GROUP_PREFIX.length()); try { @@ -862,7 +847,7 @@ else if (gfeex == null && expEx instanceof GemFireException) { // check if this VM is shutting down getGemFireCache().getCancelCriterion().checkCancelInProgress(thr); // if everything else fails, wrap in unexpected exception - member = StandardException.fixUpRemoteException(t, member); + StandardException.fixUpRemoteException(t, member); stdEx = StandardException.newException( SQLState.LANG_UNEXPECTED_USER_EXCEPTION, thr, thr.toString()); } @@ -934,7 +919,7 @@ else if (gfeex instanceof PartitionedRegionStorageException) { .toLocalizedString(); expected = expected.substring(0, expected.indexOf('.')); String msgThis = gfeex.getLocalizedMessage(); - if (msgThis.indexOf(expected) != -1 + if (msgThis.contains(expected) || msgThis.contains(LocalizedStrings .PRHARRedundancyProvider_ALLOCATE_ENOUGH_MEMBERS_TO_HOST_BUCKET .toLocalizedString()) @@ -987,7 +972,7 @@ else if (gfeex instanceof PutAllPartialResultException) { expected = expected.substring(0, expected.indexOf('.')); String msgThis = partialExceptionCause.getLocalizedMessage(); - if (msgThis.indexOf(expected) != -1 + if (msgThis.contains(expected) || partialExceptionCause .getLocalizedMessage() .contains( @@ -1022,7 +1007,7 @@ else if (gfeex instanceof DiskAccessException) { gfeex); } Throwable innerCause = gfeex.getCause(); - if (innerCause != null && innerCause instanceof GemFireException) { + if (innerCause instanceof GemFireException) { StandardException se = processKnownGemFireException( (GemFireException)innerCause, innerCause, op, false); if (se != null) { @@ -1093,7 +1078,7 @@ public static StandardException processRuntimeException( public static StandardException wrapRemoteSQLException( final SQLException sqle, final Throwable remoteEx, DistributedMember member) { - member = StandardException.fixUpRemoteException(sqle, member); + StandardException.fixUpRemoteException(sqle, member); return wrapSQLException(sqle, remoteEx); } diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/distributed/ByteArrayDataOutput.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/distributed/ByteArrayDataOutput.java index 0dce0f09c..b8973bbcc 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/distributed/ByteArrayDataOutput.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/distributed/ByteArrayDataOutput.java @@ -23,8 +23,8 @@ import com.gemstone.gemfire.internal.shared.ClientSharedUtils; import com.gemstone.gemfire.internal.shared.unsafe.ChannelBufferUnsafeDataOutputStream; +import com.gemstone.gemfire.internal.shared.unsafe.UnsafeHolder; import com.pivotal.gemfirexd.internal.shared.common.ResolverUtils; -import org.apache.spark.unsafe.Platform; /** * An expanding byte[] based DataOutputStream. Best used as intermediate buffer @@ -177,7 +177,7 @@ public final void writeUTF(@Nonnull final String str) ensureCapacity(2 + utfLen, this.bufferPos); writeShort(utfLen); ChannelBufferUnsafeDataOutputStream.writeUTFSegmentNoOverflow(str, 0, - strLen, utfLen, this.buffer, Platform.BYTE_ARRAY_OFFSET + bufferPos); + strLen, utfLen, this.buffer, UnsafeHolder.BYTE_ARRAY_OFFSET + bufferPos); this.bufferPos += utfLen; } else { throw new UTFDataFormatException("ByteArrayDataOutput#writeUTF: " diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/distributed/GfxdHeapDataOutputStream.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/distributed/GfxdHeapDataOutputStream.java index 5ecfc66a8..ffa5b8ca5 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/distributed/GfxdHeapDataOutputStream.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/distributed/GfxdHeapDataOutputStream.java @@ -22,9 +22,9 @@ import com.gemstone.gemfire.internal.HeapDataOutputStream; import com.gemstone.gemfire.internal.ObjToByteArraySerializer; import com.gemstone.gemfire.internal.shared.Version; +import com.gemstone.gemfire.internal.shared.unsafe.UnsafeHolder; import com.pivotal.gemfirexd.internal.engine.Misc; import com.pivotal.gemfirexd.internal.engine.sql.conn.GfxdHeapThresholdListener; -import org.apache.spark.unsafe.Platform; /** * GfxdHeapDataOutputStream extends {@link HeapDataOutputStream} from which it @@ -107,8 +107,8 @@ public final void copyMemory(final Object src, long srcOffset, int length) { // copy into as available space first final int remainingSpace = buffer.capacity() - pos; if (remainingSpace < length) { - Platform.copyMemory(src, srcOffset, dst, - Platform.BYTE_ARRAY_OFFSET + offset + pos, remainingSpace); + UnsafeHolder.copyMemory(src, srcOffset, dst, + UnsafeHolder.BYTE_ARRAY_OFFSET + offset + pos, remainingSpace); buffer.position(pos + remainingSpace); srcOffset += remainingSpace; length -= remainingSpace; @@ -120,8 +120,8 @@ public final void copyMemory(final Object src, long srcOffset, int length) { pos = buffer.position(); } // copy remaining bytes - Platform.copyMemory(src, srcOffset, dst, - Platform.BYTE_ARRAY_OFFSET + offset + pos, length); + UnsafeHolder.copyMemory(src, srcOffset, dst, + UnsafeHolder.BYTE_ARRAY_OFFSET + offset + pos, length); buffer.position(pos + length); } diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/distributed/utils/GemFireXDUtils.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/distributed/utils/GemFireXDUtils.java index be6f8fbc2..d1cbdab04 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/distributed/utils/GemFireXDUtils.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/distributed/utils/GemFireXDUtils.java @@ -83,6 +83,7 @@ import com.gemstone.gemfire.internal.offheap.SimpleMemoryAllocatorImpl; import com.gemstone.gemfire.internal.offheap.annotations.Released; import com.gemstone.gemfire.internal.offheap.annotations.Unretained; +import com.gemstone.gemfire.internal.shared.ClientResolverUtils; import com.gemstone.gemfire.internal.shared.ClientSharedData; import com.gemstone.gemfire.internal.shared.ClientSharedUtils; import com.gemstone.gemfire.internal.shared.HostLocationBase; @@ -165,7 +166,6 @@ import com.pivotal.gemfirexd.internal.shared.common.sanity.AssertFailure; import com.pivotal.gemfirexd.internal.shared.common.sanity.SanityManager; import org.apache.log4j.Logger; -import org.apache.spark.unsafe.hash.Murmur3_x86_32; import org.apache.thrift.TBase; import org.apache.thrift.TException; import org.apache.thrift.protocol.TCompactProtocol; @@ -3514,7 +3514,7 @@ public V setValue(V value) { public int hashCode() { long h1 = this.key != null ? this.key.hashCode() : 0; long h2 = this.val != null ? this.val.hashCode() : 0; - return Murmur3_x86_32.hashLong(h1 | (h2 << 32L), 42); + return ClientResolverUtils.fastHashLong(h1 | (h2 << 32L)); } @Override diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/AbstractCompactExecRow.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/AbstractCompactExecRow.java index 2edad68a8..3f0ac2147 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/AbstractCompactExecRow.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/AbstractCompactExecRow.java @@ -47,7 +47,6 @@ import com.pivotal.gemfirexd.internal.iapi.types.DataTypeUtilities; import com.pivotal.gemfirexd.internal.iapi.types.DataValueDescriptor; import com.pivotal.gemfirexd.internal.iapi.types.SQLDecimal; -import org.apache.spark.unsafe.types.UTF8String; /** * Common behavior for implementations of a compact Row used to minimize the @@ -1252,9 +1251,6 @@ public Clob getAsClob(int position, ResultWasNull wasNull) .getFullSQLTypeName(), cd.getColumnName()); } - // TODO: SW: fix to store same full UTF8 format in GemXD like in UTF8String - public abstract UTF8String getAsUTF8String(int index) - throws StandardException; protected abstract String getString(int position, ResultWasNull wasNull) throws StandardException; protected abstract Object getObject(int position, ResultWasNull wasNull) diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/CompactExecRow.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/CompactExecRow.java index 0f025e050..5dcf22f0d 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/CompactExecRow.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/CompactExecRow.java @@ -33,7 +33,6 @@ import com.pivotal.gemfirexd.internal.iapi.services.io.FormatableBitSet; import com.pivotal.gemfirexd.internal.iapi.sql.execute.ExecRow; import com.pivotal.gemfirexd.internal.iapi.types.DataValueDescriptor; -import org.apache.spark.unsafe.types.UTF8String; /** * A compact implementation of Row used to minimize the footprint of a row and @@ -367,11 +366,6 @@ protected final byte[][] getRowByteArraysIfPresent() { return null; } - @Override - public UTF8String getAsUTF8String(int index) throws StandardException { - return this.formatter.getAsUTF8String(index, this.source); - } - @Override protected String getString(int position, ResultWasNull wasNull) throws StandardException { diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/CompactExecRowWithLobs.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/CompactExecRowWithLobs.java index f02d88b6c..d87ea094b 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/CompactExecRowWithLobs.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/CompactExecRowWithLobs.java @@ -38,7 +38,6 @@ import com.pivotal.gemfirexd.internal.iapi.sql.execute.ExecRow; import com.pivotal.gemfirexd.internal.iapi.types.DataValueDescriptor; import com.pivotal.gemfirexd.internal.shared.common.ResolverUtils; -import org.apache.spark.unsafe.types.UTF8String; /** * A compact implementation of Row that contains one or more LOBs (i.e. BLOBs or @@ -174,11 +173,6 @@ public final byte[][] getRawRowValue(final boolean doClone) { } } - @Override - public UTF8String getAsUTF8String(int index) throws StandardException { - return this.formatter.getAsUTF8String(index, this.source); - } - @Override protected String getString(int position, ResultWasNull wasNull) throws StandardException { diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/OffHeapCompactExecRow.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/OffHeapCompactExecRow.java index 651d3597c..58976be84 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/OffHeapCompactExecRow.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/OffHeapCompactExecRow.java @@ -41,7 +41,6 @@ import com.pivotal.gemfirexd.internal.iapi.sql.execute.ExecRow; import com.pivotal.gemfirexd.internal.iapi.types.DataValueDescriptor; import com.pivotal.gemfirexd.internal.shared.common.ResolverUtils; -import org.apache.spark.unsafe.types.UTF8String; import static com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier.OFFHEAP_COMPACT_EXEC_ROW_SOURCE; @@ -593,24 +592,6 @@ protected final byte[][] getRowByteArraysIfPresent() { return null; } - @Override - public UTF8String getAsUTF8String(int index) throws StandardException { - final Object source = this.source; - if (source != null) { - final Class cls = source.getClass(); - if (cls == OffHeapRow.class) { - return this.formatter.getAsUTF8String(index, (OffHeapRow)source); - } else if (cls == byte[].class) { - return this.formatter.getAsUTF8String(index, (byte[])source); - } else { - return this.formatter.getAsUTF8String(index, - (OffHeapRowWithLobs)source); - } - } else { - return null; - } - } - @Override protected String getString(int position, ResultWasNull wasNull) throws StandardException { diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/OffHeapCompactExecRowWithLobs.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/OffHeapCompactExecRowWithLobs.java index 11f47404f..3ec362e9e 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/OffHeapCompactExecRowWithLobs.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/OffHeapCompactExecRowWithLobs.java @@ -45,7 +45,6 @@ import com.pivotal.gemfirexd.internal.iapi.sql.execute.ExecRow; import com.pivotal.gemfirexd.internal.iapi.types.DataValueDescriptor; import com.pivotal.gemfirexd.internal.shared.common.ResolverUtils; -import org.apache.spark.unsafe.types.UTF8String; import static com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier.OFFHEAP_COMPACT_EXEC_ROW_WITH_LOBS_SOURCE; @@ -271,24 +270,6 @@ else if (cls == byte[][].class) { } } - @Override - public UTF8String getAsUTF8String(int index) throws StandardException { - final Object source = this.source; - if (source != null) { - final Class cls = source.getClass(); - if (cls == OffHeapRowWithLobs.class) { - return this.formatter.getAsUTF8String(index, - (OffHeapRowWithLobs)source); - } else if (cls == byte[][].class) { - return this.formatter.getAsUTF8String(index, (byte[][])source); - } else { - return this.formatter.getAsUTF8String(index, (OffHeapRow)source); - } - } else { - return null; - } - } - @Override protected String getString(int position, ResultWasNull wasNull) throws StandardException { diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/RegionEntryUtils.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/RegionEntryUtils.java index bd3896715..863838587 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/RegionEntryUtils.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/RegionEntryUtils.java @@ -31,7 +31,6 @@ import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.internal.DistributionConfig; -import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember; import com.gemstone.gemfire.internal.Assert; import com.gemstone.gemfire.internal.ByteArrayDataInput; import com.gemstone.gemfire.internal.DSCODE; @@ -60,6 +59,7 @@ import com.gemstone.gemfire.internal.offheap.annotations.Unretained; import com.gemstone.gemfire.internal.shared.SystemProperties; import com.gemstone.gemfire.internal.shared.Version; +import com.gemstone.gemfire.internal.shared.unsafe.UnsafeHolder; import com.gemstone.gemfire.internal.size.ReflectionSingleObjectSizer; import com.gemstone.gemfire.internal.snappy.CallbackFactoryProvider; import com.gemstone.gemfire.internal.util.ArrayUtils; @@ -98,7 +98,6 @@ import com.pivotal.gemfirexd.internal.shared.common.ResolverUtils; import com.pivotal.gemfirexd.internal.shared.common.StoredFormatIds; import com.pivotal.gemfirexd.internal.shared.common.sanity.SanityManager; -import org.apache.spark.unsafe.Platform; public final class RegionEntryUtils { @@ -2940,7 +2939,7 @@ private final int compareBytes(final long memAddr, int columnOffset, final int endColumnPos = columnPos + columnWidth; long rowAddr = memAddr + columnOffset; while (columnPos < endColumnPos) { - if (columnBytes[columnPos] != Platform.getByte(null, rowAddr)) { + if (columnBytes[columnPos] != UnsafeHolder.getUnsafe().getByte(null, rowAddr)) { // indicates failure in equality comparison return -1; } @@ -2977,7 +2976,7 @@ else if (columnWidth > targetWidth) { long rowAddr = memAddr + columnOffset + shorter; long rowAddrEnd = rowAddr + (columnWidth - shorter); while (rowAddr < rowAddrEnd) { - if (Platform.getByte(null, rowAddr) != 0x20) { + if (UnsafeHolder.getUnsafe().getByte(null, rowAddr) != 0x20) { return -1; } ++rowAddr; @@ -3236,7 +3235,8 @@ private final int compareBytes(final long memAddr, int columnOffset, long rowAddr = memAddr + columnOffset; final long rowEndPos = rowAddr + columnWidth; while (rowAddr < rowEndPos) { - if (Platform.getByte(null, rowAddr) != Platform.getByte(null, columnAddr)) { + if (UnsafeHolder.getUnsafe().getByte(null, rowAddr) != + UnsafeHolder.getUnsafe().getByte(null, columnAddr)) { return -1; } rowAddr++; @@ -3260,7 +3260,7 @@ private final int compareCharBytes(final long memAddr, final long targetEndPos = targetColumnAddr + targetWidth; targetColumnAddr += shorter; while (targetColumnAddr < targetEndPos) { - if (Platform.getByte(null, targetColumnAddr) != 0x20) { + if (UnsafeHolder.getUnsafe().getByte(null, targetColumnAddr) != 0x20) { return -1; } targetColumnAddr++; @@ -3269,7 +3269,7 @@ private final int compareCharBytes(final long memAddr, long rowColumnAddr = memAddr + columnOffset + shorter; final long rowColumnEnd = rowColumnAddr + columnWidth - shorter; while (rowColumnAddr < rowColumnEnd) { - if (Platform.getByte(null, rowColumnAddr) != 0x20) { + if (UnsafeHolder.getUnsafe().getByte(null, rowColumnAddr) != 0x20) { return -1; } rowColumnAddr++; diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/RowFormatter.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/RowFormatter.java index 61ef874eb..80a1e523a 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/RowFormatter.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/RowFormatter.java @@ -62,8 +62,6 @@ import com.pivotal.gemfirexd.internal.shared.common.ResolverUtils; import com.pivotal.gemfirexd.internal.shared.common.StoredFormatIds; import com.pivotal.gemfirexd.internal.shared.common.sanity.SanityManager; -import org.apache.spark.unsafe.Platform; -import org.apache.spark.unsafe.types.UTF8String; /** * A RowFormatter translates between byte[] (and byte[][]) storage @@ -179,7 +177,7 @@ public final class RowFormatter implements Serializable { /** * Number of bytes required for serializing {@link #TOKEN_RECOVERY_VERSION}. */ - static final int TOKEN_RECOVERY_VERSION_BYTES = getCompactIntNumBytes( + private static final int TOKEN_RECOVERY_VERSION_BYTES = getCompactIntNumBytes( TOKEN_RECOVERY_VERSION); /** @@ -206,7 +204,7 @@ public final class RowFormatter implements Serializable { *

* Default value: offset is minimum -ve value possible in the offset bytes */ - int[] positionMap; + public int[] positionMap; /** * The {@link ColumnDescriptor}'s for this row that avoids having to go to @@ -661,7 +659,7 @@ private static int trimTrailingSpaces(final byte[] row, private static int trimTrailingSpaces( final long memAddress, final int columnOffset, int columnWidth) { long memOffset = memAddress + columnOffset + columnWidth - 1; - while (columnWidth > 0 && Platform.getByte(null, memOffset) == 0x20) { + while (columnWidth > 0 && UnsafeHolder.getUnsafe().getByte(null, memOffset) == 0x20) { memOffset--; columnWidth--; } @@ -675,17 +673,18 @@ private static int trimTrailingSpaces( * * @return the number of bytes written. */ - public static int writeInt(final byte[] bytes, int intValue, int offset) { + public static int writeInt(final byte[] bytes, int intValue, long offset) { assert bytes != null; // serialize in big-endian format to be compatible with DataOutput.writeInt // and also SQLInteger.computeHashCode if (UnsafeHolder.littleEndian) { - Platform.putInt(bytes, offset + Platform.BYTE_ARRAY_OFFSET, - Integer.reverseBytes(intValue)); + UnsafeHolder.getUnsafe().putInt(bytes, + offset + UnsafeHolder.BYTE_ARRAY_OFFSET, Integer.reverseBytes(intValue)); return 4; // bytes in int (= Integer.SIZE / 8); } else { - Platform.putInt(bytes, offset + Platform.BYTE_ARRAY_OFFSET, intValue); + UnsafeHolder.getUnsafe().putInt(bytes, + offset + UnsafeHolder.BYTE_ARRAY_OFFSET, intValue); return 4; // bytes in int (= Integer.SIZE / 8); } } @@ -846,20 +845,20 @@ public static int readInt(final byte[] bytes, int offset, */ public static short readShort(final long memOffset) { if (UnsafeHolder.littleEndian) { - return Short.reverseBytes(Platform.getShort(null, memOffset)); + return Short.reverseBytes(UnsafeHolder.getUnsafe().getShort(null, memOffset)); } else { - return Platform.getShort(null, memOffset); + return UnsafeHolder.getUnsafe().getShort(null, memOffset); } } - public static short readShort(final byte[] bytes, int offset) { + public static short readShort(final byte[] bytes, long offset) { assert bytes != null; if (UnsafeHolder.littleEndian) { - return Short.reverseBytes(Platform.getShort(bytes, - offset + Platform.BYTE_ARRAY_OFFSET)); + return Short.reverseBytes(UnsafeHolder.getUnsafe().getShort(bytes, + offset + UnsafeHolder.BYTE_ARRAY_OFFSET)); } else { - return Platform.getShort(bytes, offset + Platform.BYTE_ARRAY_OFFSET); + return UnsafeHolder.getUnsafe().getShort(bytes, offset + UnsafeHolder.BYTE_ARRAY_OFFSET); } } @@ -870,20 +869,21 @@ public static short readShort(final byte[] bytes, int offset) { */ public static int readInt(final long memOffset) { if (UnsafeHolder.littleEndian) { - return Integer.reverseBytes(Platform.getInt(null, memOffset)); + return Integer.reverseBytes(UnsafeHolder.getUnsafe().getInt(null, memOffset)); } else { - return Platform.getInt(null, memOffset); + return UnsafeHolder.getUnsafe().getInt(null, memOffset); } } - public static int readInt(final byte[] bytes, int offset) { + public static int readInt(final byte[] bytes, long offset) { assert bytes != null; if (UnsafeHolder.littleEndian) { - return Integer.reverseBytes(Platform.getInt(bytes, - offset + Platform.BYTE_ARRAY_OFFSET)); + return Integer.reverseBytes(UnsafeHolder.getUnsafe().getInt(bytes, + offset + UnsafeHolder.BYTE_ARRAY_OFFSET)); } else { - return Platform.getInt(bytes, offset + Platform.BYTE_ARRAY_OFFSET); + return UnsafeHolder.getUnsafe().getInt(bytes, + offset + UnsafeHolder.BYTE_ARRAY_OFFSET); } } @@ -894,7 +894,7 @@ public static int readCompactInt(long memAddr) { int shift = 0; long result = 0; while (shift < 64) { - final byte b = Platform.getByte(null, memAddr); + final byte b = UnsafeHolder.getUnsafe().getByte(null, memAddr); result |= (long)(b & 0x7F) << shift; if ((b & 0x80) == 0) { return (int)InternalDataSerializer.decodeZigZag64(result); @@ -925,17 +925,18 @@ public static int readCompactInt(final byte[] bytes, int offset) { * * @return the number of bytes written. */ - public static int writeLong(final byte[] bytes, long longValue, int offset) { + public static int writeLong(final byte[] bytes, long longValue, long offset) { assert bytes != null; // serialize in big-endian format to be compatible with DataOutput.writeInt // and also SQLInteger.computeHashCode if (UnsafeHolder.littleEndian) { - Platform.putLong(bytes, offset + Platform.BYTE_ARRAY_OFFSET, - Long.reverseBytes(longValue)); + UnsafeHolder.getUnsafe().putLong(bytes, + offset + UnsafeHolder.BYTE_ARRAY_OFFSET, Long.reverseBytes(longValue)); return 8; // bytes in long (= Long.SIZE / 8); } else { - Platform.putLong(bytes, offset + Platform.BYTE_ARRAY_OFFSET, longValue); + UnsafeHolder.getUnsafe().putLong(bytes, + offset + UnsafeHolder.BYTE_ARRAY_OFFSET, longValue); return 8; // bytes in long (= Long.SIZE / 8); } } @@ -947,20 +948,21 @@ public static int writeLong(final byte[] bytes, long longValue, int offset) { */ public static long readLong(final long memOffset) { if (UnsafeHolder.littleEndian) { - return Long.reverseBytes(Platform.getLong(null, memOffset)); + return Long.reverseBytes(UnsafeHolder.getUnsafe().getLong(null, memOffset)); } else { - return Platform.getLong(null, memOffset); + return UnsafeHolder.getUnsafe().getLong(null, memOffset); } } - public static long readLong(final byte[] bytes, int offset) { + public static long readLong(final byte[] bytes, long offset) { assert bytes != null; if (UnsafeHolder.littleEndian) { - return Long.reverseBytes(Platform.getLong(bytes, - offset + Platform.BYTE_ARRAY_OFFSET)); + return Long.reverseBytes(UnsafeHolder.getUnsafe().getLong(bytes, + offset + UnsafeHolder.BYTE_ARRAY_OFFSET)); } else { - return Platform.getLong(bytes, offset + Platform.BYTE_ARRAY_OFFSET); + return UnsafeHolder.getUnsafe().getLong(bytes, + offset + UnsafeHolder.BYTE_ARRAY_OFFSET); } } @@ -8175,116 +8177,6 @@ else if (offsetFromMap == 0) { /////////////////// PACKAGE VISIBLE METHODS /////////////////// - final UTF8String getAsUTF8String(final int index, - final byte[] bytes) throws StandardException { - final ColumnDescriptor cd = this.columns[index]; - final int offsetFromMap = this.positionMap[index]; - final long offsetAndWidth = getOffsetAndWidth(index, bytes, - offsetFromMap, cd, false); - if (offsetAndWidth >= 0) { - final int columnWidth = (int)offsetAndWidth; - final int offset = (int)(offsetAndWidth >>> Integer.SIZE); - return DataTypeUtilities.getAsUTF8String(bytes, offset, columnWidth, cd); - } else { - assert offsetAndWidth == OFFSET_AND_WIDTH_IS_NULL - || offsetAndWidth == OFFSET_AND_WIDTH_IS_DEFAULT : offsetAndWidth; - if (offsetAndWidth == OFFSET_AND_WIDTH_IS_NULL) { - return null; - } else { - final byte[] defaultBytes = cd.columnDefaultBytes; - if (defaultBytes != null) { - return UTF8String.fromAddress(defaultBytes, - Platform.BYTE_ARRAY_OFFSET, defaultBytes.length); - } else { - return null; - } - } - } - } - - final UTF8String getAsUTF8String(final int index, - final byte[][] byteArrays) throws StandardException { - final ColumnDescriptor cd = this.columns[index]; - if (!cd.isLob) { - return getAsUTF8String(index, byteArrays[0]); - } else { - final int offsetFromMap = this.positionMap[index]; - final byte[] bytes = offsetFromMap != 0 ? byteArrays[offsetFromMap] - : cd.columnDefaultBytes; - if (bytes != null) { - return DataTypeUtilities.getAsUTF8String(bytes, 0, bytes.length, cd); - } else { - return null; - } - } - } - - private UTF8String getAsUTF8String(final int index, - final UnsafeWrapper unsafe, final long memAddr, - final int bytesLen) throws StandardException { - final ColumnDescriptor cd = this.columns[index]; - final int offsetFromMap = this.positionMap[index]; - final long offsetAndWidth = getOffsetAndWidth(index, unsafe, memAddr, - bytesLen, offsetFromMap, cd); - if (offsetAndWidth >= 0) { - final int columnWidth = (int)offsetAndWidth; - final int offset = (int)(offsetAndWidth >>> Integer.SIZE); - return DataTypeUtilities.getAsUTF8String(memAddr + offset, - columnWidth, cd); - } else { - assert offsetAndWidth == OFFSET_AND_WIDTH_IS_NULL - || offsetAndWidth == OFFSET_AND_WIDTH_IS_DEFAULT : offsetAndWidth; - if (offsetAndWidth == OFFSET_AND_WIDTH_IS_NULL) { - return null; - } else { - final byte[] defaultBytes = cd.columnDefaultBytes; - if (defaultBytes != null) { - return UTF8String.fromAddress(defaultBytes, - Platform.BYTE_ARRAY_OFFSET, defaultBytes.length); - } else { - return null; - } - } - } - } - - final UTF8String getAsUTF8String(final int index, - @Unretained final OffHeapRow bytes) throws StandardException { - final UnsafeWrapper unsafe = UnsafeMemoryChunk.getUnsafeWrapper(); - final int bytesLen = bytes.getLength(); - final long memAddr = bytes.getUnsafeAddress(0, bytesLen); - return getAsUTF8String(index, unsafe, memAddr, bytesLen); - } - - final UTF8String getAsUTF8String(final int index, - @Unretained final OffHeapRowWithLobs byteArrays) - throws StandardException { - final ColumnDescriptor cd = this.columns[index]; - if (!cd.isLob) { - final UnsafeWrapper unsafe = UnsafeMemoryChunk.getUnsafeWrapper(); - final int bytesLen = byteArrays.getLength(); - final long memAddr = byteArrays.getUnsafeAddress(0, bytesLen); - return getAsUTF8String(index, unsafe, memAddr, bytesLen); - } else { - final int offsetFromMap = this.positionMap[index]; - final Object lob = offsetFromMap != 0 ? byteArrays - .getGfxdByteSource(offsetFromMap) : cd.columnDefaultBytes; - if (lob != null) { - if (lob instanceof byte[]) { - final byte[] bytes = (byte[])lob; - return DataTypeUtilities.getAsUTF8String(bytes, 0, bytes.length, cd); - } else { - final OffHeapByteSource bs = (OffHeapByteSource)lob; - final int bytesLen = bs.getLength(); - final long memAddr = bs.getUnsafeAddress(0, bytesLen); - return DataTypeUtilities.getAsUTF8String(memAddr, bytesLen, cd); - } - } else { - return null; - } - } - } - final String getAsString(final int index, final ColumnDescriptor cd, final byte[] bytes, final ResultWasNull wasNull) throws StandardException { final int offsetFromMap = this.positionMap[index]; @@ -10452,7 +10344,7 @@ final long getOffsetAndWidth(final int index, final byte[] bytes, * * @return returns a long containing the offset and column width */ - final long getOffsetAndWidth(final int index, final byte[] bytes, + public final long getOffsetAndWidth(final int index, final byte[] bytes, final int offsetFromMap, final ColumnDescriptor cd, final boolean truncateSpaces) { if (SanityManager.DEBUG) { @@ -10545,7 +10437,7 @@ final long getOffsetAndWidth(final int index, final UnsafeWrapper unsafe, * * @return returns a long containing the offset and column width */ - final long getOffsetAndWidth(final int index, final UnsafeWrapper unsafe, + public final long getOffsetAndWidth(final int index, final UnsafeWrapper unsafe, final long memAddr, final int bytesLen, final int offsetFromMap, final ColumnDescriptor cd, final boolean truncateSpaces) { if (SanityManager.DEBUG) { diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/BinaryDecimal.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/BinaryDecimal.java index 26f429fee..78c4dcc50 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/BinaryDecimal.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/BinaryDecimal.java @@ -53,6 +53,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more import com.gemstone.gemfire.DataSerializer; import com.gemstone.gemfire.internal.offheap.ByteSource; import com.gemstone.gemfire.internal.offheap.UnsafeMemoryChunk; +import com.gemstone.gemfire.internal.shared.unsafe.UnsafeHolder; // GemStone changes END import com.pivotal.gemfirexd.internal.iapi.error.StandardException; import com.pivotal.gemfirexd.internal.iapi.reference.SQLState; @@ -60,7 +61,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more import com.pivotal.gemfirexd.internal.iapi.services.sanity.SanityManager; import com.pivotal.gemfirexd.internal.shared.common.ResolverUtils; import com.pivotal.gemfirexd.internal.shared.common.StoredFormatIds; -import org.apache.spark.unsafe.Platform; /** * SQL DECIMAL using raw data. Provides the basis for the @@ -688,7 +688,7 @@ public int readBytes(final byte[] inBytes, int offset, public int readBytes(long memOffset, int columnWidth, ByteSource bs) { final int numBytes = columnWidth - 1; this.data2c = new byte[numBytes]; - this.sqlScale = Platform.getByte(null, memOffset++); + this.sqlScale = UnsafeHolder.getUnsafe().getByte(null, memOffset++); UnsafeMemoryChunk.readUnsafeBytes(memOffset, this.data2c, numBytes); return columnWidth; } diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/DataTypeUtilities.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/DataTypeUtilities.java index 1a00193a4..f0f9d3ebc 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/DataTypeUtilities.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/DataTypeUtilities.java @@ -60,8 +60,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more import com.pivotal.gemfirexd.internal.iapi.reference.SQLState; import com.pivotal.gemfirexd.internal.iapi.sql.dictionary.ColumnDescriptor; import com.pivotal.gemfirexd.internal.shared.common.StoredFormatIds; -import org.apache.spark.unsafe.Platform; -import org.apache.spark.unsafe.types.UTF8String; /** * A set of static utility methods for data types. @@ -269,51 +267,6 @@ public static int computeMaxWidth(int precision, int scale) { // GemStone changes BEGIN - /** - * Extract the given column from raw bytes as a UTF8String. - */ - public static UTF8String getAsUTF8String(final byte[] inBytes, - final int offset, final int columnWidth, final ColumnDescriptor cd) - throws StandardException { - - final DataTypeDescriptor dtd = cd.columnType; - final int formatID = dtd.getTypeId().getTypeFormatId(); - switch (formatID) { - case StoredFormatIds.CHAR_TYPE_ID: - case StoredFormatIds.LONGVARCHAR_TYPE_ID: - case StoredFormatIds.VARCHAR_TYPE_ID: - case StoredFormatIds.CLOB_TYPE_ID: - // TODO: SW: change format in SQLChar to be full UTF8 - // and below is broken for > 3-character UTF8 strings - return UTF8String.fromAddress(inBytes, - Platform.BYTE_ARRAY_OFFSET + offset, columnWidth); - default: - throw StandardException.newException(SQLState.LANG_FORMAT_EXCEPTION, - "UTF8String", cd.getColumnName()); - } - } - - /** - * Extract the given column from raw bytes as a UTF8String. - */ - public static UTF8String getAsUTF8String(final long memOffset, - final int columnWidth, final ColumnDescriptor cd) - throws StandardException { - - final DataTypeDescriptor dtd = cd.columnType; - final int formatID = dtd.getTypeId().getTypeFormatId(); - switch (formatID) { - case StoredFormatIds.CHAR_TYPE_ID: - case StoredFormatIds.LONGVARCHAR_TYPE_ID: - case StoredFormatIds.VARCHAR_TYPE_ID: - case StoredFormatIds.CLOB_TYPE_ID: - return UTF8String.fromAddress(null, memOffset, columnWidth); - default: - throw StandardException.newException(SQLState.LANG_FORMAT_EXCEPTION, - "UTF8String", cd.getColumnName()); - } - } - /** * Extract the given column from raw bytes as a string. */ diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/SQLBoolean.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/SQLBoolean.java index 1843b9801..72f6ffbff 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/SQLBoolean.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/SQLBoolean.java @@ -42,6 +42,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more import com.gemstone.gemfire.internal.DSCODE; import com.gemstone.gemfire.internal.offheap.ByteSource; +import com.gemstone.gemfire.internal.shared.unsafe.UnsafeHolder; import com.gemstone.gemfire.pdx.internal.unsafe.UnsafeWrapper; import com.pivotal.gemfirexd.internal.iapi.error.StandardException; import com.pivotal.gemfirexd.internal.iapi.reference.SQLState; @@ -51,7 +52,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more import com.pivotal.gemfirexd.internal.iapi.services.sanity.SanityManager; import com.pivotal.gemfirexd.internal.shared.common.ResolverUtils; import com.pivotal.gemfirexd.internal.shared.common.StoredFormatIds; -import org.apache.spark.unsafe.Platform; import java.io.DataInput; import java.io.DataOutput; @@ -1236,7 +1236,7 @@ public int readBytes(final byte[] inBytes, int offset, @Override public int readBytes(long memOffset, final int columnWidth, ByteSource bs) { assert columnWidth == 1: columnWidth; - this.value = (Platform.getByte(null, memOffset) == 1); + this.value = (UnsafeHolder.getUnsafe().getByte(null, memOffset) == 1); this.isnull = false; return 1; } diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/SQLDecimal.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/SQLDecimal.java index 8745a37f2..8212b7718 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/SQLDecimal.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/SQLDecimal.java @@ -46,6 +46,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more import com.gemstone.gemfire.internal.offheap.ByteSource; import com.gemstone.gemfire.internal.offheap.UnsafeMemoryChunk; import com.gemstone.gemfire.internal.shared.ClientSharedUtils; +import com.gemstone.gemfire.internal.shared.unsafe.UnsafeHolder; import com.gemstone.gemfire.pdx.internal.unsafe.UnsafeWrapper; import com.pivotal.gemfirexd.internal.engine.distributed.ByteArrayDataOutput; import com.pivotal.gemfirexd.internal.iapi.error.StandardException; @@ -57,7 +58,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more import com.pivotal.gemfirexd.internal.iapi.services.sanity.SanityManager; import com.pivotal.gemfirexd.internal.shared.common.ResolverUtils; import com.pivotal.gemfirexd.internal.shared.common.StoredFormatIds; -import org.apache.spark.unsafe.Platform; import java.math.BigDecimal; import java.math.BigInteger; @@ -1831,8 +1831,8 @@ public int readBytes(long memOffset, final int columnWidth, ByteSource bs) { // clear the previous value to ensure that the rawData value will be used this.value = null; this.rawData = new byte[numBytes]; - this.rawScale = Platform.getByte(null, memOffset++); - this.rawSig = Platform.getByte(null, memOffset++); + this.rawScale = UnsafeHolder.getUnsafe().getByte(null, memOffset++); + this.rawSig = UnsafeHolder.getUnsafe().getByte(null, memOffset++); UnsafeMemoryChunk.readUnsafeBytes(memOffset, this.rawData, numBytes); assert ((int)this.rawSig) == 0 || ((int)this.rawSig) == -1 || ((int)this.rawSig) == 1: ((int)this.rawSig) + " byte=" + this.rawSig; @@ -1892,8 +1892,8 @@ public static final BigDecimal getAsBigDecimal(final byte[] inBytes, static final BigDecimal getAsBigDecimal(long memOffset, final int columnWidth) { final int scale, signum; - scale = Platform.getByte(null, memOffset++); - signum = Platform.getByte(null, memOffset++); + scale = UnsafeHolder.getUnsafe().getByte(null, memOffset++); + signum = UnsafeHolder.getUnsafe().getByte(null, memOffset++); // we need to create intermediate byte[] since the package private // constructor of BigInteger that directly takes int[] is only available // in Sun JDK >= 1.6.0_20 diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/SQLTinyint.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/SQLTinyint.java index e5397637e..51f99df61 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/SQLTinyint.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/types/SQLTinyint.java @@ -42,6 +42,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more import com.gemstone.gemfire.internal.DSCODE; import com.gemstone.gemfire.internal.offheap.ByteSource; +import com.gemstone.gemfire.internal.shared.unsafe.UnsafeHolder; import com.gemstone.gemfire.pdx.internal.unsafe.UnsafeWrapper; import com.pivotal.gemfirexd.internal.iapi.error.StandardException; import com.pivotal.gemfirexd.internal.iapi.reference.SQLState; @@ -51,7 +52,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more import com.pivotal.gemfirexd.internal.iapi.services.sanity.SanityManager; import com.pivotal.gemfirexd.internal.shared.common.ResolverUtils; import com.pivotal.gemfirexd.internal.shared.common.StoredFormatIds; -import org.apache.spark.unsafe.Platform; import java.io.DataInput; import java.io.DataOutput; @@ -816,7 +816,7 @@ public int readBytes(final byte[] inBytes, int offset, @Override public int readBytes(long memOffset, final int columnWidth, ByteSource bs) { assert columnWidth == 1: columnWidth; - this.value = Platform.getByte(null, memOffset); + this.value = UnsafeHolder.getUnsafe().getByte(null, memOffset); return 1; } diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/impl/jdbc/EmbedDatabaseMetaData.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/impl/jdbc/EmbedDatabaseMetaData.java index 0d1b7e428..5bd1c872b 100644 --- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/impl/jdbc/EmbedDatabaseMetaData.java +++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/impl/jdbc/EmbedDatabaseMetaData.java @@ -2029,22 +2029,25 @@ private ResultSet doGetCols(String catalog, String schemaPattern, PreparedStatement s = getPreparedQuery(queryName); s.setString(1, swapNull(catalog)); s.setString(2, swapNull(schemaPattern)); - s.setString(3, swapNull(tableNamePattern)); - s.setString(4, swapNull(columnNamePattern)); + s.setString(3, swapNull(tableNamePattern)); + s.setString(4, swapNull(tableNamePattern)); + s.setString(5, swapNull(columnNamePattern)); // GemStone changes BEGIN // for #51194, using sysaliases - s.setString(5, swapNull(catalog)); - s.setString(6, swapNull(schemaPattern)); - s.setString(7, swapNull(tableNamePattern)); - s.setString(8, swapNull(columnNamePattern)); + s.setString(6, swapNull(catalog)); + s.setString(7, swapNull(schemaPattern)); + s.setString(8, swapNull(tableNamePattern)); + s.setString(9, swapNull(tableNamePattern)); + s.setString(10, swapNull(columnNamePattern)); // for hive external tables - s.setString(9, swapNull(schemaPattern)); - s.setString(10, swapNull(tableNamePattern)); - s.setString(11, swapNull(columnNamePattern)); + s.setString(11, swapNull(schemaPattern)); + s.setString(12, swapNull(tableNamePattern)); + s.setString(13, swapNull(columnNamePattern)); + s.setString(14, swapNull(tableNamePattern)); // for VTIs - s.setString(12, swapNull(schemaPattern)); - s.setString(13, swapNull(tableNamePattern)); - s.setString(14, swapNull(columnNamePattern)); + s.setString(15, swapNull(schemaPattern)); + s.setString(16, swapNull(tableNamePattern)); + s.setString(17, swapNull(columnNamePattern)); // GemStone changes END return s.executeQuery(); } @@ -2133,10 +2136,11 @@ public ResultSet getTablePrivileges(String catalog, String schemaPattern, s.setString(1, swapNull(catalog)); s.setString(2, swapNull(schemaPattern)); s.setString(3, swapNull(tableNamePattern)); - s.setString(4, swapNull(schemaPattern)); - s.setString(5, swapNull(tableNamePattern)); - s.setString(6, swapNull(schemaPattern)); - s.setString(7, swapNull(tableNamePattern)); + s.setString(4, swapNull(tableNamePattern)); + s.setString(5, swapNull(schemaPattern)); + s.setString(6, swapNull(tableNamePattern)); + s.setString(7, swapNull(schemaPattern)); + s.setString(8, swapNull(tableNamePattern)); return s.executeQuery(); } diff --git a/gemfirexd/prebuild/src/main/resources/com/pivotal/gemfirexd/internal/impl/jdbc/metadata.properties b/gemfirexd/prebuild/src/main/resources/com/pivotal/gemfirexd/internal/impl/jdbc/metadata.properties index 751a67e46..e7287c658 100644 --- a/gemfirexd/prebuild/src/main/resources/com/pivotal/gemfirexd/internal/impl/jdbc/metadata.properties +++ b/gemfirexd/prebuild/src/main/resources/com/pivotal/gemfirexd/internal/impl/jdbc/metadata.properties @@ -473,7 +473,7 @@ getColumns=\ WHERE \ ((1=1) OR ? IS NOT NULL) \ AND (S.SCHEMANAME LIKE ?) AND (T.TABLENAME LIKE ?) \ - AND (T.TABLENAME NOT LIKE 'SNAPPYSYS_INTERNAL____%') \ + AND (T.TABLENAME = ? OR T.TABLENAME NOT LIKE 'SNAPPYSYS_INTERNAL____%') \ AND T.TABLENAME NOT LIKE 'SYSXPLAIN%' AND T.TABLETYPE <> 'C' AND (C.COLUMNNAME LIKE ?) \ \ UNION \ @@ -557,7 +557,7 @@ UNION \ WHERE \ ((1=1) OR ? IS NOT NULL) \ AND (A.ALIASSCHEMANAME LIKE ?) AND (A.ALIAS LIKE ?) \ - AND (T.TABLENAME NOT LIKE 'SNAPPYSYS_INTERNAL____%') \ + AND (T.TABLENAME = ? OR T.TABLENAME NOT LIKE 'SNAPPYSYS_INTERNAL____%') \ AND T.TABLENAME NOT LIKE 'SYSXPLAIN%' AND T.TABLETYPE <> 'C' AND (C.COLUMNNAME LIKE ?) \ \ UNION \ @@ -615,7 +615,7 @@ UNION \ CAST ('NO' AS VARCHAR(128)) AS IS_AUTOINCREMENT \ FROM SYS.HIVETABLES \ WHERE (SCHEMANAME LIKE ? AND TABLENAME LIKE ? AND COLUMNNAME LIKE ?) \ - AND (TABLENAME NOT LIKE 'SNAPPYSYS_INTERNAL____%') \ + AND (TABLENAME = ? OR TABLENAME NOT LIKE 'SNAPPYSYS_INTERNAL____%') \ \ UNION \ \ @@ -735,7 +735,7 @@ getTablePrivileges=\ WHERE P.TABLEID = T.TABLEID AND S.SCHEMAID = T.SCHEMAID \ AND ((1=1) OR ? IS NOT NULL) \ AND (S.SCHEMANAME LIKE ?) AND (T.TABLENAME LIKE ?) AND T.TABLENAME NOT LIKE 'SYSXPLAIN%' \ - AND (T.TABLENAME NOT LIKE 'SNAPPYSYS_INTERNAL____%') \ + AND (T.TABLENAME = ? OR T.TABLENAME NOT LIKE 'SNAPPYSYS_INTERNAL____%') \ AND ((P.SELECTPRIV = 'y' AND X.PRIV = 'SELECT' AND X.GRANTABLE = 'NO') \ OR (P.SELECTPRIV = 'Y' AND X.PRIV = 'SELECT' AND X.GRANTABLE = 'YES') \ OR (P.SELECTPRIV = 'y' AND X.PRIV = 'SELECT' AND X.GRANTABLE = 'NO') \ diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/BucketOwners.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/BucketOwners.java index 2510ae91d..2903cced4 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/BucketOwners.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/BucketOwners.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class BucketOwners implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BucketOwners"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogFunctionObject.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogFunctionObject.java index c256a04a5..e7a088376 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogFunctionObject.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogFunctionObject.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class CatalogFunctionObject implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CatalogFunctionObject"); @@ -628,13 +628,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogFunctionObje case 4: // RESOURCES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list382 = iprot.readListBegin(); - struct.resources = new ArrayList(_list382.size); - String _elem383; - for (int _i384 = 0; _i384 < _list382.size; ++_i384) + org.apache.thrift.protocol.TList _list392 = iprot.readListBegin(); + struct.resources = new ArrayList(_list392.size); + String _elem393; + for (int _i394 = 0; _i394 < _list392.size; ++_i394) { - _elem383 = iprot.readString(); - struct.resources.add(_elem383); + _elem393 = iprot.readString(); + struct.resources.add(_elem393); } iprot.readListEnd(); } @@ -679,9 +679,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogFunctionObj oprot.writeFieldBegin(RESOURCES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.resources.size())); - for (String _iter385 : struct.resources) + for (String _iter395 : struct.resources) { - oprot.writeString(_iter385); + oprot.writeString(_iter395); } oprot.writeListEnd(); } @@ -708,9 +708,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CatalogFunctionObje oprot.writeString(struct.className); { oprot.writeI32(struct.resources.size()); - for (String _iter386 : struct.resources) + for (String _iter396 : struct.resources) { - oprot.writeString(_iter386); + oprot.writeString(_iter396); } } BitSet optionals = new BitSet(); @@ -731,13 +731,13 @@ public void read(org.apache.thrift.protocol.TProtocol prot, CatalogFunctionObjec struct.className = iprot.readString(); struct.setClassNameIsSet(true); { - org.apache.thrift.protocol.TList _list387 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.resources = new ArrayList(_list387.size); - String _elem388; - for (int _i389 = 0; _i389 < _list387.size; ++_i389) + org.apache.thrift.protocol.TList _list397 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.resources = new ArrayList(_list397.size); + String _elem398; + for (int _i399 = 0; _i399 < _list397.size; ++_i399) { - _elem388 = iprot.readString(); - struct.resources.add(_elem388); + _elem398 = iprot.readString(); + struct.resources.add(_elem398); } } struct.setResourcesIsSet(true); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogMetadataDetails.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogMetadataDetails.java index b1a4260ef..d070f6810 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogMetadataDetails.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogMetadataDetails.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class CatalogMetadataDetails implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CatalogMetadataDetails"); @@ -48,6 +48,8 @@ public class CatalogMetadataDetails implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -65,6 +67,8 @@ public class CatalogMetadataDetails implements org.apache.thrift.TBase catalogPartitions; // optional + public CatalogStats catalogStats; // optional + public String newSchema; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -77,7 +81,9 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { CATALOG_SCHEMA((short)7, "catalogSchema"), CATALOG_TABLE((short)8, "catalogTable"), CATALOG_FUNCTION((short)9, "catalogFunction"), - CATALOG_PARTITIONS((short)10, "catalogPartitions"); + CATALOG_PARTITIONS((short)10, "catalogPartitions"), + CATALOG_STATS((short)11, "catalogStats"), + NEW_SCHEMA((short)12, "newSchema"); private static final Map byName = new HashMap(); @@ -112,6 +118,10 @@ public static _Fields findByThriftId(int fieldId) { return CATALOG_FUNCTION; case 10: // CATALOG_PARTITIONS return CATALOG_PARTITIONS; + case 11: // CATALOG_STATS + return CATALOG_STATS; + case 12: // NEW_SCHEMA + return NEW_SCHEMA; default: return null; } @@ -155,7 +165,7 @@ public String getFieldName() { private static final int __CATALOGSCHEMAVERSION_ISSET_ID = 0; private static final int __EXISTS_ISSET_ID = 1; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.NAMES,_Fields.PROPERTIES,_Fields.NEW_PROPERTIES,_Fields.CATALOG_SCHEMA_VERSION,_Fields.EXISTS,_Fields.OTHER_FLAGS,_Fields.CATALOG_SCHEMA,_Fields.CATALOG_TABLE,_Fields.CATALOG_FUNCTION,_Fields.CATALOG_PARTITIONS}; + private static final _Fields optionals[] = {_Fields.NAMES,_Fields.PROPERTIES,_Fields.NEW_PROPERTIES,_Fields.CATALOG_SCHEMA_VERSION,_Fields.EXISTS,_Fields.OTHER_FLAGS,_Fields.CATALOG_SCHEMA,_Fields.CATALOG_TABLE,_Fields.CATALOG_FUNCTION,_Fields.CATALOG_PARTITIONS,_Fields.CATALOG_STATS,_Fields.NEW_SCHEMA}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -188,6 +198,10 @@ public String getFieldName() { tmpMap.put(_Fields.CATALOG_PARTITIONS, new org.apache.thrift.meta_data.FieldMetaData("catalogPartitions", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, CatalogPartitionObject.class)))); + tmpMap.put(_Fields.CATALOG_STATS, new org.apache.thrift.meta_data.FieldMetaData("catalogStats", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, CatalogStats.class))); + tmpMap.put(_Fields.NEW_SCHEMA, new org.apache.thrift.meta_data.FieldMetaData("newSchema", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CatalogMetadataDetails.class, metaDataMap); } @@ -242,6 +256,12 @@ public CatalogMetadataDetails(CatalogMetadataDetails other) { } this.catalogPartitions = __this__catalogPartitions; } + if (other.isSetCatalogStats()) { + this.catalogStats = new CatalogStats(other.catalogStats); + } + if (other.isSetNewSchema()) { + this.newSchema = other.newSchema; + } } public CatalogMetadataDetails deepCopy() { @@ -262,6 +282,8 @@ public void clear() { this.catalogTable = null; this.catalogFunction = null; this.catalogPartitions = null; + this.catalogStats = null; + this.newSchema = null; } public int getNamesSize() { @@ -577,6 +599,54 @@ public void setCatalogPartitionsIsSet(boolean value) { } } + public CatalogStats getCatalogStats() { + return this.catalogStats; + } + + public CatalogMetadataDetails setCatalogStats(CatalogStats catalogStats) { + this.catalogStats = catalogStats; + return this; + } + + public void unsetCatalogStats() { + this.catalogStats = null; + } + + /** Returns true if field catalogStats is set (has been assigned a value) and false otherwise */ + public boolean isSetCatalogStats() { + return this.catalogStats != null; + } + + public void setCatalogStatsIsSet(boolean value) { + if (!value) { + this.catalogStats = null; + } + } + + public String getNewSchema() { + return this.newSchema; + } + + public CatalogMetadataDetails setNewSchema(String newSchema) { + this.newSchema = newSchema; + return this; + } + + public void unsetNewSchema() { + this.newSchema = null; + } + + /** Returns true if field newSchema is set (has been assigned a value) and false otherwise */ + public boolean isSetNewSchema() { + return this.newSchema != null; + } + + public void setNewSchemaIsSet(boolean value) { + if (!value) { + this.newSchema = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case NAMES: @@ -659,6 +729,22 @@ public void setFieldValue(_Fields field, Object value) { } break; + case CATALOG_STATS: + if (value == null) { + unsetCatalogStats(); + } else { + setCatalogStats((CatalogStats)value); + } + break; + + case NEW_SCHEMA: + if (value == null) { + unsetNewSchema(); + } else { + setNewSchema((String)value); + } + break; + } } @@ -694,6 +780,12 @@ public Object getFieldValue(_Fields field) { case CATALOG_PARTITIONS: return getCatalogPartitions(); + case CATALOG_STATS: + return getCatalogStats(); + + case NEW_SCHEMA: + return getNewSchema(); + } throw new IllegalStateException(); } @@ -725,6 +817,10 @@ public boolean isSet(_Fields field) { return isSetCatalogFunction(); case CATALOG_PARTITIONS: return isSetCatalogPartitions(); + case CATALOG_STATS: + return isSetCatalogStats(); + case NEW_SCHEMA: + return isSetNewSchema(); } throw new IllegalStateException(); } @@ -832,6 +928,24 @@ public boolean equals(CatalogMetadataDetails that) { return false; } + boolean this_present_catalogStats = true && this.isSetCatalogStats(); + boolean that_present_catalogStats = true && that.isSetCatalogStats(); + if (this_present_catalogStats || that_present_catalogStats) { + if (!(this_present_catalogStats && that_present_catalogStats)) + return false; + if (!this.catalogStats.equals(that.catalogStats)) + return false; + } + + boolean this_present_newSchema = true && this.isSetNewSchema(); + boolean that_present_newSchema = true && that.isSetNewSchema(); + if (this_present_newSchema || that_present_newSchema) { + if (!(this_present_newSchema && that_present_newSchema)) + return false; + if (!this.newSchema.equals(that.newSchema)) + return false; + } + return true; } @@ -889,6 +1003,16 @@ public int hashCode() { if (present_catalogPartitions) list.add(catalogPartitions); + boolean present_catalogStats = true && (isSetCatalogStats()); + list.add(present_catalogStats); + if (present_catalogStats) + list.add(catalogStats); + + boolean present_newSchema = true && (isSetNewSchema()); + list.add(present_newSchema); + if (present_newSchema) + list.add(newSchema); + return list.hashCode(); } @@ -1000,6 +1124,26 @@ public int compareTo(CatalogMetadataDetails other) { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetCatalogStats()).compareTo(other.isSetCatalogStats()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetCatalogStats()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.catalogStats, other.catalogStats); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetNewSchema()).compareTo(other.isSetNewSchema()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetNewSchema()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.newSchema, other.newSchema); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -1111,6 +1255,26 @@ public String toString() { } first = false; } + if (isSetCatalogStats()) { + if (!first) sb.append(", "); + sb.append("catalogStats:"); + if (this.catalogStats == null) { + sb.append("null"); + } else { + sb.append(this.catalogStats); + } + first = false; + } + if (isSetNewSchema()) { + if (!first) sb.append(", "); + sb.append("newSchema:"); + if (this.newSchema == null) { + sb.append("null"); + } else { + sb.append(this.newSchema); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -1127,6 +1291,9 @@ public void validate() throws org.apache.thrift.TException { if (catalogFunction != null) { catalogFunction.validate(); } + if (catalogStats != null) { + catalogStats.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -1168,13 +1335,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogMetadataDeta case 1: // NAMES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list420 = iprot.readListBegin(); - struct.names = new ArrayList(_list420.size); - String _elem421; - for (int _i422 = 0; _i422 < _list420.size; ++_i422) + org.apache.thrift.protocol.TList _list430 = iprot.readListBegin(); + struct.names = new ArrayList(_list430.size); + String _elem431; + for (int _i432 = 0; _i432 < _list430.size; ++_i432) { - _elem421 = iprot.readString(); - struct.names.add(_elem421); + _elem431 = iprot.readString(); + struct.names.add(_elem431); } iprot.readListEnd(); } @@ -1186,25 +1353,25 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogMetadataDeta case 2: // PROPERTIES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list423 = iprot.readListBegin(); - struct.properties = new ArrayList>(_list423.size); - Map _elem424; - for (int _i425 = 0; _i425 < _list423.size; ++_i425) + org.apache.thrift.protocol.TList _list433 = iprot.readListBegin(); + struct.properties = new ArrayList>(_list433.size); + Map _elem434; + for (int _i435 = 0; _i435 < _list433.size; ++_i435) { { - org.apache.thrift.protocol.TMap _map426 = iprot.readMapBegin(); - _elem424 = new HashMap(2*_map426.size); - String _key427; - String _val428; - for (int _i429 = 0; _i429 < _map426.size; ++_i429) + org.apache.thrift.protocol.TMap _map436 = iprot.readMapBegin(); + _elem434 = new HashMap(2*_map436.size); + String _key437; + String _val438; + for (int _i439 = 0; _i439 < _map436.size; ++_i439) { - _key427 = iprot.readString(); - _val428 = iprot.readString(); - _elem424.put(_key427, _val428); + _key437 = iprot.readString(); + _val438 = iprot.readString(); + _elem434.put(_key437, _val438); } iprot.readMapEnd(); } - struct.properties.add(_elem424); + struct.properties.add(_elem434); } iprot.readListEnd(); } @@ -1216,25 +1383,25 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogMetadataDeta case 3: // NEW_PROPERTIES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list430 = iprot.readListBegin(); - struct.newProperties = new ArrayList>(_list430.size); - Map _elem431; - for (int _i432 = 0; _i432 < _list430.size; ++_i432) + org.apache.thrift.protocol.TList _list440 = iprot.readListBegin(); + struct.newProperties = new ArrayList>(_list440.size); + Map _elem441; + for (int _i442 = 0; _i442 < _list440.size; ++_i442) { { - org.apache.thrift.protocol.TMap _map433 = iprot.readMapBegin(); - _elem431 = new HashMap(2*_map433.size); - String _key434; - String _val435; - for (int _i436 = 0; _i436 < _map433.size; ++_i436) + org.apache.thrift.protocol.TMap _map443 = iprot.readMapBegin(); + _elem441 = new HashMap(2*_map443.size); + String _key444; + String _val445; + for (int _i446 = 0; _i446 < _map443.size; ++_i446) { - _key434 = iprot.readString(); - _val435 = iprot.readString(); - _elem431.put(_key434, _val435); + _key444 = iprot.readString(); + _val445 = iprot.readString(); + _elem441.put(_key444, _val445); } iprot.readMapEnd(); } - struct.newProperties.add(_elem431); + struct.newProperties.add(_elem441); } iprot.readListEnd(); } @@ -1262,13 +1429,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogMetadataDeta case 6: // OTHER_FLAGS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list437 = iprot.readListBegin(); - struct.otherFlags = new ArrayList(_list437.size); - int _elem438; - for (int _i439 = 0; _i439 < _list437.size; ++_i439) + org.apache.thrift.protocol.TList _list447 = iprot.readListBegin(); + struct.otherFlags = new ArrayList(_list447.size); + int _elem448; + for (int _i449 = 0; _i449 < _list447.size; ++_i449) { - _elem438 = iprot.readI32(); - struct.otherFlags.add(_elem438); + _elem448 = iprot.readI32(); + struct.otherFlags.add(_elem448); } iprot.readListEnd(); } @@ -1307,14 +1474,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogMetadataDeta case 10: // CATALOG_PARTITIONS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list440 = iprot.readListBegin(); - struct.catalogPartitions = new ArrayList(_list440.size); - CatalogPartitionObject _elem441; - for (int _i442 = 0; _i442 < _list440.size; ++_i442) + org.apache.thrift.protocol.TList _list450 = iprot.readListBegin(); + struct.catalogPartitions = new ArrayList(_list450.size); + CatalogPartitionObject _elem451; + for (int _i452 = 0; _i452 < _list450.size; ++_i452) { - _elem441 = new CatalogPartitionObject(); - _elem441.read(iprot); - struct.catalogPartitions.add(_elem441); + _elem451 = new CatalogPartitionObject(); + _elem451.read(iprot); + struct.catalogPartitions.add(_elem451); } iprot.readListEnd(); } @@ -1323,6 +1490,23 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogMetadataDeta org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 11: // CATALOG_STATS + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.catalogStats = new CatalogStats(); + struct.catalogStats.read(iprot); + struct.setCatalogStatsIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 12: // NEW_SCHEMA + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.newSchema = iprot.readString(); + struct.setNewSchemaIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1343,9 +1527,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogMetadataDet oprot.writeFieldBegin(NAMES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.names.size())); - for (String _iter443 : struct.names) + for (String _iter453 : struct.names) { - oprot.writeString(_iter443); + oprot.writeString(_iter453); } oprot.writeListEnd(); } @@ -1357,14 +1541,14 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogMetadataDet oprot.writeFieldBegin(PROPERTIES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.MAP, struct.properties.size())); - for (Map _iter444 : struct.properties) + for (Map _iter454 : struct.properties) { { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, _iter444.size())); - for (Map.Entry _iter445 : _iter444.entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, _iter454.size())); + for (Map.Entry _iter455 : _iter454.entrySet()) { - oprot.writeString(_iter445.getKey()); - oprot.writeString(_iter445.getValue()); + oprot.writeString(_iter455.getKey()); + oprot.writeString(_iter455.getValue()); } oprot.writeMapEnd(); } @@ -1379,14 +1563,14 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogMetadataDet oprot.writeFieldBegin(NEW_PROPERTIES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.MAP, struct.newProperties.size())); - for (Map _iter446 : struct.newProperties) + for (Map _iter456 : struct.newProperties) { { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, _iter446.size())); - for (Map.Entry _iter447 : _iter446.entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, _iter456.size())); + for (Map.Entry _iter457 : _iter456.entrySet()) { - oprot.writeString(_iter447.getKey()); - oprot.writeString(_iter447.getValue()); + oprot.writeString(_iter457.getKey()); + oprot.writeString(_iter457.getValue()); } oprot.writeMapEnd(); } @@ -1411,9 +1595,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogMetadataDet oprot.writeFieldBegin(OTHER_FLAGS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.otherFlags.size())); - for (int _iter448 : struct.otherFlags) + for (int _iter458 : struct.otherFlags) { - oprot.writeI32(_iter448); + oprot.writeI32(_iter458); } oprot.writeListEnd(); } @@ -1446,15 +1630,29 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogMetadataDet oprot.writeFieldBegin(CATALOG_PARTITIONS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.catalogPartitions.size())); - for (CatalogPartitionObject _iter449 : struct.catalogPartitions) + for (CatalogPartitionObject _iter459 : struct.catalogPartitions) { - _iter449.write(oprot); + _iter459.write(oprot); } oprot.writeListEnd(); } oprot.writeFieldEnd(); } } + if (struct.catalogStats != null) { + if (struct.isSetCatalogStats()) { + oprot.writeFieldBegin(CATALOG_STATS_FIELD_DESC); + struct.catalogStats.write(oprot); + oprot.writeFieldEnd(); + } + } + if (struct.newSchema != null) { + if (struct.isSetNewSchema()) { + oprot.writeFieldBegin(NEW_SCHEMA_FIELD_DESC); + oprot.writeString(struct.newSchema); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1503,27 +1701,33 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CatalogMetadataDeta if (struct.isSetCatalogPartitions()) { optionals.set(9); } - oprot.writeBitSet(optionals, 10); + if (struct.isSetCatalogStats()) { + optionals.set(10); + } + if (struct.isSetNewSchema()) { + optionals.set(11); + } + oprot.writeBitSet(optionals, 12); if (struct.isSetNames()) { { oprot.writeI32(struct.names.size()); - for (String _iter450 : struct.names) + for (String _iter460 : struct.names) { - oprot.writeString(_iter450); + oprot.writeString(_iter460); } } } if (struct.isSetProperties()) { { oprot.writeI32(struct.properties.size()); - for (Map _iter451 : struct.properties) + for (Map _iter461 : struct.properties) { { - oprot.writeI32(_iter451.size()); - for (Map.Entry _iter452 : _iter451.entrySet()) + oprot.writeI32(_iter461.size()); + for (Map.Entry _iter462 : _iter461.entrySet()) { - oprot.writeString(_iter452.getKey()); - oprot.writeString(_iter452.getValue()); + oprot.writeString(_iter462.getKey()); + oprot.writeString(_iter462.getValue()); } } } @@ -1532,14 +1736,14 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CatalogMetadataDeta if (struct.isSetNewProperties()) { { oprot.writeI32(struct.newProperties.size()); - for (Map _iter453 : struct.newProperties) + for (Map _iter463 : struct.newProperties) { { - oprot.writeI32(_iter453.size()); - for (Map.Entry _iter454 : _iter453.entrySet()) + oprot.writeI32(_iter463.size()); + for (Map.Entry _iter464 : _iter463.entrySet()) { - oprot.writeString(_iter454.getKey()); - oprot.writeString(_iter454.getValue()); + oprot.writeString(_iter464.getKey()); + oprot.writeString(_iter464.getValue()); } } } @@ -1554,9 +1758,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CatalogMetadataDeta if (struct.isSetOtherFlags()) { { oprot.writeI32(struct.otherFlags.size()); - for (int _iter455 : struct.otherFlags) + for (int _iter465 : struct.otherFlags) { - oprot.writeI32(_iter455); + oprot.writeI32(_iter465); } } } @@ -1572,75 +1776,81 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CatalogMetadataDeta if (struct.isSetCatalogPartitions()) { { oprot.writeI32(struct.catalogPartitions.size()); - for (CatalogPartitionObject _iter456 : struct.catalogPartitions) + for (CatalogPartitionObject _iter466 : struct.catalogPartitions) { - _iter456.write(oprot); + _iter466.write(oprot); } } } + if (struct.isSetCatalogStats()) { + struct.catalogStats.write(oprot); + } + if (struct.isSetNewSchema()) { + oprot.writeString(struct.newSchema); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, CatalogMetadataDetails struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(10); + BitSet incoming = iprot.readBitSet(12); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list457 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.names = new ArrayList(_list457.size); - String _elem458; - for (int _i459 = 0; _i459 < _list457.size; ++_i459) + org.apache.thrift.protocol.TList _list467 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.names = new ArrayList(_list467.size); + String _elem468; + for (int _i469 = 0; _i469 < _list467.size; ++_i469) { - _elem458 = iprot.readString(); - struct.names.add(_elem458); + _elem468 = iprot.readString(); + struct.names.add(_elem468); } } struct.setNamesIsSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list460 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.properties = new ArrayList>(_list460.size); - Map _elem461; - for (int _i462 = 0; _i462 < _list460.size; ++_i462) + org.apache.thrift.protocol.TList _list470 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.properties = new ArrayList>(_list470.size); + Map _elem471; + for (int _i472 = 0; _i472 < _list470.size; ++_i472) { { - org.apache.thrift.protocol.TMap _map463 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - _elem461 = new HashMap(2*_map463.size); - String _key464; - String _val465; - for (int _i466 = 0; _i466 < _map463.size; ++_i466) + org.apache.thrift.protocol.TMap _map473 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + _elem471 = new HashMap(2*_map473.size); + String _key474; + String _val475; + for (int _i476 = 0; _i476 < _map473.size; ++_i476) { - _key464 = iprot.readString(); - _val465 = iprot.readString(); - _elem461.put(_key464, _val465); + _key474 = iprot.readString(); + _val475 = iprot.readString(); + _elem471.put(_key474, _val475); } } - struct.properties.add(_elem461); + struct.properties.add(_elem471); } } struct.setPropertiesIsSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list467 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.newProperties = new ArrayList>(_list467.size); - Map _elem468; - for (int _i469 = 0; _i469 < _list467.size; ++_i469) + org.apache.thrift.protocol.TList _list477 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.newProperties = new ArrayList>(_list477.size); + Map _elem478; + for (int _i479 = 0; _i479 < _list477.size; ++_i479) { { - org.apache.thrift.protocol.TMap _map470 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - _elem468 = new HashMap(2*_map470.size); - String _key471; - String _val472; - for (int _i473 = 0; _i473 < _map470.size; ++_i473) + org.apache.thrift.protocol.TMap _map480 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + _elem478 = new HashMap(2*_map480.size); + String _key481; + String _val482; + for (int _i483 = 0; _i483 < _map480.size; ++_i483) { - _key471 = iprot.readString(); - _val472 = iprot.readString(); - _elem468.put(_key471, _val472); + _key481 = iprot.readString(); + _val482 = iprot.readString(); + _elem478.put(_key481, _val482); } } - struct.newProperties.add(_elem468); + struct.newProperties.add(_elem478); } } struct.setNewPropertiesIsSet(true); @@ -1655,13 +1865,13 @@ public void read(org.apache.thrift.protocol.TProtocol prot, CatalogMetadataDetai } if (incoming.get(5)) { { - org.apache.thrift.protocol.TList _list474 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.otherFlags = new ArrayList(_list474.size); - int _elem475; - for (int _i476 = 0; _i476 < _list474.size; ++_i476) + org.apache.thrift.protocol.TList _list484 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.otherFlags = new ArrayList(_list484.size); + int _elem485; + for (int _i486 = 0; _i486 < _list484.size; ++_i486) { - _elem475 = iprot.readI32(); - struct.otherFlags.add(_elem475); + _elem485 = iprot.readI32(); + struct.otherFlags.add(_elem485); } } struct.setOtherFlagsIsSet(true); @@ -1683,18 +1893,27 @@ public void read(org.apache.thrift.protocol.TProtocol prot, CatalogMetadataDetai } if (incoming.get(9)) { { - org.apache.thrift.protocol.TList _list477 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.catalogPartitions = new ArrayList(_list477.size); - CatalogPartitionObject _elem478; - for (int _i479 = 0; _i479 < _list477.size; ++_i479) + org.apache.thrift.protocol.TList _list487 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.catalogPartitions = new ArrayList(_list487.size); + CatalogPartitionObject _elem488; + for (int _i489 = 0; _i489 < _list487.size; ++_i489) { - _elem478 = new CatalogPartitionObject(); - _elem478.read(iprot); - struct.catalogPartitions.add(_elem478); + _elem488 = new CatalogPartitionObject(); + _elem488.read(iprot); + struct.catalogPartitions.add(_elem488); } } struct.setCatalogPartitionsIsSet(true); } + if (incoming.get(10)) { + struct.catalogStats = new CatalogStats(); + struct.catalogStats.read(iprot); + struct.setCatalogStatsIsSet(true); + } + if (incoming.get(11)) { + struct.newSchema = iprot.readString(); + struct.setNewSchemaIsSet(true); + } } } diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogMetadataRequest.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogMetadataRequest.java index b55d93336..be584fd09 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogMetadataRequest.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogMetadataRequest.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class CatalogMetadataRequest implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CatalogMetadataRequest"); @@ -521,15 +521,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogMetadataRequ case 3: // PROPERTIES if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map410 = iprot.readMapBegin(); - struct.properties = new HashMap(2*_map410.size); - String _key411; - String _val412; - for (int _i413 = 0; _i413 < _map410.size; ++_i413) + org.apache.thrift.protocol.TMap _map420 = iprot.readMapBegin(); + struct.properties = new HashMap(2*_map420.size); + String _key421; + String _val422; + for (int _i423 = 0; _i423 < _map420.size; ++_i423) { - _key411 = iprot.readString(); - _val412 = iprot.readString(); - struct.properties.put(_key411, _val412); + _key421 = iprot.readString(); + _val422 = iprot.readString(); + struct.properties.put(_key421, _val422); } iprot.readMapEnd(); } @@ -572,10 +572,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogMetadataReq oprot.writeFieldBegin(PROPERTIES_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.properties.size())); - for (Map.Entry _iter414 : struct.properties.entrySet()) + for (Map.Entry _iter424 : struct.properties.entrySet()) { - oprot.writeString(_iter414.getKey()); - oprot.writeString(_iter414.getValue()); + oprot.writeString(_iter424.getKey()); + oprot.writeString(_iter424.getValue()); } oprot.writeMapEnd(); } @@ -619,10 +619,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CatalogMetadataRequ if (struct.isSetProperties()) { { oprot.writeI32(struct.properties.size()); - for (Map.Entry _iter415 : struct.properties.entrySet()) + for (Map.Entry _iter425 : struct.properties.entrySet()) { - oprot.writeString(_iter415.getKey()); - oprot.writeString(_iter415.getValue()); + oprot.writeString(_iter425.getKey()); + oprot.writeString(_iter425.getValue()); } } } @@ -642,15 +642,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, CatalogMetadataReque } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map416 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.properties = new HashMap(2*_map416.size); - String _key417; - String _val418; - for (int _i419 = 0; _i419 < _map416.size; ++_i419) + org.apache.thrift.protocol.TMap _map426 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.properties = new HashMap(2*_map426.size); + String _key427; + String _val428; + for (int _i429 = 0; _i429 < _map426.size; ++_i429) { - _key417 = iprot.readString(); - _val418 = iprot.readString(); - struct.properties.put(_key417, _val418); + _key427 = iprot.readString(); + _val428 = iprot.readString(); + struct.properties.put(_key427, _val428); } } struct.setPropertiesIsSet(true); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogPartitionObject.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogPartitionObject.java index 6fdcc5335..0cdeba8cd 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogPartitionObject.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogPartitionObject.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class CatalogPartitionObject implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CatalogPartitionObject"); @@ -535,15 +535,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogPartitionObj case 1: // SPEC if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map390 = iprot.readMapBegin(); - struct.spec = new HashMap(2*_map390.size); - String _key391; - String _val392; - for (int _i393 = 0; _i393 < _map390.size; ++_i393) + org.apache.thrift.protocol.TMap _map400 = iprot.readMapBegin(); + struct.spec = new HashMap(2*_map400.size); + String _key401; + String _val402; + for (int _i403 = 0; _i403 < _map400.size; ++_i403) { - _key391 = iprot.readString(); - _val392 = iprot.readString(); - struct.spec.put(_key391, _val392); + _key401 = iprot.readString(); + _val402 = iprot.readString(); + struct.spec.put(_key401, _val402); } iprot.readMapEnd(); } @@ -564,15 +564,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogPartitionObj case 3: // PARAMETERS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map394 = iprot.readMapBegin(); - struct.parameters = new HashMap(2*_map394.size); - String _key395; - String _val396; - for (int _i397 = 0; _i397 < _map394.size; ++_i397) + org.apache.thrift.protocol.TMap _map404 = iprot.readMapBegin(); + struct.parameters = new HashMap(2*_map404.size); + String _key405; + String _val406; + for (int _i407 = 0; _i407 < _map404.size; ++_i407) { - _key395 = iprot.readString(); - _val396 = iprot.readString(); - struct.parameters.put(_key395, _val396); + _key405 = iprot.readString(); + _val406 = iprot.readString(); + struct.parameters.put(_key405, _val406); } iprot.readMapEnd(); } @@ -600,10 +600,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogPartitionOb oprot.writeFieldBegin(SPEC_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.spec.size())); - for (Map.Entry _iter398 : struct.spec.entrySet()) + for (Map.Entry _iter408 : struct.spec.entrySet()) { - oprot.writeString(_iter398.getKey()); - oprot.writeString(_iter398.getValue()); + oprot.writeString(_iter408.getKey()); + oprot.writeString(_iter408.getValue()); } oprot.writeMapEnd(); } @@ -618,10 +618,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogPartitionOb oprot.writeFieldBegin(PARAMETERS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.parameters.size())); - for (Map.Entry _iter399 : struct.parameters.entrySet()) + for (Map.Entry _iter409 : struct.parameters.entrySet()) { - oprot.writeString(_iter399.getKey()); - oprot.writeString(_iter399.getValue()); + oprot.writeString(_iter409.getKey()); + oprot.writeString(_iter409.getValue()); } oprot.writeMapEnd(); } @@ -646,19 +646,19 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CatalogPartitionObj TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.spec.size()); - for (Map.Entry _iter400 : struct.spec.entrySet()) + for (Map.Entry _iter410 : struct.spec.entrySet()) { - oprot.writeString(_iter400.getKey()); - oprot.writeString(_iter400.getValue()); + oprot.writeString(_iter410.getKey()); + oprot.writeString(_iter410.getValue()); } } struct.storage.write(oprot); { oprot.writeI32(struct.parameters.size()); - for (Map.Entry _iter401 : struct.parameters.entrySet()) + for (Map.Entry _iter411 : struct.parameters.entrySet()) { - oprot.writeString(_iter401.getKey()); - oprot.writeString(_iter401.getValue()); + oprot.writeString(_iter411.getKey()); + oprot.writeString(_iter411.getValue()); } } } @@ -667,15 +667,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CatalogPartitionObj public void read(org.apache.thrift.protocol.TProtocol prot, CatalogPartitionObject struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TMap _map402 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.spec = new HashMap(2*_map402.size); - String _key403; - String _val404; - for (int _i405 = 0; _i405 < _map402.size; ++_i405) + org.apache.thrift.protocol.TMap _map412 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.spec = new HashMap(2*_map412.size); + String _key413; + String _val414; + for (int _i415 = 0; _i415 < _map412.size; ++_i415) { - _key403 = iprot.readString(); - _val404 = iprot.readString(); - struct.spec.put(_key403, _val404); + _key413 = iprot.readString(); + _val414 = iprot.readString(); + struct.spec.put(_key413, _val414); } } struct.setSpecIsSet(true); @@ -683,15 +683,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, CatalogPartitionObje struct.storage.read(iprot); struct.setStorageIsSet(true); { - org.apache.thrift.protocol.TMap _map406 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.parameters = new HashMap(2*_map406.size); - String _key407; - String _val408; - for (int _i409 = 0; _i409 < _map406.size; ++_i409) + org.apache.thrift.protocol.TMap _map416 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.parameters = new HashMap(2*_map416.size); + String _key417; + String _val418; + for (int _i419 = 0; _i419 < _map416.size; ++_i419) { - _key407 = iprot.readString(); - _val408 = iprot.readString(); - struct.parameters.put(_key407, _val408); + _key417 = iprot.readString(); + _val418 = iprot.readString(); + struct.parameters.put(_key417, _val418); } } struct.setParametersIsSet(true); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogSchemaObject.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogSchemaObject.java index 1ed7a00e6..bb34a2040 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogSchemaObject.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogSchemaObject.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class CatalogSchemaObject implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CatalogSchemaObject"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogStats.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogStats.java new file mode 100644 index 000000000..5603838a2 --- /dev/null +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogStats.java @@ -0,0 +1,688 @@ +/** + * Autogenerated by Thrift Compiler (0.9.3) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package io.snappydata.thrift; + +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import org.apache.thrift.async.AsyncMethodCallback; +import org.apache.thrift.server.AbstractNonblockingServer.*; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; +import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; +import java.util.EnumSet; +import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import javax.annotation.Generated; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") +public class CatalogStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CatalogStats"); + + private static final org.apache.thrift.protocol.TField SIZE_IN_BYTES_FIELD_DESC = new org.apache.thrift.protocol.TField("sizeInBytes", org.apache.thrift.protocol.TType.I64, (short)1); + private static final org.apache.thrift.protocol.TField ROW_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("rowCount", org.apache.thrift.protocol.TType.I64, (short)2); + private static final org.apache.thrift.protocol.TField COL_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("colStats", org.apache.thrift.protocol.TType.LIST, (short)3); + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new CatalogStatsStandardSchemeFactory()); + schemes.put(TupleScheme.class, new CatalogStatsTupleSchemeFactory()); + } + + public long sizeInBytes; // required + public long rowCount; // optional + public List> colStats; // required + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements org.apache.thrift.TFieldIdEnum { + SIZE_IN_BYTES((short)1, "sizeInBytes"), + ROW_COUNT((short)2, "rowCount"), + COL_STATS((short)3, "colStats"); + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // SIZE_IN_BYTES + return SIZE_IN_BYTES; + case 2: // ROW_COUNT + return ROW_COUNT; + case 3: // COL_STATS + return COL_STATS; + default: + return null; + } + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + private static final int __SIZEINBYTES_ISSET_ID = 0; + private static final int __ROWCOUNT_ISSET_ID = 1; + private byte __isset_bitfield = 0; + private static final _Fields optionals[] = {_Fields.ROW_COUNT}; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SIZE_IN_BYTES, new org.apache.thrift.meta_data.FieldMetaData("sizeInBytes", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + tmpMap.put(_Fields.ROW_COUNT, new org.apache.thrift.meta_data.FieldMetaData("rowCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + tmpMap.put(_Fields.COL_STATS, new org.apache.thrift.meta_data.FieldMetaData("colStats", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))))); + metaDataMap = Collections.unmodifiableMap(tmpMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CatalogStats.class, metaDataMap); + } + + public CatalogStats() { + } + + public CatalogStats( + long sizeInBytes, + List> colStats) + { + this(); + this.sizeInBytes = sizeInBytes; + setSizeInBytesIsSet(true); + this.colStats = colStats; + } + + /** + * Performs a deep copy on other. + */ + public CatalogStats(CatalogStats other) { + __isset_bitfield = other.__isset_bitfield; + this.sizeInBytes = other.sizeInBytes; + this.rowCount = other.rowCount; + if (other.isSetColStats()) { + List> __this__colStats = new ArrayList>(other.colStats.size()); + for (Map other_element : other.colStats) { + Map __this__colStats_copy = new HashMap(other_element); + __this__colStats.add(__this__colStats_copy); + } + this.colStats = __this__colStats; + } + } + + public CatalogStats deepCopy() { + return new CatalogStats(this); + } + + @Override + public void clear() { + setSizeInBytesIsSet(false); + this.sizeInBytes = 0; + setRowCountIsSet(false); + this.rowCount = 0; + this.colStats = null; + } + + public long getSizeInBytes() { + return this.sizeInBytes; + } + + public CatalogStats setSizeInBytes(long sizeInBytes) { + this.sizeInBytes = sizeInBytes; + setSizeInBytesIsSet(true); + return this; + } + + public void unsetSizeInBytes() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SIZEINBYTES_ISSET_ID); + } + + /** Returns true if field sizeInBytes is set (has been assigned a value) and false otherwise */ + public boolean isSetSizeInBytes() { + return EncodingUtils.testBit(__isset_bitfield, __SIZEINBYTES_ISSET_ID); + } + + public void setSizeInBytesIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SIZEINBYTES_ISSET_ID, value); + } + + public long getRowCount() { + return this.rowCount; + } + + public CatalogStats setRowCount(long rowCount) { + this.rowCount = rowCount; + setRowCountIsSet(true); + return this; + } + + public void unsetRowCount() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ROWCOUNT_ISSET_ID); + } + + /** Returns true if field rowCount is set (has been assigned a value) and false otherwise */ + public boolean isSetRowCount() { + return EncodingUtils.testBit(__isset_bitfield, __ROWCOUNT_ISSET_ID); + } + + public void setRowCountIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ROWCOUNT_ISSET_ID, value); + } + + public int getColStatsSize() { + return (this.colStats == null) ? 0 : this.colStats.size(); + } + + public java.util.Iterator> getColStatsIterator() { + return (this.colStats == null) ? null : this.colStats.iterator(); + } + + public void addToColStats(Map elem) { + if (this.colStats == null) { + this.colStats = new ArrayList>(); + } + this.colStats.add(elem); + } + + public List> getColStats() { + return this.colStats; + } + + public CatalogStats setColStats(List> colStats) { + this.colStats = colStats; + return this; + } + + public void unsetColStats() { + this.colStats = null; + } + + /** Returns true if field colStats is set (has been assigned a value) and false otherwise */ + public boolean isSetColStats() { + return this.colStats != null; + } + + public void setColStatsIsSet(boolean value) { + if (!value) { + this.colStats = null; + } + } + + public void setFieldValue(_Fields field, Object value) { + switch (field) { + case SIZE_IN_BYTES: + if (value == null) { + unsetSizeInBytes(); + } else { + setSizeInBytes((Long)value); + } + break; + + case ROW_COUNT: + if (value == null) { + unsetRowCount(); + } else { + setRowCount((Long)value); + } + break; + + case COL_STATS: + if (value == null) { + unsetColStats(); + } else { + setColStats((List>)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case SIZE_IN_BYTES: + return getSizeInBytes(); + + case ROW_COUNT: + return getRowCount(); + + case COL_STATS: + return getColStats(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case SIZE_IN_BYTES: + return isSetSizeInBytes(); + case ROW_COUNT: + return isSetRowCount(); + case COL_STATS: + return isSetColStats(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof CatalogStats) + return this.equals((CatalogStats)that); + return false; + } + + public boolean equals(CatalogStats that) { + if (that == null) + return false; + + boolean this_present_sizeInBytes = true; + boolean that_present_sizeInBytes = true; + if (this_present_sizeInBytes || that_present_sizeInBytes) { + if (!(this_present_sizeInBytes && that_present_sizeInBytes)) + return false; + if (this.sizeInBytes != that.sizeInBytes) + return false; + } + + boolean this_present_rowCount = true && this.isSetRowCount(); + boolean that_present_rowCount = true && that.isSetRowCount(); + if (this_present_rowCount || that_present_rowCount) { + if (!(this_present_rowCount && that_present_rowCount)) + return false; + if (this.rowCount != that.rowCount) + return false; + } + + boolean this_present_colStats = true && this.isSetColStats(); + boolean that_present_colStats = true && that.isSetColStats(); + if (this_present_colStats || that_present_colStats) { + if (!(this_present_colStats && that_present_colStats)) + return false; + if (!this.colStats.equals(that.colStats)) + return false; + } + + return true; + } + + @Override + public int hashCode() { + List list = new ArrayList(); + + boolean present_sizeInBytes = true; + list.add(present_sizeInBytes); + if (present_sizeInBytes) + list.add(sizeInBytes); + + boolean present_rowCount = true && (isSetRowCount()); + list.add(present_rowCount); + if (present_rowCount) + list.add(rowCount); + + boolean present_colStats = true && (isSetColStats()); + list.add(present_colStats); + if (present_colStats) + list.add(colStats); + + return list.hashCode(); + } + + @Override + public int compareTo(CatalogStats other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetSizeInBytes()).compareTo(other.isSetSizeInBytes()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSizeInBytes()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sizeInBytes, other.sizeInBytes); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetRowCount()).compareTo(other.isSetRowCount()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetRowCount()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rowCount, other.rowCount); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetColStats()).compareTo(other.isSetColStats()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetColStats()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.colStats, other.colStats); + if (lastComparison != 0) { + return lastComparison; + } + } + return 0; + } + + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("CatalogStats("); + boolean first = true; + + sb.append("sizeInBytes:"); + sb.append(this.sizeInBytes); + first = false; + if (isSetRowCount()) { + if (!first) sb.append(", "); + sb.append("rowCount:"); + sb.append(this.rowCount); + first = false; + } + if (!first) sb.append(", "); + sb.append("colStats:"); + if (this.colStats == null) { + sb.append("null"); + } else { + sb.append(this.colStats); + } + first = false; + sb.append(")"); + return sb.toString(); + } + + public void validate() throws org.apache.thrift.TException { + // check for required fields + // alas, we cannot check 'sizeInBytes' because it's a primitive and you chose the non-beans generator. + if (colStats == null) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'colStats' was not present! Struct: " + toString()); + } + // check for sub-struct validity + } + + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private static class CatalogStatsStandardSchemeFactory implements SchemeFactory { + public CatalogStatsStandardScheme getScheme() { + return new CatalogStatsStandardScheme(); + } + } + + private static class CatalogStatsStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogStats struct) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField schemeField; + iprot.readStructBegin(); + while (true) + { + schemeField = iprot.readFieldBegin(); + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + break; + } + switch (schemeField.id) { + case 1: // SIZE_IN_BYTES + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.sizeInBytes = iprot.readI64(); + struct.setSizeInBytesIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // ROW_COUNT + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.rowCount = iprot.readI64(); + struct.setRowCountIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // COL_STATS + if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { + { + org.apache.thrift.protocol.TList _list298 = iprot.readListBegin(); + struct.colStats = new ArrayList>(_list298.size); + Map _elem299; + for (int _i300 = 0; _i300 < _list298.size; ++_i300) + { + { + org.apache.thrift.protocol.TMap _map301 = iprot.readMapBegin(); + _elem299 = new HashMap(2*_map301.size); + String _key302; + String _val303; + for (int _i304 = 0; _i304 < _map301.size; ++_i304) + { + _key302 = iprot.readString(); + _val303 = iprot.readString(); + _elem299.put(_key302, _val303); + } + iprot.readMapEnd(); + } + struct.colStats.add(_elem299); + } + iprot.readListEnd(); + } + struct.setColStatsIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + default: + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + + // check for required fields of primitive type, which can't be checked in the validate method + if (!struct.isSetSizeInBytes()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'sizeInBytes' was not found in serialized data! Struct: " + toString()); + } + struct.validate(); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogStats struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + oprot.writeFieldBegin(SIZE_IN_BYTES_FIELD_DESC); + oprot.writeI64(struct.sizeInBytes); + oprot.writeFieldEnd(); + if (struct.isSetRowCount()) { + oprot.writeFieldBegin(ROW_COUNT_FIELD_DESC); + oprot.writeI64(struct.rowCount); + oprot.writeFieldEnd(); + } + if (struct.colStats != null) { + oprot.writeFieldBegin(COL_STATS_FIELD_DESC); + { + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.MAP, struct.colStats.size())); + for (Map _iter305 : struct.colStats) + { + { + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, _iter305.size())); + for (Map.Entry _iter306 : _iter305.entrySet()) + { + oprot.writeString(_iter306.getKey()); + oprot.writeString(_iter306.getValue()); + } + oprot.writeMapEnd(); + } + } + oprot.writeListEnd(); + } + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + } + + private static class CatalogStatsTupleSchemeFactory implements SchemeFactory { + public CatalogStatsTupleScheme getScheme() { + return new CatalogStatsTupleScheme(); + } + } + + private static class CatalogStatsTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, CatalogStats struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + oprot.writeI64(struct.sizeInBytes); + { + oprot.writeI32(struct.colStats.size()); + for (Map _iter307 : struct.colStats) + { + { + oprot.writeI32(_iter307.size()); + for (Map.Entry _iter308 : _iter307.entrySet()) + { + oprot.writeString(_iter308.getKey()); + oprot.writeString(_iter308.getValue()); + } + } + } + } + BitSet optionals = new BitSet(); + if (struct.isSetRowCount()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetRowCount()) { + oprot.writeI64(struct.rowCount); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, CatalogStats struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + struct.sizeInBytes = iprot.readI64(); + struct.setSizeInBytesIsSet(true); + { + org.apache.thrift.protocol.TList _list309 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.MAP, iprot.readI32()); + struct.colStats = new ArrayList>(_list309.size); + Map _elem310; + for (int _i311 = 0; _i311 < _list309.size; ++_i311) + { + { + org.apache.thrift.protocol.TMap _map312 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + _elem310 = new HashMap(2*_map312.size); + String _key313; + String _val314; + for (int _i315 = 0; _i315 < _map312.size; ++_i315) + { + _key313 = iprot.readString(); + _val314 = iprot.readString(); + _elem310.put(_key313, _val314); + } + } + struct.colStats.add(_elem310); + } + } + struct.setColStatsIsSet(true); + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.rowCount = iprot.readI64(); + struct.setRowCountIsSet(true); + } + } + } + +} + diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogStorage.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogStorage.java index b68ff1094..5f13fa690 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogStorage.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogStorage.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class CatalogStorage implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CatalogStorage"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogTableObject.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogTableObject.java index a4c77d69b..dd494f189 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogTableObject.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/CatalogTableObject.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class CatalogTableObject implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CatalogTableObject"); @@ -56,16 +56,14 @@ public class CatalogTableObject implements org.apache.thrift.TBase, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -91,16 +89,14 @@ public class CatalogTableObject implements org.apache.thrift.TBase properties; // required - public long sizeInBytes; // optional - public long rowCount; // optional - public List> colStats; // required - public boolean isBroadcastable; // required + public CatalogStats stats; // optional public String viewOriginalText; // optional public String viewText; // optional public String comment; // optional public List unsupportedFeatures; // required public boolean tracksPartitionsInCatalog; // required public boolean schemaPreservesCase; // required + public Map ignoredProperties; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -122,16 +118,14 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { CREATE_TIME((short)16, "createTime"), LAST_ACCESS_TIME((short)17, "lastAccessTime"), PROPERTIES((short)18, "properties"), - SIZE_IN_BYTES((short)19, "sizeInBytes"), - ROW_COUNT((short)20, "rowCount"), - COL_STATS((short)21, "colStats"), - IS_BROADCASTABLE((short)22, "isBroadcastable"), - VIEW_ORIGINAL_TEXT((short)23, "viewOriginalText"), - VIEW_TEXT((short)24, "viewText"), - COMMENT((short)25, "comment"), - UNSUPPORTED_FEATURES((short)26, "unsupportedFeatures"), - TRACKS_PARTITIONS_IN_CATALOG((short)27, "tracksPartitionsInCatalog"), - SCHEMA_PRESERVES_CASE((short)28, "schemaPreservesCase"); + STATS((short)19, "stats"), + VIEW_ORIGINAL_TEXT((short)20, "viewOriginalText"), + VIEW_TEXT((short)21, "viewText"), + COMMENT((short)22, "comment"), + UNSUPPORTED_FEATURES((short)23, "unsupportedFeatures"), + TRACKS_PARTITIONS_IN_CATALOG((short)24, "tracksPartitionsInCatalog"), + SCHEMA_PRESERVES_CASE((short)25, "schemaPreservesCase"), + IGNORED_PROPERTIES((short)26, "ignoredProperties"); private static final Map byName = new HashMap(); @@ -182,26 +176,22 @@ public static _Fields findByThriftId(int fieldId) { return LAST_ACCESS_TIME; case 18: // PROPERTIES return PROPERTIES; - case 19: // SIZE_IN_BYTES - return SIZE_IN_BYTES; - case 20: // ROW_COUNT - return ROW_COUNT; - case 21: // COL_STATS - return COL_STATS; - case 22: // IS_BROADCASTABLE - return IS_BROADCASTABLE; - case 23: // VIEW_ORIGINAL_TEXT + case 19: // STATS + return STATS; + case 20: // VIEW_ORIGINAL_TEXT return VIEW_ORIGINAL_TEXT; - case 24: // VIEW_TEXT + case 21: // VIEW_TEXT return VIEW_TEXT; - case 25: // COMMENT + case 22: // COMMENT return COMMENT; - case 26: // UNSUPPORTED_FEATURES + case 23: // UNSUPPORTED_FEATURES return UNSUPPORTED_FEATURES; - case 27: // TRACKS_PARTITIONS_IN_CATALOG + case 24: // TRACKS_PARTITIONS_IN_CATALOG return TRACKS_PARTITIONS_IN_CATALOG; - case 28: // SCHEMA_PRESERVES_CASE + case 25: // SCHEMA_PRESERVES_CASE return SCHEMA_PRESERVES_CASE; + case 26: // IGNORED_PROPERTIES + return IGNORED_PROPERTIES; default: return null; } @@ -246,13 +236,10 @@ public String getFieldName() { private static final int __REDUNDANCY_ISSET_ID = 1; private static final int __CREATETIME_ISSET_ID = 2; private static final int __LASTACCESSTIME_ISSET_ID = 3; - private static final int __SIZEINBYTES_ISSET_ID = 4; - private static final int __ROWCOUNT_ISSET_ID = 5; - private static final int __ISBROADCASTABLE_ISSET_ID = 6; - private static final int __TRACKSPARTITIONSINCATALOG_ISSET_ID = 7; - private static final int __SCHEMAPRESERVESCASE_ISSET_ID = 8; - private short __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.SCHEMA_NAME,_Fields.PROVIDER,_Fields.NUM_BUCKETS,_Fields.REDUNDANCY,_Fields.SIZE_IN_BYTES,_Fields.ROW_COUNT,_Fields.VIEW_ORIGINAL_TEXT,_Fields.VIEW_TEXT,_Fields.COMMENT}; + private static final int __TRACKSPARTITIONSINCATALOG_ISSET_ID = 4; + private static final int __SCHEMAPRESERVESCASE_ISSET_ID = 5; + private byte __isset_bitfield = 0; + private static final _Fields optionals[] = {_Fields.SCHEMA_NAME,_Fields.PROVIDER,_Fields.NUM_BUCKETS,_Fields.REDUNDANCY,_Fields.STATS,_Fields.VIEW_ORIGINAL_TEXT,_Fields.VIEW_TEXT,_Fields.COMMENT,_Fields.IGNORED_PROPERTIES}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -300,17 +287,8 @@ public String getFieldName() { new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - tmpMap.put(_Fields.SIZE_IN_BYTES, new org.apache.thrift.meta_data.FieldMetaData("sizeInBytes", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - tmpMap.put(_Fields.ROW_COUNT, new org.apache.thrift.meta_data.FieldMetaData("rowCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - tmpMap.put(_Fields.COL_STATS, new org.apache.thrift.meta_data.FieldMetaData("colStats", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))))); - tmpMap.put(_Fields.IS_BROADCASTABLE, new org.apache.thrift.meta_data.FieldMetaData("isBroadcastable", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.STATS, new org.apache.thrift.meta_data.FieldMetaData("stats", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, CatalogStats.class))); tmpMap.put(_Fields.VIEW_ORIGINAL_TEXT, new org.apache.thrift.meta_data.FieldMetaData("viewOriginalText", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.VIEW_TEXT, new org.apache.thrift.meta_data.FieldMetaData("viewText", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -324,6 +302,10 @@ public String getFieldName() { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.SCHEMA_PRESERVES_CASE, new org.apache.thrift.meta_data.FieldMetaData("schemaPreservesCase", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.IGNORED_PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("ignoredProperties", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CatalogTableObject.class, metaDataMap); } @@ -346,8 +328,6 @@ public CatalogTableObject( long createTime, long lastAccessTime, Map properties, - List> colStats, - boolean isBroadcastable, List unsupportedFeatures, boolean tracksPartitionsInCatalog, boolean schemaPreservesCase) @@ -369,9 +349,6 @@ public CatalogTableObject( this.lastAccessTime = lastAccessTime; setLastAccessTimeIsSet(true); this.properties = properties; - this.colStats = colStats; - this.isBroadcastable = isBroadcastable; - setIsBroadcastableIsSet(true); this.unsupportedFeatures = unsupportedFeatures; this.tracksPartitionsInCatalog = tracksPartitionsInCatalog; setTracksPartitionsInCatalogIsSet(true); @@ -440,17 +417,9 @@ public CatalogTableObject(CatalogTableObject other) { Map __this__properties = new HashMap(other.properties); this.properties = __this__properties; } - this.sizeInBytes = other.sizeInBytes; - this.rowCount = other.rowCount; - if (other.isSetColStats()) { - List> __this__colStats = new ArrayList>(other.colStats.size()); - for (Map other_element : other.colStats) { - Map __this__colStats_copy = new HashMap(other_element); - __this__colStats.add(__this__colStats_copy); - } - this.colStats = __this__colStats; + if (other.isSetStats()) { + this.stats = new CatalogStats(other.stats); } - this.isBroadcastable = other.isBroadcastable; if (other.isSetViewOriginalText()) { this.viewOriginalText = other.viewOriginalText; } @@ -466,6 +435,10 @@ public CatalogTableObject(CatalogTableObject other) { } this.tracksPartitionsInCatalog = other.tracksPartitionsInCatalog; this.schemaPreservesCase = other.schemaPreservesCase; + if (other.isSetIgnoredProperties()) { + Map __this__ignoredProperties = new HashMap(other.ignoredProperties); + this.ignoredProperties = __this__ignoredProperties; + } } public CatalogTableObject deepCopy() { @@ -496,13 +469,7 @@ public void clear() { setLastAccessTimeIsSet(false); this.lastAccessTime = 0; this.properties = null; - setSizeInBytesIsSet(false); - this.sizeInBytes = 0; - setRowCountIsSet(false); - this.rowCount = 0; - this.colStats = null; - setIsBroadcastableIsSet(false); - this.isBroadcastable = false; + this.stats = null; this.viewOriginalText = null; this.viewText = null; this.comment = null; @@ -511,6 +478,7 @@ public void clear() { this.tracksPartitionsInCatalog = false; setSchemaPreservesCaseIsSet(false); this.schemaPreservesCase = false; + this.ignoredProperties = null; } public String getTableName() { @@ -1042,114 +1010,30 @@ public void setPropertiesIsSet(boolean value) { } } - public long getSizeInBytes() { - return this.sizeInBytes; + public CatalogStats getStats() { + return this.stats; } - public CatalogTableObject setSizeInBytes(long sizeInBytes) { - this.sizeInBytes = sizeInBytes; - setSizeInBytesIsSet(true); + public CatalogTableObject setStats(CatalogStats stats) { + this.stats = stats; return this; } - public void unsetSizeInBytes() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SIZEINBYTES_ISSET_ID); + public void unsetStats() { + this.stats = null; } - /** Returns true if field sizeInBytes is set (has been assigned a value) and false otherwise */ - public boolean isSetSizeInBytes() { - return EncodingUtils.testBit(__isset_bitfield, __SIZEINBYTES_ISSET_ID); + /** Returns true if field stats is set (has been assigned a value) and false otherwise */ + public boolean isSetStats() { + return this.stats != null; } - public void setSizeInBytesIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SIZEINBYTES_ISSET_ID, value); - } - - public long getRowCount() { - return this.rowCount; - } - - public CatalogTableObject setRowCount(long rowCount) { - this.rowCount = rowCount; - setRowCountIsSet(true); - return this; - } - - public void unsetRowCount() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ROWCOUNT_ISSET_ID); - } - - /** Returns true if field rowCount is set (has been assigned a value) and false otherwise */ - public boolean isSetRowCount() { - return EncodingUtils.testBit(__isset_bitfield, __ROWCOUNT_ISSET_ID); - } - - public void setRowCountIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ROWCOUNT_ISSET_ID, value); - } - - public int getColStatsSize() { - return (this.colStats == null) ? 0 : this.colStats.size(); - } - - public java.util.Iterator> getColStatsIterator() { - return (this.colStats == null) ? null : this.colStats.iterator(); - } - - public void addToColStats(Map elem) { - if (this.colStats == null) { - this.colStats = new ArrayList>(); - } - this.colStats.add(elem); - } - - public List> getColStats() { - return this.colStats; - } - - public CatalogTableObject setColStats(List> colStats) { - this.colStats = colStats; - return this; - } - - public void unsetColStats() { - this.colStats = null; - } - - /** Returns true if field colStats is set (has been assigned a value) and false otherwise */ - public boolean isSetColStats() { - return this.colStats != null; - } - - public void setColStatsIsSet(boolean value) { + public void setStatsIsSet(boolean value) { if (!value) { - this.colStats = null; + this.stats = null; } } - public boolean isIsBroadcastable() { - return this.isBroadcastable; - } - - public CatalogTableObject setIsBroadcastable(boolean isBroadcastable) { - this.isBroadcastable = isBroadcastable; - setIsBroadcastableIsSet(true); - return this; - } - - public void unsetIsBroadcastable() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISBROADCASTABLE_ISSET_ID); - } - - /** Returns true if field isBroadcastable is set (has been assigned a value) and false otherwise */ - public boolean isSetIsBroadcastable() { - return EncodingUtils.testBit(__isset_bitfield, __ISBROADCASTABLE_ISSET_ID); - } - - public void setIsBroadcastableIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISBROADCASTABLE_ISSET_ID, value); - } - public String getViewOriginalText() { return this.viewOriginalText; } @@ -1307,6 +1191,41 @@ public void setSchemaPreservesCaseIsSet(boolean value) { __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCHEMAPRESERVESCASE_ISSET_ID, value); } + public int getIgnoredPropertiesSize() { + return (this.ignoredProperties == null) ? 0 : this.ignoredProperties.size(); + } + + public void putToIgnoredProperties(String key, String val) { + if (this.ignoredProperties == null) { + this.ignoredProperties = new HashMap(); + } + this.ignoredProperties.put(key, val); + } + + public Map getIgnoredProperties() { + return this.ignoredProperties; + } + + public CatalogTableObject setIgnoredProperties(Map ignoredProperties) { + this.ignoredProperties = ignoredProperties; + return this; + } + + public void unsetIgnoredProperties() { + this.ignoredProperties = null; + } + + /** Returns true if field ignoredProperties is set (has been assigned a value) and false otherwise */ + public boolean isSetIgnoredProperties() { + return this.ignoredProperties != null; + } + + public void setIgnoredPropertiesIsSet(boolean value) { + if (!value) { + this.ignoredProperties = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case TABLE_NAME: @@ -1453,35 +1372,11 @@ public void setFieldValue(_Fields field, Object value) { } break; - case SIZE_IN_BYTES: - if (value == null) { - unsetSizeInBytes(); - } else { - setSizeInBytes((Long)value); - } - break; - - case ROW_COUNT: - if (value == null) { - unsetRowCount(); - } else { - setRowCount((Long)value); - } - break; - - case COL_STATS: - if (value == null) { - unsetColStats(); - } else { - setColStats((List>)value); - } - break; - - case IS_BROADCASTABLE: + case STATS: if (value == null) { - unsetIsBroadcastable(); + unsetStats(); } else { - setIsBroadcastable((Boolean)value); + setStats((CatalogStats)value); } break; @@ -1533,6 +1428,14 @@ public void setFieldValue(_Fields field, Object value) { } break; + case IGNORED_PROPERTIES: + if (value == null) { + unsetIgnoredProperties(); + } else { + setIgnoredProperties((Map)value); + } + break; + } } @@ -1592,17 +1495,8 @@ public Object getFieldValue(_Fields field) { case PROPERTIES: return getProperties(); - case SIZE_IN_BYTES: - return getSizeInBytes(); - - case ROW_COUNT: - return getRowCount(); - - case COL_STATS: - return getColStats(); - - case IS_BROADCASTABLE: - return isIsBroadcastable(); + case STATS: + return getStats(); case VIEW_ORIGINAL_TEXT: return getViewOriginalText(); @@ -1622,6 +1516,9 @@ public Object getFieldValue(_Fields field) { case SCHEMA_PRESERVES_CASE: return isSchemaPreservesCase(); + case IGNORED_PROPERTIES: + return getIgnoredProperties(); + } throw new IllegalStateException(); } @@ -1669,14 +1566,8 @@ public boolean isSet(_Fields field) { return isSetLastAccessTime(); case PROPERTIES: return isSetProperties(); - case SIZE_IN_BYTES: - return isSetSizeInBytes(); - case ROW_COUNT: - return isSetRowCount(); - case COL_STATS: - return isSetColStats(); - case IS_BROADCASTABLE: - return isSetIsBroadcastable(); + case STATS: + return isSetStats(); case VIEW_ORIGINAL_TEXT: return isSetViewOriginalText(); case VIEW_TEXT: @@ -1689,6 +1580,8 @@ public boolean isSet(_Fields field) { return isSetTracksPartitionsInCatalog(); case SCHEMA_PRESERVES_CASE: return isSetSchemaPreservesCase(); + case IGNORED_PROPERTIES: + return isSetIgnoredProperties(); } throw new IllegalStateException(); } @@ -1868,39 +1761,12 @@ public boolean equals(CatalogTableObject that) { return false; } - boolean this_present_sizeInBytes = true && this.isSetSizeInBytes(); - boolean that_present_sizeInBytes = true && that.isSetSizeInBytes(); - if (this_present_sizeInBytes || that_present_sizeInBytes) { - if (!(this_present_sizeInBytes && that_present_sizeInBytes)) - return false; - if (this.sizeInBytes != that.sizeInBytes) - return false; - } - - boolean this_present_rowCount = true && this.isSetRowCount(); - boolean that_present_rowCount = true && that.isSetRowCount(); - if (this_present_rowCount || that_present_rowCount) { - if (!(this_present_rowCount && that_present_rowCount)) - return false; - if (this.rowCount != that.rowCount) - return false; - } - - boolean this_present_colStats = true && this.isSetColStats(); - boolean that_present_colStats = true && that.isSetColStats(); - if (this_present_colStats || that_present_colStats) { - if (!(this_present_colStats && that_present_colStats)) - return false; - if (!this.colStats.equals(that.colStats)) - return false; - } - - boolean this_present_isBroadcastable = true; - boolean that_present_isBroadcastable = true; - if (this_present_isBroadcastable || that_present_isBroadcastable) { - if (!(this_present_isBroadcastable && that_present_isBroadcastable)) + boolean this_present_stats = true && this.isSetStats(); + boolean that_present_stats = true && that.isSetStats(); + if (this_present_stats || that_present_stats) { + if (!(this_present_stats && that_present_stats)) return false; - if (this.isBroadcastable != that.isBroadcastable) + if (!this.stats.equals(that.stats)) return false; } @@ -1958,6 +1824,15 @@ public boolean equals(CatalogTableObject that) { return false; } + boolean this_present_ignoredProperties = true && this.isSetIgnoredProperties(); + boolean that_present_ignoredProperties = true && that.isSetIgnoredProperties(); + if (this_present_ignoredProperties || that_present_ignoredProperties) { + if (!(this_present_ignoredProperties && that_present_ignoredProperties)) + return false; + if (!this.ignoredProperties.equals(that.ignoredProperties)) + return false; + } + return true; } @@ -2055,25 +1930,10 @@ public int hashCode() { if (present_properties) list.add(properties); - boolean present_sizeInBytes = true && (isSetSizeInBytes()); - list.add(present_sizeInBytes); - if (present_sizeInBytes) - list.add(sizeInBytes); - - boolean present_rowCount = true && (isSetRowCount()); - list.add(present_rowCount); - if (present_rowCount) - list.add(rowCount); - - boolean present_colStats = true && (isSetColStats()); - list.add(present_colStats); - if (present_colStats) - list.add(colStats); - - boolean present_isBroadcastable = true; - list.add(present_isBroadcastable); - if (present_isBroadcastable) - list.add(isBroadcastable); + boolean present_stats = true && (isSetStats()); + list.add(present_stats); + if (present_stats) + list.add(stats); boolean present_viewOriginalText = true && (isSetViewOriginalText()); list.add(present_viewOriginalText); @@ -2105,6 +1965,11 @@ public int hashCode() { if (present_schemaPreservesCase) list.add(schemaPreservesCase); + boolean present_ignoredProperties = true && (isSetIgnoredProperties()); + list.add(present_ignoredProperties); + if (present_ignoredProperties) + list.add(ignoredProperties); + return list.hashCode(); } @@ -2296,42 +2161,12 @@ public int compareTo(CatalogTableObject other) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSizeInBytes()).compareTo(other.isSetSizeInBytes()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetSizeInBytes()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sizeInBytes, other.sizeInBytes); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetRowCount()).compareTo(other.isSetRowCount()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetRowCount()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rowCount, other.rowCount); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetColStats()).compareTo(other.isSetColStats()); + lastComparison = Boolean.valueOf(isSetStats()).compareTo(other.isSetStats()); if (lastComparison != 0) { return lastComparison; } - if (isSetColStats()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.colStats, other.colStats); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = Boolean.valueOf(isSetIsBroadcastable()).compareTo(other.isSetIsBroadcastable()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetIsBroadcastable()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isBroadcastable, other.isBroadcastable); + if (isSetStats()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stats, other.stats); if (lastComparison != 0) { return lastComparison; } @@ -2396,6 +2231,16 @@ public int compareTo(CatalogTableObject other) { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetIgnoredProperties()).compareTo(other.isSetIgnoredProperties()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetIgnoredProperties()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ignoredProperties, other.ignoredProperties); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -2551,30 +2396,16 @@ public String toString() { sb.append(this.properties); } first = false; - if (isSetSizeInBytes()) { - if (!first) sb.append(", "); - sb.append("sizeInBytes:"); - sb.append(this.sizeInBytes); - first = false; - } - if (isSetRowCount()) { + if (isSetStats()) { if (!first) sb.append(", "); - sb.append("rowCount:"); - sb.append(this.rowCount); + sb.append("stats:"); + if (this.stats == null) { + sb.append("null"); + } else { + sb.append(this.stats); + } first = false; } - if (!first) sb.append(", "); - sb.append("colStats:"); - if (this.colStats == null) { - sb.append("null"); - } else { - sb.append(this.colStats); - } - first = false; - if (!first) sb.append(", "); - sb.append("isBroadcastable:"); - sb.append(this.isBroadcastable); - first = false; if (isSetViewOriginalText()) { if (!first) sb.append(", "); sb.append("viewOriginalText:"); @@ -2621,6 +2452,16 @@ public String toString() { sb.append("schemaPreservesCase:"); sb.append(this.schemaPreservesCase); first = false; + if (isSetIgnoredProperties()) { + if (!first) sb.append(", "); + sb.append("ignoredProperties:"); + if (this.ignoredProperties == null) { + sb.append("null"); + } else { + sb.append(this.ignoredProperties); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -2665,10 +2506,6 @@ public void validate() throws org.apache.thrift.TException { if (properties == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'properties' was not present! Struct: " + toString()); } - if (colStats == null) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'colStats' was not present! Struct: " + toString()); - } - // alas, we cannot check 'isBroadcastable' because it's a primitive and you chose the non-beans generator. if (unsupportedFeatures == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'unsupportedFeatures' was not present! Struct: " + toString()); } @@ -2678,6 +2515,9 @@ public void validate() throws org.apache.thrift.TException { if (storage != null) { storage.validate(); } + if (stats != null) { + stats.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -2768,13 +2608,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogTableObject case 7: // PARTITION_COLUMNS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list298 = iprot.readListBegin(); - struct.partitionColumns = new ArrayList(_list298.size); - String _elem299; - for (int _i300 = 0; _i300 < _list298.size; ++_i300) + org.apache.thrift.protocol.TList _list316 = iprot.readListBegin(); + struct.partitionColumns = new ArrayList(_list316.size); + String _elem317; + for (int _i318 = 0; _i318 < _list316.size; ++_i318) { - _elem299 = iprot.readString(); - struct.partitionColumns.add(_elem299); + _elem317 = iprot.readString(); + struct.partitionColumns.add(_elem317); } iprot.readListEnd(); } @@ -2786,13 +2626,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogTableObject case 8: // INDEX_COLUMNS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list301 = iprot.readListBegin(); - struct.indexColumns = new ArrayList(_list301.size); - String _elem302; - for (int _i303 = 0; _i303 < _list301.size; ++_i303) + org.apache.thrift.protocol.TList _list319 = iprot.readListBegin(); + struct.indexColumns = new ArrayList(_list319.size); + String _elem320; + for (int _i321 = 0; _i321 < _list319.size; ++_i321) { - _elem302 = iprot.readString(); - struct.indexColumns.add(_elem302); + _elem320 = iprot.readString(); + struct.indexColumns.add(_elem320); } iprot.readListEnd(); } @@ -2804,13 +2644,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogTableObject case 9: // PRIMARY_KEY_COLUMNS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list304 = iprot.readListBegin(); - struct.primaryKeyColumns = new ArrayList(_list304.size); - String _elem305; - for (int _i306 = 0; _i306 < _list304.size; ++_i306) + org.apache.thrift.protocol.TList _list322 = iprot.readListBegin(); + struct.primaryKeyColumns = new ArrayList(_list322.size); + String _elem323; + for (int _i324 = 0; _i324 < _list322.size; ++_i324) { - _elem305 = iprot.readString(); - struct.primaryKeyColumns.add(_elem305); + _elem323 = iprot.readString(); + struct.primaryKeyColumns.add(_elem323); } iprot.readListEnd(); } @@ -2838,14 +2678,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogTableObject case 12: // BUCKET_OWNERS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list307 = iprot.readListBegin(); - struct.bucketOwners = new ArrayList(_list307.size); - BucketOwners _elem308; - for (int _i309 = 0; _i309 < _list307.size; ++_i309) + org.apache.thrift.protocol.TList _list325 = iprot.readListBegin(); + struct.bucketOwners = new ArrayList(_list325.size); + BucketOwners _elem326; + for (int _i327 = 0; _i327 < _list325.size; ++_i327) { - _elem308 = new BucketOwners(); - _elem308.read(iprot); - struct.bucketOwners.add(_elem308); + _elem326 = new BucketOwners(); + _elem326.read(iprot); + struct.bucketOwners.add(_elem326); } iprot.readListEnd(); } @@ -2857,13 +2697,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogTableObject case 13: // BUCKET_COLUMNS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list310 = iprot.readListBegin(); - struct.bucketColumns = new ArrayList(_list310.size); - String _elem311; - for (int _i312 = 0; _i312 < _list310.size; ++_i312) + org.apache.thrift.protocol.TList _list328 = iprot.readListBegin(); + struct.bucketColumns = new ArrayList(_list328.size); + String _elem329; + for (int _i330 = 0; _i330 < _list328.size; ++_i330) { - _elem311 = iprot.readString(); - struct.bucketColumns.add(_elem311); + _elem329 = iprot.readString(); + struct.bucketColumns.add(_elem329); } iprot.readListEnd(); } @@ -2875,13 +2715,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogTableObject case 14: // SORT_COLUMNS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list313 = iprot.readListBegin(); - struct.sortColumns = new ArrayList(_list313.size); - String _elem314; - for (int _i315 = 0; _i315 < _list313.size; ++_i315) + org.apache.thrift.protocol.TList _list331 = iprot.readListBegin(); + struct.sortColumns = new ArrayList(_list331.size); + String _elem332; + for (int _i333 = 0; _i333 < _list331.size; ++_i333) { - _elem314 = iprot.readString(); - struct.sortColumns.add(_elem314); + _elem332 = iprot.readString(); + struct.sortColumns.add(_elem332); } iprot.readListEnd(); } @@ -2917,15 +2757,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogTableObject case 18: // PROPERTIES if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map316 = iprot.readMapBegin(); - struct.properties = new HashMap(2*_map316.size); - String _key317; - String _val318; - for (int _i319 = 0; _i319 < _map316.size; ++_i319) + org.apache.thrift.protocol.TMap _map334 = iprot.readMapBegin(); + struct.properties = new HashMap(2*_map334.size); + String _key335; + String _val336; + for (int _i337 = 0; _i337 < _map334.size; ++_i337) { - _key317 = iprot.readString(); - _val318 = iprot.readString(); - struct.properties.put(_key317, _val318); + _key335 = iprot.readString(); + _val336 = iprot.readString(); + struct.properties.put(_key335, _val336); } iprot.readMapEnd(); } @@ -2934,61 +2774,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogTableObject org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 19: // SIZE_IN_BYTES - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.sizeInBytes = iprot.readI64(); - struct.setSizeInBytesIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 20: // ROW_COUNT - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.rowCount = iprot.readI64(); - struct.setRowCountIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 21: // COL_STATS - if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { - { - org.apache.thrift.protocol.TList _list320 = iprot.readListBegin(); - struct.colStats = new ArrayList>(_list320.size); - Map _elem321; - for (int _i322 = 0; _i322 < _list320.size; ++_i322) - { - { - org.apache.thrift.protocol.TMap _map323 = iprot.readMapBegin(); - _elem321 = new HashMap(2*_map323.size); - String _key324; - String _val325; - for (int _i326 = 0; _i326 < _map323.size; ++_i326) - { - _key324 = iprot.readString(); - _val325 = iprot.readString(); - _elem321.put(_key324, _val325); - } - iprot.readMapEnd(); - } - struct.colStats.add(_elem321); - } - iprot.readListEnd(); - } - struct.setColStatsIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 22: // IS_BROADCASTABLE - if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { - struct.isBroadcastable = iprot.readBool(); - struct.setIsBroadcastableIsSet(true); + case 19: // STATS + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.stats = new CatalogStats(); + struct.stats.read(iprot); + struct.setStatsIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 23: // VIEW_ORIGINAL_TEXT + case 20: // VIEW_ORIGINAL_TEXT if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.viewOriginalText = iprot.readString(); struct.setViewOriginalTextIsSet(true); @@ -2996,7 +2791,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogTableObject org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 24: // VIEW_TEXT + case 21: // VIEW_TEXT if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.viewText = iprot.readString(); struct.setViewTextIsSet(true); @@ -3004,7 +2799,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogTableObject org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 25: // COMMENT + case 22: // COMMENT if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.comment = iprot.readString(); struct.setCommentIsSet(true); @@ -3012,16 +2807,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogTableObject org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 26: // UNSUPPORTED_FEATURES + case 23: // UNSUPPORTED_FEATURES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list327 = iprot.readListBegin(); - struct.unsupportedFeatures = new ArrayList(_list327.size); - String _elem328; - for (int _i329 = 0; _i329 < _list327.size; ++_i329) + org.apache.thrift.protocol.TList _list338 = iprot.readListBegin(); + struct.unsupportedFeatures = new ArrayList(_list338.size); + String _elem339; + for (int _i340 = 0; _i340 < _list338.size; ++_i340) { - _elem328 = iprot.readString(); - struct.unsupportedFeatures.add(_elem328); + _elem339 = iprot.readString(); + struct.unsupportedFeatures.add(_elem339); } iprot.readListEnd(); } @@ -3030,7 +2825,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogTableObject org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 27: // TRACKS_PARTITIONS_IN_CATALOG + case 24: // TRACKS_PARTITIONS_IN_CATALOG if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.tracksPartitionsInCatalog = iprot.readBool(); struct.setTracksPartitionsInCatalogIsSet(true); @@ -3038,7 +2833,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogTableObject org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 28: // SCHEMA_PRESERVES_CASE + case 25: // SCHEMA_PRESERVES_CASE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.schemaPreservesCase = iprot.readBool(); struct.setSchemaPreservesCaseIsSet(true); @@ -3046,6 +2841,26 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogTableObject org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 26: // IGNORED_PROPERTIES + if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { + { + org.apache.thrift.protocol.TMap _map341 = iprot.readMapBegin(); + struct.ignoredProperties = new HashMap(2*_map341.size); + String _key342; + String _val343; + for (int _i344 = 0; _i344 < _map341.size; ++_i344) + { + _key342 = iprot.readString(); + _val343 = iprot.readString(); + struct.ignoredProperties.put(_key342, _val343); + } + iprot.readMapEnd(); + } + struct.setIgnoredPropertiesIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -3060,9 +2875,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, CatalogTableObject if (!struct.isSetLastAccessTime()) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'lastAccessTime' was not found in serialized data! Struct: " + toString()); } - if (!struct.isSetIsBroadcastable()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'isBroadcastable' was not found in serialized data! Struct: " + toString()); - } if (!struct.isSetTracksPartitionsInCatalog()) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'tracksPartitionsInCatalog' was not found in serialized data! Struct: " + toString()); } @@ -3114,9 +2926,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogTableObject oprot.writeFieldBegin(PARTITION_COLUMNS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.partitionColumns.size())); - for (String _iter330 : struct.partitionColumns) + for (String _iter345 : struct.partitionColumns) { - oprot.writeString(_iter330); + oprot.writeString(_iter345); } oprot.writeListEnd(); } @@ -3126,9 +2938,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogTableObject oprot.writeFieldBegin(INDEX_COLUMNS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.indexColumns.size())); - for (String _iter331 : struct.indexColumns) + for (String _iter346 : struct.indexColumns) { - oprot.writeString(_iter331); + oprot.writeString(_iter346); } oprot.writeListEnd(); } @@ -3138,9 +2950,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogTableObject oprot.writeFieldBegin(PRIMARY_KEY_COLUMNS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.primaryKeyColumns.size())); - for (String _iter332 : struct.primaryKeyColumns) + for (String _iter347 : struct.primaryKeyColumns) { - oprot.writeString(_iter332); + oprot.writeString(_iter347); } oprot.writeListEnd(); } @@ -3160,9 +2972,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogTableObject oprot.writeFieldBegin(BUCKET_OWNERS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.bucketOwners.size())); - for (BucketOwners _iter333 : struct.bucketOwners) + for (BucketOwners _iter348 : struct.bucketOwners) { - _iter333.write(oprot); + _iter348.write(oprot); } oprot.writeListEnd(); } @@ -3172,9 +2984,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogTableObject oprot.writeFieldBegin(BUCKET_COLUMNS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.bucketColumns.size())); - for (String _iter334 : struct.bucketColumns) + for (String _iter349 : struct.bucketColumns) { - oprot.writeString(_iter334); + oprot.writeString(_iter349); } oprot.writeListEnd(); } @@ -3184,9 +2996,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogTableObject oprot.writeFieldBegin(SORT_COLUMNS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.sortColumns.size())); - for (String _iter335 : struct.sortColumns) + for (String _iter350 : struct.sortColumns) { - oprot.writeString(_iter335); + oprot.writeString(_iter350); } oprot.writeListEnd(); } @@ -3207,48 +3019,22 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogTableObject oprot.writeFieldBegin(PROPERTIES_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.properties.size())); - for (Map.Entry _iter336 : struct.properties.entrySet()) + for (Map.Entry _iter351 : struct.properties.entrySet()) { - oprot.writeString(_iter336.getKey()); - oprot.writeString(_iter336.getValue()); + oprot.writeString(_iter351.getKey()); + oprot.writeString(_iter351.getValue()); } oprot.writeMapEnd(); } oprot.writeFieldEnd(); } - if (struct.isSetSizeInBytes()) { - oprot.writeFieldBegin(SIZE_IN_BYTES_FIELD_DESC); - oprot.writeI64(struct.sizeInBytes); - oprot.writeFieldEnd(); - } - if (struct.isSetRowCount()) { - oprot.writeFieldBegin(ROW_COUNT_FIELD_DESC); - oprot.writeI64(struct.rowCount); - oprot.writeFieldEnd(); - } - if (struct.colStats != null) { - oprot.writeFieldBegin(COL_STATS_FIELD_DESC); - { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.MAP, struct.colStats.size())); - for (Map _iter337 : struct.colStats) - { - { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, _iter337.size())); - for (Map.Entry _iter338 : _iter337.entrySet()) - { - oprot.writeString(_iter338.getKey()); - oprot.writeString(_iter338.getValue()); - } - oprot.writeMapEnd(); - } - } - oprot.writeListEnd(); + if (struct.stats != null) { + if (struct.isSetStats()) { + oprot.writeFieldBegin(STATS_FIELD_DESC); + struct.stats.write(oprot); + oprot.writeFieldEnd(); } - oprot.writeFieldEnd(); } - oprot.writeFieldBegin(IS_BROADCASTABLE_FIELD_DESC); - oprot.writeBool(struct.isBroadcastable); - oprot.writeFieldEnd(); if (struct.viewOriginalText != null) { if (struct.isSetViewOriginalText()) { oprot.writeFieldBegin(VIEW_ORIGINAL_TEXT_FIELD_DESC); @@ -3274,9 +3060,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogTableObject oprot.writeFieldBegin(UNSUPPORTED_FEATURES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.unsupportedFeatures.size())); - for (String _iter339 : struct.unsupportedFeatures) + for (String _iter352 : struct.unsupportedFeatures) { - oprot.writeString(_iter339); + oprot.writeString(_iter352); } oprot.writeListEnd(); } @@ -3288,6 +3074,21 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, CatalogTableObject oprot.writeFieldBegin(SCHEMA_PRESERVES_CASE_FIELD_DESC); oprot.writeBool(struct.schemaPreservesCase); oprot.writeFieldEnd(); + if (struct.ignoredProperties != null) { + if (struct.isSetIgnoredProperties()) { + oprot.writeFieldBegin(IGNORED_PROPERTIES_FIELD_DESC); + { + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.ignoredProperties.size())); + for (Map.Entry _iter353 : struct.ignoredProperties.entrySet()) + { + oprot.writeString(_iter353.getKey()); + oprot.writeString(_iter353.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -3311,44 +3112,44 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CatalogTableObject oprot.writeString(struct.tableSchema); { oprot.writeI32(struct.partitionColumns.size()); - for (String _iter340 : struct.partitionColumns) + for (String _iter354 : struct.partitionColumns) { - oprot.writeString(_iter340); + oprot.writeString(_iter354); } } { oprot.writeI32(struct.indexColumns.size()); - for (String _iter341 : struct.indexColumns) + for (String _iter355 : struct.indexColumns) { - oprot.writeString(_iter341); + oprot.writeString(_iter355); } } { oprot.writeI32(struct.primaryKeyColumns.size()); - for (String _iter342 : struct.primaryKeyColumns) + for (String _iter356 : struct.primaryKeyColumns) { - oprot.writeString(_iter342); + oprot.writeString(_iter356); } } { oprot.writeI32(struct.bucketOwners.size()); - for (BucketOwners _iter343 : struct.bucketOwners) + for (BucketOwners _iter357 : struct.bucketOwners) { - _iter343.write(oprot); + _iter357.write(oprot); } } { oprot.writeI32(struct.bucketColumns.size()); - for (String _iter344 : struct.bucketColumns) + for (String _iter358 : struct.bucketColumns) { - oprot.writeString(_iter344); + oprot.writeString(_iter358); } } { oprot.writeI32(struct.sortColumns.size()); - for (String _iter345 : struct.sortColumns) + for (String _iter359 : struct.sortColumns) { - oprot.writeString(_iter345); + oprot.writeString(_iter359); } } oprot.writeString(struct.owner); @@ -3356,32 +3157,17 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CatalogTableObject oprot.writeI64(struct.lastAccessTime); { oprot.writeI32(struct.properties.size()); - for (Map.Entry _iter346 : struct.properties.entrySet()) - { - oprot.writeString(_iter346.getKey()); - oprot.writeString(_iter346.getValue()); - } - } - { - oprot.writeI32(struct.colStats.size()); - for (Map _iter347 : struct.colStats) + for (Map.Entry _iter360 : struct.properties.entrySet()) { - { - oprot.writeI32(_iter347.size()); - for (Map.Entry _iter348 : _iter347.entrySet()) - { - oprot.writeString(_iter348.getKey()); - oprot.writeString(_iter348.getValue()); - } - } + oprot.writeString(_iter360.getKey()); + oprot.writeString(_iter360.getValue()); } } - oprot.writeBool(struct.isBroadcastable); { oprot.writeI32(struct.unsupportedFeatures.size()); - for (String _iter349 : struct.unsupportedFeatures) + for (String _iter361 : struct.unsupportedFeatures) { - oprot.writeString(_iter349); + oprot.writeString(_iter361); } } oprot.writeBool(struct.tracksPartitionsInCatalog); @@ -3399,19 +3185,19 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CatalogTableObject if (struct.isSetRedundancy()) { optionals.set(3); } - if (struct.isSetSizeInBytes()) { + if (struct.isSetStats()) { optionals.set(4); } - if (struct.isSetRowCount()) { + if (struct.isSetViewOriginalText()) { optionals.set(5); } - if (struct.isSetViewOriginalText()) { + if (struct.isSetViewText()) { optionals.set(6); } - if (struct.isSetViewText()) { + if (struct.isSetComment()) { optionals.set(7); } - if (struct.isSetComment()) { + if (struct.isSetIgnoredProperties()) { optionals.set(8); } oprot.writeBitSet(optionals, 9); @@ -3427,11 +3213,8 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CatalogTableObject if (struct.isSetRedundancy()) { oprot.writeI32(struct.redundancy); } - if (struct.isSetSizeInBytes()) { - oprot.writeI64(struct.sizeInBytes); - } - if (struct.isSetRowCount()) { - oprot.writeI64(struct.rowCount); + if (struct.isSetStats()) { + struct.stats.write(oprot); } if (struct.isSetViewOriginalText()) { oprot.writeString(struct.viewOriginalText); @@ -3442,6 +3225,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, CatalogTableObject if (struct.isSetComment()) { oprot.writeString(struct.comment); } + if (struct.isSetIgnoredProperties()) { + { + oprot.writeI32(struct.ignoredProperties.size()); + for (Map.Entry _iter362 : struct.ignoredProperties.entrySet()) + { + oprot.writeString(_iter362.getKey()); + oprot.writeString(_iter362.getValue()); + } + } + } } @Override @@ -3457,69 +3250,69 @@ public void read(org.apache.thrift.protocol.TProtocol prot, CatalogTableObject s struct.tableSchema = iprot.readString(); struct.setTableSchemaIsSet(true); { - org.apache.thrift.protocol.TList _list350 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.partitionColumns = new ArrayList(_list350.size); - String _elem351; - for (int _i352 = 0; _i352 < _list350.size; ++_i352) + org.apache.thrift.protocol.TList _list363 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.partitionColumns = new ArrayList(_list363.size); + String _elem364; + for (int _i365 = 0; _i365 < _list363.size; ++_i365) { - _elem351 = iprot.readString(); - struct.partitionColumns.add(_elem351); + _elem364 = iprot.readString(); + struct.partitionColumns.add(_elem364); } } struct.setPartitionColumnsIsSet(true); { - org.apache.thrift.protocol.TList _list353 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.indexColumns = new ArrayList(_list353.size); - String _elem354; - for (int _i355 = 0; _i355 < _list353.size; ++_i355) + org.apache.thrift.protocol.TList _list366 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.indexColumns = new ArrayList(_list366.size); + String _elem367; + for (int _i368 = 0; _i368 < _list366.size; ++_i368) { - _elem354 = iprot.readString(); - struct.indexColumns.add(_elem354); + _elem367 = iprot.readString(); + struct.indexColumns.add(_elem367); } } struct.setIndexColumnsIsSet(true); { - org.apache.thrift.protocol.TList _list356 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.primaryKeyColumns = new ArrayList(_list356.size); - String _elem357; - for (int _i358 = 0; _i358 < _list356.size; ++_i358) + org.apache.thrift.protocol.TList _list369 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.primaryKeyColumns = new ArrayList(_list369.size); + String _elem370; + for (int _i371 = 0; _i371 < _list369.size; ++_i371) { - _elem357 = iprot.readString(); - struct.primaryKeyColumns.add(_elem357); + _elem370 = iprot.readString(); + struct.primaryKeyColumns.add(_elem370); } } struct.setPrimaryKeyColumnsIsSet(true); { - org.apache.thrift.protocol.TList _list359 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.bucketOwners = new ArrayList(_list359.size); - BucketOwners _elem360; - for (int _i361 = 0; _i361 < _list359.size; ++_i361) + org.apache.thrift.protocol.TList _list372 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.bucketOwners = new ArrayList(_list372.size); + BucketOwners _elem373; + for (int _i374 = 0; _i374 < _list372.size; ++_i374) { - _elem360 = new BucketOwners(); - _elem360.read(iprot); - struct.bucketOwners.add(_elem360); + _elem373 = new BucketOwners(); + _elem373.read(iprot); + struct.bucketOwners.add(_elem373); } } struct.setBucketOwnersIsSet(true); { - org.apache.thrift.protocol.TList _list362 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.bucketColumns = new ArrayList(_list362.size); - String _elem363; - for (int _i364 = 0; _i364 < _list362.size; ++_i364) + org.apache.thrift.protocol.TList _list375 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.bucketColumns = new ArrayList(_list375.size); + String _elem376; + for (int _i377 = 0; _i377 < _list375.size; ++_i377) { - _elem363 = iprot.readString(); - struct.bucketColumns.add(_elem363); + _elem376 = iprot.readString(); + struct.bucketColumns.add(_elem376); } } struct.setBucketColumnsIsSet(true); { - org.apache.thrift.protocol.TList _list365 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.sortColumns = new ArrayList(_list365.size); - String _elem366; - for (int _i367 = 0; _i367 < _list365.size; ++_i367) + org.apache.thrift.protocol.TList _list378 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.sortColumns = new ArrayList(_list378.size); + String _elem379; + for (int _i380 = 0; _i380 < _list378.size; ++_i380) { - _elem366 = iprot.readString(); - struct.sortColumns.add(_elem366); + _elem379 = iprot.readString(); + struct.sortColumns.add(_elem379); } } struct.setSortColumnsIsSet(true); @@ -3530,50 +3323,26 @@ public void read(org.apache.thrift.protocol.TProtocol prot, CatalogTableObject s struct.lastAccessTime = iprot.readI64(); struct.setLastAccessTimeIsSet(true); { - org.apache.thrift.protocol.TMap _map368 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.properties = new HashMap(2*_map368.size); - String _key369; - String _val370; - for (int _i371 = 0; _i371 < _map368.size; ++_i371) + org.apache.thrift.protocol.TMap _map381 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.properties = new HashMap(2*_map381.size); + String _key382; + String _val383; + for (int _i384 = 0; _i384 < _map381.size; ++_i384) { - _key369 = iprot.readString(); - _val370 = iprot.readString(); - struct.properties.put(_key369, _val370); + _key382 = iprot.readString(); + _val383 = iprot.readString(); + struct.properties.put(_key382, _val383); } } struct.setPropertiesIsSet(true); { - org.apache.thrift.protocol.TList _list372 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.colStats = new ArrayList>(_list372.size); - Map _elem373; - for (int _i374 = 0; _i374 < _list372.size; ++_i374) - { - { - org.apache.thrift.protocol.TMap _map375 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - _elem373 = new HashMap(2*_map375.size); - String _key376; - String _val377; - for (int _i378 = 0; _i378 < _map375.size; ++_i378) - { - _key376 = iprot.readString(); - _val377 = iprot.readString(); - _elem373.put(_key376, _val377); - } - } - struct.colStats.add(_elem373); - } - } - struct.setColStatsIsSet(true); - struct.isBroadcastable = iprot.readBool(); - struct.setIsBroadcastableIsSet(true); - { - org.apache.thrift.protocol.TList _list379 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.unsupportedFeatures = new ArrayList(_list379.size); - String _elem380; - for (int _i381 = 0; _i381 < _list379.size; ++_i381) + org.apache.thrift.protocol.TList _list385 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.unsupportedFeatures = new ArrayList(_list385.size); + String _elem386; + for (int _i387 = 0; _i387 < _list385.size; ++_i387) { - _elem380 = iprot.readString(); - struct.unsupportedFeatures.add(_elem380); + _elem386 = iprot.readString(); + struct.unsupportedFeatures.add(_elem386); } } struct.setUnsupportedFeaturesIsSet(true); @@ -3599,25 +3368,37 @@ public void read(org.apache.thrift.protocol.TProtocol prot, CatalogTableObject s struct.setRedundancyIsSet(true); } if (incoming.get(4)) { - struct.sizeInBytes = iprot.readI64(); - struct.setSizeInBytesIsSet(true); + struct.stats = new CatalogStats(); + struct.stats.read(iprot); + struct.setStatsIsSet(true); } if (incoming.get(5)) { - struct.rowCount = iprot.readI64(); - struct.setRowCountIsSet(true); - } - if (incoming.get(6)) { struct.viewOriginalText = iprot.readString(); struct.setViewOriginalTextIsSet(true); } - if (incoming.get(7)) { + if (incoming.get(6)) { struct.viewText = iprot.readString(); struct.setViewTextIsSet(true); } - if (incoming.get(8)) { + if (incoming.get(7)) { struct.comment = iprot.readString(); struct.setCommentIsSet(true); } + if (incoming.get(8)) { + { + org.apache.thrift.protocol.TMap _map388 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.ignoredProperties = new HashMap(2*_map388.size); + String _key389; + String _val390; + for (int _i391 = 0; _i391 < _map388.size; ++_i391) + { + _key389 = iprot.readString(); + _val390 = iprot.readString(); + struct.ignoredProperties.put(_key389, _val390); + } + } + struct.setIgnoredPropertiesIsSet(true); + } } } diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/ClobChunk.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/ClobChunk.java index 831bf4d91..fee4a402d 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/ClobChunk.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/ClobChunk.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class ClobChunk implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClobChunk"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/ColumnDescriptor.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/ColumnDescriptor.java index d328292e0..89f539a53 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/ColumnDescriptor.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/ColumnDescriptor.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class ColumnDescriptor implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnDescriptor"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/ConnectionProperties.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/ConnectionProperties.java index 6c1d17077..d887e0555 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/ConnectionProperties.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/ConnectionProperties.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class ConnectionProperties implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConnectionProperties"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/Decimal.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/Decimal.java index 68a6125cb..61b5b657c 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/Decimal.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/Decimal.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class Decimal implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Decimal"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/EntityId.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/EntityId.java index ddf2c8fe0..562732633 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/EntityId.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/EntityId.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class EntityId implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EntityId"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/LocatorService.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/LocatorService.java index 8be65b129..6ba627e0d 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/LocatorService.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/LocatorService.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class LocatorService { public interface Iface { @@ -705,13 +705,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getPreferredServer_ case 1: // SERVER_TYPES if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set480 = iprot.readSetBegin(); - struct.serverTypes = new HashSet(2*_set480.size); - ServerType _elem481; - for (int _i482 = 0; _i482 < _set480.size; ++_i482) + org.apache.thrift.protocol.TSet _set490 = iprot.readSetBegin(); + struct.serverTypes = new HashSet(2*_set490.size); + ServerType _elem491; + for (int _i492 = 0; _i492 < _set490.size; ++_i492) { - _elem481 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); - struct.serverTypes.add(_elem481); + _elem491 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); + struct.serverTypes.add(_elem491); } iprot.readSetEnd(); } @@ -723,13 +723,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getPreferredServer_ case 2: // SERVER_GROUPS if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set483 = iprot.readSetBegin(); - struct.serverGroups = new HashSet(2*_set483.size); - String _elem484; - for (int _i485 = 0; _i485 < _set483.size; ++_i485) + org.apache.thrift.protocol.TSet _set493 = iprot.readSetBegin(); + struct.serverGroups = new HashSet(2*_set493.size); + String _elem494; + for (int _i495 = 0; _i495 < _set493.size; ++_i495) { - _elem484 = iprot.readString(); - struct.serverGroups.add(_elem484); + _elem494 = iprot.readString(); + struct.serverGroups.add(_elem494); } iprot.readSetEnd(); } @@ -741,14 +741,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getPreferredServer_ case 3: // FAILED_SERVERS if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set486 = iprot.readSetBegin(); - struct.failedServers = new HashSet(2*_set486.size); - HostAddress _elem487; - for (int _i488 = 0; _i488 < _set486.size; ++_i488) + org.apache.thrift.protocol.TSet _set496 = iprot.readSetBegin(); + struct.failedServers = new HashSet(2*_set496.size); + HostAddress _elem497; + for (int _i498 = 0; _i498 < _set496.size; ++_i498) { - _elem487 = new HostAddress(); - _elem487.read(iprot); - struct.failedServers.add(_elem487); + _elem497 = new HostAddress(); + _elem497.read(iprot); + struct.failedServers.add(_elem497); } iprot.readSetEnd(); } @@ -776,9 +776,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getPreferredServer oprot.writeFieldBegin(SERVER_TYPES_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, struct.serverTypes.size())); - for (ServerType _iter489 : struct.serverTypes) + for (ServerType _iter499 : struct.serverTypes) { - oprot.writeI32(_iter489.getValue()); + oprot.writeI32(_iter499.getValue()); } oprot.writeSetEnd(); } @@ -788,9 +788,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getPreferredServer oprot.writeFieldBegin(SERVER_GROUPS_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.serverGroups.size())); - for (String _iter490 : struct.serverGroups) + for (String _iter500 : struct.serverGroups) { - oprot.writeString(_iter490); + oprot.writeString(_iter500); } oprot.writeSetEnd(); } @@ -800,9 +800,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getPreferredServer oprot.writeFieldBegin(FAILED_SERVERS_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, struct.failedServers.size())); - for (HostAddress _iter491 : struct.failedServers) + for (HostAddress _iter501 : struct.failedServers) { - _iter491.write(oprot); + _iter501.write(oprot); } oprot.writeSetEnd(); } @@ -839,27 +839,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, getPreferredServer_ if (struct.isSetServerTypes()) { { oprot.writeI32(struct.serverTypes.size()); - for (ServerType _iter492 : struct.serverTypes) + for (ServerType _iter502 : struct.serverTypes) { - oprot.writeI32(_iter492.getValue()); + oprot.writeI32(_iter502.getValue()); } } } if (struct.isSetServerGroups()) { { oprot.writeI32(struct.serverGroups.size()); - for (String _iter493 : struct.serverGroups) + for (String _iter503 : struct.serverGroups) { - oprot.writeString(_iter493); + oprot.writeString(_iter503); } } } if (struct.isSetFailedServers()) { { oprot.writeI32(struct.failedServers.size()); - for (HostAddress _iter494 : struct.failedServers) + for (HostAddress _iter504 : struct.failedServers) { - _iter494.write(oprot); + _iter504.write(oprot); } } } @@ -871,40 +871,40 @@ public void read(org.apache.thrift.protocol.TProtocol prot, getPreferredServer_a BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { { - org.apache.thrift.protocol.TSet _set495 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.serverTypes = new HashSet(2*_set495.size); - ServerType _elem496; - for (int _i497 = 0; _i497 < _set495.size; ++_i497) + org.apache.thrift.protocol.TSet _set505 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.serverTypes = new HashSet(2*_set505.size); + ServerType _elem506; + for (int _i507 = 0; _i507 < _set505.size; ++_i507) { - _elem496 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); - struct.serverTypes.add(_elem496); + _elem506 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); + struct.serverTypes.add(_elem506); } } struct.setServerTypesIsSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TSet _set498 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.serverGroups = new HashSet(2*_set498.size); - String _elem499; - for (int _i500 = 0; _i500 < _set498.size; ++_i500) + org.apache.thrift.protocol.TSet _set508 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.serverGroups = new HashSet(2*_set508.size); + String _elem509; + for (int _i510 = 0; _i510 < _set508.size; ++_i510) { - _elem499 = iprot.readString(); - struct.serverGroups.add(_elem499); + _elem509 = iprot.readString(); + struct.serverGroups.add(_elem509); } } struct.setServerGroupsIsSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TSet _set501 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.failedServers = new HashSet(2*_set501.size); - HostAddress _elem502; - for (int _i503 = 0; _i503 < _set501.size; ++_i503) + org.apache.thrift.protocol.TSet _set511 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.failedServers = new HashSet(2*_set511.size); + HostAddress _elem512; + for (int _i513 = 0; _i513 < _set511.size; ++_i513) { - _elem502 = new HostAddress(); - _elem502.read(iprot); - struct.failedServers.add(_elem502); + _elem512 = new HostAddress(); + _elem512.read(iprot); + struct.failedServers.add(_elem512); } } struct.setFailedServersIsSet(true); @@ -1904,13 +1904,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getAllServersWithPr case 1: // SERVER_TYPES if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set504 = iprot.readSetBegin(); - struct.serverTypes = new HashSet(2*_set504.size); - ServerType _elem505; - for (int _i506 = 0; _i506 < _set504.size; ++_i506) + org.apache.thrift.protocol.TSet _set514 = iprot.readSetBegin(); + struct.serverTypes = new HashSet(2*_set514.size); + ServerType _elem515; + for (int _i516 = 0; _i516 < _set514.size; ++_i516) { - _elem505 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); - struct.serverTypes.add(_elem505); + _elem515 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); + struct.serverTypes.add(_elem515); } iprot.readSetEnd(); } @@ -1922,13 +1922,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getAllServersWithPr case 2: // SERVER_GROUPS if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set507 = iprot.readSetBegin(); - struct.serverGroups = new HashSet(2*_set507.size); - String _elem508; - for (int _i509 = 0; _i509 < _set507.size; ++_i509) + org.apache.thrift.protocol.TSet _set517 = iprot.readSetBegin(); + struct.serverGroups = new HashSet(2*_set517.size); + String _elem518; + for (int _i519 = 0; _i519 < _set517.size; ++_i519) { - _elem508 = iprot.readString(); - struct.serverGroups.add(_elem508); + _elem518 = iprot.readString(); + struct.serverGroups.add(_elem518); } iprot.readSetEnd(); } @@ -1940,14 +1940,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getAllServersWithPr case 3: // FAILED_SERVERS if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set510 = iprot.readSetBegin(); - struct.failedServers = new HashSet(2*_set510.size); - HostAddress _elem511; - for (int _i512 = 0; _i512 < _set510.size; ++_i512) + org.apache.thrift.protocol.TSet _set520 = iprot.readSetBegin(); + struct.failedServers = new HashSet(2*_set520.size); + HostAddress _elem521; + for (int _i522 = 0; _i522 < _set520.size; ++_i522) { - _elem511 = new HostAddress(); - _elem511.read(iprot); - struct.failedServers.add(_elem511); + _elem521 = new HostAddress(); + _elem521.read(iprot); + struct.failedServers.add(_elem521); } iprot.readSetEnd(); } @@ -1975,9 +1975,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getAllServersWithP oprot.writeFieldBegin(SERVER_TYPES_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, struct.serverTypes.size())); - for (ServerType _iter513 : struct.serverTypes) + for (ServerType _iter523 : struct.serverTypes) { - oprot.writeI32(_iter513.getValue()); + oprot.writeI32(_iter523.getValue()); } oprot.writeSetEnd(); } @@ -1987,9 +1987,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getAllServersWithP oprot.writeFieldBegin(SERVER_GROUPS_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.serverGroups.size())); - for (String _iter514 : struct.serverGroups) + for (String _iter524 : struct.serverGroups) { - oprot.writeString(_iter514); + oprot.writeString(_iter524); } oprot.writeSetEnd(); } @@ -1999,9 +1999,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getAllServersWithP oprot.writeFieldBegin(FAILED_SERVERS_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, struct.failedServers.size())); - for (HostAddress _iter515 : struct.failedServers) + for (HostAddress _iter525 : struct.failedServers) { - _iter515.write(oprot); + _iter525.write(oprot); } oprot.writeSetEnd(); } @@ -2038,27 +2038,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, getAllServersWithPr if (struct.isSetServerTypes()) { { oprot.writeI32(struct.serverTypes.size()); - for (ServerType _iter516 : struct.serverTypes) + for (ServerType _iter526 : struct.serverTypes) { - oprot.writeI32(_iter516.getValue()); + oprot.writeI32(_iter526.getValue()); } } } if (struct.isSetServerGroups()) { { oprot.writeI32(struct.serverGroups.size()); - for (String _iter517 : struct.serverGroups) + for (String _iter527 : struct.serverGroups) { - oprot.writeString(_iter517); + oprot.writeString(_iter527); } } } if (struct.isSetFailedServers()) { { oprot.writeI32(struct.failedServers.size()); - for (HostAddress _iter518 : struct.failedServers) + for (HostAddress _iter528 : struct.failedServers) { - _iter518.write(oprot); + _iter528.write(oprot); } } } @@ -2070,40 +2070,40 @@ public void read(org.apache.thrift.protocol.TProtocol prot, getAllServersWithPre BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { { - org.apache.thrift.protocol.TSet _set519 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.serverTypes = new HashSet(2*_set519.size); - ServerType _elem520; - for (int _i521 = 0; _i521 < _set519.size; ++_i521) + org.apache.thrift.protocol.TSet _set529 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.serverTypes = new HashSet(2*_set529.size); + ServerType _elem530; + for (int _i531 = 0; _i531 < _set529.size; ++_i531) { - _elem520 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); - struct.serverTypes.add(_elem520); + _elem530 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); + struct.serverTypes.add(_elem530); } } struct.setServerTypesIsSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TSet _set522 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.serverGroups = new HashSet(2*_set522.size); - String _elem523; - for (int _i524 = 0; _i524 < _set522.size; ++_i524) + org.apache.thrift.protocol.TSet _set532 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.serverGroups = new HashSet(2*_set532.size); + String _elem533; + for (int _i534 = 0; _i534 < _set532.size; ++_i534) { - _elem523 = iprot.readString(); - struct.serverGroups.add(_elem523); + _elem533 = iprot.readString(); + struct.serverGroups.add(_elem533); } } struct.setServerGroupsIsSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TSet _set525 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.failedServers = new HashSet(2*_set525.size); - HostAddress _elem526; - for (int _i527 = 0; _i527 < _set525.size; ++_i527) + org.apache.thrift.protocol.TSet _set535 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.failedServers = new HashSet(2*_set535.size); + HostAddress _elem536; + for (int _i537 = 0; _i537 < _set535.size; ++_i537) { - _elem526 = new HostAddress(); - _elem526.read(iprot); - struct.failedServers.add(_elem526); + _elem536 = new HostAddress(); + _elem536.read(iprot); + struct.failedServers.add(_elem536); } } struct.setFailedServersIsSet(true); @@ -2511,14 +2511,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getAllServersWithPr case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list528 = iprot.readListBegin(); - struct.success = new ArrayList(_list528.size); - HostAddress _elem529; - for (int _i530 = 0; _i530 < _list528.size; ++_i530) + org.apache.thrift.protocol.TList _list538 = iprot.readListBegin(); + struct.success = new ArrayList(_list538.size); + HostAddress _elem539; + for (int _i540 = 0; _i540 < _list538.size; ++_i540) { - _elem529 = new HostAddress(); - _elem529.read(iprot); - struct.success.add(_elem529); + _elem539 = new HostAddress(); + _elem539.read(iprot); + struct.success.add(_elem539); } iprot.readListEnd(); } @@ -2555,9 +2555,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getAllServersWithP oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (HostAddress _iter531 : struct.success) + for (HostAddress _iter541 : struct.success) { - _iter531.write(oprot); + _iter541.write(oprot); } oprot.writeListEnd(); } @@ -2596,9 +2596,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, getAllServersWithPr if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (HostAddress _iter532 : struct.success) + for (HostAddress _iter542 : struct.success) { - _iter532.write(oprot); + _iter542.write(oprot); } } } @@ -2613,14 +2613,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, getAllServersWithPre BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list533 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list533.size); - HostAddress _elem534; - for (int _i535 = 0; _i535 < _list533.size; ++_i535) + org.apache.thrift.protocol.TList _list543 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.success = new ArrayList(_list543.size); + HostAddress _elem544; + for (int _i545 = 0; _i545 < _list543.size; ++_i545) { - _elem534 = new HostAddress(); - _elem534.read(iprot); - struct.success.add(_elem534); + _elem544 = new HostAddress(); + _elem544.read(iprot); + struct.success.add(_elem544); } } struct.setSuccessIsSet(true); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/OpenConnectionArgs.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/OpenConnectionArgs.java index 89b652944..600bc31ad 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/OpenConnectionArgs.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/OpenConnectionArgs.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class OpenConnectionArgs implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OpenConnectionArgs"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/OutputParameter.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/OutputParameter.java index c45c48179..5a3b02afd 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/OutputParameter.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/OutputParameter.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class OutputParameter implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OutputParameter"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/PrepareResult.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/PrepareResult.java index 3ad654be5..d1d89fe7a 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/PrepareResult.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/PrepareResult.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class PrepareResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrepareResult"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/RowSet.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/RowSet.java index 16ffdc0c9..07fc68ae3 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/RowSet.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/RowSet.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class RowSet implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RowSet"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/ServiceMetaData.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/ServiceMetaData.java index 9b4538418..89e0cb973 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/ServiceMetaData.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/ServiceMetaData.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class ServiceMetaData implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ServiceMetaData"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/ServiceMetaDataArgs.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/ServiceMetaDataArgs.java index af90b8e2e..fdcb10384 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/ServiceMetaDataArgs.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/ServiceMetaDataArgs.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class ServiceMetaDataArgs implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ServiceMetaDataArgs"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/SnappyDataService.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/SnappyDataService.java index 6d0c673a9..7c6dea31e 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/SnappyDataService.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/SnappyDataService.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class SnappyDataService { public interface Iface { @@ -3013,13 +3013,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getPreferredServer_ case 1: // SERVER_TYPES if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set536 = iprot.readSetBegin(); - struct.serverTypes = new HashSet(2*_set536.size); - ServerType _elem537; - for (int _i538 = 0; _i538 < _set536.size; ++_i538) + org.apache.thrift.protocol.TSet _set546 = iprot.readSetBegin(); + struct.serverTypes = new HashSet(2*_set546.size); + ServerType _elem547; + for (int _i548 = 0; _i548 < _set546.size; ++_i548) { - _elem537 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); - struct.serverTypes.add(_elem537); + _elem547 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); + struct.serverTypes.add(_elem547); } iprot.readSetEnd(); } @@ -3031,13 +3031,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getPreferredServer_ case 2: // SERVER_GROUPS if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set539 = iprot.readSetBegin(); - struct.serverGroups = new HashSet(2*_set539.size); - String _elem540; - for (int _i541 = 0; _i541 < _set539.size; ++_i541) + org.apache.thrift.protocol.TSet _set549 = iprot.readSetBegin(); + struct.serverGroups = new HashSet(2*_set549.size); + String _elem550; + for (int _i551 = 0; _i551 < _set549.size; ++_i551) { - _elem540 = iprot.readString(); - struct.serverGroups.add(_elem540); + _elem550 = iprot.readString(); + struct.serverGroups.add(_elem550); } iprot.readSetEnd(); } @@ -3049,14 +3049,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getPreferredServer_ case 3: // FAILED_SERVERS if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set542 = iprot.readSetBegin(); - struct.failedServers = new HashSet(2*_set542.size); - HostAddress _elem543; - for (int _i544 = 0; _i544 < _set542.size; ++_i544) + org.apache.thrift.protocol.TSet _set552 = iprot.readSetBegin(); + struct.failedServers = new HashSet(2*_set552.size); + HostAddress _elem553; + for (int _i554 = 0; _i554 < _set552.size; ++_i554) { - _elem543 = new HostAddress(); - _elem543.read(iprot); - struct.failedServers.add(_elem543); + _elem553 = new HostAddress(); + _elem553.read(iprot); + struct.failedServers.add(_elem553); } iprot.readSetEnd(); } @@ -3084,9 +3084,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getPreferredServer oprot.writeFieldBegin(SERVER_TYPES_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, struct.serverTypes.size())); - for (ServerType _iter545 : struct.serverTypes) + for (ServerType _iter555 : struct.serverTypes) { - oprot.writeI32(_iter545.getValue()); + oprot.writeI32(_iter555.getValue()); } oprot.writeSetEnd(); } @@ -3096,9 +3096,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getPreferredServer oprot.writeFieldBegin(SERVER_GROUPS_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.serverGroups.size())); - for (String _iter546 : struct.serverGroups) + for (String _iter556 : struct.serverGroups) { - oprot.writeString(_iter546); + oprot.writeString(_iter556); } oprot.writeSetEnd(); } @@ -3108,9 +3108,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getPreferredServer oprot.writeFieldBegin(FAILED_SERVERS_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, struct.failedServers.size())); - for (HostAddress _iter547 : struct.failedServers) + for (HostAddress _iter557 : struct.failedServers) { - _iter547.write(oprot); + _iter557.write(oprot); } oprot.writeSetEnd(); } @@ -3147,27 +3147,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, getPreferredServer_ if (struct.isSetServerTypes()) { { oprot.writeI32(struct.serverTypes.size()); - for (ServerType _iter548 : struct.serverTypes) + for (ServerType _iter558 : struct.serverTypes) { - oprot.writeI32(_iter548.getValue()); + oprot.writeI32(_iter558.getValue()); } } } if (struct.isSetServerGroups()) { { oprot.writeI32(struct.serverGroups.size()); - for (String _iter549 : struct.serverGroups) + for (String _iter559 : struct.serverGroups) { - oprot.writeString(_iter549); + oprot.writeString(_iter559); } } } if (struct.isSetFailedServers()) { { oprot.writeI32(struct.failedServers.size()); - for (HostAddress _iter550 : struct.failedServers) + for (HostAddress _iter560 : struct.failedServers) { - _iter550.write(oprot); + _iter560.write(oprot); } } } @@ -3179,40 +3179,40 @@ public void read(org.apache.thrift.protocol.TProtocol prot, getPreferredServer_a BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { { - org.apache.thrift.protocol.TSet _set551 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.serverTypes = new HashSet(2*_set551.size); - ServerType _elem552; - for (int _i553 = 0; _i553 < _set551.size; ++_i553) + org.apache.thrift.protocol.TSet _set561 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.serverTypes = new HashSet(2*_set561.size); + ServerType _elem562; + for (int _i563 = 0; _i563 < _set561.size; ++_i563) { - _elem552 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); - struct.serverTypes.add(_elem552); + _elem562 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); + struct.serverTypes.add(_elem562); } } struct.setServerTypesIsSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TSet _set554 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.serverGroups = new HashSet(2*_set554.size); - String _elem555; - for (int _i556 = 0; _i556 < _set554.size; ++_i556) + org.apache.thrift.protocol.TSet _set564 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.serverGroups = new HashSet(2*_set564.size); + String _elem565; + for (int _i566 = 0; _i566 < _set564.size; ++_i566) { - _elem555 = iprot.readString(); - struct.serverGroups.add(_elem555); + _elem565 = iprot.readString(); + struct.serverGroups.add(_elem565); } } struct.setServerGroupsIsSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TSet _set557 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.failedServers = new HashSet(2*_set557.size); - HostAddress _elem558; - for (int _i559 = 0; _i559 < _set557.size; ++_i559) + org.apache.thrift.protocol.TSet _set567 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.failedServers = new HashSet(2*_set567.size); + HostAddress _elem568; + for (int _i569 = 0; _i569 < _set567.size; ++_i569) { - _elem558 = new HostAddress(); - _elem558.read(iprot); - struct.failedServers.add(_elem558); + _elem568 = new HostAddress(); + _elem568.read(iprot); + struct.failedServers.add(_elem568); } } struct.setFailedServersIsSet(true); @@ -4212,13 +4212,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getAllServersWithPr case 1: // SERVER_TYPES if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set560 = iprot.readSetBegin(); - struct.serverTypes = new HashSet(2*_set560.size); - ServerType _elem561; - for (int _i562 = 0; _i562 < _set560.size; ++_i562) + org.apache.thrift.protocol.TSet _set570 = iprot.readSetBegin(); + struct.serverTypes = new HashSet(2*_set570.size); + ServerType _elem571; + for (int _i572 = 0; _i572 < _set570.size; ++_i572) { - _elem561 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); - struct.serverTypes.add(_elem561); + _elem571 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); + struct.serverTypes.add(_elem571); } iprot.readSetEnd(); } @@ -4230,13 +4230,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getAllServersWithPr case 2: // SERVER_GROUPS if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set563 = iprot.readSetBegin(); - struct.serverGroups = new HashSet(2*_set563.size); - String _elem564; - for (int _i565 = 0; _i565 < _set563.size; ++_i565) + org.apache.thrift.protocol.TSet _set573 = iprot.readSetBegin(); + struct.serverGroups = new HashSet(2*_set573.size); + String _elem574; + for (int _i575 = 0; _i575 < _set573.size; ++_i575) { - _elem564 = iprot.readString(); - struct.serverGroups.add(_elem564); + _elem574 = iprot.readString(); + struct.serverGroups.add(_elem574); } iprot.readSetEnd(); } @@ -4248,14 +4248,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getAllServersWithPr case 3: // FAILED_SERVERS if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set566 = iprot.readSetBegin(); - struct.failedServers = new HashSet(2*_set566.size); - HostAddress _elem567; - for (int _i568 = 0; _i568 < _set566.size; ++_i568) + org.apache.thrift.protocol.TSet _set576 = iprot.readSetBegin(); + struct.failedServers = new HashSet(2*_set576.size); + HostAddress _elem577; + for (int _i578 = 0; _i578 < _set576.size; ++_i578) { - _elem567 = new HostAddress(); - _elem567.read(iprot); - struct.failedServers.add(_elem567); + _elem577 = new HostAddress(); + _elem577.read(iprot); + struct.failedServers.add(_elem577); } iprot.readSetEnd(); } @@ -4283,9 +4283,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getAllServersWithP oprot.writeFieldBegin(SERVER_TYPES_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, struct.serverTypes.size())); - for (ServerType _iter569 : struct.serverTypes) + for (ServerType _iter579 : struct.serverTypes) { - oprot.writeI32(_iter569.getValue()); + oprot.writeI32(_iter579.getValue()); } oprot.writeSetEnd(); } @@ -4295,9 +4295,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getAllServersWithP oprot.writeFieldBegin(SERVER_GROUPS_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.serverGroups.size())); - for (String _iter570 : struct.serverGroups) + for (String _iter580 : struct.serverGroups) { - oprot.writeString(_iter570); + oprot.writeString(_iter580); } oprot.writeSetEnd(); } @@ -4307,9 +4307,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getAllServersWithP oprot.writeFieldBegin(FAILED_SERVERS_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, struct.failedServers.size())); - for (HostAddress _iter571 : struct.failedServers) + for (HostAddress _iter581 : struct.failedServers) { - _iter571.write(oprot); + _iter581.write(oprot); } oprot.writeSetEnd(); } @@ -4346,27 +4346,27 @@ public void write(org.apache.thrift.protocol.TProtocol prot, getAllServersWithPr if (struct.isSetServerTypes()) { { oprot.writeI32(struct.serverTypes.size()); - for (ServerType _iter572 : struct.serverTypes) + for (ServerType _iter582 : struct.serverTypes) { - oprot.writeI32(_iter572.getValue()); + oprot.writeI32(_iter582.getValue()); } } } if (struct.isSetServerGroups()) { { oprot.writeI32(struct.serverGroups.size()); - for (String _iter573 : struct.serverGroups) + for (String _iter583 : struct.serverGroups) { - oprot.writeString(_iter573); + oprot.writeString(_iter583); } } } if (struct.isSetFailedServers()) { { oprot.writeI32(struct.failedServers.size()); - for (HostAddress _iter574 : struct.failedServers) + for (HostAddress _iter584 : struct.failedServers) { - _iter574.write(oprot); + _iter584.write(oprot); } } } @@ -4378,40 +4378,40 @@ public void read(org.apache.thrift.protocol.TProtocol prot, getAllServersWithPre BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { { - org.apache.thrift.protocol.TSet _set575 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.serverTypes = new HashSet(2*_set575.size); - ServerType _elem576; - for (int _i577 = 0; _i577 < _set575.size; ++_i577) + org.apache.thrift.protocol.TSet _set585 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.serverTypes = new HashSet(2*_set585.size); + ServerType _elem586; + for (int _i587 = 0; _i587 < _set585.size; ++_i587) { - _elem576 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); - struct.serverTypes.add(_elem576); + _elem586 = io.snappydata.thrift.ServerType.findByValue(iprot.readI32()); + struct.serverTypes.add(_elem586); } } struct.setServerTypesIsSet(true); } if (incoming.get(1)) { { - org.apache.thrift.protocol.TSet _set578 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.serverGroups = new HashSet(2*_set578.size); - String _elem579; - for (int _i580 = 0; _i580 < _set578.size; ++_i580) + org.apache.thrift.protocol.TSet _set588 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.serverGroups = new HashSet(2*_set588.size); + String _elem589; + for (int _i590 = 0; _i590 < _set588.size; ++_i590) { - _elem579 = iprot.readString(); - struct.serverGroups.add(_elem579); + _elem589 = iprot.readString(); + struct.serverGroups.add(_elem589); } } struct.setServerGroupsIsSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TSet _set581 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.failedServers = new HashSet(2*_set581.size); - HostAddress _elem582; - for (int _i583 = 0; _i583 < _set581.size; ++_i583) + org.apache.thrift.protocol.TSet _set591 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.failedServers = new HashSet(2*_set591.size); + HostAddress _elem592; + for (int _i593 = 0; _i593 < _set591.size; ++_i593) { - _elem582 = new HostAddress(); - _elem582.read(iprot); - struct.failedServers.add(_elem582); + _elem592 = new HostAddress(); + _elem592.read(iprot); + struct.failedServers.add(_elem592); } } struct.setFailedServersIsSet(true); @@ -4819,14 +4819,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getAllServersWithPr case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list584 = iprot.readListBegin(); - struct.success = new ArrayList(_list584.size); - HostAddress _elem585; - for (int _i586 = 0; _i586 < _list584.size; ++_i586) + org.apache.thrift.protocol.TList _list594 = iprot.readListBegin(); + struct.success = new ArrayList(_list594.size); + HostAddress _elem595; + for (int _i596 = 0; _i596 < _list594.size; ++_i596) { - _elem585 = new HostAddress(); - _elem585.read(iprot); - struct.success.add(_elem585); + _elem595 = new HostAddress(); + _elem595.read(iprot); + struct.success.add(_elem595); } iprot.readListEnd(); } @@ -4863,9 +4863,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getAllServersWithP oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (HostAddress _iter587 : struct.success) + for (HostAddress _iter597 : struct.success) { - _iter587.write(oprot); + _iter597.write(oprot); } oprot.writeListEnd(); } @@ -4904,9 +4904,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, getAllServersWithPr if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (HostAddress _iter588 : struct.success) + for (HostAddress _iter598 : struct.success) { - _iter588.write(oprot); + _iter598.write(oprot); } } } @@ -4921,14 +4921,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, getAllServersWithPre BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list589 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list589.size); - HostAddress _elem590; - for (int _i591 = 0; _i591 < _list589.size; ++_i591) + org.apache.thrift.protocol.TList _list599 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.success = new ArrayList(_list599.size); + HostAddress _elem600; + for (int _i601 = 0; _i601 < _list599.size; ++_i601) { - _elem590 = new HostAddress(); - _elem590.read(iprot); - struct.success.add(_elem590); + _elem600 = new HostAddress(); + _elem600.read(iprot); + struct.success.add(_elem600); } } struct.setSuccessIsSet(true); @@ -6460,16 +6460,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, execute_args struct case 3: // OUTPUT_PARAMS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map592 = iprot.readMapBegin(); - struct.outputParams = new HashMap(2*_map592.size); - int _key593; - OutputParameter _val594; - for (int _i595 = 0; _i595 < _map592.size; ++_i595) + org.apache.thrift.protocol.TMap _map602 = iprot.readMapBegin(); + struct.outputParams = new HashMap(2*_map602.size); + int _key603; + OutputParameter _val604; + for (int _i605 = 0; _i605 < _map602.size; ++_i605) { - _key593 = iprot.readI32(); - _val594 = new OutputParameter(); - _val594.read(iprot); - struct.outputParams.put(_key593, _val594); + _key603 = iprot.readI32(); + _val604 = new OutputParameter(); + _val604.read(iprot); + struct.outputParams.put(_key603, _val604); } iprot.readMapEnd(); } @@ -6522,10 +6522,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, execute_args struc oprot.writeFieldBegin(OUTPUT_PARAMS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, struct.outputParams.size())); - for (Map.Entry _iter596 : struct.outputParams.entrySet()) + for (Map.Entry _iter606 : struct.outputParams.entrySet()) { - oprot.writeI32(_iter596.getKey()); - _iter596.getValue().write(oprot); + oprot.writeI32(_iter606.getKey()); + _iter606.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -6584,10 +6584,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, execute_args struct if (struct.isSetOutputParams()) { { oprot.writeI32(struct.outputParams.size()); - for (Map.Entry _iter597 : struct.outputParams.entrySet()) + for (Map.Entry _iter607 : struct.outputParams.entrySet()) { - oprot.writeI32(_iter597.getKey()); - _iter597.getValue().write(oprot); + oprot.writeI32(_iter607.getKey()); + _iter607.getValue().write(oprot); } } } @@ -6613,16 +6613,16 @@ public void read(org.apache.thrift.protocol.TProtocol prot, execute_args struct) } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map598 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.outputParams = new HashMap(2*_map598.size); - int _key599; - OutputParameter _val600; - for (int _i601 = 0; _i601 < _map598.size; ++_i601) + org.apache.thrift.protocol.TMap _map608 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.outputParams = new HashMap(2*_map608.size); + int _key609; + OutputParameter _val610; + for (int _i611 = 0; _i611 < _map608.size; ++_i611) { - _key599 = iprot.readI32(); - _val600 = new OutputParameter(); - _val600.read(iprot); - struct.outputParams.put(_key599, _val600); + _key609 = iprot.readI32(); + _val610 = new OutputParameter(); + _val610.read(iprot); + struct.outputParams.put(_key609, _val610); } } struct.setOutputParamsIsSet(true); @@ -7694,13 +7694,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, executeUpdate_args case 2: // SQLS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list602 = iprot.readListBegin(); - struct.sqls = new ArrayList(_list602.size); - String _elem603; - for (int _i604 = 0; _i604 < _list602.size; ++_i604) + org.apache.thrift.protocol.TList _list612 = iprot.readListBegin(); + struct.sqls = new ArrayList(_list612.size); + String _elem613; + for (int _i614 = 0; _i614 < _list612.size; ++_i614) { - _elem603 = iprot.readString(); - struct.sqls.add(_elem603); + _elem613 = iprot.readString(); + struct.sqls.add(_elem613); } iprot.readListEnd(); } @@ -7748,9 +7748,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, executeUpdate_args oprot.writeFieldBegin(SQLS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.sqls.size())); - for (String _iter605 : struct.sqls) + for (String _iter615 : struct.sqls) { - oprot.writeString(_iter605); + oprot.writeString(_iter615); } oprot.writeListEnd(); } @@ -7803,9 +7803,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, executeUpdate_args if (struct.isSetSqls()) { { oprot.writeI32(struct.sqls.size()); - for (String _iter606 : struct.sqls) + for (String _iter616 : struct.sqls) { - oprot.writeString(_iter606); + oprot.writeString(_iter616); } } } @@ -7827,13 +7827,13 @@ public void read(org.apache.thrift.protocol.TProtocol prot, executeUpdate_args s } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list607 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.sqls = new ArrayList(_list607.size); - String _elem608; - for (int _i609 = 0; _i609 < _list607.size; ++_i609) + org.apache.thrift.protocol.TList _list617 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.sqls = new ArrayList(_list617.size); + String _elem618; + for (int _i619 = 0; _i619 < _list617.size; ++_i619) { - _elem608 = iprot.readString(); - struct.sqls.add(_elem608); + _elem618 = iprot.readString(); + struct.sqls.add(_elem618); } } struct.setSqlsIsSet(true); @@ -10165,16 +10165,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, prepareStatement_ar case 3: // OUTPUT_PARAMS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map610 = iprot.readMapBegin(); - struct.outputParams = new HashMap(2*_map610.size); - int _key611; - OutputParameter _val612; - for (int _i613 = 0; _i613 < _map610.size; ++_i613) + org.apache.thrift.protocol.TMap _map620 = iprot.readMapBegin(); + struct.outputParams = new HashMap(2*_map620.size); + int _key621; + OutputParameter _val622; + for (int _i623 = 0; _i623 < _map620.size; ++_i623) { - _key611 = iprot.readI32(); - _val612 = new OutputParameter(); - _val612.read(iprot); - struct.outputParams.put(_key611, _val612); + _key621 = iprot.readI32(); + _val622 = new OutputParameter(); + _val622.read(iprot); + struct.outputParams.put(_key621, _val622); } iprot.readMapEnd(); } @@ -10227,10 +10227,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, prepareStatement_a oprot.writeFieldBegin(OUTPUT_PARAMS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, struct.outputParams.size())); - for (Map.Entry _iter614 : struct.outputParams.entrySet()) + for (Map.Entry _iter624 : struct.outputParams.entrySet()) { - oprot.writeI32(_iter614.getKey()); - _iter614.getValue().write(oprot); + oprot.writeI32(_iter624.getKey()); + _iter624.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -10289,10 +10289,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, prepareStatement_ar if (struct.isSetOutputParams()) { { oprot.writeI32(struct.outputParams.size()); - for (Map.Entry _iter615 : struct.outputParams.entrySet()) + for (Map.Entry _iter625 : struct.outputParams.entrySet()) { - oprot.writeI32(_iter615.getKey()); - _iter615.getValue().write(oprot); + oprot.writeI32(_iter625.getKey()); + _iter625.getValue().write(oprot); } } } @@ -10318,16 +10318,16 @@ public void read(org.apache.thrift.protocol.TProtocol prot, prepareStatement_arg } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map616 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.outputParams = new HashMap(2*_map616.size); - int _key617; - OutputParameter _val618; - for (int _i619 = 0; _i619 < _map616.size; ++_i619) + org.apache.thrift.protocol.TMap _map626 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.outputParams = new HashMap(2*_map626.size); + int _key627; + OutputParameter _val628; + for (int _i629 = 0; _i629 < _map626.size; ++_i629) { - _key617 = iprot.readI32(); - _val618 = new OutputParameter(); - _val618.read(iprot); - struct.outputParams.put(_key617, _val618); + _key627 = iprot.readI32(); + _val628 = new OutputParameter(); + _val628.read(iprot); + struct.outputParams.put(_key627, _val628); } } struct.setOutputParamsIsSet(true); @@ -11501,16 +11501,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, executePrepared_arg case 3: // OUTPUT_PARAMS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map620 = iprot.readMapBegin(); - struct.outputParams = new HashMap(2*_map620.size); - int _key621; - OutputParameter _val622; - for (int _i623 = 0; _i623 < _map620.size; ++_i623) + org.apache.thrift.protocol.TMap _map630 = iprot.readMapBegin(); + struct.outputParams = new HashMap(2*_map630.size); + int _key631; + OutputParameter _val632; + for (int _i633 = 0; _i633 < _map630.size; ++_i633) { - _key621 = iprot.readI32(); - _val622 = new OutputParameter(); - _val622.read(iprot); - struct.outputParams.put(_key621, _val622); + _key631 = iprot.readI32(); + _val632 = new OutputParameter(); + _val632.read(iprot); + struct.outputParams.put(_key631, _val632); } iprot.readMapEnd(); } @@ -11563,10 +11563,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, executePrepared_ar oprot.writeFieldBegin(OUTPUT_PARAMS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, struct.outputParams.size())); - for (Map.Entry _iter624 : struct.outputParams.entrySet()) + for (Map.Entry _iter634 : struct.outputParams.entrySet()) { - oprot.writeI32(_iter624.getKey()); - _iter624.getValue().write(oprot); + oprot.writeI32(_iter634.getKey()); + _iter634.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -11625,10 +11625,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, executePrepared_arg if (struct.isSetOutputParams()) { { oprot.writeI32(struct.outputParams.size()); - for (Map.Entry _iter625 : struct.outputParams.entrySet()) + for (Map.Entry _iter635 : struct.outputParams.entrySet()) { - oprot.writeI32(_iter625.getKey()); - _iter625.getValue().write(oprot); + oprot.writeI32(_iter635.getKey()); + _iter635.getValue().write(oprot); } } } @@ -11655,16 +11655,16 @@ public void read(org.apache.thrift.protocol.TProtocol prot, executePrepared_args } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map626 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.outputParams = new HashMap(2*_map626.size); - int _key627; - OutputParameter _val628; - for (int _i629 = 0; _i629 < _map626.size; ++_i629) + org.apache.thrift.protocol.TMap _map636 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.outputParams = new HashMap(2*_map636.size); + int _key637; + OutputParameter _val638; + for (int _i639 = 0; _i639 < _map636.size; ++_i639) { - _key627 = iprot.readI32(); - _val628 = new OutputParameter(); - _val628.read(iprot); - struct.outputParams.put(_key627, _val628); + _key637 = iprot.readI32(); + _val638 = new OutputParameter(); + _val638.read(iprot); + struct.outputParams.put(_key637, _val638); } } struct.setOutputParamsIsSet(true); @@ -15073,14 +15073,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, executePreparedBatc case 2: // PARAMS_BATCH if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list630 = iprot.readListBegin(); - struct.paramsBatch = new ArrayList(_list630.size); - Row _elem631; - for (int _i632 = 0; _i632 < _list630.size; ++_i632) + org.apache.thrift.protocol.TList _list640 = iprot.readListBegin(); + struct.paramsBatch = new ArrayList(_list640.size); + Row _elem641; + for (int _i642 = 0; _i642 < _list640.size; ++_i642) { - _elem631 = new Row(); - _elem631.read(iprot); - struct.paramsBatch.add(_elem631); + _elem641 = new Row(); + _elem641.read(iprot); + struct.paramsBatch.add(_elem641); } iprot.readListEnd(); } @@ -15128,9 +15128,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, executePreparedBat oprot.writeFieldBegin(PARAMS_BATCH_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.paramsBatch.size())); - for (Row _iter633 : struct.paramsBatch) + for (Row _iter643 : struct.paramsBatch) { - _iter633.write(oprot); + _iter643.write(oprot); } oprot.writeListEnd(); } @@ -15183,9 +15183,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, executePreparedBatc if (struct.isSetParamsBatch()) { { oprot.writeI32(struct.paramsBatch.size()); - for (Row _iter634 : struct.paramsBatch) + for (Row _iter644 : struct.paramsBatch) { - _iter634.write(oprot); + _iter644.write(oprot); } } } @@ -15207,14 +15207,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, executePreparedBatch } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list635 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.paramsBatch = new ArrayList(_list635.size); - Row _elem636; - for (int _i637 = 0; _i637 < _list635.size; ++_i637) + org.apache.thrift.protocol.TList _list645 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.paramsBatch = new ArrayList(_list645.size); + Row _elem646; + for (int _i647 = 0; _i647 < _list645.size; ++_i647) { - _elem636 = new Row(); - _elem636.read(iprot); - struct.paramsBatch.add(_elem636); + _elem646 = new Row(); + _elem646.read(iprot); + struct.paramsBatch.add(_elem646); } } struct.setParamsBatchIsSet(true); @@ -16486,14 +16486,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, prepareAndExecute_a case 3: // PARAMS_BATCH if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list638 = iprot.readListBegin(); - struct.paramsBatch = new ArrayList(_list638.size); - Row _elem639; - for (int _i640 = 0; _i640 < _list638.size; ++_i640) + org.apache.thrift.protocol.TList _list648 = iprot.readListBegin(); + struct.paramsBatch = new ArrayList(_list648.size); + Row _elem649; + for (int _i650 = 0; _i650 < _list648.size; ++_i650) { - _elem639 = new Row(); - _elem639.read(iprot); - struct.paramsBatch.add(_elem639); + _elem649 = new Row(); + _elem649.read(iprot); + struct.paramsBatch.add(_elem649); } iprot.readListEnd(); } @@ -16505,16 +16505,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, prepareAndExecute_a case 4: // OUTPUT_PARAMS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map641 = iprot.readMapBegin(); - struct.outputParams = new HashMap(2*_map641.size); - int _key642; - OutputParameter _val643; - for (int _i644 = 0; _i644 < _map641.size; ++_i644) + org.apache.thrift.protocol.TMap _map651 = iprot.readMapBegin(); + struct.outputParams = new HashMap(2*_map651.size); + int _key652; + OutputParameter _val653; + for (int _i654 = 0; _i654 < _map651.size; ++_i654) { - _key642 = iprot.readI32(); - _val643 = new OutputParameter(); - _val643.read(iprot); - struct.outputParams.put(_key642, _val643); + _key652 = iprot.readI32(); + _val653 = new OutputParameter(); + _val653.read(iprot); + struct.outputParams.put(_key652, _val653); } iprot.readMapEnd(); } @@ -16567,9 +16567,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, prepareAndExecute_ oprot.writeFieldBegin(PARAMS_BATCH_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.paramsBatch.size())); - for (Row _iter645 : struct.paramsBatch) + for (Row _iter655 : struct.paramsBatch) { - _iter645.write(oprot); + _iter655.write(oprot); } oprot.writeListEnd(); } @@ -16579,10 +16579,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, prepareAndExecute_ oprot.writeFieldBegin(OUTPUT_PARAMS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, struct.outputParams.size())); - for (Map.Entry _iter646 : struct.outputParams.entrySet()) + for (Map.Entry _iter656 : struct.outputParams.entrySet()) { - oprot.writeI32(_iter646.getKey()); - _iter646.getValue().write(oprot); + oprot.writeI32(_iter656.getKey()); + _iter656.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -16644,19 +16644,19 @@ public void write(org.apache.thrift.protocol.TProtocol prot, prepareAndExecute_a if (struct.isSetParamsBatch()) { { oprot.writeI32(struct.paramsBatch.size()); - for (Row _iter647 : struct.paramsBatch) + for (Row _iter657 : struct.paramsBatch) { - _iter647.write(oprot); + _iter657.write(oprot); } } } if (struct.isSetOutputParams()) { { oprot.writeI32(struct.outputParams.size()); - for (Map.Entry _iter648 : struct.outputParams.entrySet()) + for (Map.Entry _iter658 : struct.outputParams.entrySet()) { - oprot.writeI32(_iter648.getKey()); - _iter648.getValue().write(oprot); + oprot.writeI32(_iter658.getKey()); + _iter658.getValue().write(oprot); } } } @@ -16682,30 +16682,30 @@ public void read(org.apache.thrift.protocol.TProtocol prot, prepareAndExecute_ar } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list649 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.paramsBatch = new ArrayList(_list649.size); - Row _elem650; - for (int _i651 = 0; _i651 < _list649.size; ++_i651) + org.apache.thrift.protocol.TList _list659 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.paramsBatch = new ArrayList(_list659.size); + Row _elem660; + for (int _i661 = 0; _i661 < _list659.size; ++_i661) { - _elem650 = new Row(); - _elem650.read(iprot); - struct.paramsBatch.add(_elem650); + _elem660 = new Row(); + _elem660.read(iprot); + struct.paramsBatch.add(_elem660); } } struct.setParamsBatchIsSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map652 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.outputParams = new HashMap(2*_map652.size); - int _key653; - OutputParameter _val654; - for (int _i655 = 0; _i655 < _map652.size; ++_i655) + org.apache.thrift.protocol.TMap _map662 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.outputParams = new HashMap(2*_map662.size); + int _key663; + OutputParameter _val664; + for (int _i665 = 0; _i665 < _map662.size; ++_i665) { - _key653 = iprot.readI32(); - _val654 = new OutputParameter(); - _val654.read(iprot); - struct.outputParams.put(_key653, _val654); + _key663 = iprot.readI32(); + _val664 = new OutputParameter(); + _val664.read(iprot); + struct.outputParams.put(_key663, _val664); } } struct.setOutputParamsIsSet(true); @@ -17786,15 +17786,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, beginTransaction_ar case 3: // FLAGS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map656 = iprot.readMapBegin(); - struct.flags = new HashMap(2*_map656.size); - TransactionAttribute _key657; - boolean _val658; - for (int _i659 = 0; _i659 < _map656.size; ++_i659) + org.apache.thrift.protocol.TMap _map666 = iprot.readMapBegin(); + struct.flags = new HashMap(2*_map666.size); + TransactionAttribute _key667; + boolean _val668; + for (int _i669 = 0; _i669 < _map666.size; ++_i669) { - _key657 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); - _val658 = iprot.readBool(); - struct.flags.put(_key657, _val658); + _key667 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); + _val668 = iprot.readBool(); + struct.flags.put(_key667, _val668); } iprot.readMapEnd(); } @@ -17836,10 +17836,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, beginTransaction_a oprot.writeFieldBegin(FLAGS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.BOOL, struct.flags.size())); - for (Map.Entry _iter660 : struct.flags.entrySet()) + for (Map.Entry _iter670 : struct.flags.entrySet()) { - oprot.writeI32(_iter660.getKey().getValue()); - oprot.writeBool(_iter660.getValue()); + oprot.writeI32(_iter670.getKey().getValue()); + oprot.writeBool(_iter670.getValue()); } oprot.writeMapEnd(); } @@ -17890,10 +17890,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, beginTransaction_ar if (struct.isSetFlags()) { { oprot.writeI32(struct.flags.size()); - for (Map.Entry _iter661 : struct.flags.entrySet()) + for (Map.Entry _iter671 : struct.flags.entrySet()) { - oprot.writeI32(_iter661.getKey().getValue()); - oprot.writeBool(_iter661.getValue()); + oprot.writeI32(_iter671.getKey().getValue()); + oprot.writeBool(_iter671.getValue()); } } } @@ -17916,15 +17916,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, beginTransaction_arg } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map662 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.BOOL, iprot.readI32()); - struct.flags = new HashMap(2*_map662.size); - TransactionAttribute _key663; - boolean _val664; - for (int _i665 = 0; _i665 < _map662.size; ++_i665) + org.apache.thrift.protocol.TMap _map672 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.BOOL, iprot.readI32()); + struct.flags = new HashMap(2*_map672.size); + TransactionAttribute _key673; + boolean _val674; + for (int _i675 = 0; _i675 < _map672.size; ++_i675) { - _key663 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); - _val664 = iprot.readBool(); - struct.flags.put(_key663, _val664); + _key673 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); + _val674 = iprot.readBool(); + struct.flags.put(_key673, _val674); } } struct.setFlagsIsSet(true); @@ -18909,15 +18909,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setTransactionAttri case 2: // FLAGS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map666 = iprot.readMapBegin(); - struct.flags = new HashMap(2*_map666.size); - TransactionAttribute _key667; - boolean _val668; - for (int _i669 = 0; _i669 < _map666.size; ++_i669) + org.apache.thrift.protocol.TMap _map676 = iprot.readMapBegin(); + struct.flags = new HashMap(2*_map676.size); + TransactionAttribute _key677; + boolean _val678; + for (int _i679 = 0; _i679 < _map676.size; ++_i679) { - _key667 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); - _val668 = iprot.readBool(); - struct.flags.put(_key667, _val668); + _key677 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); + _val678 = iprot.readBool(); + struct.flags.put(_key677, _val678); } iprot.readMapEnd(); } @@ -18956,10 +18956,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setTransactionAttr oprot.writeFieldBegin(FLAGS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.BOOL, struct.flags.size())); - for (Map.Entry _iter670 : struct.flags.entrySet()) + for (Map.Entry _iter680 : struct.flags.entrySet()) { - oprot.writeI32(_iter670.getKey().getValue()); - oprot.writeBool(_iter670.getValue()); + oprot.writeI32(_iter680.getKey().getValue()); + oprot.writeBool(_iter680.getValue()); } oprot.writeMapEnd(); } @@ -19004,10 +19004,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setTransactionAttri if (struct.isSetFlags()) { { oprot.writeI32(struct.flags.size()); - for (Map.Entry _iter671 : struct.flags.entrySet()) + for (Map.Entry _iter681 : struct.flags.entrySet()) { - oprot.writeI32(_iter671.getKey().getValue()); - oprot.writeBool(_iter671.getValue()); + oprot.writeI32(_iter681.getKey().getValue()); + oprot.writeBool(_iter681.getValue()); } } } @@ -19026,15 +19026,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, setTransactionAttrib } if (incoming.get(1)) { { - org.apache.thrift.protocol.TMap _map672 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.BOOL, iprot.readI32()); - struct.flags = new HashMap(2*_map672.size); - TransactionAttribute _key673; - boolean _val674; - for (int _i675 = 0; _i675 < _map672.size; ++_i675) + org.apache.thrift.protocol.TMap _map682 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.BOOL, iprot.readI32()); + struct.flags = new HashMap(2*_map682.size); + TransactionAttribute _key683; + boolean _val684; + for (int _i685 = 0; _i685 < _map682.size; ++_i685) { - _key673 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); - _val674 = iprot.readBool(); - struct.flags.put(_key673, _val674); + _key683 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); + _val684 = iprot.readBool(); + struct.flags.put(_key683, _val684); } } struct.setFlagsIsSet(true); @@ -20288,15 +20288,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getTransactionAttri case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map676 = iprot.readMapBegin(); - struct.success = new HashMap(2*_map676.size); - TransactionAttribute _key677; - boolean _val678; - for (int _i679 = 0; _i679 < _map676.size; ++_i679) + org.apache.thrift.protocol.TMap _map686 = iprot.readMapBegin(); + struct.success = new HashMap(2*_map686.size); + TransactionAttribute _key687; + boolean _val688; + for (int _i689 = 0; _i689 < _map686.size; ++_i689) { - _key677 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); - _val678 = iprot.readBool(); - struct.success.put(_key677, _val678); + _key687 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); + _val688 = iprot.readBool(); + struct.success.put(_key687, _val688); } iprot.readMapEnd(); } @@ -20333,10 +20333,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getTransactionAttr oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.BOOL, struct.success.size())); - for (Map.Entry _iter680 : struct.success.entrySet()) + for (Map.Entry _iter690 : struct.success.entrySet()) { - oprot.writeI32(_iter680.getKey().getValue()); - oprot.writeBool(_iter680.getValue()); + oprot.writeI32(_iter690.getKey().getValue()); + oprot.writeBool(_iter690.getValue()); } oprot.writeMapEnd(); } @@ -20375,10 +20375,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, getTransactionAttri if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (Map.Entry _iter681 : struct.success.entrySet()) + for (Map.Entry _iter691 : struct.success.entrySet()) { - oprot.writeI32(_iter681.getKey().getValue()); - oprot.writeBool(_iter681.getValue()); + oprot.writeI32(_iter691.getKey().getValue()); + oprot.writeBool(_iter691.getValue()); } } } @@ -20393,15 +20393,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, getTransactionAttrib BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map682 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.BOOL, iprot.readI32()); - struct.success = new HashMap(2*_map682.size); - TransactionAttribute _key683; - boolean _val684; - for (int _i685 = 0; _i685 < _map682.size; ++_i685) + org.apache.thrift.protocol.TMap _map692 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.BOOL, iprot.readI32()); + struct.success = new HashMap(2*_map692.size); + TransactionAttribute _key693; + boolean _val694; + for (int _i695 = 0; _i695 < _map692.size; ++_i695) { - _key683 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); - _val684 = iprot.readBool(); - struct.success.put(_key683, _val684); + _key693 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); + _val694 = iprot.readBool(); + struct.success.put(_key693, _val694); } } struct.setSuccessIsSet(true); @@ -21005,15 +21005,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, commitTransaction_a case 3: // FLAGS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map686 = iprot.readMapBegin(); - struct.flags = new HashMap(2*_map686.size); - TransactionAttribute _key687; - boolean _val688; - for (int _i689 = 0; _i689 < _map686.size; ++_i689) + org.apache.thrift.protocol.TMap _map696 = iprot.readMapBegin(); + struct.flags = new HashMap(2*_map696.size); + TransactionAttribute _key697; + boolean _val698; + for (int _i699 = 0; _i699 < _map696.size; ++_i699) { - _key687 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); - _val688 = iprot.readBool(); - struct.flags.put(_key687, _val688); + _key697 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); + _val698 = iprot.readBool(); + struct.flags.put(_key697, _val698); } iprot.readMapEnd(); } @@ -21055,10 +21055,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, commitTransaction_ oprot.writeFieldBegin(FLAGS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.BOOL, struct.flags.size())); - for (Map.Entry _iter690 : struct.flags.entrySet()) + for (Map.Entry _iter700 : struct.flags.entrySet()) { - oprot.writeI32(_iter690.getKey().getValue()); - oprot.writeBool(_iter690.getValue()); + oprot.writeI32(_iter700.getKey().getValue()); + oprot.writeBool(_iter700.getValue()); } oprot.writeMapEnd(); } @@ -21109,10 +21109,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, commitTransaction_a if (struct.isSetFlags()) { { oprot.writeI32(struct.flags.size()); - for (Map.Entry _iter691 : struct.flags.entrySet()) + for (Map.Entry _iter701 : struct.flags.entrySet()) { - oprot.writeI32(_iter691.getKey().getValue()); - oprot.writeBool(_iter691.getValue()); + oprot.writeI32(_iter701.getKey().getValue()); + oprot.writeBool(_iter701.getValue()); } } } @@ -21135,15 +21135,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, commitTransaction_ar } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map692 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.BOOL, iprot.readI32()); - struct.flags = new HashMap(2*_map692.size); - TransactionAttribute _key693; - boolean _val694; - for (int _i695 = 0; _i695 < _map692.size; ++_i695) + org.apache.thrift.protocol.TMap _map702 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.BOOL, iprot.readI32()); + struct.flags = new HashMap(2*_map702.size); + TransactionAttribute _key703; + boolean _val704; + for (int _i705 = 0; _i705 < _map702.size; ++_i705) { - _key693 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); - _val694 = iprot.readBool(); - struct.flags.put(_key693, _val694); + _key703 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); + _val704 = iprot.readBool(); + struct.flags.put(_key703, _val704); } } struct.setFlagsIsSet(true); @@ -22109,15 +22109,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, rollbackTransaction case 3: // FLAGS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map696 = iprot.readMapBegin(); - struct.flags = new HashMap(2*_map696.size); - TransactionAttribute _key697; - boolean _val698; - for (int _i699 = 0; _i699 < _map696.size; ++_i699) + org.apache.thrift.protocol.TMap _map706 = iprot.readMapBegin(); + struct.flags = new HashMap(2*_map706.size); + TransactionAttribute _key707; + boolean _val708; + for (int _i709 = 0; _i709 < _map706.size; ++_i709) { - _key697 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); - _val698 = iprot.readBool(); - struct.flags.put(_key697, _val698); + _key707 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); + _val708 = iprot.readBool(); + struct.flags.put(_key707, _val708); } iprot.readMapEnd(); } @@ -22159,10 +22159,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, rollbackTransactio oprot.writeFieldBegin(FLAGS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.BOOL, struct.flags.size())); - for (Map.Entry _iter700 : struct.flags.entrySet()) + for (Map.Entry _iter710 : struct.flags.entrySet()) { - oprot.writeI32(_iter700.getKey().getValue()); - oprot.writeBool(_iter700.getValue()); + oprot.writeI32(_iter710.getKey().getValue()); + oprot.writeBool(_iter710.getValue()); } oprot.writeMapEnd(); } @@ -22213,10 +22213,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, rollbackTransaction if (struct.isSetFlags()) { { oprot.writeI32(struct.flags.size()); - for (Map.Entry _iter701 : struct.flags.entrySet()) + for (Map.Entry _iter711 : struct.flags.entrySet()) { - oprot.writeI32(_iter701.getKey().getValue()); - oprot.writeBool(_iter701.getValue()); + oprot.writeI32(_iter711.getKey().getValue()); + oprot.writeBool(_iter711.getValue()); } } } @@ -22239,15 +22239,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, rollbackTransaction_ } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map702 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.BOOL, iprot.readI32()); - struct.flags = new HashMap(2*_map702.size); - TransactionAttribute _key703; - boolean _val704; - for (int _i705 = 0; _i705 < _map702.size; ++_i705) + org.apache.thrift.protocol.TMap _map712 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.BOOL, iprot.readI32()); + struct.flags = new HashMap(2*_map712.size); + TransactionAttribute _key713; + boolean _val714; + for (int _i715 = 0; _i715 < _map712.size; ++_i715) { - _key703 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); - _val704 = iprot.readBool(); - struct.flags.put(_key703, _val704); + _key713 = io.snappydata.thrift.TransactionAttribute.findByValue(iprot.readI32()); + _val714 = iprot.readBool(); + struct.flags.put(_key713, _val714); } } struct.setFlagsIsSet(true); @@ -31542,13 +31542,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, executeCursorUpdate case 2: // OPERATIONS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list706 = iprot.readListBegin(); - struct.operations = new ArrayList(_list706.size); - CursorUpdateOperation _elem707; - for (int _i708 = 0; _i708 < _list706.size; ++_i708) + org.apache.thrift.protocol.TList _list716 = iprot.readListBegin(); + struct.operations = new ArrayList(_list716.size); + CursorUpdateOperation _elem717; + for (int _i718 = 0; _i718 < _list716.size; ++_i718) { - _elem707 = io.snappydata.thrift.CursorUpdateOperation.findByValue(iprot.readI32()); - struct.operations.add(_elem707); + _elem717 = io.snappydata.thrift.CursorUpdateOperation.findByValue(iprot.readI32()); + struct.operations.add(_elem717); } iprot.readListEnd(); } @@ -31560,14 +31560,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, executeCursorUpdate case 3: // CHANGED_ROWS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list709 = iprot.readListBegin(); - struct.changedRows = new ArrayList(_list709.size); - Row _elem710; - for (int _i711 = 0; _i711 < _list709.size; ++_i711) + org.apache.thrift.protocol.TList _list719 = iprot.readListBegin(); + struct.changedRows = new ArrayList(_list719.size); + Row _elem720; + for (int _i721 = 0; _i721 < _list719.size; ++_i721) { - _elem710 = new Row(); - _elem710.read(iprot); - struct.changedRows.add(_elem710); + _elem720 = new Row(); + _elem720.read(iprot); + struct.changedRows.add(_elem720); } iprot.readListEnd(); } @@ -31579,23 +31579,23 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, executeCursorUpdate case 4: // CHANGED_COLUMNS_LIST if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list712 = iprot.readListBegin(); - struct.changedColumnsList = new ArrayList>(_list712.size); - List _elem713; - for (int _i714 = 0; _i714 < _list712.size; ++_i714) + org.apache.thrift.protocol.TList _list722 = iprot.readListBegin(); + struct.changedColumnsList = new ArrayList>(_list722.size); + List _elem723; + for (int _i724 = 0; _i724 < _list722.size; ++_i724) { { - org.apache.thrift.protocol.TList _list715 = iprot.readListBegin(); - _elem713 = new ArrayList(_list715.size); - int _elem716; - for (int _i717 = 0; _i717 < _list715.size; ++_i717) + org.apache.thrift.protocol.TList _list725 = iprot.readListBegin(); + _elem723 = new ArrayList(_list725.size); + int _elem726; + for (int _i727 = 0; _i727 < _list725.size; ++_i727) { - _elem716 = iprot.readI32(); - _elem713.add(_elem716); + _elem726 = iprot.readI32(); + _elem723.add(_elem726); } iprot.readListEnd(); } - struct.changedColumnsList.add(_elem713); + struct.changedColumnsList.add(_elem723); } iprot.readListEnd(); } @@ -31607,13 +31607,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, executeCursorUpdate case 5: // CHANGED_ROW_INDEXES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list718 = iprot.readListBegin(); - struct.changedRowIndexes = new ArrayList(_list718.size); - int _elem719; - for (int _i720 = 0; _i720 < _list718.size; ++_i720) + org.apache.thrift.protocol.TList _list728 = iprot.readListBegin(); + struct.changedRowIndexes = new ArrayList(_list728.size); + int _elem729; + for (int _i730 = 0; _i730 < _list728.size; ++_i730) { - _elem719 = iprot.readI32(); - struct.changedRowIndexes.add(_elem719); + _elem729 = iprot.readI32(); + struct.changedRowIndexes.add(_elem729); } iprot.readListEnd(); } @@ -31652,9 +31652,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, executeCursorUpdat oprot.writeFieldBegin(OPERATIONS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.operations.size())); - for (CursorUpdateOperation _iter721 : struct.operations) + for (CursorUpdateOperation _iter731 : struct.operations) { - oprot.writeI32(_iter721.getValue()); + oprot.writeI32(_iter731.getValue()); } oprot.writeListEnd(); } @@ -31664,9 +31664,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, executeCursorUpdat oprot.writeFieldBegin(CHANGED_ROWS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.changedRows.size())); - for (Row _iter722 : struct.changedRows) + for (Row _iter732 : struct.changedRows) { - _iter722.write(oprot); + _iter732.write(oprot); } oprot.writeListEnd(); } @@ -31676,13 +31676,13 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, executeCursorUpdat oprot.writeFieldBegin(CHANGED_COLUMNS_LIST_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.LIST, struct.changedColumnsList.size())); - for (List _iter723 : struct.changedColumnsList) + for (List _iter733 : struct.changedColumnsList) { { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, _iter723.size())); - for (int _iter724 : _iter723) + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, _iter733.size())); + for (int _iter734 : _iter733) { - oprot.writeI32(_iter724); + oprot.writeI32(_iter734); } oprot.writeListEnd(); } @@ -31695,9 +31695,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, executeCursorUpdat oprot.writeFieldBegin(CHANGED_ROW_INDEXES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.changedRowIndexes.size())); - for (int _iter725 : struct.changedRowIndexes) + for (int _iter735 : struct.changedRowIndexes) { - oprot.writeI32(_iter725); + oprot.writeI32(_iter735); } oprot.writeListEnd(); } @@ -31751,31 +31751,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, executeCursorUpdate if (struct.isSetOperations()) { { oprot.writeI32(struct.operations.size()); - for (CursorUpdateOperation _iter726 : struct.operations) + for (CursorUpdateOperation _iter736 : struct.operations) { - oprot.writeI32(_iter726.getValue()); + oprot.writeI32(_iter736.getValue()); } } } if (struct.isSetChangedRows()) { { oprot.writeI32(struct.changedRows.size()); - for (Row _iter727 : struct.changedRows) + for (Row _iter737 : struct.changedRows) { - _iter727.write(oprot); + _iter737.write(oprot); } } } if (struct.isSetChangedColumnsList()) { { oprot.writeI32(struct.changedColumnsList.size()); - for (List _iter728 : struct.changedColumnsList) + for (List _iter738 : struct.changedColumnsList) { { - oprot.writeI32(_iter728.size()); - for (int _iter729 : _iter728) + oprot.writeI32(_iter738.size()); + for (int _iter739 : _iter738) { - oprot.writeI32(_iter729); + oprot.writeI32(_iter739); } } } @@ -31784,9 +31784,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, executeCursorUpdate if (struct.isSetChangedRowIndexes()) { { oprot.writeI32(struct.changedRowIndexes.size()); - for (int _iter730 : struct.changedRowIndexes) + for (int _iter740 : struct.changedRowIndexes) { - oprot.writeI32(_iter730); + oprot.writeI32(_iter740); } } } @@ -31805,62 +31805,62 @@ public void read(org.apache.thrift.protocol.TProtocol prot, executeCursorUpdate_ } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list731 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.operations = new ArrayList(_list731.size); - CursorUpdateOperation _elem732; - for (int _i733 = 0; _i733 < _list731.size; ++_i733) + org.apache.thrift.protocol.TList _list741 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.operations = new ArrayList(_list741.size); + CursorUpdateOperation _elem742; + for (int _i743 = 0; _i743 < _list741.size; ++_i743) { - _elem732 = io.snappydata.thrift.CursorUpdateOperation.findByValue(iprot.readI32()); - struct.operations.add(_elem732); + _elem742 = io.snappydata.thrift.CursorUpdateOperation.findByValue(iprot.readI32()); + struct.operations.add(_elem742); } } struct.setOperationsIsSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list734 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.changedRows = new ArrayList(_list734.size); - Row _elem735; - for (int _i736 = 0; _i736 < _list734.size; ++_i736) + org.apache.thrift.protocol.TList _list744 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.changedRows = new ArrayList(_list744.size); + Row _elem745; + for (int _i746 = 0; _i746 < _list744.size; ++_i746) { - _elem735 = new Row(); - _elem735.read(iprot); - struct.changedRows.add(_elem735); + _elem745 = new Row(); + _elem745.read(iprot); + struct.changedRows.add(_elem745); } } struct.setChangedRowsIsSet(true); } if (incoming.get(3)) { { - org.apache.thrift.protocol.TList _list737 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.LIST, iprot.readI32()); - struct.changedColumnsList = new ArrayList>(_list737.size); - List _elem738; - for (int _i739 = 0; _i739 < _list737.size; ++_i739) + org.apache.thrift.protocol.TList _list747 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.LIST, iprot.readI32()); + struct.changedColumnsList = new ArrayList>(_list747.size); + List _elem748; + for (int _i749 = 0; _i749 < _list747.size; ++_i749) { { - org.apache.thrift.protocol.TList _list740 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - _elem738 = new ArrayList(_list740.size); - int _elem741; - for (int _i742 = 0; _i742 < _list740.size; ++_i742) + org.apache.thrift.protocol.TList _list750 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + _elem748 = new ArrayList(_list750.size); + int _elem751; + for (int _i752 = 0; _i752 < _list750.size; ++_i752) { - _elem741 = iprot.readI32(); - _elem738.add(_elem741); + _elem751 = iprot.readI32(); + _elem748.add(_elem751); } } - struct.changedColumnsList.add(_elem738); + struct.changedColumnsList.add(_elem748); } } struct.setChangedColumnsListIsSet(true); } if (incoming.get(4)) { { - org.apache.thrift.protocol.TList _list743 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.changedRowIndexes = new ArrayList(_list743.size); - int _elem744; - for (int _i745 = 0; _i745 < _list743.size; ++_i745) + org.apache.thrift.protocol.TList _list753 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.changedRowIndexes = new ArrayList(_list753.size); + int _elem754; + for (int _i755 = 0; _i755 < _list753.size; ++_i755) { - _elem744 = iprot.readI32(); - struct.changedRowIndexes.add(_elem744); + _elem754 = iprot.readI32(); + struct.changedRowIndexes.add(_elem754); } } struct.setChangedRowIndexesIsSet(true); @@ -39391,14 +39391,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, recoverXATransactio case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list746 = iprot.readListBegin(); - struct.success = new ArrayList(_list746.size); - TransactionXid _elem747; - for (int _i748 = 0; _i748 < _list746.size; ++_i748) + org.apache.thrift.protocol.TList _list756 = iprot.readListBegin(); + struct.success = new ArrayList(_list756.size); + TransactionXid _elem757; + for (int _i758 = 0; _i758 < _list756.size; ++_i758) { - _elem747 = new TransactionXid(); - _elem747.read(iprot); - struct.success.add(_elem747); + _elem757 = new TransactionXid(); + _elem757.read(iprot); + struct.success.add(_elem757); } iprot.readListEnd(); } @@ -39435,9 +39435,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, recoverXATransacti oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (TransactionXid _iter749 : struct.success) + for (TransactionXid _iter759 : struct.success) { - _iter749.write(oprot); + _iter759.write(oprot); } oprot.writeListEnd(); } @@ -39476,9 +39476,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, recoverXATransactio if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (TransactionXid _iter750 : struct.success) + for (TransactionXid _iter760 : struct.success) { - _iter750.write(oprot); + _iter760.write(oprot); } } } @@ -39493,14 +39493,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, recoverXATransaction BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list751 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list751.size); - TransactionXid _elem752; - for (int _i753 = 0; _i753 < _list751.size; ++_i753) + org.apache.thrift.protocol.TList _list761 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.success = new ArrayList(_list761.size); + TransactionXid _elem762; + for (int _i763 = 0; _i763 < _list761.size; ++_i763) { - _elem752 = new TransactionXid(); - _elem752.read(iprot); - struct.success.add(_elem752); + _elem762 = new TransactionXid(); + _elem762.read(iprot); + struct.success.add(_elem762); } } struct.setSuccessIsSet(true); @@ -42873,13 +42873,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getUDTs_args struct case 2: // TYPES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list754 = iprot.readListBegin(); - struct.types = new ArrayList(_list754.size); - SnappyType _elem755; - for (int _i756 = 0; _i756 < _list754.size; ++_i756) + org.apache.thrift.protocol.TList _list764 = iprot.readListBegin(); + struct.types = new ArrayList(_list764.size); + SnappyType _elem765; + for (int _i766 = 0; _i766 < _list764.size; ++_i766) { - _elem755 = io.snappydata.thrift.SnappyType.findByValue(iprot.readI32()); - struct.types.add(_elem755); + _elem765 = io.snappydata.thrift.SnappyType.findByValue(iprot.readI32()); + struct.types.add(_elem765); } iprot.readListEnd(); } @@ -42912,9 +42912,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getUDTs_args struc oprot.writeFieldBegin(TYPES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.types.size())); - for (SnappyType _iter757 : struct.types) + for (SnappyType _iter767 : struct.types) { - oprot.writeI32(_iter757.getValue()); + oprot.writeI32(_iter767.getValue()); } oprot.writeListEnd(); } @@ -42951,9 +42951,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, getUDTs_args struct if (struct.isSetTypes()) { { oprot.writeI32(struct.types.size()); - for (SnappyType _iter758 : struct.types) + for (SnappyType _iter768 : struct.types) { - oprot.writeI32(_iter758.getValue()); + oprot.writeI32(_iter768.getValue()); } } } @@ -42970,13 +42970,13 @@ public void read(org.apache.thrift.protocol.TProtocol prot, getUDTs_args struct) } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list759 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.types = new ArrayList(_list759.size); - SnappyType _elem760; - for (int _i761 = 0; _i761 < _list759.size; ++_i761) + org.apache.thrift.protocol.TList _list769 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.types = new ArrayList(_list769.size); + SnappyType _elem770; + for (int _i771 = 0; _i771 < _list769.size; ++_i771) { - _elem760 = io.snappydata.thrift.SnappyType.findByValue(iprot.readI32()); - struct.types.add(_elem760); + _elem770 = io.snappydata.thrift.SnappyType.findByValue(iprot.readI32()); + struct.types.add(_elem770); } } struct.setTypesIsSet(true); @@ -45372,14 +45372,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, fetchActiveConnecti case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list762 = iprot.readListBegin(); - struct.success = new ArrayList(_list762.size); - ConnectionProperties _elem763; - for (int _i764 = 0; _i764 < _list762.size; ++_i764) + org.apache.thrift.protocol.TList _list772 = iprot.readListBegin(); + struct.success = new ArrayList(_list772.size); + ConnectionProperties _elem773; + for (int _i774 = 0; _i774 < _list772.size; ++_i774) { - _elem763 = new ConnectionProperties(); - _elem763.read(iprot); - struct.success.add(_elem763); + _elem773 = new ConnectionProperties(); + _elem773.read(iprot); + struct.success.add(_elem773); } iprot.readListEnd(); } @@ -45416,9 +45416,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, fetchActiveConnect oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (ConnectionProperties _iter765 : struct.success) + for (ConnectionProperties _iter775 : struct.success) { - _iter765.write(oprot); + _iter775.write(oprot); } oprot.writeListEnd(); } @@ -45457,9 +45457,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, fetchActiveConnecti if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (ConnectionProperties _iter766 : struct.success) + for (ConnectionProperties _iter776 : struct.success) { - _iter766.write(oprot); + _iter776.write(oprot); } } } @@ -45474,14 +45474,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, fetchActiveConnectio BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list767 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list767.size); - ConnectionProperties _elem768; - for (int _i769 = 0; _i769 < _list767.size; ++_i769) + org.apache.thrift.protocol.TList _list777 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.success = new ArrayList(_list777.size); + ConnectionProperties _elem778; + for (int _i779 = 0; _i779 < _list777.size; ++_i779) { - _elem768 = new ConnectionProperties(); - _elem768.read(iprot); - struct.success.add(_elem768); + _elem778 = new ConnectionProperties(); + _elem778.read(iprot); + struct.success.add(_elem778); } } struct.setSuccessIsSet(true); @@ -46362,15 +46362,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, fetchActiveStatemen case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map770 = iprot.readMapBegin(); - struct.success = new HashMap(2*_map770.size); - long _key771; - String _val772; - for (int _i773 = 0; _i773 < _map770.size; ++_i773) + org.apache.thrift.protocol.TMap _map780 = iprot.readMapBegin(); + struct.success = new HashMap(2*_map780.size); + long _key781; + String _val782; + for (int _i783 = 0; _i783 < _map780.size; ++_i783) { - _key771 = iprot.readI64(); - _val772 = iprot.readString(); - struct.success.put(_key771, _val772); + _key781 = iprot.readI64(); + _val782 = iprot.readString(); + struct.success.put(_key781, _val782); } iprot.readMapEnd(); } @@ -46407,10 +46407,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, fetchActiveStateme oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I64, org.apache.thrift.protocol.TType.STRING, struct.success.size())); - for (Map.Entry _iter774 : struct.success.entrySet()) + for (Map.Entry _iter784 : struct.success.entrySet()) { - oprot.writeI64(_iter774.getKey()); - oprot.writeString(_iter774.getValue()); + oprot.writeI64(_iter784.getKey()); + oprot.writeString(_iter784.getValue()); } oprot.writeMapEnd(); } @@ -46449,10 +46449,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, fetchActiveStatemen if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (Map.Entry _iter775 : struct.success.entrySet()) + for (Map.Entry _iter785 : struct.success.entrySet()) { - oprot.writeI64(_iter775.getKey()); - oprot.writeString(_iter775.getValue()); + oprot.writeI64(_iter785.getKey()); + oprot.writeString(_iter785.getValue()); } } } @@ -46467,15 +46467,15 @@ public void read(org.apache.thrift.protocol.TProtocol prot, fetchActiveStatement BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TMap _map776 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I64, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.success = new HashMap(2*_map776.size); - long _key777; - String _val778; - for (int _i779 = 0; _i779 < _map776.size; ++_i779) + org.apache.thrift.protocol.TMap _map786 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I64, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.success = new HashMap(2*_map786.size); + long _key787; + String _val788; + for (int _i789 = 0; _i789 < _map786.size; ++_i789) { - _key777 = iprot.readI64(); - _val778 = iprot.readString(); - struct.success.put(_key777, _val778); + _key787 = iprot.readI64(); + _val788 = iprot.readString(); + struct.success.put(_key787, _val788); } } struct.setSuccessIsSet(true); @@ -50727,14 +50727,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, bulkClose_args stru case 1: // ENTITIES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list780 = iprot.readListBegin(); - struct.entities = new ArrayList(_list780.size); - EntityId _elem781; - for (int _i782 = 0; _i782 < _list780.size; ++_i782) + org.apache.thrift.protocol.TList _list790 = iprot.readListBegin(); + struct.entities = new ArrayList(_list790.size); + EntityId _elem791; + for (int _i792 = 0; _i792 < _list790.size; ++_i792) { - _elem781 = new EntityId(); - _elem781.read(iprot); - struct.entities.add(_elem781); + _elem791 = new EntityId(); + _elem791.read(iprot); + struct.entities.add(_elem791); } iprot.readListEnd(); } @@ -50762,9 +50762,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, bulkClose_args str oprot.writeFieldBegin(ENTITIES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.entities.size())); - for (EntityId _iter783 : struct.entities) + for (EntityId _iter793 : struct.entities) { - _iter783.write(oprot); + _iter793.write(oprot); } oprot.writeListEnd(); } @@ -50795,9 +50795,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, bulkClose_args stru if (struct.isSetEntities()) { { oprot.writeI32(struct.entities.size()); - for (EntityId _iter784 : struct.entities) + for (EntityId _iter794 : struct.entities) { - _iter784.write(oprot); + _iter794.write(oprot); } } } @@ -50809,14 +50809,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, bulkClose_args struc BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list785 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.entities = new ArrayList(_list785.size); - EntityId _elem786; - for (int _i787 = 0; _i787 < _list785.size; ++_i787) + org.apache.thrift.protocol.TList _list795 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.entities = new ArrayList(_list795.size); + EntityId _elem796; + for (int _i797 = 0; _i797 < _list795.size; ++_i797) { - _elem786 = new EntityId(); - _elem786.read(iprot); - struct.entities.add(_elem786); + _elem796 = new EntityId(); + _elem796.read(iprot); + struct.entities.add(_elem796); } } struct.setEntitiesIsSet(true); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/SnappyException.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/SnappyException.java index fac7a6da5..8816fcd45 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/SnappyException.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/SnappyException.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class SnappyException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SnappyException"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/SnappyExceptionData.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/SnappyExceptionData.java index ed5d45de0..789b5e136 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/SnappyExceptionData.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/SnappyExceptionData.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class SnappyExceptionData implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SnappyExceptionData"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/StatementAttrs.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/StatementAttrs.java index 9ccf9cb37..a4c8d629f 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/StatementAttrs.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/StatementAttrs.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class StatementAttrs implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StatementAttrs"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/StatementResult.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/StatementResult.java index 3eb21d7b6..3889530d9 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/StatementResult.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/StatementResult.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class StatementResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StatementResult"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/TransactionXid.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/TransactionXid.java index b4d693a23..147243a59 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/TransactionXid.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/TransactionXid.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class TransactionXid implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TransactionXid"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/UpdateResult.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/UpdateResult.java index 797a6f981..dc34e9a59 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/UpdateResult.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/UpdateResult.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-01-28") public class UpdateResult implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UpdateResult"); diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/common/Converters.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/common/Converters.java index 012cbeefd..43f07923e 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/common/Converters.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/common/Converters.java @@ -256,7 +256,7 @@ public double toDouble(OptimizedElementArray row, int columnPosition) @Override public BigDecimal toBigDecimal(OptimizedElementArray row, int columnPosition) throws SQLException { - return new BigDecimal(row.getByte(columnPosition - 1)); + return BigDecimal.valueOf(row.getByte(columnPosition - 1)); } @Override public String toString(OptimizedElementArray row, int columnPosition, @@ -420,7 +420,7 @@ public double toDouble(OptimizedElementArray row, int columnPosition) @Override public BigDecimal toBigDecimal(OptimizedElementArray row, int columnPosition) throws SQLException { - return new BigDecimal(row.getShort(columnPosition - 1)); + return BigDecimal.valueOf(row.getShort(columnPosition - 1)); } @Override public String toString(OptimizedElementArray row, int columnPosition, @@ -585,7 +585,7 @@ public double toDouble(OptimizedElementArray row, int columnPosition) @Override public BigDecimal toBigDecimal(OptimizedElementArray row, int columnPosition) throws SQLException { - return new BigDecimal(row.getInt(columnPosition - 1)); + return BigDecimal.valueOf(row.getInt(columnPosition - 1)); } @Override public String toString(OptimizedElementArray row, int columnPosition, @@ -751,7 +751,7 @@ public double toDouble(OptimizedElementArray row, int columnPosition) @Override public BigDecimal toBigDecimal(OptimizedElementArray row, int columnPosition) throws SQLException { - return new BigDecimal(row.getLong(columnPosition - 1)); + return BigDecimal.valueOf(row.getLong(columnPosition - 1)); } @Override public String toString(OptimizedElementArray row, int columnPosition, @@ -918,7 +918,7 @@ public double toDouble(OptimizedElementArray row, int columnPosition) @Override public BigDecimal toBigDecimal(OptimizedElementArray row, int columnPosition) throws SQLException { - return new BigDecimal(row.getFloat(columnPosition - 1)); + return BigDecimal.valueOf(row.getFloat(columnPosition - 1)); } @Override public String toString(OptimizedElementArray row, int columnPosition, @@ -1091,7 +1091,7 @@ public double toDouble(OptimizedElementArray row, int columnPosition) @Override public BigDecimal toBigDecimal(OptimizedElementArray row, int columnPosition) throws SQLException { - return new BigDecimal(row.getDouble(columnPosition - 1)); + return BigDecimal.valueOf(row.getDouble(columnPosition - 1)); } @Override public String toString(OptimizedElementArray row, int columnPosition, @@ -1277,32 +1277,32 @@ public void setBoolean(OptimizedElementArray row, int columnPosition, @Override public void setByte(OptimizedElementArray row, int columnPosition, byte x) throws SQLException { - setBigDecimal(row, columnPosition, new BigDecimal(x)); + setBigDecimal(row, columnPosition, BigDecimal.valueOf(x)); } @Override public void setShort(OptimizedElementArray row, int columnPosition, short x) throws SQLException { - setBigDecimal(row, columnPosition, new BigDecimal(x)); + setBigDecimal(row, columnPosition, BigDecimal.valueOf(x)); } @Override public void setInteger(OptimizedElementArray row, int columnPosition, int x) throws SQLException { - setBigDecimal(row, columnPosition, new BigDecimal(x)); + setBigDecimal(row, columnPosition, BigDecimal.valueOf(x)); } @Override public void setLong(OptimizedElementArray row, int columnPosition, long x) throws SQLException { - setBigDecimal(row, columnPosition, new BigDecimal(x)); + setBigDecimal(row, columnPosition, BigDecimal.valueOf(x)); } @Override public void setFloat(OptimizedElementArray row, int columnPosition, float x) throws SQLException { - setBigDecimal(row, columnPosition, new BigDecimal(x)); + setBigDecimal(row, columnPosition, BigDecimal.valueOf(x)); } @Override public void setDouble(OptimizedElementArray row, int columnPosition, double x) throws SQLException { - setBigDecimal(row, columnPosition, new BigDecimal(x)); + setBigDecimal(row, columnPosition, BigDecimal.valueOf(x)); } @Override public final void setBigDecimal(OptimizedElementArray row, diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/common/OptimizedElementArray.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/common/OptimizedElementArray.java index eebfe49e9..6b702ac45 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/common/OptimizedElementArray.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/common/OptimizedElementArray.java @@ -49,6 +49,7 @@ import java.util.Map; import com.gemstone.gemfire.internal.shared.ClientSharedUtils; +import com.gemstone.gemfire.internal.shared.unsafe.UnsafeHolder; import com.pivotal.gemfirexd.internal.shared.common.ResolverUtils; import io.snappydata.thrift.BlobChunk; import io.snappydata.thrift.ClobChunk; @@ -56,7 +57,6 @@ import io.snappydata.thrift.ColumnValue; import io.snappydata.thrift.Decimal; import io.snappydata.thrift.SnappyType; -import org.apache.spark.unsafe.Platform; import org.apache.thrift.TBaseHelper; import org.apache.thrift.TException; import org.apache.thrift.protocol.TField; @@ -215,9 +215,9 @@ public OptimizedElementArray(final List metadata, private void setDefaultNullability() { final long[] primitives = this.primitives; - final int end = Platform.LONG_ARRAY_OFFSET + size(); - for (int offset = Platform.LONG_ARRAY_OFFSET; offset < end; offset++) { - final byte snappyType = Platform.getByte(primitives, offset); + final long end = UnsafeHolder.LONG_ARRAY_OFFSET + size(); + for (long offset = UnsafeHolder.LONG_ARRAY_OFFSET; offset < end; offset++) { + final byte snappyType = UnsafeHolder.getUnsafe().getByte(primitives, offset); switch (Math.abs(snappyType)) { case 4: // INTEGER case 5: // BIGINT @@ -232,21 +232,21 @@ private void setDefaultNullability() { case 24: // NULLTYPE // primitives must be marked non-null if (snappyType < 0) { - Platform.putByte(primitives, offset, (byte)-snappyType); + UnsafeHolder.getUnsafe().putByte(primitives, offset, (byte)-snappyType); } break; default: // non-primitives must be marked null if (snappyType > 0) { - Platform.putByte(primitives, offset, (byte)-snappyType); + UnsafeHolder.getUnsafe().putByte(primitives, offset, (byte)-snappyType); } } } } public final void setType(int index, int snappyType) { - Platform.putByte(this.primitives, Platform.LONG_ARRAY_OFFSET + index, - (byte)snappyType); + UnsafeHolder.getUnsafe().putByte(this.primitives, + UnsafeHolder.LONG_ARRAY_OFFSET + (long)index, (byte)snappyType); } /** @@ -256,7 +256,8 @@ public final void setType(int index, int snappyType) { * @param index 0-based index of the column */ public final int getType(int index) { - return Platform.getByte(primitives, Platform.LONG_ARRAY_OFFSET + index); + return UnsafeHolder.getUnsafe().getByte(primitives, + UnsafeHolder.LONG_ARRAY_OFFSET + (long)index); } public final boolean isNull(int index) { diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/common/snappydata.thrift b/gemfirexd/shared/src/main/java/io/snappydata/thrift/common/snappydata.thrift index fe9e86725..f49808e9b 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/common/snappydata.thrift +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/common/snappydata.thrift @@ -720,6 +720,14 @@ struct CatalogSchemaObject { 4: required map properties } +// encapsulates Spark's CatalogStatistics/Statistics +struct CatalogStats { + 1: required i64 sizeInBytes + 2: optional i64 rowCount + // statistics for each column of the table (or empty if none) + 3: required list> colStats +} + // encapsulates Spark's CatalogTable and SnappyData extensions like BucketOwners, indexColumns etc struct CatalogTableObject { 1: required string tableName @@ -741,17 +749,14 @@ struct CatalogTableObject { 16: required i64 createTime 17: required i64 lastAccessTime 18: required map properties - 19: optional i64 sizeInBytes - 20: optional i64 rowCount - // statistics for each column of the table (or empty if none) - 21: required list> colStats - 22: required bool isBroadcastable - 23: optional string viewOriginalText - 24: optional string viewText - 25: optional string comment - 26: required list unsupportedFeatures - 27: required bool tracksPartitionsInCatalog - 28: required bool schemaPreservesCase + 19: optional CatalogStats stats + 20: optional string viewOriginalText + 21: optional string viewText + 22: optional string comment + 23: required list unsupportedFeatures + 24: required bool tracksPartitionsInCatalog + 25: required bool schemaPreservesCase + 26: optional map ignoredProperties } // encapsulates Spark's CatalogFunction @@ -788,6 +793,8 @@ struct CatalogMetadataDetails { 8: optional CatalogTableObject catalogTable 9: optional CatalogFunctionObject catalogFunction 10: optional list catalogPartitions + 11: optional CatalogStats catalogStats + 12: optional string newSchema } // different types of get operations returning CatalogMetadataDetails @@ -810,17 +817,20 @@ const i32 CATALOG_DROP_SCHEMA = 102 const i32 CATALOG_CREATE_TABLE = 103 const i32 CATALOG_DROP_TABLE = 104 const i32 CATALOG_ALTER_TABLE = 105 -const i32 CATALOG_RENAME_TABLE = 106 -const i32 CATALOG_LOAD_TABLE = 107 -const i32 CATALOG_CREATE_FUNCTION = 108 -const i32 CATALOG_DROP_FUNCTION = 109 -const i32 CATALOG_RENAME_FUNCTION = 110 -const i32 CATALOG_CREATE_PARTITIONS = 111 -const i32 CATALOG_DROP_PARTITIONS = 112 -const i32 CATALOG_ALTER_PARTITIONS = 113 -const i32 CATALOG_RENAME_PARTITIONS = 114 -const i32 CATALOG_LOAD_PARTITION = 115 -const i32 CATALOG_LOAD_DYNAMIC_PARTITIONS = 116 +const i32 CATALOG_ALTER_TABLE_STATS = 106 +const i32 CATALOG_RENAME_TABLE = 107 +const i32 CATALOG_LOAD_TABLE = 108 +const i32 CATALOG_CREATE_FUNCTION = 109 +const i32 CATALOG_DROP_FUNCTION = 110 +const i32 CATALOG_ALTER_FUNCTION = 111 +const i32 CATALOG_RENAME_FUNCTION = 112 +const i32 CATALOG_CREATE_PARTITIONS = 113 +const i32 CATALOG_DROP_PARTITIONS = 114 +const i32 CATALOG_ALTER_PARTITIONS = 115 +const i32 CATALOG_RENAME_PARTITIONS = 116 +const i32 CATALOG_LOAD_PARTITION = 117 +const i32 CATALOG_LOAD_DYNAMIC_PARTITIONS = 118 +const i32 CATALOG_ALTER_TABLE_SCHEMA = 119 // type IDs for EntityId used by bulkClose API const byte BULK_CLOSE_RESULTSET = 1 diff --git a/gemfirexd/shared/src/main/java/io/snappydata/thrift/snappydataConstants.java b/gemfirexd/shared/src/main/java/io/snappydata/thrift/snappydataConstants.java index eb2193219..28bf06f7c 100644 --- a/gemfirexd/shared/src/main/java/io/snappydata/thrift/snappydataConstants.java +++ b/gemfirexd/shared/src/main/java/io/snappydata/thrift/snappydataConstants.java @@ -166,27 +166,33 @@ public class snappydataConstants { public static final int CATALOG_ALTER_TABLE = 105; - public static final int CATALOG_RENAME_TABLE = 106; + public static final int CATALOG_ALTER_TABLE_STATS = 106; - public static final int CATALOG_LOAD_TABLE = 107; + public static final int CATALOG_RENAME_TABLE = 107; - public static final int CATALOG_CREATE_FUNCTION = 108; + public static final int CATALOG_LOAD_TABLE = 108; - public static final int CATALOG_DROP_FUNCTION = 109; + public static final int CATALOG_CREATE_FUNCTION = 109; - public static final int CATALOG_RENAME_FUNCTION = 110; + public static final int CATALOG_DROP_FUNCTION = 110; - public static final int CATALOG_CREATE_PARTITIONS = 111; + public static final int CATALOG_ALTER_FUNCTION = 111; - public static final int CATALOG_DROP_PARTITIONS = 112; + public static final int CATALOG_RENAME_FUNCTION = 112; - public static final int CATALOG_ALTER_PARTITIONS = 113; + public static final int CATALOG_CREATE_PARTITIONS = 113; - public static final int CATALOG_RENAME_PARTITIONS = 114; + public static final int CATALOG_DROP_PARTITIONS = 114; - public static final int CATALOG_LOAD_PARTITION = 115; + public static final int CATALOG_ALTER_PARTITIONS = 115; - public static final int CATALOG_LOAD_DYNAMIC_PARTITIONS = 116; + public static final int CATALOG_RENAME_PARTITIONS = 116; + + public static final int CATALOG_LOAD_PARTITION = 117; + + public static final int CATALOG_LOAD_DYNAMIC_PARTITIONS = 118; + + public static final int CATALOG_ALTER_TABLE_SCHEMA = 119; public static final byte BULK_CLOSE_RESULTSET = (byte)1; diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ee671127f..0ebb3108e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 0bad6a51d..d04230843 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="-XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Xmx1g -Xms1g -Djava.net.preferIPv4Stack=true" +DEFAULT_JVM_OPTS='"-XX:MaxMetaspaceSize=256m" "-XX:+HeapDumpOnOutOfMemoryError" "-Xmx2g" "-Xms1g" "-Djava.net.preferIPv4Stack=true"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/gradlew.bat b/gradlew.bat index 5ce1db48e..46867a2ac 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS=-XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Xmx1g -Xms1g -Djava.net.preferIPv4Stack=true +set DEFAULT_JVM_OPTS="-XX:MaxMetaspaceSize=256m" "-XX:+HeapDumpOnOutOfMemoryError" "-Xmx2g" "-Xms1g" "-Djava.net.preferIPv4Stack=true" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/ldap-test-server/build.gradle b/ldap-test-server/build.gradle index 0ea6c9f27..fe2f65337 100644 --- a/ldap-test-server/build.gradle +++ b/ldap-test-server/build.gradle @@ -16,7 +16,7 @@ */ plugins { - id 'com.github.johnrengelman.shadow' version '4.0.3' + id 'com.github.johnrengelman.shadow' version '5.1.0' } apply plugin: 'java' diff --git a/ldap-test-server/gradle/wrapper/gradle-wrapper.properties b/ldap-test-server/gradle/wrapper/gradle-wrapper.properties index ee671127f..0ebb3108e 100644 --- a/ldap-test-server/gradle/wrapper/gradle-wrapper.properties +++ b/ldap-test-server/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ldap-test-server/gradlew b/ldap-test-server/gradlew index 0bad6a51d..d04230843 100755 --- a/ldap-test-server/gradlew +++ b/ldap-test-server/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="-XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Xmx1g -Xms1g -Djava.net.preferIPv4Stack=true" +DEFAULT_JVM_OPTS='"-XX:MaxMetaspaceSize=256m" "-XX:+HeapDumpOnOutOfMemoryError" "-Xmx2g" "-Xms1g" "-Djava.net.preferIPv4Stack=true"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/ldap-test-server/gradlew.bat b/ldap-test-server/gradlew.bat index 5ce1db48e..46867a2ac 100644 --- a/ldap-test-server/gradlew.bat +++ b/ldap-test-server/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS=-XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Xmx1g -Xms1g -Djava.net.preferIPv4Stack=true +set DEFAULT_JVM_OPTS="-XX:MaxMetaspaceSize=256m" "-XX:+HeapDumpOnOutOfMemoryError" "-Xmx2g" "-Xms1g" "-Djava.net.preferIPv4Stack=true" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/native/build.gradle b/native/build.gradle index 43c18041f..f3240398c 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -14,16 +14,13 @@ * permissions and limitations under the License. See accompanying * LICENSE file. */ -//plugins{ -//id "de.undercouch.download" version "3.4.3" -//} buildscript { repositories { maven { url 'https://plugins.gradle.org/m2' } } dependencies { - classpath 'de.undercouch:gradle-download-task:3.4.3' + classpath 'de.undercouch:gradle-download-task:4.0.4' } } apply plugin: 'wrapper' diff --git a/native/gradle/wrapper/gradle-wrapper.properties b/native/gradle/wrapper/gradle-wrapper.properties index ee671127f..0ebb3108e 100644 --- a/native/gradle/wrapper/gradle-wrapper.properties +++ b/native/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native/gradlew b/native/gradlew index 0bad6a51d..d04230843 100755 --- a/native/gradlew +++ b/native/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="-XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Xmx1g -Xms1g -Djava.net.preferIPv4Stack=true" +DEFAULT_JVM_OPTS='"-XX:MaxMetaspaceSize=256m" "-XX:+HeapDumpOnOutOfMemoryError" "-Xmx2g" "-Xms1g" "-Djava.net.preferIPv4Stack=true"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/native/gradlew.bat b/native/gradlew.bat index 5ce1db48e..46867a2ac 100644 --- a/native/gradlew.bat +++ b/native/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS=-XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Xmx1g -Xms1g -Djava.net.preferIPv4Stack=true +set DEFAULT_JVM_OPTS="-XX:MaxMetaspaceSize=256m" "-XX:+HeapDumpOnOutOfMemoryError" "-Xmx2g" "-Xms1g" "-Djava.net.preferIPv4Stack=true" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/native/src/snappyclient/cpp/thrift/LocatorService.cpp b/native/src/snappyclient/cpp/thrift/LocatorService.cpp index 2305588d6..73e38963e 100644 --- a/native/src/snappyclient/cpp/thrift/LocatorService.cpp +++ b/native/src/snappyclient/cpp/thrift/LocatorService.cpp @@ -38,17 +38,17 @@ uint32_t LocatorService_getPreferredServer_args::read(::apache::thrift::protocol if (ftype == ::apache::thrift::protocol::T_SET) { { this->serverTypes.clear(); - uint32_t _size500; - ::apache::thrift::protocol::TType _etype503; - xfer += iprot->readSetBegin(_etype503, _size500); - uint32_t _i504; - for (_i504 = 0; _i504 < _size500; ++_i504) + uint32_t _size512; + ::apache::thrift::protocol::TType _etype515; + xfer += iprot->readSetBegin(_etype515, _size512); + uint32_t _i516; + for (_i516 = 0; _i516 < _size512; ++_i516) { - ServerType::type _elem505; - int32_t ecast506; - xfer += iprot->readI32(ecast506); - _elem505 = (ServerType::type)ecast506; - this->serverTypes.insert(_elem505); + ServerType::type _elem517; + int32_t ecast518; + xfer += iprot->readI32(ecast518); + _elem517 = (ServerType::type)ecast518; + this->serverTypes.insert(_elem517); } xfer += iprot->readSetEnd(); } @@ -61,15 +61,15 @@ uint32_t LocatorService_getPreferredServer_args::read(::apache::thrift::protocol if (ftype == ::apache::thrift::protocol::T_SET) { { this->serverGroups.clear(); - uint32_t _size507; - ::apache::thrift::protocol::TType _etype510; - xfer += iprot->readSetBegin(_etype510, _size507); - uint32_t _i511; - for (_i511 = 0; _i511 < _size507; ++_i511) + uint32_t _size519; + ::apache::thrift::protocol::TType _etype522; + xfer += iprot->readSetBegin(_etype522, _size519); + uint32_t _i523; + for (_i523 = 0; _i523 < _size519; ++_i523) { - std::string _elem512; - xfer += iprot->readString(_elem512); - this->serverGroups.insert(_elem512); + std::string _elem524; + xfer += iprot->readString(_elem524); + this->serverGroups.insert(_elem524); } xfer += iprot->readSetEnd(); } @@ -82,15 +82,15 @@ uint32_t LocatorService_getPreferredServer_args::read(::apache::thrift::protocol if (ftype == ::apache::thrift::protocol::T_SET) { { this->failedServers.clear(); - uint32_t _size513; - ::apache::thrift::protocol::TType _etype516; - xfer += iprot->readSetBegin(_etype516, _size513); - uint32_t _i517; - for (_i517 = 0; _i517 < _size513; ++_i517) + uint32_t _size525; + ::apache::thrift::protocol::TType _etype528; + xfer += iprot->readSetBegin(_etype528, _size525); + uint32_t _i529; + for (_i529 = 0; _i529 < _size525; ++_i529) { - HostAddress _elem518; - xfer += _elem518.read(iprot); - this->failedServers.insert(_elem518); + HostAddress _elem530; + xfer += _elem530.read(iprot); + this->failedServers.insert(_elem530); } xfer += iprot->readSetEnd(); } @@ -118,10 +118,10 @@ uint32_t LocatorService_getPreferredServer_args::write(::apache::thrift::protoco xfer += oprot->writeFieldBegin("serverTypes", ::apache::thrift::protocol::T_SET, 1); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_I32, static_cast(this->serverTypes.size())); - std::set ::const_iterator _iter519; - for (_iter519 = this->serverTypes.begin(); _iter519 != this->serverTypes.end(); ++_iter519) + std::set ::const_iterator _iter531; + for (_iter531 = this->serverTypes.begin(); _iter531 != this->serverTypes.end(); ++_iter531) { - xfer += oprot->writeI32((int32_t)(*_iter519)); + xfer += oprot->writeI32((int32_t)(*_iter531)); } xfer += oprot->writeSetEnd(); } @@ -130,10 +130,10 @@ uint32_t LocatorService_getPreferredServer_args::write(::apache::thrift::protoco xfer += oprot->writeFieldBegin("serverGroups", ::apache::thrift::protocol::T_SET, 2); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast(this->serverGroups.size())); - std::set ::const_iterator _iter520; - for (_iter520 = this->serverGroups.begin(); _iter520 != this->serverGroups.end(); ++_iter520) + std::set ::const_iterator _iter532; + for (_iter532 = this->serverGroups.begin(); _iter532 != this->serverGroups.end(); ++_iter532) { - xfer += oprot->writeString((*_iter520)); + xfer += oprot->writeString((*_iter532)); } xfer += oprot->writeSetEnd(); } @@ -142,10 +142,10 @@ uint32_t LocatorService_getPreferredServer_args::write(::apache::thrift::protoco xfer += oprot->writeFieldBegin("failedServers", ::apache::thrift::protocol::T_SET, 3); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRUCT, static_cast(this->failedServers.size())); - std::set ::const_iterator _iter521; - for (_iter521 = this->failedServers.begin(); _iter521 != this->failedServers.end(); ++_iter521) + std::set ::const_iterator _iter533; + for (_iter533 = this->failedServers.begin(); _iter533 != this->failedServers.end(); ++_iter533) { - xfer += (*_iter521).write(oprot); + xfer += (*_iter533).write(oprot); } xfer += oprot->writeSetEnd(); } @@ -168,10 +168,10 @@ uint32_t LocatorService_getPreferredServer_pargs::write(::apache::thrift::protoc xfer += oprot->writeFieldBegin("serverTypes", ::apache::thrift::protocol::T_SET, 1); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_I32, static_cast((*(this->serverTypes)).size())); - std::set ::const_iterator _iter522; - for (_iter522 = (*(this->serverTypes)).begin(); _iter522 != (*(this->serverTypes)).end(); ++_iter522) + std::set ::const_iterator _iter534; + for (_iter534 = (*(this->serverTypes)).begin(); _iter534 != (*(this->serverTypes)).end(); ++_iter534) { - xfer += oprot->writeI32((int32_t)(*_iter522)); + xfer += oprot->writeI32((int32_t)(*_iter534)); } xfer += oprot->writeSetEnd(); } @@ -180,10 +180,10 @@ uint32_t LocatorService_getPreferredServer_pargs::write(::apache::thrift::protoc xfer += oprot->writeFieldBegin("serverGroups", ::apache::thrift::protocol::T_SET, 2); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast((*(this->serverGroups)).size())); - std::set ::const_iterator _iter523; - for (_iter523 = (*(this->serverGroups)).begin(); _iter523 != (*(this->serverGroups)).end(); ++_iter523) + std::set ::const_iterator _iter535; + for (_iter535 = (*(this->serverGroups)).begin(); _iter535 != (*(this->serverGroups)).end(); ++_iter535) { - xfer += oprot->writeString((*_iter523)); + xfer += oprot->writeString((*_iter535)); } xfer += oprot->writeSetEnd(); } @@ -192,10 +192,10 @@ uint32_t LocatorService_getPreferredServer_pargs::write(::apache::thrift::protoc xfer += oprot->writeFieldBegin("failedServers", ::apache::thrift::protocol::T_SET, 3); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRUCT, static_cast((*(this->failedServers)).size())); - std::set ::const_iterator _iter524; - for (_iter524 = (*(this->failedServers)).begin(); _iter524 != (*(this->failedServers)).end(); ++_iter524) + std::set ::const_iterator _iter536; + for (_iter536 = (*(this->failedServers)).begin(); _iter536 != (*(this->failedServers)).end(); ++_iter536) { - xfer += (*_iter524).write(oprot); + xfer += (*_iter536).write(oprot); } xfer += oprot->writeSetEnd(); } @@ -361,17 +361,17 @@ uint32_t LocatorService_getAllServersWithPreferredServer_args::read(::apache::th if (ftype == ::apache::thrift::protocol::T_SET) { { this->serverTypes.clear(); - uint32_t _size525; - ::apache::thrift::protocol::TType _etype528; - xfer += iprot->readSetBegin(_etype528, _size525); - uint32_t _i529; - for (_i529 = 0; _i529 < _size525; ++_i529) + uint32_t _size537; + ::apache::thrift::protocol::TType _etype540; + xfer += iprot->readSetBegin(_etype540, _size537); + uint32_t _i541; + for (_i541 = 0; _i541 < _size537; ++_i541) { - ServerType::type _elem530; - int32_t ecast531; - xfer += iprot->readI32(ecast531); - _elem530 = (ServerType::type)ecast531; - this->serverTypes.insert(_elem530); + ServerType::type _elem542; + int32_t ecast543; + xfer += iprot->readI32(ecast543); + _elem542 = (ServerType::type)ecast543; + this->serverTypes.insert(_elem542); } xfer += iprot->readSetEnd(); } @@ -384,15 +384,15 @@ uint32_t LocatorService_getAllServersWithPreferredServer_args::read(::apache::th if (ftype == ::apache::thrift::protocol::T_SET) { { this->serverGroups.clear(); - uint32_t _size532; - ::apache::thrift::protocol::TType _etype535; - xfer += iprot->readSetBegin(_etype535, _size532); - uint32_t _i536; - for (_i536 = 0; _i536 < _size532; ++_i536) + uint32_t _size544; + ::apache::thrift::protocol::TType _etype547; + xfer += iprot->readSetBegin(_etype547, _size544); + uint32_t _i548; + for (_i548 = 0; _i548 < _size544; ++_i548) { - std::string _elem537; - xfer += iprot->readString(_elem537); - this->serverGroups.insert(_elem537); + std::string _elem549; + xfer += iprot->readString(_elem549); + this->serverGroups.insert(_elem549); } xfer += iprot->readSetEnd(); } @@ -405,15 +405,15 @@ uint32_t LocatorService_getAllServersWithPreferredServer_args::read(::apache::th if (ftype == ::apache::thrift::protocol::T_SET) { { this->failedServers.clear(); - uint32_t _size538; - ::apache::thrift::protocol::TType _etype541; - xfer += iprot->readSetBegin(_etype541, _size538); - uint32_t _i542; - for (_i542 = 0; _i542 < _size538; ++_i542) + uint32_t _size550; + ::apache::thrift::protocol::TType _etype553; + xfer += iprot->readSetBegin(_etype553, _size550); + uint32_t _i554; + for (_i554 = 0; _i554 < _size550; ++_i554) { - HostAddress _elem543; - xfer += _elem543.read(iprot); - this->failedServers.insert(_elem543); + HostAddress _elem555; + xfer += _elem555.read(iprot); + this->failedServers.insert(_elem555); } xfer += iprot->readSetEnd(); } @@ -441,10 +441,10 @@ uint32_t LocatorService_getAllServersWithPreferredServer_args::write(::apache::t xfer += oprot->writeFieldBegin("serverTypes", ::apache::thrift::protocol::T_SET, 1); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_I32, static_cast(this->serverTypes.size())); - std::set ::const_iterator _iter544; - for (_iter544 = this->serverTypes.begin(); _iter544 != this->serverTypes.end(); ++_iter544) + std::set ::const_iterator _iter556; + for (_iter556 = this->serverTypes.begin(); _iter556 != this->serverTypes.end(); ++_iter556) { - xfer += oprot->writeI32((int32_t)(*_iter544)); + xfer += oprot->writeI32((int32_t)(*_iter556)); } xfer += oprot->writeSetEnd(); } @@ -453,10 +453,10 @@ uint32_t LocatorService_getAllServersWithPreferredServer_args::write(::apache::t xfer += oprot->writeFieldBegin("serverGroups", ::apache::thrift::protocol::T_SET, 2); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast(this->serverGroups.size())); - std::set ::const_iterator _iter545; - for (_iter545 = this->serverGroups.begin(); _iter545 != this->serverGroups.end(); ++_iter545) + std::set ::const_iterator _iter557; + for (_iter557 = this->serverGroups.begin(); _iter557 != this->serverGroups.end(); ++_iter557) { - xfer += oprot->writeString((*_iter545)); + xfer += oprot->writeString((*_iter557)); } xfer += oprot->writeSetEnd(); } @@ -465,10 +465,10 @@ uint32_t LocatorService_getAllServersWithPreferredServer_args::write(::apache::t xfer += oprot->writeFieldBegin("failedServers", ::apache::thrift::protocol::T_SET, 3); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRUCT, static_cast(this->failedServers.size())); - std::set ::const_iterator _iter546; - for (_iter546 = this->failedServers.begin(); _iter546 != this->failedServers.end(); ++_iter546) + std::set ::const_iterator _iter558; + for (_iter558 = this->failedServers.begin(); _iter558 != this->failedServers.end(); ++_iter558) { - xfer += (*_iter546).write(oprot); + xfer += (*_iter558).write(oprot); } xfer += oprot->writeSetEnd(); } @@ -491,10 +491,10 @@ uint32_t LocatorService_getAllServersWithPreferredServer_pargs::write(::apache:: xfer += oprot->writeFieldBegin("serverTypes", ::apache::thrift::protocol::T_SET, 1); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_I32, static_cast((*(this->serverTypes)).size())); - std::set ::const_iterator _iter547; - for (_iter547 = (*(this->serverTypes)).begin(); _iter547 != (*(this->serverTypes)).end(); ++_iter547) + std::set ::const_iterator _iter559; + for (_iter559 = (*(this->serverTypes)).begin(); _iter559 != (*(this->serverTypes)).end(); ++_iter559) { - xfer += oprot->writeI32((int32_t)(*_iter547)); + xfer += oprot->writeI32((int32_t)(*_iter559)); } xfer += oprot->writeSetEnd(); } @@ -503,10 +503,10 @@ uint32_t LocatorService_getAllServersWithPreferredServer_pargs::write(::apache:: xfer += oprot->writeFieldBegin("serverGroups", ::apache::thrift::protocol::T_SET, 2); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast((*(this->serverGroups)).size())); - std::set ::const_iterator _iter548; - for (_iter548 = (*(this->serverGroups)).begin(); _iter548 != (*(this->serverGroups)).end(); ++_iter548) + std::set ::const_iterator _iter560; + for (_iter560 = (*(this->serverGroups)).begin(); _iter560 != (*(this->serverGroups)).end(); ++_iter560) { - xfer += oprot->writeString((*_iter548)); + xfer += oprot->writeString((*_iter560)); } xfer += oprot->writeSetEnd(); } @@ -515,10 +515,10 @@ uint32_t LocatorService_getAllServersWithPreferredServer_pargs::write(::apache:: xfer += oprot->writeFieldBegin("failedServers", ::apache::thrift::protocol::T_SET, 3); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRUCT, static_cast((*(this->failedServers)).size())); - std::set ::const_iterator _iter549; - for (_iter549 = (*(this->failedServers)).begin(); _iter549 != (*(this->failedServers)).end(); ++_iter549) + std::set ::const_iterator _iter561; + for (_iter561 = (*(this->failedServers)).begin(); _iter561 != (*(this->failedServers)).end(); ++_iter561) { - xfer += (*_iter549).write(oprot); + xfer += (*_iter561).write(oprot); } xfer += oprot->writeSetEnd(); } @@ -558,14 +558,14 @@ uint32_t LocatorService_getAllServersWithPreferredServer_result::read(::apache:: if (ftype == ::apache::thrift::protocol::T_LIST) { { this->success.clear(); - uint32_t _size550; - ::apache::thrift::protocol::TType _etype553; - xfer += iprot->readListBegin(_etype553, _size550); - this->success.resize(_size550); - uint32_t _i554; - for (_i554 = 0; _i554 < _size550; ++_i554) + uint32_t _size562; + ::apache::thrift::protocol::TType _etype565; + xfer += iprot->readListBegin(_etype565, _size562); + this->success.resize(_size562); + uint32_t _i566; + for (_i566 = 0; _i566 < _size562; ++_i566) { - xfer += this->success[_i554].read(iprot); + xfer += this->success[_i566].read(iprot); } xfer += iprot->readListEnd(); } @@ -604,10 +604,10 @@ uint32_t LocatorService_getAllServersWithPreferredServer_result::write(::apache: xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast(this->success.size())); - std::vector ::const_iterator _iter555; - for (_iter555 = this->success.begin(); _iter555 != this->success.end(); ++_iter555) + std::vector ::const_iterator _iter567; + for (_iter567 = this->success.begin(); _iter567 != this->success.end(); ++_iter567) { - xfer += (*_iter555).write(oprot); + xfer += (*_iter567).write(oprot); } xfer += oprot->writeListEnd(); } @@ -651,14 +651,14 @@ uint32_t LocatorService_getAllServersWithPreferredServer_presult::read(::apache: if (ftype == ::apache::thrift::protocol::T_LIST) { { (*(this->success)).clear(); - uint32_t _size556; - ::apache::thrift::protocol::TType _etype559; - xfer += iprot->readListBegin(_etype559, _size556); - (*(this->success)).resize(_size556); - uint32_t _i560; - for (_i560 = 0; _i560 < _size556; ++_i560) + uint32_t _size568; + ::apache::thrift::protocol::TType _etype571; + xfer += iprot->readListBegin(_etype571, _size568); + (*(this->success)).resize(_size568); + uint32_t _i572; + for (_i572 = 0; _i572 < _size568; ++_i572) { - xfer += (*(this->success))[_i560].read(iprot); + xfer += (*(this->success))[_i572].read(iprot); } xfer += iprot->readListEnd(); } diff --git a/native/src/snappyclient/cpp/thrift/LocatorService.h b/native/src/snappyclient/cpp/thrift/LocatorService.h index 24907618f..06046e9d3 100644 --- a/native/src/snappyclient/cpp/thrift/LocatorService.h +++ b/native/src/snappyclient/cpp/thrift/LocatorService.h @@ -40,6 +40,7 @@ #include "snappydata_struct_BucketOwners.h" #include "snappydata_struct_CatalogStorage.h" #include "snappydata_struct_CatalogSchemaObject.h" +#include "snappydata_struct_CatalogStats.h" #include "snappydata_struct_CatalogTableObject.h" #include "snappydata_struct_CatalogFunctionObject.h" #include "snappydata_struct_CatalogPartitionObject.h" diff --git a/native/src/snappyclient/cpp/thrift/SnappyDataService.cpp b/native/src/snappyclient/cpp/thrift/SnappyDataService.cpp index a3317afb1..eb9e9e556 100644 --- a/native/src/snappyclient/cpp/thrift/SnappyDataService.cpp +++ b/native/src/snappyclient/cpp/thrift/SnappyDataService.cpp @@ -38,17 +38,17 @@ uint32_t SnappyDataService_getPreferredServer_args::read(::apache::thrift::proto if (ftype == ::apache::thrift::protocol::T_SET) { { this->serverTypes.clear(); - uint32_t _size561; - ::apache::thrift::protocol::TType _etype564; - xfer += iprot->readSetBegin(_etype564, _size561); - uint32_t _i565; - for (_i565 = 0; _i565 < _size561; ++_i565) + uint32_t _size573; + ::apache::thrift::protocol::TType _etype576; + xfer += iprot->readSetBegin(_etype576, _size573); + uint32_t _i577; + for (_i577 = 0; _i577 < _size573; ++_i577) { - ServerType::type _elem566; - int32_t ecast567; - xfer += iprot->readI32(ecast567); - _elem566 = (ServerType::type)ecast567; - this->serverTypes.insert(_elem566); + ServerType::type _elem578; + int32_t ecast579; + xfer += iprot->readI32(ecast579); + _elem578 = (ServerType::type)ecast579; + this->serverTypes.insert(_elem578); } xfer += iprot->readSetEnd(); } @@ -61,15 +61,15 @@ uint32_t SnappyDataService_getPreferredServer_args::read(::apache::thrift::proto if (ftype == ::apache::thrift::protocol::T_SET) { { this->serverGroups.clear(); - uint32_t _size568; - ::apache::thrift::protocol::TType _etype571; - xfer += iprot->readSetBegin(_etype571, _size568); - uint32_t _i572; - for (_i572 = 0; _i572 < _size568; ++_i572) + uint32_t _size580; + ::apache::thrift::protocol::TType _etype583; + xfer += iprot->readSetBegin(_etype583, _size580); + uint32_t _i584; + for (_i584 = 0; _i584 < _size580; ++_i584) { - std::string _elem573; - xfer += iprot->readString(_elem573); - this->serverGroups.insert(_elem573); + std::string _elem585; + xfer += iprot->readString(_elem585); + this->serverGroups.insert(_elem585); } xfer += iprot->readSetEnd(); } @@ -82,15 +82,15 @@ uint32_t SnappyDataService_getPreferredServer_args::read(::apache::thrift::proto if (ftype == ::apache::thrift::protocol::T_SET) { { this->failedServers.clear(); - uint32_t _size574; - ::apache::thrift::protocol::TType _etype577; - xfer += iprot->readSetBegin(_etype577, _size574); - uint32_t _i578; - for (_i578 = 0; _i578 < _size574; ++_i578) + uint32_t _size586; + ::apache::thrift::protocol::TType _etype589; + xfer += iprot->readSetBegin(_etype589, _size586); + uint32_t _i590; + for (_i590 = 0; _i590 < _size586; ++_i590) { - HostAddress _elem579; - xfer += _elem579.read(iprot); - this->failedServers.insert(_elem579); + HostAddress _elem591; + xfer += _elem591.read(iprot); + this->failedServers.insert(_elem591); } xfer += iprot->readSetEnd(); } @@ -118,10 +118,10 @@ uint32_t SnappyDataService_getPreferredServer_args::write(::apache::thrift::prot xfer += oprot->writeFieldBegin("serverTypes", ::apache::thrift::protocol::T_SET, 1); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_I32, static_cast(this->serverTypes.size())); - std::set ::const_iterator _iter580; - for (_iter580 = this->serverTypes.begin(); _iter580 != this->serverTypes.end(); ++_iter580) + std::set ::const_iterator _iter592; + for (_iter592 = this->serverTypes.begin(); _iter592 != this->serverTypes.end(); ++_iter592) { - xfer += oprot->writeI32((int32_t)(*_iter580)); + xfer += oprot->writeI32((int32_t)(*_iter592)); } xfer += oprot->writeSetEnd(); } @@ -130,10 +130,10 @@ uint32_t SnappyDataService_getPreferredServer_args::write(::apache::thrift::prot xfer += oprot->writeFieldBegin("serverGroups", ::apache::thrift::protocol::T_SET, 2); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast(this->serverGroups.size())); - std::set ::const_iterator _iter581; - for (_iter581 = this->serverGroups.begin(); _iter581 != this->serverGroups.end(); ++_iter581) + std::set ::const_iterator _iter593; + for (_iter593 = this->serverGroups.begin(); _iter593 != this->serverGroups.end(); ++_iter593) { - xfer += oprot->writeString((*_iter581)); + xfer += oprot->writeString((*_iter593)); } xfer += oprot->writeSetEnd(); } @@ -142,10 +142,10 @@ uint32_t SnappyDataService_getPreferredServer_args::write(::apache::thrift::prot xfer += oprot->writeFieldBegin("failedServers", ::apache::thrift::protocol::T_SET, 3); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRUCT, static_cast(this->failedServers.size())); - std::set ::const_iterator _iter582; - for (_iter582 = this->failedServers.begin(); _iter582 != this->failedServers.end(); ++_iter582) + std::set ::const_iterator _iter594; + for (_iter594 = this->failedServers.begin(); _iter594 != this->failedServers.end(); ++_iter594) { - xfer += (*_iter582).write(oprot); + xfer += (*_iter594).write(oprot); } xfer += oprot->writeSetEnd(); } @@ -168,10 +168,10 @@ uint32_t SnappyDataService_getPreferredServer_pargs::write(::apache::thrift::pro xfer += oprot->writeFieldBegin("serverTypes", ::apache::thrift::protocol::T_SET, 1); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_I32, static_cast((*(this->serverTypes)).size())); - std::set ::const_iterator _iter583; - for (_iter583 = (*(this->serverTypes)).begin(); _iter583 != (*(this->serverTypes)).end(); ++_iter583) + std::set ::const_iterator _iter595; + for (_iter595 = (*(this->serverTypes)).begin(); _iter595 != (*(this->serverTypes)).end(); ++_iter595) { - xfer += oprot->writeI32((int32_t)(*_iter583)); + xfer += oprot->writeI32((int32_t)(*_iter595)); } xfer += oprot->writeSetEnd(); } @@ -180,10 +180,10 @@ uint32_t SnappyDataService_getPreferredServer_pargs::write(::apache::thrift::pro xfer += oprot->writeFieldBegin("serverGroups", ::apache::thrift::protocol::T_SET, 2); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast((*(this->serverGroups)).size())); - std::set ::const_iterator _iter584; - for (_iter584 = (*(this->serverGroups)).begin(); _iter584 != (*(this->serverGroups)).end(); ++_iter584) + std::set ::const_iterator _iter596; + for (_iter596 = (*(this->serverGroups)).begin(); _iter596 != (*(this->serverGroups)).end(); ++_iter596) { - xfer += oprot->writeString((*_iter584)); + xfer += oprot->writeString((*_iter596)); } xfer += oprot->writeSetEnd(); } @@ -192,10 +192,10 @@ uint32_t SnappyDataService_getPreferredServer_pargs::write(::apache::thrift::pro xfer += oprot->writeFieldBegin("failedServers", ::apache::thrift::protocol::T_SET, 3); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRUCT, static_cast((*(this->failedServers)).size())); - std::set ::const_iterator _iter585; - for (_iter585 = (*(this->failedServers)).begin(); _iter585 != (*(this->failedServers)).end(); ++_iter585) + std::set ::const_iterator _iter597; + for (_iter597 = (*(this->failedServers)).begin(); _iter597 != (*(this->failedServers)).end(); ++_iter597) { - xfer += (*_iter585).write(oprot); + xfer += (*_iter597).write(oprot); } xfer += oprot->writeSetEnd(); } @@ -361,17 +361,17 @@ uint32_t SnappyDataService_getAllServersWithPreferredServer_args::read(::apache: if (ftype == ::apache::thrift::protocol::T_SET) { { this->serverTypes.clear(); - uint32_t _size586; - ::apache::thrift::protocol::TType _etype589; - xfer += iprot->readSetBegin(_etype589, _size586); - uint32_t _i590; - for (_i590 = 0; _i590 < _size586; ++_i590) + uint32_t _size598; + ::apache::thrift::protocol::TType _etype601; + xfer += iprot->readSetBegin(_etype601, _size598); + uint32_t _i602; + for (_i602 = 0; _i602 < _size598; ++_i602) { - ServerType::type _elem591; - int32_t ecast592; - xfer += iprot->readI32(ecast592); - _elem591 = (ServerType::type)ecast592; - this->serverTypes.insert(_elem591); + ServerType::type _elem603; + int32_t ecast604; + xfer += iprot->readI32(ecast604); + _elem603 = (ServerType::type)ecast604; + this->serverTypes.insert(_elem603); } xfer += iprot->readSetEnd(); } @@ -384,15 +384,15 @@ uint32_t SnappyDataService_getAllServersWithPreferredServer_args::read(::apache: if (ftype == ::apache::thrift::protocol::T_SET) { { this->serverGroups.clear(); - uint32_t _size593; - ::apache::thrift::protocol::TType _etype596; - xfer += iprot->readSetBegin(_etype596, _size593); - uint32_t _i597; - for (_i597 = 0; _i597 < _size593; ++_i597) + uint32_t _size605; + ::apache::thrift::protocol::TType _etype608; + xfer += iprot->readSetBegin(_etype608, _size605); + uint32_t _i609; + for (_i609 = 0; _i609 < _size605; ++_i609) { - std::string _elem598; - xfer += iprot->readString(_elem598); - this->serverGroups.insert(_elem598); + std::string _elem610; + xfer += iprot->readString(_elem610); + this->serverGroups.insert(_elem610); } xfer += iprot->readSetEnd(); } @@ -405,15 +405,15 @@ uint32_t SnappyDataService_getAllServersWithPreferredServer_args::read(::apache: if (ftype == ::apache::thrift::protocol::T_SET) { { this->failedServers.clear(); - uint32_t _size599; - ::apache::thrift::protocol::TType _etype602; - xfer += iprot->readSetBegin(_etype602, _size599); - uint32_t _i603; - for (_i603 = 0; _i603 < _size599; ++_i603) + uint32_t _size611; + ::apache::thrift::protocol::TType _etype614; + xfer += iprot->readSetBegin(_etype614, _size611); + uint32_t _i615; + for (_i615 = 0; _i615 < _size611; ++_i615) { - HostAddress _elem604; - xfer += _elem604.read(iprot); - this->failedServers.insert(_elem604); + HostAddress _elem616; + xfer += _elem616.read(iprot); + this->failedServers.insert(_elem616); } xfer += iprot->readSetEnd(); } @@ -441,10 +441,10 @@ uint32_t SnappyDataService_getAllServersWithPreferredServer_args::write(::apache xfer += oprot->writeFieldBegin("serverTypes", ::apache::thrift::protocol::T_SET, 1); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_I32, static_cast(this->serverTypes.size())); - std::set ::const_iterator _iter605; - for (_iter605 = this->serverTypes.begin(); _iter605 != this->serverTypes.end(); ++_iter605) + std::set ::const_iterator _iter617; + for (_iter617 = this->serverTypes.begin(); _iter617 != this->serverTypes.end(); ++_iter617) { - xfer += oprot->writeI32((int32_t)(*_iter605)); + xfer += oprot->writeI32((int32_t)(*_iter617)); } xfer += oprot->writeSetEnd(); } @@ -453,10 +453,10 @@ uint32_t SnappyDataService_getAllServersWithPreferredServer_args::write(::apache xfer += oprot->writeFieldBegin("serverGroups", ::apache::thrift::protocol::T_SET, 2); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast(this->serverGroups.size())); - std::set ::const_iterator _iter606; - for (_iter606 = this->serverGroups.begin(); _iter606 != this->serverGroups.end(); ++_iter606) + std::set ::const_iterator _iter618; + for (_iter618 = this->serverGroups.begin(); _iter618 != this->serverGroups.end(); ++_iter618) { - xfer += oprot->writeString((*_iter606)); + xfer += oprot->writeString((*_iter618)); } xfer += oprot->writeSetEnd(); } @@ -465,10 +465,10 @@ uint32_t SnappyDataService_getAllServersWithPreferredServer_args::write(::apache xfer += oprot->writeFieldBegin("failedServers", ::apache::thrift::protocol::T_SET, 3); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRUCT, static_cast(this->failedServers.size())); - std::set ::const_iterator _iter607; - for (_iter607 = this->failedServers.begin(); _iter607 != this->failedServers.end(); ++_iter607) + std::set ::const_iterator _iter619; + for (_iter619 = this->failedServers.begin(); _iter619 != this->failedServers.end(); ++_iter619) { - xfer += (*_iter607).write(oprot); + xfer += (*_iter619).write(oprot); } xfer += oprot->writeSetEnd(); } @@ -491,10 +491,10 @@ uint32_t SnappyDataService_getAllServersWithPreferredServer_pargs::write(::apach xfer += oprot->writeFieldBegin("serverTypes", ::apache::thrift::protocol::T_SET, 1); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_I32, static_cast((*(this->serverTypes)).size())); - std::set ::const_iterator _iter608; - for (_iter608 = (*(this->serverTypes)).begin(); _iter608 != (*(this->serverTypes)).end(); ++_iter608) + std::set ::const_iterator _iter620; + for (_iter620 = (*(this->serverTypes)).begin(); _iter620 != (*(this->serverTypes)).end(); ++_iter620) { - xfer += oprot->writeI32((int32_t)(*_iter608)); + xfer += oprot->writeI32((int32_t)(*_iter620)); } xfer += oprot->writeSetEnd(); } @@ -503,10 +503,10 @@ uint32_t SnappyDataService_getAllServersWithPreferredServer_pargs::write(::apach xfer += oprot->writeFieldBegin("serverGroups", ::apache::thrift::protocol::T_SET, 2); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast((*(this->serverGroups)).size())); - std::set ::const_iterator _iter609; - for (_iter609 = (*(this->serverGroups)).begin(); _iter609 != (*(this->serverGroups)).end(); ++_iter609) + std::set ::const_iterator _iter621; + for (_iter621 = (*(this->serverGroups)).begin(); _iter621 != (*(this->serverGroups)).end(); ++_iter621) { - xfer += oprot->writeString((*_iter609)); + xfer += oprot->writeString((*_iter621)); } xfer += oprot->writeSetEnd(); } @@ -515,10 +515,10 @@ uint32_t SnappyDataService_getAllServersWithPreferredServer_pargs::write(::apach xfer += oprot->writeFieldBegin("failedServers", ::apache::thrift::protocol::T_SET, 3); { xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRUCT, static_cast((*(this->failedServers)).size())); - std::set ::const_iterator _iter610; - for (_iter610 = (*(this->failedServers)).begin(); _iter610 != (*(this->failedServers)).end(); ++_iter610) + std::set ::const_iterator _iter622; + for (_iter622 = (*(this->failedServers)).begin(); _iter622 != (*(this->failedServers)).end(); ++_iter622) { - xfer += (*_iter610).write(oprot); + xfer += (*_iter622).write(oprot); } xfer += oprot->writeSetEnd(); } @@ -558,14 +558,14 @@ uint32_t SnappyDataService_getAllServersWithPreferredServer_result::read(::apach if (ftype == ::apache::thrift::protocol::T_LIST) { { this->success.clear(); - uint32_t _size611; - ::apache::thrift::protocol::TType _etype614; - xfer += iprot->readListBegin(_etype614, _size611); - this->success.resize(_size611); - uint32_t _i615; - for (_i615 = 0; _i615 < _size611; ++_i615) + uint32_t _size623; + ::apache::thrift::protocol::TType _etype626; + xfer += iprot->readListBegin(_etype626, _size623); + this->success.resize(_size623); + uint32_t _i627; + for (_i627 = 0; _i627 < _size623; ++_i627) { - xfer += this->success[_i615].read(iprot); + xfer += this->success[_i627].read(iprot); } xfer += iprot->readListEnd(); } @@ -604,10 +604,10 @@ uint32_t SnappyDataService_getAllServersWithPreferredServer_result::write(::apac xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast(this->success.size())); - std::vector ::const_iterator _iter616; - for (_iter616 = this->success.begin(); _iter616 != this->success.end(); ++_iter616) + std::vector ::const_iterator _iter628; + for (_iter628 = this->success.begin(); _iter628 != this->success.end(); ++_iter628) { - xfer += (*_iter616).write(oprot); + xfer += (*_iter628).write(oprot); } xfer += oprot->writeListEnd(); } @@ -651,14 +651,14 @@ uint32_t SnappyDataService_getAllServersWithPreferredServer_presult::read(::apac if (ftype == ::apache::thrift::protocol::T_LIST) { { (*(this->success)).clear(); - uint32_t _size617; - ::apache::thrift::protocol::TType _etype620; - xfer += iprot->readListBegin(_etype620, _size617); - (*(this->success)).resize(_size617); - uint32_t _i621; - for (_i621 = 0; _i621 < _size617; ++_i621) + uint32_t _size629; + ::apache::thrift::protocol::TType _etype632; + xfer += iprot->readListBegin(_etype632, _size629); + (*(this->success)).resize(_size629); + uint32_t _i633; + for (_i633 = 0; _i633 < _size629; ++_i633) { - xfer += (*(this->success))[_i621].read(iprot); + xfer += (*(this->success))[_i633].read(iprot); } xfer += iprot->readListEnd(); } @@ -934,17 +934,17 @@ uint32_t SnappyDataService_execute_args::read(::apache::thrift::protocol::TProto if (ftype == ::apache::thrift::protocol::T_MAP) { { this->outputParams.clear(); - uint32_t _size622; - ::apache::thrift::protocol::TType _ktype623; - ::apache::thrift::protocol::TType _vtype624; - xfer += iprot->readMapBegin(_ktype623, _vtype624, _size622); - uint32_t _i626; - for (_i626 = 0; _i626 < _size622; ++_i626) + uint32_t _size634; + ::apache::thrift::protocol::TType _ktype635; + ::apache::thrift::protocol::TType _vtype636; + xfer += iprot->readMapBegin(_ktype635, _vtype636, _size634); + uint32_t _i638; + for (_i638 = 0; _i638 < _size634; ++_i638) { - int32_t _key627; - xfer += iprot->readI32(_key627); - OutputParameter& _val628 = this->outputParams[_key627]; - xfer += _val628.read(iprot); + int32_t _key639; + xfer += iprot->readI32(_key639); + OutputParameter& _val640 = this->outputParams[_key639]; + xfer += _val640.read(iprot); } xfer += iprot->readMapEnd(); } @@ -996,11 +996,11 @@ uint32_t SnappyDataService_execute_args::write(::apache::thrift::protocol::TProt xfer += oprot->writeFieldBegin("outputParams", ::apache::thrift::protocol::T_MAP, 3); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRUCT, static_cast(this->outputParams.size())); - std::map ::const_iterator _iter629; - for (_iter629 = this->outputParams.begin(); _iter629 != this->outputParams.end(); ++_iter629) + std::map ::const_iterator _iter641; + for (_iter641 = this->outputParams.begin(); _iter641 != this->outputParams.end(); ++_iter641) { - xfer += oprot->writeI32(_iter629->first); - xfer += _iter629->second.write(oprot); + xfer += oprot->writeI32(_iter641->first); + xfer += _iter641->second.write(oprot); } xfer += oprot->writeMapEnd(); } @@ -1039,11 +1039,11 @@ uint32_t SnappyDataService_execute_pargs::write(::apache::thrift::protocol::TPro xfer += oprot->writeFieldBegin("outputParams", ::apache::thrift::protocol::T_MAP, 3); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRUCT, static_cast((*(this->outputParams)).size())); - std::map ::const_iterator _iter630; - for (_iter630 = (*(this->outputParams)).begin(); _iter630 != (*(this->outputParams)).end(); ++_iter630) + std::map ::const_iterator _iter642; + for (_iter642 = (*(this->outputParams)).begin(); _iter642 != (*(this->outputParams)).end(); ++_iter642) { - xfer += oprot->writeI32(_iter630->first); - xfer += _iter630->second.write(oprot); + xfer += oprot->writeI32(_iter642->first); + xfer += _iter642->second.write(oprot); } xfer += oprot->writeMapEnd(); } @@ -1225,14 +1225,14 @@ uint32_t SnappyDataService_executeUpdate_args::read(::apache::thrift::protocol:: if (ftype == ::apache::thrift::protocol::T_LIST) { { this->sqls.clear(); - uint32_t _size631; - ::apache::thrift::protocol::TType _etype634; - xfer += iprot->readListBegin(_etype634, _size631); - this->sqls.resize(_size631); - uint32_t _i635; - for (_i635 = 0; _i635 < _size631; ++_i635) + uint32_t _size643; + ::apache::thrift::protocol::TType _etype646; + xfer += iprot->readListBegin(_etype646, _size643); + this->sqls.resize(_size643); + uint32_t _i647; + for (_i647 = 0; _i647 < _size643; ++_i647) { - xfer += iprot->readString(this->sqls[_i635]); + xfer += iprot->readString(this->sqls[_i647]); } xfer += iprot->readListEnd(); } @@ -1280,10 +1280,10 @@ uint32_t SnappyDataService_executeUpdate_args::write(::apache::thrift::protocol: xfer += oprot->writeFieldBegin("sqls", ::apache::thrift::protocol::T_LIST, 2); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast(this->sqls.size())); - std::vector ::const_iterator _iter636; - for (_iter636 = this->sqls.begin(); _iter636 != this->sqls.end(); ++_iter636) + std::vector ::const_iterator _iter648; + for (_iter648 = this->sqls.begin(); _iter648 != this->sqls.end(); ++_iter648) { - xfer += oprot->writeString((*_iter636)); + xfer += oprot->writeString((*_iter648)); } xfer += oprot->writeListEnd(); } @@ -1318,10 +1318,10 @@ uint32_t SnappyDataService_executeUpdate_pargs::write(::apache::thrift::protocol xfer += oprot->writeFieldBegin("sqls", ::apache::thrift::protocol::T_LIST, 2); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast((*(this->sqls)).size())); - std::vector ::const_iterator _iter637; - for (_iter637 = (*(this->sqls)).begin(); _iter637 != (*(this->sqls)).end(); ++_iter637) + std::vector ::const_iterator _iter649; + for (_iter649 = (*(this->sqls)).begin(); _iter649 != (*(this->sqls)).end(); ++_iter649) { - xfer += oprot->writeString((*_iter637)); + xfer += oprot->writeString((*_iter649)); } xfer += oprot->writeListEnd(); } @@ -1761,17 +1761,17 @@ uint32_t SnappyDataService_prepareStatement_args::read(::apache::thrift::protoco if (ftype == ::apache::thrift::protocol::T_MAP) { { this->outputParams.clear(); - uint32_t _size638; - ::apache::thrift::protocol::TType _ktype639; - ::apache::thrift::protocol::TType _vtype640; - xfer += iprot->readMapBegin(_ktype639, _vtype640, _size638); - uint32_t _i642; - for (_i642 = 0; _i642 < _size638; ++_i642) + uint32_t _size650; + ::apache::thrift::protocol::TType _ktype651; + ::apache::thrift::protocol::TType _vtype652; + xfer += iprot->readMapBegin(_ktype651, _vtype652, _size650); + uint32_t _i654; + for (_i654 = 0; _i654 < _size650; ++_i654) { - int32_t _key643; - xfer += iprot->readI32(_key643); - OutputParameter& _val644 = this->outputParams[_key643]; - xfer += _val644.read(iprot); + int32_t _key655; + xfer += iprot->readI32(_key655); + OutputParameter& _val656 = this->outputParams[_key655]; + xfer += _val656.read(iprot); } xfer += iprot->readMapEnd(); } @@ -1823,11 +1823,11 @@ uint32_t SnappyDataService_prepareStatement_args::write(::apache::thrift::protoc xfer += oprot->writeFieldBegin("outputParams", ::apache::thrift::protocol::T_MAP, 3); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRUCT, static_cast(this->outputParams.size())); - std::map ::const_iterator _iter645; - for (_iter645 = this->outputParams.begin(); _iter645 != this->outputParams.end(); ++_iter645) + std::map ::const_iterator _iter657; + for (_iter657 = this->outputParams.begin(); _iter657 != this->outputParams.end(); ++_iter657) { - xfer += oprot->writeI32(_iter645->first); - xfer += _iter645->second.write(oprot); + xfer += oprot->writeI32(_iter657->first); + xfer += _iter657->second.write(oprot); } xfer += oprot->writeMapEnd(); } @@ -1866,11 +1866,11 @@ uint32_t SnappyDataService_prepareStatement_pargs::write(::apache::thrift::proto xfer += oprot->writeFieldBegin("outputParams", ::apache::thrift::protocol::T_MAP, 3); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRUCT, static_cast((*(this->outputParams)).size())); - std::map ::const_iterator _iter646; - for (_iter646 = (*(this->outputParams)).begin(); _iter646 != (*(this->outputParams)).end(); ++_iter646) + std::map ::const_iterator _iter658; + for (_iter658 = (*(this->outputParams)).begin(); _iter658 != (*(this->outputParams)).end(); ++_iter658) { - xfer += oprot->writeI32(_iter646->first); - xfer += _iter646->second.write(oprot); + xfer += oprot->writeI32(_iter658->first); + xfer += _iter658->second.write(oprot); } xfer += oprot->writeMapEnd(); } @@ -2060,17 +2060,17 @@ uint32_t SnappyDataService_executePrepared_args::read(::apache::thrift::protocol if (ftype == ::apache::thrift::protocol::T_MAP) { { this->outputParams.clear(); - uint32_t _size647; - ::apache::thrift::protocol::TType _ktype648; - ::apache::thrift::protocol::TType _vtype649; - xfer += iprot->readMapBegin(_ktype648, _vtype649, _size647); - uint32_t _i651; - for (_i651 = 0; _i651 < _size647; ++_i651) + uint32_t _size659; + ::apache::thrift::protocol::TType _ktype660; + ::apache::thrift::protocol::TType _vtype661; + xfer += iprot->readMapBegin(_ktype660, _vtype661, _size659); + uint32_t _i663; + for (_i663 = 0; _i663 < _size659; ++_i663) { - int32_t _key652; - xfer += iprot->readI32(_key652); - OutputParameter& _val653 = this->outputParams[_key652]; - xfer += _val653.read(iprot); + int32_t _key664; + xfer += iprot->readI32(_key664); + OutputParameter& _val665 = this->outputParams[_key664]; + xfer += _val665.read(iprot); } xfer += iprot->readMapEnd(); } @@ -2122,11 +2122,11 @@ uint32_t SnappyDataService_executePrepared_args::write(::apache::thrift::protoco xfer += oprot->writeFieldBegin("outputParams", ::apache::thrift::protocol::T_MAP, 3); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRUCT, static_cast(this->outputParams.size())); - std::map ::const_iterator _iter654; - for (_iter654 = this->outputParams.begin(); _iter654 != this->outputParams.end(); ++_iter654) + std::map ::const_iterator _iter666; + for (_iter666 = this->outputParams.begin(); _iter666 != this->outputParams.end(); ++_iter666) { - xfer += oprot->writeI32(_iter654->first); - xfer += _iter654->second.write(oprot); + xfer += oprot->writeI32(_iter666->first); + xfer += _iter666->second.write(oprot); } xfer += oprot->writeMapEnd(); } @@ -2165,11 +2165,11 @@ uint32_t SnappyDataService_executePrepared_pargs::write(::apache::thrift::protoc xfer += oprot->writeFieldBegin("outputParams", ::apache::thrift::protocol::T_MAP, 3); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRUCT, static_cast((*(this->outputParams)).size())); - std::map ::const_iterator _iter655; - for (_iter655 = (*(this->outputParams)).begin(); _iter655 != (*(this->outputParams)).end(); ++_iter655) + std::map ::const_iterator _iter667; + for (_iter667 = (*(this->outputParams)).begin(); _iter667 != (*(this->outputParams)).end(); ++_iter667) { - xfer += oprot->writeI32(_iter655->first); - xfer += _iter655->second.write(oprot); + xfer += oprot->writeI32(_iter667->first); + xfer += _iter667->second.write(oprot); } xfer += oprot->writeMapEnd(); } @@ -2851,14 +2851,14 @@ uint32_t SnappyDataService_executePreparedBatch_args::read(::apache::thrift::pro if (ftype == ::apache::thrift::protocol::T_LIST) { { this->paramsBatch.clear(); - uint32_t _size656; - ::apache::thrift::protocol::TType _etype659; - xfer += iprot->readListBegin(_etype659, _size656); - this->paramsBatch.resize(_size656); - uint32_t _i660; - for (_i660 = 0; _i660 < _size656; ++_i660) + uint32_t _size668; + ::apache::thrift::protocol::TType _etype671; + xfer += iprot->readListBegin(_etype671, _size668); + this->paramsBatch.resize(_size668); + uint32_t _i672; + for (_i672 = 0; _i672 < _size668; ++_i672) { - xfer += this->paramsBatch[_i660].read(iprot); + xfer += this->paramsBatch[_i672].read(iprot); } xfer += iprot->readListEnd(); } @@ -2906,10 +2906,10 @@ uint32_t SnappyDataService_executePreparedBatch_args::write(::apache::thrift::pr xfer += oprot->writeFieldBegin("paramsBatch", ::apache::thrift::protocol::T_LIST, 2); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast(this->paramsBatch.size())); - std::vector ::const_iterator _iter661; - for (_iter661 = this->paramsBatch.begin(); _iter661 != this->paramsBatch.end(); ++_iter661) + std::vector ::const_iterator _iter673; + for (_iter673 = this->paramsBatch.begin(); _iter673 != this->paramsBatch.end(); ++_iter673) { - xfer += (*_iter661).write(oprot); + xfer += (*_iter673).write(oprot); } xfer += oprot->writeListEnd(); } @@ -2944,10 +2944,10 @@ uint32_t SnappyDataService_executePreparedBatch_pargs::write(::apache::thrift::p xfer += oprot->writeFieldBegin("paramsBatch", ::apache::thrift::protocol::T_LIST, 2); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast((*(this->paramsBatch)).size())); - std::vector ::const_iterator _iter662; - for (_iter662 = (*(this->paramsBatch)).begin(); _iter662 != (*(this->paramsBatch)).end(); ++_iter662) + std::vector ::const_iterator _iter674; + for (_iter674 = (*(this->paramsBatch)).begin(); _iter674 != (*(this->paramsBatch)).end(); ++_iter674) { - xfer += (*_iter662).write(oprot); + xfer += (*_iter674).write(oprot); } xfer += oprot->writeListEnd(); } @@ -3137,14 +3137,14 @@ uint32_t SnappyDataService_prepareAndExecute_args::read(::apache::thrift::protoc if (ftype == ::apache::thrift::protocol::T_LIST) { { this->paramsBatch.clear(); - uint32_t _size663; - ::apache::thrift::protocol::TType _etype666; - xfer += iprot->readListBegin(_etype666, _size663); - this->paramsBatch.resize(_size663); - uint32_t _i667; - for (_i667 = 0; _i667 < _size663; ++_i667) + uint32_t _size675; + ::apache::thrift::protocol::TType _etype678; + xfer += iprot->readListBegin(_etype678, _size675); + this->paramsBatch.resize(_size675); + uint32_t _i679; + for (_i679 = 0; _i679 < _size675; ++_i679) { - xfer += this->paramsBatch[_i667].read(iprot); + xfer += this->paramsBatch[_i679].read(iprot); } xfer += iprot->readListEnd(); } @@ -3157,17 +3157,17 @@ uint32_t SnappyDataService_prepareAndExecute_args::read(::apache::thrift::protoc if (ftype == ::apache::thrift::protocol::T_MAP) { { this->outputParams.clear(); - uint32_t _size668; - ::apache::thrift::protocol::TType _ktype669; - ::apache::thrift::protocol::TType _vtype670; - xfer += iprot->readMapBegin(_ktype669, _vtype670, _size668); - uint32_t _i672; - for (_i672 = 0; _i672 < _size668; ++_i672) + uint32_t _size680; + ::apache::thrift::protocol::TType _ktype681; + ::apache::thrift::protocol::TType _vtype682; + xfer += iprot->readMapBegin(_ktype681, _vtype682, _size680); + uint32_t _i684; + for (_i684 = 0; _i684 < _size680; ++_i684) { - int32_t _key673; - xfer += iprot->readI32(_key673); - OutputParameter& _val674 = this->outputParams[_key673]; - xfer += _val674.read(iprot); + int32_t _key685; + xfer += iprot->readI32(_key685); + OutputParameter& _val686 = this->outputParams[_key685]; + xfer += _val686.read(iprot); } xfer += iprot->readMapEnd(); } @@ -3219,10 +3219,10 @@ uint32_t SnappyDataService_prepareAndExecute_args::write(::apache::thrift::proto xfer += oprot->writeFieldBegin("paramsBatch", ::apache::thrift::protocol::T_LIST, 3); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast(this->paramsBatch.size())); - std::vector ::const_iterator _iter675; - for (_iter675 = this->paramsBatch.begin(); _iter675 != this->paramsBatch.end(); ++_iter675) + std::vector ::const_iterator _iter687; + for (_iter687 = this->paramsBatch.begin(); _iter687 != this->paramsBatch.end(); ++_iter687) { - xfer += (*_iter675).write(oprot); + xfer += (*_iter687).write(oprot); } xfer += oprot->writeListEnd(); } @@ -3231,11 +3231,11 @@ uint32_t SnappyDataService_prepareAndExecute_args::write(::apache::thrift::proto xfer += oprot->writeFieldBegin("outputParams", ::apache::thrift::protocol::T_MAP, 4); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRUCT, static_cast(this->outputParams.size())); - std::map ::const_iterator _iter676; - for (_iter676 = this->outputParams.begin(); _iter676 != this->outputParams.end(); ++_iter676) + std::map ::const_iterator _iter688; + for (_iter688 = this->outputParams.begin(); _iter688 != this->outputParams.end(); ++_iter688) { - xfer += oprot->writeI32(_iter676->first); - xfer += _iter676->second.write(oprot); + xfer += oprot->writeI32(_iter688->first); + xfer += _iter688->second.write(oprot); } xfer += oprot->writeMapEnd(); } @@ -3274,10 +3274,10 @@ uint32_t SnappyDataService_prepareAndExecute_pargs::write(::apache::thrift::prot xfer += oprot->writeFieldBegin("paramsBatch", ::apache::thrift::protocol::T_LIST, 3); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast((*(this->paramsBatch)).size())); - std::vector ::const_iterator _iter677; - for (_iter677 = (*(this->paramsBatch)).begin(); _iter677 != (*(this->paramsBatch)).end(); ++_iter677) + std::vector ::const_iterator _iter689; + for (_iter689 = (*(this->paramsBatch)).begin(); _iter689 != (*(this->paramsBatch)).end(); ++_iter689) { - xfer += (*_iter677).write(oprot); + xfer += (*_iter689).write(oprot); } xfer += oprot->writeListEnd(); } @@ -3286,11 +3286,11 @@ uint32_t SnappyDataService_prepareAndExecute_pargs::write(::apache::thrift::prot xfer += oprot->writeFieldBegin("outputParams", ::apache::thrift::protocol::T_MAP, 4); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRUCT, static_cast((*(this->outputParams)).size())); - std::map ::const_iterator _iter678; - for (_iter678 = (*(this->outputParams)).begin(); _iter678 != (*(this->outputParams)).end(); ++_iter678) + std::map ::const_iterator _iter690; + for (_iter690 = (*(this->outputParams)).begin(); _iter690 != (*(this->outputParams)).end(); ++_iter690) { - xfer += oprot->writeI32(_iter678->first); - xfer += _iter678->second.write(oprot); + xfer += oprot->writeI32(_iter690->first); + xfer += _iter690->second.write(oprot); } xfer += oprot->writeMapEnd(); } @@ -3480,19 +3480,19 @@ uint32_t SnappyDataService_beginTransaction_args::read(::apache::thrift::protoco if (ftype == ::apache::thrift::protocol::T_MAP) { { this->flags.clear(); - uint32_t _size679; - ::apache::thrift::protocol::TType _ktype680; - ::apache::thrift::protocol::TType _vtype681; - xfer += iprot->readMapBegin(_ktype680, _vtype681, _size679); - uint32_t _i683; - for (_i683 = 0; _i683 < _size679; ++_i683) + uint32_t _size691; + ::apache::thrift::protocol::TType _ktype692; + ::apache::thrift::protocol::TType _vtype693; + xfer += iprot->readMapBegin(_ktype692, _vtype693, _size691); + uint32_t _i695; + for (_i695 = 0; _i695 < _size691; ++_i695) { - TransactionAttribute::type _key684; - int32_t ecast686; - xfer += iprot->readI32(ecast686); - _key684 = (TransactionAttribute::type)ecast686; - bool& _val685 = this->flags[_key684]; - xfer += iprot->readBool(_val685); + TransactionAttribute::type _key696; + int32_t ecast698; + xfer += iprot->readI32(ecast698); + _key696 = (TransactionAttribute::type)ecast698; + bool& _val697 = this->flags[_key696]; + xfer += iprot->readBool(_val697); } xfer += iprot->readMapEnd(); } @@ -3536,11 +3536,11 @@ uint32_t SnappyDataService_beginTransaction_args::write(::apache::thrift::protoc xfer += oprot->writeFieldBegin("flags", ::apache::thrift::protocol::T_MAP, 3); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_BOOL, static_cast(this->flags.size())); - std::map ::const_iterator _iter687; - for (_iter687 = this->flags.begin(); _iter687 != this->flags.end(); ++_iter687) + std::map ::const_iterator _iter699; + for (_iter699 = this->flags.begin(); _iter699 != this->flags.end(); ++_iter699) { - xfer += oprot->writeI32((int32_t)_iter687->first); - xfer += oprot->writeBool(_iter687->second); + xfer += oprot->writeI32((int32_t)_iter699->first); + xfer += oprot->writeBool(_iter699->second); } xfer += oprot->writeMapEnd(); } @@ -3575,11 +3575,11 @@ uint32_t SnappyDataService_beginTransaction_pargs::write(::apache::thrift::proto xfer += oprot->writeFieldBegin("flags", ::apache::thrift::protocol::T_MAP, 3); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_BOOL, static_cast((*(this->flags)).size())); - std::map ::const_iterator _iter688; - for (_iter688 = (*(this->flags)).begin(); _iter688 != (*(this->flags)).end(); ++_iter688) + std::map ::const_iterator _iter700; + for (_iter700 = (*(this->flags)).begin(); _iter700 != (*(this->flags)).end(); ++_iter700) { - xfer += oprot->writeI32((int32_t)_iter688->first); - xfer += oprot->writeBool(_iter688->second); + xfer += oprot->writeI32((int32_t)_iter700->first); + xfer += oprot->writeBool(_iter700->second); } xfer += oprot->writeMapEnd(); } @@ -3757,19 +3757,19 @@ uint32_t SnappyDataService_setTransactionAttributes_args::read(::apache::thrift: if (ftype == ::apache::thrift::protocol::T_MAP) { { this->flags.clear(); - uint32_t _size689; - ::apache::thrift::protocol::TType _ktype690; - ::apache::thrift::protocol::TType _vtype691; - xfer += iprot->readMapBegin(_ktype690, _vtype691, _size689); - uint32_t _i693; - for (_i693 = 0; _i693 < _size689; ++_i693) + uint32_t _size701; + ::apache::thrift::protocol::TType _ktype702; + ::apache::thrift::protocol::TType _vtype703; + xfer += iprot->readMapBegin(_ktype702, _vtype703, _size701); + uint32_t _i705; + for (_i705 = 0; _i705 < _size701; ++_i705) { - TransactionAttribute::type _key694; - int32_t ecast696; - xfer += iprot->readI32(ecast696); - _key694 = (TransactionAttribute::type)ecast696; - bool& _val695 = this->flags[_key694]; - xfer += iprot->readBool(_val695); + TransactionAttribute::type _key706; + int32_t ecast708; + xfer += iprot->readI32(ecast708); + _key706 = (TransactionAttribute::type)ecast708; + bool& _val707 = this->flags[_key706]; + xfer += iprot->readBool(_val707); } xfer += iprot->readMapEnd(); } @@ -3809,11 +3809,11 @@ uint32_t SnappyDataService_setTransactionAttributes_args::write(::apache::thrift xfer += oprot->writeFieldBegin("flags", ::apache::thrift::protocol::T_MAP, 2); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_BOOL, static_cast(this->flags.size())); - std::map ::const_iterator _iter697; - for (_iter697 = this->flags.begin(); _iter697 != this->flags.end(); ++_iter697) + std::map ::const_iterator _iter709; + for (_iter709 = this->flags.begin(); _iter709 != this->flags.end(); ++_iter709) { - xfer += oprot->writeI32((int32_t)_iter697->first); - xfer += oprot->writeBool(_iter697->second); + xfer += oprot->writeI32((int32_t)_iter709->first); + xfer += oprot->writeBool(_iter709->second); } xfer += oprot->writeMapEnd(); } @@ -3844,11 +3844,11 @@ uint32_t SnappyDataService_setTransactionAttributes_pargs::write(::apache::thrif xfer += oprot->writeFieldBegin("flags", ::apache::thrift::protocol::T_MAP, 2); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_BOOL, static_cast((*(this->flags)).size())); - std::map ::const_iterator _iter698; - for (_iter698 = (*(this->flags)).begin(); _iter698 != (*(this->flags)).end(); ++_iter698) + std::map ::const_iterator _iter710; + for (_iter710 = (*(this->flags)).begin(); _iter710 != (*(this->flags)).end(); ++_iter710) { - xfer += oprot->writeI32((int32_t)_iter698->first); - xfer += oprot->writeBool(_iter698->second); + xfer += oprot->writeI32((int32_t)_iter710->first); + xfer += oprot->writeBool(_iter710->second); } xfer += oprot->writeMapEnd(); } @@ -4090,19 +4090,19 @@ uint32_t SnappyDataService_getTransactionAttributes_result::read(::apache::thrif if (ftype == ::apache::thrift::protocol::T_MAP) { { this->success.clear(); - uint32_t _size699; - ::apache::thrift::protocol::TType _ktype700; - ::apache::thrift::protocol::TType _vtype701; - xfer += iprot->readMapBegin(_ktype700, _vtype701, _size699); - uint32_t _i703; - for (_i703 = 0; _i703 < _size699; ++_i703) + uint32_t _size711; + ::apache::thrift::protocol::TType _ktype712; + ::apache::thrift::protocol::TType _vtype713; + xfer += iprot->readMapBegin(_ktype712, _vtype713, _size711); + uint32_t _i715; + for (_i715 = 0; _i715 < _size711; ++_i715) { - TransactionAttribute::type _key704; - int32_t ecast706; - xfer += iprot->readI32(ecast706); - _key704 = (TransactionAttribute::type)ecast706; - bool& _val705 = this->success[_key704]; - xfer += iprot->readBool(_val705); + TransactionAttribute::type _key716; + int32_t ecast718; + xfer += iprot->readI32(ecast718); + _key716 = (TransactionAttribute::type)ecast718; + bool& _val717 = this->success[_key716]; + xfer += iprot->readBool(_val717); } xfer += iprot->readMapEnd(); } @@ -4141,11 +4141,11 @@ uint32_t SnappyDataService_getTransactionAttributes_result::write(::apache::thri xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_BOOL, static_cast(this->success.size())); - std::map ::const_iterator _iter707; - for (_iter707 = this->success.begin(); _iter707 != this->success.end(); ++_iter707) + std::map ::const_iterator _iter719; + for (_iter719 = this->success.begin(); _iter719 != this->success.end(); ++_iter719) { - xfer += oprot->writeI32((int32_t)_iter707->first); - xfer += oprot->writeBool(_iter707->second); + xfer += oprot->writeI32((int32_t)_iter719->first); + xfer += oprot->writeBool(_iter719->second); } xfer += oprot->writeMapEnd(); } @@ -4189,19 +4189,19 @@ uint32_t SnappyDataService_getTransactionAttributes_presult::read(::apache::thri if (ftype == ::apache::thrift::protocol::T_MAP) { { (*(this->success)).clear(); - uint32_t _size708; - ::apache::thrift::protocol::TType _ktype709; - ::apache::thrift::protocol::TType _vtype710; - xfer += iprot->readMapBegin(_ktype709, _vtype710, _size708); - uint32_t _i712; - for (_i712 = 0; _i712 < _size708; ++_i712) + uint32_t _size720; + ::apache::thrift::protocol::TType _ktype721; + ::apache::thrift::protocol::TType _vtype722; + xfer += iprot->readMapBegin(_ktype721, _vtype722, _size720); + uint32_t _i724; + for (_i724 = 0; _i724 < _size720; ++_i724) { - TransactionAttribute::type _key713; - int32_t ecast715; - xfer += iprot->readI32(ecast715); - _key713 = (TransactionAttribute::type)ecast715; - bool& _val714 = (*(this->success))[_key713]; - xfer += iprot->readBool(_val714); + TransactionAttribute::type _key725; + int32_t ecast727; + xfer += iprot->readI32(ecast727); + _key725 = (TransactionAttribute::type)ecast727; + bool& _val726 = (*(this->success))[_key725]; + xfer += iprot->readBool(_val726); } xfer += iprot->readMapEnd(); } @@ -4275,19 +4275,19 @@ uint32_t SnappyDataService_commitTransaction_args::read(::apache::thrift::protoc if (ftype == ::apache::thrift::protocol::T_MAP) { { this->flags.clear(); - uint32_t _size716; - ::apache::thrift::protocol::TType _ktype717; - ::apache::thrift::protocol::TType _vtype718; - xfer += iprot->readMapBegin(_ktype717, _vtype718, _size716); - uint32_t _i720; - for (_i720 = 0; _i720 < _size716; ++_i720) + uint32_t _size728; + ::apache::thrift::protocol::TType _ktype729; + ::apache::thrift::protocol::TType _vtype730; + xfer += iprot->readMapBegin(_ktype729, _vtype730, _size728); + uint32_t _i732; + for (_i732 = 0; _i732 < _size728; ++_i732) { - TransactionAttribute::type _key721; - int32_t ecast723; - xfer += iprot->readI32(ecast723); - _key721 = (TransactionAttribute::type)ecast723; - bool& _val722 = this->flags[_key721]; - xfer += iprot->readBool(_val722); + TransactionAttribute::type _key733; + int32_t ecast735; + xfer += iprot->readI32(ecast735); + _key733 = (TransactionAttribute::type)ecast735; + bool& _val734 = this->flags[_key733]; + xfer += iprot->readBool(_val734); } xfer += iprot->readMapEnd(); } @@ -4331,11 +4331,11 @@ uint32_t SnappyDataService_commitTransaction_args::write(::apache::thrift::proto xfer += oprot->writeFieldBegin("flags", ::apache::thrift::protocol::T_MAP, 3); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_BOOL, static_cast(this->flags.size())); - std::map ::const_iterator _iter724; - for (_iter724 = this->flags.begin(); _iter724 != this->flags.end(); ++_iter724) + std::map ::const_iterator _iter736; + for (_iter736 = this->flags.begin(); _iter736 != this->flags.end(); ++_iter736) { - xfer += oprot->writeI32((int32_t)_iter724->first); - xfer += oprot->writeBool(_iter724->second); + xfer += oprot->writeI32((int32_t)_iter736->first); + xfer += oprot->writeBool(_iter736->second); } xfer += oprot->writeMapEnd(); } @@ -4370,11 +4370,11 @@ uint32_t SnappyDataService_commitTransaction_pargs::write(::apache::thrift::prot xfer += oprot->writeFieldBegin("flags", ::apache::thrift::protocol::T_MAP, 3); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_BOOL, static_cast((*(this->flags)).size())); - std::map ::const_iterator _iter725; - for (_iter725 = (*(this->flags)).begin(); _iter725 != (*(this->flags)).end(); ++_iter725) + std::map ::const_iterator _iter737; + for (_iter737 = (*(this->flags)).begin(); _iter737 != (*(this->flags)).end(); ++_iter737) { - xfer += oprot->writeI32((int32_t)_iter725->first); - xfer += oprot->writeBool(_iter725->second); + xfer += oprot->writeI32((int32_t)_iter737->first); + xfer += oprot->writeBool(_iter737->second); } xfer += oprot->writeMapEnd(); } @@ -4540,19 +4540,19 @@ uint32_t SnappyDataService_rollbackTransaction_args::read(::apache::thrift::prot if (ftype == ::apache::thrift::protocol::T_MAP) { { this->flags.clear(); - uint32_t _size726; - ::apache::thrift::protocol::TType _ktype727; - ::apache::thrift::protocol::TType _vtype728; - xfer += iprot->readMapBegin(_ktype727, _vtype728, _size726); - uint32_t _i730; - for (_i730 = 0; _i730 < _size726; ++_i730) + uint32_t _size738; + ::apache::thrift::protocol::TType _ktype739; + ::apache::thrift::protocol::TType _vtype740; + xfer += iprot->readMapBegin(_ktype739, _vtype740, _size738); + uint32_t _i742; + for (_i742 = 0; _i742 < _size738; ++_i742) { - TransactionAttribute::type _key731; - int32_t ecast733; - xfer += iprot->readI32(ecast733); - _key731 = (TransactionAttribute::type)ecast733; - bool& _val732 = this->flags[_key731]; - xfer += iprot->readBool(_val732); + TransactionAttribute::type _key743; + int32_t ecast745; + xfer += iprot->readI32(ecast745); + _key743 = (TransactionAttribute::type)ecast745; + bool& _val744 = this->flags[_key743]; + xfer += iprot->readBool(_val744); } xfer += iprot->readMapEnd(); } @@ -4596,11 +4596,11 @@ uint32_t SnappyDataService_rollbackTransaction_args::write(::apache::thrift::pro xfer += oprot->writeFieldBegin("flags", ::apache::thrift::protocol::T_MAP, 3); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_BOOL, static_cast(this->flags.size())); - std::map ::const_iterator _iter734; - for (_iter734 = this->flags.begin(); _iter734 != this->flags.end(); ++_iter734) + std::map ::const_iterator _iter746; + for (_iter746 = this->flags.begin(); _iter746 != this->flags.end(); ++_iter746) { - xfer += oprot->writeI32((int32_t)_iter734->first); - xfer += oprot->writeBool(_iter734->second); + xfer += oprot->writeI32((int32_t)_iter746->first); + xfer += oprot->writeBool(_iter746->second); } xfer += oprot->writeMapEnd(); } @@ -4635,11 +4635,11 @@ uint32_t SnappyDataService_rollbackTransaction_pargs::write(::apache::thrift::pr xfer += oprot->writeFieldBegin("flags", ::apache::thrift::protocol::T_MAP, 3); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_BOOL, static_cast((*(this->flags)).size())); - std::map ::const_iterator _iter735; - for (_iter735 = (*(this->flags)).begin(); _iter735 != (*(this->flags)).end(); ++_iter735) + std::map ::const_iterator _iter747; + for (_iter747 = (*(this->flags)).begin(); _iter747 != (*(this->flags)).end(); ++_iter747) { - xfer += oprot->writeI32((int32_t)_iter735->first); - xfer += oprot->writeBool(_iter735->second); + xfer += oprot->writeI32((int32_t)_iter747->first); + xfer += oprot->writeBool(_iter747->second); } xfer += oprot->writeMapEnd(); } @@ -6559,16 +6559,16 @@ uint32_t SnappyDataService_executeCursorUpdate_args::read(::apache::thrift::prot if (ftype == ::apache::thrift::protocol::T_LIST) { { this->operations.clear(); - uint32_t _size736; - ::apache::thrift::protocol::TType _etype739; - xfer += iprot->readListBegin(_etype739, _size736); - this->operations.resize(_size736); - uint32_t _i740; - for (_i740 = 0; _i740 < _size736; ++_i740) + uint32_t _size748; + ::apache::thrift::protocol::TType _etype751; + xfer += iprot->readListBegin(_etype751, _size748); + this->operations.resize(_size748); + uint32_t _i752; + for (_i752 = 0; _i752 < _size748; ++_i752) { - int32_t ecast741; - xfer += iprot->readI32(ecast741); - this->operations[_i740] = (CursorUpdateOperation::type)ecast741; + int32_t ecast753; + xfer += iprot->readI32(ecast753); + this->operations[_i752] = (CursorUpdateOperation::type)ecast753; } xfer += iprot->readListEnd(); } @@ -6581,14 +6581,14 @@ uint32_t SnappyDataService_executeCursorUpdate_args::read(::apache::thrift::prot if (ftype == ::apache::thrift::protocol::T_LIST) { { this->changedRows.clear(); - uint32_t _size742; - ::apache::thrift::protocol::TType _etype745; - xfer += iprot->readListBegin(_etype745, _size742); - this->changedRows.resize(_size742); - uint32_t _i746; - for (_i746 = 0; _i746 < _size742; ++_i746) + uint32_t _size754; + ::apache::thrift::protocol::TType _etype757; + xfer += iprot->readListBegin(_etype757, _size754); + this->changedRows.resize(_size754); + uint32_t _i758; + for (_i758 = 0; _i758 < _size754; ++_i758) { - xfer += this->changedRows[_i746].read(iprot); + xfer += this->changedRows[_i758].read(iprot); } xfer += iprot->readListEnd(); } @@ -6601,23 +6601,23 @@ uint32_t SnappyDataService_executeCursorUpdate_args::read(::apache::thrift::prot if (ftype == ::apache::thrift::protocol::T_LIST) { { this->changedColumnsList.clear(); - uint32_t _size747; - ::apache::thrift::protocol::TType _etype750; - xfer += iprot->readListBegin(_etype750, _size747); - this->changedColumnsList.resize(_size747); - uint32_t _i751; - for (_i751 = 0; _i751 < _size747; ++_i751) + uint32_t _size759; + ::apache::thrift::protocol::TType _etype762; + xfer += iprot->readListBegin(_etype762, _size759); + this->changedColumnsList.resize(_size759); + uint32_t _i763; + for (_i763 = 0; _i763 < _size759; ++_i763) { { - this->changedColumnsList[_i751].clear(); - uint32_t _size752; - ::apache::thrift::protocol::TType _etype755; - xfer += iprot->readListBegin(_etype755, _size752); - this->changedColumnsList[_i751].resize(_size752); - uint32_t _i756; - for (_i756 = 0; _i756 < _size752; ++_i756) + this->changedColumnsList[_i763].clear(); + uint32_t _size764; + ::apache::thrift::protocol::TType _etype767; + xfer += iprot->readListBegin(_etype767, _size764); + this->changedColumnsList[_i763].resize(_size764); + uint32_t _i768; + for (_i768 = 0; _i768 < _size764; ++_i768) { - xfer += iprot->readI32(this->changedColumnsList[_i751][_i756]); + xfer += iprot->readI32(this->changedColumnsList[_i763][_i768]); } xfer += iprot->readListEnd(); } @@ -6633,14 +6633,14 @@ uint32_t SnappyDataService_executeCursorUpdate_args::read(::apache::thrift::prot if (ftype == ::apache::thrift::protocol::T_LIST) { { this->changedRowIndexes.clear(); - uint32_t _size757; - ::apache::thrift::protocol::TType _etype760; - xfer += iprot->readListBegin(_etype760, _size757); - this->changedRowIndexes.resize(_size757); - uint32_t _i761; - for (_i761 = 0; _i761 < _size757; ++_i761) + uint32_t _size769; + ::apache::thrift::protocol::TType _etype772; + xfer += iprot->readListBegin(_etype772, _size769); + this->changedRowIndexes.resize(_size769); + uint32_t _i773; + for (_i773 = 0; _i773 < _size769; ++_i773) { - xfer += iprot->readI32(this->changedRowIndexes[_i761]); + xfer += iprot->readI32(this->changedRowIndexes[_i773]); } xfer += iprot->readListEnd(); } @@ -6680,10 +6680,10 @@ uint32_t SnappyDataService_executeCursorUpdate_args::write(::apache::thrift::pro xfer += oprot->writeFieldBegin("operations", ::apache::thrift::protocol::T_LIST, 2); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast(this->operations.size())); - std::vector ::const_iterator _iter762; - for (_iter762 = this->operations.begin(); _iter762 != this->operations.end(); ++_iter762) + std::vector ::const_iterator _iter774; + for (_iter774 = this->operations.begin(); _iter774 != this->operations.end(); ++_iter774) { - xfer += oprot->writeI32((int32_t)(*_iter762)); + xfer += oprot->writeI32((int32_t)(*_iter774)); } xfer += oprot->writeListEnd(); } @@ -6692,10 +6692,10 @@ uint32_t SnappyDataService_executeCursorUpdate_args::write(::apache::thrift::pro xfer += oprot->writeFieldBegin("changedRows", ::apache::thrift::protocol::T_LIST, 3); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast(this->changedRows.size())); - std::vector ::const_iterator _iter763; - for (_iter763 = this->changedRows.begin(); _iter763 != this->changedRows.end(); ++_iter763) + std::vector ::const_iterator _iter775; + for (_iter775 = this->changedRows.begin(); _iter775 != this->changedRows.end(); ++_iter775) { - xfer += (*_iter763).write(oprot); + xfer += (*_iter775).write(oprot); } xfer += oprot->writeListEnd(); } @@ -6704,15 +6704,15 @@ uint32_t SnappyDataService_executeCursorUpdate_args::write(::apache::thrift::pro xfer += oprot->writeFieldBegin("changedColumnsList", ::apache::thrift::protocol::T_LIST, 4); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_LIST, static_cast(this->changedColumnsList.size())); - std::vector > ::const_iterator _iter764; - for (_iter764 = this->changedColumnsList.begin(); _iter764 != this->changedColumnsList.end(); ++_iter764) + std::vector > ::const_iterator _iter776; + for (_iter776 = this->changedColumnsList.begin(); _iter776 != this->changedColumnsList.end(); ++_iter776) { { - xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast((*_iter764).size())); - std::vector ::const_iterator _iter765; - for (_iter765 = (*_iter764).begin(); _iter765 != (*_iter764).end(); ++_iter765) + xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast((*_iter776).size())); + std::vector ::const_iterator _iter777; + for (_iter777 = (*_iter776).begin(); _iter777 != (*_iter776).end(); ++_iter777) { - xfer += oprot->writeI32((*_iter765)); + xfer += oprot->writeI32((*_iter777)); } xfer += oprot->writeListEnd(); } @@ -6724,10 +6724,10 @@ uint32_t SnappyDataService_executeCursorUpdate_args::write(::apache::thrift::pro xfer += oprot->writeFieldBegin("changedRowIndexes", ::apache::thrift::protocol::T_LIST, 5); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast(this->changedRowIndexes.size())); - std::vector ::const_iterator _iter766; - for (_iter766 = this->changedRowIndexes.begin(); _iter766 != this->changedRowIndexes.end(); ++_iter766) + std::vector ::const_iterator _iter778; + for (_iter778 = this->changedRowIndexes.begin(); _iter778 != this->changedRowIndexes.end(); ++_iter778) { - xfer += oprot->writeI32((*_iter766)); + xfer += oprot->writeI32((*_iter778)); } xfer += oprot->writeListEnd(); } @@ -6758,10 +6758,10 @@ uint32_t SnappyDataService_executeCursorUpdate_pargs::write(::apache::thrift::pr xfer += oprot->writeFieldBegin("operations", ::apache::thrift::protocol::T_LIST, 2); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast((*(this->operations)).size())); - std::vector ::const_iterator _iter767; - for (_iter767 = (*(this->operations)).begin(); _iter767 != (*(this->operations)).end(); ++_iter767) + std::vector ::const_iterator _iter779; + for (_iter779 = (*(this->operations)).begin(); _iter779 != (*(this->operations)).end(); ++_iter779) { - xfer += oprot->writeI32((int32_t)(*_iter767)); + xfer += oprot->writeI32((int32_t)(*_iter779)); } xfer += oprot->writeListEnd(); } @@ -6770,10 +6770,10 @@ uint32_t SnappyDataService_executeCursorUpdate_pargs::write(::apache::thrift::pr xfer += oprot->writeFieldBegin("changedRows", ::apache::thrift::protocol::T_LIST, 3); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast((*(this->changedRows)).size())); - std::vector ::const_iterator _iter768; - for (_iter768 = (*(this->changedRows)).begin(); _iter768 != (*(this->changedRows)).end(); ++_iter768) + std::vector ::const_iterator _iter780; + for (_iter780 = (*(this->changedRows)).begin(); _iter780 != (*(this->changedRows)).end(); ++_iter780) { - xfer += (*_iter768).write(oprot); + xfer += (*_iter780).write(oprot); } xfer += oprot->writeListEnd(); } @@ -6782,15 +6782,15 @@ uint32_t SnappyDataService_executeCursorUpdate_pargs::write(::apache::thrift::pr xfer += oprot->writeFieldBegin("changedColumnsList", ::apache::thrift::protocol::T_LIST, 4); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_LIST, static_cast((*(this->changedColumnsList)).size())); - std::vector > ::const_iterator _iter769; - for (_iter769 = (*(this->changedColumnsList)).begin(); _iter769 != (*(this->changedColumnsList)).end(); ++_iter769) + std::vector > ::const_iterator _iter781; + for (_iter781 = (*(this->changedColumnsList)).begin(); _iter781 != (*(this->changedColumnsList)).end(); ++_iter781) { { - xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast((*_iter769).size())); - std::vector ::const_iterator _iter770; - for (_iter770 = (*_iter769).begin(); _iter770 != (*_iter769).end(); ++_iter770) + xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast((*_iter781).size())); + std::vector ::const_iterator _iter782; + for (_iter782 = (*_iter781).begin(); _iter782 != (*_iter781).end(); ++_iter782) { - xfer += oprot->writeI32((*_iter770)); + xfer += oprot->writeI32((*_iter782)); } xfer += oprot->writeListEnd(); } @@ -6802,10 +6802,10 @@ uint32_t SnappyDataService_executeCursorUpdate_pargs::write(::apache::thrift::pr xfer += oprot->writeFieldBegin("changedRowIndexes", ::apache::thrift::protocol::T_LIST, 5); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast((*(this->changedRowIndexes)).size())); - std::vector ::const_iterator _iter771; - for (_iter771 = (*(this->changedRowIndexes)).begin(); _iter771 != (*(this->changedRowIndexes)).end(); ++_iter771) + std::vector ::const_iterator _iter783; + for (_iter783 = (*(this->changedRowIndexes)).begin(); _iter783 != (*(this->changedRowIndexes)).end(); ++_iter783) { - xfer += oprot->writeI32((*_iter771)); + xfer += oprot->writeI32((*_iter783)); } xfer += oprot->writeListEnd(); } @@ -8431,14 +8431,14 @@ uint32_t SnappyDataService_recoverXATransaction_result::read(::apache::thrift::p if (ftype == ::apache::thrift::protocol::T_LIST) { { this->success.clear(); - uint32_t _size772; - ::apache::thrift::protocol::TType _etype775; - xfer += iprot->readListBegin(_etype775, _size772); - this->success.resize(_size772); - uint32_t _i776; - for (_i776 = 0; _i776 < _size772; ++_i776) + uint32_t _size784; + ::apache::thrift::protocol::TType _etype787; + xfer += iprot->readListBegin(_etype787, _size784); + this->success.resize(_size784); + uint32_t _i788; + for (_i788 = 0; _i788 < _size784; ++_i788) { - xfer += this->success[_i776].read(iprot); + xfer += this->success[_i788].read(iprot); } xfer += iprot->readListEnd(); } @@ -8477,10 +8477,10 @@ uint32_t SnappyDataService_recoverXATransaction_result::write(::apache::thrift:: xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast(this->success.size())); - std::vector ::const_iterator _iter777; - for (_iter777 = this->success.begin(); _iter777 != this->success.end(); ++_iter777) + std::vector ::const_iterator _iter789; + for (_iter789 = this->success.begin(); _iter789 != this->success.end(); ++_iter789) { - xfer += (*_iter777).write(oprot); + xfer += (*_iter789).write(oprot); } xfer += oprot->writeListEnd(); } @@ -8524,14 +8524,14 @@ uint32_t SnappyDataService_recoverXATransaction_presult::read(::apache::thrift:: if (ftype == ::apache::thrift::protocol::T_LIST) { { (*(this->success)).clear(); - uint32_t _size778; - ::apache::thrift::protocol::TType _etype781; - xfer += iprot->readListBegin(_etype781, _size778); - (*(this->success)).resize(_size778); - uint32_t _i782; - for (_i782 = 0; _i782 < _size778; ++_i782) + uint32_t _size790; + ::apache::thrift::protocol::TType _etype793; + xfer += iprot->readListBegin(_etype793, _size790); + (*(this->success)).resize(_size790); + uint32_t _i794; + for (_i794 = 0; _i794 < _size790; ++_i794) { - xfer += (*(this->success))[_i782].read(iprot); + xfer += (*(this->success))[_i794].read(iprot); } xfer += iprot->readListEnd(); } @@ -8805,9 +8805,9 @@ uint32_t SnappyDataService_getSchemaMetaData_args::read(::apache::thrift::protoc { case 1: if (ftype == ::apache::thrift::protocol::T_I32) { - int32_t ecast783; - xfer += iprot->readI32(ecast783); - this->schemaCall = (ServiceMetaDataCall::type)ecast783; + int32_t ecast795; + xfer += iprot->readI32(ecast795); + this->schemaCall = (ServiceMetaDataCall::type)ecast795; this->__isset.schemaCall = true; } else { xfer += iprot->skip(ftype); @@ -9269,16 +9269,16 @@ uint32_t SnappyDataService_getUDTs_args::read(::apache::thrift::protocol::TProto if (ftype == ::apache::thrift::protocol::T_LIST) { { this->types.clear(); - uint32_t _size784; - ::apache::thrift::protocol::TType _etype787; - xfer += iprot->readListBegin(_etype787, _size784); - this->types.resize(_size784); - uint32_t _i788; - for (_i788 = 0; _i788 < _size784; ++_i788) + uint32_t _size796; + ::apache::thrift::protocol::TType _etype799; + xfer += iprot->readListBegin(_etype799, _size796); + this->types.resize(_size796); + uint32_t _i800; + for (_i800 = 0; _i800 < _size796; ++_i800) { - int32_t ecast789; - xfer += iprot->readI32(ecast789); - this->types[_i788] = (SnappyType::type)ecast789; + int32_t ecast801; + xfer += iprot->readI32(ecast801); + this->types[_i800] = (SnappyType::type)ecast801; } xfer += iprot->readListEnd(); } @@ -9310,10 +9310,10 @@ uint32_t SnappyDataService_getUDTs_args::write(::apache::thrift::protocol::TProt xfer += oprot->writeFieldBegin("types", ::apache::thrift::protocol::T_LIST, 2); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast(this->types.size())); - std::vector ::const_iterator _iter790; - for (_iter790 = this->types.begin(); _iter790 != this->types.end(); ++_iter790) + std::vector ::const_iterator _iter802; + for (_iter802 = this->types.begin(); _iter802 != this->types.end(); ++_iter802) { - xfer += oprot->writeI32((int32_t)(*_iter790)); + xfer += oprot->writeI32((int32_t)(*_iter802)); } xfer += oprot->writeListEnd(); } @@ -9340,10 +9340,10 @@ uint32_t SnappyDataService_getUDTs_pargs::write(::apache::thrift::protocol::TPro xfer += oprot->writeFieldBegin("types", ::apache::thrift::protocol::T_LIST, 2); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast((*(this->types)).size())); - std::vector ::const_iterator _iter791; - for (_iter791 = (*(this->types)).begin(); _iter791 != (*(this->types)).end(); ++_iter791) + std::vector ::const_iterator _iter803; + for (_iter803 = (*(this->types)).begin(); _iter803 != (*(this->types)).end(); ++_iter803) { - xfer += oprot->writeI32((int32_t)(*_iter791)); + xfer += oprot->writeI32((int32_t)(*_iter803)); } xfer += oprot->writeListEnd(); } @@ -9835,14 +9835,14 @@ uint32_t SnappyDataService_fetchActiveConnections_result::read(::apache::thrift: if (ftype == ::apache::thrift::protocol::T_LIST) { { this->success.clear(); - uint32_t _size792; - ::apache::thrift::protocol::TType _etype795; - xfer += iprot->readListBegin(_etype795, _size792); - this->success.resize(_size792); - uint32_t _i796; - for (_i796 = 0; _i796 < _size792; ++_i796) + uint32_t _size804; + ::apache::thrift::protocol::TType _etype807; + xfer += iprot->readListBegin(_etype807, _size804); + this->success.resize(_size804); + uint32_t _i808; + for (_i808 = 0; _i808 < _size804; ++_i808) { - xfer += this->success[_i796].read(iprot); + xfer += this->success[_i808].read(iprot); } xfer += iprot->readListEnd(); } @@ -9881,10 +9881,10 @@ uint32_t SnappyDataService_fetchActiveConnections_result::write(::apache::thrift xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast(this->success.size())); - std::vector ::const_iterator _iter797; - for (_iter797 = this->success.begin(); _iter797 != this->success.end(); ++_iter797) + std::vector ::const_iterator _iter809; + for (_iter809 = this->success.begin(); _iter809 != this->success.end(); ++_iter809) { - xfer += (*_iter797).write(oprot); + xfer += (*_iter809).write(oprot); } xfer += oprot->writeListEnd(); } @@ -9928,14 +9928,14 @@ uint32_t SnappyDataService_fetchActiveConnections_presult::read(::apache::thrift if (ftype == ::apache::thrift::protocol::T_LIST) { { (*(this->success)).clear(); - uint32_t _size798; - ::apache::thrift::protocol::TType _etype801; - xfer += iprot->readListBegin(_etype801, _size798); - (*(this->success)).resize(_size798); - uint32_t _i802; - for (_i802 = 0; _i802 < _size798; ++_i802) + uint32_t _size810; + ::apache::thrift::protocol::TType _etype813; + xfer += iprot->readListBegin(_etype813, _size810); + (*(this->success)).resize(_size810); + uint32_t _i814; + for (_i814 = 0; _i814 < _size810; ++_i814) { - xfer += (*(this->success))[_i802].read(iprot); + xfer += (*(this->success))[_i814].read(iprot); } xfer += iprot->readListEnd(); } @@ -10085,17 +10085,17 @@ uint32_t SnappyDataService_fetchActiveStatements_result::read(::apache::thrift:: if (ftype == ::apache::thrift::protocol::T_MAP) { { this->success.clear(); - uint32_t _size803; - ::apache::thrift::protocol::TType _ktype804; - ::apache::thrift::protocol::TType _vtype805; - xfer += iprot->readMapBegin(_ktype804, _vtype805, _size803); - uint32_t _i807; - for (_i807 = 0; _i807 < _size803; ++_i807) + uint32_t _size815; + ::apache::thrift::protocol::TType _ktype816; + ::apache::thrift::protocol::TType _vtype817; + xfer += iprot->readMapBegin(_ktype816, _vtype817, _size815); + uint32_t _i819; + for (_i819 = 0; _i819 < _size815; ++_i819) { - int64_t _key808; - xfer += iprot->readI64(_key808); - std::string& _val809 = this->success[_key808]; - xfer += iprot->readString(_val809); + int64_t _key820; + xfer += iprot->readI64(_key820); + std::string& _val821 = this->success[_key820]; + xfer += iprot->readString(_val821); } xfer += iprot->readMapEnd(); } @@ -10134,11 +10134,11 @@ uint32_t SnappyDataService_fetchActiveStatements_result::write(::apache::thrift: xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_MAP, 0); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I64, ::apache::thrift::protocol::T_STRING, static_cast(this->success.size())); - std::map ::const_iterator _iter810; - for (_iter810 = this->success.begin(); _iter810 != this->success.end(); ++_iter810) + std::map ::const_iterator _iter822; + for (_iter822 = this->success.begin(); _iter822 != this->success.end(); ++_iter822) { - xfer += oprot->writeI64(_iter810->first); - xfer += oprot->writeString(_iter810->second); + xfer += oprot->writeI64(_iter822->first); + xfer += oprot->writeString(_iter822->second); } xfer += oprot->writeMapEnd(); } @@ -10182,17 +10182,17 @@ uint32_t SnappyDataService_fetchActiveStatements_presult::read(::apache::thrift: if (ftype == ::apache::thrift::protocol::T_MAP) { { (*(this->success)).clear(); - uint32_t _size811; - ::apache::thrift::protocol::TType _ktype812; - ::apache::thrift::protocol::TType _vtype813; - xfer += iprot->readMapBegin(_ktype812, _vtype813, _size811); - uint32_t _i815; - for (_i815 = 0; _i815 < _size811; ++_i815) + uint32_t _size823; + ::apache::thrift::protocol::TType _ktype824; + ::apache::thrift::protocol::TType _vtype825; + xfer += iprot->readMapBegin(_ktype824, _vtype825, _size823); + uint32_t _i827; + for (_i827 = 0; _i827 < _size823; ++_i827) { - int64_t _key816; - xfer += iprot->readI64(_key816); - std::string& _val817 = (*(this->success))[_key816]; - xfer += iprot->readString(_val817); + int64_t _key828; + xfer += iprot->readI64(_key828); + std::string& _val829 = (*(this->success))[_key828]; + xfer += iprot->readString(_val829); } xfer += iprot->readMapEnd(); } @@ -11150,14 +11150,14 @@ uint32_t SnappyDataService_bulkClose_args::read(::apache::thrift::protocol::TPro if (ftype == ::apache::thrift::protocol::T_LIST) { { this->entities.clear(); - uint32_t _size818; - ::apache::thrift::protocol::TType _etype821; - xfer += iprot->readListBegin(_etype821, _size818); - this->entities.resize(_size818); - uint32_t _i822; - for (_i822 = 0; _i822 < _size818; ++_i822) + uint32_t _size830; + ::apache::thrift::protocol::TType _etype833; + xfer += iprot->readListBegin(_etype833, _size830); + this->entities.resize(_size830); + uint32_t _i834; + for (_i834 = 0; _i834 < _size830; ++_i834) { - xfer += this->entities[_i822].read(iprot); + xfer += this->entities[_i834].read(iprot); } xfer += iprot->readListEnd(); } @@ -11185,10 +11185,10 @@ uint32_t SnappyDataService_bulkClose_args::write(::apache::thrift::protocol::TPr xfer += oprot->writeFieldBegin("entities", ::apache::thrift::protocol::T_LIST, 1); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast(this->entities.size())); - std::vector ::const_iterator _iter823; - for (_iter823 = this->entities.begin(); _iter823 != this->entities.end(); ++_iter823) + std::vector ::const_iterator _iter835; + for (_iter835 = this->entities.begin(); _iter835 != this->entities.end(); ++_iter835) { - xfer += (*_iter823).write(oprot); + xfer += (*_iter835).write(oprot); } xfer += oprot->writeListEnd(); } @@ -11211,10 +11211,10 @@ uint32_t SnappyDataService_bulkClose_pargs::write(::apache::thrift::protocol::TP xfer += oprot->writeFieldBegin("entities", ::apache::thrift::protocol::T_LIST, 1); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast((*(this->entities)).size())); - std::vector ::const_iterator _iter824; - for (_iter824 = (*(this->entities)).begin(); _iter824 != (*(this->entities)).end(); ++_iter824) + std::vector ::const_iterator _iter836; + for (_iter836 = (*(this->entities)).begin(); _iter836 != (*(this->entities)).end(); ++_iter836) { - xfer += (*_iter824).write(oprot); + xfer += (*_iter836).write(oprot); } xfer += oprot->writeListEnd(); } diff --git a/native/src/snappyclient/cpp/thrift/SnappyDataService.h b/native/src/snappyclient/cpp/thrift/SnappyDataService.h index c29457e6c..89c32f884 100644 --- a/native/src/snappyclient/cpp/thrift/SnappyDataService.h +++ b/native/src/snappyclient/cpp/thrift/SnappyDataService.h @@ -40,6 +40,7 @@ #include "snappydata_struct_BucketOwners.h" #include "snappydata_struct_CatalogStorage.h" #include "snappydata_struct_CatalogSchemaObject.h" +#include "snappydata_struct_CatalogStats.h" #include "snappydata_struct_CatalogTableObject.h" #include "snappydata_struct_CatalogFunctionObject.h" #include "snappydata_struct_CatalogPartitionObject.h" diff --git a/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogFunctionObject.cpp b/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogFunctionObject.cpp index e07dbb469..520f03222 100644 --- a/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogFunctionObject.cpp +++ b/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogFunctionObject.cpp @@ -95,14 +95,14 @@ uint32_t CatalogFunctionObject::read(::apache::thrift::protocol::TProtocol* ipro if (ftype == ::apache::thrift::protocol::T_LIST) { { this->resources.clear(); - uint32_t _size404; - ::apache::thrift::protocol::TType _etype407; - xfer += iprot->readListBegin(_etype407, _size404); - this->resources.resize(_size404); - uint32_t _i408; - for (_i408 = 0; _i408 < _size404; ++_i408) + uint32_t _size416; + ::apache::thrift::protocol::TType _etype419; + xfer += iprot->readListBegin(_etype419, _size416); + this->resources.resize(_size416); + uint32_t _i420; + for (_i420 = 0; _i420 < _size416; ++_i420) { - xfer += iprot->readString(this->resources[_i408]); + xfer += iprot->readString(this->resources[_i420]); } xfer += iprot->readListEnd(); } @@ -149,10 +149,10 @@ uint32_t CatalogFunctionObject::write(::apache::thrift::protocol::TProtocol* opr xfer += oprot->writeFieldBegin("resources", ::apache::thrift::protocol::T_LIST, 4); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast(this->resources.size())); - std::vector ::const_iterator _iter409; - for (_iter409 = this->resources.begin(); _iter409 != this->resources.end(); ++_iter409) + std::vector ::const_iterator _iter421; + for (_iter421 = this->resources.begin(); _iter421 != this->resources.end(); ++_iter421) { - xfer += oprot->writeString((*_iter409)); + xfer += oprot->writeString((*_iter421)); } xfer += oprot->writeListEnd(); } @@ -172,34 +172,34 @@ void swap(CatalogFunctionObject &a, CatalogFunctionObject &b) { swap(a.__isset, b.__isset); } -CatalogFunctionObject::CatalogFunctionObject(const CatalogFunctionObject& other410) { - functionName = other410.functionName; - schemaName = other410.schemaName; - className = other410.className; - resources = other410.resources; - __isset = other410.__isset; +CatalogFunctionObject::CatalogFunctionObject(const CatalogFunctionObject& other422) { + functionName = other422.functionName; + schemaName = other422.schemaName; + className = other422.className; + resources = other422.resources; + __isset = other422.__isset; } -CatalogFunctionObject::CatalogFunctionObject( CatalogFunctionObject&& other411) noexcept { - functionName = std::move(other411.functionName); - schemaName = std::move(other411.schemaName); - className = std::move(other411.className); - resources = std::move(other411.resources); - __isset = std::move(other411.__isset); +CatalogFunctionObject::CatalogFunctionObject( CatalogFunctionObject&& other423) noexcept { + functionName = std::move(other423.functionName); + schemaName = std::move(other423.schemaName); + className = std::move(other423.className); + resources = std::move(other423.resources); + __isset = std::move(other423.__isset); } -CatalogFunctionObject& CatalogFunctionObject::operator=(const CatalogFunctionObject& other412) { - functionName = other412.functionName; - schemaName = other412.schemaName; - className = other412.className; - resources = other412.resources; - __isset = other412.__isset; +CatalogFunctionObject& CatalogFunctionObject::operator=(const CatalogFunctionObject& other424) { + functionName = other424.functionName; + schemaName = other424.schemaName; + className = other424.className; + resources = other424.resources; + __isset = other424.__isset; return *this; } -CatalogFunctionObject& CatalogFunctionObject::operator=(CatalogFunctionObject&& other413) noexcept { - functionName = std::move(other413.functionName); - schemaName = std::move(other413.schemaName); - className = std::move(other413.className); - resources = std::move(other413.resources); - __isset = std::move(other413.__isset); +CatalogFunctionObject& CatalogFunctionObject::operator=(CatalogFunctionObject&& other425) noexcept { + functionName = std::move(other425.functionName); + schemaName = std::move(other425.schemaName); + className = std::move(other425.className); + resources = std::move(other425.resources); + __isset = std::move(other425.__isset); return *this; } void CatalogFunctionObject::printTo(std::ostream& out) const { diff --git a/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogMetadataDetails.cpp b/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogMetadataDetails.cpp index ce99bb55f..d8eebe60d 100644 --- a/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogMetadataDetails.cpp +++ b/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogMetadataDetails.cpp @@ -77,6 +77,11 @@ void CatalogMetadataDetails::__set_catalogPartitions(const std::vectorcatalogStats = val; +__isset.catalogStats = true; +} + uint32_t CatalogMetadataDetails::read(::apache::thrift::protocol::TProtocol* iprot) { uint32_t xfer = 0; @@ -101,14 +106,14 @@ uint32_t CatalogMetadataDetails::read(::apache::thrift::protocol::TProtocol* ipr if (ftype == ::apache::thrift::protocol::T_LIST) { { this->names.clear(); - uint32_t _size446; - ::apache::thrift::protocol::TType _etype449; - xfer += iprot->readListBegin(_etype449, _size446); - this->names.resize(_size446); - uint32_t _i450; - for (_i450 = 0; _i450 < _size446; ++_i450) + uint32_t _size458; + ::apache::thrift::protocol::TType _etype461; + xfer += iprot->readListBegin(_etype461, _size458); + this->names.resize(_size458); + uint32_t _i462; + for (_i462 = 0; _i462 < _size458; ++_i462) { - xfer += iprot->readString(this->names[_i450]); + xfer += iprot->readString(this->names[_i462]); } xfer += iprot->readListEnd(); } @@ -121,26 +126,26 @@ uint32_t CatalogMetadataDetails::read(::apache::thrift::protocol::TProtocol* ipr if (ftype == ::apache::thrift::protocol::T_LIST) { { this->properties.clear(); - uint32_t _size451; - ::apache::thrift::protocol::TType _etype454; - xfer += iprot->readListBegin(_etype454, _size451); - this->properties.resize(_size451); - uint32_t _i455; - for (_i455 = 0; _i455 < _size451; ++_i455) + uint32_t _size463; + ::apache::thrift::protocol::TType _etype466; + xfer += iprot->readListBegin(_etype466, _size463); + this->properties.resize(_size463); + uint32_t _i467; + for (_i467 = 0; _i467 < _size463; ++_i467) { { - this->properties[_i455].clear(); - uint32_t _size456; - ::apache::thrift::protocol::TType _ktype457; - ::apache::thrift::protocol::TType _vtype458; - xfer += iprot->readMapBegin(_ktype457, _vtype458, _size456); - uint32_t _i460; - for (_i460 = 0; _i460 < _size456; ++_i460) + this->properties[_i467].clear(); + uint32_t _size468; + ::apache::thrift::protocol::TType _ktype469; + ::apache::thrift::protocol::TType _vtype470; + xfer += iprot->readMapBegin(_ktype469, _vtype470, _size468); + uint32_t _i472; + for (_i472 = 0; _i472 < _size468; ++_i472) { - std::string _key461; - xfer += iprot->readString(_key461); - std::string& _val462 = this->properties[_i455][_key461]; - xfer += iprot->readString(_val462); + std::string _key473; + xfer += iprot->readString(_key473); + std::string& _val474 = this->properties[_i467][_key473]; + xfer += iprot->readString(_val474); } xfer += iprot->readMapEnd(); } @@ -156,26 +161,26 @@ uint32_t CatalogMetadataDetails::read(::apache::thrift::protocol::TProtocol* ipr if (ftype == ::apache::thrift::protocol::T_LIST) { { this->newProperties.clear(); - uint32_t _size463; - ::apache::thrift::protocol::TType _etype466; - xfer += iprot->readListBegin(_etype466, _size463); - this->newProperties.resize(_size463); - uint32_t _i467; - for (_i467 = 0; _i467 < _size463; ++_i467) + uint32_t _size475; + ::apache::thrift::protocol::TType _etype478; + xfer += iprot->readListBegin(_etype478, _size475); + this->newProperties.resize(_size475); + uint32_t _i479; + for (_i479 = 0; _i479 < _size475; ++_i479) { { - this->newProperties[_i467].clear(); - uint32_t _size468; - ::apache::thrift::protocol::TType _ktype469; - ::apache::thrift::protocol::TType _vtype470; - xfer += iprot->readMapBegin(_ktype469, _vtype470, _size468); - uint32_t _i472; - for (_i472 = 0; _i472 < _size468; ++_i472) + this->newProperties[_i479].clear(); + uint32_t _size480; + ::apache::thrift::protocol::TType _ktype481; + ::apache::thrift::protocol::TType _vtype482; + xfer += iprot->readMapBegin(_ktype481, _vtype482, _size480); + uint32_t _i484; + for (_i484 = 0; _i484 < _size480; ++_i484) { - std::string _key473; - xfer += iprot->readString(_key473); - std::string& _val474 = this->newProperties[_i467][_key473]; - xfer += iprot->readString(_val474); + std::string _key485; + xfer += iprot->readString(_key485); + std::string& _val486 = this->newProperties[_i479][_key485]; + xfer += iprot->readString(_val486); } xfer += iprot->readMapEnd(); } @@ -207,14 +212,14 @@ uint32_t CatalogMetadataDetails::read(::apache::thrift::protocol::TProtocol* ipr if (ftype == ::apache::thrift::protocol::T_LIST) { { this->otherFlags.clear(); - uint32_t _size475; - ::apache::thrift::protocol::TType _etype478; - xfer += iprot->readListBegin(_etype478, _size475); - this->otherFlags.resize(_size475); - uint32_t _i479; - for (_i479 = 0; _i479 < _size475; ++_i479) + uint32_t _size487; + ::apache::thrift::protocol::TType _etype490; + xfer += iprot->readListBegin(_etype490, _size487); + this->otherFlags.resize(_size487); + uint32_t _i491; + for (_i491 = 0; _i491 < _size487; ++_i491) { - xfer += iprot->readI32(this->otherFlags[_i479]); + xfer += iprot->readI32(this->otherFlags[_i491]); } xfer += iprot->readListEnd(); } @@ -251,14 +256,14 @@ uint32_t CatalogMetadataDetails::read(::apache::thrift::protocol::TProtocol* ipr if (ftype == ::apache::thrift::protocol::T_LIST) { { this->catalogPartitions.clear(); - uint32_t _size480; - ::apache::thrift::protocol::TType _etype483; - xfer += iprot->readListBegin(_etype483, _size480); - this->catalogPartitions.resize(_size480); - uint32_t _i484; - for (_i484 = 0; _i484 < _size480; ++_i484) + uint32_t _size492; + ::apache::thrift::protocol::TType _etype495; + xfer += iprot->readListBegin(_etype495, _size492); + this->catalogPartitions.resize(_size492); + uint32_t _i496; + for (_i496 = 0; _i496 < _size492; ++_i496) { - xfer += this->catalogPartitions[_i484].read(iprot); + xfer += this->catalogPartitions[_i496].read(iprot); } xfer += iprot->readListEnd(); } @@ -267,6 +272,14 @@ uint32_t CatalogMetadataDetails::read(::apache::thrift::protocol::TProtocol* ipr xfer += iprot->skip(ftype); } break; + case 11: + if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->catalogStats.read(iprot); + this->__isset.catalogStats = true; + } else { + xfer += iprot->skip(ftype); + } + break; default: xfer += iprot->skip(ftype); break; @@ -287,10 +300,10 @@ uint32_t CatalogMetadataDetails::write(::apache::thrift::protocol::TProtocol* op xfer += oprot->writeFieldBegin("names", ::apache::thrift::protocol::T_LIST, 1); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast(this->names.size())); - std::vector ::const_iterator _iter485; - for (_iter485 = this->names.begin(); _iter485 != this->names.end(); ++_iter485) + std::vector ::const_iterator _iter497; + for (_iter497 = this->names.begin(); _iter497 != this->names.end(); ++_iter497) { - xfer += oprot->writeString((*_iter485)); + xfer += oprot->writeString((*_iter497)); } xfer += oprot->writeListEnd(); } @@ -300,16 +313,16 @@ uint32_t CatalogMetadataDetails::write(::apache::thrift::protocol::TProtocol* op xfer += oprot->writeFieldBegin("properties", ::apache::thrift::protocol::T_LIST, 2); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_MAP, static_cast(this->properties.size())); - std::vector > ::const_iterator _iter486; - for (_iter486 = this->properties.begin(); _iter486 != this->properties.end(); ++_iter486) + std::vector > ::const_iterator _iter498; + for (_iter498 = this->properties.begin(); _iter498 != this->properties.end(); ++_iter498) { { - xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast((*_iter486).size())); - std::map ::const_iterator _iter487; - for (_iter487 = (*_iter486).begin(); _iter487 != (*_iter486).end(); ++_iter487) + xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast((*_iter498).size())); + std::map ::const_iterator _iter499; + for (_iter499 = (*_iter498).begin(); _iter499 != (*_iter498).end(); ++_iter499) { - xfer += oprot->writeString(_iter487->first); - xfer += oprot->writeString(_iter487->second); + xfer += oprot->writeString(_iter499->first); + xfer += oprot->writeString(_iter499->second); } xfer += oprot->writeMapEnd(); } @@ -322,16 +335,16 @@ uint32_t CatalogMetadataDetails::write(::apache::thrift::protocol::TProtocol* op xfer += oprot->writeFieldBegin("newProperties", ::apache::thrift::protocol::T_LIST, 3); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_MAP, static_cast(this->newProperties.size())); - std::vector > ::const_iterator _iter488; - for (_iter488 = this->newProperties.begin(); _iter488 != this->newProperties.end(); ++_iter488) + std::vector > ::const_iterator _iter500; + for (_iter500 = this->newProperties.begin(); _iter500 != this->newProperties.end(); ++_iter500) { { - xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast((*_iter488).size())); - std::map ::const_iterator _iter489; - for (_iter489 = (*_iter488).begin(); _iter489 != (*_iter488).end(); ++_iter489) + xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast((*_iter500).size())); + std::map ::const_iterator _iter501; + for (_iter501 = (*_iter500).begin(); _iter501 != (*_iter500).end(); ++_iter501) { - xfer += oprot->writeString(_iter489->first); - xfer += oprot->writeString(_iter489->second); + xfer += oprot->writeString(_iter501->first); + xfer += oprot->writeString(_iter501->second); } xfer += oprot->writeMapEnd(); } @@ -354,10 +367,10 @@ uint32_t CatalogMetadataDetails::write(::apache::thrift::protocol::TProtocol* op xfer += oprot->writeFieldBegin("otherFlags", ::apache::thrift::protocol::T_LIST, 6); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast(this->otherFlags.size())); - std::vector ::const_iterator _iter490; - for (_iter490 = this->otherFlags.begin(); _iter490 != this->otherFlags.end(); ++_iter490) + std::vector ::const_iterator _iter502; + for (_iter502 = this->otherFlags.begin(); _iter502 != this->otherFlags.end(); ++_iter502) { - xfer += oprot->writeI32((*_iter490)); + xfer += oprot->writeI32((*_iter502)); } xfer += oprot->writeListEnd(); } @@ -382,15 +395,20 @@ uint32_t CatalogMetadataDetails::write(::apache::thrift::protocol::TProtocol* op xfer += oprot->writeFieldBegin("catalogPartitions", ::apache::thrift::protocol::T_LIST, 10); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast(this->catalogPartitions.size())); - std::vector ::const_iterator _iter491; - for (_iter491 = this->catalogPartitions.begin(); _iter491 != this->catalogPartitions.end(); ++_iter491) + std::vector ::const_iterator _iter503; + for (_iter503 = this->catalogPartitions.begin(); _iter503 != this->catalogPartitions.end(); ++_iter503) { - xfer += (*_iter491).write(oprot); + xfer += (*_iter503).write(oprot); } xfer += oprot->writeListEnd(); } xfer += oprot->writeFieldEnd(); } + if (this->__isset.catalogStats) { + xfer += oprot->writeFieldBegin("catalogStats", ::apache::thrift::protocol::T_STRUCT, 11); + xfer += this->catalogStats.write(oprot); + xfer += oprot->writeFieldEnd(); + } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -408,61 +426,66 @@ void swap(CatalogMetadataDetails &a, CatalogMetadataDetails &b) { swap(a.catalogTable, b.catalogTable); swap(a.catalogFunction, b.catalogFunction); swap(a.catalogPartitions, b.catalogPartitions); + swap(a.catalogStats, b.catalogStats); swap(a.__isset, b.__isset); } -CatalogMetadataDetails::CatalogMetadataDetails(const CatalogMetadataDetails& other492) { - names = other492.names; - properties = other492.properties; - newProperties = other492.newProperties; - catalogSchemaVersion = other492.catalogSchemaVersion; - exists = other492.exists; - otherFlags = other492.otherFlags; - catalogSchema = other492.catalogSchema; - catalogTable = other492.catalogTable; - catalogFunction = other492.catalogFunction; - catalogPartitions = other492.catalogPartitions; - __isset = other492.__isset; +CatalogMetadataDetails::CatalogMetadataDetails(const CatalogMetadataDetails& other504) { + names = other504.names; + properties = other504.properties; + newProperties = other504.newProperties; + catalogSchemaVersion = other504.catalogSchemaVersion; + exists = other504.exists; + otherFlags = other504.otherFlags; + catalogSchema = other504.catalogSchema; + catalogTable = other504.catalogTable; + catalogFunction = other504.catalogFunction; + catalogPartitions = other504.catalogPartitions; + catalogStats = other504.catalogStats; + __isset = other504.__isset; } -CatalogMetadataDetails::CatalogMetadataDetails( CatalogMetadataDetails&& other493) noexcept { - names = std::move(other493.names); - properties = std::move(other493.properties); - newProperties = std::move(other493.newProperties); - catalogSchemaVersion = std::move(other493.catalogSchemaVersion); - exists = std::move(other493.exists); - otherFlags = std::move(other493.otherFlags); - catalogSchema = std::move(other493.catalogSchema); - catalogTable = std::move(other493.catalogTable); - catalogFunction = std::move(other493.catalogFunction); - catalogPartitions = std::move(other493.catalogPartitions); - __isset = std::move(other493.__isset); +CatalogMetadataDetails::CatalogMetadataDetails( CatalogMetadataDetails&& other505) noexcept { + names = std::move(other505.names); + properties = std::move(other505.properties); + newProperties = std::move(other505.newProperties); + catalogSchemaVersion = std::move(other505.catalogSchemaVersion); + exists = std::move(other505.exists); + otherFlags = std::move(other505.otherFlags); + catalogSchema = std::move(other505.catalogSchema); + catalogTable = std::move(other505.catalogTable); + catalogFunction = std::move(other505.catalogFunction); + catalogPartitions = std::move(other505.catalogPartitions); + catalogStats = std::move(other505.catalogStats); + __isset = std::move(other505.__isset); } -CatalogMetadataDetails& CatalogMetadataDetails::operator=(const CatalogMetadataDetails& other494) { - names = other494.names; - properties = other494.properties; - newProperties = other494.newProperties; - catalogSchemaVersion = other494.catalogSchemaVersion; - exists = other494.exists; - otherFlags = other494.otherFlags; - catalogSchema = other494.catalogSchema; - catalogTable = other494.catalogTable; - catalogFunction = other494.catalogFunction; - catalogPartitions = other494.catalogPartitions; - __isset = other494.__isset; +CatalogMetadataDetails& CatalogMetadataDetails::operator=(const CatalogMetadataDetails& other506) { + names = other506.names; + properties = other506.properties; + newProperties = other506.newProperties; + catalogSchemaVersion = other506.catalogSchemaVersion; + exists = other506.exists; + otherFlags = other506.otherFlags; + catalogSchema = other506.catalogSchema; + catalogTable = other506.catalogTable; + catalogFunction = other506.catalogFunction; + catalogPartitions = other506.catalogPartitions; + catalogStats = other506.catalogStats; + __isset = other506.__isset; return *this; } -CatalogMetadataDetails& CatalogMetadataDetails::operator=(CatalogMetadataDetails&& other495) noexcept { - names = std::move(other495.names); - properties = std::move(other495.properties); - newProperties = std::move(other495.newProperties); - catalogSchemaVersion = std::move(other495.catalogSchemaVersion); - exists = std::move(other495.exists); - otherFlags = std::move(other495.otherFlags); - catalogSchema = std::move(other495.catalogSchema); - catalogTable = std::move(other495.catalogTable); - catalogFunction = std::move(other495.catalogFunction); - catalogPartitions = std::move(other495.catalogPartitions); - __isset = std::move(other495.__isset); +CatalogMetadataDetails& CatalogMetadataDetails::operator=(CatalogMetadataDetails&& other507) noexcept { + names = std::move(other507.names); + properties = std::move(other507.properties); + newProperties = std::move(other507.newProperties); + catalogSchemaVersion = std::move(other507.catalogSchemaVersion); + exists = std::move(other507.exists); + otherFlags = std::move(other507.otherFlags); + catalogSchema = std::move(other507.catalogSchema); + catalogTable = std::move(other507.catalogTable); + catalogFunction = std::move(other507.catalogFunction); + catalogPartitions = std::move(other507.catalogPartitions); + catalogStats = std::move(other507.catalogStats); + __isset = std::move(other507.__isset); return *this; } void CatalogMetadataDetails::printTo(std::ostream& out) const { @@ -478,6 +501,7 @@ void CatalogMetadataDetails::printTo(std::ostream& out) const { out << ", " << "catalogTable="; (__isset.catalogTable ? (out << to_string(catalogTable)) : (out << "")); out << ", " << "catalogFunction="; (__isset.catalogFunction ? (out << to_string(catalogFunction)) : (out << "")); out << ", " << "catalogPartitions="; (__isset.catalogPartitions ? (out << to_string(catalogPartitions)) : (out << "")); + out << ", " << "catalogStats="; (__isset.catalogStats ? (out << to_string(catalogStats)) : (out << "")); out << ")"; } diff --git a/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogMetadataRequest.cpp b/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogMetadataRequest.cpp index 4f4d8a119..e40a859b3 100644 --- a/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogMetadataRequest.cpp +++ b/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogMetadataRequest.cpp @@ -82,17 +82,17 @@ uint32_t CatalogMetadataRequest::read(::apache::thrift::protocol::TProtocol* ipr if (ftype == ::apache::thrift::protocol::T_MAP) { { this->properties.clear(); - uint32_t _size434; - ::apache::thrift::protocol::TType _ktype435; - ::apache::thrift::protocol::TType _vtype436; - xfer += iprot->readMapBegin(_ktype435, _vtype436, _size434); - uint32_t _i438; - for (_i438 = 0; _i438 < _size434; ++_i438) + uint32_t _size446; + ::apache::thrift::protocol::TType _ktype447; + ::apache::thrift::protocol::TType _vtype448; + xfer += iprot->readMapBegin(_ktype447, _vtype448, _size446); + uint32_t _i450; + for (_i450 = 0; _i450 < _size446; ++_i450) { - std::string _key439; - xfer += iprot->readString(_key439); - std::string& _val440 = this->properties[_key439]; - xfer += iprot->readString(_val440); + std::string _key451; + xfer += iprot->readString(_key451); + std::string& _val452 = this->properties[_key451]; + xfer += iprot->readString(_val452); } xfer += iprot->readMapEnd(); } @@ -131,11 +131,11 @@ uint32_t CatalogMetadataRequest::write(::apache::thrift::protocol::TProtocol* op xfer += oprot->writeFieldBegin("properties", ::apache::thrift::protocol::T_MAP, 3); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast(this->properties.size())); - std::map ::const_iterator _iter441; - for (_iter441 = this->properties.begin(); _iter441 != this->properties.end(); ++_iter441) + std::map ::const_iterator _iter453; + for (_iter453 = this->properties.begin(); _iter453 != this->properties.end(); ++_iter453) { - xfer += oprot->writeString(_iter441->first); - xfer += oprot->writeString(_iter441->second); + xfer += oprot->writeString(_iter453->first); + xfer += oprot->writeString(_iter453->second); } xfer += oprot->writeMapEnd(); } @@ -154,30 +154,30 @@ void swap(CatalogMetadataRequest &a, CatalogMetadataRequest &b) { swap(a.__isset, b.__isset); } -CatalogMetadataRequest::CatalogMetadataRequest(const CatalogMetadataRequest& other442) { - schemaName = other442.schemaName; - nameOrPattern = other442.nameOrPattern; - properties = other442.properties; - __isset = other442.__isset; +CatalogMetadataRequest::CatalogMetadataRequest(const CatalogMetadataRequest& other454) { + schemaName = other454.schemaName; + nameOrPattern = other454.nameOrPattern; + properties = other454.properties; + __isset = other454.__isset; } -CatalogMetadataRequest::CatalogMetadataRequest( CatalogMetadataRequest&& other443) noexcept { - schemaName = std::move(other443.schemaName); - nameOrPattern = std::move(other443.nameOrPattern); - properties = std::move(other443.properties); - __isset = std::move(other443.__isset); +CatalogMetadataRequest::CatalogMetadataRequest( CatalogMetadataRequest&& other455) noexcept { + schemaName = std::move(other455.schemaName); + nameOrPattern = std::move(other455.nameOrPattern); + properties = std::move(other455.properties); + __isset = std::move(other455.__isset); } -CatalogMetadataRequest& CatalogMetadataRequest::operator=(const CatalogMetadataRequest& other444) { - schemaName = other444.schemaName; - nameOrPattern = other444.nameOrPattern; - properties = other444.properties; - __isset = other444.__isset; +CatalogMetadataRequest& CatalogMetadataRequest::operator=(const CatalogMetadataRequest& other456) { + schemaName = other456.schemaName; + nameOrPattern = other456.nameOrPattern; + properties = other456.properties; + __isset = other456.__isset; return *this; } -CatalogMetadataRequest& CatalogMetadataRequest::operator=(CatalogMetadataRequest&& other445) noexcept { - schemaName = std::move(other445.schemaName); - nameOrPattern = std::move(other445.nameOrPattern); - properties = std::move(other445.properties); - __isset = std::move(other445.__isset); +CatalogMetadataRequest& CatalogMetadataRequest::operator=(CatalogMetadataRequest&& other457) noexcept { + schemaName = std::move(other457.schemaName); + nameOrPattern = std::move(other457.nameOrPattern); + properties = std::move(other457.properties); + __isset = std::move(other457.__isset); return *this; } void CatalogMetadataRequest::printTo(std::ostream& out) const { diff --git a/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogPartitionObject.cpp b/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogPartitionObject.cpp index ccbbed4c7..08e01ace7 100644 --- a/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogPartitionObject.cpp +++ b/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogPartitionObject.cpp @@ -66,17 +66,17 @@ uint32_t CatalogPartitionObject::read(::apache::thrift::protocol::TProtocol* ipr if (ftype == ::apache::thrift::protocol::T_MAP) { { this->spec.clear(); - uint32_t _size414; - ::apache::thrift::protocol::TType _ktype415; - ::apache::thrift::protocol::TType _vtype416; - xfer += iprot->readMapBegin(_ktype415, _vtype416, _size414); - uint32_t _i418; - for (_i418 = 0; _i418 < _size414; ++_i418) + uint32_t _size426; + ::apache::thrift::protocol::TType _ktype427; + ::apache::thrift::protocol::TType _vtype428; + xfer += iprot->readMapBegin(_ktype427, _vtype428, _size426); + uint32_t _i430; + for (_i430 = 0; _i430 < _size426; ++_i430) { - std::string _key419; - xfer += iprot->readString(_key419); - std::string& _val420 = this->spec[_key419]; - xfer += iprot->readString(_val420); + std::string _key431; + xfer += iprot->readString(_key431); + std::string& _val432 = this->spec[_key431]; + xfer += iprot->readString(_val432); } xfer += iprot->readMapEnd(); } @@ -97,17 +97,17 @@ uint32_t CatalogPartitionObject::read(::apache::thrift::protocol::TProtocol* ipr if (ftype == ::apache::thrift::protocol::T_MAP) { { this->parameters.clear(); - uint32_t _size421; - ::apache::thrift::protocol::TType _ktype422; - ::apache::thrift::protocol::TType _vtype423; - xfer += iprot->readMapBegin(_ktype422, _vtype423, _size421); - uint32_t _i425; - for (_i425 = 0; _i425 < _size421; ++_i425) + uint32_t _size433; + ::apache::thrift::protocol::TType _ktype434; + ::apache::thrift::protocol::TType _vtype435; + xfer += iprot->readMapBegin(_ktype434, _vtype435, _size433); + uint32_t _i437; + for (_i437 = 0; _i437 < _size433; ++_i437) { - std::string _key426; - xfer += iprot->readString(_key426); - std::string& _val427 = this->parameters[_key426]; - xfer += iprot->readString(_val427); + std::string _key438; + xfer += iprot->readString(_key438); + std::string& _val439 = this->parameters[_key438]; + xfer += iprot->readString(_val439); } xfer += iprot->readMapEnd(); } @@ -141,11 +141,11 @@ uint32_t CatalogPartitionObject::write(::apache::thrift::protocol::TProtocol* op xfer += oprot->writeFieldBegin("spec", ::apache::thrift::protocol::T_MAP, 1); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast(this->spec.size())); - std::map ::const_iterator _iter428; - for (_iter428 = this->spec.begin(); _iter428 != this->spec.end(); ++_iter428) + std::map ::const_iterator _iter440; + for (_iter440 = this->spec.begin(); _iter440 != this->spec.end(); ++_iter440) { - xfer += oprot->writeString(_iter428->first); - xfer += oprot->writeString(_iter428->second); + xfer += oprot->writeString(_iter440->first); + xfer += oprot->writeString(_iter440->second); } xfer += oprot->writeMapEnd(); } @@ -158,11 +158,11 @@ uint32_t CatalogPartitionObject::write(::apache::thrift::protocol::TProtocol* op xfer += oprot->writeFieldBegin("parameters", ::apache::thrift::protocol::T_MAP, 3); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast(this->parameters.size())); - std::map ::const_iterator _iter429; - for (_iter429 = this->parameters.begin(); _iter429 != this->parameters.end(); ++_iter429) + std::map ::const_iterator _iter441; + for (_iter441 = this->parameters.begin(); _iter441 != this->parameters.end(); ++_iter441) { - xfer += oprot->writeString(_iter429->first); - xfer += oprot->writeString(_iter429->second); + xfer += oprot->writeString(_iter441->first); + xfer += oprot->writeString(_iter441->second); } xfer += oprot->writeMapEnd(); } @@ -180,26 +180,26 @@ void swap(CatalogPartitionObject &a, CatalogPartitionObject &b) { swap(a.parameters, b.parameters); } -CatalogPartitionObject::CatalogPartitionObject(const CatalogPartitionObject& other430) { - spec = other430.spec; - storage = other430.storage; - parameters = other430.parameters; +CatalogPartitionObject::CatalogPartitionObject(const CatalogPartitionObject& other442) { + spec = other442.spec; + storage = other442.storage; + parameters = other442.parameters; } -CatalogPartitionObject::CatalogPartitionObject( CatalogPartitionObject&& other431) noexcept { - spec = std::move(other431.spec); - storage = std::move(other431.storage); - parameters = std::move(other431.parameters); +CatalogPartitionObject::CatalogPartitionObject( CatalogPartitionObject&& other443) noexcept { + spec = std::move(other443.spec); + storage = std::move(other443.storage); + parameters = std::move(other443.parameters); } -CatalogPartitionObject& CatalogPartitionObject::operator=(const CatalogPartitionObject& other432) { - spec = other432.spec; - storage = other432.storage; - parameters = other432.parameters; +CatalogPartitionObject& CatalogPartitionObject::operator=(const CatalogPartitionObject& other444) { + spec = other444.spec; + storage = other444.storage; + parameters = other444.parameters; return *this; } -CatalogPartitionObject& CatalogPartitionObject::operator=(CatalogPartitionObject&& other433) noexcept { - spec = std::move(other433.spec); - storage = std::move(other433.storage); - parameters = std::move(other433.parameters); +CatalogPartitionObject& CatalogPartitionObject::operator=(CatalogPartitionObject&& other445) noexcept { + spec = std::move(other445.spec); + storage = std::move(other445.storage); + parameters = std::move(other445.parameters); return *this; } void CatalogPartitionObject::printTo(std::ostream& out) const { diff --git a/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogStats.cpp b/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogStats.cpp new file mode 100644 index 000000000..22a7d5b29 --- /dev/null +++ b/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogStats.cpp @@ -0,0 +1,214 @@ +/** + * Autogenerated by Thrift Compiler (0.10.0) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ + +#include + +#include +#include +#include +#include + +#include +#include "snappydata_struct_CatalogStats.h" + +#include +#include + +#include + +namespace io { namespace snappydata { namespace thrift { + + +CatalogStats::~CatalogStats() noexcept { +} + + +void CatalogStats::__set_sizeInBytes(const int64_t val) { + this->sizeInBytes = val; +} + +void CatalogStats::__set_rowCount(const int64_t val) { + this->rowCount = val; +__isset.rowCount = true; +} + +void CatalogStats::__set_colStats(const std::vector > & val) { + this->colStats = val; +} + +uint32_t CatalogStats::read(::apache::thrift::protocol::TProtocol* iprot) { + + uint32_t xfer = 0; + std::string fname; + ::apache::thrift::protocol::TType ftype; + int16_t fid; + + xfer += iprot->readStructBegin(fname); + + using ::apache::thrift::protocol::TProtocolException; + + bool isset_sizeInBytes = false; + bool isset_colStats = false; + + while (true) + { + xfer += iprot->readFieldBegin(fname, ftype, fid); + if (ftype == ::apache::thrift::protocol::T_STOP) { + break; + } + switch (fid) + { + case 1: + if (ftype == ::apache::thrift::protocol::T_I64) { + xfer += iprot->readI64(this->sizeInBytes); + isset_sizeInBytes = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 2: + if (ftype == ::apache::thrift::protocol::T_I64) { + xfer += iprot->readI64(this->rowCount); + this->__isset.rowCount = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 3: + if (ftype == ::apache::thrift::protocol::T_LIST) { + { + this->colStats.clear(); + uint32_t _size336; + ::apache::thrift::protocol::TType _etype339; + xfer += iprot->readListBegin(_etype339, _size336); + this->colStats.resize(_size336); + uint32_t _i340; + for (_i340 = 0; _i340 < _size336; ++_i340) + { + { + this->colStats[_i340].clear(); + uint32_t _size341; + ::apache::thrift::protocol::TType _ktype342; + ::apache::thrift::protocol::TType _vtype343; + xfer += iprot->readMapBegin(_ktype342, _vtype343, _size341); + uint32_t _i345; + for (_i345 = 0; _i345 < _size341; ++_i345) + { + std::string _key346; + xfer += iprot->readString(_key346); + std::string& _val347 = this->colStats[_i340][_key346]; + xfer += iprot->readString(_val347); + } + xfer += iprot->readMapEnd(); + } + } + xfer += iprot->readListEnd(); + } + isset_colStats = true; + } else { + xfer += iprot->skip(ftype); + } + break; + default: + xfer += iprot->skip(ftype); + break; + } + xfer += iprot->readFieldEnd(); + } + + xfer += iprot->readStructEnd(); + + if (!isset_sizeInBytes) + throw TProtocolException(TProtocolException::INVALID_DATA); + if (!isset_colStats) + throw TProtocolException(TProtocolException::INVALID_DATA); + return xfer; +} + +uint32_t CatalogStats::write(::apache::thrift::protocol::TProtocol* oprot) const { + uint32_t xfer = 0; + xfer += oprot->writeStructBegin("CatalogStats"); + + xfer += oprot->writeFieldBegin("sizeInBytes", ::apache::thrift::protocol::T_I64, 1); + xfer += oprot->writeI64(this->sizeInBytes); + xfer += oprot->writeFieldEnd(); + + if (this->__isset.rowCount) { + xfer += oprot->writeFieldBegin("rowCount", ::apache::thrift::protocol::T_I64, 2); + xfer += oprot->writeI64(this->rowCount); + xfer += oprot->writeFieldEnd(); + } + xfer += oprot->writeFieldBegin("colStats", ::apache::thrift::protocol::T_LIST, 3); + { + xfer += oprot->writeListBegin(::apache::thrift::protocol::T_MAP, static_cast(this->colStats.size())); + std::vector > ::const_iterator _iter348; + for (_iter348 = this->colStats.begin(); _iter348 != this->colStats.end(); ++_iter348) + { + { + xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast((*_iter348).size())); + std::map ::const_iterator _iter349; + for (_iter349 = (*_iter348).begin(); _iter349 != (*_iter348).end(); ++_iter349) + { + xfer += oprot->writeString(_iter349->first); + xfer += oprot->writeString(_iter349->second); + } + xfer += oprot->writeMapEnd(); + } + } + xfer += oprot->writeListEnd(); + } + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldStop(); + xfer += oprot->writeStructEnd(); + return xfer; +} + +void swap(CatalogStats &a, CatalogStats &b) { + using ::std::swap; + swap(a.sizeInBytes, b.sizeInBytes); + swap(a.rowCount, b.rowCount); + swap(a.colStats, b.colStats); + swap(a.__isset, b.__isset); +} + +CatalogStats::CatalogStats(const CatalogStats& other350) { + sizeInBytes = other350.sizeInBytes; + rowCount = other350.rowCount; + colStats = other350.colStats; + __isset = other350.__isset; +} +CatalogStats::CatalogStats( CatalogStats&& other351) noexcept { + sizeInBytes = std::move(other351.sizeInBytes); + rowCount = std::move(other351.rowCount); + colStats = std::move(other351.colStats); + __isset = std::move(other351.__isset); +} +CatalogStats& CatalogStats::operator=(const CatalogStats& other352) { + sizeInBytes = other352.sizeInBytes; + rowCount = other352.rowCount; + colStats = other352.colStats; + __isset = other352.__isset; + return *this; +} +CatalogStats& CatalogStats::operator=(CatalogStats&& other353) noexcept { + sizeInBytes = std::move(other353.sizeInBytes); + rowCount = std::move(other353.rowCount); + colStats = std::move(other353.colStats); + __isset = std::move(other353.__isset); + return *this; +} +void CatalogStats::printTo(std::ostream& out) const { + using ::apache::thrift::to_string; + out << "CatalogStats("; + out << "sizeInBytes=" << to_string(sizeInBytes); + out << ", " << "rowCount="; (__isset.rowCount ? (out << to_string(rowCount)) : (out << "")); + out << ", " << "colStats=" << to_string(colStats); + out << ")"; +} + +}}} // namespace diff --git a/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogTableObject.cpp b/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogTableObject.cpp index 8de464914..1f008b800 100644 --- a/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogTableObject.cpp +++ b/native/src/snappyclient/cpp/thrift/snappydata_struct_CatalogTableObject.cpp @@ -103,22 +103,9 @@ void CatalogTableObject::__set_properties(const std::mapproperties = val; } -void CatalogTableObject::__set_sizeInBytes(const int64_t val) { - this->sizeInBytes = val; -__isset.sizeInBytes = true; -} - -void CatalogTableObject::__set_rowCount(const int64_t val) { - this->rowCount = val; -__isset.rowCount = true; -} - -void CatalogTableObject::__set_colStats(const std::vector > & val) { - this->colStats = val; -} - -void CatalogTableObject::__set_isBroadcastable(const bool val) { - this->isBroadcastable = val; +void CatalogTableObject::__set_stats(const CatalogStats& val) { + this->stats = val; +__isset.stats = true; } void CatalogTableObject::__set_viewOriginalText(const std::string& val) { @@ -148,6 +135,11 @@ void CatalogTableObject::__set_schemaPreservesCase(const bool val) { this->schemaPreservesCase = val; } +void CatalogTableObject::__set_ignoredProperties(const std::map & val) { + this->ignoredProperties = val; +__isset.ignoredProperties = true; +} + uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) { uint32_t xfer = 0; @@ -173,8 +165,6 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) bool isset_createTime = false; bool isset_lastAccessTime = false; bool isset_properties = false; - bool isset_colStats = false; - bool isset_isBroadcastable = false; bool isset_unsupportedFeatures = false; bool isset_tracksPartitionsInCatalog = false; bool isset_schemaPreservesCase = false; @@ -239,14 +229,14 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) if (ftype == ::apache::thrift::protocol::T_LIST) { { this->partitionColumns.clear(); - uint32_t _size336; - ::apache::thrift::protocol::TType _etype339; - xfer += iprot->readListBegin(_etype339, _size336); - this->partitionColumns.resize(_size336); - uint32_t _i340; - for (_i340 = 0; _i340 < _size336; ++_i340) + uint32_t _size354; + ::apache::thrift::protocol::TType _etype357; + xfer += iprot->readListBegin(_etype357, _size354); + this->partitionColumns.resize(_size354); + uint32_t _i358; + for (_i358 = 0; _i358 < _size354; ++_i358) { - xfer += iprot->readString(this->partitionColumns[_i340]); + xfer += iprot->readString(this->partitionColumns[_i358]); } xfer += iprot->readListEnd(); } @@ -259,14 +249,14 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) if (ftype == ::apache::thrift::protocol::T_LIST) { { this->indexColumns.clear(); - uint32_t _size341; - ::apache::thrift::protocol::TType _etype344; - xfer += iprot->readListBegin(_etype344, _size341); - this->indexColumns.resize(_size341); - uint32_t _i345; - for (_i345 = 0; _i345 < _size341; ++_i345) + uint32_t _size359; + ::apache::thrift::protocol::TType _etype362; + xfer += iprot->readListBegin(_etype362, _size359); + this->indexColumns.resize(_size359); + uint32_t _i363; + for (_i363 = 0; _i363 < _size359; ++_i363) { - xfer += iprot->readString(this->indexColumns[_i345]); + xfer += iprot->readString(this->indexColumns[_i363]); } xfer += iprot->readListEnd(); } @@ -279,14 +269,14 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) if (ftype == ::apache::thrift::protocol::T_LIST) { { this->primaryKeyColumns.clear(); - uint32_t _size346; - ::apache::thrift::protocol::TType _etype349; - xfer += iprot->readListBegin(_etype349, _size346); - this->primaryKeyColumns.resize(_size346); - uint32_t _i350; - for (_i350 = 0; _i350 < _size346; ++_i350) + uint32_t _size364; + ::apache::thrift::protocol::TType _etype367; + xfer += iprot->readListBegin(_etype367, _size364); + this->primaryKeyColumns.resize(_size364); + uint32_t _i368; + for (_i368 = 0; _i368 < _size364; ++_i368) { - xfer += iprot->readString(this->primaryKeyColumns[_i350]); + xfer += iprot->readString(this->primaryKeyColumns[_i368]); } xfer += iprot->readListEnd(); } @@ -315,14 +305,14 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) if (ftype == ::apache::thrift::protocol::T_LIST) { { this->bucketOwners.clear(); - uint32_t _size351; - ::apache::thrift::protocol::TType _etype354; - xfer += iprot->readListBegin(_etype354, _size351); - this->bucketOwners.resize(_size351); - uint32_t _i355; - for (_i355 = 0; _i355 < _size351; ++_i355) + uint32_t _size369; + ::apache::thrift::protocol::TType _etype372; + xfer += iprot->readListBegin(_etype372, _size369); + this->bucketOwners.resize(_size369); + uint32_t _i373; + for (_i373 = 0; _i373 < _size369; ++_i373) { - xfer += this->bucketOwners[_i355].read(iprot); + xfer += this->bucketOwners[_i373].read(iprot); } xfer += iprot->readListEnd(); } @@ -335,14 +325,14 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) if (ftype == ::apache::thrift::protocol::T_LIST) { { this->bucketColumns.clear(); - uint32_t _size356; - ::apache::thrift::protocol::TType _etype359; - xfer += iprot->readListBegin(_etype359, _size356); - this->bucketColumns.resize(_size356); - uint32_t _i360; - for (_i360 = 0; _i360 < _size356; ++_i360) + uint32_t _size374; + ::apache::thrift::protocol::TType _etype377; + xfer += iprot->readListBegin(_etype377, _size374); + this->bucketColumns.resize(_size374); + uint32_t _i378; + for (_i378 = 0; _i378 < _size374; ++_i378) { - xfer += iprot->readString(this->bucketColumns[_i360]); + xfer += iprot->readString(this->bucketColumns[_i378]); } xfer += iprot->readListEnd(); } @@ -355,14 +345,14 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) if (ftype == ::apache::thrift::protocol::T_LIST) { { this->sortColumns.clear(); - uint32_t _size361; - ::apache::thrift::protocol::TType _etype364; - xfer += iprot->readListBegin(_etype364, _size361); - this->sortColumns.resize(_size361); - uint32_t _i365; - for (_i365 = 0; _i365 < _size361; ++_i365) + uint32_t _size379; + ::apache::thrift::protocol::TType _etype382; + xfer += iprot->readListBegin(_etype382, _size379); + this->sortColumns.resize(_size379); + uint32_t _i383; + for (_i383 = 0; _i383 < _size379; ++_i383) { - xfer += iprot->readString(this->sortColumns[_i365]); + xfer += iprot->readString(this->sortColumns[_i383]); } xfer += iprot->readListEnd(); } @@ -399,17 +389,17 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) if (ftype == ::apache::thrift::protocol::T_MAP) { { this->properties.clear(); - uint32_t _size366; - ::apache::thrift::protocol::TType _ktype367; - ::apache::thrift::protocol::TType _vtype368; - xfer += iprot->readMapBegin(_ktype367, _vtype368, _size366); - uint32_t _i370; - for (_i370 = 0; _i370 < _size366; ++_i370) + uint32_t _size384; + ::apache::thrift::protocol::TType _ktype385; + ::apache::thrift::protocol::TType _vtype386; + xfer += iprot->readMapBegin(_ktype385, _vtype386, _size384); + uint32_t _i388; + for (_i388 = 0; _i388 < _size384; ++_i388) { - std::string _key371; - xfer += iprot->readString(_key371); - std::string& _val372 = this->properties[_key371]; - xfer += iprot->readString(_val372); + std::string _key389; + xfer += iprot->readString(_key389); + std::string& _val390 = this->properties[_key389]; + xfer += iprot->readString(_val390); } xfer += iprot->readMapEnd(); } @@ -419,65 +409,14 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) } break; case 19: - if (ftype == ::apache::thrift::protocol::T_I64) { - xfer += iprot->readI64(this->sizeInBytes); - this->__isset.sizeInBytes = true; + if (ftype == ::apache::thrift::protocol::T_STRUCT) { + xfer += this->stats.read(iprot); + this->__isset.stats = true; } else { xfer += iprot->skip(ftype); } break; case 20: - if (ftype == ::apache::thrift::protocol::T_I64) { - xfer += iprot->readI64(this->rowCount); - this->__isset.rowCount = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 21: - if (ftype == ::apache::thrift::protocol::T_LIST) { - { - this->colStats.clear(); - uint32_t _size373; - ::apache::thrift::protocol::TType _etype376; - xfer += iprot->readListBegin(_etype376, _size373); - this->colStats.resize(_size373); - uint32_t _i377; - for (_i377 = 0; _i377 < _size373; ++_i377) - { - { - this->colStats[_i377].clear(); - uint32_t _size378; - ::apache::thrift::protocol::TType _ktype379; - ::apache::thrift::protocol::TType _vtype380; - xfer += iprot->readMapBegin(_ktype379, _vtype380, _size378); - uint32_t _i382; - for (_i382 = 0; _i382 < _size378; ++_i382) - { - std::string _key383; - xfer += iprot->readString(_key383); - std::string& _val384 = this->colStats[_i377][_key383]; - xfer += iprot->readString(_val384); - } - xfer += iprot->readMapEnd(); - } - } - xfer += iprot->readListEnd(); - } - isset_colStats = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 22: - if (ftype == ::apache::thrift::protocol::T_BOOL) { - xfer += iprot->readBool(this->isBroadcastable); - isset_isBroadcastable = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 23: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->viewOriginalText); this->__isset.viewOriginalText = true; @@ -485,7 +424,7 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) xfer += iprot->skip(ftype); } break; - case 24: + case 21: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->viewText); this->__isset.viewText = true; @@ -493,7 +432,7 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) xfer += iprot->skip(ftype); } break; - case 25: + case 22: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->comment); this->__isset.comment = true; @@ -501,18 +440,18 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) xfer += iprot->skip(ftype); } break; - case 26: + case 23: if (ftype == ::apache::thrift::protocol::T_LIST) { { this->unsupportedFeatures.clear(); - uint32_t _size385; - ::apache::thrift::protocol::TType _etype388; - xfer += iprot->readListBegin(_etype388, _size385); - this->unsupportedFeatures.resize(_size385); - uint32_t _i389; - for (_i389 = 0; _i389 < _size385; ++_i389) + uint32_t _size391; + ::apache::thrift::protocol::TType _etype394; + xfer += iprot->readListBegin(_etype394, _size391); + this->unsupportedFeatures.resize(_size391); + uint32_t _i395; + for (_i395 = 0; _i395 < _size391; ++_i395) { - xfer += iprot->readString(this->unsupportedFeatures[_i389]); + xfer += iprot->readString(this->unsupportedFeatures[_i395]); } xfer += iprot->readListEnd(); } @@ -521,7 +460,7 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) xfer += iprot->skip(ftype); } break; - case 27: + case 24: if (ftype == ::apache::thrift::protocol::T_BOOL) { xfer += iprot->readBool(this->tracksPartitionsInCatalog); isset_tracksPartitionsInCatalog = true; @@ -529,7 +468,7 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) xfer += iprot->skip(ftype); } break; - case 28: + case 25: if (ftype == ::apache::thrift::protocol::T_BOOL) { xfer += iprot->readBool(this->schemaPreservesCase); isset_schemaPreservesCase = true; @@ -537,6 +476,29 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) xfer += iprot->skip(ftype); } break; + case 26: + if (ftype == ::apache::thrift::protocol::T_MAP) { + { + this->ignoredProperties.clear(); + uint32_t _size396; + ::apache::thrift::protocol::TType _ktype397; + ::apache::thrift::protocol::TType _vtype398; + xfer += iprot->readMapBegin(_ktype397, _vtype398, _size396); + uint32_t _i400; + for (_i400 = 0; _i400 < _size396; ++_i400) + { + std::string _key401; + xfer += iprot->readString(_key401); + std::string& _val402 = this->ignoredProperties[_key401]; + xfer += iprot->readString(_val402); + } + xfer += iprot->readMapEnd(); + } + this->__isset.ignoredProperties = true; + } else { + xfer += iprot->skip(ftype); + } + break; default: xfer += iprot->skip(ftype); break; @@ -574,10 +536,6 @@ uint32_t CatalogTableObject::read(::apache::thrift::protocol::TProtocol* iprot) throw TProtocolException(TProtocolException::INVALID_DATA); if (!isset_properties) throw TProtocolException(TProtocolException::INVALID_DATA); - if (!isset_colStats) - throw TProtocolException(TProtocolException::INVALID_DATA); - if (!isset_isBroadcastable) - throw TProtocolException(TProtocolException::INVALID_DATA); if (!isset_unsupportedFeatures) throw TProtocolException(TProtocolException::INVALID_DATA); if (!isset_tracksPartitionsInCatalog) @@ -620,10 +578,10 @@ uint32_t CatalogTableObject::write(::apache::thrift::protocol::TProtocol* oprot) xfer += oprot->writeFieldBegin("partitionColumns", ::apache::thrift::protocol::T_LIST, 7); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast(this->partitionColumns.size())); - std::vector ::const_iterator _iter390; - for (_iter390 = this->partitionColumns.begin(); _iter390 != this->partitionColumns.end(); ++_iter390) + std::vector ::const_iterator _iter403; + for (_iter403 = this->partitionColumns.begin(); _iter403 != this->partitionColumns.end(); ++_iter403) { - xfer += oprot->writeString((*_iter390)); + xfer += oprot->writeString((*_iter403)); } xfer += oprot->writeListEnd(); } @@ -632,10 +590,10 @@ uint32_t CatalogTableObject::write(::apache::thrift::protocol::TProtocol* oprot) xfer += oprot->writeFieldBegin("indexColumns", ::apache::thrift::protocol::T_LIST, 8); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast(this->indexColumns.size())); - std::vector ::const_iterator _iter391; - for (_iter391 = this->indexColumns.begin(); _iter391 != this->indexColumns.end(); ++_iter391) + std::vector ::const_iterator _iter404; + for (_iter404 = this->indexColumns.begin(); _iter404 != this->indexColumns.end(); ++_iter404) { - xfer += oprot->writeString((*_iter391)); + xfer += oprot->writeString((*_iter404)); } xfer += oprot->writeListEnd(); } @@ -644,10 +602,10 @@ uint32_t CatalogTableObject::write(::apache::thrift::protocol::TProtocol* oprot) xfer += oprot->writeFieldBegin("primaryKeyColumns", ::apache::thrift::protocol::T_LIST, 9); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast(this->primaryKeyColumns.size())); - std::vector ::const_iterator _iter392; - for (_iter392 = this->primaryKeyColumns.begin(); _iter392 != this->primaryKeyColumns.end(); ++_iter392) + std::vector ::const_iterator _iter405; + for (_iter405 = this->primaryKeyColumns.begin(); _iter405 != this->primaryKeyColumns.end(); ++_iter405) { - xfer += oprot->writeString((*_iter392)); + xfer += oprot->writeString((*_iter405)); } xfer += oprot->writeListEnd(); } @@ -666,10 +624,10 @@ uint32_t CatalogTableObject::write(::apache::thrift::protocol::TProtocol* oprot) xfer += oprot->writeFieldBegin("bucketOwners", ::apache::thrift::protocol::T_LIST, 12); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast(this->bucketOwners.size())); - std::vector ::const_iterator _iter393; - for (_iter393 = this->bucketOwners.begin(); _iter393 != this->bucketOwners.end(); ++_iter393) + std::vector ::const_iterator _iter406; + for (_iter406 = this->bucketOwners.begin(); _iter406 != this->bucketOwners.end(); ++_iter406) { - xfer += (*_iter393).write(oprot); + xfer += (*_iter406).write(oprot); } xfer += oprot->writeListEnd(); } @@ -678,10 +636,10 @@ uint32_t CatalogTableObject::write(::apache::thrift::protocol::TProtocol* oprot) xfer += oprot->writeFieldBegin("bucketColumns", ::apache::thrift::protocol::T_LIST, 13); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast(this->bucketColumns.size())); - std::vector ::const_iterator _iter394; - for (_iter394 = this->bucketColumns.begin(); _iter394 != this->bucketColumns.end(); ++_iter394) + std::vector ::const_iterator _iter407; + for (_iter407 = this->bucketColumns.begin(); _iter407 != this->bucketColumns.end(); ++_iter407) { - xfer += oprot->writeString((*_iter394)); + xfer += oprot->writeString((*_iter407)); } xfer += oprot->writeListEnd(); } @@ -690,10 +648,10 @@ uint32_t CatalogTableObject::write(::apache::thrift::protocol::TProtocol* oprot) xfer += oprot->writeFieldBegin("sortColumns", ::apache::thrift::protocol::T_LIST, 14); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast(this->sortColumns.size())); - std::vector ::const_iterator _iter395; - for (_iter395 = this->sortColumns.begin(); _iter395 != this->sortColumns.end(); ++_iter395) + std::vector ::const_iterator _iter408; + for (_iter408 = this->sortColumns.begin(); _iter408 != this->sortColumns.end(); ++_iter408) { - xfer += oprot->writeString((*_iter395)); + xfer += oprot->writeString((*_iter408)); } xfer += oprot->writeListEnd(); } @@ -714,86 +672,70 @@ uint32_t CatalogTableObject::write(::apache::thrift::protocol::TProtocol* oprot) xfer += oprot->writeFieldBegin("properties", ::apache::thrift::protocol::T_MAP, 18); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast(this->properties.size())); - std::map ::const_iterator _iter396; - for (_iter396 = this->properties.begin(); _iter396 != this->properties.end(); ++_iter396) + std::map ::const_iterator _iter409; + for (_iter409 = this->properties.begin(); _iter409 != this->properties.end(); ++_iter409) { - xfer += oprot->writeString(_iter396->first); - xfer += oprot->writeString(_iter396->second); + xfer += oprot->writeString(_iter409->first); + xfer += oprot->writeString(_iter409->second); } xfer += oprot->writeMapEnd(); } xfer += oprot->writeFieldEnd(); - if (this->__isset.sizeInBytes) { - xfer += oprot->writeFieldBegin("sizeInBytes", ::apache::thrift::protocol::T_I64, 19); - xfer += oprot->writeI64(this->sizeInBytes); - xfer += oprot->writeFieldEnd(); - } - if (this->__isset.rowCount) { - xfer += oprot->writeFieldBegin("rowCount", ::apache::thrift::protocol::T_I64, 20); - xfer += oprot->writeI64(this->rowCount); + if (this->__isset.stats) { + xfer += oprot->writeFieldBegin("stats", ::apache::thrift::protocol::T_STRUCT, 19); + xfer += this->stats.write(oprot); xfer += oprot->writeFieldEnd(); } - xfer += oprot->writeFieldBegin("colStats", ::apache::thrift::protocol::T_LIST, 21); - { - xfer += oprot->writeListBegin(::apache::thrift::protocol::T_MAP, static_cast(this->colStats.size())); - std::vector > ::const_iterator _iter397; - for (_iter397 = this->colStats.begin(); _iter397 != this->colStats.end(); ++_iter397) - { - { - xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast((*_iter397).size())); - std::map ::const_iterator _iter398; - for (_iter398 = (*_iter397).begin(); _iter398 != (*_iter397).end(); ++_iter398) - { - xfer += oprot->writeString(_iter398->first); - xfer += oprot->writeString(_iter398->second); - } - xfer += oprot->writeMapEnd(); - } - } - xfer += oprot->writeListEnd(); - } - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("isBroadcastable", ::apache::thrift::protocol::T_BOOL, 22); - xfer += oprot->writeBool(this->isBroadcastable); - xfer += oprot->writeFieldEnd(); - if (this->__isset.viewOriginalText) { - xfer += oprot->writeFieldBegin("viewOriginalText", ::apache::thrift::protocol::T_STRING, 23); + xfer += oprot->writeFieldBegin("viewOriginalText", ::apache::thrift::protocol::T_STRING, 20); xfer += oprot->writeString(this->viewOriginalText); xfer += oprot->writeFieldEnd(); } if (this->__isset.viewText) { - xfer += oprot->writeFieldBegin("viewText", ::apache::thrift::protocol::T_STRING, 24); + xfer += oprot->writeFieldBegin("viewText", ::apache::thrift::protocol::T_STRING, 21); xfer += oprot->writeString(this->viewText); xfer += oprot->writeFieldEnd(); } if (this->__isset.comment) { - xfer += oprot->writeFieldBegin("comment", ::apache::thrift::protocol::T_STRING, 25); + xfer += oprot->writeFieldBegin("comment", ::apache::thrift::protocol::T_STRING, 22); xfer += oprot->writeString(this->comment); xfer += oprot->writeFieldEnd(); } - xfer += oprot->writeFieldBegin("unsupportedFeatures", ::apache::thrift::protocol::T_LIST, 26); + xfer += oprot->writeFieldBegin("unsupportedFeatures", ::apache::thrift::protocol::T_LIST, 23); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast(this->unsupportedFeatures.size())); - std::vector ::const_iterator _iter399; - for (_iter399 = this->unsupportedFeatures.begin(); _iter399 != this->unsupportedFeatures.end(); ++_iter399) + std::vector ::const_iterator _iter410; + for (_iter410 = this->unsupportedFeatures.begin(); _iter410 != this->unsupportedFeatures.end(); ++_iter410) { - xfer += oprot->writeString((*_iter399)); + xfer += oprot->writeString((*_iter410)); } xfer += oprot->writeListEnd(); } xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("tracksPartitionsInCatalog", ::apache::thrift::protocol::T_BOOL, 27); + xfer += oprot->writeFieldBegin("tracksPartitionsInCatalog", ::apache::thrift::protocol::T_BOOL, 24); xfer += oprot->writeBool(this->tracksPartitionsInCatalog); xfer += oprot->writeFieldEnd(); - xfer += oprot->writeFieldBegin("schemaPreservesCase", ::apache::thrift::protocol::T_BOOL, 28); + xfer += oprot->writeFieldBegin("schemaPreservesCase", ::apache::thrift::protocol::T_BOOL, 25); xfer += oprot->writeBool(this->schemaPreservesCase); xfer += oprot->writeFieldEnd(); + if (this->__isset.ignoredProperties) { + xfer += oprot->writeFieldBegin("ignoredProperties", ::apache::thrift::protocol::T_MAP, 26); + { + xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast(this->ignoredProperties.size())); + std::map ::const_iterator _iter411; + for (_iter411 = this->ignoredProperties.begin(); _iter411 != this->ignoredProperties.end(); ++_iter411) + { + xfer += oprot->writeString(_iter411->first); + xfer += oprot->writeString(_iter411->second); + } + xfer += oprot->writeMapEnd(); + } + xfer += oprot->writeFieldEnd(); + } xfer += oprot->writeFieldStop(); xfer += oprot->writeStructEnd(); return xfer; @@ -819,143 +761,133 @@ void swap(CatalogTableObject &a, CatalogTableObject &b) { swap(a.createTime, b.createTime); swap(a.lastAccessTime, b.lastAccessTime); swap(a.properties, b.properties); - swap(a.sizeInBytes, b.sizeInBytes); - swap(a.rowCount, b.rowCount); - swap(a.colStats, b.colStats); - swap(a.isBroadcastable, b.isBroadcastable); + swap(a.stats, b.stats); swap(a.viewOriginalText, b.viewOriginalText); swap(a.viewText, b.viewText); swap(a.comment, b.comment); swap(a.unsupportedFeatures, b.unsupportedFeatures); swap(a.tracksPartitionsInCatalog, b.tracksPartitionsInCatalog); swap(a.schemaPreservesCase, b.schemaPreservesCase); + swap(a.ignoredProperties, b.ignoredProperties); swap(a.__isset, b.__isset); } -CatalogTableObject::CatalogTableObject(const CatalogTableObject& other400) { - tableName = other400.tableName; - schemaName = other400.schemaName; - tableType = other400.tableType; - storage = other400.storage; - tableSchema = other400.tableSchema; - provider = other400.provider; - partitionColumns = other400.partitionColumns; - indexColumns = other400.indexColumns; - primaryKeyColumns = other400.primaryKeyColumns; - numBuckets = other400.numBuckets; - redundancy = other400.redundancy; - bucketOwners = other400.bucketOwners; - bucketColumns = other400.bucketColumns; - sortColumns = other400.sortColumns; - owner = other400.owner; - createTime = other400.createTime; - lastAccessTime = other400.lastAccessTime; - properties = other400.properties; - sizeInBytes = other400.sizeInBytes; - rowCount = other400.rowCount; - colStats = other400.colStats; - isBroadcastable = other400.isBroadcastable; - viewOriginalText = other400.viewOriginalText; - viewText = other400.viewText; - comment = other400.comment; - unsupportedFeatures = other400.unsupportedFeatures; - tracksPartitionsInCatalog = other400.tracksPartitionsInCatalog; - schemaPreservesCase = other400.schemaPreservesCase; - __isset = other400.__isset; -} -CatalogTableObject::CatalogTableObject( CatalogTableObject&& other401) noexcept { - tableName = std::move(other401.tableName); - schemaName = std::move(other401.schemaName); - tableType = std::move(other401.tableType); - storage = std::move(other401.storage); - tableSchema = std::move(other401.tableSchema); - provider = std::move(other401.provider); - partitionColumns = std::move(other401.partitionColumns); - indexColumns = std::move(other401.indexColumns); - primaryKeyColumns = std::move(other401.primaryKeyColumns); - numBuckets = std::move(other401.numBuckets); - redundancy = std::move(other401.redundancy); - bucketOwners = std::move(other401.bucketOwners); - bucketColumns = std::move(other401.bucketColumns); - sortColumns = std::move(other401.sortColumns); - owner = std::move(other401.owner); - createTime = std::move(other401.createTime); - lastAccessTime = std::move(other401.lastAccessTime); - properties = std::move(other401.properties); - sizeInBytes = std::move(other401.sizeInBytes); - rowCount = std::move(other401.rowCount); - colStats = std::move(other401.colStats); - isBroadcastable = std::move(other401.isBroadcastable); - viewOriginalText = std::move(other401.viewOriginalText); - viewText = std::move(other401.viewText); - comment = std::move(other401.comment); - unsupportedFeatures = std::move(other401.unsupportedFeatures); - tracksPartitionsInCatalog = std::move(other401.tracksPartitionsInCatalog); - schemaPreservesCase = std::move(other401.schemaPreservesCase); - __isset = std::move(other401.__isset); -} -CatalogTableObject& CatalogTableObject::operator=(const CatalogTableObject& other402) { - tableName = other402.tableName; - schemaName = other402.schemaName; - tableType = other402.tableType; - storage = other402.storage; - tableSchema = other402.tableSchema; - provider = other402.provider; - partitionColumns = other402.partitionColumns; - indexColumns = other402.indexColumns; - primaryKeyColumns = other402.primaryKeyColumns; - numBuckets = other402.numBuckets; - redundancy = other402.redundancy; - bucketOwners = other402.bucketOwners; - bucketColumns = other402.bucketColumns; - sortColumns = other402.sortColumns; - owner = other402.owner; - createTime = other402.createTime; - lastAccessTime = other402.lastAccessTime; - properties = other402.properties; - sizeInBytes = other402.sizeInBytes; - rowCount = other402.rowCount; - colStats = other402.colStats; - isBroadcastable = other402.isBroadcastable; - viewOriginalText = other402.viewOriginalText; - viewText = other402.viewText; - comment = other402.comment; - unsupportedFeatures = other402.unsupportedFeatures; - tracksPartitionsInCatalog = other402.tracksPartitionsInCatalog; - schemaPreservesCase = other402.schemaPreservesCase; - __isset = other402.__isset; +CatalogTableObject::CatalogTableObject(const CatalogTableObject& other412) { + tableName = other412.tableName; + schemaName = other412.schemaName; + tableType = other412.tableType; + storage = other412.storage; + tableSchema = other412.tableSchema; + provider = other412.provider; + partitionColumns = other412.partitionColumns; + indexColumns = other412.indexColumns; + primaryKeyColumns = other412.primaryKeyColumns; + numBuckets = other412.numBuckets; + redundancy = other412.redundancy; + bucketOwners = other412.bucketOwners; + bucketColumns = other412.bucketColumns; + sortColumns = other412.sortColumns; + owner = other412.owner; + createTime = other412.createTime; + lastAccessTime = other412.lastAccessTime; + properties = other412.properties; + stats = other412.stats; + viewOriginalText = other412.viewOriginalText; + viewText = other412.viewText; + comment = other412.comment; + unsupportedFeatures = other412.unsupportedFeatures; + tracksPartitionsInCatalog = other412.tracksPartitionsInCatalog; + schemaPreservesCase = other412.schemaPreservesCase; + ignoredProperties = other412.ignoredProperties; + __isset = other412.__isset; +} +CatalogTableObject::CatalogTableObject( CatalogTableObject&& other413) noexcept { + tableName = std::move(other413.tableName); + schemaName = std::move(other413.schemaName); + tableType = std::move(other413.tableType); + storage = std::move(other413.storage); + tableSchema = std::move(other413.tableSchema); + provider = std::move(other413.provider); + partitionColumns = std::move(other413.partitionColumns); + indexColumns = std::move(other413.indexColumns); + primaryKeyColumns = std::move(other413.primaryKeyColumns); + numBuckets = std::move(other413.numBuckets); + redundancy = std::move(other413.redundancy); + bucketOwners = std::move(other413.bucketOwners); + bucketColumns = std::move(other413.bucketColumns); + sortColumns = std::move(other413.sortColumns); + owner = std::move(other413.owner); + createTime = std::move(other413.createTime); + lastAccessTime = std::move(other413.lastAccessTime); + properties = std::move(other413.properties); + stats = std::move(other413.stats); + viewOriginalText = std::move(other413.viewOriginalText); + viewText = std::move(other413.viewText); + comment = std::move(other413.comment); + unsupportedFeatures = std::move(other413.unsupportedFeatures); + tracksPartitionsInCatalog = std::move(other413.tracksPartitionsInCatalog); + schemaPreservesCase = std::move(other413.schemaPreservesCase); + ignoredProperties = std::move(other413.ignoredProperties); + __isset = std::move(other413.__isset); +} +CatalogTableObject& CatalogTableObject::operator=(const CatalogTableObject& other414) { + tableName = other414.tableName; + schemaName = other414.schemaName; + tableType = other414.tableType; + storage = other414.storage; + tableSchema = other414.tableSchema; + provider = other414.provider; + partitionColumns = other414.partitionColumns; + indexColumns = other414.indexColumns; + primaryKeyColumns = other414.primaryKeyColumns; + numBuckets = other414.numBuckets; + redundancy = other414.redundancy; + bucketOwners = other414.bucketOwners; + bucketColumns = other414.bucketColumns; + sortColumns = other414.sortColumns; + owner = other414.owner; + createTime = other414.createTime; + lastAccessTime = other414.lastAccessTime; + properties = other414.properties; + stats = other414.stats; + viewOriginalText = other414.viewOriginalText; + viewText = other414.viewText; + comment = other414.comment; + unsupportedFeatures = other414.unsupportedFeatures; + tracksPartitionsInCatalog = other414.tracksPartitionsInCatalog; + schemaPreservesCase = other414.schemaPreservesCase; + ignoredProperties = other414.ignoredProperties; + __isset = other414.__isset; return *this; } -CatalogTableObject& CatalogTableObject::operator=(CatalogTableObject&& other403) noexcept { - tableName = std::move(other403.tableName); - schemaName = std::move(other403.schemaName); - tableType = std::move(other403.tableType); - storage = std::move(other403.storage); - tableSchema = std::move(other403.tableSchema); - provider = std::move(other403.provider); - partitionColumns = std::move(other403.partitionColumns); - indexColumns = std::move(other403.indexColumns); - primaryKeyColumns = std::move(other403.primaryKeyColumns); - numBuckets = std::move(other403.numBuckets); - redundancy = std::move(other403.redundancy); - bucketOwners = std::move(other403.bucketOwners); - bucketColumns = std::move(other403.bucketColumns); - sortColumns = std::move(other403.sortColumns); - owner = std::move(other403.owner); - createTime = std::move(other403.createTime); - lastAccessTime = std::move(other403.lastAccessTime); - properties = std::move(other403.properties); - sizeInBytes = std::move(other403.sizeInBytes); - rowCount = std::move(other403.rowCount); - colStats = std::move(other403.colStats); - isBroadcastable = std::move(other403.isBroadcastable); - viewOriginalText = std::move(other403.viewOriginalText); - viewText = std::move(other403.viewText); - comment = std::move(other403.comment); - unsupportedFeatures = std::move(other403.unsupportedFeatures); - tracksPartitionsInCatalog = std::move(other403.tracksPartitionsInCatalog); - schemaPreservesCase = std::move(other403.schemaPreservesCase); - __isset = std::move(other403.__isset); +CatalogTableObject& CatalogTableObject::operator=(CatalogTableObject&& other415) noexcept { + tableName = std::move(other415.tableName); + schemaName = std::move(other415.schemaName); + tableType = std::move(other415.tableType); + storage = std::move(other415.storage); + tableSchema = std::move(other415.tableSchema); + provider = std::move(other415.provider); + partitionColumns = std::move(other415.partitionColumns); + indexColumns = std::move(other415.indexColumns); + primaryKeyColumns = std::move(other415.primaryKeyColumns); + numBuckets = std::move(other415.numBuckets); + redundancy = std::move(other415.redundancy); + bucketOwners = std::move(other415.bucketOwners); + bucketColumns = std::move(other415.bucketColumns); + sortColumns = std::move(other415.sortColumns); + owner = std::move(other415.owner); + createTime = std::move(other415.createTime); + lastAccessTime = std::move(other415.lastAccessTime); + properties = std::move(other415.properties); + stats = std::move(other415.stats); + viewOriginalText = std::move(other415.viewOriginalText); + viewText = std::move(other415.viewText); + comment = std::move(other415.comment); + unsupportedFeatures = std::move(other415.unsupportedFeatures); + tracksPartitionsInCatalog = std::move(other415.tracksPartitionsInCatalog); + schemaPreservesCase = std::move(other415.schemaPreservesCase); + ignoredProperties = std::move(other415.ignoredProperties); + __isset = std::move(other415.__isset); return *this; } void CatalogTableObject::printTo(std::ostream& out) const { @@ -979,16 +911,14 @@ void CatalogTableObject::printTo(std::ostream& out) const { out << ", " << "createTime=" << to_string(createTime); out << ", " << "lastAccessTime=" << to_string(lastAccessTime); out << ", " << "properties=" << to_string(properties); - out << ", " << "sizeInBytes="; (__isset.sizeInBytes ? (out << to_string(sizeInBytes)) : (out << "")); - out << ", " << "rowCount="; (__isset.rowCount ? (out << to_string(rowCount)) : (out << "")); - out << ", " << "colStats=" << to_string(colStats); - out << ", " << "isBroadcastable=" << to_string(isBroadcastable); + out << ", " << "stats="; (__isset.stats ? (out << to_string(stats)) : (out << "")); out << ", " << "viewOriginalText="; (__isset.viewOriginalText ? (out << to_string(viewOriginalText)) : (out << "")); out << ", " << "viewText="; (__isset.viewText ? (out << to_string(viewText)) : (out << "")); out << ", " << "comment="; (__isset.comment ? (out << to_string(comment)) : (out << "")); out << ", " << "unsupportedFeatures=" << to_string(unsupportedFeatures); out << ", " << "tracksPartitionsInCatalog=" << to_string(tracksPartitionsInCatalog); out << ", " << "schemaPreservesCase=" << to_string(schemaPreservesCase); + out << ", " << "ignoredProperties="; (__isset.ignoredProperties ? (out << to_string(ignoredProperties)) : (out << "")); out << ")"; } diff --git a/native/src/snappyclient/cpp/thrift/snappydata_struct_EntityId.cpp b/native/src/snappyclient/cpp/thrift/snappydata_struct_EntityId.cpp index 61cbf9eca..dcd9e48f3 100644 --- a/native/src/snappyclient/cpp/thrift/snappydata_struct_EntityId.cpp +++ b/native/src/snappyclient/cpp/thrift/snappydata_struct_EntityId.cpp @@ -152,30 +152,30 @@ void swap(EntityId &a, EntityId &b) { swap(a.token, b.token); } -EntityId::EntityId(const EntityId& other496) { - id = other496.id; - type = other496.type; - connId = other496.connId; - token = other496.token; +EntityId::EntityId(const EntityId& other508) { + id = other508.id; + type = other508.type; + connId = other508.connId; + token = other508.token; } -EntityId::EntityId( EntityId&& other497) noexcept { - id = std::move(other497.id); - type = std::move(other497.type); - connId = std::move(other497.connId); - token = std::move(other497.token); +EntityId::EntityId( EntityId&& other509) noexcept { + id = std::move(other509.id); + type = std::move(other509.type); + connId = std::move(other509.connId); + token = std::move(other509.token); } -EntityId& EntityId::operator=(const EntityId& other498) { - id = other498.id; - type = other498.type; - connId = other498.connId; - token = other498.token; +EntityId& EntityId::operator=(const EntityId& other510) { + id = other510.id; + type = other510.type; + connId = other510.connId; + token = other510.token; return *this; } -EntityId& EntityId::operator=(EntityId&& other499) noexcept { - id = std::move(other499.id); - type = std::move(other499.type); - connId = std::move(other499.connId); - token = std::move(other499.token); +EntityId& EntityId::operator=(EntityId&& other511) noexcept { + id = std::move(other511.id); + type = std::move(other511.type); + connId = std::move(other511.connId); + token = std::move(other511.token); return *this; } void EntityId::printTo(std::ostream& out) const { diff --git a/native/src/snappyclient/headers/snappydata_constants.h b/native/src/snappyclient/headers/snappydata_constants.h index 5401eadf1..8ff0bd602 100644 --- a/native/src/snappyclient/headers/snappydata_constants.h +++ b/native/src/snappyclient/headers/snappydata_constants.h @@ -81,17 +81,19 @@ class snappydataConstants { static const int32_t CATALOG_CREATE_TABLE = 103; static const int32_t CATALOG_DROP_TABLE = 104; static const int32_t CATALOG_ALTER_TABLE = 105; - static const int32_t CATALOG_RENAME_TABLE = 106; - static const int32_t CATALOG_LOAD_TABLE = 107; - static const int32_t CATALOG_CREATE_FUNCTION = 108; - static const int32_t CATALOG_DROP_FUNCTION = 109; - static const int32_t CATALOG_RENAME_FUNCTION = 110; - static const int32_t CATALOG_CREATE_PARTITIONS = 111; - static const int32_t CATALOG_DROP_PARTITIONS = 112; - static const int32_t CATALOG_ALTER_PARTITIONS = 113; - static const int32_t CATALOG_RENAME_PARTITIONS = 114; - static const int32_t CATALOG_LOAD_PARTITION = 115; - static const int32_t CATALOG_LOAD_DYNAMIC_PARTITIONS = 116; + static const int32_t CATALOG_ALTER_TABLE_STATS = 106; + static const int32_t CATALOG_RENAME_TABLE = 107; + static const int32_t CATALOG_LOAD_TABLE = 108; + static const int32_t CATALOG_CREATE_FUNCTION = 109; + static const int32_t CATALOG_DROP_FUNCTION = 110; + static const int32_t CATALOG_ALTER_FUNCTION = 111; + static const int32_t CATALOG_RENAME_FUNCTION = 112; + static const int32_t CATALOG_CREATE_PARTITIONS = 113; + static const int32_t CATALOG_DROP_PARTITIONS = 114; + static const int32_t CATALOG_ALTER_PARTITIONS = 115; + static const int32_t CATALOG_RENAME_PARTITIONS = 116; + static const int32_t CATALOG_LOAD_PARTITION = 117; + static const int32_t CATALOG_LOAD_DYNAMIC_PARTITIONS = 118; static const int8_t BULK_CLOSE_RESULTSET = 1; static const int8_t BULK_CLOSE_LOB = 2; static const int8_t BULK_CLOSE_STATEMENT = 3; diff --git a/native/src/snappyclient/headers/snappydata_struct_CatalogFunctionObject.h b/native/src/snappyclient/headers/snappydata_struct_CatalogFunctionObject.h index a7c0e9f18..5e9f9981f 100644 --- a/native/src/snappyclient/headers/snappydata_struct_CatalogFunctionObject.h +++ b/native/src/snappyclient/headers/snappydata_struct_CatalogFunctionObject.h @@ -31,6 +31,7 @@ #include "snappydata_struct_BucketOwners.h" #include "snappydata_struct_CatalogStorage.h" #include "snappydata_struct_CatalogSchemaObject.h" +#include "snappydata_struct_CatalogStats.h" #include "snappydata_struct_CatalogTableObject.h" #include "snappydata_types.h" diff --git a/native/src/snappyclient/headers/snappydata_struct_CatalogMetadataDetails.h b/native/src/snappyclient/headers/snappydata_struct_CatalogMetadataDetails.h index a40e8716c..3d44fe6ec 100644 --- a/native/src/snappyclient/headers/snappydata_struct_CatalogMetadataDetails.h +++ b/native/src/snappyclient/headers/snappydata_struct_CatalogMetadataDetails.h @@ -31,6 +31,7 @@ #include "snappydata_struct_BucketOwners.h" #include "snappydata_struct_CatalogStorage.h" #include "snappydata_struct_CatalogSchemaObject.h" +#include "snappydata_struct_CatalogStats.h" #include "snappydata_struct_CatalogTableObject.h" #include "snappydata_struct_CatalogFunctionObject.h" #include "snappydata_struct_CatalogPartitionObject.h" @@ -41,7 +42,7 @@ namespace io { namespace snappydata { namespace thrift { typedef struct _CatalogMetadataDetails__isset { - _CatalogMetadataDetails__isset() : names(false), properties(false), newProperties(false), catalogSchemaVersion(false), exists(false), otherFlags(false), catalogSchema(false), catalogTable(false), catalogFunction(false), catalogPartitions(false) {} + _CatalogMetadataDetails__isset() : names(false), properties(false), newProperties(false), catalogSchemaVersion(false), exists(false), otherFlags(false), catalogSchema(false), catalogTable(false), catalogFunction(false), catalogPartitions(false), catalogStats(false) {} bool names :1; bool properties :1; bool newProperties :1; @@ -52,6 +53,7 @@ typedef struct _CatalogMetadataDetails__isset { bool catalogTable :1; bool catalogFunction :1; bool catalogPartitions :1; + bool catalogStats :1; } _CatalogMetadataDetails__isset; class CatalogMetadataDetails { @@ -75,6 +77,7 @@ class CatalogMetadataDetails { CatalogTableObject catalogTable; CatalogFunctionObject catalogFunction; std::vector catalogPartitions; + CatalogStats catalogStats; _CatalogMetadataDetails__isset __isset; @@ -98,6 +101,8 @@ class CatalogMetadataDetails { void __set_catalogPartitions(const std::vector & val); + void __set_catalogStats(const CatalogStats& val); + bool operator == (const CatalogMetadataDetails & rhs) const { if (__isset.names != rhs.__isset.names) @@ -140,6 +145,10 @@ class CatalogMetadataDetails { return false; else if (__isset.catalogPartitions && !(catalogPartitions == rhs.catalogPartitions)) return false; + if (__isset.catalogStats != rhs.__isset.catalogStats) + return false; + else if (__isset.catalogStats && !(catalogStats == rhs.catalogStats)) + return false; return true; } bool operator != (const CatalogMetadataDetails &rhs) const { diff --git a/native/src/snappyclient/headers/snappydata_struct_CatalogMetadataRequest.h b/native/src/snappyclient/headers/snappydata_struct_CatalogMetadataRequest.h index 570057957..02653be15 100644 --- a/native/src/snappyclient/headers/snappydata_struct_CatalogMetadataRequest.h +++ b/native/src/snappyclient/headers/snappydata_struct_CatalogMetadataRequest.h @@ -31,6 +31,7 @@ #include "snappydata_struct_BucketOwners.h" #include "snappydata_struct_CatalogStorage.h" #include "snappydata_struct_CatalogSchemaObject.h" +#include "snappydata_struct_CatalogStats.h" #include "snappydata_struct_CatalogTableObject.h" #include "snappydata_struct_CatalogFunctionObject.h" #include "snappydata_struct_CatalogPartitionObject.h" diff --git a/native/src/snappyclient/headers/snappydata_struct_CatalogPartitionObject.h b/native/src/snappyclient/headers/snappydata_struct_CatalogPartitionObject.h index d0a60f571..60242a8ae 100644 --- a/native/src/snappyclient/headers/snappydata_struct_CatalogPartitionObject.h +++ b/native/src/snappyclient/headers/snappydata_struct_CatalogPartitionObject.h @@ -31,6 +31,7 @@ #include "snappydata_struct_BucketOwners.h" #include "snappydata_struct_CatalogStorage.h" #include "snappydata_struct_CatalogSchemaObject.h" +#include "snappydata_struct_CatalogStats.h" #include "snappydata_struct_CatalogTableObject.h" #include "snappydata_struct_CatalogFunctionObject.h" diff --git a/native/src/snappyclient/headers/snappydata_struct_CatalogStats.h b/native/src/snappyclient/headers/snappydata_struct_CatalogStats.h new file mode 100644 index 000000000..d4da8618b --- /dev/null +++ b/native/src/snappyclient/headers/snappydata_struct_CatalogStats.h @@ -0,0 +1,101 @@ +/** + * Autogenerated by Thrift Compiler (0.10.0) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ + +#ifndef SNAPPYDATA_STRUCT_CATALOGSTATS_H +#define SNAPPYDATA_STRUCT_CATALOGSTATS_H + + +#include "snappydata_struct_Decimal.h" +#include "snappydata_struct_BlobChunk.h" +#include "snappydata_struct_ClobChunk.h" +#include "snappydata_struct_TransactionXid.h" +#include "snappydata_struct_ServiceMetaData.h" +#include "snappydata_struct_ServiceMetaDataArgs.h" +#include "snappydata_struct_OpenConnectionArgs.h" +#include "snappydata_struct_ConnectionProperties.h" +#include "snappydata_struct_HostAddress.h" +#include "snappydata_struct_SnappyExceptionData.h" +#include "snappydata_struct_StatementAttrs.h" +#include "snappydata_struct_ColumnValue.h" +#include "snappydata_struct_ColumnDescriptor.h" +#include "snappydata_struct_Row.h" +#include "snappydata_struct_OutputParameter.h" +#include "snappydata_struct_RowSet.h" +#include "snappydata_struct_PrepareResult.h" +#include "snappydata_struct_UpdateResult.h" +#include "snappydata_struct_StatementResult.h" +#include "snappydata_struct_BucketOwners.h" +#include "snappydata_struct_CatalogStorage.h" +#include "snappydata_struct_CatalogSchemaObject.h" + +#include "snappydata_types.h" + +namespace io { namespace snappydata { namespace thrift { + +typedef struct _CatalogStats__isset { + _CatalogStats__isset() : rowCount(false) {} + bool rowCount :1; +} _CatalogStats__isset; + +class CatalogStats { + public: + + CatalogStats(const CatalogStats&); + CatalogStats(CatalogStats&&) noexcept; + CatalogStats& operator=(const CatalogStats&); + CatalogStats& operator=(CatalogStats&&) noexcept; + CatalogStats() : sizeInBytes(0), rowCount(0) { + } + + virtual ~CatalogStats() noexcept; + int64_t sizeInBytes; + int64_t rowCount; + std::vector > colStats; + + _CatalogStats__isset __isset; + + void __set_sizeInBytes(const int64_t val); + + void __set_rowCount(const int64_t val); + + void __set_colStats(const std::vector > & val); + + bool operator == (const CatalogStats & rhs) const + { + if (!(sizeInBytes == rhs.sizeInBytes)) + return false; + if (__isset.rowCount != rhs.__isset.rowCount) + return false; + else if (__isset.rowCount && !(rowCount == rhs.rowCount)) + return false; + if (!(colStats == rhs.colStats)) + return false; + return true; + } + bool operator != (const CatalogStats &rhs) const { + return !(*this == rhs); + } + + bool operator < (const CatalogStats & ) const; + + uint32_t read(::apache::thrift::protocol::TProtocol* iprot); + uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; + + virtual void printTo(std::ostream& out) const; +}; + +void swap(CatalogStats &a, CatalogStats &b); + +inline std::ostream& operator<<(std::ostream& out, const CatalogStats& obj) +{ + obj.printTo(out); + return out; +} + +}}} // namespace + +#endif diff --git a/native/src/snappyclient/headers/snappydata_struct_CatalogTableObject.h b/native/src/snappyclient/headers/snappydata_struct_CatalogTableObject.h index 4371f01f2..a33f8013a 100644 --- a/native/src/snappyclient/headers/snappydata_struct_CatalogTableObject.h +++ b/native/src/snappyclient/headers/snappydata_struct_CatalogTableObject.h @@ -31,22 +31,23 @@ #include "snappydata_struct_BucketOwners.h" #include "snappydata_struct_CatalogStorage.h" #include "snappydata_struct_CatalogSchemaObject.h" +#include "snappydata_struct_CatalogStats.h" #include "snappydata_types.h" namespace io { namespace snappydata { namespace thrift { typedef struct _CatalogTableObject__isset { - _CatalogTableObject__isset() : schemaName(false), provider(false), numBuckets(false), redundancy(false), sizeInBytes(false), rowCount(false), viewOriginalText(false), viewText(false), comment(false) {} + _CatalogTableObject__isset() : schemaName(false), provider(false), numBuckets(false), redundancy(false), stats(false), viewOriginalText(false), viewText(false), comment(false), ignoredProperties(false) {} bool schemaName :1; bool provider :1; bool numBuckets :1; bool redundancy :1; - bool sizeInBytes :1; - bool rowCount :1; + bool stats :1; bool viewOriginalText :1; bool viewText :1; bool comment :1; + bool ignoredProperties :1; } _CatalogTableObject__isset; class CatalogTableObject { @@ -56,7 +57,7 @@ class CatalogTableObject { CatalogTableObject(CatalogTableObject&&) noexcept; CatalogTableObject& operator=(const CatalogTableObject&); CatalogTableObject& operator=(CatalogTableObject&&) noexcept; - CatalogTableObject() : tableName(), schemaName(), tableType(), tableSchema(), provider(), numBuckets(0), redundancy(0), owner(), createTime(0), lastAccessTime(0), sizeInBytes(0), rowCount(0), isBroadcastable(0), viewOriginalText(), viewText(), comment(), tracksPartitionsInCatalog(0), schemaPreservesCase(0) { + CatalogTableObject() : tableName(), schemaName(), tableType(), tableSchema(), provider(), numBuckets(0), redundancy(0), owner(), createTime(0), lastAccessTime(0), viewOriginalText(), viewText(), comment(), tracksPartitionsInCatalog(0), schemaPreservesCase(0) { } virtual ~CatalogTableObject() noexcept; @@ -78,16 +79,14 @@ class CatalogTableObject { int64_t createTime; int64_t lastAccessTime; std::map properties; - int64_t sizeInBytes; - int64_t rowCount; - std::vector > colStats; - bool isBroadcastable; + CatalogStats stats; std::string viewOriginalText; std::string viewText; std::string comment; std::vector unsupportedFeatures; bool tracksPartitionsInCatalog; bool schemaPreservesCase; + std::map ignoredProperties; _CatalogTableObject__isset __isset; @@ -127,13 +126,7 @@ class CatalogTableObject { void __set_properties(const std::map & val); - void __set_sizeInBytes(const int64_t val); - - void __set_rowCount(const int64_t val); - - void __set_colStats(const std::vector > & val); - - void __set_isBroadcastable(const bool val); + void __set_stats(const CatalogStats& val); void __set_viewOriginalText(const std::string& val); @@ -147,6 +140,8 @@ class CatalogTableObject { void __set_schemaPreservesCase(const bool val); + void __set_ignoredProperties(const std::map & val); + bool operator == (const CatalogTableObject & rhs) const { if (!(tableName == rhs.tableName)) @@ -193,17 +188,9 @@ class CatalogTableObject { return false; if (!(properties == rhs.properties)) return false; - if (__isset.sizeInBytes != rhs.__isset.sizeInBytes) - return false; - else if (__isset.sizeInBytes && !(sizeInBytes == rhs.sizeInBytes)) + if (__isset.stats != rhs.__isset.stats) return false; - if (__isset.rowCount != rhs.__isset.rowCount) - return false; - else if (__isset.rowCount && !(rowCount == rhs.rowCount)) - return false; - if (!(colStats == rhs.colStats)) - return false; - if (!(isBroadcastable == rhs.isBroadcastable)) + else if (__isset.stats && !(stats == rhs.stats)) return false; if (__isset.viewOriginalText != rhs.__isset.viewOriginalText) return false; @@ -223,6 +210,10 @@ class CatalogTableObject { return false; if (!(schemaPreservesCase == rhs.schemaPreservesCase)) return false; + if (__isset.ignoredProperties != rhs.__isset.ignoredProperties) + return false; + else if (__isset.ignoredProperties && !(ignoredProperties == rhs.ignoredProperties)) + return false; return true; } bool operator != (const CatalogTableObject &rhs) const { diff --git a/native/src/snappyclient/headers/snappydata_struct_EntityId.h b/native/src/snappyclient/headers/snappydata_struct_EntityId.h index be5c3a9d3..a2e0a8e62 100644 --- a/native/src/snappyclient/headers/snappydata_struct_EntityId.h +++ b/native/src/snappyclient/headers/snappydata_struct_EntityId.h @@ -31,6 +31,7 @@ #include "snappydata_struct_BucketOwners.h" #include "snappydata_struct_CatalogStorage.h" #include "snappydata_struct_CatalogSchemaObject.h" +#include "snappydata_struct_CatalogStats.h" #include "snappydata_struct_CatalogTableObject.h" #include "snappydata_struct_CatalogFunctionObject.h" #include "snappydata_struct_CatalogPartitionObject.h" diff --git a/native/src/snappyclient/headers/snappydata_types.h b/native/src/snappyclient/headers/snappydata_types.h index 0adb0f300..01af79fad 100644 --- a/native/src/snappyclient/headers/snappydata_types.h +++ b/native/src/snappyclient/headers/snappydata_types.h @@ -309,6 +309,8 @@ class CatalogStorage; class CatalogSchemaObject; +class CatalogStats; + class CatalogTableObject; class CatalogFunctionObject; diff --git a/tests/core/build.gradle b/tests/core/build.gradle index 90a713aca..f341ff2f9 100644 --- a/tests/core/build.gradle +++ b/tests/core/build.gradle @@ -52,7 +52,7 @@ dependencies { compile "com.vmware:vijava:${vijavaVersion}" compile "org.jdom:jdom:${jdomVersion}" compile "com.oracle:ojdbc6:${ojdbc6Version}" - compile "javax.servlet:javax.servlet-api:${servletAPIVersion}" + compile "javax.servlet:javax.servlet-api:${javaxServletVersion}" compile "org.eclipse.jetty:jetty-server:${jettyVersion}" compile "org.eclipse.jetty:jetty-servlet:${jettyVersion}" compile "org.eclipse.jetty:jetty-util:${jettyVersion}"