diff --git a/CHANGES.txt b/CHANGES.txt index 27e1f3a..f283803 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -239,20 +239,6 @@ Release 0.91.0 - Unreleased HBASE-4027 Off Heap Cache never creates Slabs (Li Pi) HBASE-4265 zookeeper.KeeperException$NodeExistsException if HMaster restarts while table is being disabled (Ming Ma) - HBASE-4338 Package build for rpm and deb are broken (Eric Yang) - HBASE-4309 slow query log metrics spewing warnings (Riley Patterson) - HBASE-4302 Only run Snappy compression tests if Snappy is available - (Alejandro Abdelnur via todd) - HBASE-4271 Clean up coprocessor handling of table operations - (Ming Ma via garyh) - HBASE-4341 HRS#closeAllRegions should take care of HRS#onlineRegions's - weak consistency (Jieshan Bean) - HBASE-4297 TableMapReduceUtil overwrites user supplied options - (Jan Lukavsky) - HBASE-4015 Refactor the TimeoutMonitor to make it less racy - (ramkrishna.s.vasudevan) - - IMPROVEMENTS HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack) @@ -457,14 +443,6 @@ Release 0.91.0 - Unreleased HBASE-1730 Online Schema Changes HBASE-4206 jenkins hash implementation uses longs unnecessarily (Ron Yang) - HBASE-3842 Refactor Coprocessor Compaction API - HBASE-4312 Deploy new hbase logo - HBASE-4327 Compile HBase against hadoop 0.22 (Joep Rottinghuis) - HBASE-4339 Improve eclipse documentation and project file generation - (Eric Charles) - HBASE-4342 Update Thrift to 0.7.0 (Moaz Reyad) - HBASE-4260 Expose a command to manually trigger an HLog roll - (ramkrishna.s.vasudevan) TASKS HBASE-3559 Move report of split to master OFF the heartbeat channel @@ -485,8 +463,6 @@ Release 0.91.0 - Unreleased HBASE-4315 RS requestsPerSecond counter seems to be off (subramanian raghunathan) HBASE-4289 Move spinlock to SingleSizeCache rather than the slab allocator (Li Pi) - HBASE-4296 Deprecate HTable[Interface].getRowOrBefore(...) (Lars Hofhansl) - HBASE-2195 Support cyclic replication (Lars Hofhansl) NEW FEATURES HBASE-2001 Coprocessors: Colocate user code with regions (Mingjie Lai via diff --git a/pom.xml b/pom.xml index 6cb67e5..7c154d0 100644 --- a/pom.xml +++ b/pom.xml @@ -586,7 +586,7 @@ - ${project.build.directory}/generated-jamon + ${basedir}/target/jspc ${project.build.directory}/generated-sources/java @@ -663,7 +663,7 @@ 2.4.0a 1.5.8 1.0.1 - 0.7.0 + 0.6.1 3.3.3 0.0.1-SNAPSHOT @@ -674,7 +674,6 @@ 1 0.91.0 - ${artifactId}-${version} @@ -1123,12 +1122,12 @@ - + hadoop-0.20 - !hadoop.profile + !hadoop23 @@ -1177,161 +1176,14 @@ - - hadoop-0.22 - - - hadoop.profile - 22 - - - - 0.22.0-SNAPSHOT - - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - hsqldb - hsqldb - - - net.sf.kosmosfs - kfs - - - org.eclipse.jdt - core - - - net.java.dev.jets3t - jets3t - - - oro - oro - - - jdiff - jdiff - - - org.apache.lucene - lucene-core - - - - - org.apache.hadoop - hadoop-hdfs - ${hadoop.version} - - - - hsqldb - hsqldb - - - net.sf.kosmosfs - kfs - - - org.eclipse.jdt - core - - - net.java.dev.jets3t - jets3t - - - oro - oro - - - jdiff - jdiff - - - org.apache.lucene - lucene-core - - - - - org.apache.hadoop - hadoop-mapred - ${hadoop.version} - - - - hsqldb - hsqldb - - - net.sf.kosmosfs - kfs - - - org.eclipse.jdt - core - - - net.java.dev.jets3t - jets3t - - - oro - oro - - - jdiff - jdiff - - - org.apache.lucene - lucene-core - - - - - - org.apache.hadoop - hadoop-common-test - ${hadoop.version} - test - - - org.apache.hadoop - hadoop-hdfs-test - ${hadoop.version} - test - - - org.apache.hadoop - hadoop-mapred-test - ${hadoop.version} - test - - - - - hadoop-0.23 - hadoop.profile - 23 + hadoop23 diff --git a/src/docbkx/book.xml b/src/docbkx/book.xml index 5534acd..3bed801 100644 --- a/src/docbkx/book.xml +++ b/src/docbkx/book.xml @@ -28,14 +28,14 @@ xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook"> - <link xlink:href="http://www.hbase.org"> + <title>The Apache <link xlink:href="http://www.hbase.org"> <inlinemediaobject> <imageobject> - <imagedata align="middle" valign="middle" fileref="hbase_logo.png" /> + <imagedata align="middle" valign="middle" fileref="hbase_small.gif" /> </imageobject> </inlinemediaobject> </link> - + Book 2011Apache Software Foundation This is the official book of diff --git a/src/docbkx/build.xml b/src/docbkx/build.xml index 6541727..25dc0b2 100644 --- a/src/docbkx/build.xml +++ b/src/docbkx/build.xml @@ -12,8 +12,8 @@
Building in snappy compression support - Pass -Dsnappy to trigger the snappy maven profile for building - snappy native libs into hbase. +

Pass -Dsnappy to trigger the snappy maven profile for building + snappy native libs into hbase.

diff --git a/src/docbkx/developer.xml b/src/docbkx/developer.xml index 9f3d8bd..70c40f8 100644 --- a/src/docbkx/developer.xml +++ b/src/docbkx/developer.xml @@ -47,8 +47,7 @@ git clone git://git.apache.org/hbase.git mvn eclipse:eclipse - ... from your local HBase project directory in your workspace to generate some new .project - and .classpathfiles. Then reopen Eclipse. + ... from your local HBase project directory in your workspace to generate a new .project file. Then reopen Eclipse.
Maven Plugin @@ -67,16 +66,6 @@ Unbound classpath variable: 'M2_REPO/com/github/stephenc/high-scale-lib/high-sca Unbound classpath variable: 'M2_REPO/com/google/guava/guava/r09/guava-r09.jar' in project 'hbase' hbase Build path Build Path Problem Unbound classpath variable: 'M2_REPO/com/google/protobuf/protobuf-java/2.3.0/protobuf-java-2.3.0.jar' in project 'hbase' hbase Build path Build Path Problem Unbound classpath variable: -
-
- Import via m2eclipse - If you install the m2eclipse and import the HBase pom.xml in your workspace, you will have to fix your eclipse Build Path. - Remove target folder, add target/generated-jamon - and target/generated-sources/java folders. You may also remove from your Build Path - the exclusions on the src/main/resources and src/test/resources - to avoid error message in the console 'Failed to execute goal org.apache.maven.plugins:maven-antrun-plugin:1.6:run (default) on project hbase: - 'An Ant BuildException has occured: Replace: source file .../target/classes/hbase-default.xml doesn't exist'. This will also - reduce the eclipse build cycles and make your life easier when developing.
Eclipse Known Issues diff --git a/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon b/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon index 38731bc..e3e13e7 100644 --- a/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/src/main/jamon/org/apache/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -49,7 +49,7 @@ org.apache.hadoop.hbase.HTableDescriptor; - +

Master: <% master.getServerName().getHostname() %>:<% master.getServerName().getPort() %>

Region Server: <% serverInfo.getServerAddress().getHostname() %>:<% serverInfo.getServerAddress().getPort() %>

    - *
  • Wrap the provided {@link InternalScanner} with a custom - * implementation that is returned from this method. The custom scanner - * can then inspect {@link KeyValue}s from the wrapped scanner, applying - * its own policy to what gets written.
  • - *
  • Call {@link org.apache.hadoop.hbase.coprocessor.ObserverContext#bypass()} - * and provide a custom implementation for writing of new - * {@link StoreFile}s. Note: any implementations bypassing - * core compaction using this approach must write out new store files - * themselves or the existing data will no longer be available after - * compaction.
  • - *
- * @param c the environment provided by the region server - * @param store the store being compacted - * @param scanner the scanner over existing data used in the store file - * rewriting - * @return the scanner to use during compaction. Should not be {@code null} - * unless the implementation is writing new store files on its own. - */ - InternalScanner preCompact(final ObserverContext c, - final Store store, final InternalScanner scanner); - - /** - * Called after compaction has completed and the new store file has been - * moved in to place. - * @param c the environment provided by the region server - * @param store the store being compacted - * @param resultFile the new store file written out during compaction + * @param willSplit true if compaction will result in a split, false + * otherwise */ void postCompact(final ObserverContext c, - final Store store, StoreFile resultFile); + final boolean willSplit); /** * Called before the region is split. diff --git a/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java b/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java index 85e784d..a012e1e 100644 --- a/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java +++ b/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java @@ -91,18 +91,17 @@ public class HFileBlock implements Cacheable { private static final CacheableDeserializer blockDeserializer = new CacheableDeserializer() { public HFileBlock deserialize(ByteBuffer buf) throws IOException{ - ByteBuffer tempCopy = buf.duplicate(); - ByteBuffer newByteBuffer = ByteBuffer.allocate(tempCopy.limit() + ByteBuffer newByteBuffer = ByteBuffer.allocate(buf.limit() - HFileBlock.EXTRA_SERIALIZATION_SPACE); - tempCopy.limit(tempCopy.limit() + buf.limit(buf.limit() - HFileBlock.EXTRA_SERIALIZATION_SPACE).rewind(); - newByteBuffer.put(tempCopy); + newByteBuffer.put(buf); HFileBlock ourBuffer = new HFileBlock(newByteBuffer); - tempCopy.position(tempCopy.limit()); - tempCopy.limit(tempCopy.limit() + HFileBlock.EXTRA_SERIALIZATION_SPACE); - ourBuffer.offset = tempCopy.getLong(); - ourBuffer.nextBlockOnDiskSizeWithHeader = tempCopy.getInt(); + buf.position(buf.limit()); + buf.limit(buf.limit() + HFileBlock.EXTRA_SERIALIZATION_SPACE); + ourBuffer.offset = buf.getLong(); + ourBuffer.nextBlockOnDiskSizeWithHeader = buf.getInt(); return ourBuffer; } }; diff --git a/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SingleSizeCache.java b/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SingleSizeCache.java index 18a3332..8ac54e6 100644 --- a/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SingleSizeCache.java +++ b/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SingleSizeCache.java @@ -19,12 +19,10 @@ */ package org.apache.hadoop.hbase.io.hfile.slab; -import java.io.IOException; import java.nio.ByteBuffer; import java.util.List; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.ReentrantReadWriteLock; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -94,24 +92,9 @@ public class SingleSizeCache implements BlockCache { MapEvictionListener listener = new MapEvictionListener() { @Override public void onEviction(String key, CacheablePair value) { - try { - value.evictionLock.writeLock().lock(); - timeSinceLastAccess.set(System.nanoTime() - - value.recentlyAccessed.get()); - backingStore.free(value.serializedData); - stats.evict(); - /** - * We may choose to run this cache alone, without the SlabCache on - * top, no evictionWatcher in that case - */ - if (evictionWatcher != null) { - evictionWatcher.onEviction(key, false); - } - size.addAndGet(-1 * value.heapSize()); - stats.evicted(); - } finally { - value.evictionLock.writeLock().unlock(); - } + timeSinceLastAccess.set(System.nanoTime() + - value.recentlyAccessed.get()); + doEviction(key, value); } }; @@ -121,7 +104,7 @@ public class SingleSizeCache implements BlockCache { } @Override - public synchronized void cacheBlock(String blockName, Cacheable toBeCached) { + public void cacheBlock(String blockName, Cacheable toBeCached) { ByteBuffer storedBlock; /* @@ -129,12 +112,18 @@ public class SingleSizeCache implements BlockCache { * items than the memory we have allocated, but the Slab Allocator may still * be empty if we have not yet completed eviction */ - do { + + try { storedBlock = backingStore.alloc(toBeCached.getSerializedLength()); - } while (storedBlock == null); + } catch (InterruptedException e) { + LOG.warn("SlabAllocator was interrupted while waiting for block to become available"); + LOG.warn(e); + return; + } CacheablePair newEntry = new CacheablePair(toBeCached.getDeserializer(), storedBlock); + toBeCached.serialize(storedBlock); CacheablePair alreadyCached = backingMap.putIfAbsent(blockName, newEntry); @@ -142,7 +131,6 @@ public class SingleSizeCache implements BlockCache { backingStore.free(storedBlock); throw new RuntimeException("already cached " + blockName); } - toBeCached.serialize(storedBlock); newEntry.recentlyAccessed.set(System.nanoTime()); this.size.addAndGet(newEntry.heapSize()); } @@ -157,20 +145,21 @@ public class SingleSizeCache implements BlockCache { stats.hit(caching); // If lock cannot be obtained, that means we're undergoing eviction. - if (contentBlock.evictionLock.readLock().tryLock()) { - try { - contentBlock.recentlyAccessed.set(System.nanoTime()); + try { + contentBlock.recentlyAccessed.set(System.nanoTime()); + synchronized (contentBlock) { + if (contentBlock.serializedData == null) { + // concurrently evicted + LOG.warn("Concurrent eviction of " + key); + return null; + } return contentBlock.deserializer - .deserialize(contentBlock.serializedData); - } catch (IOException e) { - e.printStackTrace(); - LOG.warn("Deserializer throwing ioexception, possibly deserializing wrong object buffer"); - return null; - } finally { - contentBlock.evictionLock.readLock().unlock(); + .deserialize(contentBlock.serializedData.asReadOnlyBuffer()); } + } catch (Throwable t) { + LOG.error("Deserializer threw an exception. This may indicate a bug.", t); + return null; } - return null; } /** @@ -183,23 +172,45 @@ public class SingleSizeCache implements BlockCache { stats.evict(); CacheablePair evictedBlock = backingMap.remove(key); if (evictedBlock != null) { - try { - evictedBlock.evictionLock.writeLock().lock(); - backingStore.free(evictedBlock.serializedData); - evictionWatcher.onEviction(key, false); - stats.evicted(); - size.addAndGet(-1 * evictedBlock.heapSize()); - } finally { - evictedBlock.evictionLock.writeLock().unlock(); - } + doEviction(key, evictedBlock); } return evictedBlock != null; } + private void doEviction(String key, CacheablePair evictedBlock) { + long evictedHeap = 0; + synchronized (evictedBlock) { + if (evictedBlock.serializedData == null) { + // someone else already freed + return; + } + evictedHeap = evictedBlock.heapSize(); + ByteBuffer bb = evictedBlock.serializedData; + evictedBlock.serializedData = null; + backingStore.free(bb); + + // We have to do this callback inside the synchronization here. + // Otherwise we can have the following interleaving: + // Thread A calls getBlock(): + // SlabCache directs call to this SingleSizeCache + // It gets the CacheablePair object + // Thread B runs eviction + // doEviction() is called and sets serializedData = null, here. + // Thread A sees the null serializedData, and returns null + // Thread A calls cacheBlock on the same block, and gets + // "already cached" since the block is still in backingStore + if (evictionWatcher != null) { + evictionWatcher.onEviction(key, false); + } + } + stats.evicted(); + size.addAndGet(-1 * evictedHeap); + } + public void logStats() { - long milliseconds = (long)this.timeSinceLastAccess.get() / 1000000; + long milliseconds = (long) this.timeSinceLastAccess.get() / 1000000; LOG.info("For Slab of size " + this.blockSize + ": " + this.getOccupiedSize() / this.blockSize @@ -299,8 +310,7 @@ public class SingleSizeCache implements BlockCache { /* Just a pair class, holds a reference to the parent cacheable */ private class CacheablePair implements HeapSize { final CacheableDeserializer deserializer; - final ByteBuffer serializedData; - final ReentrantReadWriteLock evictionLock; + ByteBuffer serializedData; AtomicLong recentlyAccessed; private CacheablePair(CacheableDeserializer deserializer, @@ -308,7 +318,6 @@ public class SingleSizeCache implements BlockCache { this.recentlyAccessed = new AtomicLong(); this.deserializer = deserializer; this.serializedData = serializedData; - evictionLock = new ReentrantReadWriteLock(); } /* diff --git a/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/Slab.java b/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/Slab.java index 9811c6b..ed32980 100644 --- a/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/Slab.java +++ b/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/Slab.java @@ -21,6 +21,8 @@ package org.apache.hadoop.hbase.io.hfile.slab; import java.nio.ByteBuffer; import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.LinkedBlockingQueue; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.util.ClassSize; @@ -37,7 +39,7 @@ class Slab implements org.apache.hadoop.hbase.io.HeapSize { static final Log LOG = LogFactory.getLog(Slab.class); /** This is where our items, or blocks of the slab, are stored. */ - private ConcurrentLinkedQueue buffers; + private LinkedBlockingQueue buffers; /** This is where our Slabs are stored */ private ConcurrentLinkedQueue slabs; @@ -47,7 +49,7 @@ class Slab implements org.apache.hadoop.hbase.io.HeapSize { private long heapSize; Slab(int blockSize, int numBlocks) { - buffers = new ConcurrentLinkedQueue(); + buffers = new LinkedBlockingQueue(); slabs = new ConcurrentLinkedQueue(); this.blockSize = blockSize; @@ -108,16 +110,13 @@ class Slab implements org.apache.hadoop.hbase.io.HeapSize { } /* - * This returns null if empty. Throws an exception if you try to allocate a - * bigger size than the allocator can handle. + * Throws an exception if you try to allocate a + * bigger size than the allocator can handle. Alloc will block until a buffer is available. */ - ByteBuffer alloc(int bufferSize) { + ByteBuffer alloc(int bufferSize) throws InterruptedException { int newCapacity = Preconditions.checkPositionIndex(bufferSize, blockSize); - ByteBuffer returnedBuffer = buffers.poll(); - if (returnedBuffer == null) { - return null; - } + ByteBuffer returnedBuffer = buffers.take(); returnedBuffer.clear().limit(newCapacity); return returnedBuffer; diff --git a/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabCache.java b/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabCache.java index 1611349..4e3d337 100644 --- a/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabCache.java +++ b/src/main/java/org/apache/hadoop/hbase/io/hfile/slab/SlabCache.java @@ -232,6 +232,7 @@ public class SlabCache implements SlabItemEvictionWatcher, BlockCache, HeapSize public Cacheable getBlock(String key, boolean caching) { SingleSizeCache cachedBlock = backingStore.get(key); if (cachedBlock == null) { + // TODO: this is a miss, isn't it? return null; } diff --git a/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java b/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java index 337da78..1c68875 100644 --- a/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java +++ b/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java @@ -77,7 +77,6 @@ public class HBaseRpcMetrics implements Updater { public MetricsTimeVaryingRate rpcQueueTime = new MetricsTimeVaryingRate("RpcQueueTime", registry); public MetricsTimeVaryingRate rpcProcessingTime = new MetricsTimeVaryingRate("RpcProcessingTime", registry); - public MetricsTimeVaryingRate rpcSlowResponseTime = new MetricsTimeVaryingRate("RpcSlowResponse", registry); //public Map metricsList = Collections.synchronizedMap(new HashMap()); @@ -130,48 +129,13 @@ public class HBaseRpcMetrics implements Updater { * "classname.method" */ public void createMetrics(Class[] ifaces, boolean prefixWithClass) { - createMetrics(ifaces, prefixWithClass, null); - } - - /** - * Generate metrics entries for all the methods defined in the list of - * interfaces. A {@link MetricsTimeVaryingRate} counter will be created for - * each {@code Class.getMethods().getName()} entry. - * - *

- * If {@code prefixWithClass} is {@code true}, each metric will be named as - * {@code [Class.getSimpleName()].[Method.getName()]}. Otherwise each metric - * will just be named according to the method -- {@code Method.getName()}. - *

- * - *

- * Additionally, if {@code suffixes} is defined, additional metrics will be - * created for each method named as the original metric concatenated with - * the suffix. - *

- * @param ifaces Define metrics for all methods in the given classes - * @param prefixWithClass If {@code true}, each metric will be named as - * "classname.method" - * @param suffixes If not null, each method will get additional metrics ending - * in each of the suffixes. - */ - public void createMetrics(Class[] ifaces, boolean prefixWithClass, - String [] suffixes) { for (Class iface : ifaces) { Method[] methods = iface.getMethods(); for (Method method : methods) { String attrName = prefixWithClass ? - getMetricName(iface, method.getName()) : method.getName(); + getMetricName(iface, method.getName()) : method.getName(); if (get(attrName) == null) create(attrName); - if (suffixes != null) { - // create metrics for each requested suffix - for (String s : suffixes) { - String metricName = attrName + s; - if (get(metricName) == null) - create(metricName); - } - } } } } @@ -204,4 +168,4 @@ public class HBaseRpcMetrics implements Updater { if (rpcStatistics != null) rpcStatistics.shutdown(); } -} +} \ No newline at end of file diff --git a/src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java b/src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java index 3679c02..8d8908c 100644 --- a/src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java +++ b/src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java @@ -44,7 +44,6 @@ import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; import org.apache.hadoop.hbase.filter.WritableByteArrayComparable; import org.apache.hadoop.hbase.io.hfile.BlockCacheColumnFamilySummary; import org.apache.hadoop.hbase.regionserver.RegionOpeningState; -import org.apache.hadoop.hbase.regionserver.wal.FailedLogCloseException; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.ipc.RemoteException; import org.apache.hadoop.hbase.ipc.VersionedProtocol; @@ -333,7 +332,7 @@ public interface HRegionInterface extends VersionedProtocol, Stoppable, Abortabl * @param region * region to open * @return RegionOpeningState - * OPENED - if region open request was successful. + * OPENED - if region opened succesfully. * ALREADY_OPENED - if the region was already opened. * FAILED_OPENING - if region opening failed. * @@ -342,22 +341,6 @@ public interface HRegionInterface extends VersionedProtocol, Stoppable, Abortabl public RegionOpeningState openRegion(final HRegionInfo region) throws IOException; /** - * Opens the specified region. - * @param region - * region to open - * @param versionOfOfflineNode - * the version of znode to compare when RS transitions the znode from - * OFFLINE state. - * @return RegionOpeningState - * OPENED - if region open request was successful. - * ALREADY_OPENED - if the region was already opened. - * FAILED_OPENING - if region opening failed. - * @throws IOException - */ - public RegionOpeningState openRegion(HRegionInfo region, int versionOfOfflineNode) - throws IOException; - - /** * Opens the specified regions. * @param regions regions to open * @throws IOException @@ -530,14 +513,4 @@ public interface HRegionInterface extends VersionedProtocol, Stoppable, Abortabl * @throws IOException exception */ public List getBlockCacheColumnFamilySummaries() throws IOException; - /** - * Roll the log writer. That is, start writing log messages to a new file. - * - * @throws IOException - * @throws FailedLogCloseException - * @return If lots of logs, flush the returned regions so next time through - * we can clean logs. Returns null if nothing to flush. Names are actual - * region names as returned by {@link HRegionInfo#getEncodedName()} - */ - public byte[][] rollHLogWriter() throws IOException, FailedLogCloseException; } diff --git a/src/main/java/org/apache/hadoop/hbase/ipc/WritableRpcEngine.java b/src/main/java/org/apache/hadoop/hbase/ipc/WritableRpcEngine.java index b618429..55e0339 100644 --- a/src/main/java/org/apache/hadoop/hbase/ipc/WritableRpcEngine.java +++ b/src/main/java/org/apache/hadoop/hbase/ipc/WritableRpcEngine.java @@ -264,9 +264,6 @@ class WritableRpcEngine implements RpcEngine { private static final int DEFAULT_WARN_RESPONSE_TIME = 10000; // milliseconds private static final int DEFAULT_WARN_RESPONSE_SIZE = 100 * 1024 * 1024; - /** Names for suffixed metrics */ - private static final String ABOVE_ONE_SEC_METRIC = ".aboveOneSec."; - private final int warnResponseTime; private final int warnResponseSize; @@ -301,8 +298,7 @@ class WritableRpcEngine implements RpcEngine { this.ifaces = ifaces; // create metrics for the advertised interfaces this server implements. - String [] metricSuffixes = new String [] {ABOVE_ONE_SEC_METRIC}; - this.rpcMetrics.createMetrics(this.ifaces, false, metricSuffixes); + this.rpcMetrics.createMetrics(this.ifaces); this.authorize = conf.getBoolean( @@ -372,14 +368,15 @@ class WritableRpcEngine implements RpcEngine { startTime, processingTime, qTime, responseSize); // provides a count of log-reported slow responses if (tooSlow) { - rpcMetrics.rpcSlowResponseTime.inc(processingTime); + rpcMetrics.inc(call.getMethodName() + ".slowResponse.", + processingTime); } } if (processingTime > 1000) { // we use a hard-coded one second period so that we can clearly // indicate the time period we're warning about in the name of the // metric itself - rpcMetrics.inc(call.getMethodName() + ABOVE_ONE_SEC_METRIC, + rpcMetrics.inc(call.getMethodName() + ".aboveOneSec.", processingTime); } @@ -443,7 +440,7 @@ class WritableRpcEngine implements RpcEngine { } else if (params.length == 1 && instance instanceof HRegionServer && params[0] instanceof Operation) { // annotate the response map with operation details - responseInfo.putAll(((Operation) params[0]).toMap()); + responseInfo.putAll(((Operation) params[1]).toMap()); // report to the log file LOG.warn("(operation" + tag + "): " + mapper.writeValueAsString(responseInfo)); diff --git a/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java index ad88b76..ff05df8 100644 --- a/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java +++ b/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java @@ -126,10 +126,10 @@ public class TableMapReduceUtil { if (outputValueClass != null) job.setMapOutputValueClass(outputValueClass); if (outputKeyClass != null) job.setMapOutputKeyClass(outputKeyClass); job.setMapperClass(mapper); - Configuration conf = job.getConfiguration(); - HBaseConfiguration.merge(conf, HBaseConfiguration.create(conf)); - conf.set(TableInputFormat.INPUT_TABLE, table); - conf.set(TableInputFormat.SCAN, convertScanToString(scan)); + HBaseConfiguration.addHbaseResources(job.getConfiguration()); + job.getConfiguration().set(TableInputFormat.INPUT_TABLE, table); + job.getConfiguration().set(TableInputFormat.SCAN, + convertScanToString(scan)); if (addDependencyJars) { addDependencyJars(job); } @@ -333,8 +333,8 @@ public class TableMapReduceUtil { Class partitioner, String quorumAddress, String serverClass, String serverImpl, boolean addDependencyJars) throws IOException { - Configuration conf = job.getConfiguration(); - HBaseConfiguration.merge(conf, HBaseConfiguration.create(conf)); + Configuration conf = job.getConfiguration(); + HBaseConfiguration.addHbaseResources(conf); job.setOutputFormatClass(TableOutputFormat.class); if (reducer != null) job.setReducerClass(reducer); conf.set(TableOutputFormat.OUTPUT_TABLE, table); diff --git a/src/main/java/org/apache/hadoop/hbase/master/AssignCallable.java b/src/main/java/org/apache/hadoop/hbase/master/AssignCallable.java deleted file mode 100644 index b233d10..0000000 --- a/src/main/java/org/apache/hadoop/hbase/master/AssignCallable.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2011 The Apache Software Foundation - * - * 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 org.apache.hadoop.hbase.master; - -import java.util.concurrent.Callable; - -import org.apache.hadoop.hbase.HRegionInfo; - -/** - * A callable object that invokes the corresponding action that needs to be - * taken for assignment of a region in transition. - * Implementing as future callable we are able to act on the timeout - * asynchronously. - */ -public class AssignCallable implements Callable { - private AssignmentManager assignmentManager; - - private HRegionInfo hri; - - public AssignCallable(AssignmentManager assignmentManager, HRegionInfo hri) { - this.assignmentManager = assignmentManager; - this.hri = hri; - } - - @Override - public Object call() throws Exception { - assignmentManager.assign(hri, true, true, true); - return null; - } -} diff --git a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index c0170b4..c8d4855 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -38,7 +38,6 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListSet; -import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -160,9 +159,6 @@ public class AssignmentManager extends ZooKeeperListener { private final ExecutorService executorService; - //Thread pool executor service for timeout monitor - private java.util.concurrent.ExecutorService threadPoolExecutorService; - /** * Constructs a new assignment manager. * @@ -194,7 +190,6 @@ public class AssignmentManager extends ZooKeeperListener { this.maximumAssignmentAttempts = this.master.getConfiguration().getInt("hbase.assignment.maximum.attempts", 10); this.balancer = LoadBalancerFactory.getLoadBalancer(conf); - this.threadPoolExecutorService = Executors.newCachedThreadPool(); } /** @@ -480,20 +475,9 @@ public class AssignmentManager extends ZooKeeperListener { // Just insert region into RIT // If this never updates the timeout will trigger new assignment - if (regionInfo.isMetaRegion() || regionInfo.isRootRegion()) { - regionsInTransition.put(encodedRegionName, new RegionState( - regionInfo, RegionState.State.OPENING, data.getStamp(), data - .getOrigin())); - // If ROOT or .META. table is waiting for timeout monitor to assign - // it may take lot of time when the assignment.timeout.period is - // the default value which may be very long. We will not be able - // to serve any request during this time. - // So we will assign the ROOT and .META. region immediately. - processOpeningState(regionInfo); - break; - } - regionsInTransition.put(encodedRegionName, new RegionState(regionInfo, - RegionState.State.OPENING, data.getStamp(), data.getOrigin())); + regionsInTransition.put(encodedRegionName, new RegionState( + regionInfo, RegionState.State.OPENING, + data.getStamp(), data.getOrigin())); break; case RS_ZK_REGION_OPENED: @@ -1125,21 +1109,12 @@ public class AssignmentManager extends ZooKeeperListener { public void assign(HRegionInfo region, boolean setOfflineInZK, boolean forceNewPlan) { - assign(region, setOfflineInZK, forceNewPlan, false); - } - - /** - * @param region - * @param setOfflineInZK - * @param forceNewPlan - * @param hijack - * - true new assignment is needed, false otherwise - */ - public void assign(HRegionInfo region, boolean setOfflineInZK, - boolean forceNewPlan, boolean hijack) { - //If hijack is true do not call disableRegionIfInRIT as - // we have not yet moved the znode to OFFLINE state. - if (!hijack && isDisabledorDisablingRegionInRIT(region)) { + String tableName = region.getTableNameAsString(); + boolean disabled = this.zkTable.isDisabledTable(tableName); + if (disabled || this.zkTable.isDisablingTable(tableName)) { + LOG.info("Table " + tableName + (disabled? " disabled;": " disabling;") + + " skipping assign of " + region.getRegionNameAsString()); + offlineDisabledRegion(region); return; } if (this.serverManager.isClusterShutdown()) { @@ -1147,10 +1122,9 @@ public class AssignmentManager extends ZooKeeperListener { region.getRegionNameAsString()); return; } - RegionState state = addToRegionsInTransition(region, - hijack); + RegionState state = addToRegionsInTransition(region); synchronized (state) { - assign(region, state, setOfflineInZK, forceNewPlan, hijack); + assign(state, setOfflineInZK, forceNewPlan); } } @@ -1308,52 +1282,26 @@ public class AssignmentManager extends ZooKeeperListener { * @return The current RegionState */ private RegionState addToRegionsInTransition(final HRegionInfo region) { - return addToRegionsInTransition(region, false); - } - /** - * @param region - * @param hijack - * @return The current RegionState - */ - private RegionState addToRegionsInTransition(final HRegionInfo region, - boolean hijack) { synchronized (regionsInTransition) { - return forceRegionStateToOffline(region, hijack); + return forceRegionStateToOffline(region); } } - /** - * Sets regions {@link RegionState} to {@link RegionState.State#OFFLINE}. - * Caller must hold lock on this.regionsInTransition. - * @param region - * @return Amended RegionState. - */ - private RegionState forceRegionStateToOffline(final HRegionInfo region) { - return forceRegionStateToOffline(region, false); - } /** * Sets regions {@link RegionState} to {@link RegionState.State#OFFLINE}. * Caller must hold lock on this.regionsInTransition. * @param region - * @param hijack * @return Amended RegionState. */ - private RegionState forceRegionStateToOffline(final HRegionInfo region, - boolean hijack) { + private RegionState forceRegionStateToOffline(final HRegionInfo region) { String encodedName = region.getEncodedName(); RegionState state = this.regionsInTransition.get(encodedName); if (state == null) { state = new RegionState(region, RegionState.State.OFFLINE); this.regionsInTransition.put(encodedName, state); } else { - // If we are reassigning the node do not force in-memory state to OFFLINE. - // Based on the znode state we will decide if to change - // in-memory state to OFFLINE or not. It will - // be done before setting the znode to OFFLINE state. - if (!hijack) { - LOG.debug("Forcing OFFLINE; was=" + state); - state.update(RegionState.State.OFFLINE); - } + LOG.debug("Forcing OFFLINE; was=" + state); + state.update(RegionState.State.OFFLINE); } return state; } @@ -1363,29 +1311,11 @@ public class AssignmentManager extends ZooKeeperListener { * @param state * @param setOfflineInZK * @param forceNewPlan - * @param hijack */ - private void assign(final HRegionInfo region, final RegionState state, - final boolean setOfflineInZK, final boolean forceNewPlan, - boolean hijack) { + private void assign(final RegionState state, final boolean setOfflineInZK, + final boolean forceNewPlan) { for (int i = 0; i < this.maximumAssignmentAttempts; i++) { - int versionOfOfflineNode = -1; - if (setOfflineInZK) { - // get the version of the znode after setting it to OFFLINE. - // versionOfOfflineNode will be -1 if the znode was not set to OFFLINE - versionOfOfflineNode = setOfflineInZooKeeper(state, - hijack); - if(versionOfOfflineNode != -1){ - if (isDisabledorDisablingRegionInRIT(region)) { - return; - } - } - } - - if (setOfflineInZK && versionOfOfflineNode == -1) { - return; - } - + if (setOfflineInZK && !setOfflineInZooKeeper(state)) return; if (this.master.isStopped()) { LOG.debug("Server stopped; skipping assign of " + state); return; @@ -1404,9 +1334,8 @@ public class AssignmentManager extends ZooKeeperListener { state.update(RegionState.State.PENDING_OPEN, System.currentTimeMillis(), plan.getDestination()); // Send OPEN RPC. This can fail if the server on other end is is not up. - // Pass the version that was obtained while setting the node to OFFLINE. RegionOpeningState regionOpenState = serverManager.sendRegionOpen(plan - .getDestination(), state.getRegion(), versionOfOfflineNode); + .getDestination(), state.getRegion()); if (regionOpenState == RegionOpeningState.ALREADY_OPENED) { // Remove region from in-memory transition and unassigned node from ZK // While trying to enable the table the regions of the table were @@ -1460,69 +1389,31 @@ public class AssignmentManager extends ZooKeeperListener { } } - private boolean isDisabledorDisablingRegionInRIT(final HRegionInfo region) { - String tableName = region.getTableNameAsString(); - boolean disabled = this.zkTable.isDisabledTable(tableName); - if (disabled || this.zkTable.isDisablingTable(tableName)) { - LOG.info("Table " + tableName + (disabled ? " disabled;" : " disabling;") + - " skipping assign of " + region.getRegionNameAsString()); - offlineDisabledRegion(region); - return true; - } - return false; - } - /** * Set region as OFFLINED up in zookeeper - * * @param state - * @param hijack - * - true if needs to be hijacked and reassigned, false otherwise. - * @return the version of the offline node if setting of the OFFLINE node was - * successful, -1 otherwise. - */ - int setOfflineInZooKeeper(final RegionState state, - boolean hijack) { - // In case of reassignment the current state in memory need not be - // OFFLINE. - if (!hijack && !state.isClosed() && !state.isOffline()) { + * @return True if we succeeded, false otherwise (State was incorrect or failed + * updating zk). + */ + boolean setOfflineInZooKeeper(final RegionState state) { + if (!state.isClosed() && !state.isOffline()) { this.master.abort("Unexpected state trying to OFFLINE; " + state, - new IllegalStateException()); - return -1; - } - boolean allowZNodeCreation = false; - // Under reassignment if the current state is PENDING_OPEN - // or OPENING then refresh the in-memory state to PENDING_OPEN. This is - // important because if the region was in - // RS_OPENING state for a long time the master will try to force the znode - // to OFFLINE state meanwhile the RS could have opened the corresponding - // region and the state in znode will be RS_ZK_REGION_OPENED. - // For all other cases we can change the in-memory state to OFFLINE. - if (hijack && - (state.getState().equals(RegionState.State.PENDING_OPEN) || - state.getState().equals(RegionState.State.OPENING))) { - state.update(RegionState.State.PENDING_OPEN); - allowZNodeCreation = false; - } else { - state.update(RegionState.State.OFFLINE); - allowZNodeCreation = true; + new IllegalStateException()); + return false; } - int versionOfOfflineNode = -1; + state.update(RegionState.State.OFFLINE); try { - // get the version after setting the znode to OFFLINE - versionOfOfflineNode = ZKAssign.createOrForceNodeOffline(master.getZooKeeper(), - state.getRegion(), this.master.getServerName(), - hijack, allowZNodeCreation); - if (versionOfOfflineNode == -1) { - LOG.warn("Attempted to create/force node into OFFLINE state before " - + "completing assignment but failed to do so for " + state); - return -1; + if(!ZKAssign.createOrForceNodeOffline(master.getZooKeeper(), + state.getRegion(), this.master.getServerName())) { + LOG.warn("Attempted to create/force node into OFFLINE state before " + + "completing assignment but failed to do so for " + state); + return false; } } catch (KeeperException e) { master.abort("Unexpected ZK exception creating/setting node OFFLINE", e); - return -1; + return false; } - return versionOfOfflineNode; + return true; } /** @@ -2156,12 +2047,10 @@ public class AssignmentManager extends ZooKeeperListener { watcher.assignmentZNode); } for (String tableName : enablingTables) { - // Recover by calling EnableTableHandler + // Recover by calling DisableTableHandler LOG.info("The table " + tableName + " is in ENABLING state. Hence recovering by moving the table" + " to ENABLED state."); - // enableTable in sync way during master startup, - // no need to invoke coprocessor new EnableTableHandler(this.master, tableName.getBytes(), catalogTracker, this, true).process(); } @@ -2388,119 +2277,134 @@ public class AssignmentManager extends ZooKeeperListener { protected void chore() { // If bulkAssign in progress, suspend checks if (this.bulkAssign) return; + List unassigns = new ArrayList(); + Map assigns = + new HashMap(); synchronized (regionsInTransition) { // Iterate all regions in transition checking for time outs long now = System.currentTimeMillis(); for (RegionState regionState : regionsInTransition.values()) { if (regionState.getStamp() + timeout <= now) { - //decide on action upon timeout - actOnTimeOut(regionState); - } - } - } - } - - private void actOnTimeOut(RegionState regionState) { - HRegionInfo regionInfo = regionState.getRegion(); - LOG.info("Regions in transition timed out: " + regionState); - // Expired! Do a retry. - switch (regionState.getState()) { - case CLOSED: - LOG.info("Region " + regionInfo.getEncodedName() - + " has been CLOSED for too long, waiting on queued " - + "ClosedRegionHandler to run or server shutdown"); - // Update our timestamp. - regionState.updateTimestampToNow(); - break; - case OFFLINE: - LOG.info("Region has been OFFLINE for too long, " + "reassigning " - + regionInfo.getRegionNameAsString() + " to a random server"); - invokeAssign(regionInfo); - break; - case PENDING_OPEN: - LOG.info("Region has been PENDING_OPEN for too " - + "long, reassigning region=" + regionInfo.getRegionNameAsString()); - invokeAssign(regionInfo); - break; - case OPENING: - processOpeningState(regionInfo); - break; - case OPEN: - LOG.error("Region has been OPEN for too long, " + - "we don't know where region was opened so can't do anything"); - synchronized (regionState) { - regionState.updateTimestampToNow(); - } - break; - - case PENDING_CLOSE: - LOG.info("Region has been PENDING_CLOSE for too " - + "long, running forced unassign again on region=" - + regionInfo.getRegionNameAsString()); - try { - // If the server got the RPC, it will transition the node - // to CLOSING, so only do something here if no node exists - if (!ZKUtil.watchAndCheckExists(watcher, - ZKAssign.getNodeName(watcher, regionInfo.getEncodedName()))) { - // Queue running of an unassign -- do actual unassign - // outside of the regionsInTransition lock. - invokeUnassign(regionInfo); + HRegionInfo regionInfo = regionState.getRegion(); + LOG.info("Regions in transition timed out: " + regionState); + // Expired! Do a retry. + switch (regionState.getState()) { + case CLOSED: + LOG.info("Region " + regionInfo.getEncodedName() + + " has been CLOSED for too long, waiting on queued " + + "ClosedRegionHandler to run or server shutdown"); + // Update our timestamp. + regionState.updateTimestampToNow(); + break; + case OFFLINE: + LOG.info("Region has been OFFLINE for too long, " + + "reassigning " + regionInfo.getRegionNameAsString() + + " to a random server"); + assigns.put(regionState.getRegion(), Boolean.FALSE); + break; + case PENDING_OPEN: + LOG.info("Region has been PENDING_OPEN for too " + + "long, reassigning region=" + + regionInfo.getRegionNameAsString()); + assigns.put(regionState.getRegion(), Boolean.TRUE); + break; + case OPENING: + LOG.info("Region has been OPENING for too " + + "long, reassigning region=" + + regionInfo.getRegionNameAsString()); + // Should have a ZK node in OPENING state + try { + String node = ZKAssign.getNodeName(watcher, + regionInfo.getEncodedName()); + Stat stat = new Stat(); + RegionTransitionData data = ZKAssign.getDataNoWatch(watcher, + node, stat); + if (data == null) { + LOG.warn("Data is null, node " + node + " no longer exists"); + break; + } + if (data.getEventType() == EventType.RS_ZK_REGION_OPENED) { + LOG.debug("Region has transitioned to OPENED, allowing " + + "watched event handlers to process"); + break; + } else if (data.getEventType() != + EventType.RS_ZK_REGION_OPENING) { + LOG.warn("While timing out a region in state OPENING, " + + "found ZK node in unexpected state: " + + data.getEventType()); + break; + } + // Attempt to transition node into OFFLINE + try { + data = new RegionTransitionData( + EventType.M_ZK_REGION_OFFLINE, regionInfo.getRegionName(), + master.getServerName()); + if (ZKUtil.setData(watcher, node, data.getBytes(), + stat.getVersion())) { + // Node is now OFFLINE, let's trigger another assignment + ZKUtil.getDataAndWatch(watcher, node); // re-set the watch + LOG.info("Successfully transitioned region=" + + regionInfo.getRegionNameAsString() + " into OFFLINE" + + " and forcing a new assignment"); + assigns.put(regionState.getRegion(), Boolean.TRUE); + } + } catch (KeeperException.NoNodeException nne) { + // Node did not exist, can't time this out + } + } catch (KeeperException ke) { + LOG.error("Unexpected ZK exception timing out CLOSING region", + ke); + break; + } + break; + case OPEN: + LOG.error("Region has been OPEN for too long, " + + "we don't know where region was opened so can't do anything"); + synchronized(regionState) { + regionState.updateTimestampToNow(); + } + break; + + case PENDING_CLOSE: + LOG.info("Region has been PENDING_CLOSE for too " + + "long, running forced unassign again on region=" + + regionInfo.getRegionNameAsString()); + try { + // If the server got the RPC, it will transition the node + // to CLOSING, so only do something here if no node exists + if (!ZKUtil.watchAndCheckExists(watcher, + ZKAssign.getNodeName(watcher, regionInfo.getEncodedName()))) { + // Queue running of an unassign -- do actual unassign + // outside of the regionsInTransition lock. + unassigns.add(regionInfo); + } + } catch (NoNodeException e) { + LOG.debug("Node no longer existed so not forcing another " + + "unassignment"); + } catch (KeeperException e) { + LOG.warn("Unexpected ZK exception timing out a region " + + "close", e); + } + break; + case CLOSING: + LOG.info("Region has been CLOSING for too " + + "long, this should eventually complete or the server will " + + "expire, doing nothing"); + break; + } } - } catch (NoNodeException e) { - LOG.debug("Node no longer existed so not forcing another " - + "unassignment"); - } catch (KeeperException e) { - LOG.warn("Unexpected ZK exception timing out a region close", e); } - break; - case CLOSING: - LOG.info("Region has been CLOSING for too " + - "long, this should eventually complete or the server will " + - "expire, doing nothing"); - break; } - } - } - - private void processOpeningState(HRegionInfo regionInfo) { - LOG.info("Region has been OPENING for too " + "long, reassigning region=" - + regionInfo.getRegionNameAsString()); - // Should have a ZK node in OPENING state - try { - String node = ZKAssign.getNodeName(watcher, regionInfo.getEncodedName()); - Stat stat = new Stat(); - RegionTransitionData dataInZNode = ZKAssign.getDataNoWatch(watcher, node, - stat); - if (dataInZNode == null) { - LOG.warn("Data is null, node " + node + " no longer exists"); - return; + // Finish the work for regions in PENDING_CLOSE state + for (HRegionInfo hri: unassigns) { + unassign(hri, true); } - if (dataInZNode.getEventType() == EventType.RS_ZK_REGION_OPENED) { - LOG.debug("Region has transitioned to OPENED, allowing " - + "watched event handlers to process"); - return; - } else if (dataInZNode.getEventType() != EventType.RS_ZK_REGION_OPENING) { - LOG.warn("While timing out a region in state OPENING, " - + "found ZK node in unexpected state: " - + dataInZNode.getEventType()); - return; + for (Map.Entry e: assigns.entrySet()){ + assign(e.getKey(), false, e.getValue()); } - invokeAssign(regionInfo); - } catch (KeeperException ke) { - LOG.error("Unexpected ZK exception timing out CLOSING region", ke); - return; } - return; - } - - private void invokeAssign(HRegionInfo regionInfo) { - threadPoolExecutorService.submit(new AssignCallable(this, regionInfo)); - } - - private void invokeUnassign(HRegionInfo regionInfo) { - threadPoolExecutorService.submit(new UnAssignCallable(this, regionInfo)); } - + /** * Process shutdown server removing any assignments. * @param sn Server that went down. @@ -2791,12 +2695,4 @@ public class AssignmentManager extends ZooKeeperListener { public boolean isServerOnline(ServerName serverName) { return this.serverManager.isServerOnline(serverName); } - /** - * Shutdown the threadpool executor service - */ - public void shutdown() { - if (null != threadPoolExecutorService) { - this.threadPoolExecutorService.shutdown(); - } - } } diff --git a/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 9de5581..3f60653 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -188,7 +188,7 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server { private final ServerName serverName; private TableDescriptors tableDescriptors; - + /** * Initializes the HMaster. The steps are as follows: *

@@ -922,9 +922,7 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server { } else { dest = new ServerName(Bytes.toString(destServerName)); if (this.cpHost != null) { - if (this.cpHost.preMove(p.getFirst(), p.getSecond(), dest)) { - return; - } + this.cpHost.preMove(p.getFirst(), p.getSecond(), dest); } RegionPlan rp = new RegionPlan(p.getFirst(), p.getSecond(), dest); LOG.info("Added move plan " + rp + ", running balancer"); @@ -941,18 +939,18 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server { if (!isMasterRunning()) { throw new MasterNotRunningException(); } - - HRegionInfo [] newRegions = getHRegionInfos(hTableDescriptor, splitKeys); if (cpHost != null) { - cpHost.preCreateTable(hTableDescriptor, newRegions); + cpHost.preCreateTable(hTableDescriptor, splitKeys); } + HRegionInfo [] newRegions = getHRegionInfos(hTableDescriptor, splitKeys); this.executorService.submit(new CreateTableHandler(this, this.fileSystemManager, this.serverManager, hTableDescriptor, conf, newRegions, catalogTracker, assignmentManager)); if (cpHost != null) { - cpHost.postCreateTable(hTableDescriptor, newRegions); + // TODO, remove sync parameter from postCreateTable method + cpHost.postCreateTable(newRegions, false); } } @@ -988,7 +986,6 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server { cpHost.preDeleteTable(tableName); } this.executorService.submit(new DeleteTableHandler(tableName, this, this)); - if (cpHost != null) { cpHost.postDeleteTable(tableName); } @@ -1009,9 +1006,7 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server { public void addColumn(byte [] tableName, HColumnDescriptor column) throws IOException { if (cpHost != null) { - if (cpHost.preAddColumn(tableName, column)) { - return; - } + cpHost.preAddColumn(tableName, column); } new TableAddFamilyHandler(tableName, column, this, this).process(); if (cpHost != null) { @@ -1022,9 +1017,7 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server { public void modifyColumn(byte [] tableName, HColumnDescriptor descriptor) throws IOException { if (cpHost != null) { - if (cpHost.preModifyColumn(tableName, descriptor)) { - return; - } + cpHost.preModifyColumn(tableName, descriptor); } new TableModifyFamilyHandler(tableName, descriptor, this, this).process(); if (cpHost != null) { @@ -1035,9 +1028,7 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server { public void deleteColumn(final byte [] tableName, final byte [] c) throws IOException { if (cpHost != null) { - if (cpHost.preDeleteColumn(tableName, c)) { - return; - } + cpHost.preDeleteColumn(tableName, c); } new TableDeleteFamilyHandler(tableName, c, this, this).process(); if (cpHost != null) { @@ -1051,7 +1042,6 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server { } this.executorService.submit(new EnableTableHandler(this, tableName, catalogTracker, assignmentManager, false)); - if (cpHost != null) { cpHost.postEnableTable(tableName); } @@ -1063,7 +1053,6 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server { } this.executorService.submit(new DisableTableHandler(this, tableName, catalogTracker, assignmentManager, false)); - if (cpHost != null) { cpHost.postDisableTable(tableName); } @@ -1110,10 +1099,7 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server { if (cpHost != null) { cpHost.preModifyTable(tableName, htd); } - - this.executorService.submit(new ModifyTableHandler(tableName, htd, this, - this)); - + this.executorService.submit(new ModifyTableHandler(tableName, htd, this, this)); if (cpHost != null) { cpHost.postModifyTable(tableName, htd); } @@ -1265,7 +1251,6 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server { LOG.error("Error call master coprocessor preShutdown()", ioe); } } - this.assignmentManager.shutdown(); this.serverManager.shutdownCluster(); try { this.clusterStatusTracker.setClusterDown(); @@ -1334,17 +1319,17 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server { @Override public void assign(final byte [] regionName, final boolean force) throws IOException { - Pair pair = - MetaReader.getRegion(this.catalogTracker, regionName); - if (pair == null) throw new UnknownRegionException(Bytes.toString(regionName)); if (cpHost != null) { - if (cpHost.preAssign(pair.getFirst(), force)) { + if (cpHost.preAssign(regionName, force)) { return; } } + Pair pair = + MetaReader.getRegion(this.catalogTracker, regionName); + if (pair == null) throw new UnknownRegionException(Bytes.toString(regionName)); assignRegion(pair.getFirst()); if (cpHost != null) { - cpHost.postAssign(pair.getFirst(), force); + cpHost.postAssign(pair.getFirst()); } } @@ -1355,15 +1340,15 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server { @Override public void unassign(final byte [] regionName, final boolean force) throws IOException { - Pair pair = - MetaReader.getRegion(this.catalogTracker, regionName); - if (pair == null) throw new UnknownRegionException(Bytes.toString(regionName)); - HRegionInfo hri = pair.getFirst(); if (cpHost != null) { - if (cpHost.preUnassign(hri, force)) { + if (cpHost.preUnassign(regionName, force)) { return; } } + Pair pair = + MetaReader.getRegion(this.catalogTracker, regionName); + if (pair == null) throw new UnknownRegionException(Bytes.toString(regionName)); + HRegionInfo hri = pair.getFirst(); if (force) this.assignmentManager.clearRegionFromTransition(hri); this.assignmentManager.unassign(hri, force); if (cpHost != null) { diff --git a/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java b/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java index 3e87443..aa930f5 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java +++ b/src/main/java/org/apache/hadoop/hbase/master/MasterCoprocessorHost.java @@ -70,13 +70,13 @@ public class MasterCoprocessorHost } /* Implementation of hooks for invoking MasterObservers */ - void preCreateTable(HTableDescriptor htd, HRegionInfo[] regions) - throws IOException { + void preCreateTable(HTableDescriptor desc, byte[][] splitKeys) + throws IOException { ObserverContext ctx = null; for (MasterEnvironment env: coprocessors) { if (env.getInstance() instanceof MasterObserver) { ctx = ObserverContext.createAndPrepare(env, ctx); - ((MasterObserver)env.getInstance()).preCreateTable(ctx, htd, regions); + ((MasterObserver)env.getInstance()).preCreateTable(ctx, desc, splitKeys); if (ctx.shouldComplete()) { break; } @@ -84,13 +84,12 @@ public class MasterCoprocessorHost } } - void postCreateTable(HTableDescriptor htd, HRegionInfo[] regions) - throws IOException { + void postCreateTable(HRegionInfo[] regions, boolean sync) throws IOException { ObserverContext ctx = null; for (MasterEnvironment env: coprocessors) { if (env.getInstance() instanceof MasterObserver) { ctx = ObserverContext.createAndPrepare(env, ctx); - ((MasterObserver)env.getInstance()).postCreateTable(ctx, htd, regions); + ((MasterObserver)env.getInstance()).postCreateTable(ctx, regions, sync); if (ctx.shouldComplete()) { break; } @@ -152,21 +151,18 @@ public class MasterCoprocessorHost } } - boolean preAddColumn(byte [] tableName, HColumnDescriptor column) + void preAddColumn(byte [] tableName, HColumnDescriptor column) throws IOException { - boolean bypass = false; ObserverContext ctx = null; for (MasterEnvironment env: coprocessors) { if (env.getInstance() instanceof MasterObserver) { ctx = ObserverContext.createAndPrepare(env, ctx); ((MasterObserver)env.getInstance()).preAddColumn(ctx, tableName, column); - bypass |= ctx.shouldBypass(); if (ctx.shouldComplete()) { break; } } } - return bypass; } void postAddColumn(byte [] tableName, HColumnDescriptor column) @@ -183,22 +179,19 @@ public class MasterCoprocessorHost } } - boolean preModifyColumn(byte [] tableName, HColumnDescriptor descriptor) + void preModifyColumn(byte [] tableName, HColumnDescriptor descriptor) throws IOException { - boolean bypass = false; ObserverContext ctx = null; for (MasterEnvironment env: coprocessors) { if (env.getInstance() instanceof MasterObserver) { ctx = ObserverContext.createAndPrepare(env, ctx); ((MasterObserver)env.getInstance()).preModifyColumn( ctx, tableName, descriptor); - bypass |= ctx.shouldBypass(); if (ctx.shouldComplete()) { break; } } } - return bypass; } void postModifyColumn(byte [] tableName, HColumnDescriptor descriptor) @@ -216,21 +209,18 @@ public class MasterCoprocessorHost } } - boolean preDeleteColumn(final byte [] tableName, final byte [] c) + void preDeleteColumn(final byte [] tableName, final byte [] c) throws IOException { - boolean bypass = false; ObserverContext ctx = null; for (MasterEnvironment env: coprocessors) { if (env.getInstance() instanceof MasterObserver) { ctx = ObserverContext.createAndPrepare(env, ctx); ((MasterObserver)env.getInstance()).preDeleteColumn(ctx, tableName, c); - bypass |= ctx.shouldBypass(); if (ctx.shouldComplete()) { break; } } } - return bypass; } void postDeleteColumn(final byte [] tableName, final byte [] c) @@ -299,22 +289,19 @@ public class MasterCoprocessorHost } } - boolean preMove(final HRegionInfo region, final ServerName srcServer, final ServerName destServer) + void preMove(final HRegionInfo region, final ServerName srcServer, final ServerName destServer) throws UnknownRegionException { - boolean bypass = false; ObserverContext ctx = null; for (MasterEnvironment env: coprocessors) { if (env.getInstance() instanceof MasterObserver) { ctx = ObserverContext.createAndPrepare(env, ctx); ((MasterObserver)env.getInstance()).preMove( ctx, region, srcServer, destServer); - bypass |= ctx.shouldBypass(); if (ctx.shouldComplete()) { break; } } } - return bypass; } void postMove(final HRegionInfo region, final ServerName srcServer, final ServerName destServer) @@ -332,14 +319,14 @@ public class MasterCoprocessorHost } } - boolean preAssign(final HRegionInfo regionInfo, final boolean force) + boolean preAssign(final byte [] regionName, final boolean force) throws IOException { boolean bypass = false; ObserverContext ctx = null; for (MasterEnvironment env: coprocessors) { if (env.getInstance() instanceof MasterObserver) { ctx = ObserverContext.createAndPrepare(env, ctx); - ((MasterObserver)env.getInstance()).preAssign(ctx, regionInfo, force); + ((MasterObserver)env.getInstance()).preAssign(ctx, regionName, force); bypass |= ctx.shouldBypass(); if (ctx.shouldComplete()) { break; @@ -349,12 +336,12 @@ public class MasterCoprocessorHost return bypass; } - void postAssign(final HRegionInfo regionInfo, final boolean force) throws IOException { + void postAssign(final HRegionInfo regionInfo) throws IOException { ObserverContext ctx = null; for (MasterEnvironment env: coprocessors) { if (env.getInstance() instanceof MasterObserver) { ctx = ObserverContext.createAndPrepare(env, ctx); - ((MasterObserver)env.getInstance()).postAssign(ctx, regionInfo, force); + ((MasterObserver)env.getInstance()).postAssign(ctx, regionInfo); if (ctx.shouldComplete()) { break; } @@ -362,7 +349,7 @@ public class MasterCoprocessorHost } } - boolean preUnassign(final HRegionInfo regionInfo, final boolean force) + boolean preUnassign(final byte [] regionName, final boolean force) throws IOException { boolean bypass = false; ObserverContext ctx = null; @@ -370,7 +357,7 @@ public class MasterCoprocessorHost if (env.getInstance() instanceof MasterObserver) { ctx = ObserverContext.createAndPrepare(env, ctx); ((MasterObserver)env.getInstance()).preUnassign( - ctx, regionInfo, force); + ctx, regionName, force); bypass |= ctx.shouldBypass(); if (ctx.shouldComplete()) { break; diff --git a/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java b/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java index f994f99..57c1140 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java +++ b/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java @@ -392,11 +392,8 @@ public class ServerManager { *

* @param server server to open a region * @param region region to open - * @param versionOfOfflineNode that needs to be present in the offline node - * when RS tries to change the state from OFFLINE to other states. */ - public RegionOpeningState sendRegionOpen(final ServerName server, - HRegionInfo region, int versionOfOfflineNode) + public RegionOpeningState sendRegionOpen(final ServerName server, HRegionInfo region) throws IOException { HRegionInterface hri = getServerConnection(server); if (hri == null) { @@ -404,8 +401,7 @@ public class ServerManager { " failed because no RPC connection found to this server"); return RegionOpeningState.FAILED_OPENING; } - return (versionOfOfflineNode == -1) ? hri.openRegion(region) : hri - .openRegion(region, versionOfOfflineNode); + return hri.openRegion(region); } /** diff --git a/src/main/java/org/apache/hadoop/hbase/master/UnAssignCallable.java b/src/main/java/org/apache/hadoop/hbase/master/UnAssignCallable.java deleted file mode 100644 index f1d7797..0000000 --- a/src/main/java/org/apache/hadoop/hbase/master/UnAssignCallable.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Copyright 2011 The Apache Software Foundation - * - * 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 org.apache.hadoop.hbase.master; - -import java.util.concurrent.Callable; - -import org.apache.hadoop.hbase.HRegionInfo; - -/** - * A callable object that invokes the corresponding action that needs to be - * taken for unassignment of a region in transition. Implementing as future - * callable we are able to act on the timeout asynchronously. - */ -public class UnAssignCallable implements Callable { - private AssignmentManager assignmentManager; - - private HRegionInfo hri; - - public UnAssignCallable(AssignmentManager assignmentManager, HRegionInfo hri) { - this.assignmentManager = assignmentManager; - this.hri = hri; - } - - @Override - public Object call() throws Exception { - assignmentManager.unassign(hri); - return null; - } -} diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 876f9f0..30c9d69 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -39,7 +39,6 @@ import java.util.NavigableMap; import java.util.NavigableSet; import java.util.Random; import java.util.TreeMap; -import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.CountDownLatch; @@ -938,6 +937,10 @@ public class HRegion implements HeapSize { // , Writable{ LOG.debug("Skipping compaction on " + this + " because closed"); return false; } + if (coprocessorHost != null) { + status.setStatus("Running coprocessor preCompact hooks"); + coprocessorHost.preCompact(false); + } boolean decr = true; try { synchronized (writestate) { @@ -973,6 +976,10 @@ public class HRegion implements HeapSize { // , Writable{ } } } + if (coprocessorHost != null) { + status.setStatus("Running coprocessor post-compact hooks"); + coprocessorHost.postCompact(false); + } status.markComplete("Compaction complete"); return true; } finally { @@ -1397,7 +1404,7 @@ public class HRegion implements HeapSize { // , Writable{ try { // All edits for the given row (across all column families) must happen atomically. prepareDelete(delete); - delete(delete.getFamilyMap(), delete.getClusterId(), writeToWAL); + delete(delete.getFamilyMap(), writeToWAL); } finally { if(lockid == null) releaseRowLock(lid); } @@ -1406,13 +1413,14 @@ public class HRegion implements HeapSize { // , Writable{ } } + /** * @param familyMap map of family to edits for the given family. * @param writeToWAL * @throws IOException */ - public void delete(Map> familyMap, UUID clusterId, - boolean writeToWAL) throws IOException { + public void delete(Map> familyMap, boolean writeToWAL) + throws IOException { /* Run coprocessor pre hook outside of locks to avoid deadlock */ if (coprocessorHost != null) { if (coprocessorHost.preDelete(familyMap, writeToWAL)) { @@ -1482,7 +1490,7 @@ public class HRegion implements HeapSize { // , Writable{ WALEdit walEdit = new WALEdit(); addFamilyMapToWALEdit(familyMap, walEdit); this.log.append(regionInfo, this.htableDescriptor.getName(), - walEdit, clusterId, now, this.htableDescriptor); + walEdit, now, this.htableDescriptor); } // Now make changes to the memstore. @@ -1557,7 +1565,7 @@ public class HRegion implements HeapSize { // , Writable{ try { // All edits for the given row (across all column families) must happen atomically. // Coprocessor interception happens in put(Map,boolean) - put(put.getFamilyMap(), put.getClusterId(), writeToWAL); + put(put.getFamilyMap(), writeToWAL); } finally { if(lockid == null) releaseRowLock(lid); } @@ -1752,9 +1760,8 @@ public class HRegion implements HeapSize { // , Writable{ } // Append the edit to WAL - Put first = batchOp.operations[firstIndex].getFirst(); this.log.append(regionInfo, this.htableDescriptor.getName(), - walEdit, first.getClusterId(), now, this.htableDescriptor); + walEdit, now, this.htableDescriptor); // ------------------------------------ // STEP 4. Write back to memstore @@ -1884,18 +1891,13 @@ public class HRegion implements HeapSize { // , Writable{ } //If matches put the new put or delete the new delete if (matches) { - // All edits for the given row (across all column families) must - // happen atomically. - // - // Using default cluster id, as this can only happen in the - // originating cluster. A slave cluster receives the result as a Put - // or Delete + // All edits for the given row (across all column families) must happen atomically. if (isPut) { - put(((Put)w).getFamilyMap(), HConstants.DEFAULT_CLUSTER_ID, writeToWAL); + put(((Put)w).getFamilyMap(), writeToWAL); } else { Delete d = (Delete)w; prepareDelete(d); - delete(d.getFamilyMap(), HConstants.DEFAULT_CLUSTER_ID, writeToWAL); + delete(d.getFamilyMap(), writeToWAL); } return true; } @@ -1986,7 +1988,7 @@ public class HRegion implements HeapSize { // , Writable{ familyMap = new HashMap>(); familyMap.put(family, edits); - this.put(familyMap, HConstants.DEFAULT_CLUSTER_ID, true); + this.put(familyMap, true); } /** @@ -1996,8 +1998,8 @@ public class HRegion implements HeapSize { // , Writable{ * @param writeToWAL if true, then we should write to the log * @throws IOException */ - private void put(Map> familyMap, UUID clusterId, - boolean writeToWAL) throws IOException { + private void put(Map> familyMap, boolean writeToWAL) + throws IOException { /* run pre put hook outside of lock to avoid deadlock */ if (coprocessorHost != null) { if (coprocessorHost.prePut(familyMap, writeToWAL)) { @@ -2022,7 +2024,7 @@ public class HRegion implements HeapSize { // , Writable{ WALEdit walEdit = new WALEdit(); addFamilyMapToWALEdit(familyMap, walEdit); this.log.append(regionInfo, this.htableDescriptor.getName(), - walEdit, clusterId, now, this.htableDescriptor); + walEdit, now, this.htableDescriptor); } long addedSize = applyFamilyMapToMemstore(familyMap); @@ -3552,12 +3554,8 @@ public class HRegion implements HeapSize { // , Writable{ // Actually write to WAL now if (writeToWAL) { - // Using default cluster id, as this can only happen in the orginating - // cluster. A slave cluster receives the final value (not the delta) - // as a Put. this.log.append(regionInfo, this.htableDescriptor.getName(), - walEdits, HConstants.DEFAULT_CLUSTER_ID, now, - this.htableDescriptor); + walEdits, now, this.htableDescriptor); } size = this.addAndGetGlobalMemstoreSize(size); @@ -3614,40 +3612,36 @@ public class HRegion implements HeapSize { // , Writable{ if (!results.isEmpty()) { KeyValue kv = results.get(0); if(kv.getValueLength() == 8){ - byte [] buffer = kv.getBuffer(); - int valueOffset = kv.getValueOffset(); - result += Bytes.toLong(buffer, valueOffset, Bytes.SIZEOF_LONG); + byte [] buffer = kv.getBuffer(); + int valueOffset = kv.getValueOffset(); + result += Bytes.toLong(buffer, valueOffset, Bytes.SIZEOF_LONG); } else{ - wrongLength = true; + wrongLength = true; } } if(!wrongLength){ - // build the KeyValue now: - KeyValue newKv = new KeyValue(row, family, + // build the KeyValue now: + KeyValue newKv = new KeyValue(row, family, qualifier, EnvironmentEdgeManager.currentTimeMillis(), Bytes.toBytes(result)); - // now log it: - if (writeToWAL) { - long now = EnvironmentEdgeManager.currentTimeMillis(); - WALEdit walEdit = new WALEdit(); - walEdit.add(newKv); - // Using default cluster id, as this can only happen in the - // orginating cluster. A slave cluster receives the final value (not - // the delta) as a Put. - this.log.append(regionInfo, this.htableDescriptor.getName(), - walEdit, HConstants.DEFAULT_CLUSTER_ID, now, - this.htableDescriptor); - } - - // Now request the ICV to the store, this will set the timestamp - // appropriately depending on if there is a value in memcache or not. - // returns the change in the size of the memstore from operation - long size = store.updateColumnValue(row, family, qualifier, result); - - size = this.addAndGetGlobalMemstoreSize(size); - flush = isFlushSize(size); + // now log it: + if (writeToWAL) { + long now = EnvironmentEdgeManager.currentTimeMillis(); + WALEdit walEdit = new WALEdit(); + walEdit.add(newKv); + this.log.append(regionInfo, this.htableDescriptor.getName(), + walEdit, now, this.htableDescriptor); + } + + // Now request the ICV to the store, this will set the timestamp + // appropriately depending on if there is a value in memcache or not. + // returns the change in the size of the memstore from operation + long size = store.updateColumnValue(row, family, qualifier, result); + + size = this.addAndGetGlobalMemstoreSize(size); + flush = isFlushSize(size); } } finally { this.updatesLock.readLock().unlock(); diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index cd809ba..8ff6e62 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -119,7 +119,6 @@ import org.apache.hadoop.hbase.regionserver.handler.OpenMetaHandler; import org.apache.hadoop.hbase.regionserver.handler.OpenRegionHandler; import org.apache.hadoop.hbase.regionserver.handler.OpenRootHandler; import org.apache.hadoop.hbase.regionserver.metrics.RegionServerMetrics; -import org.apache.hadoop.hbase.regionserver.wal.FailedLogCloseException; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.WALActionsListener; import org.apache.hadoop.hbase.replication.regionserver.Replication; @@ -704,7 +703,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler, // Interrupt catalog tracker here in case any regions being opened out in // handlers are stuck waiting on meta or root. if (this.catalogTracker != null) this.catalogTracker.stop(); - if (this.fsOk) waitOnAllRegionsToClose(abortRequested); + if (this.fsOk) waitOnAllRegionsToClose(); // Make sure the proxy is down. if (this.hbaseMaster != null) { @@ -783,7 +782,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler, /** * Wait on regions close. */ - private void waitOnAllRegionsToClose(final boolean abort) { + private void waitOnAllRegionsToClose() { // Wait till all regions are closed before going out. int lastCount = -1; while (!isOnlineRegionsEmpty()) { @@ -798,16 +797,6 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler, LOG.debug(this.onlineRegions); } } - // Ensure all user regions have been sent a close. Use this to - // protect against the case where an open comes in after we start the - // iterator of onlineRegions to close all user regions. - for (Map.Entry e : this.onlineRegions.entrySet()) { - HRegionInfo hri = e.getValue().getRegionInfo(); - if (!this.regionsInTransitionInRS.contains(hri.getEncodedNameAsBytes())) { - // Don't update zk with this close transition; pass false. - closeRegion(hri, abort, false); - } - } Threads.sleep(1000); } } @@ -2336,12 +2325,6 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler, @QosPriority(priority=HIGH_QOS) public RegionOpeningState openRegion(HRegionInfo region) throws IOException { - return openRegion(region, -1); - } - @Override - @QosPriority(priority = HIGH_QOS) - public RegionOpeningState openRegion(HRegionInfo region, int versionOfOfflineNode) - throws IOException { checkOpen(); if (this.regionsInTransitionInRS.contains(region.getEncodedNameAsBytes())) { throw new RegionAlreadyInTransitionException("open", region.getEncodedName()); @@ -2356,16 +2339,12 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler, region.getRegionNameAsString()); this.regionsInTransitionInRS.add(region.getEncodedNameAsBytes()); HTableDescriptor htd = this.tableDescriptors.get(region.getTableName()); - // Need to pass the expected version in the constructor. if (region.isRootRegion()) { - this.service.submit(new OpenRootHandler(this, this, region, htd, - versionOfOfflineNode)); - } else if (region.isMetaRegion()) { - this.service.submit(new OpenMetaHandler(this, this, region, htd, - versionOfOfflineNode)); + this.service.submit(new OpenRootHandler(this, this, region, htd)); + } else if(region.isMetaRegion()) { + this.service.submit(new OpenMetaHandler(this, this, region, htd)); } else { - this.service.submit(new OpenRegionHandler(this, this, region, htd, - versionOfOfflineNode)); + this.service.submit(new OpenRegionHandler(this, this, region, htd)); } return RegionOpeningState.OPENED; } @@ -3109,9 +3088,6 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler, return c.getBlockCacheColumnFamilySummaries(this.conf); } - @Override - public byte[][] rollHLogWriter() throws IOException, FailedLogCloseException { - HLog wal = this.getWAL(); - return wal.rollWriter(true); - } + + } diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java b/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java index a6cf6a8..5796413 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.regionserver; -import com.google.common.collect.ImmutableList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -258,83 +257,32 @@ public class RegionCoprocessorHost } /** - * Called prior to selecting the {@link StoreFile}s for compaction from - * the list of currently available candidates. - * @param store The store where compaction is being requested - * @param candidates The currently available store files - * @return If {@code true}, skip the normal selection process and use the current list + * Invoked before a region is compacted. + * @param willSplit true if the compaction is about to trigger a split */ - public boolean preCompactSelection(Store store, List candidates) { - ObserverContext ctx = null; - boolean bypass = false; - for (RegionEnvironment env: coprocessors) { - if (env.getInstance() instanceof RegionObserver) { - ctx = ObserverContext.createAndPrepare(env, ctx); - ((RegionObserver)env.getInstance()).preCompactSelection( - ctx, store, candidates); - bypass |= ctx.shouldBypass(); - if (ctx.shouldComplete()) { - break; - } - } - } - return bypass; - } - - /** - * Called after the {@link StoreFile}s to be compacted have been selected - * from the available candidates. - * @param store The store where compaction is being requested - * @param selected The store files selected to compact - */ - public void postCompactSelection(Store store, - ImmutableList selected) { + public void preCompact(boolean willSplit) { ObserverContext ctx = null; for (RegionEnvironment env: coprocessors) { if (env.getInstance() instanceof RegionObserver) { ctx = ObserverContext.createAndPrepare(env, ctx); - ((RegionObserver)env.getInstance()).postCompactSelection( - ctx, store, selected); - if (ctx.shouldComplete()) { - break; - } - } - } - } - - /** - * Called prior to rewriting the store files selected for compaction - * @param store the store being compacted - * @param scanner the scanner used to read store data during compaction - */ - public InternalScanner preCompact(Store store, InternalScanner scanner) { - ObserverContext ctx = null; - boolean bypass = false; - for (RegionEnvironment env: coprocessors) { - if (env.getInstance() instanceof RegionObserver) { - ctx = ObserverContext.createAndPrepare(env, ctx); - scanner = ((RegionObserver)env.getInstance()).preCompact( - ctx, store, scanner); - bypass |= ctx.shouldBypass(); + ((RegionObserver)env.getInstance()).preCompact(ctx, willSplit); if (ctx.shouldComplete()) { break; } } } - return bypass ? null : scanner; } /** - * Called after the store compaction has completed. - * @param store the store being compacted - * @param resultFile the new store file written during compaction + * Invoked after a region is compacted. + * @param willSplit true if the compaction is about to trigger a split */ - public void postCompact(Store store, StoreFile resultFile) { + public void postCompact(boolean willSplit) { ObserverContext ctx = null; for (RegionEnvironment env: coprocessors) { if (env.getInstance() instanceof RegionObserver) { ctx = ObserverContext.createAndPrepare(env, ctx); - ((RegionObserver)env.getInstance()).postCompact(ctx, store, resultFile); + ((RegionObserver)env.getInstance()).postCompact(ctx, willSplit); if (ctx.shouldComplete()) { break; } diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java b/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java index f1b1373..655db7d 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java @@ -684,9 +684,6 @@ public class Store implements HeapSize { maxId); // Move the compaction into place. sf = completeCompaction(filesToCompact, writer); - if (region.getCoprocessorHost() != null) { - region.getCoprocessorHost().postCompact(this, sf); - } } finally { synchronized (filesCompacting) { filesCompacting.removeAll(filesToCompact); @@ -742,10 +739,7 @@ public class Store implements HeapSize { // Ready to go. Have list of files to compact. StoreFile.Writer writer = compactStore(filesToCompact, isMajor, maxId); // Move the compaction into place. - StoreFile sf = completeCompaction(filesToCompact, writer); - if (region.getCoprocessorHost() != null) { - region.getCoprocessorHost().postCompact(this, sf); - } + completeCompaction(filesToCompact, writer); } finally { synchronized (filesCompacting) { filesCompacting.removeAll(filesToCompact); @@ -906,24 +900,7 @@ public class Store implements HeapSize { Preconditions.checkArgument(idx != -1); candidates.subList(0, idx + 1).clear(); } - - boolean override = false; - if (region.getCoprocessorHost() != null) { - override = region.getCoprocessorHost().preCompactSelection( - this, candidates); - } - List filesToCompact; - if (override) { - // coprocessor is overriding normal file selection - filesToCompact = candidates; - } else { - filesToCompact = compactSelection(candidates); - } - - if (region.getCoprocessorHost() != null) { - region.getCoprocessorHost().postCompactSelection(this, - ImmutableList.copyOf(filesToCompact)); - } + List filesToCompact = compactSelection(candidates); // no files to compact if (filesToCompact.isEmpty()) { @@ -1144,17 +1121,6 @@ public class Store implements HeapSize { scan.setMaxVersions(family.getMaxVersions()); /* include deletes, unless we are doing a major compaction */ scanner = new StoreScanner(this, scan, scanners, !majorCompaction); - if (region.getCoprocessorHost() != null) { - InternalScanner cpScanner = region.getCoprocessorHost().preCompact( - this, scanner); - // NULL scanner returned from coprocessor hooks means skip normal processing - if (cpScanner == null) { - return null; - } - - scanner = cpScanner; - } - int bytesWritten = 0; // since scanner.next() can return 'false' but still be delivering data, // we have to use a do/while loop. diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java b/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java index 66e5706..55f80c1 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenMetaHandler.java @@ -33,12 +33,6 @@ public class OpenMetaHandler extends OpenRegionHandler { public OpenMetaHandler(final Server server, final RegionServerServices rsServices, HRegionInfo regionInfo, final HTableDescriptor htd) { - this(server, rsServices, regionInfo, htd, -1); - } - public OpenMetaHandler(final Server server, - final RegionServerServices rsServices, HRegionInfo regionInfo, - final HTableDescriptor htd, int versionOfOfflineNode) { - super(server, rsServices, regionInfo, htd, EventType.M_RS_OPEN_META, - versionOfOfflineNode); + super(server,rsServices, regionInfo, htd, EventType.M_RS_OPEN_META); } } \ No newline at end of file diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java b/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java index 8f96baa..66ecbca 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java @@ -52,30 +52,20 @@ public class OpenRegionHandler extends EventHandler { // the total open. We'll fail the open if someone hijacks our znode; we can // tell this has happened if version is not as expected. private volatile int version = -1; - //version of the offline node that was set by the master - private volatile int versionOfOfflineNode = -1; public OpenRegionHandler(final Server server, final RegionServerServices rsServices, HRegionInfo regionInfo, HTableDescriptor htd) { - this(server, rsServices, regionInfo, htd, EventType.M_RS_OPEN_REGION, -1); - } - public OpenRegionHandler(final Server server, - final RegionServerServices rsServices, HRegionInfo regionInfo, - HTableDescriptor htd, int versionOfOfflineNode) { - this(server, rsServices, regionInfo, htd, EventType.M_RS_OPEN_REGION, - versionOfOfflineNode); + this (server, rsServices, regionInfo, htd, EventType.M_RS_OPEN_REGION); } protected OpenRegionHandler(final Server server, final RegionServerServices rsServices, final HRegionInfo regionInfo, - final HTableDescriptor htd, EventType eventType, - final int versionOfOfflineNode) { + final HTableDescriptor htd, EventType eventType) { super(server, eventType); this.rsServices = rsServices; this.regionInfo = regionInfo; this.htd = htd; - this.versionOfOfflineNode = versionOfOfflineNode; } public HRegionInfo getRegionInfo() { @@ -96,8 +86,7 @@ public class OpenRegionHandler extends EventHandler { // If fails, just return. Someone stole the region from under us. // Calling transitionZookeeperOfflineToOpening initalizes this.version. - if (!transitionZookeeperOfflineToOpening(encodedName, - versionOfOfflineNode)) { + if (!transitionZookeeperOfflineToOpening(encodedName)) { LOG.warn("Region was hijacked? It no longer exists, encodedName=" + encodedName); return; @@ -336,18 +325,15 @@ public class OpenRegionHandler extends EventHandler { * Transition ZK node from OFFLINE to OPENING. * @param encodedName Name of the znode file (Region encodedName is the znode * name). - * @param versionOfOfflineNode - version Of OfflineNode that needs to be compared - * before changing the node's state from OFFLINE * @return True if successful transition. */ - boolean transitionZookeeperOfflineToOpening(final String encodedName, - int versionOfOfflineNode) { + boolean transitionZookeeperOfflineToOpening(final String encodedName) { // TODO: should also handle transition from CLOSED? try { // Initialize the znode version. - this.version = ZKAssign.transitionNode(server.getZooKeeper(), regionInfo, - server.getServerName(), EventType.M_ZK_REGION_OFFLINE, - EventType.RS_ZK_REGION_OPENING, versionOfOfflineNode); + this.version = + ZKAssign.transitionNodeOpening(server.getZooKeeper(), + regionInfo, server.getServerName()); } catch (KeeperException e) { LOG.error("Error transition from OFFLINE to OPENING for region=" + encodedName, e); diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRootHandler.java b/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRootHandler.java index 9a4f01a..027d077 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRootHandler.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRootHandler.java @@ -33,12 +33,6 @@ public class OpenRootHandler extends OpenRegionHandler { public OpenRootHandler(final Server server, final RegionServerServices rsServices, HRegionInfo regionInfo, final HTableDescriptor htd) { - super(server, rsServices, regionInfo, htd, EventType.M_RS_OPEN_ROOT, -1); - } - public OpenRootHandler(final Server server, - final RegionServerServices rsServices, HRegionInfo regionInfo, - final HTableDescriptor htd, int versionOfOfflineNode) { - super(server, rsServices, regionInfo, htd, EventType.M_RS_OPEN_ROOT, - versionOfOfflineNode); + super(server, rsServices, regionInfo, htd, EventType.M_RS_OPEN_ROOT); } } diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java b/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java index 72412be..8fb86ac 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java @@ -37,7 +37,6 @@ import java.util.NavigableSet; import java.util.SortedMap; import java.util.TreeMap; import java.util.TreeSet; -import java.util.UUID; import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicInteger; @@ -901,15 +900,14 @@ public class HLog implements Syncable { * @param now * @param regionName * @param tableName - * @param clusterId * @return New log key. */ - protected HLogKey makeKey(byte[] regionName, byte[] tableName, long seqnum, - long now, UUID clusterId) { - return new HLogKey(regionName, tableName, seqnum, now, clusterId); + protected HLogKey makeKey(byte[] regionName, byte[] tableName, long seqnum, long now) { + return new HLogKey(regionName, tableName, seqnum, now); } + /** Append an entry to the log. * * @param regionInfo @@ -947,22 +945,6 @@ public class HLog implements Syncable { } /** - * Only used in tests. - * - * @param info - * @param tableName - * @param edits - * @param now - * @param htd - * @throws IOException - */ - public void append(HRegionInfo info, byte [] tableName, WALEdit edits, - final long now, HTableDescriptor htd) - throws IOException { - append(info, tableName, edits, HConstants.DEFAULT_CLUSTER_ID, now, htd); - } - - /** * Append a set of edits to the log. Log edits are keyed by (encoded) * regionName, rowname, and log-sequence-id. * @@ -982,40 +964,39 @@ public class HLog implements Syncable { * @param info * @param tableName * @param edits - * @param clusterId The originating clusterId for this edit (for replication) * @param now * @throws IOException */ - public void append(HRegionInfo info, byte [] tableName, WALEdit edits, UUID clusterId, - final long now, HTableDescriptor htd) - throws IOException { - if (edits.isEmpty()) return; - if (this.closed) { - throw new IOException("Cannot append; log is closed"); - } - synchronized (this.updateLock) { - long seqNum = obtainSeqNum(); - // The 'lastSeqWritten' map holds the sequence number of the oldest - // write for each region (i.e. the first edit added to the particular - // memstore). . When the cache is flushed, the entry for the - // region being flushed is removed if the sequence number of the flush - // is greater than or equal to the value in lastSeqWritten. - // Use encoded name. Its shorter, guaranteed unique and a subset of - // actual name. - byte [] hriKey = info.getEncodedNameAsBytes(); - this.lastSeqWritten.putIfAbsent(hriKey, seqNum); - HLogKey logKey = makeKey(hriKey, tableName, seqNum, now, clusterId); - doWrite(info, logKey, edits, htd); - this.numEntries.incrementAndGet(); - } - // Sync if catalog region, and if not then check if that table supports - // deferred log flushing - if (info.isMetaRegion() || - !htd.isDeferredLogFlush()) { - // sync txn to file system - this.sync(); - } + public void append(HRegionInfo info, byte [] tableName, WALEdit edits, + final long now, HTableDescriptor htd) + throws IOException { + if (edits.isEmpty()) return; + if (this.closed) { + throw new IOException("Cannot append; log is closed"); + } + synchronized (this.updateLock) { + long seqNum = obtainSeqNum(); + // The 'lastSeqWritten' map holds the sequence number of the oldest + // write for each region (i.e. the first edit added to the particular + // memstore). . When the cache is flushed, the entry for the + // region being flushed is removed if the sequence number of the flush + // is greater than or equal to the value in lastSeqWritten. + // Use encoded name. Its shorter, guaranteed unique and a subset of + // actual name. + byte [] hriKey = info.getEncodedNameAsBytes(); + this.lastSeqWritten.putIfAbsent(hriKey, seqNum); + HLogKey logKey = makeKey(hriKey, tableName, seqNum, now); + doWrite(info, logKey, edits, htd); + this.numEntries.incrementAndGet(); + } + // Sync if catalog region, and if not then check if that table supports + // deferred log flushing + if (info.isMetaRegion() || + !htd.isDeferredLogFlush()) { + // sync txn to file system + this.sync(); } + } /** * This thread is responsible to call syncFs and buffer up the writers while @@ -1314,7 +1295,7 @@ public class HLog implements Syncable { long now = System.currentTimeMillis(); WALEdit edit = completeCacheFlushLogEdit(); HLogKey key = makeKey(encodedRegionName, tableName, logSeqId, - System.currentTimeMillis(), HConstants.DEFAULT_CLUSTER_ID); + System.currentTimeMillis()); this.writer.append(new Entry(key, edit)); writeTime += System.currentTimeMillis() - now; writeOps++; diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java b/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java index 9dba3fb..08bbff8 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java @@ -25,12 +25,10 @@ import java.io.EOFException; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.UUID; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.WritableComparable; -import org.apache.hadoop.io.WritableUtils; /** * A Key for an entry in the change log. @@ -43,9 +41,6 @@ import org.apache.hadoop.io.WritableUtils; * associated row. */ public class HLogKey implements WritableComparable { - // should be < 0 (@see #readFields(DataInput)) - private static final int VERSION = -1; - // The encoded region name. private byte [] encodedRegionName; private byte [] tablename; @@ -53,12 +48,11 @@ public class HLogKey implements WritableComparable { // Time at which this edit was written. private long writeTime; - private UUID clusterId; + private byte clusterId; /** Writable Consructor -- Do not use. */ public HLogKey() { - this(null, null, 0L, HConstants.LATEST_TIMESTAMP, - HConstants.DEFAULT_CLUSTER_ID); + this(null, null, 0L, HConstants.LATEST_TIMESTAMP); } /** @@ -71,15 +65,14 @@ public class HLogKey implements WritableComparable { * @param tablename - name of table * @param logSeqNum - log sequence number * @param now Time at which this edit was written. - * @param UUID of the cluster (used in Replication) */ public HLogKey(final byte [] encodedRegionName, final byte [] tablename, - long logSeqNum, final long now, UUID clusterId) { + long logSeqNum, final long now) { this.encodedRegionName = encodedRegionName; this.tablename = tablename; this.logSeqNum = logSeqNum; this.writeTime = now; - this.clusterId = clusterId; + this.clusterId = HConstants.DEFAULT_CLUSTER_ID; } /** @return encoded region name */ @@ -112,7 +105,7 @@ public class HLogKey implements WritableComparable { * Get the id of the original cluster * @return Cluster id. */ - public UUID getClusterId() { + public byte getClusterId() { return clusterId; } @@ -120,7 +113,7 @@ public class HLogKey implements WritableComparable { * Set the cluster id of this key * @param clusterId */ - public void setClusterId(UUID clusterId) { + public void setClusterId(byte clusterId) { this.clusterId = clusterId; } @@ -161,7 +154,7 @@ public class HLogKey implements WritableComparable { int result = Bytes.hashCode(this.encodedRegionName); result ^= this.logSeqNum; result ^= this.writeTime; - result ^= this.clusterId.hashCode(); + result ^= this.clusterId; return result; } @@ -181,7 +174,6 @@ public class HLogKey implements WritableComparable { } } } - // why isn't cluster id accounted for? return result; } @@ -211,57 +203,23 @@ public class HLogKey implements WritableComparable { this.encodedRegionName = encodedRegionName; } - @Override public void write(DataOutput out) throws IOException { - WritableUtils.writeVInt(out, VERSION); Bytes.writeByteArray(out, this.encodedRegionName); Bytes.writeByteArray(out, this.tablename); out.writeLong(this.logSeqNum); out.writeLong(this.writeTime); - // avoid storing 16 bytes when replication is not enabled - if (this.clusterId == HConstants.DEFAULT_CLUSTER_ID) { - out.writeBoolean(false); - } else { - out.writeBoolean(true); - out.writeLong(this.clusterId.getMostSignificantBits()); - out.writeLong(this.clusterId.getLeastSignificantBits()); - } + out.writeByte(this.clusterId); } - @Override public void readFields(DataInput in) throws IOException { - int version = 0; - // HLogKey was not versioned in the beginning. - // In order to introduce it now, we make use of the fact - // that encodedRegionName was written with Bytes.writeByteArray, - // which encodes the array length as a vint which is >= 0. - // Hence if the vint is >= 0 we have an old version and the vint - // encodes the length of encodedRegionName. - // If < 0 we just read the version and the next vint is the length. - // @see Bytes#readByteArray(DataInput) - int len = WritableUtils.readVInt(in); - if (len < 0) { - // what we just read was the version - version = len; - len = WritableUtils.readVInt(in); - } - this.encodedRegionName = new byte[len]; - in.readFully(this.encodedRegionName); + this.encodedRegionName = Bytes.readByteArray(in); this.tablename = Bytes.readByteArray(in); this.logSeqNum = in.readLong(); this.writeTime = in.readLong(); - this.clusterId = HConstants.DEFAULT_CLUSTER_ID; - if (version < 0) { - if (in.readBoolean()) { - this.clusterId = new UUID(in.readLong(), in.readLong()); - } - } else { - try { - // dummy read (former byte cluster id) - in.readByte(); - } catch(EOFException e) { - // Means it's a very old key, just continue - } + try { + this.clusterId = in.readByte(); + } catch(EOFException e) { + // Means it's an old key, just continue } } } diff --git a/src/main/java/org/apache/hadoop/hbase/replication/ReplicationZookeeper.java b/src/main/java/org/apache/hadoop/hbase/replication/ReplicationZookeeper.java index 6ba24c0..b6843b9 100644 --- a/src/main/java/org/apache/hadoop/hbase/replication/ReplicationZookeeper.java +++ b/src/main/java/org/apache/hadoop/hbase/replication/ReplicationZookeeper.java @@ -93,6 +93,8 @@ public class ReplicationZookeeper { private final Configuration conf; // Is this cluster replicating at the moment? private AtomicBoolean replicating; + // Byte (stored as string here) that identifies this cluster + private String clusterId; // The key to our own cluster private String ourClusterKey; // Abortable @@ -144,8 +146,12 @@ public class ReplicationZookeeper { conf.get("zookeeper.znode.replication", "replication"); String peersZNodeName = conf.get("zookeeper.znode.replication.peers", "peers"); + String repMasterZNodeName = + conf.get("zookeeper.znode.replication.master", "master"); this.replicationStateNodeName = conf.get("zookeeper.znode.replication.state", "state"); + String clusterIdZNodeName = + conf.get("zookeeper.znode.replication.clusterId", "clusterId"); String rsZNodeName = conf.get("zookeeper.znode.replication.rs", "rs"); this.ourClusterKey = ZKUtil.getZooKeeperClusterKey(this.conf); @@ -156,6 +162,11 @@ public class ReplicationZookeeper { this.rsZNode = ZKUtil.joinZNode(replicationZNode, rsZNodeName); ZKUtil.createWithParents(this.zookeeper, this.rsZNode); + String znode = ZKUtil.joinZNode(this.replicationZNode, clusterIdZNodeName); + byte [] data = ZKUtil.getData(this.zookeeper, znode); + String idResult = Bytes.toString(data); + this.clusterId = idResult == null? + Byte.toString(HConstants.DEFAULT_CLUSTER_ID): idResult; // Set a tracker on replicationStateNodeNode this.statusTracker = new ReplicationStatusTracker(this.zookeeper, abortable); @@ -691,6 +702,15 @@ public class ReplicationZookeeper { } /** + * Get the identification of the cluster + * + * @return the id for the cluster + */ + public String getClusterId() { + return this.clusterId; + } + + /** * Get a map of all peer clusters * @return map of peer cluster keyed by id */ @@ -742,4 +762,4 @@ public class ReplicationZookeeper { } } } -} +} \ No newline at end of file diff --git a/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java b/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java index 8b78eaf..5343403 100644 --- a/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java +++ b/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java @@ -22,7 +22,6 @@ package org.apache.hadoop.hbase.replication.regionserver; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.client.Delete; @@ -107,7 +106,6 @@ public class ReplicationSink { if (kvs.get(0).isDelete()) { Delete delete = new Delete(kvs.get(0).getRow(), kvs.get(0).getTimestamp(), null); - delete.setClusterId(entry.getKey().getClusterId()); for (KeyValue kv : kvs) { if (kv.isDeleteFamily()) { delete.deleteFamily(kv.getFamily()); @@ -128,12 +126,10 @@ public class ReplicationSink { byte[] lastKey = kvs.get(0).getRow(); Put put = new Put(kvs.get(0).getRow(), kvs.get(0).getTimestamp()); - put.setClusterId(entry.getKey().getClusterId()); for (KeyValue kv : kvs) { if (!Bytes.equals(lastKey, kv.getRow())) { tableList.add(put); put = new Put(kv.getRow(), kv.getTimestamp()); - put.setClusterId(entry.getKey().getClusterId()); } put.add(kv.getFamily(), kv.getQualifier(), kv.getValue()); lastKey = kv.getRow(); diff --git a/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java b/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java index 1f3ad34..2e8de8b 100644 --- a/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java +++ b/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java @@ -30,7 +30,6 @@ import java.util.List; import java.util.NavigableMap; import java.util.Random; import java.util.Set; -import java.util.UUID; import java.util.concurrent.CountDownLatch; import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.TimeUnit; @@ -56,7 +55,6 @@ import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.replication.ReplicationZookeeper; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; -import org.apache.hadoop.hbase.zookeeper.ClusterId; import org.apache.hadoop.ipc.RemoteException; import org.apache.zookeeper.KeeperException; @@ -90,7 +88,7 @@ public class ReplicationSource extends Thread // should we replicate or not? private AtomicBoolean replicating; // id of the peer cluster this source replicates to - private String peerId; + private String peerClusterId; // The manager of all sources to which we ping back our progress private ReplicationSourceManager manager; // Should we stop everything? @@ -111,9 +109,7 @@ public class ReplicationSource extends Thread private volatile Path currentPath; private FileSystem fs; // id of this cluster - private UUID clusterId; - // id of the other cluster - private UUID peerClusterId; + private byte clusterId; // total number of edits we replicated private long totalReplicatedEdits = 0; // The znode we currently play with @@ -180,15 +176,9 @@ public class ReplicationSource extends Thread this.sleepForRetries = this.conf.getLong("replication.source.sleepforretries", 1000); this.fs = fs; + this.clusterId = Byte.valueOf(zkHelper.getClusterId()); this.metrics = new ReplicationSourceMetrics(peerClusterZnode); - try { - this.clusterId = UUID.fromString(ClusterId.readClusterIdZNode(zkHelper - .getZookeeperWatcher())); - } catch (KeeperException ke) { - throw new IOException("Could not read cluster id", ke); - } - // Finally look if this is a recovered queue this.checkIfQueueRecovered(peerClusterZnode); } @@ -198,7 +188,7 @@ public class ReplicationSource extends Thread private void checkIfQueueRecovered(String peerClusterZnode) { String[] parts = peerClusterZnode.split("-"); this.queueRecovered = parts.length != 1; - this.peerId = this.queueRecovered ? + this.peerClusterId = this.queueRecovered ? parts[0] : peerClusterZnode; this.peerClusterZnode = peerClusterZnode; this.deadRegionServers = new String[parts.length-1]; @@ -214,11 +204,11 @@ public class ReplicationSource extends Thread private void chooseSinks() throws KeeperException { this.currentPeers.clear(); List addresses = - this.zkHelper.getSlavesAddresses(peerId); + this.zkHelper.getSlavesAddresses(peerClusterId); Set setOfAddr = new HashSet(); int nbPeers = (int) (Math.ceil(addresses.size() * ratio)); LOG.info("Getting " + nbPeers + - " rs from peer cluster # " + peerId); + " rs from peer cluster # " + peerClusterId); for (int i = 0; i < nbPeers; i++) { HServerAddress address; // Make sure we get one address that we don't already have @@ -245,15 +235,6 @@ public class ReplicationSource extends Thread if (this.stopper.isStopped()) { return; } - // delay this until we are in an asynchronous thread - try { - this.peerClusterId = UUID.fromString(ClusterId - .readClusterIdZNode(zkHelper.getPeerClusters().get(peerId).getZkw())); - } catch (KeeperException ke) { - this.terminate("Could not read peer's cluster id", ke); - } - LOG.info("Replicating "+clusterId + " -> " + peerClusterId); - // If this is recovered, the queue is already full and the first log // normally has a position (unless the RS failed between 2 logs) if (this.queueRecovered) { @@ -369,7 +350,7 @@ public class ReplicationSource extends Thread LOG.debug("Attempt to close connection failed", e); } } - LOG.debug("Source exiting " + peerId); + LOG.debug("Source exiting " + peerClusterId); } /** @@ -390,27 +371,18 @@ public class ReplicationSource extends Thread this.metrics.logEditsReadRate.inc(1); seenEntries++; // Remove all KVs that should not be replicated + removeNonReplicableEdits(edit); HLogKey logKey = entry.getKey(); - // don't replicate if the log entries originated in the peer - if (!logKey.getClusterId().equals(peerClusterId)) { - removeNonReplicableEdits(edit); - // Don't replicate catalog entries, if the WALEdit wasn't - // containing anything to replicate and if we're currently not set to replicate - if (!(Bytes.equals(logKey.getTablename(), HConstants.ROOT_TABLE_NAME) || - Bytes.equals(logKey.getTablename(), HConstants.META_TABLE_NAME)) && - edit.size() != 0 && replicating.get()) { - // Only set the clusterId if is a local key. - // This ensures that the originator sets the cluster id - // and all replicas retain the initial cluster id. - // This is *only* place where a cluster id other than the default is set. - if (HConstants.DEFAULT_CLUSTER_ID == logKey.getClusterId()) { - logKey.setClusterId(this.clusterId); - } - currentNbOperations += countDistinctRowKeys(edit); - currentNbEntries++; - } else { - this.metrics.logEditsFilteredRate.inc(1); - } + // Don't replicate catalog entries, if the WALEdit wasn't + // containing anything to replicate and if we're currently not set to replicate + if (!(Bytes.equals(logKey.getTablename(), HConstants.ROOT_TABLE_NAME) || + Bytes.equals(logKey.getTablename(), HConstants.META_TABLE_NAME)) && + edit.size() != 0 && replicating.get()) { + logKey.setClusterId(this.clusterId); + currentNbOperations += countDistinctRowKeys(edit); + currentNbEntries++; + } else { + this.metrics.logEditsFilteredRate.inc(1); } // Stop if too many entries or too big if ((this.reader.getPosition() - this.position) @@ -551,12 +523,13 @@ public class ReplicationSource extends Thread protected void removeNonReplicableEdits(WALEdit edit) { NavigableMap scopes = edit.getScopes(); List kvs = edit.getKeyValues(); - for (int i = edit.size()-1; i >= 0; i--) { + for (int i = 0; i < edit.size(); i++) { KeyValue kv = kvs.get(i); // The scope will be null or empty if // there's nothing to replicate in that WALEdit if (scopes == null || !scopes.containsKey(kv.getFamily())) { kvs.remove(i); + i--; } } } @@ -733,7 +706,7 @@ public class ReplicationSource extends Thread } public String getPeerClusterId() { - return this.peerId; + return this.peerClusterId; } public Path getCurrentPath() { diff --git a/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java b/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java index 0479e31..04f6fb3 100644 --- a/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java +++ b/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.7.0) + * Autogenerated by Thrift * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -29,7 +29,7 @@ public class AlreadyExists extends Exception implements org.apache.thrift.TBase< private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1); - public String message; // required + public String message; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { diff --git a/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java b/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java index be902c9..0394582 100644 --- a/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java +++ b/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.7.0) + * Autogenerated by Thrift * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -29,8 +29,8 @@ public class BatchMutation implements org.apache.thrift.TBase mutations; // required + public ByteBuffer row; + public List mutations; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -364,7 +364,7 @@ public class BatchMutation implements org.apache.thrift.TBase(_list0.size); for (int _i1 = 0; _i1 < _list0.size; ++_i1) { - Mutation _elem2; // required + Mutation _elem2; _elem2 = new Mutation(); _elem2.read(iprot); this.mutations.add(_elem2); diff --git a/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java b/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java index 04b42fe..7d6aff2 100644 --- a/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java +++ b/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.7.0) + * Autogenerated by Thrift * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -38,15 +38,15 @@ public class ColumnDescriptor implements org.apache.thrift.TBase getTableNames() throws IOError, org.apache.thrift.TException; + public List getTableNames() throws IOError, TException; /** * List all the column families assoicated with a table. @@ -64,7 +70,7 @@ public class Hbase { * * @param tableName table name */ - public Map getColumnDescriptors(ByteBuffer tableName) throws IOError, org.apache.thrift.TException; + public Map getColumnDescriptors(ByteBuffer tableName) throws IOError, TException; /** * List the regions associated with a table. @@ -73,7 +79,7 @@ public class Hbase { * * @param tableName table name */ - public List getTableRegions(ByteBuffer tableName) throws IOError, org.apache.thrift.TException; + public List getTableRegions(ByteBuffer tableName) throws IOError, TException; /** * Create a table with the specified column families. The name @@ -89,7 +95,7 @@ public class Hbase { * * @param columnFamilies list of column family descriptors */ - public void createTable(ByteBuffer tableName, List columnFamilies) throws IOError, IllegalArgument, AlreadyExists, org.apache.thrift.TException; + public void createTable(ByteBuffer tableName, List columnFamilies) throws IOError, IllegalArgument, AlreadyExists, TException; /** * Deletes a table @@ -99,7 +105,7 @@ public class Hbase { * * @param tableName name of table to delete */ - public void deleteTable(ByteBuffer tableName) throws IOError, org.apache.thrift.TException; + public void deleteTable(ByteBuffer tableName) throws IOError, TException; /** * Get a single TCell for the specified table, row, and column at the @@ -113,7 +119,7 @@ public class Hbase { * * @param column column name */ - public List get(ByteBuffer tableName, ByteBuffer row, ByteBuffer column) throws IOError, org.apache.thrift.TException; + public List get(ByteBuffer tableName, ByteBuffer row, ByteBuffer column) throws IOError, TException; /** * Get the specified number of versions for the specified table, @@ -129,7 +135,7 @@ public class Hbase { * * @param numVersions number of versions to retrieve */ - public List getVer(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, int numVersions) throws IOError, org.apache.thrift.TException; + public List getVer(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, int numVersions) throws IOError, TException; /** * Get the specified number of versions for the specified table, @@ -148,7 +154,7 @@ public class Hbase { * * @param numVersions number of versions to retrieve */ - public List getVerTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, int numVersions) throws IOError, org.apache.thrift.TException; + public List getVerTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, int numVersions) throws IOError, TException; /** * Get all the data for the specified table and row at the latest @@ -160,7 +166,7 @@ public class Hbase { * * @param row row key */ - public List getRow(ByteBuffer tableName, ByteBuffer row) throws IOError, org.apache.thrift.TException; + public List getRow(ByteBuffer tableName, ByteBuffer row) throws IOError, TException; /** * Get the specified columns for the specified table and row at the latest @@ -174,7 +180,7 @@ public class Hbase { * * @param columns List of columns to return, null for all columns */ - public List getRowWithColumns(ByteBuffer tableName, ByteBuffer row, List columns) throws IOError, org.apache.thrift.TException; + public List getRowWithColumns(ByteBuffer tableName, ByteBuffer row, List columns) throws IOError, TException; /** * Get all the data for the specified table and row at the specified @@ -188,7 +194,7 @@ public class Hbase { * * @param timestamp timestamp */ - public List getRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp) throws IOError, org.apache.thrift.TException; + public List getRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp) throws IOError, TException; /** * Get the specified columns for the specified table and row at the specified @@ -204,7 +210,7 @@ public class Hbase { * * @param timestamp */ - public List getRowWithColumnsTs(ByteBuffer tableName, ByteBuffer row, List columns, long timestamp) throws IOError, org.apache.thrift.TException; + public List getRowWithColumnsTs(ByteBuffer tableName, ByteBuffer row, List columns, long timestamp) throws IOError, TException; /** * Get all the data for the specified table and rows at the latest @@ -216,7 +222,7 @@ public class Hbase { * * @param rows row keys */ - public List getRows(ByteBuffer tableName, List rows) throws IOError, org.apache.thrift.TException; + public List getRows(ByteBuffer tableName, List rows) throws IOError, TException; /** * Get the specified columns for the specified table and rows at the latest @@ -230,7 +236,7 @@ public class Hbase { * * @param columns List of columns to return, null for all columns */ - public List getRowsWithColumns(ByteBuffer tableName, List rows, List columns) throws IOError, org.apache.thrift.TException; + public List getRowsWithColumns(ByteBuffer tableName, List rows, List columns) throws IOError, TException; /** * Get all the data for the specified table and rows at the specified @@ -244,7 +250,7 @@ public class Hbase { * * @param timestamp timestamp */ - public List getRowsTs(ByteBuffer tableName, List rows, long timestamp) throws IOError, org.apache.thrift.TException; + public List getRowsTs(ByteBuffer tableName, List rows, long timestamp) throws IOError, TException; /** * Get the specified columns for the specified table and rows at the specified @@ -260,7 +266,7 @@ public class Hbase { * * @param timestamp */ - public List getRowsWithColumnsTs(ByteBuffer tableName, List rows, List columns, long timestamp) throws IOError, org.apache.thrift.TException; + public List getRowsWithColumnsTs(ByteBuffer tableName, List rows, List columns, long timestamp) throws IOError, TException; /** * Apply a series of mutations (updates/deletes) to a row in a @@ -274,7 +280,7 @@ public class Hbase { * * @param mutations list of mutation commands */ - public void mutateRow(ByteBuffer tableName, ByteBuffer row, List mutations) throws IOError, IllegalArgument, org.apache.thrift.TException; + public void mutateRow(ByteBuffer tableName, ByteBuffer row, List mutations) throws IOError, IllegalArgument, TException; /** * Apply a series of mutations (updates/deletes) to a row in a @@ -290,7 +296,7 @@ public class Hbase { * * @param timestamp timestamp */ - public void mutateRowTs(ByteBuffer tableName, ByteBuffer row, List mutations, long timestamp) throws IOError, IllegalArgument, org.apache.thrift.TException; + public void mutateRowTs(ByteBuffer tableName, ByteBuffer row, List mutations, long timestamp) throws IOError, IllegalArgument, TException; /** * Apply a series of batches (each a series of mutations on a single row) @@ -302,7 +308,7 @@ public class Hbase { * * @param rowBatches list of row batches */ - public void mutateRows(ByteBuffer tableName, List rowBatches) throws IOError, IllegalArgument, org.apache.thrift.TException; + public void mutateRows(ByteBuffer tableName, List rowBatches) throws IOError, IllegalArgument, TException; /** * Apply a series of batches (each a series of mutations on a single row) @@ -316,7 +322,7 @@ public class Hbase { * * @param timestamp timestamp */ - public void mutateRowsTs(ByteBuffer tableName, List rowBatches, long timestamp) throws IOError, IllegalArgument, org.apache.thrift.TException; + public void mutateRowsTs(ByteBuffer tableName, List rowBatches, long timestamp) throws IOError, IllegalArgument, TException; /** * Atomically increment the column value specified. Returns the next value post increment. @@ -329,7 +335,7 @@ public class Hbase { * * @param value amount to increment by */ - public long atomicIncrement(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long value) throws IOError, IllegalArgument, org.apache.thrift.TException; + public long atomicIncrement(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long value) throws IOError, IllegalArgument, TException; /** * Delete all cells that match the passed row and column. @@ -340,7 +346,7 @@ public class Hbase { * * @param column name of column whose value is to be deleted */ - public void deleteAll(ByteBuffer tableName, ByteBuffer row, ByteBuffer column) throws IOError, org.apache.thrift.TException; + public void deleteAll(ByteBuffer tableName, ByteBuffer row, ByteBuffer column) throws IOError, TException; /** * Delete all cells that match the passed row and column and whose @@ -354,7 +360,7 @@ public class Hbase { * * @param timestamp timestamp */ - public void deleteAllTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp) throws IOError, org.apache.thrift.TException; + public void deleteAllTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp) throws IOError, TException; /** * Completely delete the row's cells. @@ -363,7 +369,7 @@ public class Hbase { * * @param row key of the row to be completely deleted. */ - public void deleteAllRow(ByteBuffer tableName, ByteBuffer row) throws IOError, org.apache.thrift.TException; + public void deleteAllRow(ByteBuffer tableName, ByteBuffer row) throws IOError, TException; /** * Completely delete the row's cells marked with a timestamp @@ -375,7 +381,7 @@ public class Hbase { * * @param timestamp timestamp */ - public void deleteAllRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp) throws IOError, org.apache.thrift.TException; + public void deleteAllRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp) throws IOError, TException; /** * Get a scanner on the current table, using the Scan instance @@ -385,7 +391,7 @@ public class Hbase { * * @param scan Scan instance */ - public int scannerOpenWithScan(ByteBuffer tableName, TScan scan) throws IOError, org.apache.thrift.TException; + public int scannerOpenWithScan(ByteBuffer tableName, TScan scan) throws IOError, TException; /** * Get a scanner on the current table starting at the specified row and @@ -402,7 +408,7 @@ public class Hbase { * columns of the specified column family are returned. It's also possible * to pass a regex in the column qualifier. */ - public int scannerOpen(ByteBuffer tableName, ByteBuffer startRow, List columns) throws IOError, org.apache.thrift.TException; + public int scannerOpen(ByteBuffer tableName, ByteBuffer startRow, List columns) throws IOError, TException; /** * Get a scanner on the current table starting and stopping at the @@ -423,7 +429,7 @@ public class Hbase { * columns of the specified column family are returned. It's also possible * to pass a regex in the column qualifier. */ - public int scannerOpenWithStop(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns) throws IOError, org.apache.thrift.TException; + public int scannerOpenWithStop(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns) throws IOError, TException; /** * Open a scanner for a given prefix. That is all rows will have the specified @@ -437,7 +443,7 @@ public class Hbase { * * @param columns the columns you want returned */ - public int scannerOpenWithPrefix(ByteBuffer tableName, ByteBuffer startAndPrefix, List columns) throws IOError, org.apache.thrift.TException; + public int scannerOpenWithPrefix(ByteBuffer tableName, ByteBuffer startAndPrefix, List columns) throws IOError, TException; /** * Get a scanner on the current table starting at the specified row and @@ -457,7 +463,7 @@ public class Hbase { * * @param timestamp timestamp */ - public int scannerOpenTs(ByteBuffer tableName, ByteBuffer startRow, List columns, long timestamp) throws IOError, org.apache.thrift.TException; + public int scannerOpenTs(ByteBuffer tableName, ByteBuffer startRow, List columns, long timestamp) throws IOError, TException; /** * Get a scanner on the current table starting and stopping at the @@ -481,7 +487,7 @@ public class Hbase { * * @param timestamp timestamp */ - public int scannerOpenWithStopTs(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, long timestamp) throws IOError, org.apache.thrift.TException; + public int scannerOpenWithStopTs(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, long timestamp) throws IOError, TException; /** * Returns the scanner's current row value and advances to the next @@ -497,7 +503,7 @@ public class Hbase { * * @param id id of a scanner returned by scannerOpen */ - public List scannerGet(int id) throws IOError, IllegalArgument, org.apache.thrift.TException; + public List scannerGet(int id) throws IOError, IllegalArgument, TException; /** * Returns, starting at the scanner's current row value nbRows worth of @@ -515,7 +521,7 @@ public class Hbase { * * @param nbRows number of results to return */ - public List scannerGetList(int id, int nbRows) throws IOError, IllegalArgument, org.apache.thrift.TException; + public List scannerGetList(int id, int nbRows) throws IOError, IllegalArgument, TException; /** * Closes the server-state associated with an open scanner. @@ -524,325 +530,459 @@ public class Hbase { * * @param id id of a scanner returned by scannerOpen */ - public void scannerClose(int id) throws IOError, IllegalArgument, org.apache.thrift.TException; + public void scannerClose(int id) throws IOError, IllegalArgument, TException; } public interface AsyncIface { - public void enableTable(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void enableTable(ByteBuffer tableName, AsyncMethodCallback resultHandler) throws TException; - public void disableTable(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void disableTable(ByteBuffer tableName, AsyncMethodCallback resultHandler) throws TException; - public void isTableEnabled(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void isTableEnabled(ByteBuffer tableName, AsyncMethodCallback resultHandler) throws TException; - public void compact(ByteBuffer tableNameOrRegionName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void compact(ByteBuffer tableNameOrRegionName, AsyncMethodCallback resultHandler) throws TException; - public void majorCompact(ByteBuffer tableNameOrRegionName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void majorCompact(ByteBuffer tableNameOrRegionName, AsyncMethodCallback resultHandler) throws TException; - public void getTableNames(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getTableNames(AsyncMethodCallback resultHandler) throws TException; - public void getColumnDescriptors(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getColumnDescriptors(ByteBuffer tableName, AsyncMethodCallback resultHandler) throws TException; - public void getTableRegions(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getTableRegions(ByteBuffer tableName, AsyncMethodCallback resultHandler) throws TException; - public void createTable(ByteBuffer tableName, List columnFamilies, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void createTable(ByteBuffer tableName, List columnFamilies, AsyncMethodCallback resultHandler) throws TException; - public void deleteTable(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteTable(ByteBuffer tableName, AsyncMethodCallback resultHandler) throws TException; - public void get(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void get(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, AsyncMethodCallback resultHandler) throws TException; - public void getVer(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, int numVersions, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getVer(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, int numVersions, AsyncMethodCallback resultHandler) throws TException; - public void getVerTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, int numVersions, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getVerTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, int numVersions, AsyncMethodCallback resultHandler) throws TException; - public void getRow(ByteBuffer tableName, ByteBuffer row, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getRow(ByteBuffer tableName, ByteBuffer row, AsyncMethodCallback resultHandler) throws TException; - public void getRowWithColumns(ByteBuffer tableName, ByteBuffer row, List columns, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getRowWithColumns(ByteBuffer tableName, ByteBuffer row, List columns, AsyncMethodCallback resultHandler) throws TException; - public void getRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp, AsyncMethodCallback resultHandler) throws TException; - public void getRowWithColumnsTs(ByteBuffer tableName, ByteBuffer row, List columns, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getRowWithColumnsTs(ByteBuffer tableName, ByteBuffer row, List columns, long timestamp, AsyncMethodCallback resultHandler) throws TException; - public void getRows(ByteBuffer tableName, List rows, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getRows(ByteBuffer tableName, List rows, AsyncMethodCallback resultHandler) throws TException; - public void getRowsWithColumns(ByteBuffer tableName, List rows, List columns, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getRowsWithColumns(ByteBuffer tableName, List rows, List columns, AsyncMethodCallback resultHandler) throws TException; - public void getRowsTs(ByteBuffer tableName, List rows, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getRowsTs(ByteBuffer tableName, List rows, long timestamp, AsyncMethodCallback resultHandler) throws TException; - public void getRowsWithColumnsTs(ByteBuffer tableName, List rows, List columns, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void getRowsWithColumnsTs(ByteBuffer tableName, List rows, List columns, long timestamp, AsyncMethodCallback resultHandler) throws TException; - public void mutateRow(ByteBuffer tableName, ByteBuffer row, List mutations, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void mutateRow(ByteBuffer tableName, ByteBuffer row, List mutations, AsyncMethodCallback resultHandler) throws TException; - public void mutateRowTs(ByteBuffer tableName, ByteBuffer row, List mutations, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void mutateRowTs(ByteBuffer tableName, ByteBuffer row, List mutations, long timestamp, AsyncMethodCallback resultHandler) throws TException; - public void mutateRows(ByteBuffer tableName, List rowBatches, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void mutateRows(ByteBuffer tableName, List rowBatches, AsyncMethodCallback resultHandler) throws TException; - public void mutateRowsTs(ByteBuffer tableName, List rowBatches, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void mutateRowsTs(ByteBuffer tableName, List rowBatches, long timestamp, AsyncMethodCallback resultHandler) throws TException; - public void atomicIncrement(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long value, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void atomicIncrement(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long value, AsyncMethodCallback resultHandler) throws TException; - public void deleteAll(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteAll(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, AsyncMethodCallback resultHandler) throws TException; - public void deleteAllTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteAllTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, AsyncMethodCallback resultHandler) throws TException; - public void deleteAllRow(ByteBuffer tableName, ByteBuffer row, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteAllRow(ByteBuffer tableName, ByteBuffer row, AsyncMethodCallback resultHandler) throws TException; - public void deleteAllRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void deleteAllRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp, AsyncMethodCallback resultHandler) throws TException; - public void scannerOpenWithScan(ByteBuffer tableName, TScan scan, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void scannerOpenWithScan(ByteBuffer tableName, TScan scan, AsyncMethodCallback resultHandler) throws TException; - public void scannerOpen(ByteBuffer tableName, ByteBuffer startRow, List columns, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void scannerOpen(ByteBuffer tableName, ByteBuffer startRow, List columns, AsyncMethodCallback resultHandler) throws TException; - public void scannerOpenWithStop(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void scannerOpenWithStop(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, AsyncMethodCallback resultHandler) throws TException; - public void scannerOpenWithPrefix(ByteBuffer tableName, ByteBuffer startAndPrefix, List columns, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void scannerOpenWithPrefix(ByteBuffer tableName, ByteBuffer startAndPrefix, List columns, AsyncMethodCallback resultHandler) throws TException; - public void scannerOpenTs(ByteBuffer tableName, ByteBuffer startRow, List columns, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void scannerOpenTs(ByteBuffer tableName, ByteBuffer startRow, List columns, long timestamp, AsyncMethodCallback resultHandler) throws TException; - public void scannerOpenWithStopTs(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void scannerOpenWithStopTs(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, long timestamp, AsyncMethodCallback resultHandler) throws TException; - public void scannerGet(int id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void scannerGet(int id, AsyncMethodCallback resultHandler) throws TException; - public void scannerGetList(int id, int nbRows, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void scannerGetList(int id, int nbRows, AsyncMethodCallback resultHandler) throws TException; - public void scannerClose(int id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void scannerClose(int id, AsyncMethodCallback resultHandler) throws TException; } - public static class Client extends org.apache.thrift.TServiceClient implements Iface { - public static class Factory implements org.apache.thrift.TServiceClientFactory { + public static class Client implements TServiceClient, Iface { + public static class Factory implements TServiceClientFactory { public Factory() {} - public Client getClient(org.apache.thrift.protocol.TProtocol prot) { + public Client getClient(TProtocol prot) { return new Client(prot); } - public Client getClient(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) { + public Client getClient(TProtocol iprot, TProtocol oprot) { return new Client(iprot, oprot); } } - public Client(org.apache.thrift.protocol.TProtocol prot) + public Client(TProtocol prot) + { + this(prot, prot); + } + + public Client(TProtocol iprot, TProtocol oprot) + { + iprot_ = iprot; + oprot_ = oprot; + } + + protected TProtocol iprot_; + protected TProtocol oprot_; + + protected int seqid_; + + public TProtocol getInputProtocol() { - super(prot, prot); + return this.iprot_; } - public Client(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TProtocol oprot) { - super(iprot, oprot); + public TProtocol getOutputProtocol() + { + return this.oprot_; } - public void enableTable(ByteBuffer tableName) throws IOError, org.apache.thrift.TException + public void enableTable(ByteBuffer tableName) throws IOError, TException { send_enableTable(tableName); recv_enableTable(); } - public void send_enableTable(ByteBuffer tableName) throws org.apache.thrift.TException + public void send_enableTable(ByteBuffer tableName) throws TException { + oprot_.writeMessageBegin(new TMessage("enableTable", TMessageType.CALL, ++seqid_)); enableTable_args args = new enableTable_args(); args.setTableName(tableName); - sendBase("enableTable", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public void recv_enableTable() throws IOError, org.apache.thrift.TException + public void recv_enableTable() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "enableTable failed: out of sequence response"); + } enableTable_result result = new enableTable_result(); - receiveBase(result, "enableTable"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.io != null) { throw result.io; } return; } - public void disableTable(ByteBuffer tableName) throws IOError, org.apache.thrift.TException + public void disableTable(ByteBuffer tableName) throws IOError, TException { send_disableTable(tableName); recv_disableTable(); } - public void send_disableTable(ByteBuffer tableName) throws org.apache.thrift.TException + public void send_disableTable(ByteBuffer tableName) throws TException { + oprot_.writeMessageBegin(new TMessage("disableTable", TMessageType.CALL, ++seqid_)); disableTable_args args = new disableTable_args(); args.setTableName(tableName); - sendBase("disableTable", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public void recv_disableTable() throws IOError, org.apache.thrift.TException + public void recv_disableTable() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "disableTable failed: out of sequence response"); + } disableTable_result result = new disableTable_result(); - receiveBase(result, "disableTable"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.io != null) { throw result.io; } return; } - public boolean isTableEnabled(ByteBuffer tableName) throws IOError, org.apache.thrift.TException + public boolean isTableEnabled(ByteBuffer tableName) throws IOError, TException { send_isTableEnabled(tableName); return recv_isTableEnabled(); } - public void send_isTableEnabled(ByteBuffer tableName) throws org.apache.thrift.TException + public void send_isTableEnabled(ByteBuffer tableName) throws TException { + oprot_.writeMessageBegin(new TMessage("isTableEnabled", TMessageType.CALL, ++seqid_)); isTableEnabled_args args = new isTableEnabled_args(); args.setTableName(tableName); - sendBase("isTableEnabled", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public boolean recv_isTableEnabled() throws IOError, org.apache.thrift.TException + public boolean recv_isTableEnabled() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "isTableEnabled failed: out of sequence response"); + } isTableEnabled_result result = new isTableEnabled_result(); - receiveBase(result, "isTableEnabled"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "isTableEnabled failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "isTableEnabled failed: unknown result"); } - public void compact(ByteBuffer tableNameOrRegionName) throws IOError, org.apache.thrift.TException + public void compact(ByteBuffer tableNameOrRegionName) throws IOError, TException { send_compact(tableNameOrRegionName); recv_compact(); } - public void send_compact(ByteBuffer tableNameOrRegionName) throws org.apache.thrift.TException + public void send_compact(ByteBuffer tableNameOrRegionName) throws TException { + oprot_.writeMessageBegin(new TMessage("compact", TMessageType.CALL, ++seqid_)); compact_args args = new compact_args(); args.setTableNameOrRegionName(tableNameOrRegionName); - sendBase("compact", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public void recv_compact() throws IOError, org.apache.thrift.TException + public void recv_compact() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "compact failed: out of sequence response"); + } compact_result result = new compact_result(); - receiveBase(result, "compact"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.io != null) { throw result.io; } return; } - public void majorCompact(ByteBuffer tableNameOrRegionName) throws IOError, org.apache.thrift.TException + public void majorCompact(ByteBuffer tableNameOrRegionName) throws IOError, TException { send_majorCompact(tableNameOrRegionName); recv_majorCompact(); } - public void send_majorCompact(ByteBuffer tableNameOrRegionName) throws org.apache.thrift.TException + public void send_majorCompact(ByteBuffer tableNameOrRegionName) throws TException { + oprot_.writeMessageBegin(new TMessage("majorCompact", TMessageType.CALL, ++seqid_)); majorCompact_args args = new majorCompact_args(); args.setTableNameOrRegionName(tableNameOrRegionName); - sendBase("majorCompact", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public void recv_majorCompact() throws IOError, org.apache.thrift.TException + public void recv_majorCompact() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "majorCompact failed: out of sequence response"); + } majorCompact_result result = new majorCompact_result(); - receiveBase(result, "majorCompact"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.io != null) { throw result.io; } return; } - public List getTableNames() throws IOError, org.apache.thrift.TException + public List getTableNames() throws IOError, TException { send_getTableNames(); return recv_getTableNames(); } - public void send_getTableNames() throws org.apache.thrift.TException + public void send_getTableNames() throws TException { + oprot_.writeMessageBegin(new TMessage("getTableNames", TMessageType.CALL, ++seqid_)); getTableNames_args args = new getTableNames_args(); - sendBase("getTableNames", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public List recv_getTableNames() throws IOError, org.apache.thrift.TException + public List recv_getTableNames() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "getTableNames failed: out of sequence response"); + } getTableNames_result result = new getTableNames_result(); - receiveBase(result, "getTableNames"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getTableNames failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "getTableNames failed: unknown result"); } - public Map getColumnDescriptors(ByteBuffer tableName) throws IOError, org.apache.thrift.TException + public Map getColumnDescriptors(ByteBuffer tableName) throws IOError, TException { send_getColumnDescriptors(tableName); return recv_getColumnDescriptors(); } - public void send_getColumnDescriptors(ByteBuffer tableName) throws org.apache.thrift.TException + public void send_getColumnDescriptors(ByteBuffer tableName) throws TException { + oprot_.writeMessageBegin(new TMessage("getColumnDescriptors", TMessageType.CALL, ++seqid_)); getColumnDescriptors_args args = new getColumnDescriptors_args(); args.setTableName(tableName); - sendBase("getColumnDescriptors", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public Map recv_getColumnDescriptors() throws IOError, org.apache.thrift.TException + public Map recv_getColumnDescriptors() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "getColumnDescriptors failed: out of sequence response"); + } getColumnDescriptors_result result = new getColumnDescriptors_result(); - receiveBase(result, "getColumnDescriptors"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getColumnDescriptors failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "getColumnDescriptors failed: unknown result"); } - public List getTableRegions(ByteBuffer tableName) throws IOError, org.apache.thrift.TException + public List getTableRegions(ByteBuffer tableName) throws IOError, TException { send_getTableRegions(tableName); return recv_getTableRegions(); } - public void send_getTableRegions(ByteBuffer tableName) throws org.apache.thrift.TException + public void send_getTableRegions(ByteBuffer tableName) throws TException { + oprot_.writeMessageBegin(new TMessage("getTableRegions", TMessageType.CALL, ++seqid_)); getTableRegions_args args = new getTableRegions_args(); args.setTableName(tableName); - sendBase("getTableRegions", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public List recv_getTableRegions() throws IOError, org.apache.thrift.TException + public List recv_getTableRegions() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "getTableRegions failed: out of sequence response"); + } getTableRegions_result result = new getTableRegions_result(); - receiveBase(result, "getTableRegions"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getTableRegions failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "getTableRegions failed: unknown result"); } - public void createTable(ByteBuffer tableName, List columnFamilies) throws IOError, IllegalArgument, AlreadyExists, org.apache.thrift.TException + public void createTable(ByteBuffer tableName, List columnFamilies) throws IOError, IllegalArgument, AlreadyExists, TException { send_createTable(tableName, columnFamilies); recv_createTable(); } - public void send_createTable(ByteBuffer tableName, List columnFamilies) throws org.apache.thrift.TException + public void send_createTable(ByteBuffer tableName, List columnFamilies) throws TException { + oprot_.writeMessageBegin(new TMessage("createTable", TMessageType.CALL, ++seqid_)); createTable_args args = new createTable_args(); args.setTableName(tableName); args.setColumnFamilies(columnFamilies); - sendBase("createTable", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public void recv_createTable() throws IOError, IllegalArgument, AlreadyExists, org.apache.thrift.TException + public void recv_createTable() throws IOError, IllegalArgument, AlreadyExists, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "createTable failed: out of sequence response"); + } createTable_result result = new createTable_result(); - receiveBase(result, "createTable"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.io != null) { throw result.io; } @@ -855,359 +995,528 @@ public class Hbase { return; } - public void deleteTable(ByteBuffer tableName) throws IOError, org.apache.thrift.TException + public void deleteTable(ByteBuffer tableName) throws IOError, TException { send_deleteTable(tableName); recv_deleteTable(); } - public void send_deleteTable(ByteBuffer tableName) throws org.apache.thrift.TException + public void send_deleteTable(ByteBuffer tableName) throws TException { + oprot_.writeMessageBegin(new TMessage("deleteTable", TMessageType.CALL, ++seqid_)); deleteTable_args args = new deleteTable_args(); args.setTableName(tableName); - sendBase("deleteTable", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public void recv_deleteTable() throws IOError, org.apache.thrift.TException + public void recv_deleteTable() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "deleteTable failed: out of sequence response"); + } deleteTable_result result = new deleteTable_result(); - receiveBase(result, "deleteTable"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.io != null) { throw result.io; } return; } - public List get(ByteBuffer tableName, ByteBuffer row, ByteBuffer column) throws IOError, org.apache.thrift.TException + public List get(ByteBuffer tableName, ByteBuffer row, ByteBuffer column) throws IOError, TException { send_get(tableName, row, column); return recv_get(); } - public void send_get(ByteBuffer tableName, ByteBuffer row, ByteBuffer column) throws org.apache.thrift.TException + public void send_get(ByteBuffer tableName, ByteBuffer row, ByteBuffer column) throws TException { + oprot_.writeMessageBegin(new TMessage("get", TMessageType.CALL, ++seqid_)); get_args args = new get_args(); args.setTableName(tableName); args.setRow(row); args.setColumn(column); - sendBase("get", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public List recv_get() throws IOError, org.apache.thrift.TException + public List recv_get() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "get failed: out of sequence response"); + } get_result result = new get_result(); - receiveBase(result, "get"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "get failed: unknown result"); } - public List getVer(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, int numVersions) throws IOError, org.apache.thrift.TException + public List getVer(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, int numVersions) throws IOError, TException { send_getVer(tableName, row, column, numVersions); return recv_getVer(); } - public void send_getVer(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, int numVersions) throws org.apache.thrift.TException + public void send_getVer(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, int numVersions) throws TException { + oprot_.writeMessageBegin(new TMessage("getVer", TMessageType.CALL, ++seqid_)); getVer_args args = new getVer_args(); args.setTableName(tableName); args.setRow(row); args.setColumn(column); args.setNumVersions(numVersions); - sendBase("getVer", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public List recv_getVer() throws IOError, org.apache.thrift.TException + public List recv_getVer() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "getVer failed: out of sequence response"); + } getVer_result result = new getVer_result(); - receiveBase(result, "getVer"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getVer failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "getVer failed: unknown result"); } - public List getVerTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, int numVersions) throws IOError, org.apache.thrift.TException + public List getVerTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, int numVersions) throws IOError, TException { send_getVerTs(tableName, row, column, timestamp, numVersions); return recv_getVerTs(); } - public void send_getVerTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, int numVersions) throws org.apache.thrift.TException + public void send_getVerTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, int numVersions) throws TException { + oprot_.writeMessageBegin(new TMessage("getVerTs", TMessageType.CALL, ++seqid_)); getVerTs_args args = new getVerTs_args(); args.setTableName(tableName); args.setRow(row); args.setColumn(column); args.setTimestamp(timestamp); args.setNumVersions(numVersions); - sendBase("getVerTs", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public List recv_getVerTs() throws IOError, org.apache.thrift.TException + public List recv_getVerTs() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "getVerTs failed: out of sequence response"); + } getVerTs_result result = new getVerTs_result(); - receiveBase(result, "getVerTs"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getVerTs failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "getVerTs failed: unknown result"); } - public List getRow(ByteBuffer tableName, ByteBuffer row) throws IOError, org.apache.thrift.TException + public List getRow(ByteBuffer tableName, ByteBuffer row) throws IOError, TException { send_getRow(tableName, row); return recv_getRow(); } - public void send_getRow(ByteBuffer tableName, ByteBuffer row) throws org.apache.thrift.TException + public void send_getRow(ByteBuffer tableName, ByteBuffer row) throws TException { + oprot_.writeMessageBegin(new TMessage("getRow", TMessageType.CALL, ++seqid_)); getRow_args args = new getRow_args(); args.setTableName(tableName); args.setRow(row); - sendBase("getRow", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public List recv_getRow() throws IOError, org.apache.thrift.TException + public List recv_getRow() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "getRow failed: out of sequence response"); + } getRow_result result = new getRow_result(); - receiveBase(result, "getRow"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getRow failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "getRow failed: unknown result"); } - public List getRowWithColumns(ByteBuffer tableName, ByteBuffer row, List columns) throws IOError, org.apache.thrift.TException + public List getRowWithColumns(ByteBuffer tableName, ByteBuffer row, List columns) throws IOError, TException { send_getRowWithColumns(tableName, row, columns); return recv_getRowWithColumns(); } - public void send_getRowWithColumns(ByteBuffer tableName, ByteBuffer row, List columns) throws org.apache.thrift.TException + public void send_getRowWithColumns(ByteBuffer tableName, ByteBuffer row, List columns) throws TException { + oprot_.writeMessageBegin(new TMessage("getRowWithColumns", TMessageType.CALL, ++seqid_)); getRowWithColumns_args args = new getRowWithColumns_args(); args.setTableName(tableName); args.setRow(row); args.setColumns(columns); - sendBase("getRowWithColumns", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public List recv_getRowWithColumns() throws IOError, org.apache.thrift.TException + public List recv_getRowWithColumns() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "getRowWithColumns failed: out of sequence response"); + } getRowWithColumns_result result = new getRowWithColumns_result(); - receiveBase(result, "getRowWithColumns"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getRowWithColumns failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "getRowWithColumns failed: unknown result"); } - public List getRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp) throws IOError, org.apache.thrift.TException + public List getRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp) throws IOError, TException { send_getRowTs(tableName, row, timestamp); return recv_getRowTs(); } - public void send_getRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp) throws org.apache.thrift.TException + public void send_getRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp) throws TException { + oprot_.writeMessageBegin(new TMessage("getRowTs", TMessageType.CALL, ++seqid_)); getRowTs_args args = new getRowTs_args(); args.setTableName(tableName); args.setRow(row); args.setTimestamp(timestamp); - sendBase("getRowTs", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public List recv_getRowTs() throws IOError, org.apache.thrift.TException + public List recv_getRowTs() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "getRowTs failed: out of sequence response"); + } getRowTs_result result = new getRowTs_result(); - receiveBase(result, "getRowTs"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getRowTs failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "getRowTs failed: unknown result"); } - public List getRowWithColumnsTs(ByteBuffer tableName, ByteBuffer row, List columns, long timestamp) throws IOError, org.apache.thrift.TException + public List getRowWithColumnsTs(ByteBuffer tableName, ByteBuffer row, List columns, long timestamp) throws IOError, TException { send_getRowWithColumnsTs(tableName, row, columns, timestamp); return recv_getRowWithColumnsTs(); } - public void send_getRowWithColumnsTs(ByteBuffer tableName, ByteBuffer row, List columns, long timestamp) throws org.apache.thrift.TException + public void send_getRowWithColumnsTs(ByteBuffer tableName, ByteBuffer row, List columns, long timestamp) throws TException { + oprot_.writeMessageBegin(new TMessage("getRowWithColumnsTs", TMessageType.CALL, ++seqid_)); getRowWithColumnsTs_args args = new getRowWithColumnsTs_args(); args.setTableName(tableName); args.setRow(row); args.setColumns(columns); args.setTimestamp(timestamp); - sendBase("getRowWithColumnsTs", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public List recv_getRowWithColumnsTs() throws IOError, org.apache.thrift.TException + public List recv_getRowWithColumnsTs() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "getRowWithColumnsTs failed: out of sequence response"); + } getRowWithColumnsTs_result result = new getRowWithColumnsTs_result(); - receiveBase(result, "getRowWithColumnsTs"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getRowWithColumnsTs failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "getRowWithColumnsTs failed: unknown result"); } - public List getRows(ByteBuffer tableName, List rows) throws IOError, org.apache.thrift.TException + public List getRows(ByteBuffer tableName, List rows) throws IOError, TException { send_getRows(tableName, rows); return recv_getRows(); } - public void send_getRows(ByteBuffer tableName, List rows) throws org.apache.thrift.TException + public void send_getRows(ByteBuffer tableName, List rows) throws TException { + oprot_.writeMessageBegin(new TMessage("getRows", TMessageType.CALL, ++seqid_)); getRows_args args = new getRows_args(); args.setTableName(tableName); args.setRows(rows); - sendBase("getRows", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public List recv_getRows() throws IOError, org.apache.thrift.TException + public List recv_getRows() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "getRows failed: out of sequence response"); + } getRows_result result = new getRows_result(); - receiveBase(result, "getRows"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getRows failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "getRows failed: unknown result"); } - public List getRowsWithColumns(ByteBuffer tableName, List rows, List columns) throws IOError, org.apache.thrift.TException + public List getRowsWithColumns(ByteBuffer tableName, List rows, List columns) throws IOError, TException { send_getRowsWithColumns(tableName, rows, columns); return recv_getRowsWithColumns(); } - public void send_getRowsWithColumns(ByteBuffer tableName, List rows, List columns) throws org.apache.thrift.TException + public void send_getRowsWithColumns(ByteBuffer tableName, List rows, List columns) throws TException { + oprot_.writeMessageBegin(new TMessage("getRowsWithColumns", TMessageType.CALL, ++seqid_)); getRowsWithColumns_args args = new getRowsWithColumns_args(); args.setTableName(tableName); args.setRows(rows); args.setColumns(columns); - sendBase("getRowsWithColumns", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public List recv_getRowsWithColumns() throws IOError, org.apache.thrift.TException + public List recv_getRowsWithColumns() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "getRowsWithColumns failed: out of sequence response"); + } getRowsWithColumns_result result = new getRowsWithColumns_result(); - receiveBase(result, "getRowsWithColumns"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getRowsWithColumns failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "getRowsWithColumns failed: unknown result"); } - public List getRowsTs(ByteBuffer tableName, List rows, long timestamp) throws IOError, org.apache.thrift.TException + public List getRowsTs(ByteBuffer tableName, List rows, long timestamp) throws IOError, TException { send_getRowsTs(tableName, rows, timestamp); return recv_getRowsTs(); } - public void send_getRowsTs(ByteBuffer tableName, List rows, long timestamp) throws org.apache.thrift.TException + public void send_getRowsTs(ByteBuffer tableName, List rows, long timestamp) throws TException { + oprot_.writeMessageBegin(new TMessage("getRowsTs", TMessageType.CALL, ++seqid_)); getRowsTs_args args = new getRowsTs_args(); args.setTableName(tableName); args.setRows(rows); args.setTimestamp(timestamp); - sendBase("getRowsTs", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public List recv_getRowsTs() throws IOError, org.apache.thrift.TException + public List recv_getRowsTs() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "getRowsTs failed: out of sequence response"); + } getRowsTs_result result = new getRowsTs_result(); - receiveBase(result, "getRowsTs"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getRowsTs failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "getRowsTs failed: unknown result"); } - public List getRowsWithColumnsTs(ByteBuffer tableName, List rows, List columns, long timestamp) throws IOError, org.apache.thrift.TException + public List getRowsWithColumnsTs(ByteBuffer tableName, List rows, List columns, long timestamp) throws IOError, TException { send_getRowsWithColumnsTs(tableName, rows, columns, timestamp); return recv_getRowsWithColumnsTs(); } - public void send_getRowsWithColumnsTs(ByteBuffer tableName, List rows, List columns, long timestamp) throws org.apache.thrift.TException + public void send_getRowsWithColumnsTs(ByteBuffer tableName, List rows, List columns, long timestamp) throws TException { + oprot_.writeMessageBegin(new TMessage("getRowsWithColumnsTs", TMessageType.CALL, ++seqid_)); getRowsWithColumnsTs_args args = new getRowsWithColumnsTs_args(); args.setTableName(tableName); args.setRows(rows); args.setColumns(columns); args.setTimestamp(timestamp); - sendBase("getRowsWithColumnsTs", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public List recv_getRowsWithColumnsTs() throws IOError, org.apache.thrift.TException + public List recv_getRowsWithColumnsTs() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "getRowsWithColumnsTs failed: out of sequence response"); + } getRowsWithColumnsTs_result result = new getRowsWithColumnsTs_result(); - receiveBase(result, "getRowsWithColumnsTs"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getRowsWithColumnsTs failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "getRowsWithColumnsTs failed: unknown result"); } - public void mutateRow(ByteBuffer tableName, ByteBuffer row, List mutations) throws IOError, IllegalArgument, org.apache.thrift.TException + public void mutateRow(ByteBuffer tableName, ByteBuffer row, List mutations) throws IOError, IllegalArgument, TException { send_mutateRow(tableName, row, mutations); recv_mutateRow(); } - public void send_mutateRow(ByteBuffer tableName, ByteBuffer row, List mutations) throws org.apache.thrift.TException + public void send_mutateRow(ByteBuffer tableName, ByteBuffer row, List mutations) throws TException { + oprot_.writeMessageBegin(new TMessage("mutateRow", TMessageType.CALL, ++seqid_)); mutateRow_args args = new mutateRow_args(); args.setTableName(tableName); args.setRow(row); args.setMutations(mutations); - sendBase("mutateRow", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public void recv_mutateRow() throws IOError, IllegalArgument, org.apache.thrift.TException + public void recv_mutateRow() throws IOError, IllegalArgument, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "mutateRow failed: out of sequence response"); + } mutateRow_result result = new mutateRow_result(); - receiveBase(result, "mutateRow"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.io != null) { throw result.io; } @@ -1217,26 +1526,39 @@ public class Hbase { return; } - public void mutateRowTs(ByteBuffer tableName, ByteBuffer row, List mutations, long timestamp) throws IOError, IllegalArgument, org.apache.thrift.TException + public void mutateRowTs(ByteBuffer tableName, ByteBuffer row, List mutations, long timestamp) throws IOError, IllegalArgument, TException { send_mutateRowTs(tableName, row, mutations, timestamp); recv_mutateRowTs(); } - public void send_mutateRowTs(ByteBuffer tableName, ByteBuffer row, List mutations, long timestamp) throws org.apache.thrift.TException + public void send_mutateRowTs(ByteBuffer tableName, ByteBuffer row, List mutations, long timestamp) throws TException { + oprot_.writeMessageBegin(new TMessage("mutateRowTs", TMessageType.CALL, ++seqid_)); mutateRowTs_args args = new mutateRowTs_args(); args.setTableName(tableName); args.setRow(row); args.setMutations(mutations); args.setTimestamp(timestamp); - sendBase("mutateRowTs", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public void recv_mutateRowTs() throws IOError, IllegalArgument, org.apache.thrift.TException + public void recv_mutateRowTs() throws IOError, IllegalArgument, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "mutateRowTs failed: out of sequence response"); + } mutateRowTs_result result = new mutateRowTs_result(); - receiveBase(result, "mutateRowTs"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.io != null) { throw result.io; } @@ -1246,24 +1568,37 @@ public class Hbase { return; } - public void mutateRows(ByteBuffer tableName, List rowBatches) throws IOError, IllegalArgument, org.apache.thrift.TException + public void mutateRows(ByteBuffer tableName, List rowBatches) throws IOError, IllegalArgument, TException { send_mutateRows(tableName, rowBatches); recv_mutateRows(); } - public void send_mutateRows(ByteBuffer tableName, List rowBatches) throws org.apache.thrift.TException + public void send_mutateRows(ByteBuffer tableName, List rowBatches) throws TException { + oprot_.writeMessageBegin(new TMessage("mutateRows", TMessageType.CALL, ++seqid_)); mutateRows_args args = new mutateRows_args(); args.setTableName(tableName); args.setRowBatches(rowBatches); - sendBase("mutateRows", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public void recv_mutateRows() throws IOError, IllegalArgument, org.apache.thrift.TException + public void recv_mutateRows() throws IOError, IllegalArgument, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "mutateRows failed: out of sequence response"); + } mutateRows_result result = new mutateRows_result(); - receiveBase(result, "mutateRows"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.io != null) { throw result.io; } @@ -1273,25 +1608,38 @@ public class Hbase { return; } - public void mutateRowsTs(ByteBuffer tableName, List rowBatches, long timestamp) throws IOError, IllegalArgument, org.apache.thrift.TException + public void mutateRowsTs(ByteBuffer tableName, List rowBatches, long timestamp) throws IOError, IllegalArgument, TException { send_mutateRowsTs(tableName, rowBatches, timestamp); recv_mutateRowsTs(); } - public void send_mutateRowsTs(ByteBuffer tableName, List rowBatches, long timestamp) throws org.apache.thrift.TException + public void send_mutateRowsTs(ByteBuffer tableName, List rowBatches, long timestamp) throws TException { + oprot_.writeMessageBegin(new TMessage("mutateRowsTs", TMessageType.CALL, ++seqid_)); mutateRowsTs_args args = new mutateRowsTs_args(); args.setTableName(tableName); args.setRowBatches(rowBatches); args.setTimestamp(timestamp); - sendBase("mutateRowsTs", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public void recv_mutateRowsTs() throws IOError, IllegalArgument, org.apache.thrift.TException + public void recv_mutateRowsTs() throws IOError, IllegalArgument, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "mutateRowsTs failed: out of sequence response"); + } mutateRowsTs_result result = new mutateRowsTs_result(); - receiveBase(result, "mutateRowsTs"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.io != null) { throw result.io; } @@ -1301,26 +1649,39 @@ public class Hbase { return; } - public long atomicIncrement(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long value) throws IOError, IllegalArgument, org.apache.thrift.TException + public long atomicIncrement(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long value) throws IOError, IllegalArgument, TException { send_atomicIncrement(tableName, row, column, value); return recv_atomicIncrement(); } - public void send_atomicIncrement(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long value) throws org.apache.thrift.TException + public void send_atomicIncrement(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long value) throws TException { + oprot_.writeMessageBegin(new TMessage("atomicIncrement", TMessageType.CALL, ++seqid_)); atomicIncrement_args args = new atomicIncrement_args(); args.setTableName(tableName); args.setRow(row); args.setColumn(column); args.setValue(value); - sendBase("atomicIncrement", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public long recv_atomicIncrement() throws IOError, IllegalArgument, org.apache.thrift.TException + public long recv_atomicIncrement() throws IOError, IllegalArgument, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "atomicIncrement failed: out of sequence response"); + } atomicIncrement_result result = new atomicIncrement_result(); - receiveBase(result, "atomicIncrement"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } @@ -1330,297 +1691,440 @@ public class Hbase { if (result.ia != null) { throw result.ia; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "atomicIncrement failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "atomicIncrement failed: unknown result"); } - public void deleteAll(ByteBuffer tableName, ByteBuffer row, ByteBuffer column) throws IOError, org.apache.thrift.TException + public void deleteAll(ByteBuffer tableName, ByteBuffer row, ByteBuffer column) throws IOError, TException { send_deleteAll(tableName, row, column); recv_deleteAll(); } - public void send_deleteAll(ByteBuffer tableName, ByteBuffer row, ByteBuffer column) throws org.apache.thrift.TException + public void send_deleteAll(ByteBuffer tableName, ByteBuffer row, ByteBuffer column) throws TException { + oprot_.writeMessageBegin(new TMessage("deleteAll", TMessageType.CALL, ++seqid_)); deleteAll_args args = new deleteAll_args(); args.setTableName(tableName); args.setRow(row); args.setColumn(column); - sendBase("deleteAll", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public void recv_deleteAll() throws IOError, org.apache.thrift.TException + public void recv_deleteAll() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "deleteAll failed: out of sequence response"); + } deleteAll_result result = new deleteAll_result(); - receiveBase(result, "deleteAll"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.io != null) { throw result.io; } return; } - public void deleteAllTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp) throws IOError, org.apache.thrift.TException + public void deleteAllTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp) throws IOError, TException { send_deleteAllTs(tableName, row, column, timestamp); recv_deleteAllTs(); } - public void send_deleteAllTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp) throws org.apache.thrift.TException + public void send_deleteAllTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp) throws TException { + oprot_.writeMessageBegin(new TMessage("deleteAllTs", TMessageType.CALL, ++seqid_)); deleteAllTs_args args = new deleteAllTs_args(); args.setTableName(tableName); args.setRow(row); args.setColumn(column); args.setTimestamp(timestamp); - sendBase("deleteAllTs", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public void recv_deleteAllTs() throws IOError, org.apache.thrift.TException + public void recv_deleteAllTs() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "deleteAllTs failed: out of sequence response"); + } deleteAllTs_result result = new deleteAllTs_result(); - receiveBase(result, "deleteAllTs"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.io != null) { throw result.io; } return; } - public void deleteAllRow(ByteBuffer tableName, ByteBuffer row) throws IOError, org.apache.thrift.TException + public void deleteAllRow(ByteBuffer tableName, ByteBuffer row) throws IOError, TException { send_deleteAllRow(tableName, row); recv_deleteAllRow(); } - public void send_deleteAllRow(ByteBuffer tableName, ByteBuffer row) throws org.apache.thrift.TException + public void send_deleteAllRow(ByteBuffer tableName, ByteBuffer row) throws TException { + oprot_.writeMessageBegin(new TMessage("deleteAllRow", TMessageType.CALL, ++seqid_)); deleteAllRow_args args = new deleteAllRow_args(); args.setTableName(tableName); args.setRow(row); - sendBase("deleteAllRow", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public void recv_deleteAllRow() throws IOError, org.apache.thrift.TException + public void recv_deleteAllRow() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "deleteAllRow failed: out of sequence response"); + } deleteAllRow_result result = new deleteAllRow_result(); - receiveBase(result, "deleteAllRow"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.io != null) { throw result.io; } return; } - public void deleteAllRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp) throws IOError, org.apache.thrift.TException + public void deleteAllRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp) throws IOError, TException { send_deleteAllRowTs(tableName, row, timestamp); recv_deleteAllRowTs(); } - public void send_deleteAllRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp) throws org.apache.thrift.TException + public void send_deleteAllRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp) throws TException { + oprot_.writeMessageBegin(new TMessage("deleteAllRowTs", TMessageType.CALL, ++seqid_)); deleteAllRowTs_args args = new deleteAllRowTs_args(); args.setTableName(tableName); args.setRow(row); args.setTimestamp(timestamp); - sendBase("deleteAllRowTs", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public void recv_deleteAllRowTs() throws IOError, org.apache.thrift.TException + public void recv_deleteAllRowTs() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "deleteAllRowTs failed: out of sequence response"); + } deleteAllRowTs_result result = new deleteAllRowTs_result(); - receiveBase(result, "deleteAllRowTs"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.io != null) { throw result.io; } return; } - public int scannerOpenWithScan(ByteBuffer tableName, TScan scan) throws IOError, org.apache.thrift.TException + public int scannerOpenWithScan(ByteBuffer tableName, TScan scan) throws IOError, TException { send_scannerOpenWithScan(tableName, scan); return recv_scannerOpenWithScan(); } - public void send_scannerOpenWithScan(ByteBuffer tableName, TScan scan) throws org.apache.thrift.TException + public void send_scannerOpenWithScan(ByteBuffer tableName, TScan scan) throws TException { + oprot_.writeMessageBegin(new TMessage("scannerOpenWithScan", TMessageType.CALL, ++seqid_)); scannerOpenWithScan_args args = new scannerOpenWithScan_args(); args.setTableName(tableName); args.setScan(scan); - sendBase("scannerOpenWithScan", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public int recv_scannerOpenWithScan() throws IOError, org.apache.thrift.TException + public int recv_scannerOpenWithScan() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "scannerOpenWithScan failed: out of sequence response"); + } scannerOpenWithScan_result result = new scannerOpenWithScan_result(); - receiveBase(result, "scannerOpenWithScan"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "scannerOpenWithScan failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "scannerOpenWithScan failed: unknown result"); } - public int scannerOpen(ByteBuffer tableName, ByteBuffer startRow, List columns) throws IOError, org.apache.thrift.TException + public int scannerOpen(ByteBuffer tableName, ByteBuffer startRow, List columns) throws IOError, TException { send_scannerOpen(tableName, startRow, columns); return recv_scannerOpen(); } - public void send_scannerOpen(ByteBuffer tableName, ByteBuffer startRow, List columns) throws org.apache.thrift.TException + public void send_scannerOpen(ByteBuffer tableName, ByteBuffer startRow, List columns) throws TException { + oprot_.writeMessageBegin(new TMessage("scannerOpen", TMessageType.CALL, ++seqid_)); scannerOpen_args args = new scannerOpen_args(); args.setTableName(tableName); args.setStartRow(startRow); args.setColumns(columns); - sendBase("scannerOpen", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public int recv_scannerOpen() throws IOError, org.apache.thrift.TException + public int recv_scannerOpen() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "scannerOpen failed: out of sequence response"); + } scannerOpen_result result = new scannerOpen_result(); - receiveBase(result, "scannerOpen"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "scannerOpen failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "scannerOpen failed: unknown result"); } - public int scannerOpenWithStop(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns) throws IOError, org.apache.thrift.TException + public int scannerOpenWithStop(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns) throws IOError, TException { send_scannerOpenWithStop(tableName, startRow, stopRow, columns); return recv_scannerOpenWithStop(); } - public void send_scannerOpenWithStop(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns) throws org.apache.thrift.TException + public void send_scannerOpenWithStop(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns) throws TException { + oprot_.writeMessageBegin(new TMessage("scannerOpenWithStop", TMessageType.CALL, ++seqid_)); scannerOpenWithStop_args args = new scannerOpenWithStop_args(); args.setTableName(tableName); args.setStartRow(startRow); args.setStopRow(stopRow); args.setColumns(columns); - sendBase("scannerOpenWithStop", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public int recv_scannerOpenWithStop() throws IOError, org.apache.thrift.TException + public int recv_scannerOpenWithStop() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "scannerOpenWithStop failed: out of sequence response"); + } scannerOpenWithStop_result result = new scannerOpenWithStop_result(); - receiveBase(result, "scannerOpenWithStop"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "scannerOpenWithStop failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "scannerOpenWithStop failed: unknown result"); } - public int scannerOpenWithPrefix(ByteBuffer tableName, ByteBuffer startAndPrefix, List columns) throws IOError, org.apache.thrift.TException + public int scannerOpenWithPrefix(ByteBuffer tableName, ByteBuffer startAndPrefix, List columns) throws IOError, TException { send_scannerOpenWithPrefix(tableName, startAndPrefix, columns); return recv_scannerOpenWithPrefix(); } - public void send_scannerOpenWithPrefix(ByteBuffer tableName, ByteBuffer startAndPrefix, List columns) throws org.apache.thrift.TException + public void send_scannerOpenWithPrefix(ByteBuffer tableName, ByteBuffer startAndPrefix, List columns) throws TException { + oprot_.writeMessageBegin(new TMessage("scannerOpenWithPrefix", TMessageType.CALL, ++seqid_)); scannerOpenWithPrefix_args args = new scannerOpenWithPrefix_args(); args.setTableName(tableName); args.setStartAndPrefix(startAndPrefix); args.setColumns(columns); - sendBase("scannerOpenWithPrefix", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public int recv_scannerOpenWithPrefix() throws IOError, org.apache.thrift.TException + public int recv_scannerOpenWithPrefix() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "scannerOpenWithPrefix failed: out of sequence response"); + } scannerOpenWithPrefix_result result = new scannerOpenWithPrefix_result(); - receiveBase(result, "scannerOpenWithPrefix"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "scannerOpenWithPrefix failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "scannerOpenWithPrefix failed: unknown result"); } - public int scannerOpenTs(ByteBuffer tableName, ByteBuffer startRow, List columns, long timestamp) throws IOError, org.apache.thrift.TException + public int scannerOpenTs(ByteBuffer tableName, ByteBuffer startRow, List columns, long timestamp) throws IOError, TException { send_scannerOpenTs(tableName, startRow, columns, timestamp); return recv_scannerOpenTs(); } - public void send_scannerOpenTs(ByteBuffer tableName, ByteBuffer startRow, List columns, long timestamp) throws org.apache.thrift.TException + public void send_scannerOpenTs(ByteBuffer tableName, ByteBuffer startRow, List columns, long timestamp) throws TException { + oprot_.writeMessageBegin(new TMessage("scannerOpenTs", TMessageType.CALL, ++seqid_)); scannerOpenTs_args args = new scannerOpenTs_args(); args.setTableName(tableName); args.setStartRow(startRow); args.setColumns(columns); args.setTimestamp(timestamp); - sendBase("scannerOpenTs", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public int recv_scannerOpenTs() throws IOError, org.apache.thrift.TException + public int recv_scannerOpenTs() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "scannerOpenTs failed: out of sequence response"); + } scannerOpenTs_result result = new scannerOpenTs_result(); - receiveBase(result, "scannerOpenTs"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "scannerOpenTs failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "scannerOpenTs failed: unknown result"); } - public int scannerOpenWithStopTs(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, long timestamp) throws IOError, org.apache.thrift.TException + public int scannerOpenWithStopTs(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, long timestamp) throws IOError, TException { send_scannerOpenWithStopTs(tableName, startRow, stopRow, columns, timestamp); return recv_scannerOpenWithStopTs(); } - public void send_scannerOpenWithStopTs(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, long timestamp) throws org.apache.thrift.TException + public void send_scannerOpenWithStopTs(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, long timestamp) throws TException { + oprot_.writeMessageBegin(new TMessage("scannerOpenWithStopTs", TMessageType.CALL, ++seqid_)); scannerOpenWithStopTs_args args = new scannerOpenWithStopTs_args(); args.setTableName(tableName); args.setStartRow(startRow); args.setStopRow(stopRow); args.setColumns(columns); args.setTimestamp(timestamp); - sendBase("scannerOpenWithStopTs", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public int recv_scannerOpenWithStopTs() throws IOError, org.apache.thrift.TException + public int recv_scannerOpenWithStopTs() throws IOError, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "scannerOpenWithStopTs failed: out of sequence response"); + } scannerOpenWithStopTs_result result = new scannerOpenWithStopTs_result(); - receiveBase(result, "scannerOpenWithStopTs"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } if (result.io != null) { throw result.io; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "scannerOpenWithStopTs failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "scannerOpenWithStopTs failed: unknown result"); } - public List scannerGet(int id) throws IOError, IllegalArgument, org.apache.thrift.TException + public List scannerGet(int id) throws IOError, IllegalArgument, TException { send_scannerGet(id); return recv_scannerGet(); } - public void send_scannerGet(int id) throws org.apache.thrift.TException + public void send_scannerGet(int id) throws TException { + oprot_.writeMessageBegin(new TMessage("scannerGet", TMessageType.CALL, ++seqid_)); scannerGet_args args = new scannerGet_args(); args.setId(id); - sendBase("scannerGet", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public List recv_scannerGet() throws IOError, IllegalArgument, org.apache.thrift.TException + public List recv_scannerGet() throws IOError, IllegalArgument, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "scannerGet failed: out of sequence response"); + } scannerGet_result result = new scannerGet_result(); - receiveBase(result, "scannerGet"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } @@ -1630,27 +2134,40 @@ public class Hbase { if (result.ia != null) { throw result.ia; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "scannerGet failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "scannerGet failed: unknown result"); } - public List scannerGetList(int id, int nbRows) throws IOError, IllegalArgument, org.apache.thrift.TException + public List scannerGetList(int id, int nbRows) throws IOError, IllegalArgument, TException { send_scannerGetList(id, nbRows); return recv_scannerGetList(); } - public void send_scannerGetList(int id, int nbRows) throws org.apache.thrift.TException + public void send_scannerGetList(int id, int nbRows) throws TException { + oprot_.writeMessageBegin(new TMessage("scannerGetList", TMessageType.CALL, ++seqid_)); scannerGetList_args args = new scannerGetList_args(); args.setId(id); args.setNbRows(nbRows); - sendBase("scannerGetList", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public List recv_scannerGetList() throws IOError, IllegalArgument, org.apache.thrift.TException + public List recv_scannerGetList() throws IOError, IllegalArgument, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "scannerGetList failed: out of sequence response"); + } scannerGetList_result result = new scannerGetList_result(); - receiveBase(result, "scannerGetList"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.isSetSuccess()) { return result.success; } @@ -1660,26 +2177,39 @@ public class Hbase { if (result.ia != null) { throw result.ia; } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "scannerGetList failed: unknown result"); + throw new TApplicationException(TApplicationException.MISSING_RESULT, "scannerGetList failed: unknown result"); } - public void scannerClose(int id) throws IOError, IllegalArgument, org.apache.thrift.TException + public void scannerClose(int id) throws IOError, IllegalArgument, TException { send_scannerClose(id); recv_scannerClose(); } - public void send_scannerClose(int id) throws org.apache.thrift.TException + public void send_scannerClose(int id) throws TException { + oprot_.writeMessageBegin(new TMessage("scannerClose", TMessageType.CALL, ++seqid_)); scannerClose_args args = new scannerClose_args(); args.setId(id); - sendBase("scannerClose", args); + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); } - public void recv_scannerClose() throws IOError, IllegalArgument, org.apache.thrift.TException + public void recv_scannerClose() throws IOError, IllegalArgument, TException { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + if (msg.seqid != seqid_) { + throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "scannerClose failed: out of sequence response"); + } scannerClose_result result = new scannerClose_result(); - receiveBase(result, "scannerClose"); + result.read(iprot_); + iprot_.readMessageEnd(); if (result.io != null) { throw result.io; } @@ -1690,294 +2220,285 @@ public class Hbase { } } - public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface { - public static class Factory implements org.apache.thrift.async.TAsyncClientFactory { - private org.apache.thrift.async.TAsyncClientManager clientManager; - private org.apache.thrift.protocol.TProtocolFactory protocolFactory; - public Factory(org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) { + public static class AsyncClient extends TAsyncClient implements AsyncIface { + public static class Factory implements TAsyncClientFactory { + private TAsyncClientManager clientManager; + private TProtocolFactory protocolFactory; + public Factory(TAsyncClientManager clientManager, TProtocolFactory protocolFactory) { this.clientManager = clientManager; this.protocolFactory = protocolFactory; } - public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) { + public AsyncClient getAsyncClient(TNonblockingTransport transport) { return new AsyncClient(protocolFactory, clientManager, transport); } } - public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) { + public AsyncClient(TProtocolFactory protocolFactory, TAsyncClientManager clientManager, TNonblockingTransport transport) { super(protocolFactory, clientManager, transport); } - public void enableTable(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void enableTable(ByteBuffer tableName, AsyncMethodCallback resultHandler) throws TException { checkReady(); - enableTable_call method_call = new enableTable_call(tableName, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + enableTable_call method_call = new enableTable_call(tableName, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class enableTable_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class enableTable_call extends TAsyncMethodCall { private ByteBuffer tableName; - public enableTable_call(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public enableTable_call(ByteBuffer tableName, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("enableTable", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("enableTable", TMessageType.CALL, 0)); enableTable_args args = new enableTable_args(); args.setTableName(tableName); args.write(prot); prot.writeMessageEnd(); } - public void getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_enableTable(); } } - public void disableTable(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void disableTable(ByteBuffer tableName, AsyncMethodCallback resultHandler) throws TException { checkReady(); - disableTable_call method_call = new disableTable_call(tableName, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + disableTable_call method_call = new disableTable_call(tableName, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class disableTable_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class disableTable_call extends TAsyncMethodCall { private ByteBuffer tableName; - public disableTable_call(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public disableTable_call(ByteBuffer tableName, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("disableTable", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("disableTable", TMessageType.CALL, 0)); disableTable_args args = new disableTable_args(); args.setTableName(tableName); args.write(prot); prot.writeMessageEnd(); } - public void getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_disableTable(); } } - public void isTableEnabled(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void isTableEnabled(ByteBuffer tableName, AsyncMethodCallback resultHandler) throws TException { checkReady(); - isTableEnabled_call method_call = new isTableEnabled_call(tableName, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + isTableEnabled_call method_call = new isTableEnabled_call(tableName, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class isTableEnabled_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class isTableEnabled_call extends TAsyncMethodCall { private ByteBuffer tableName; - public isTableEnabled_call(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public isTableEnabled_call(ByteBuffer tableName, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("isTableEnabled", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("isTableEnabled", TMessageType.CALL, 0)); isTableEnabled_args args = new isTableEnabled_args(); args.setTableName(tableName); args.write(prot); prot.writeMessageEnd(); } - public boolean getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public boolean getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_isTableEnabled(); } } - public void compact(ByteBuffer tableNameOrRegionName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void compact(ByteBuffer tableNameOrRegionName, AsyncMethodCallback resultHandler) throws TException { checkReady(); - compact_call method_call = new compact_call(tableNameOrRegionName, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + compact_call method_call = new compact_call(tableNameOrRegionName, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class compact_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class compact_call extends TAsyncMethodCall { private ByteBuffer tableNameOrRegionName; - public compact_call(ByteBuffer tableNameOrRegionName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public compact_call(ByteBuffer tableNameOrRegionName, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableNameOrRegionName = tableNameOrRegionName; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("compact", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("compact", TMessageType.CALL, 0)); compact_args args = new compact_args(); args.setTableNameOrRegionName(tableNameOrRegionName); args.write(prot); prot.writeMessageEnd(); } - public void getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_compact(); } } - public void majorCompact(ByteBuffer tableNameOrRegionName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void majorCompact(ByteBuffer tableNameOrRegionName, AsyncMethodCallback resultHandler) throws TException { checkReady(); - majorCompact_call method_call = new majorCompact_call(tableNameOrRegionName, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + majorCompact_call method_call = new majorCompact_call(tableNameOrRegionName, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class majorCompact_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class majorCompact_call extends TAsyncMethodCall { private ByteBuffer tableNameOrRegionName; - public majorCompact_call(ByteBuffer tableNameOrRegionName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public majorCompact_call(ByteBuffer tableNameOrRegionName, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableNameOrRegionName = tableNameOrRegionName; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("majorCompact", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("majorCompact", TMessageType.CALL, 0)); majorCompact_args args = new majorCompact_args(); args.setTableNameOrRegionName(tableNameOrRegionName); args.write(prot); prot.writeMessageEnd(); } - public void getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_majorCompact(); } } - public void getTableNames(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getTableNames(AsyncMethodCallback resultHandler) throws TException { checkReady(); - getTableNames_call method_call = new getTableNames_call(resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + getTableNames_call method_call = new getTableNames_call(resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class getTableNames_call extends org.apache.thrift.async.TAsyncMethodCall { - public getTableNames_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public static class getTableNames_call extends TAsyncMethodCall { + public getTableNames_call(AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getTableNames", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("getTableNames", TMessageType.CALL, 0)); getTableNames_args args = new getTableNames_args(); args.write(prot); prot.writeMessageEnd(); } - public List getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public List getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getTableNames(); } } - public void getColumnDescriptors(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getColumnDescriptors(ByteBuffer tableName, AsyncMethodCallback resultHandler) throws TException { checkReady(); - getColumnDescriptors_call method_call = new getColumnDescriptors_call(tableName, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + getColumnDescriptors_call method_call = new getColumnDescriptors_call(tableName, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class getColumnDescriptors_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class getColumnDescriptors_call extends TAsyncMethodCall { private ByteBuffer tableName; - public getColumnDescriptors_call(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public getColumnDescriptors_call(ByteBuffer tableName, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getColumnDescriptors", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("getColumnDescriptors", TMessageType.CALL, 0)); getColumnDescriptors_args args = new getColumnDescriptors_args(); args.setTableName(tableName); args.write(prot); prot.writeMessageEnd(); } - public Map getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public Map getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getColumnDescriptors(); } } - public void getTableRegions(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getTableRegions(ByteBuffer tableName, AsyncMethodCallback resultHandler) throws TException { checkReady(); - getTableRegions_call method_call = new getTableRegions_call(tableName, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + getTableRegions_call method_call = new getTableRegions_call(tableName, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class getTableRegions_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class getTableRegions_call extends TAsyncMethodCall { private ByteBuffer tableName; - public getTableRegions_call(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public getTableRegions_call(ByteBuffer tableName, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getTableRegions", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("getTableRegions", TMessageType.CALL, 0)); getTableRegions_args args = new getTableRegions_args(); args.setTableName(tableName); args.write(prot); prot.writeMessageEnd(); } - public List getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public List getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getTableRegions(); } } - public void createTable(ByteBuffer tableName, List columnFamilies, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void createTable(ByteBuffer tableName, List columnFamilies, AsyncMethodCallback resultHandler) throws TException { checkReady(); - createTable_call method_call = new createTable_call(tableName, columnFamilies, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + createTable_call method_call = new createTable_call(tableName, columnFamilies, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class createTable_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class createTable_call extends TAsyncMethodCall { private ByteBuffer tableName; private List columnFamilies; - public createTable_call(ByteBuffer tableName, List columnFamilies, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public createTable_call(ByteBuffer tableName, List columnFamilies, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.columnFamilies = columnFamilies; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("createTable", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("createTable", TMessageType.CALL, 0)); createTable_args args = new createTable_args(); args.setTableName(tableName); args.setColumnFamilies(columnFamilies); @@ -1985,68 +2506,66 @@ public class Hbase { prot.writeMessageEnd(); } - public void getResult() throws IOError, IllegalArgument, AlreadyExists, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws IOError, IllegalArgument, AlreadyExists, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_createTable(); } } - public void deleteTable(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deleteTable(ByteBuffer tableName, AsyncMethodCallback resultHandler) throws TException { checkReady(); - deleteTable_call method_call = new deleteTable_call(tableName, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + deleteTable_call method_call = new deleteTable_call(tableName, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class deleteTable_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class deleteTable_call extends TAsyncMethodCall { private ByteBuffer tableName; - public deleteTable_call(ByteBuffer tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public deleteTable_call(ByteBuffer tableName, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteTable", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("deleteTable", TMessageType.CALL, 0)); deleteTable_args args = new deleteTable_args(); args.setTableName(tableName); args.write(prot); prot.writeMessageEnd(); } - public void getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_deleteTable(); } } - public void get(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void get(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, AsyncMethodCallback resultHandler) throws TException { checkReady(); - get_call method_call = new get_call(tableName, row, column, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + get_call method_call = new get_call(tableName, row, column, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class get_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class get_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer row; private ByteBuffer column; - public get_call(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public get_call(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.row = row; this.column = column; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("get", TMessageType.CALL, 0)); get_args args = new get_args(); args.setTableName(tableName); args.setRow(row); @@ -2055,29 +2574,28 @@ public class Hbase { prot.writeMessageEnd(); } - public List getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public List getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_get(); } } - public void getVer(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, int numVersions, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getVer(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, int numVersions, AsyncMethodCallback resultHandler) throws TException { checkReady(); - getVer_call method_call = new getVer_call(tableName, row, column, numVersions, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + getVer_call method_call = new getVer_call(tableName, row, column, numVersions, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class getVer_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class getVer_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer row; private ByteBuffer column; private int numVersions; - public getVer_call(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, int numVersions, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public getVer_call(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, int numVersions, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.row = row; @@ -2085,8 +2603,8 @@ public class Hbase { this.numVersions = numVersions; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getVer", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("getVer", TMessageType.CALL, 0)); getVer_args args = new getVer_args(); args.setTableName(tableName); args.setRow(row); @@ -2096,30 +2614,29 @@ public class Hbase { prot.writeMessageEnd(); } - public List getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public List getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getVer(); } } - public void getVerTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, int numVersions, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getVerTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, int numVersions, AsyncMethodCallback resultHandler) throws TException { checkReady(); - getVerTs_call method_call = new getVerTs_call(tableName, row, column, timestamp, numVersions, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + getVerTs_call method_call = new getVerTs_call(tableName, row, column, timestamp, numVersions, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class getVerTs_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class getVerTs_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer row; private ByteBuffer column; private long timestamp; private int numVersions; - public getVerTs_call(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, int numVersions, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public getVerTs_call(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, int numVersions, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.row = row; @@ -2128,8 +2645,8 @@ public class Hbase { this.numVersions = numVersions; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getVerTs", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("getVerTs", TMessageType.CALL, 0)); getVerTs_args args = new getVerTs_args(); args.setTableName(tableName); args.setRow(row); @@ -2140,34 +2657,33 @@ public class Hbase { prot.writeMessageEnd(); } - public List getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public List getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getVerTs(); } } - public void getRow(ByteBuffer tableName, ByteBuffer row, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getRow(ByteBuffer tableName, ByteBuffer row, AsyncMethodCallback resultHandler) throws TException { checkReady(); - getRow_call method_call = new getRow_call(tableName, row, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + getRow_call method_call = new getRow_call(tableName, row, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class getRow_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class getRow_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer row; - public getRow_call(ByteBuffer tableName, ByteBuffer row, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public getRow_call(ByteBuffer tableName, ByteBuffer row, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.row = row; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getRow", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("getRow", TMessageType.CALL, 0)); getRow_args args = new getRow_args(); args.setTableName(tableName); args.setRow(row); @@ -2175,36 +2691,35 @@ public class Hbase { prot.writeMessageEnd(); } - public List getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public List getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getRow(); } } - public void getRowWithColumns(ByteBuffer tableName, ByteBuffer row, List columns, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getRowWithColumns(ByteBuffer tableName, ByteBuffer row, List columns, AsyncMethodCallback resultHandler) throws TException { checkReady(); - getRowWithColumns_call method_call = new getRowWithColumns_call(tableName, row, columns, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + getRowWithColumns_call method_call = new getRowWithColumns_call(tableName, row, columns, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class getRowWithColumns_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class getRowWithColumns_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer row; private List columns; - public getRowWithColumns_call(ByteBuffer tableName, ByteBuffer row, List columns, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public getRowWithColumns_call(ByteBuffer tableName, ByteBuffer row, List columns, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.row = row; this.columns = columns; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getRowWithColumns", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("getRowWithColumns", TMessageType.CALL, 0)); getRowWithColumns_args args = new getRowWithColumns_args(); args.setTableName(tableName); args.setRow(row); @@ -2213,36 +2728,35 @@ public class Hbase { prot.writeMessageEnd(); } - public List getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public List getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getRowWithColumns(); } } - public void getRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp, AsyncMethodCallback resultHandler) throws TException { checkReady(); - getRowTs_call method_call = new getRowTs_call(tableName, row, timestamp, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + getRowTs_call method_call = new getRowTs_call(tableName, row, timestamp, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class getRowTs_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class getRowTs_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer row; private long timestamp; - public getRowTs_call(ByteBuffer tableName, ByteBuffer row, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public getRowTs_call(ByteBuffer tableName, ByteBuffer row, long timestamp, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.row = row; this.timestamp = timestamp; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getRowTs", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("getRowTs", TMessageType.CALL, 0)); getRowTs_args args = new getRowTs_args(); args.setTableName(tableName); args.setRow(row); @@ -2251,29 +2765,28 @@ public class Hbase { prot.writeMessageEnd(); } - public List getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public List getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getRowTs(); } } - public void getRowWithColumnsTs(ByteBuffer tableName, ByteBuffer row, List columns, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getRowWithColumnsTs(ByteBuffer tableName, ByteBuffer row, List columns, long timestamp, AsyncMethodCallback resultHandler) throws TException { checkReady(); - getRowWithColumnsTs_call method_call = new getRowWithColumnsTs_call(tableName, row, columns, timestamp, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + getRowWithColumnsTs_call method_call = new getRowWithColumnsTs_call(tableName, row, columns, timestamp, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class getRowWithColumnsTs_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class getRowWithColumnsTs_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer row; private List columns; private long timestamp; - public getRowWithColumnsTs_call(ByteBuffer tableName, ByteBuffer row, List columns, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public getRowWithColumnsTs_call(ByteBuffer tableName, ByteBuffer row, List columns, long timestamp, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.row = row; @@ -2281,8 +2794,8 @@ public class Hbase { this.timestamp = timestamp; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getRowWithColumnsTs", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("getRowWithColumnsTs", TMessageType.CALL, 0)); getRowWithColumnsTs_args args = new getRowWithColumnsTs_args(); args.setTableName(tableName); args.setRow(row); @@ -2292,34 +2805,33 @@ public class Hbase { prot.writeMessageEnd(); } - public List getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public List getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getRowWithColumnsTs(); } } - public void getRows(ByteBuffer tableName, List rows, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getRows(ByteBuffer tableName, List rows, AsyncMethodCallback resultHandler) throws TException { checkReady(); - getRows_call method_call = new getRows_call(tableName, rows, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + getRows_call method_call = new getRows_call(tableName, rows, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class getRows_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class getRows_call extends TAsyncMethodCall { private ByteBuffer tableName; private List rows; - public getRows_call(ByteBuffer tableName, List rows, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public getRows_call(ByteBuffer tableName, List rows, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.rows = rows; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getRows", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("getRows", TMessageType.CALL, 0)); getRows_args args = new getRows_args(); args.setTableName(tableName); args.setRows(rows); @@ -2327,36 +2839,35 @@ public class Hbase { prot.writeMessageEnd(); } - public List getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public List getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getRows(); } } - public void getRowsWithColumns(ByteBuffer tableName, List rows, List columns, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getRowsWithColumns(ByteBuffer tableName, List rows, List columns, AsyncMethodCallback resultHandler) throws TException { checkReady(); - getRowsWithColumns_call method_call = new getRowsWithColumns_call(tableName, rows, columns, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + getRowsWithColumns_call method_call = new getRowsWithColumns_call(tableName, rows, columns, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class getRowsWithColumns_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class getRowsWithColumns_call extends TAsyncMethodCall { private ByteBuffer tableName; private List rows; private List columns; - public getRowsWithColumns_call(ByteBuffer tableName, List rows, List columns, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public getRowsWithColumns_call(ByteBuffer tableName, List rows, List columns, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.rows = rows; this.columns = columns; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getRowsWithColumns", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("getRowsWithColumns", TMessageType.CALL, 0)); getRowsWithColumns_args args = new getRowsWithColumns_args(); args.setTableName(tableName); args.setRows(rows); @@ -2365,36 +2876,35 @@ public class Hbase { prot.writeMessageEnd(); } - public List getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public List getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getRowsWithColumns(); } } - public void getRowsTs(ByteBuffer tableName, List rows, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getRowsTs(ByteBuffer tableName, List rows, long timestamp, AsyncMethodCallback resultHandler) throws TException { checkReady(); - getRowsTs_call method_call = new getRowsTs_call(tableName, rows, timestamp, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + getRowsTs_call method_call = new getRowsTs_call(tableName, rows, timestamp, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class getRowsTs_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class getRowsTs_call extends TAsyncMethodCall { private ByteBuffer tableName; private List rows; private long timestamp; - public getRowsTs_call(ByteBuffer tableName, List rows, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public getRowsTs_call(ByteBuffer tableName, List rows, long timestamp, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.rows = rows; this.timestamp = timestamp; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getRowsTs", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("getRowsTs", TMessageType.CALL, 0)); getRowsTs_args args = new getRowsTs_args(); args.setTableName(tableName); args.setRows(rows); @@ -2403,29 +2913,28 @@ public class Hbase { prot.writeMessageEnd(); } - public List getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public List getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getRowsTs(); } } - public void getRowsWithColumnsTs(ByteBuffer tableName, List rows, List columns, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void getRowsWithColumnsTs(ByteBuffer tableName, List rows, List columns, long timestamp, AsyncMethodCallback resultHandler) throws TException { checkReady(); - getRowsWithColumnsTs_call method_call = new getRowsWithColumnsTs_call(tableName, rows, columns, timestamp, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + getRowsWithColumnsTs_call method_call = new getRowsWithColumnsTs_call(tableName, rows, columns, timestamp, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class getRowsWithColumnsTs_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class getRowsWithColumnsTs_call extends TAsyncMethodCall { private ByteBuffer tableName; private List rows; private List columns; private long timestamp; - public getRowsWithColumnsTs_call(ByteBuffer tableName, List rows, List columns, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public getRowsWithColumnsTs_call(ByteBuffer tableName, List rows, List columns, long timestamp, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.rows = rows; @@ -2433,8 +2942,8 @@ public class Hbase { this.timestamp = timestamp; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getRowsWithColumnsTs", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("getRowsWithColumnsTs", TMessageType.CALL, 0)); getRowsWithColumnsTs_args args = new getRowsWithColumnsTs_args(); args.setTableName(tableName); args.setRows(rows); @@ -2444,36 +2953,35 @@ public class Hbase { prot.writeMessageEnd(); } - public List getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public List getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_getRowsWithColumnsTs(); } } - public void mutateRow(ByteBuffer tableName, ByteBuffer row, List mutations, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void mutateRow(ByteBuffer tableName, ByteBuffer row, List mutations, AsyncMethodCallback resultHandler) throws TException { checkReady(); - mutateRow_call method_call = new mutateRow_call(tableName, row, mutations, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + mutateRow_call method_call = new mutateRow_call(tableName, row, mutations, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class mutateRow_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class mutateRow_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer row; private List mutations; - public mutateRow_call(ByteBuffer tableName, ByteBuffer row, List mutations, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public mutateRow_call(ByteBuffer tableName, ByteBuffer row, List mutations, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.row = row; this.mutations = mutations; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("mutateRow", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("mutateRow", TMessageType.CALL, 0)); mutateRow_args args = new mutateRow_args(); args.setTableName(tableName); args.setRow(row); @@ -2482,29 +2990,28 @@ public class Hbase { prot.writeMessageEnd(); } - public void getResult() throws IOError, IllegalArgument, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws IOError, IllegalArgument, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_mutateRow(); } } - public void mutateRowTs(ByteBuffer tableName, ByteBuffer row, List mutations, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void mutateRowTs(ByteBuffer tableName, ByteBuffer row, List mutations, long timestamp, AsyncMethodCallback resultHandler) throws TException { checkReady(); - mutateRowTs_call method_call = new mutateRowTs_call(tableName, row, mutations, timestamp, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + mutateRowTs_call method_call = new mutateRowTs_call(tableName, row, mutations, timestamp, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class mutateRowTs_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class mutateRowTs_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer row; private List mutations; private long timestamp; - public mutateRowTs_call(ByteBuffer tableName, ByteBuffer row, List mutations, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public mutateRowTs_call(ByteBuffer tableName, ByteBuffer row, List mutations, long timestamp, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.row = row; @@ -2512,8 +3019,8 @@ public class Hbase { this.timestamp = timestamp; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("mutateRowTs", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("mutateRowTs", TMessageType.CALL, 0)); mutateRowTs_args args = new mutateRowTs_args(); args.setTableName(tableName); args.setRow(row); @@ -2523,34 +3030,33 @@ public class Hbase { prot.writeMessageEnd(); } - public void getResult() throws IOError, IllegalArgument, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws IOError, IllegalArgument, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_mutateRowTs(); } } - public void mutateRows(ByteBuffer tableName, List rowBatches, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void mutateRows(ByteBuffer tableName, List rowBatches, AsyncMethodCallback resultHandler) throws TException { checkReady(); - mutateRows_call method_call = new mutateRows_call(tableName, rowBatches, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + mutateRows_call method_call = new mutateRows_call(tableName, rowBatches, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class mutateRows_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class mutateRows_call extends TAsyncMethodCall { private ByteBuffer tableName; private List rowBatches; - public mutateRows_call(ByteBuffer tableName, List rowBatches, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public mutateRows_call(ByteBuffer tableName, List rowBatches, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.rowBatches = rowBatches; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("mutateRows", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("mutateRows", TMessageType.CALL, 0)); mutateRows_args args = new mutateRows_args(); args.setTableName(tableName); args.setRowBatches(rowBatches); @@ -2558,36 +3064,35 @@ public class Hbase { prot.writeMessageEnd(); } - public void getResult() throws IOError, IllegalArgument, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws IOError, IllegalArgument, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_mutateRows(); } } - public void mutateRowsTs(ByteBuffer tableName, List rowBatches, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void mutateRowsTs(ByteBuffer tableName, List rowBatches, long timestamp, AsyncMethodCallback resultHandler) throws TException { checkReady(); - mutateRowsTs_call method_call = new mutateRowsTs_call(tableName, rowBatches, timestamp, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + mutateRowsTs_call method_call = new mutateRowsTs_call(tableName, rowBatches, timestamp, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class mutateRowsTs_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class mutateRowsTs_call extends TAsyncMethodCall { private ByteBuffer tableName; private List rowBatches; private long timestamp; - public mutateRowsTs_call(ByteBuffer tableName, List rowBatches, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public mutateRowsTs_call(ByteBuffer tableName, List rowBatches, long timestamp, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.rowBatches = rowBatches; this.timestamp = timestamp; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("mutateRowsTs", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("mutateRowsTs", TMessageType.CALL, 0)); mutateRowsTs_args args = new mutateRowsTs_args(); args.setTableName(tableName); args.setRowBatches(rowBatches); @@ -2596,29 +3101,28 @@ public class Hbase { prot.writeMessageEnd(); } - public void getResult() throws IOError, IllegalArgument, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws IOError, IllegalArgument, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_mutateRowsTs(); } } - public void atomicIncrement(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long value, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void atomicIncrement(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long value, AsyncMethodCallback resultHandler) throws TException { checkReady(); - atomicIncrement_call method_call = new atomicIncrement_call(tableName, row, column, value, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + atomicIncrement_call method_call = new atomicIncrement_call(tableName, row, column, value, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class atomicIncrement_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class atomicIncrement_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer row; private ByteBuffer column; private long value; - public atomicIncrement_call(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long value, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public atomicIncrement_call(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long value, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.row = row; @@ -2626,8 +3130,8 @@ public class Hbase { this.value = value; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("atomicIncrement", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("atomicIncrement", TMessageType.CALL, 0)); atomicIncrement_args args = new atomicIncrement_args(); args.setTableName(tableName); args.setRow(row); @@ -2637,36 +3141,35 @@ public class Hbase { prot.writeMessageEnd(); } - public long getResult() throws IOError, IllegalArgument, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public long getResult() throws IOError, IllegalArgument, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_atomicIncrement(); } } - public void deleteAll(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deleteAll(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, AsyncMethodCallback resultHandler) throws TException { checkReady(); - deleteAll_call method_call = new deleteAll_call(tableName, row, column, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + deleteAll_call method_call = new deleteAll_call(tableName, row, column, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class deleteAll_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class deleteAll_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer row; private ByteBuffer column; - public deleteAll_call(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public deleteAll_call(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.row = row; this.column = column; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteAll", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("deleteAll", TMessageType.CALL, 0)); deleteAll_args args = new deleteAll_args(); args.setTableName(tableName); args.setRow(row); @@ -2675,29 +3178,28 @@ public class Hbase { prot.writeMessageEnd(); } - public void getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_deleteAll(); } } - public void deleteAllTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deleteAllTs(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, AsyncMethodCallback resultHandler) throws TException { checkReady(); - deleteAllTs_call method_call = new deleteAllTs_call(tableName, row, column, timestamp, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + deleteAllTs_call method_call = new deleteAllTs_call(tableName, row, column, timestamp, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class deleteAllTs_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class deleteAllTs_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer row; private ByteBuffer column; private long timestamp; - public deleteAllTs_call(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public deleteAllTs_call(ByteBuffer tableName, ByteBuffer row, ByteBuffer column, long timestamp, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.row = row; @@ -2705,8 +3207,8 @@ public class Hbase { this.timestamp = timestamp; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteAllTs", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("deleteAllTs", TMessageType.CALL, 0)); deleteAllTs_args args = new deleteAllTs_args(); args.setTableName(tableName); args.setRow(row); @@ -2716,34 +3218,33 @@ public class Hbase { prot.writeMessageEnd(); } - public void getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_deleteAllTs(); } } - public void deleteAllRow(ByteBuffer tableName, ByteBuffer row, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deleteAllRow(ByteBuffer tableName, ByteBuffer row, AsyncMethodCallback resultHandler) throws TException { checkReady(); - deleteAllRow_call method_call = new deleteAllRow_call(tableName, row, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + deleteAllRow_call method_call = new deleteAllRow_call(tableName, row, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class deleteAllRow_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class deleteAllRow_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer row; - public deleteAllRow_call(ByteBuffer tableName, ByteBuffer row, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public deleteAllRow_call(ByteBuffer tableName, ByteBuffer row, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.row = row; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteAllRow", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("deleteAllRow", TMessageType.CALL, 0)); deleteAllRow_args args = new deleteAllRow_args(); args.setTableName(tableName); args.setRow(row); @@ -2751,36 +3252,35 @@ public class Hbase { prot.writeMessageEnd(); } - public void getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_deleteAllRow(); } } - public void deleteAllRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void deleteAllRowTs(ByteBuffer tableName, ByteBuffer row, long timestamp, AsyncMethodCallback resultHandler) throws TException { checkReady(); - deleteAllRowTs_call method_call = new deleteAllRowTs_call(tableName, row, timestamp, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + deleteAllRowTs_call method_call = new deleteAllRowTs_call(tableName, row, timestamp, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class deleteAllRowTs_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class deleteAllRowTs_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer row; private long timestamp; - public deleteAllRowTs_call(ByteBuffer tableName, ByteBuffer row, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public deleteAllRowTs_call(ByteBuffer tableName, ByteBuffer row, long timestamp, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.row = row; this.timestamp = timestamp; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteAllRowTs", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("deleteAllRowTs", TMessageType.CALL, 0)); deleteAllRowTs_args args = new deleteAllRowTs_args(); args.setTableName(tableName); args.setRow(row); @@ -2789,34 +3289,33 @@ public class Hbase { prot.writeMessageEnd(); } - public void getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_deleteAllRowTs(); } } - public void scannerOpenWithScan(ByteBuffer tableName, TScan scan, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void scannerOpenWithScan(ByteBuffer tableName, TScan scan, AsyncMethodCallback resultHandler) throws TException { checkReady(); - scannerOpenWithScan_call method_call = new scannerOpenWithScan_call(tableName, scan, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + scannerOpenWithScan_call method_call = new scannerOpenWithScan_call(tableName, scan, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class scannerOpenWithScan_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class scannerOpenWithScan_call extends TAsyncMethodCall { private ByteBuffer tableName; private TScan scan; - public scannerOpenWithScan_call(ByteBuffer tableName, TScan scan, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public scannerOpenWithScan_call(ByteBuffer tableName, TScan scan, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.scan = scan; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("scannerOpenWithScan", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("scannerOpenWithScan", TMessageType.CALL, 0)); scannerOpenWithScan_args args = new scannerOpenWithScan_args(); args.setTableName(tableName); args.setScan(scan); @@ -2824,36 +3323,35 @@ public class Hbase { prot.writeMessageEnd(); } - public int getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public int getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_scannerOpenWithScan(); } } - public void scannerOpen(ByteBuffer tableName, ByteBuffer startRow, List columns, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void scannerOpen(ByteBuffer tableName, ByteBuffer startRow, List columns, AsyncMethodCallback resultHandler) throws TException { checkReady(); - scannerOpen_call method_call = new scannerOpen_call(tableName, startRow, columns, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + scannerOpen_call method_call = new scannerOpen_call(tableName, startRow, columns, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class scannerOpen_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class scannerOpen_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer startRow; private List columns; - public scannerOpen_call(ByteBuffer tableName, ByteBuffer startRow, List columns, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public scannerOpen_call(ByteBuffer tableName, ByteBuffer startRow, List columns, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.startRow = startRow; this.columns = columns; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("scannerOpen", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("scannerOpen", TMessageType.CALL, 0)); scannerOpen_args args = new scannerOpen_args(); args.setTableName(tableName); args.setStartRow(startRow); @@ -2862,29 +3360,28 @@ public class Hbase { prot.writeMessageEnd(); } - public int getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public int getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_scannerOpen(); } } - public void scannerOpenWithStop(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void scannerOpenWithStop(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, AsyncMethodCallback resultHandler) throws TException { checkReady(); - scannerOpenWithStop_call method_call = new scannerOpenWithStop_call(tableName, startRow, stopRow, columns, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + scannerOpenWithStop_call method_call = new scannerOpenWithStop_call(tableName, startRow, stopRow, columns, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class scannerOpenWithStop_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class scannerOpenWithStop_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer startRow; private ByteBuffer stopRow; private List columns; - public scannerOpenWithStop_call(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public scannerOpenWithStop_call(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.startRow = startRow; @@ -2892,8 +3389,8 @@ public class Hbase { this.columns = columns; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("scannerOpenWithStop", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("scannerOpenWithStop", TMessageType.CALL, 0)); scannerOpenWithStop_args args = new scannerOpenWithStop_args(); args.setTableName(tableName); args.setStartRow(startRow); @@ -2903,36 +3400,35 @@ public class Hbase { prot.writeMessageEnd(); } - public int getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public int getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_scannerOpenWithStop(); } } - public void scannerOpenWithPrefix(ByteBuffer tableName, ByteBuffer startAndPrefix, List columns, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void scannerOpenWithPrefix(ByteBuffer tableName, ByteBuffer startAndPrefix, List columns, AsyncMethodCallback resultHandler) throws TException { checkReady(); - scannerOpenWithPrefix_call method_call = new scannerOpenWithPrefix_call(tableName, startAndPrefix, columns, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + scannerOpenWithPrefix_call method_call = new scannerOpenWithPrefix_call(tableName, startAndPrefix, columns, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class scannerOpenWithPrefix_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class scannerOpenWithPrefix_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer startAndPrefix; private List columns; - public scannerOpenWithPrefix_call(ByteBuffer tableName, ByteBuffer startAndPrefix, List columns, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public scannerOpenWithPrefix_call(ByteBuffer tableName, ByteBuffer startAndPrefix, List columns, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.startAndPrefix = startAndPrefix; this.columns = columns; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("scannerOpenWithPrefix", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("scannerOpenWithPrefix", TMessageType.CALL, 0)); scannerOpenWithPrefix_args args = new scannerOpenWithPrefix_args(); args.setTableName(tableName); args.setStartAndPrefix(startAndPrefix); @@ -2941,29 +3437,28 @@ public class Hbase { prot.writeMessageEnd(); } - public int getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public int getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_scannerOpenWithPrefix(); } } - public void scannerOpenTs(ByteBuffer tableName, ByteBuffer startRow, List columns, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void scannerOpenTs(ByteBuffer tableName, ByteBuffer startRow, List columns, long timestamp, AsyncMethodCallback resultHandler) throws TException { checkReady(); - scannerOpenTs_call method_call = new scannerOpenTs_call(tableName, startRow, columns, timestamp, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + scannerOpenTs_call method_call = new scannerOpenTs_call(tableName, startRow, columns, timestamp, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class scannerOpenTs_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class scannerOpenTs_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer startRow; private List columns; private long timestamp; - public scannerOpenTs_call(ByteBuffer tableName, ByteBuffer startRow, List columns, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public scannerOpenTs_call(ByteBuffer tableName, ByteBuffer startRow, List columns, long timestamp, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.startRow = startRow; @@ -2971,8 +3466,8 @@ public class Hbase { this.timestamp = timestamp; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("scannerOpenTs", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("scannerOpenTs", TMessageType.CALL, 0)); scannerOpenTs_args args = new scannerOpenTs_args(); args.setTableName(tableName); args.setStartRow(startRow); @@ -2982,30 +3477,29 @@ public class Hbase { prot.writeMessageEnd(); } - public int getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public int getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_scannerOpenTs(); } } - public void scannerOpenWithStopTs(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void scannerOpenWithStopTs(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, long timestamp, AsyncMethodCallback resultHandler) throws TException { checkReady(); - scannerOpenWithStopTs_call method_call = new scannerOpenWithStopTs_call(tableName, startRow, stopRow, columns, timestamp, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + scannerOpenWithStopTs_call method_call = new scannerOpenWithStopTs_call(tableName, startRow, stopRow, columns, timestamp, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class scannerOpenWithStopTs_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class scannerOpenWithStopTs_call extends TAsyncMethodCall { private ByteBuffer tableName; private ByteBuffer startRow; private ByteBuffer stopRow; private List columns; private long timestamp; - public scannerOpenWithStopTs_call(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, long timestamp, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public scannerOpenWithStopTs_call(ByteBuffer tableName, ByteBuffer startRow, ByteBuffer stopRow, List columns, long timestamp, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.tableName = tableName; this.startRow = startRow; @@ -3014,8 +3508,8 @@ public class Hbase { this.timestamp = timestamp; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("scannerOpenWithStopTs", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("scannerOpenWithStopTs", TMessageType.CALL, 0)); scannerOpenWithStopTs_args args = new scannerOpenWithStopTs_args(); args.setTableName(tableName); args.setStartRow(startRow); @@ -3026,66 +3520,64 @@ public class Hbase { prot.writeMessageEnd(); } - public int getResult() throws IOError, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public int getResult() throws IOError, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_scannerOpenWithStopTs(); } } - public void scannerGet(int id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void scannerGet(int id, AsyncMethodCallback resultHandler) throws TException { checkReady(); - scannerGet_call method_call = new scannerGet_call(id, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + scannerGet_call method_call = new scannerGet_call(id, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class scannerGet_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class scannerGet_call extends TAsyncMethodCall { private int id; - public scannerGet_call(int id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public scannerGet_call(int id, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("scannerGet", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("scannerGet", TMessageType.CALL, 0)); scannerGet_args args = new scannerGet_args(); args.setId(id); args.write(prot); prot.writeMessageEnd(); } - public List getResult() throws IOError, IllegalArgument, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public List getResult() throws IOError, IllegalArgument, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_scannerGet(); } } - public void scannerGetList(int id, int nbRows, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void scannerGetList(int id, int nbRows, AsyncMethodCallback resultHandler) throws TException { checkReady(); - scannerGetList_call method_call = new scannerGetList_call(id, nbRows, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + scannerGetList_call method_call = new scannerGetList_call(id, nbRows, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class scannerGetList_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class scannerGetList_call extends TAsyncMethodCall { private int id; private int nbRows; - public scannerGetList_call(int id, int nbRows, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public scannerGetList_call(int id, int nbRows, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; this.nbRows = nbRows; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("scannerGetList", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("scannerGetList", TMessageType.CALL, 0)); scannerGetList_args args = new scannerGetList_args(); args.setId(id); args.setNbRows(nbRows); @@ -3093,925 +3585,1644 @@ public class Hbase { prot.writeMessageEnd(); } - public List getResult() throws IOError, IllegalArgument, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public List getResult() throws IOError, IllegalArgument, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); return (new Client(prot)).recv_scannerGetList(); } } - public void scannerClose(int id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void scannerClose(int id, AsyncMethodCallback resultHandler) throws TException { checkReady(); - scannerClose_call method_call = new scannerClose_call(id, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); + scannerClose_call method_call = new scannerClose_call(id, resultHandler, this, protocolFactory, transport); + manager.call(method_call); } - public static class scannerClose_call extends org.apache.thrift.async.TAsyncMethodCall { + public static class scannerClose_call extends TAsyncMethodCall { private int id; - public scannerClose_call(int id, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public scannerClose_call(int id, AsyncMethodCallback resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException { super(client, protocolFactory, transport, resultHandler, false); this.id = id; } - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("scannerClose", org.apache.thrift.protocol.TMessageType.CALL, 0)); + public void write_args(TProtocol prot) throws TException { + prot.writeMessageBegin(new TMessage("scannerClose", TMessageType.CALL, 0)); scannerClose_args args = new scannerClose_args(); args.setId(id); args.write(prot); prot.writeMessageEnd(); } - public void getResult() throws IOError, IllegalArgument, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { + public void getResult() throws IOError, IllegalArgument, TException { + if (getState() != State.RESPONSE_READ) { throw new IllegalStateException("Method call not finished!"); } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); + TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array()); + TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); (new Client(prot)).recv_scannerClose(); } } } - public static class Processor extends org.apache.thrift.TBaseProcessor implements org.apache.thrift.TProcessor { + public static class Processor implements TProcessor { private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName()); - public Processor(I iface) { - super(iface, getProcessMap(new HashMap>())); - } - - protected Processor(I iface, Map> processMap) { - super(iface, getProcessMap(processMap)); - } - - private static Map> getProcessMap(Map> processMap) { - processMap.put("enableTable", new enableTable()); - processMap.put("disableTable", new disableTable()); - processMap.put("isTableEnabled", new isTableEnabled()); - processMap.put("compact", new compact()); - processMap.put("majorCompact", new majorCompact()); - processMap.put("getTableNames", new getTableNames()); - processMap.put("getColumnDescriptors", new getColumnDescriptors()); - processMap.put("getTableRegions", new getTableRegions()); - processMap.put("createTable", new createTable()); - processMap.put("deleteTable", new deleteTable()); - processMap.put("get", new get()); - processMap.put("getVer", new getVer()); - processMap.put("getVerTs", new getVerTs()); - processMap.put("getRow", new getRow()); - processMap.put("getRowWithColumns", new getRowWithColumns()); - processMap.put("getRowTs", new getRowTs()); - processMap.put("getRowWithColumnsTs", new getRowWithColumnsTs()); - processMap.put("getRows", new getRows()); - processMap.put("getRowsWithColumns", new getRowsWithColumns()); - processMap.put("getRowsTs", new getRowsTs()); - processMap.put("getRowsWithColumnsTs", new getRowsWithColumnsTs()); - processMap.put("mutateRow", new mutateRow()); - processMap.put("mutateRowTs", new mutateRowTs()); - processMap.put("mutateRows", new mutateRows()); - processMap.put("mutateRowsTs", new mutateRowsTs()); - processMap.put("atomicIncrement", new atomicIncrement()); - processMap.put("deleteAll", new deleteAll()); - processMap.put("deleteAllTs", new deleteAllTs()); - processMap.put("deleteAllRow", new deleteAllRow()); - processMap.put("deleteAllRowTs", new deleteAllRowTs()); - processMap.put("scannerOpenWithScan", new scannerOpenWithScan()); - processMap.put("scannerOpen", new scannerOpen()); - processMap.put("scannerOpenWithStop", new scannerOpenWithStop()); - processMap.put("scannerOpenWithPrefix", new scannerOpenWithPrefix()); - processMap.put("scannerOpenTs", new scannerOpenTs()); - processMap.put("scannerOpenWithStopTs", new scannerOpenWithStopTs()); - processMap.put("scannerGet", new scannerGet()); - processMap.put("scannerGetList", new scannerGetList()); - processMap.put("scannerClose", new scannerClose()); - return processMap; - } - - private static class enableTable extends org.apache.thrift.ProcessFunction { - public enableTable() { - super("enableTable"); - } - - protected enableTable_args getEmptyArgsInstance() { - return new enableTable_args(); - } - - protected enableTable_result getResult(I iface, enableTable_args args) throws org.apache.thrift.TException { + public Processor(Iface iface) + { + iface_ = iface; + processMap_.put("enableTable", new enableTable()); + processMap_.put("disableTable", new disableTable()); + processMap_.put("isTableEnabled", new isTableEnabled()); + processMap_.put("compact", new compact()); + processMap_.put("majorCompact", new majorCompact()); + processMap_.put("getTableNames", new getTableNames()); + processMap_.put("getColumnDescriptors", new getColumnDescriptors()); + processMap_.put("getTableRegions", new getTableRegions()); + processMap_.put("createTable", new createTable()); + processMap_.put("deleteTable", new deleteTable()); + processMap_.put("get", new get()); + processMap_.put("getVer", new getVer()); + processMap_.put("getVerTs", new getVerTs()); + processMap_.put("getRow", new getRow()); + processMap_.put("getRowWithColumns", new getRowWithColumns()); + processMap_.put("getRowTs", new getRowTs()); + processMap_.put("getRowWithColumnsTs", new getRowWithColumnsTs()); + processMap_.put("getRows", new getRows()); + processMap_.put("getRowsWithColumns", new getRowsWithColumns()); + processMap_.put("getRowsTs", new getRowsTs()); + processMap_.put("getRowsWithColumnsTs", new getRowsWithColumnsTs()); + processMap_.put("mutateRow", new mutateRow()); + processMap_.put("mutateRowTs", new mutateRowTs()); + processMap_.put("mutateRows", new mutateRows()); + processMap_.put("mutateRowsTs", new mutateRowsTs()); + processMap_.put("atomicIncrement", new atomicIncrement()); + processMap_.put("deleteAll", new deleteAll()); + processMap_.put("deleteAllTs", new deleteAllTs()); + processMap_.put("deleteAllRow", new deleteAllRow()); + processMap_.put("deleteAllRowTs", new deleteAllRowTs()); + processMap_.put("scannerOpenWithScan", new scannerOpenWithScan()); + processMap_.put("scannerOpen", new scannerOpen()); + processMap_.put("scannerOpenWithStop", new scannerOpenWithStop()); + processMap_.put("scannerOpenWithPrefix", new scannerOpenWithPrefix()); + processMap_.put("scannerOpenTs", new scannerOpenTs()); + processMap_.put("scannerOpenWithStopTs", new scannerOpenWithStopTs()); + processMap_.put("scannerGet", new scannerGet()); + processMap_.put("scannerGetList", new scannerGetList()); + processMap_.put("scannerClose", new scannerClose()); + } + + protected static interface ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException; + } + + private Iface iface_; + protected final HashMap processMap_ = new HashMap(); + + public boolean process(TProtocol iprot, TProtocol oprot) throws TException + { + TMessage msg = iprot.readMessageBegin(); + ProcessFunction fn = processMap_.get(msg.name); + if (fn == null) { + TProtocolUtil.skip(iprot, TType.STRUCT); + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.UNKNOWN_METHOD, "Invalid method name: '"+msg.name+"'"); + oprot.writeMessageBegin(new TMessage(msg.name, TMessageType.EXCEPTION, msg.seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return true; + } + fn.process(msg.seqid, iprot, oprot); + return true; + } + + private class enableTable implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + enableTable_args args = new enableTable_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("enableTable", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); enableTable_result result = new enableTable_result(); try { - iface.enableTable(args.tableName); + iface_.enableTable(args.tableName); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing enableTable", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing enableTable"); + oprot.writeMessageBegin(new TMessage("enableTable", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class disableTable extends org.apache.thrift.ProcessFunction { - public disableTable() { - super("disableTable"); + oprot.writeMessageBegin(new TMessage("enableTable", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected disableTable_args getEmptyArgsInstance() { - return new disableTable_args(); - } + } - protected disableTable_result getResult(I iface, disableTable_args args) throws org.apache.thrift.TException { + private class disableTable implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + disableTable_args args = new disableTable_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("disableTable", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); disableTable_result result = new disableTable_result(); try { - iface.disableTable(args.tableName); + iface_.disableTable(args.tableName); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing disableTable", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing disableTable"); + oprot.writeMessageBegin(new TMessage("disableTable", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; + oprot.writeMessageBegin(new TMessage("disableTable", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - } - private static class isTableEnabled extends org.apache.thrift.ProcessFunction { - public isTableEnabled() { - super("isTableEnabled"); - } - - protected isTableEnabled_args getEmptyArgsInstance() { - return new isTableEnabled_args(); - } + } - protected isTableEnabled_result getResult(I iface, isTableEnabled_args args) throws org.apache.thrift.TException { + private class isTableEnabled implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + isTableEnabled_args args = new isTableEnabled_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("isTableEnabled", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); isTableEnabled_result result = new isTableEnabled_result(); try { - result.success = iface.isTableEnabled(args.tableName); + result.success = iface_.isTableEnabled(args.tableName); result.setSuccessIsSet(true); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing isTableEnabled", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing isTableEnabled"); + oprot.writeMessageBegin(new TMessage("isTableEnabled", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class compact extends org.apache.thrift.ProcessFunction { - public compact() { - super("compact"); + oprot.writeMessageBegin(new TMessage("isTableEnabled", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected compact_args getEmptyArgsInstance() { - return new compact_args(); - } + } - protected compact_result getResult(I iface, compact_args args) throws org.apache.thrift.TException { + private class compact implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + compact_args args = new compact_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("compact", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); compact_result result = new compact_result(); try { - iface.compact(args.tableNameOrRegionName); + iface_.compact(args.tableNameOrRegionName); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing compact", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing compact"); + oprot.writeMessageBegin(new TMessage("compact", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class majorCompact extends org.apache.thrift.ProcessFunction { - public majorCompact() { - super("majorCompact"); + oprot.writeMessageBegin(new TMessage("compact", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected majorCompact_args getEmptyArgsInstance() { - return new majorCompact_args(); - } + } - protected majorCompact_result getResult(I iface, majorCompact_args args) throws org.apache.thrift.TException { + private class majorCompact implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + majorCompact_args args = new majorCompact_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("majorCompact", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); majorCompact_result result = new majorCompact_result(); try { - iface.majorCompact(args.tableNameOrRegionName); + iface_.majorCompact(args.tableNameOrRegionName); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing majorCompact", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing majorCompact"); + oprot.writeMessageBegin(new TMessage("majorCompact", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; + oprot.writeMessageBegin(new TMessage("majorCompact", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - } - private static class getTableNames extends org.apache.thrift.ProcessFunction { - public getTableNames() { - super("getTableNames"); - } - - protected getTableNames_args getEmptyArgsInstance() { - return new getTableNames_args(); - } + } - protected getTableNames_result getResult(I iface, getTableNames_args args) throws org.apache.thrift.TException { + private class getTableNames implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + getTableNames_args args = new getTableNames_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("getTableNames", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); getTableNames_result result = new getTableNames_result(); try { - result.success = iface.getTableNames(); + result.success = iface_.getTableNames(); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing getTableNames", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing getTableNames"); + oprot.writeMessageBegin(new TMessage("getTableNames", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class getColumnDescriptors extends org.apache.thrift.ProcessFunction { - public getColumnDescriptors() { - super("getColumnDescriptors"); + oprot.writeMessageBegin(new TMessage("getTableNames", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected getColumnDescriptors_args getEmptyArgsInstance() { - return new getColumnDescriptors_args(); - } + } - protected getColumnDescriptors_result getResult(I iface, getColumnDescriptors_args args) throws org.apache.thrift.TException { + private class getColumnDescriptors implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + getColumnDescriptors_args args = new getColumnDescriptors_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("getColumnDescriptors", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); getColumnDescriptors_result result = new getColumnDescriptors_result(); try { - result.success = iface.getColumnDescriptors(args.tableName); + result.success = iface_.getColumnDescriptors(args.tableName); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing getColumnDescriptors", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing getColumnDescriptors"); + oprot.writeMessageBegin(new TMessage("getColumnDescriptors", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class getTableRegions extends org.apache.thrift.ProcessFunction { - public getTableRegions() { - super("getTableRegions"); + oprot.writeMessageBegin(new TMessage("getColumnDescriptors", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected getTableRegions_args getEmptyArgsInstance() { - return new getTableRegions_args(); - } + } - protected getTableRegions_result getResult(I iface, getTableRegions_args args) throws org.apache.thrift.TException { + private class getTableRegions implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + getTableRegions_args args = new getTableRegions_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("getTableRegions", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); getTableRegions_result result = new getTableRegions_result(); try { - result.success = iface.getTableRegions(args.tableName); + result.success = iface_.getTableRegions(args.tableName); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing getTableRegions", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing getTableRegions"); + oprot.writeMessageBegin(new TMessage("getTableRegions", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class createTable extends org.apache.thrift.ProcessFunction { - public createTable() { - super("createTable"); + oprot.writeMessageBegin(new TMessage("getTableRegions", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected createTable_args getEmptyArgsInstance() { - return new createTable_args(); - } + } - protected createTable_result getResult(I iface, createTable_args args) throws org.apache.thrift.TException { + private class createTable implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + createTable_args args = new createTable_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("createTable", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); createTable_result result = new createTable_result(); try { - iface.createTable(args.tableName, args.columnFamilies); + iface_.createTable(args.tableName, args.columnFamilies); } catch (IOError io) { result.io = io; } catch (IllegalArgument ia) { result.ia = ia; } catch (AlreadyExists exist) { result.exist = exist; + } catch (Throwable th) { + LOGGER.error("Internal error processing createTable", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing createTable"); + oprot.writeMessageBegin(new TMessage("createTable", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class deleteTable extends org.apache.thrift.ProcessFunction { - public deleteTable() { - super("deleteTable"); + oprot.writeMessageBegin(new TMessage("createTable", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected deleteTable_args getEmptyArgsInstance() { - return new deleteTable_args(); - } + } - protected deleteTable_result getResult(I iface, deleteTable_args args) throws org.apache.thrift.TException { + private class deleteTable implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + deleteTable_args args = new deleteTable_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("deleteTable", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); deleteTable_result result = new deleteTable_result(); try { - iface.deleteTable(args.tableName); + iface_.deleteTable(args.tableName); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing deleteTable", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing deleteTable"); + oprot.writeMessageBegin(new TMessage("deleteTable", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class get extends org.apache.thrift.ProcessFunction { - public get() { - super("get"); + oprot.writeMessageBegin(new TMessage("deleteTable", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected get_args getEmptyArgsInstance() { - return new get_args(); - } + } - protected get_result getResult(I iface, get_args args) throws org.apache.thrift.TException { + private class get implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + get_args args = new get_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("get", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); get_result result = new get_result(); try { - result.success = iface.get(args.tableName, args.row, args.column); + result.success = iface_.get(args.tableName, args.row, args.column); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing get", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing get"); + oprot.writeMessageBegin(new TMessage("get", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class getVer extends org.apache.thrift.ProcessFunction { - public getVer() { - super("getVer"); + oprot.writeMessageBegin(new TMessage("get", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected getVer_args getEmptyArgsInstance() { - return new getVer_args(); - } + } - protected getVer_result getResult(I iface, getVer_args args) throws org.apache.thrift.TException { + private class getVer implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + getVer_args args = new getVer_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("getVer", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); getVer_result result = new getVer_result(); try { - result.success = iface.getVer(args.tableName, args.row, args.column, args.numVersions); + result.success = iface_.getVer(args.tableName, args.row, args.column, args.numVersions); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing getVer", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing getVer"); + oprot.writeMessageBegin(new TMessage("getVer", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; + oprot.writeMessageBegin(new TMessage("getVer", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - } - private static class getVerTs extends org.apache.thrift.ProcessFunction { - public getVerTs() { - super("getVerTs"); - } - - protected getVerTs_args getEmptyArgsInstance() { - return new getVerTs_args(); - } + } - protected getVerTs_result getResult(I iface, getVerTs_args args) throws org.apache.thrift.TException { + private class getVerTs implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + getVerTs_args args = new getVerTs_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("getVerTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); getVerTs_result result = new getVerTs_result(); try { - result.success = iface.getVerTs(args.tableName, args.row, args.column, args.timestamp, args.numVersions); + result.success = iface_.getVerTs(args.tableName, args.row, args.column, args.timestamp, args.numVersions); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing getVerTs", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing getVerTs"); + oprot.writeMessageBegin(new TMessage("getVerTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class getRow extends org.apache.thrift.ProcessFunction { - public getRow() { - super("getRow"); + oprot.writeMessageBegin(new TMessage("getVerTs", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected getRow_args getEmptyArgsInstance() { - return new getRow_args(); - } + } - protected getRow_result getResult(I iface, getRow_args args) throws org.apache.thrift.TException { + private class getRow implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + getRow_args args = new getRow_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("getRow", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); getRow_result result = new getRow_result(); try { - result.success = iface.getRow(args.tableName, args.row); + result.success = iface_.getRow(args.tableName, args.row); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing getRow", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing getRow"); + oprot.writeMessageBegin(new TMessage("getRow", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; + oprot.writeMessageBegin(new TMessage("getRow", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - } - private static class getRowWithColumns extends org.apache.thrift.ProcessFunction { - public getRowWithColumns() { - super("getRowWithColumns"); - } - - protected getRowWithColumns_args getEmptyArgsInstance() { - return new getRowWithColumns_args(); - } + } - protected getRowWithColumns_result getResult(I iface, getRowWithColumns_args args) throws org.apache.thrift.TException { + private class getRowWithColumns implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + getRowWithColumns_args args = new getRowWithColumns_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("getRowWithColumns", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); getRowWithColumns_result result = new getRowWithColumns_result(); try { - result.success = iface.getRowWithColumns(args.tableName, args.row, args.columns); + result.success = iface_.getRowWithColumns(args.tableName, args.row, args.columns); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing getRowWithColumns", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing getRowWithColumns"); + oprot.writeMessageBegin(new TMessage("getRowWithColumns", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class getRowTs extends org.apache.thrift.ProcessFunction { - public getRowTs() { - super("getRowTs"); + oprot.writeMessageBegin(new TMessage("getRowWithColumns", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected getRowTs_args getEmptyArgsInstance() { - return new getRowTs_args(); - } + } - protected getRowTs_result getResult(I iface, getRowTs_args args) throws org.apache.thrift.TException { + private class getRowTs implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + getRowTs_args args = new getRowTs_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("getRowTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); getRowTs_result result = new getRowTs_result(); try { - result.success = iface.getRowTs(args.tableName, args.row, args.timestamp); + result.success = iface_.getRowTs(args.tableName, args.row, args.timestamp); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing getRowTs", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing getRowTs"); + oprot.writeMessageBegin(new TMessage("getRowTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class getRowWithColumnsTs extends org.apache.thrift.ProcessFunction { - public getRowWithColumnsTs() { - super("getRowWithColumnsTs"); + oprot.writeMessageBegin(new TMessage("getRowTs", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected getRowWithColumnsTs_args getEmptyArgsInstance() { - return new getRowWithColumnsTs_args(); - } + } - protected getRowWithColumnsTs_result getResult(I iface, getRowWithColumnsTs_args args) throws org.apache.thrift.TException { + private class getRowWithColumnsTs implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + getRowWithColumnsTs_args args = new getRowWithColumnsTs_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("getRowWithColumnsTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); getRowWithColumnsTs_result result = new getRowWithColumnsTs_result(); try { - result.success = iface.getRowWithColumnsTs(args.tableName, args.row, args.columns, args.timestamp); + result.success = iface_.getRowWithColumnsTs(args.tableName, args.row, args.columns, args.timestamp); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing getRowWithColumnsTs", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing getRowWithColumnsTs"); + oprot.writeMessageBegin(new TMessage("getRowWithColumnsTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; + oprot.writeMessageBegin(new TMessage("getRowWithColumnsTs", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - } - private static class getRows extends org.apache.thrift.ProcessFunction { - public getRows() { - super("getRows"); - } - - protected getRows_args getEmptyArgsInstance() { - return new getRows_args(); - } + } - protected getRows_result getResult(I iface, getRows_args args) throws org.apache.thrift.TException { + private class getRows implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + getRows_args args = new getRows_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("getRows", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); getRows_result result = new getRows_result(); try { - result.success = iface.getRows(args.tableName, args.rows); + result.success = iface_.getRows(args.tableName, args.rows); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing getRows", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing getRows"); + oprot.writeMessageBegin(new TMessage("getRows", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class getRowsWithColumns extends org.apache.thrift.ProcessFunction { - public getRowsWithColumns() { - super("getRowsWithColumns"); + oprot.writeMessageBegin(new TMessage("getRows", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected getRowsWithColumns_args getEmptyArgsInstance() { - return new getRowsWithColumns_args(); - } + } - protected getRowsWithColumns_result getResult(I iface, getRowsWithColumns_args args) throws org.apache.thrift.TException { + private class getRowsWithColumns implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + getRowsWithColumns_args args = new getRowsWithColumns_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("getRowsWithColumns", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); getRowsWithColumns_result result = new getRowsWithColumns_result(); try { - result.success = iface.getRowsWithColumns(args.tableName, args.rows, args.columns); + result.success = iface_.getRowsWithColumns(args.tableName, args.rows, args.columns); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing getRowsWithColumns", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing getRowsWithColumns"); + oprot.writeMessageBegin(new TMessage("getRowsWithColumns", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class getRowsTs extends org.apache.thrift.ProcessFunction { - public getRowsTs() { - super("getRowsTs"); + oprot.writeMessageBegin(new TMessage("getRowsWithColumns", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected getRowsTs_args getEmptyArgsInstance() { - return new getRowsTs_args(); - } + } - protected getRowsTs_result getResult(I iface, getRowsTs_args args) throws org.apache.thrift.TException { + private class getRowsTs implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + getRowsTs_args args = new getRowsTs_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("getRowsTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); getRowsTs_result result = new getRowsTs_result(); try { - result.success = iface.getRowsTs(args.tableName, args.rows, args.timestamp); + result.success = iface_.getRowsTs(args.tableName, args.rows, args.timestamp); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing getRowsTs", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing getRowsTs"); + oprot.writeMessageBegin(new TMessage("getRowsTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class getRowsWithColumnsTs extends org.apache.thrift.ProcessFunction { - public getRowsWithColumnsTs() { - super("getRowsWithColumnsTs"); + oprot.writeMessageBegin(new TMessage("getRowsTs", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected getRowsWithColumnsTs_args getEmptyArgsInstance() { - return new getRowsWithColumnsTs_args(); - } + } - protected getRowsWithColumnsTs_result getResult(I iface, getRowsWithColumnsTs_args args) throws org.apache.thrift.TException { + private class getRowsWithColumnsTs implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + getRowsWithColumnsTs_args args = new getRowsWithColumnsTs_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("getRowsWithColumnsTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); getRowsWithColumnsTs_result result = new getRowsWithColumnsTs_result(); try { - result.success = iface.getRowsWithColumnsTs(args.tableName, args.rows, args.columns, args.timestamp); + result.success = iface_.getRowsWithColumnsTs(args.tableName, args.rows, args.columns, args.timestamp); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing getRowsWithColumnsTs", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing getRowsWithColumnsTs"); + oprot.writeMessageBegin(new TMessage("getRowsWithColumnsTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class mutateRow extends org.apache.thrift.ProcessFunction { - public mutateRow() { - super("mutateRow"); + oprot.writeMessageBegin(new TMessage("getRowsWithColumnsTs", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected mutateRow_args getEmptyArgsInstance() { - return new mutateRow_args(); - } + } - protected mutateRow_result getResult(I iface, mutateRow_args args) throws org.apache.thrift.TException { + private class mutateRow implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + mutateRow_args args = new mutateRow_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("mutateRow", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); mutateRow_result result = new mutateRow_result(); try { - iface.mutateRow(args.tableName, args.row, args.mutations); + iface_.mutateRow(args.tableName, args.row, args.mutations); } catch (IOError io) { result.io = io; } catch (IllegalArgument ia) { result.ia = ia; + } catch (Throwable th) { + LOGGER.error("Internal error processing mutateRow", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing mutateRow"); + oprot.writeMessageBegin(new TMessage("mutateRow", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class mutateRowTs extends org.apache.thrift.ProcessFunction { - public mutateRowTs() { - super("mutateRowTs"); + oprot.writeMessageBegin(new TMessage("mutateRow", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected mutateRowTs_args getEmptyArgsInstance() { - return new mutateRowTs_args(); - } + } - protected mutateRowTs_result getResult(I iface, mutateRowTs_args args) throws org.apache.thrift.TException { + private class mutateRowTs implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + mutateRowTs_args args = new mutateRowTs_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("mutateRowTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); mutateRowTs_result result = new mutateRowTs_result(); try { - iface.mutateRowTs(args.tableName, args.row, args.mutations, args.timestamp); + iface_.mutateRowTs(args.tableName, args.row, args.mutations, args.timestamp); } catch (IOError io) { result.io = io; } catch (IllegalArgument ia) { result.ia = ia; + } catch (Throwable th) { + LOGGER.error("Internal error processing mutateRowTs", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing mutateRowTs"); + oprot.writeMessageBegin(new TMessage("mutateRowTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class mutateRows extends org.apache.thrift.ProcessFunction { - public mutateRows() { - super("mutateRows"); + oprot.writeMessageBegin(new TMessage("mutateRowTs", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected mutateRows_args getEmptyArgsInstance() { - return new mutateRows_args(); - } + } - protected mutateRows_result getResult(I iface, mutateRows_args args) throws org.apache.thrift.TException { + private class mutateRows implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + mutateRows_args args = new mutateRows_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("mutateRows", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); mutateRows_result result = new mutateRows_result(); try { - iface.mutateRows(args.tableName, args.rowBatches); + iface_.mutateRows(args.tableName, args.rowBatches); } catch (IOError io) { result.io = io; } catch (IllegalArgument ia) { result.ia = ia; + } catch (Throwable th) { + LOGGER.error("Internal error processing mutateRows", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing mutateRows"); + oprot.writeMessageBegin(new TMessage("mutateRows", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class mutateRowsTs extends org.apache.thrift.ProcessFunction { - public mutateRowsTs() { - super("mutateRowsTs"); + oprot.writeMessageBegin(new TMessage("mutateRows", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected mutateRowsTs_args getEmptyArgsInstance() { - return new mutateRowsTs_args(); - } + } - protected mutateRowsTs_result getResult(I iface, mutateRowsTs_args args) throws org.apache.thrift.TException { + private class mutateRowsTs implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + mutateRowsTs_args args = new mutateRowsTs_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("mutateRowsTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); mutateRowsTs_result result = new mutateRowsTs_result(); try { - iface.mutateRowsTs(args.tableName, args.rowBatches, args.timestamp); + iface_.mutateRowsTs(args.tableName, args.rowBatches, args.timestamp); } catch (IOError io) { result.io = io; } catch (IllegalArgument ia) { result.ia = ia; + } catch (Throwable th) { + LOGGER.error("Internal error processing mutateRowsTs", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing mutateRowsTs"); + oprot.writeMessageBegin(new TMessage("mutateRowsTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; + oprot.writeMessageBegin(new TMessage("mutateRowsTs", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - } - private static class atomicIncrement extends org.apache.thrift.ProcessFunction { - public atomicIncrement() { - super("atomicIncrement"); - } - - protected atomicIncrement_args getEmptyArgsInstance() { - return new atomicIncrement_args(); - } + } - protected atomicIncrement_result getResult(I iface, atomicIncrement_args args) throws org.apache.thrift.TException { + private class atomicIncrement implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + atomicIncrement_args args = new atomicIncrement_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("atomicIncrement", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); atomicIncrement_result result = new atomicIncrement_result(); try { - result.success = iface.atomicIncrement(args.tableName, args.row, args.column, args.value); + result.success = iface_.atomicIncrement(args.tableName, args.row, args.column, args.value); result.setSuccessIsSet(true); } catch (IOError io) { result.io = io; } catch (IllegalArgument ia) { result.ia = ia; + } catch (Throwable th) { + LOGGER.error("Internal error processing atomicIncrement", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing atomicIncrement"); + oprot.writeMessageBegin(new TMessage("atomicIncrement", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; + oprot.writeMessageBegin(new TMessage("atomicIncrement", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - } - private static class deleteAll extends org.apache.thrift.ProcessFunction { - public deleteAll() { - super("deleteAll"); - } - - protected deleteAll_args getEmptyArgsInstance() { - return new deleteAll_args(); - } + } - protected deleteAll_result getResult(I iface, deleteAll_args args) throws org.apache.thrift.TException { + private class deleteAll implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + deleteAll_args args = new deleteAll_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("deleteAll", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); deleteAll_result result = new deleteAll_result(); try { - iface.deleteAll(args.tableName, args.row, args.column); + iface_.deleteAll(args.tableName, args.row, args.column); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing deleteAll", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing deleteAll"); + oprot.writeMessageBegin(new TMessage("deleteAll", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; + oprot.writeMessageBegin(new TMessage("deleteAll", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - } - private static class deleteAllTs extends org.apache.thrift.ProcessFunction { - public deleteAllTs() { - super("deleteAllTs"); - } - - protected deleteAllTs_args getEmptyArgsInstance() { - return new deleteAllTs_args(); - } + } - protected deleteAllTs_result getResult(I iface, deleteAllTs_args args) throws org.apache.thrift.TException { + private class deleteAllTs implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + deleteAllTs_args args = new deleteAllTs_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("deleteAllTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); deleteAllTs_result result = new deleteAllTs_result(); try { - iface.deleteAllTs(args.tableName, args.row, args.column, args.timestamp); + iface_.deleteAllTs(args.tableName, args.row, args.column, args.timestamp); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing deleteAllTs", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing deleteAllTs"); + oprot.writeMessageBegin(new TMessage("deleteAllTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; + oprot.writeMessageBegin(new TMessage("deleteAllTs", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - } - private static class deleteAllRow extends org.apache.thrift.ProcessFunction { - public deleteAllRow() { - super("deleteAllRow"); - } - - protected deleteAllRow_args getEmptyArgsInstance() { - return new deleteAllRow_args(); - } + } - protected deleteAllRow_result getResult(I iface, deleteAllRow_args args) throws org.apache.thrift.TException { + private class deleteAllRow implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + deleteAllRow_args args = new deleteAllRow_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("deleteAllRow", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); deleteAllRow_result result = new deleteAllRow_result(); try { - iface.deleteAllRow(args.tableName, args.row); + iface_.deleteAllRow(args.tableName, args.row); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing deleteAllRow", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing deleteAllRow"); + oprot.writeMessageBegin(new TMessage("deleteAllRow", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class deleteAllRowTs extends org.apache.thrift.ProcessFunction { - public deleteAllRowTs() { - super("deleteAllRowTs"); + oprot.writeMessageBegin(new TMessage("deleteAllRow", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected deleteAllRowTs_args getEmptyArgsInstance() { - return new deleteAllRowTs_args(); - } + } - protected deleteAllRowTs_result getResult(I iface, deleteAllRowTs_args args) throws org.apache.thrift.TException { + private class deleteAllRowTs implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + deleteAllRowTs_args args = new deleteAllRowTs_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("deleteAllRowTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); deleteAllRowTs_result result = new deleteAllRowTs_result(); try { - iface.deleteAllRowTs(args.tableName, args.row, args.timestamp); + iface_.deleteAllRowTs(args.tableName, args.row, args.timestamp); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing deleteAllRowTs", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing deleteAllRowTs"); + oprot.writeMessageBegin(new TMessage("deleteAllRowTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class scannerOpenWithScan extends org.apache.thrift.ProcessFunction { - public scannerOpenWithScan() { - super("scannerOpenWithScan"); + oprot.writeMessageBegin(new TMessage("deleteAllRowTs", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected scannerOpenWithScan_args getEmptyArgsInstance() { - return new scannerOpenWithScan_args(); - } + } - protected scannerOpenWithScan_result getResult(I iface, scannerOpenWithScan_args args) throws org.apache.thrift.TException { + private class scannerOpenWithScan implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + scannerOpenWithScan_args args = new scannerOpenWithScan_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("scannerOpenWithScan", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); scannerOpenWithScan_result result = new scannerOpenWithScan_result(); try { - result.success = iface.scannerOpenWithScan(args.tableName, args.scan); + result.success = iface_.scannerOpenWithScan(args.tableName, args.scan); result.setSuccessIsSet(true); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing scannerOpenWithScan", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing scannerOpenWithScan"); + oprot.writeMessageBegin(new TMessage("scannerOpenWithScan", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class scannerOpen extends org.apache.thrift.ProcessFunction { - public scannerOpen() { - super("scannerOpen"); + oprot.writeMessageBegin(new TMessage("scannerOpenWithScan", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected scannerOpen_args getEmptyArgsInstance() { - return new scannerOpen_args(); - } + } - protected scannerOpen_result getResult(I iface, scannerOpen_args args) throws org.apache.thrift.TException { + private class scannerOpen implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + scannerOpen_args args = new scannerOpen_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("scannerOpen", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); scannerOpen_result result = new scannerOpen_result(); try { - result.success = iface.scannerOpen(args.tableName, args.startRow, args.columns); + result.success = iface_.scannerOpen(args.tableName, args.startRow, args.columns); result.setSuccessIsSet(true); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing scannerOpen", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing scannerOpen"); + oprot.writeMessageBegin(new TMessage("scannerOpen", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; + oprot.writeMessageBegin(new TMessage("scannerOpen", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - } - private static class scannerOpenWithStop extends org.apache.thrift.ProcessFunction { - public scannerOpenWithStop() { - super("scannerOpenWithStop"); - } - - protected scannerOpenWithStop_args getEmptyArgsInstance() { - return new scannerOpenWithStop_args(); - } + } - protected scannerOpenWithStop_result getResult(I iface, scannerOpenWithStop_args args) throws org.apache.thrift.TException { + private class scannerOpenWithStop implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + scannerOpenWithStop_args args = new scannerOpenWithStop_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("scannerOpenWithStop", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); scannerOpenWithStop_result result = new scannerOpenWithStop_result(); try { - result.success = iface.scannerOpenWithStop(args.tableName, args.startRow, args.stopRow, args.columns); + result.success = iface_.scannerOpenWithStop(args.tableName, args.startRow, args.stopRow, args.columns); result.setSuccessIsSet(true); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing scannerOpenWithStop", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing scannerOpenWithStop"); + oprot.writeMessageBegin(new TMessage("scannerOpenWithStop", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class scannerOpenWithPrefix extends org.apache.thrift.ProcessFunction { - public scannerOpenWithPrefix() { - super("scannerOpenWithPrefix"); + oprot.writeMessageBegin(new TMessage("scannerOpenWithStop", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected scannerOpenWithPrefix_args getEmptyArgsInstance() { - return new scannerOpenWithPrefix_args(); - } + } - protected scannerOpenWithPrefix_result getResult(I iface, scannerOpenWithPrefix_args args) throws org.apache.thrift.TException { + private class scannerOpenWithPrefix implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + scannerOpenWithPrefix_args args = new scannerOpenWithPrefix_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("scannerOpenWithPrefix", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); scannerOpenWithPrefix_result result = new scannerOpenWithPrefix_result(); try { - result.success = iface.scannerOpenWithPrefix(args.tableName, args.startAndPrefix, args.columns); + result.success = iface_.scannerOpenWithPrefix(args.tableName, args.startAndPrefix, args.columns); result.setSuccessIsSet(true); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing scannerOpenWithPrefix", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing scannerOpenWithPrefix"); + oprot.writeMessageBegin(new TMessage("scannerOpenWithPrefix", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class scannerOpenTs extends org.apache.thrift.ProcessFunction { - public scannerOpenTs() { - super("scannerOpenTs"); + oprot.writeMessageBegin(new TMessage("scannerOpenWithPrefix", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected scannerOpenTs_args getEmptyArgsInstance() { - return new scannerOpenTs_args(); - } + } - protected scannerOpenTs_result getResult(I iface, scannerOpenTs_args args) throws org.apache.thrift.TException { + private class scannerOpenTs implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + scannerOpenTs_args args = new scannerOpenTs_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("scannerOpenTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); scannerOpenTs_result result = new scannerOpenTs_result(); try { - result.success = iface.scannerOpenTs(args.tableName, args.startRow, args.columns, args.timestamp); + result.success = iface_.scannerOpenTs(args.tableName, args.startRow, args.columns, args.timestamp); result.setSuccessIsSet(true); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing scannerOpenTs", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing scannerOpenTs"); + oprot.writeMessageBegin(new TMessage("scannerOpenTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class scannerOpenWithStopTs extends org.apache.thrift.ProcessFunction { - public scannerOpenWithStopTs() { - super("scannerOpenWithStopTs"); + oprot.writeMessageBegin(new TMessage("scannerOpenTs", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected scannerOpenWithStopTs_args getEmptyArgsInstance() { - return new scannerOpenWithStopTs_args(); - } + } - protected scannerOpenWithStopTs_result getResult(I iface, scannerOpenWithStopTs_args args) throws org.apache.thrift.TException { + private class scannerOpenWithStopTs implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + scannerOpenWithStopTs_args args = new scannerOpenWithStopTs_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("scannerOpenWithStopTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); scannerOpenWithStopTs_result result = new scannerOpenWithStopTs_result(); try { - result.success = iface.scannerOpenWithStopTs(args.tableName, args.startRow, args.stopRow, args.columns, args.timestamp); + result.success = iface_.scannerOpenWithStopTs(args.tableName, args.startRow, args.stopRow, args.columns, args.timestamp); result.setSuccessIsSet(true); } catch (IOError io) { result.io = io; + } catch (Throwable th) { + LOGGER.error("Internal error processing scannerOpenWithStopTs", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing scannerOpenWithStopTs"); + oprot.writeMessageBegin(new TMessage("scannerOpenWithStopTs", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; - } - } - - private static class scannerGet extends org.apache.thrift.ProcessFunction { - public scannerGet() { - super("scannerGet"); + oprot.writeMessageBegin(new TMessage("scannerOpenWithStopTs", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - protected scannerGet_args getEmptyArgsInstance() { - return new scannerGet_args(); - } + } - protected scannerGet_result getResult(I iface, scannerGet_args args) throws org.apache.thrift.TException { + private class scannerGet implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + scannerGet_args args = new scannerGet_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("scannerGet", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); scannerGet_result result = new scannerGet_result(); try { - result.success = iface.scannerGet(args.id); + result.success = iface_.scannerGet(args.id); } catch (IOError io) { result.io = io; } catch (IllegalArgument ia) { result.ia = ia; + } catch (Throwable th) { + LOGGER.error("Internal error processing scannerGet", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing scannerGet"); + oprot.writeMessageBegin(new TMessage("scannerGet", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; + oprot.writeMessageBegin(new TMessage("scannerGet", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - } - private static class scannerGetList extends org.apache.thrift.ProcessFunction { - public scannerGetList() { - super("scannerGetList"); - } - - protected scannerGetList_args getEmptyArgsInstance() { - return new scannerGetList_args(); - } + } - protected scannerGetList_result getResult(I iface, scannerGetList_args args) throws org.apache.thrift.TException { + private class scannerGetList implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + scannerGetList_args args = new scannerGetList_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("scannerGetList", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); scannerGetList_result result = new scannerGetList_result(); try { - result.success = iface.scannerGetList(args.id, args.nbRows); + result.success = iface_.scannerGetList(args.id, args.nbRows); } catch (IOError io) { result.io = io; } catch (IllegalArgument ia) { result.ia = ia; + } catch (Throwable th) { + LOGGER.error("Internal error processing scannerGetList", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing scannerGetList"); + oprot.writeMessageBegin(new TMessage("scannerGetList", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; + oprot.writeMessageBegin(new TMessage("scannerGetList", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } - } - private static class scannerClose extends org.apache.thrift.ProcessFunction { - public scannerClose() { - super("scannerClose"); - } - - protected scannerClose_args getEmptyArgsInstance() { - return new scannerClose_args(); - } + } - protected scannerClose_result getResult(I iface, scannerClose_args args) throws org.apache.thrift.TException { + private class scannerClose implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + scannerClose_args args = new scannerClose_args(); + try { + args.read(iprot); + } catch (TProtocolException e) { + iprot.readMessageEnd(); + TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage()); + oprot.writeMessageBegin(new TMessage("scannerClose", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; + } + iprot.readMessageEnd(); scannerClose_result result = new scannerClose_result(); try { - iface.scannerClose(args.id); + iface_.scannerClose(args.id); } catch (IOError io) { result.io = io; } catch (IllegalArgument ia) { result.ia = ia; + } catch (Throwable th) { + LOGGER.error("Internal error processing scannerClose", th); + TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing scannerClose"); + oprot.writeMessageBegin(new TMessage("scannerClose", TMessageType.EXCEPTION, seqid)); + x.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + return; } - return result; + oprot.writeMessageBegin(new TMessage("scannerClose", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); } + } } - public static class enableTable_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("enableTable_args"); + public static class enableTable_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("enableTable_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); /** * name of the table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of the table */ @@ -4073,13 +5284,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Bytes"))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Bytes"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(enableTable_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(enableTable_args.class, metaDataMap); } public enableTable_args() { @@ -4114,11 +5325,11 @@ public class Hbase { * name of the table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -4126,7 +5337,7 @@ public class Hbase { * name of the table */ public enableTable_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -4139,7 +5350,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -4172,7 +5383,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -4228,7 +5439,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -4240,25 +5451,25 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -4268,7 +5479,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -4297,37 +5508,21 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class enableTable_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("enableTable_result"); + public static class enableTable_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("enableTable_result"); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public IOError io; // required + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { IO((short)1, "io"); private static final Map byName = new HashMap(); @@ -4386,13 +5581,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(enableTable_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(enableTable_result.class, metaDataMap); } public enableTable_result() { @@ -4436,7 +5631,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -4469,7 +5664,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -4525,7 +5720,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -4537,26 +5732,26 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -4566,7 +5761,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetIo()) { @@ -4594,40 +5789,24 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - - } + public static class disableTable_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("disableTable_args"); - public static class disableTable_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("disableTable_args"); - - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); /** * name of the table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of the table */ @@ -4689,13 +5868,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Bytes"))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Bytes"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(disableTable_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(disableTable_args.class, metaDataMap); } public disableTable_args() { @@ -4730,11 +5909,11 @@ public class Hbase { * name of the table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -4742,7 +5921,7 @@ public class Hbase { * name of the table */ public disableTable_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -4755,7 +5934,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -4788,7 +5967,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -4844,7 +6023,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -4856,25 +6035,25 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -4884,7 +6063,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -4913,37 +6092,21 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } + public static class disableTable_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("disableTable_result"); - } + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public static class disableTable_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("disableTable_result"); - - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - - public IOError io; // required + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { IO((short)1, "io"); private static final Map byName = new HashMap(); @@ -5002,13 +6165,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(disableTable_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(disableTable_result.class, metaDataMap); } public disableTable_result() { @@ -5052,7 +6215,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -5085,7 +6248,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -5141,7 +6304,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -5153,26 +6316,26 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -5182,7 +6345,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetIo()) { @@ -5210,40 +6373,24 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - } + public static class isTableEnabled_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("isTableEnabled_args"); - public static class isTableEnabled_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("isTableEnabled_args"); - - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); /** * name of the table to check */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of the table to check */ @@ -5305,13 +6452,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Bytes"))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Bytes"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(isTableEnabled_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(isTableEnabled_args.class, metaDataMap); } public isTableEnabled_args() { @@ -5346,11 +6493,11 @@ public class Hbase { * name of the table to check */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -5358,7 +6505,7 @@ public class Hbase { * name of the table to check */ public isTableEnabled_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -5371,7 +6518,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -5404,7 +6551,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -5460,7 +6607,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -5472,25 +6619,25 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -5500,7 +6647,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -5529,39 +6676,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class isTableEnabled_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("isTableEnabled_result"); + public static class isTableEnabled_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("isTableEnabled_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.BOOL, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public boolean success; // required - public IOError io; // required + public boolean success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -5625,15 +6756,15 @@ public class Hbase { private static final int __SUCCESS_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.BOOL))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(isTableEnabled_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(isTableEnabled_result.class, metaDataMap); } public isTableEnabled_result() { @@ -5686,7 +6817,7 @@ public class Hbase { __isset_bit_vector.clear(__SUCCESS_ISSET_ID); } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return __isset_bit_vector.get(__SUCCESS_ISSET_ID); } @@ -5708,7 +6839,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -5743,7 +6874,7 @@ public class Hbase { public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Boolean.valueOf(isSuccess()); + return new Boolean(isSuccess()); case IO: return getIo(); @@ -5752,7 +6883,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -5819,7 +6950,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -5829,7 +6960,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -5841,34 +6972,34 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.BOOL) { + if (field.type == TType.BOOL) { this.success = iprot.readBool(); setSuccessIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -5878,7 +7009,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { @@ -5914,37 +7045,21 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - - } + public static class compact_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("compact_args"); - public static class compact_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("compact_args"); + private static final TField TABLE_NAME_OR_REGION_NAME_FIELD_DESC = new TField("tableNameOrRegionName", TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField TABLE_NAME_OR_REGION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableNameOrRegionName", org.apache.thrift.protocol.TType.STRING, (short)1); - - public ByteBuffer tableNameOrRegionName; // required + public ByteBuffer tableNameOrRegionName; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { TABLE_NAME_OR_REGION_NAME((short)1, "tableNameOrRegionName"); private static final Map byName = new HashMap(); @@ -6003,13 +7118,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME_OR_REGION_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableNameOrRegionName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Bytes"))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME_OR_REGION_NAME, new FieldMetaData("tableNameOrRegionName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Bytes"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(compact_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(compact_args.class, metaDataMap); } public compact_args() { @@ -6041,16 +7156,16 @@ public class Hbase { } public byte[] getTableNameOrRegionName() { - setTableNameOrRegionName(org.apache.thrift.TBaseHelper.rightSize(tableNameOrRegionName)); - return tableNameOrRegionName == null ? null : tableNameOrRegionName.array(); + setTableNameOrRegionName(TBaseHelper.rightSize(tableNameOrRegionName)); + return tableNameOrRegionName.array(); } - public ByteBuffer bufferForTableNameOrRegionName() { + public ByteBuffer BufferForTableNameOrRegionName() { return tableNameOrRegionName; } public compact_args setTableNameOrRegionName(byte[] tableNameOrRegionName) { - setTableNameOrRegionName(tableNameOrRegionName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableNameOrRegionName)); + setTableNameOrRegionName(ByteBuffer.wrap(tableNameOrRegionName)); return this; } @@ -6063,7 +7178,7 @@ public class Hbase { this.tableNameOrRegionName = null; } - /** Returns true if field tableNameOrRegionName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableNameOrRegionName is set (has been asigned a value) and false otherwise */ public boolean isSetTableNameOrRegionName() { return this.tableNameOrRegionName != null; } @@ -6096,7 +7211,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -6152,7 +7267,7 @@ public class Hbase { return lastComparison; } if (isSetTableNameOrRegionName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableNameOrRegionName, typedOther.tableNameOrRegionName); + lastComparison = TBaseHelper.compareTo(this.tableNameOrRegionName, typedOther.tableNameOrRegionName); if (lastComparison != 0) { return lastComparison; } @@ -6164,25 +7279,25 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME_OR_REGION_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableNameOrRegionName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -6192,7 +7307,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -6221,37 +7336,21 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class compact_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("compact_result"); + public static class compact_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("compact_result"); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public IOError io; // required + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { IO((short)1, "io"); private static final Map byName = new HashMap(); @@ -6310,13 +7409,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(compact_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(compact_result.class, metaDataMap); } public compact_result() { @@ -6360,7 +7459,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -6393,7 +7492,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -6449,7 +7548,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -6461,26 +7560,26 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -6490,7 +7589,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetIo()) { @@ -6518,37 +7617,21 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - } + public static class majorCompact_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("majorCompact_args"); - public static class majorCompact_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("majorCompact_args"); + private static final TField TABLE_NAME_OR_REGION_NAME_FIELD_DESC = new TField("tableNameOrRegionName", TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField TABLE_NAME_OR_REGION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableNameOrRegionName", org.apache.thrift.protocol.TType.STRING, (short)1); - - public ByteBuffer tableNameOrRegionName; // required + public ByteBuffer tableNameOrRegionName; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { TABLE_NAME_OR_REGION_NAME((short)1, "tableNameOrRegionName"); private static final Map byName = new HashMap(); @@ -6607,13 +7690,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME_OR_REGION_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableNameOrRegionName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Bytes"))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME_OR_REGION_NAME, new FieldMetaData("tableNameOrRegionName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Bytes"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(majorCompact_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(majorCompact_args.class, metaDataMap); } public majorCompact_args() { @@ -6645,16 +7728,16 @@ public class Hbase { } public byte[] getTableNameOrRegionName() { - setTableNameOrRegionName(org.apache.thrift.TBaseHelper.rightSize(tableNameOrRegionName)); - return tableNameOrRegionName == null ? null : tableNameOrRegionName.array(); + setTableNameOrRegionName(TBaseHelper.rightSize(tableNameOrRegionName)); + return tableNameOrRegionName.array(); } - public ByteBuffer bufferForTableNameOrRegionName() { + public ByteBuffer BufferForTableNameOrRegionName() { return tableNameOrRegionName; } public majorCompact_args setTableNameOrRegionName(byte[] tableNameOrRegionName) { - setTableNameOrRegionName(tableNameOrRegionName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableNameOrRegionName)); + setTableNameOrRegionName(ByteBuffer.wrap(tableNameOrRegionName)); return this; } @@ -6667,7 +7750,7 @@ public class Hbase { this.tableNameOrRegionName = null; } - /** Returns true if field tableNameOrRegionName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableNameOrRegionName is set (has been asigned a value) and false otherwise */ public boolean isSetTableNameOrRegionName() { return this.tableNameOrRegionName != null; } @@ -6700,7 +7783,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -6756,7 +7839,7 @@ public class Hbase { return lastComparison; } if (isSetTableNameOrRegionName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableNameOrRegionName, typedOther.tableNameOrRegionName); + lastComparison = TBaseHelper.compareTo(this.tableNameOrRegionName, typedOther.tableNameOrRegionName); if (lastComparison != 0) { return lastComparison; } @@ -6768,25 +7851,25 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME_OR_REGION_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableNameOrRegionName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -6796,7 +7879,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -6825,37 +7908,21 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - - } - - public static class majorCompact_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("majorCompact_result"); + public static class majorCompact_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("majorCompact_result"); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public IOError io; // required + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { IO((short)1, "io"); private static final Map byName = new HashMap(); @@ -6914,13 +7981,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(majorCompact_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(majorCompact_result.class, metaDataMap); } public majorCompact_result() { @@ -6964,7 +8031,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -6997,7 +8064,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -7053,7 +8120,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -7065,26 +8132,26 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -7094,7 +8161,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetIo()) { @@ -7122,35 +8189,19 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - - } - - public static class getTableNames_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTableNames_args"); + public static class getTableNames_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getTableNames_args"); /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { ; private static final Map byName = new HashMap(); @@ -7204,11 +8255,11 @@ public class Hbase { return _fieldName; } } - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, FieldMetaData> metaDataMap; static { - Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTableNames_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getTableNames_args.class, metaDataMap); } public getTableNames_args() { @@ -7239,7 +8290,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -7286,18 +8337,18 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -7307,7 +8358,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -7324,39 +8375,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class getTableNames_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTableNames_result"); + public static class getTableNames_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getTableNames_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public List success; // required - public IOError io; // required + public List success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -7418,16 +8453,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.STRING , "Text")))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTableNames_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getTableNames_result.class, metaDataMap); } public getTableNames_result() { @@ -7496,7 +8531,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -7520,7 +8555,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -7564,7 +8599,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -7631,7 +8666,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -7641,7 +8676,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -7653,43 +8688,43 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list13 = iprot.readListBegin(); + TList _list13 = iprot.readListBegin(); this.success = new ArrayList(_list13.size); for (int _i14 = 0; _i14 < _list13.size; ++_i14) { - ByteBuffer _elem15; // required + ByteBuffer _elem15; _elem15 = iprot.readBinary(); this.success.add(_elem15); } iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -7699,13 +8734,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.success.size())); + oprot.writeListBegin(new TList(TType.STRING, this.success.size())); for (ByteBuffer _iter16 : this.success) { oprot.writeBinary(_iter16); @@ -7746,40 +8781,24 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - - } + public static class getColumnDescriptors_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getColumnDescriptors_args"); - public static class getColumnDescriptors_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getColumnDescriptors_args"); - - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); /** * table name */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * table name */ @@ -7841,13 +8860,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getColumnDescriptors_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getColumnDescriptors_args.class, metaDataMap); } public getColumnDescriptors_args() { @@ -7882,11 +8901,11 @@ public class Hbase { * table name */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -7894,7 +8913,7 @@ public class Hbase { * table name */ public getColumnDescriptors_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -7907,7 +8926,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -7940,7 +8959,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -7996,7 +9015,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -8008,25 +9027,25 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -8036,7 +9055,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -8065,39 +9084,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - - } - public static class getColumnDescriptors_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getColumnDescriptors_result"); + public static class getColumnDescriptors_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getColumnDescriptors_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.MAP, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.MAP, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public Map success; // required - public IOError io; // required + public Map success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -8159,17 +9162,17 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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 , "Text"), - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnDescriptor.class)))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new MapMetaData(TType.MAP, + new FieldValueMetaData(TType.STRING , "Text"), + new StructMetaData(TType.STRUCT, ColumnDescriptor.class)))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getColumnDescriptors_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getColumnDescriptors_result.class, metaDataMap); } public getColumnDescriptors_result() { @@ -8242,7 +9245,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -8266,7 +9269,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -8310,7 +9313,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -8377,7 +9380,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -8387,7 +9390,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -8399,25 +9402,25 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.MAP) { + if (field.type == TType.MAP) { { - org.apache.thrift.protocol.TMap _map17 = iprot.readMapBegin(); + TMap _map17 = iprot.readMapBegin(); this.success = new HashMap(2*_map17.size); for (int _i18 = 0; _i18 < _map17.size; ++_i18) { - ByteBuffer _key19; // required - ColumnDescriptor _val20; // required + ByteBuffer _key19; + ColumnDescriptor _val20; _key19 = iprot.readBinary(); _val20 = new ColumnDescriptor(); _val20.read(iprot); @@ -8426,19 +9429,19 @@ public class Hbase { iprot.readMapEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -8448,13 +9451,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + oprot.writeMapBegin(new TMap(TType.STRING, TType.STRUCT, this.success.size())); for (Map.Entry _iter21 : this.success.entrySet()) { oprot.writeBinary(_iter21.getKey()); @@ -8496,40 +9499,24 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - } - - public static class getTableRegions_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTableRegions_args"); + public static class getTableRegions_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getTableRegions_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); /** * table name */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * table name */ @@ -8591,13 +9578,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTableRegions_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getTableRegions_args.class, metaDataMap); } public getTableRegions_args() { @@ -8632,11 +9619,11 @@ public class Hbase { * table name */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -8644,7 +9631,7 @@ public class Hbase { * table name */ public getTableRegions_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -8657,7 +9644,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -8690,7 +9677,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -8746,7 +9733,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -8758,25 +9745,25 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -8786,7 +9773,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -8815,39 +9802,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } + public static class getTableRegions_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getTableRegions_result"); - } - - public static class getTableRegions_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTableRegions_result"); - - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public List success; // required - public IOError io; // required + public List success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -8909,16 +9880,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, TRegionInfo.class)))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, TRegionInfo.class)))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTableRegions_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getTableRegions_result.class, metaDataMap); } public getTableRegions_result() { @@ -8987,7 +9958,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -9011,7 +9982,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -9055,7 +10026,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -9122,7 +10093,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -9132,7 +10103,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -9144,24 +10115,24 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list22 = iprot.readListBegin(); + TList _list22 = iprot.readListBegin(); this.success = new ArrayList(_list22.size); for (int _i23 = 0; _i23 < _list22.size; ++_i23) { - TRegionInfo _elem24; // required + TRegionInfo _elem24; _elem24 = new TRegionInfo(); _elem24.read(iprot); this.success.add(_elem24); @@ -9169,19 +10140,19 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -9191,13 +10162,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); for (TRegionInfo _iter25 : this.success) { _iter25.write(oprot); @@ -9238,45 +10209,29 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - - } - public static class createTable_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createTable_args"); + public static class createTable_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("createTable_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField COLUMN_FAMILIES_FIELD_DESC = new org.apache.thrift.protocol.TField("columnFamilies", org.apache.thrift.protocol.TType.LIST, (short)2); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField COLUMN_FAMILIES_FIELD_DESC = new TField("columnFamilies", TType.LIST, (short)2); /** * name of table to create */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * list of column family descriptors */ - public List columnFamilies; // required + public List columnFamilies; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table to create */ @@ -9344,16 +10299,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.COLUMN_FAMILIES, new org.apache.thrift.meta_data.FieldMetaData("columnFamilies", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, ColumnDescriptor.class)))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.COLUMN_FAMILIES, new FieldMetaData("columnFamilies", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, ColumnDescriptor.class)))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createTable_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(createTable_args.class, metaDataMap); } public createTable_args() { @@ -9398,11 +10353,11 @@ public class Hbase { * name of table to create */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -9410,7 +10365,7 @@ public class Hbase { * name of table to create */ public createTable_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -9423,7 +10378,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -9468,7 +10423,7 @@ public class Hbase { this.columnFamilies = null; } - /** Returns true if field columnFamilies is set (has been assigned a value) and false otherwise */ + /** Returns true if field columnFamilies is set (has been asigned a value) and false otherwise */ public boolean isSetColumnFamilies() { return this.columnFamilies != null; } @@ -9512,7 +10467,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -9579,7 +10534,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -9589,7 +10544,7 @@ public class Hbase { return lastComparison; } if (isSetColumnFamilies()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnFamilies, typedOther.columnFamilies); + lastComparison = TBaseHelper.compareTo(this.columnFamilies, typedOther.columnFamilies); if (lastComparison != 0) { return lastComparison; } @@ -9601,31 +10556,31 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // COLUMN_FAMILIES - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list26 = iprot.readListBegin(); + TList _list26 = iprot.readListBegin(); this.columnFamilies = new ArrayList(_list26.size); for (int _i27 = 0; _i27 < _list26.size; ++_i27) { - ColumnDescriptor _elem28; // required + ColumnDescriptor _elem28; _elem28 = new ColumnDescriptor(); _elem28.read(iprot); this.columnFamilies.add(_elem28); @@ -9633,11 +10588,11 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -9647,7 +10602,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -9659,7 +10614,7 @@ public class Hbase { if (this.columnFamilies != null) { oprot.writeFieldBegin(COLUMN_FAMILIES_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.columnFamilies.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.columnFamilies.size())); for (ColumnDescriptor _iter29 : this.columnFamilies) { _iter29.write(oprot); @@ -9696,41 +10651,25 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - - } - public static class createTable_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createTable_result"); + public static class createTable_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("createTable_result"); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField IA_FIELD_DESC = new org.apache.thrift.protocol.TField("ia", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField EXIST_FIELD_DESC = new org.apache.thrift.protocol.TField("exist", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); + private static final TField IA_FIELD_DESC = new TField("ia", TType.STRUCT, (short)2); + private static final TField EXIST_FIELD_DESC = new TField("exist", TType.STRUCT, (short)3); - public IOError io; // required - public IllegalArgument ia; // required - public AlreadyExists exist; // required + public IOError io; + public IllegalArgument ia; + public AlreadyExists exist; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { IO((short)1, "io"), IA((short)2, "ia"), EXIST((short)3, "exist"); @@ -9795,17 +10734,17 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - tmpMap.put(_Fields.IA, new org.apache.thrift.meta_data.FieldMetaData("ia", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - tmpMap.put(_Fields.EXIST, new org.apache.thrift.meta_data.FieldMetaData("exist", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); + tmpMap.put(_Fields.IA, new FieldMetaData("ia", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); + tmpMap.put(_Fields.EXIST, new FieldMetaData("exist", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createTable_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(createTable_result.class, metaDataMap); } public createTable_result() { @@ -9861,7 +10800,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -9885,7 +10824,7 @@ public class Hbase { this.ia = null; } - /** Returns true if field ia is set (has been assigned a value) and false otherwise */ + /** Returns true if field ia is set (has been asigned a value) and false otherwise */ public boolean isSetIa() { return this.ia != null; } @@ -9909,7 +10848,7 @@ public class Hbase { this.exist = null; } - /** Returns true if field exist is set (has been assigned a value) and false otherwise */ + /** Returns true if field exist is set (has been asigned a value) and false otherwise */ public boolean isSetExist() { return this.exist != null; } @@ -9964,7 +10903,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -10042,7 +10981,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -10052,7 +10991,7 @@ public class Hbase { return lastComparison; } if (isSetIa()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ia, typedOther.ia); + lastComparison = TBaseHelper.compareTo(this.ia, typedOther.ia); if (lastComparison != 0) { return lastComparison; } @@ -10062,7 +11001,7 @@ public class Hbase { return lastComparison; } if (isSetExist()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.exist, typedOther.exist); + lastComparison = TBaseHelper.compareTo(this.exist, typedOther.exist); if (lastComparison != 0) { return lastComparison; } @@ -10074,42 +11013,42 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // IA - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.ia = new IllegalArgument(); this.ia.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // EXIST - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.exist = new AlreadyExists(); this.exist.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -10119,7 +11058,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetIo()) { @@ -10171,40 +11110,24 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } + public static class deleteTable_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("deleteTable_args"); - } - - public static class deleteTable_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteTable_args"); - - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); /** * name of table to delete */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table to delete */ @@ -10266,13 +11189,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteTable_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(deleteTable_args.class, metaDataMap); } public deleteTable_args() { @@ -10307,11 +11230,11 @@ public class Hbase { * name of table to delete */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -10319,7 +11242,7 @@ public class Hbase { * name of table to delete */ public deleteTable_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -10332,7 +11255,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -10365,7 +11288,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -10421,7 +11344,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -10433,25 +11356,25 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -10461,7 +11384,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -10490,37 +11413,21 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } + public static class deleteTable_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("deleteTable_result"); - } - - public static class deleteTable_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteTable_result"); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - - public IOError io; // required + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { IO((short)1, "io"); private static final Map byName = new HashMap(); @@ -10579,13 +11486,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteTable_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(deleteTable_result.class, metaDataMap); } public deleteTable_result() { @@ -10629,7 +11536,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -10662,7 +11569,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -10718,7 +11625,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -10730,26 +11637,26 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -10759,7 +11666,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetIo()) { @@ -10787,50 +11694,34 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class get_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_args"); + public static class get_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("get_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_FIELD_DESC = new TField("row", TType.STRING, (short)2); + private static final TField COLUMN_FIELD_DESC = new TField("column", TType.STRING, (short)3); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * row key */ - public ByteBuffer row; // required + public ByteBuffer row; /** * column name */ - public ByteBuffer column; // required + public ByteBuffer column; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -10904,17 +11795,17 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW, new FieldMetaData("row", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.COLUMN, new FieldMetaData("column", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(get_args.class, metaDataMap); } public get_args() { @@ -10961,11 +11852,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -10973,7 +11864,7 @@ public class Hbase { * name of table */ public get_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -10986,7 +11877,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -11001,11 +11892,11 @@ public class Hbase { * row key */ public byte[] getRow() { - setRow(org.apache.thrift.TBaseHelper.rightSize(row)); - return row == null ? null : row.array(); + setRow(TBaseHelper.rightSize(row)); + return row.array(); } - public ByteBuffer bufferForRow() { + public ByteBuffer BufferForRow() { return row; } @@ -11013,7 +11904,7 @@ public class Hbase { * row key */ public get_args setRow(byte[] row) { - setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); + setRow(ByteBuffer.wrap(row)); return this; } @@ -11026,7 +11917,7 @@ public class Hbase { this.row = null; } - /** Returns true if field row is set (has been assigned a value) and false otherwise */ + /** Returns true if field row is set (has been asigned a value) and false otherwise */ public boolean isSetRow() { return this.row != null; } @@ -11041,11 +11932,11 @@ public class Hbase { * column name */ public byte[] getColumn() { - setColumn(org.apache.thrift.TBaseHelper.rightSize(column)); - return column == null ? null : column.array(); + setColumn(TBaseHelper.rightSize(column)); + return column.array(); } - public ByteBuffer bufferForColumn() { + public ByteBuffer BufferForColumn() { return column; } @@ -11053,7 +11944,7 @@ public class Hbase { * column name */ public get_args setColumn(byte[] column) { - setColumn(column == null ? (ByteBuffer)null : ByteBuffer.wrap(column)); + setColumn(ByteBuffer.wrap(column)); return this; } @@ -11066,7 +11957,7 @@ public class Hbase { this.column = null; } - /** Returns true if field column is set (has been assigned a value) and false otherwise */ + /** Returns true if field column is set (has been asigned a value) and false otherwise */ public boolean isSetColumn() { return this.column != null; } @@ -11121,7 +12012,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -11199,7 +12090,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -11209,7 +12100,7 @@ public class Hbase { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } @@ -11219,7 +12110,7 @@ public class Hbase { return lastComparison; } if (isSetColumn()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column); + lastComparison = TBaseHelper.compareTo(this.column, typedOther.column); if (lastComparison != 0) { return lastComparison; } @@ -11231,39 +12122,39 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.row = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // COLUMN - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.column = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -11273,7 +12164,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -11328,39 +12219,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - - } + public static class get_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("get_result"); - public static class get_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_result"); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - - public List success; // required - public IOError io; // required + public List success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -11422,16 +12297,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, TCell.class)))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, TCell.class)))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(get_result.class, metaDataMap); } public get_result() { @@ -11500,7 +12375,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -11524,7 +12399,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -11568,7 +12443,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -11635,7 +12510,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -11645,7 +12520,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -11657,24 +12532,24 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list30 = iprot.readListBegin(); + TList _list30 = iprot.readListBegin(); this.success = new ArrayList(_list30.size); for (int _i31 = 0; _i31 < _list30.size; ++_i31) { - TCell _elem32; // required + TCell _elem32; _elem32 = new TCell(); _elem32.read(iprot); this.success.add(_elem32); @@ -11682,19 +12557,19 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -11704,13 +12579,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); for (TCell _iter33 : this.success) { _iter33.write(oprot); @@ -11751,55 +12626,39 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } + public static class getVer_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getVer_args"); - } - - public static class getVer_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getVer_args"); - - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField NUM_VERSIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("numVersions", org.apache.thrift.protocol.TType.I32, (short)4); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_FIELD_DESC = new TField("row", TType.STRING, (short)2); + private static final TField COLUMN_FIELD_DESC = new TField("column", TType.STRING, (short)3); + private static final TField NUM_VERSIONS_FIELD_DESC = new TField("numVersions", TType.I32, (short)4); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * row key */ - public ByteBuffer row; // required + public ByteBuffer row; /** * column name */ - public ByteBuffer column; // required + public ByteBuffer column; /** * number of versions to retrieve */ - public int numVersions; // required + public int numVersions; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -11881,19 +12740,19 @@ public class Hbase { private static final int __NUMVERSIONS_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.NUM_VERSIONS, new org.apache.thrift.meta_data.FieldMetaData("numVersions", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW, new FieldMetaData("row", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.COLUMN, new FieldMetaData("column", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.NUM_VERSIONS, new FieldMetaData("numVersions", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getVer_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getVer_args.class, metaDataMap); } public getVer_args() { @@ -11948,11 +12807,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -11960,7 +12819,7 @@ public class Hbase { * name of table */ public getVer_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -11973,7 +12832,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -11988,11 +12847,11 @@ public class Hbase { * row key */ public byte[] getRow() { - setRow(org.apache.thrift.TBaseHelper.rightSize(row)); - return row == null ? null : row.array(); + setRow(TBaseHelper.rightSize(row)); + return row.array(); } - public ByteBuffer bufferForRow() { + public ByteBuffer BufferForRow() { return row; } @@ -12000,7 +12859,7 @@ public class Hbase { * row key */ public getVer_args setRow(byte[] row) { - setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); + setRow(ByteBuffer.wrap(row)); return this; } @@ -12013,7 +12872,7 @@ public class Hbase { this.row = null; } - /** Returns true if field row is set (has been assigned a value) and false otherwise */ + /** Returns true if field row is set (has been asigned a value) and false otherwise */ public boolean isSetRow() { return this.row != null; } @@ -12028,11 +12887,11 @@ public class Hbase { * column name */ public byte[] getColumn() { - setColumn(org.apache.thrift.TBaseHelper.rightSize(column)); - return column == null ? null : column.array(); + setColumn(TBaseHelper.rightSize(column)); + return column.array(); } - public ByteBuffer bufferForColumn() { + public ByteBuffer BufferForColumn() { return column; } @@ -12040,7 +12899,7 @@ public class Hbase { * column name */ public getVer_args setColumn(byte[] column) { - setColumn(column == null ? (ByteBuffer)null : ByteBuffer.wrap(column)); + setColumn(ByteBuffer.wrap(column)); return this; } @@ -12053,7 +12912,7 @@ public class Hbase { this.column = null; } - /** Returns true if field column is set (has been assigned a value) and false otherwise */ + /** Returns true if field column is set (has been asigned a value) and false otherwise */ public boolean isSetColumn() { return this.column != null; } @@ -12084,7 +12943,7 @@ public class Hbase { __isset_bit_vector.clear(__NUMVERSIONS_ISSET_ID); } - /** Returns true if field numVersions is set (has been assigned a value) and false otherwise */ + /** Returns true if field numVersions is set (has been asigned a value) and false otherwise */ public boolean isSetNumVersions() { return __isset_bit_vector.get(__NUMVERSIONS_ISSET_ID); } @@ -12142,13 +13001,13 @@ public class Hbase { return getColumn(); case NUM_VERSIONS: - return Integer.valueOf(getNumVersions()); + return new Integer(getNumVersions()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -12237,7 +13096,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -12247,7 +13106,7 @@ public class Hbase { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } @@ -12257,7 +13116,7 @@ public class Hbase { return lastComparison; } if (isSetColumn()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column); + lastComparison = TBaseHelper.compareTo(this.column, typedOther.column); if (lastComparison != 0) { return lastComparison; } @@ -12267,7 +13126,7 @@ public class Hbase { return lastComparison; } if (isSetNumVersions()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.numVersions, typedOther.numVersions); + lastComparison = TBaseHelper.compareTo(this.numVersions, typedOther.numVersions); if (lastComparison != 0) { return lastComparison; } @@ -12279,47 +13138,47 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.row = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // COLUMN - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.column = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 4: // NUM_VERSIONS - if (field.type == org.apache.thrift.protocol.TType.I32) { + if (field.type == TType.I32) { this.numVersions = iprot.readI32(); setNumVersionsIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -12329,7 +13188,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -12391,39 +13250,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - } + public static class getVer_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getVer_result"); - public static class getVer_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getVer_result"); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - - public List success; // required - public IOError io; // required + public List success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -12485,16 +13328,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, TCell.class)))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, TCell.class)))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getVer_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getVer_result.class, metaDataMap); } public getVer_result() { @@ -12563,7 +13406,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -12587,7 +13430,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -12631,7 +13474,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -12698,7 +13541,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -12708,7 +13551,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -12720,24 +13563,24 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list34 = iprot.readListBegin(); + TList _list34 = iprot.readListBegin(); this.success = new ArrayList(_list34.size); for (int _i35 = 0; _i35 < _list34.size; ++_i35) { - TCell _elem36; // required + TCell _elem36; _elem36 = new TCell(); _elem36.read(iprot); this.success.add(_elem36); @@ -12745,19 +13588,19 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -12767,13 +13610,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); for (TCell _iter37 : this.success) { _iter37.write(oprot); @@ -12814,60 +13657,44 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class getVerTs_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getVerTs_args"); + public static class getVerTs_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getVerTs_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)4); - private static final org.apache.thrift.protocol.TField NUM_VERSIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("numVersions", org.apache.thrift.protocol.TType.I32, (short)5); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_FIELD_DESC = new TField("row", TType.STRING, (short)2); + private static final TField COLUMN_FIELD_DESC = new TField("column", TType.STRING, (short)3); + private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)4); + private static final TField NUM_VERSIONS_FIELD_DESC = new TField("numVersions", TType.I32, (short)5); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * row key */ - public ByteBuffer row; // required + public ByteBuffer row; /** * column name */ - public ByteBuffer column; // required + public ByteBuffer column; /** * timestamp */ - public long timestamp; // required + public long timestamp; /** * number of versions to retrieve */ - public int numVersions; // required + public int numVersions; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -12956,21 +13783,21 @@ public class Hbase { private static final int __NUMVERSIONS_ISSET_ID = 1; private BitSet __isset_bit_vector = new BitSet(2); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - tmpMap.put(_Fields.NUM_VERSIONS, new org.apache.thrift.meta_data.FieldMetaData("numVersions", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW, new FieldMetaData("row", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.COLUMN, new FieldMetaData("column", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.TIMESTAMP, new FieldMetaData("timestamp", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I64))); + tmpMap.put(_Fields.NUM_VERSIONS, new FieldMetaData("numVersions", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getVerTs_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getVerTs_args.class, metaDataMap); } public getVerTs_args() { @@ -13031,11 +13858,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -13043,7 +13870,7 @@ public class Hbase { * name of table */ public getVerTs_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -13056,7 +13883,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -13071,11 +13898,11 @@ public class Hbase { * row key */ public byte[] getRow() { - setRow(org.apache.thrift.TBaseHelper.rightSize(row)); - return row == null ? null : row.array(); + setRow(TBaseHelper.rightSize(row)); + return row.array(); } - public ByteBuffer bufferForRow() { + public ByteBuffer BufferForRow() { return row; } @@ -13083,7 +13910,7 @@ public class Hbase { * row key */ public getVerTs_args setRow(byte[] row) { - setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); + setRow(ByteBuffer.wrap(row)); return this; } @@ -13096,7 +13923,7 @@ public class Hbase { this.row = null; } - /** Returns true if field row is set (has been assigned a value) and false otherwise */ + /** Returns true if field row is set (has been asigned a value) and false otherwise */ public boolean isSetRow() { return this.row != null; } @@ -13111,11 +13938,11 @@ public class Hbase { * column name */ public byte[] getColumn() { - setColumn(org.apache.thrift.TBaseHelper.rightSize(column)); - return column == null ? null : column.array(); + setColumn(TBaseHelper.rightSize(column)); + return column.array(); } - public ByteBuffer bufferForColumn() { + public ByteBuffer BufferForColumn() { return column; } @@ -13123,7 +13950,7 @@ public class Hbase { * column name */ public getVerTs_args setColumn(byte[] column) { - setColumn(column == null ? (ByteBuffer)null : ByteBuffer.wrap(column)); + setColumn(ByteBuffer.wrap(column)); return this; } @@ -13136,7 +13963,7 @@ public class Hbase { this.column = null; } - /** Returns true if field column is set (has been assigned a value) and false otherwise */ + /** Returns true if field column is set (has been asigned a value) and false otherwise */ public boolean isSetColumn() { return this.column != null; } @@ -13167,7 +13994,7 @@ public class Hbase { __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID); } - /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */ + /** Returns true if field timestamp is set (has been asigned a value) and false otherwise */ public boolean isSetTimestamp() { return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID); } @@ -13196,7 +14023,7 @@ public class Hbase { __isset_bit_vector.clear(__NUMVERSIONS_ISSET_ID); } - /** Returns true if field numVersions is set (has been assigned a value) and false otherwise */ + /** Returns true if field numVersions is set (has been asigned a value) and false otherwise */ public boolean isSetNumVersions() { return __isset_bit_vector.get(__NUMVERSIONS_ISSET_ID); } @@ -13262,16 +14089,16 @@ public class Hbase { return getColumn(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return new Long(getTimestamp()); case NUM_VERSIONS: - return Integer.valueOf(getNumVersions()); + return new Integer(getNumVersions()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -13371,7 +14198,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -13381,7 +14208,7 @@ public class Hbase { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } @@ -13391,7 +14218,7 @@ public class Hbase { return lastComparison; } if (isSetColumn()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column); + lastComparison = TBaseHelper.compareTo(this.column, typedOther.column); if (lastComparison != 0) { return lastComparison; } @@ -13401,7 +14228,7 @@ public class Hbase { return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); + lastComparison = TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); if (lastComparison != 0) { return lastComparison; } @@ -13411,7 +14238,7 @@ public class Hbase { return lastComparison; } if (isSetNumVersions()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.numVersions, typedOther.numVersions); + lastComparison = TBaseHelper.compareTo(this.numVersions, typedOther.numVersions); if (lastComparison != 0) { return lastComparison; } @@ -13423,55 +14250,55 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.row = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // COLUMN - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.column = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 4: // TIMESTAMP - if (field.type == org.apache.thrift.protocol.TType.I64) { + if (field.type == TType.I64) { this.timestamp = iprot.readI64(); setTimestampIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 5: // NUM_VERSIONS - if (field.type == org.apache.thrift.protocol.TType.I32) { + if (field.type == TType.I32) { this.numVersions = iprot.readI32(); setNumVersionsIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -13481,7 +14308,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -13550,41 +14377,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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_bit_vector = new BitSet(1); - 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); - } - } - - } + public static class getVerTs_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getVerTs_result"); - public static class getVerTs_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getVerTs_result"); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - - public List success; // required - public IOError io; // required + public List success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -13646,16 +14455,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, TCell.class)))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, TCell.class)))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getVerTs_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getVerTs_result.class, metaDataMap); } public getVerTs_result() { @@ -13724,7 +14533,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -13748,7 +14557,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -13792,7 +14601,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -13859,7 +14668,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -13869,7 +14678,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -13881,24 +14690,24 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list38 = iprot.readListBegin(); + TList _list38 = iprot.readListBegin(); this.success = new ArrayList(_list38.size); for (int _i39 = 0; _i39 < _list38.size; ++_i39) { - TCell _elem40; // required + TCell _elem40; _elem40 = new TCell(); _elem40.read(iprot); this.success.add(_elem40); @@ -13906,19 +14715,19 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -13928,13 +14737,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); for (TCell _iter41 : this.success) { _iter41.write(oprot); @@ -13975,45 +14784,29 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class getRow_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRow_args"); + public static class getRow_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRow_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_FIELD_DESC = new TField("row", TType.STRING, (short)2); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * row key */ - public ByteBuffer row; // required + public ByteBuffer row; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -14081,15 +14874,15 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW, new FieldMetaData("row", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRow_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRow_args.class, metaDataMap); } public getRow_args() { @@ -14130,11 +14923,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -14142,7 +14935,7 @@ public class Hbase { * name of table */ public getRow_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -14155,7 +14948,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -14170,11 +14963,11 @@ public class Hbase { * row key */ public byte[] getRow() { - setRow(org.apache.thrift.TBaseHelper.rightSize(row)); - return row == null ? null : row.array(); + setRow(TBaseHelper.rightSize(row)); + return row.array(); } - public ByteBuffer bufferForRow() { + public ByteBuffer BufferForRow() { return row; } @@ -14182,7 +14975,7 @@ public class Hbase { * row key */ public getRow_args setRow(byte[] row) { - setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); + setRow(ByteBuffer.wrap(row)); return this; } @@ -14195,7 +14988,7 @@ public class Hbase { this.row = null; } - /** Returns true if field row is set (has been assigned a value) and false otherwise */ + /** Returns true if field row is set (has been asigned a value) and false otherwise */ public boolean isSetRow() { return this.row != null; } @@ -14239,7 +15032,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -14306,7 +15099,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -14316,7 +15109,7 @@ public class Hbase { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } @@ -14328,32 +15121,32 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.row = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -14363,7 +15156,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -14405,39 +15198,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - } + public static class getRow_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRow_result"); - public static class getRow_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRow_result"); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - - public List success; // required - public IOError io; // required + public List success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -14499,16 +15276,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, TRowResult.class)))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, TRowResult.class)))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRow_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRow_result.class, metaDataMap); } public getRow_result() { @@ -14577,7 +15354,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -14601,7 +15378,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -14645,7 +15422,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -14712,7 +15489,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -14722,7 +15499,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -14734,24 +15511,24 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list42 = iprot.readListBegin(); + TList _list42 = iprot.readListBegin(); this.success = new ArrayList(_list42.size); for (int _i43 = 0; _i43 < _list42.size; ++_i43) { - TRowResult _elem44; // required + TRowResult _elem44; _elem44 = new TRowResult(); _elem44.read(iprot); this.success.add(_elem44); @@ -14759,19 +15536,19 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -14781,13 +15558,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); for (TRowResult _iter45 : this.success) { _iter45.write(oprot); @@ -14828,50 +15605,34 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - - } - - public static class getRowWithColumns_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRowWithColumns_args"); + public static class getRowWithColumns_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRowWithColumns_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)3); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_FIELD_DESC = new TField("row", TType.STRING, (short)2); + private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.LIST, (short)3); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * row key */ - public ByteBuffer row; // required + public ByteBuffer row; /** * List of columns to return, null for all columns */ - public List columns; // required + public List columns; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -14945,18 +15706,18 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW, new FieldMetaData("row", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.STRING , "Text")))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRowWithColumns_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRowWithColumns_args.class, metaDataMap); } public getRowWithColumns_args() { @@ -15007,11 +15768,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -15019,7 +15780,7 @@ public class Hbase { * name of table */ public getRowWithColumns_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -15032,7 +15793,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -15047,11 +15808,11 @@ public class Hbase { * row key */ public byte[] getRow() { - setRow(org.apache.thrift.TBaseHelper.rightSize(row)); - return row == null ? null : row.array(); + setRow(TBaseHelper.rightSize(row)); + return row.array(); } - public ByteBuffer bufferForRow() { + public ByteBuffer BufferForRow() { return row; } @@ -15059,7 +15820,7 @@ public class Hbase { * row key */ public getRowWithColumns_args setRow(byte[] row) { - setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); + setRow(ByteBuffer.wrap(row)); return this; } @@ -15072,7 +15833,7 @@ public class Hbase { this.row = null; } - /** Returns true if field row is set (has been assigned a value) and false otherwise */ + /** Returns true if field row is set (has been asigned a value) and false otherwise */ public boolean isSetRow() { return this.row != null; } @@ -15117,7 +15878,7 @@ public class Hbase { this.columns = null; } - /** Returns true if field columns is set (has been assigned a value) and false otherwise */ + /** Returns true if field columns is set (has been asigned a value) and false otherwise */ public boolean isSetColumns() { return this.columns != null; } @@ -15172,7 +15933,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -15250,7 +16011,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -15260,7 +16021,7 @@ public class Hbase { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } @@ -15270,7 +16031,7 @@ public class Hbase { return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = TBaseHelper.compareTo(this.columns, typedOther.columns); if (lastComparison != 0) { return lastComparison; } @@ -15282,49 +16043,49 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.row = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // COLUMNS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list46 = iprot.readListBegin(); + TList _list46 = iprot.readListBegin(); this.columns = new ArrayList(_list46.size); for (int _i47 = 0; _i47 < _list46.size; ++_i47) { - ByteBuffer _elem48; // required + ByteBuffer _elem48; _elem48 = iprot.readBinary(); this.columns.add(_elem48); } iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -15334,7 +16095,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -15351,7 +16112,7 @@ public class Hbase { if (this.columns != null) { oprot.writeFieldBegin(COLUMNS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.columns.size())); + oprot.writeListBegin(new TList(TType.STRING, this.columns.size())); for (ByteBuffer _iter49 : this.columns) { oprot.writeBinary(_iter49); @@ -15396,39 +16157,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - } - - public static class getRowWithColumns_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRowWithColumns_result"); + public static class getRowWithColumns_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRowWithColumns_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public List success; // required - public IOError io; // required + public List success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -15490,16 +16235,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, TRowResult.class)))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, TRowResult.class)))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRowWithColumns_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRowWithColumns_result.class, metaDataMap); } public getRowWithColumns_result() { @@ -15568,7 +16313,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -15592,7 +16337,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -15636,7 +16381,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -15703,7 +16448,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -15713,7 +16458,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -15725,24 +16470,24 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list50 = iprot.readListBegin(); + TList _list50 = iprot.readListBegin(); this.success = new ArrayList(_list50.size); for (int _i51 = 0; _i51 < _list50.size; ++_i51) { - TRowResult _elem52; // required + TRowResult _elem52; _elem52 = new TRowResult(); _elem52.read(iprot); this.success.add(_elem52); @@ -15750,19 +16495,19 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -15772,13 +16517,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); for (TRowResult _iter53 : this.success) { _iter53.write(oprot); @@ -15819,50 +16564,34 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class getRowTs_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRowTs_args"); + public static class getRowTs_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRowTs_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)3); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_FIELD_DESC = new TField("row", TType.STRING, (short)2); + private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)3); /** * name of the table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * row key */ - public ByteBuffer row; // required + public ByteBuffer row; /** * timestamp */ - public long timestamp; // required + public long timestamp; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of the table */ @@ -15938,17 +16667,17 @@ public class Hbase { private static final int __TIMESTAMP_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW, new FieldMetaData("row", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.TIMESTAMP, new FieldMetaData("timestamp", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRowTs_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRowTs_args.class, metaDataMap); } public getRowTs_args() { @@ -15997,11 +16726,11 @@ public class Hbase { * name of the table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -16009,7 +16738,7 @@ public class Hbase { * name of the table */ public getRowTs_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -16022,7 +16751,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -16037,11 +16766,11 @@ public class Hbase { * row key */ public byte[] getRow() { - setRow(org.apache.thrift.TBaseHelper.rightSize(row)); - return row == null ? null : row.array(); + setRow(TBaseHelper.rightSize(row)); + return row.array(); } - public ByteBuffer bufferForRow() { + public ByteBuffer BufferForRow() { return row; } @@ -16049,7 +16778,7 @@ public class Hbase { * row key */ public getRowTs_args setRow(byte[] row) { - setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); + setRow(ByteBuffer.wrap(row)); return this; } @@ -16062,7 +16791,7 @@ public class Hbase { this.row = null; } - /** Returns true if field row is set (has been assigned a value) and false otherwise */ + /** Returns true if field row is set (has been asigned a value) and false otherwise */ public boolean isSetRow() { return this.row != null; } @@ -16093,7 +16822,7 @@ public class Hbase { __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID); } - /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */ + /** Returns true if field timestamp is set (has been asigned a value) and false otherwise */ public boolean isSetTimestamp() { return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID); } @@ -16140,13 +16869,13 @@ public class Hbase { return getRow(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return new Long(getTimestamp()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -16224,7 +16953,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -16234,7 +16963,7 @@ public class Hbase { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } @@ -16244,7 +16973,7 @@ public class Hbase { return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); + lastComparison = TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); if (lastComparison != 0) { return lastComparison; } @@ -16256,40 +16985,40 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.row = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // TIMESTAMP - if (field.type == org.apache.thrift.protocol.TType.I64) { + if (field.type == TType.I64) { this.timestamp = iprot.readI64(); setTimestampIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -16299,7 +17028,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -16348,39 +17077,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - - } + public static class getRowTs_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRowTs_result"); - public static class getRowTs_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRowTs_result"); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - - public List success; // required - public IOError io; // required + public List success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -16442,16 +17155,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, TRowResult.class)))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, TRowResult.class)))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRowTs_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRowTs_result.class, metaDataMap); } public getRowTs_result() { @@ -16520,7 +17233,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -16544,7 +17257,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -16588,7 +17301,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -16655,7 +17368,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -16665,7 +17378,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -16677,24 +17390,24 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list54 = iprot.readListBegin(); + TList _list54 = iprot.readListBegin(); this.success = new ArrayList(_list54.size); for (int _i55 = 0; _i55 < _list54.size; ++_i55) { - TRowResult _elem56; // required + TRowResult _elem56; _elem56 = new TRowResult(); _elem56.read(iprot); this.success.add(_elem56); @@ -16702,19 +17415,19 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -16724,13 +17437,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); for (TRowResult _iter57 : this.success) { _iter57.write(oprot); @@ -16771,52 +17484,36 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - - } - public static class getRowWithColumnsTs_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRowWithColumnsTs_args"); + public static class getRowWithColumnsTs_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRowWithColumnsTs_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)3); - private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)4); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_FIELD_DESC = new TField("row", TType.STRING, (short)2); + private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.LIST, (short)3); + private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)4); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * row key */ - public ByteBuffer row; // required + public ByteBuffer row; /** * List of columns to return, null for all columns */ - public List columns; // required - public long timestamp; // required + public List columns; + public long timestamp; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -16895,20 +17592,20 @@ public class Hbase { private static final int __TIMESTAMP_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); - tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW, new FieldMetaData("row", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.STRING , "Text")))); + tmpMap.put(_Fields.TIMESTAMP, new FieldMetaData("timestamp", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRowWithColumnsTs_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRowWithColumnsTs_args.class, metaDataMap); } public getRowWithColumnsTs_args() { @@ -16967,11 +17664,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -16979,7 +17676,7 @@ public class Hbase { * name of table */ public getRowWithColumnsTs_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -16992,7 +17689,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -17007,11 +17704,11 @@ public class Hbase { * row key */ public byte[] getRow() { - setRow(org.apache.thrift.TBaseHelper.rightSize(row)); - return row == null ? null : row.array(); + setRow(TBaseHelper.rightSize(row)); + return row.array(); } - public ByteBuffer bufferForRow() { + public ByteBuffer BufferForRow() { return row; } @@ -17019,7 +17716,7 @@ public class Hbase { * row key */ public getRowWithColumnsTs_args setRow(byte[] row) { - setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); + setRow(ByteBuffer.wrap(row)); return this; } @@ -17032,7 +17729,7 @@ public class Hbase { this.row = null; } - /** Returns true if field row is set (has been assigned a value) and false otherwise */ + /** Returns true if field row is set (has been asigned a value) and false otherwise */ public boolean isSetRow() { return this.row != null; } @@ -17077,7 +17774,7 @@ public class Hbase { this.columns = null; } - /** Returns true if field columns is set (has been assigned a value) and false otherwise */ + /** Returns true if field columns is set (has been asigned a value) and false otherwise */ public boolean isSetColumns() { return this.columns != null; } @@ -17102,7 +17799,7 @@ public class Hbase { __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID); } - /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */ + /** Returns true if field timestamp is set (has been asigned a value) and false otherwise */ public boolean isSetTimestamp() { return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID); } @@ -17160,13 +17857,13 @@ public class Hbase { return getColumns(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return new Long(getTimestamp()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -17255,7 +17952,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -17265,7 +17962,7 @@ public class Hbase { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } @@ -17275,7 +17972,7 @@ public class Hbase { return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = TBaseHelper.compareTo(this.columns, typedOther.columns); if (lastComparison != 0) { return lastComparison; } @@ -17285,7 +17982,7 @@ public class Hbase { return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); + lastComparison = TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); if (lastComparison != 0) { return lastComparison; } @@ -17297,57 +17994,57 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.row = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // COLUMNS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list58 = iprot.readListBegin(); + TList _list58 = iprot.readListBegin(); this.columns = new ArrayList(_list58.size); for (int _i59 = 0; _i59 < _list58.size; ++_i59) { - ByteBuffer _elem60; // required + ByteBuffer _elem60; _elem60 = iprot.readBinary(); this.columns.add(_elem60); } iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 4: // TIMESTAMP - if (field.type == org.apache.thrift.protocol.TType.I64) { + if (field.type == TType.I64) { this.timestamp = iprot.readI64(); setTimestampIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -17357,7 +18054,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -17374,7 +18071,7 @@ public class Hbase { if (this.columns != null) { oprot.writeFieldBegin(COLUMNS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.columns.size())); + oprot.writeListBegin(new TList(TType.STRING, this.columns.size())); for (ByteBuffer _iter61 : this.columns) { oprot.writeBinary(_iter61); @@ -17426,39 +18123,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - } - - public static class getRowWithColumnsTs_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRowWithColumnsTs_result"); + public static class getRowWithColumnsTs_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRowWithColumnsTs_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public List success; // required - public IOError io; // required + public List success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -17520,16 +18201,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, TRowResult.class)))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, TRowResult.class)))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRowWithColumnsTs_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRowWithColumnsTs_result.class, metaDataMap); } public getRowWithColumnsTs_result() { @@ -17598,7 +18279,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -17622,7 +18303,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -17666,7 +18347,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -17733,7 +18414,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -17743,7 +18424,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -17755,24 +18436,24 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list62 = iprot.readListBegin(); + TList _list62 = iprot.readListBegin(); this.success = new ArrayList(_list62.size); for (int _i63 = 0; _i63 < _list62.size; ++_i63) { - TRowResult _elem64; // required + TRowResult _elem64; _elem64 = new TRowResult(); _elem64.read(iprot); this.success.add(_elem64); @@ -17780,19 +18461,19 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -17802,13 +18483,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); for (TRowResult _iter65 : this.success) { _iter65.write(oprot); @@ -17849,45 +18530,29 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } + public static class getRows_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRows_args"); - } - - public static class getRows_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRows_args"); - - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROWS_FIELD_DESC = new org.apache.thrift.protocol.TField("rows", org.apache.thrift.protocol.TType.LIST, (short)2); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROWS_FIELD_DESC = new TField("rows", TType.LIST, (short)2); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * row keys */ - public List rows; // required + public List rows; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -17955,16 +18620,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROWS, new org.apache.thrift.meta_data.FieldMetaData("rows", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROWS, new FieldMetaData("rows", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.STRING , "Text")))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRows_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRows_args.class, metaDataMap); } public getRows_args() { @@ -18009,11 +18674,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -18021,7 +18686,7 @@ public class Hbase { * name of table */ public getRows_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -18034,7 +18699,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -18079,7 +18744,7 @@ public class Hbase { this.rows = null; } - /** Returns true if field rows is set (has been assigned a value) and false otherwise */ + /** Returns true if field rows is set (has been asigned a value) and false otherwise */ public boolean isSetRows() { return this.rows != null; } @@ -18123,7 +18788,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -18190,7 +18855,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -18200,7 +18865,7 @@ public class Hbase { return lastComparison; } if (isSetRows()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rows, typedOther.rows); + lastComparison = TBaseHelper.compareTo(this.rows, typedOther.rows); if (lastComparison != 0) { return lastComparison; } @@ -18212,42 +18877,42 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROWS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list66 = iprot.readListBegin(); + TList _list66 = iprot.readListBegin(); this.rows = new ArrayList(_list66.size); for (int _i67 = 0; _i67 < _list66.size; ++_i67) { - ByteBuffer _elem68; // required + ByteBuffer _elem68; _elem68 = iprot.readBinary(); this.rows.add(_elem68); } iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -18257,7 +18922,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -18269,7 +18934,7 @@ public class Hbase { if (this.rows != null) { oprot.writeFieldBegin(ROWS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.rows.size())); + oprot.writeListBegin(new TList(TType.STRING, this.rows.size())); for (ByteBuffer _iter69 : this.rows) { oprot.writeBinary(_iter69); @@ -18306,39 +18971,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - - } - public static class getRows_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRows_result"); + public static class getRows_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRows_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public List success; // required - public IOError io; // required + public List success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -18400,16 +19049,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, TRowResult.class)))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, TRowResult.class)))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRows_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRows_result.class, metaDataMap); } public getRows_result() { @@ -18478,7 +19127,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -18502,7 +19151,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -18546,7 +19195,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -18613,7 +19262,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -18623,7 +19272,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -18635,24 +19284,24 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list70 = iprot.readListBegin(); + TList _list70 = iprot.readListBegin(); this.success = new ArrayList(_list70.size); for (int _i71 = 0; _i71 < _list70.size; ++_i71) { - TRowResult _elem72; // required + TRowResult _elem72; _elem72 = new TRowResult(); _elem72.read(iprot); this.success.add(_elem72); @@ -18660,19 +19309,19 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -18682,13 +19331,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); for (TRowResult _iter73 : this.success) { _iter73.write(oprot); @@ -18729,50 +19378,34 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } - - } + public static class getRowsWithColumns_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRowsWithColumns_args"); - public static class getRowsWithColumns_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRowsWithColumns_args"); - - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROWS_FIELD_DESC = new org.apache.thrift.protocol.TField("rows", org.apache.thrift.protocol.TType.LIST, (short)2); - private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)3); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROWS_FIELD_DESC = new TField("rows", TType.LIST, (short)2); + private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.LIST, (short)3); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * row keys */ - public List rows; // required + public List rows; /** * List of columns to return, null for all columns */ - public List columns; // required + public List columns; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -18846,19 +19479,19 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROWS, new org.apache.thrift.meta_data.FieldMetaData("rows", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); - tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROWS, new FieldMetaData("rows", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.STRING , "Text")))); + tmpMap.put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.STRING , "Text")))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRowsWithColumns_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRowsWithColumns_args.class, metaDataMap); } public getRowsWithColumns_args() { @@ -18913,11 +19546,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -18925,7 +19558,7 @@ public class Hbase { * name of table */ public getRowsWithColumns_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -18938,7 +19571,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -18983,7 +19616,7 @@ public class Hbase { this.rows = null; } - /** Returns true if field rows is set (has been assigned a value) and false otherwise */ + /** Returns true if field rows is set (has been asigned a value) and false otherwise */ public boolean isSetRows() { return this.rows != null; } @@ -19028,7 +19661,7 @@ public class Hbase { this.columns = null; } - /** Returns true if field columns is set (has been assigned a value) and false otherwise */ + /** Returns true if field columns is set (has been asigned a value) and false otherwise */ public boolean isSetColumns() { return this.columns != null; } @@ -19083,7 +19716,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -19161,7 +19794,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -19171,7 +19804,7 @@ public class Hbase { return lastComparison; } if (isSetRows()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rows, typedOther.rows); + lastComparison = TBaseHelper.compareTo(this.rows, typedOther.rows); if (lastComparison != 0) { return lastComparison; } @@ -19181,7 +19814,7 @@ public class Hbase { return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = TBaseHelper.compareTo(this.columns, typedOther.columns); if (lastComparison != 0) { return lastComparison; } @@ -19193,59 +19826,59 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROWS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list74 = iprot.readListBegin(); + TList _list74 = iprot.readListBegin(); this.rows = new ArrayList(_list74.size); for (int _i75 = 0; _i75 < _list74.size; ++_i75) { - ByteBuffer _elem76; // required + ByteBuffer _elem76; _elem76 = iprot.readBinary(); this.rows.add(_elem76); } iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // COLUMNS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list77 = iprot.readListBegin(); + TList _list77 = iprot.readListBegin(); this.columns = new ArrayList(_list77.size); for (int _i78 = 0; _i78 < _list77.size; ++_i78) { - ByteBuffer _elem79; // required + ByteBuffer _elem79; _elem79 = iprot.readBinary(); this.columns.add(_elem79); } iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -19255,7 +19888,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -19267,7 +19900,7 @@ public class Hbase { if (this.rows != null) { oprot.writeFieldBegin(ROWS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.rows.size())); + oprot.writeListBegin(new TList(TType.STRING, this.rows.size())); for (ByteBuffer _iter80 : this.rows) { oprot.writeBinary(_iter80); @@ -19279,7 +19912,7 @@ public class Hbase { if (this.columns != null) { oprot.writeFieldBegin(COLUMNS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.columns.size())); + oprot.writeListBegin(new TList(TType.STRING, this.columns.size())); for (ByteBuffer _iter81 : this.columns) { oprot.writeBinary(_iter81); @@ -19324,39 +19957,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } + public static class getRowsWithColumns_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRowsWithColumns_result"); - } - - public static class getRowsWithColumns_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRowsWithColumns_result"); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - - public List success; // required - public IOError io; // required + public List success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -19418,16 +20035,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, TRowResult.class)))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, TRowResult.class)))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRowsWithColumns_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRowsWithColumns_result.class, metaDataMap); } public getRowsWithColumns_result() { @@ -19496,7 +20113,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -19520,7 +20137,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -19564,7 +20181,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -19631,7 +20248,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -19641,7 +20258,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -19653,24 +20270,24 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list82 = iprot.readListBegin(); + TList _list82 = iprot.readListBegin(); this.success = new ArrayList(_list82.size); for (int _i83 = 0; _i83 < _list82.size; ++_i83) { - TRowResult _elem84; // required + TRowResult _elem84; _elem84 = new TRowResult(); _elem84.read(iprot); this.success.add(_elem84); @@ -19678,19 +20295,19 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -19700,13 +20317,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); for (TRowResult _iter85 : this.success) { _iter85.write(oprot); @@ -19747,50 +20364,34 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - } + public static class getRowsTs_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRowsTs_args"); - public static class getRowsTs_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRowsTs_args"); - - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROWS_FIELD_DESC = new org.apache.thrift.protocol.TField("rows", org.apache.thrift.protocol.TType.LIST, (short)2); - private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)3); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROWS_FIELD_DESC = new TField("rows", TType.LIST, (short)2); + private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)3); /** * name of the table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * row keys */ - public List rows; // required + public List rows; /** * timestamp */ - public long timestamp; // required + public long timestamp; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of the table */ @@ -19866,18 +20467,18 @@ public class Hbase { private static final int __TIMESTAMP_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROWS, new org.apache.thrift.meta_data.FieldMetaData("rows", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); - tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROWS, new FieldMetaData("rows", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.STRING , "Text")))); + tmpMap.put(_Fields.TIMESTAMP, new FieldMetaData("timestamp", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRowsTs_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRowsTs_args.class, metaDataMap); } public getRowsTs_args() { @@ -19930,11 +20531,11 @@ public class Hbase { * name of the table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -19942,7 +20543,7 @@ public class Hbase { * name of the table */ public getRowsTs_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -19955,7 +20556,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -20000,7 +20601,7 @@ public class Hbase { this.rows = null; } - /** Returns true if field rows is set (has been assigned a value) and false otherwise */ + /** Returns true if field rows is set (has been asigned a value) and false otherwise */ public boolean isSetRows() { return this.rows != null; } @@ -20031,7 +20632,7 @@ public class Hbase { __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID); } - /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */ + /** Returns true if field timestamp is set (has been asigned a value) and false otherwise */ public boolean isSetTimestamp() { return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID); } @@ -20078,13 +20679,13 @@ public class Hbase { return getRows(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return new Long(getTimestamp()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -20162,7 +20763,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -20172,7 +20773,7 @@ public class Hbase { return lastComparison; } if (isSetRows()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rows, typedOther.rows); + lastComparison = TBaseHelper.compareTo(this.rows, typedOther.rows); if (lastComparison != 0) { return lastComparison; } @@ -20182,7 +20783,7 @@ public class Hbase { return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); + lastComparison = TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); if (lastComparison != 0) { return lastComparison; } @@ -20194,50 +20795,50 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROWS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list86 = iprot.readListBegin(); + TList _list86 = iprot.readListBegin(); this.rows = new ArrayList(_list86.size); for (int _i87 = 0; _i87 < _list86.size; ++_i87) { - ByteBuffer _elem88; // required + ByteBuffer _elem88; _elem88 = iprot.readBinary(); this.rows.add(_elem88); } iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // TIMESTAMP - if (field.type == org.apache.thrift.protocol.TType.I64) { + if (field.type == TType.I64) { this.timestamp = iprot.readI64(); setTimestampIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -20247,7 +20848,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -20259,7 +20860,7 @@ public class Hbase { if (this.rows != null) { oprot.writeFieldBegin(ROWS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.rows.size())); + oprot.writeListBegin(new TList(TType.STRING, this.rows.size())); for (ByteBuffer _iter89 : this.rows) { oprot.writeBinary(_iter89); @@ -20303,41 +20904,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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_bit_vector = new BitSet(1); - 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); } - } - - } - public static class getRowsTs_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRowsTs_result"); + public static class getRowsTs_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRowsTs_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public List success; // required - public IOError io; // required + public List success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -20399,16 +20982,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, TRowResult.class)))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, TRowResult.class)))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRowsTs_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRowsTs_result.class, metaDataMap); } public getRowsTs_result() { @@ -20477,7 +21060,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -20501,7 +21084,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -20545,7 +21128,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -20612,7 +21195,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -20622,7 +21205,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -20634,24 +21217,24 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list90 = iprot.readListBegin(); + TList _list90 = iprot.readListBegin(); this.success = new ArrayList(_list90.size); for (int _i91 = 0; _i91 < _list90.size; ++_i91) { - TRowResult _elem92; // required + TRowResult _elem92; _elem92 = new TRowResult(); _elem92.read(iprot); this.success.add(_elem92); @@ -20659,19 +21242,19 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -20681,13 +21264,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); for (TRowResult _iter93 : this.success) { _iter93.write(oprot); @@ -20728,52 +21311,36 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class getRowsWithColumnsTs_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRowsWithColumnsTs_args"); + public static class getRowsWithColumnsTs_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRowsWithColumnsTs_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROWS_FIELD_DESC = new org.apache.thrift.protocol.TField("rows", org.apache.thrift.protocol.TType.LIST, (short)2); - private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)3); - private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)4); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROWS_FIELD_DESC = new TField("rows", TType.LIST, (short)2); + private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.LIST, (short)3); + private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)4); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * row keys */ - public List rows; // required + public List rows; /** * List of columns to return, null for all columns */ - public List columns; // required - public long timestamp; // required + public List columns; + public long timestamp; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -20852,21 +21419,21 @@ public class Hbase { private static final int __TIMESTAMP_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROWS, new org.apache.thrift.meta_data.FieldMetaData("rows", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); - tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); - tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROWS, new FieldMetaData("rows", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.STRING , "Text")))); + tmpMap.put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.STRING , "Text")))); + tmpMap.put(_Fields.TIMESTAMP, new FieldMetaData("timestamp", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRowsWithColumnsTs_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRowsWithColumnsTs_args.class, metaDataMap); } public getRowsWithColumnsTs_args() { @@ -20929,11 +21496,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -20941,7 +21508,7 @@ public class Hbase { * name of table */ public getRowsWithColumnsTs_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -20954,7 +21521,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -20999,7 +21566,7 @@ public class Hbase { this.rows = null; } - /** Returns true if field rows is set (has been assigned a value) and false otherwise */ + /** Returns true if field rows is set (has been asigned a value) and false otherwise */ public boolean isSetRows() { return this.rows != null; } @@ -21044,7 +21611,7 @@ public class Hbase { this.columns = null; } - /** Returns true if field columns is set (has been assigned a value) and false otherwise */ + /** Returns true if field columns is set (has been asigned a value) and false otherwise */ public boolean isSetColumns() { return this.columns != null; } @@ -21069,7 +21636,7 @@ public class Hbase { __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID); } - /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */ + /** Returns true if field timestamp is set (has been asigned a value) and false otherwise */ public boolean isSetTimestamp() { return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID); } @@ -21127,13 +21694,13 @@ public class Hbase { return getColumns(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return new Long(getTimestamp()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -21222,7 +21789,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -21232,7 +21799,7 @@ public class Hbase { return lastComparison; } if (isSetRows()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rows, typedOther.rows); + lastComparison = TBaseHelper.compareTo(this.rows, typedOther.rows); if (lastComparison != 0) { return lastComparison; } @@ -21242,7 +21809,7 @@ public class Hbase { return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = TBaseHelper.compareTo(this.columns, typedOther.columns); if (lastComparison != 0) { return lastComparison; } @@ -21252,7 +21819,7 @@ public class Hbase { return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); + lastComparison = TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); if (lastComparison != 0) { return lastComparison; } @@ -21264,67 +21831,67 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROWS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list94 = iprot.readListBegin(); + TList _list94 = iprot.readListBegin(); this.rows = new ArrayList(_list94.size); for (int _i95 = 0; _i95 < _list94.size; ++_i95) { - ByteBuffer _elem96; // required + ByteBuffer _elem96; _elem96 = iprot.readBinary(); this.rows.add(_elem96); } iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // COLUMNS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list97 = iprot.readListBegin(); + TList _list97 = iprot.readListBegin(); this.columns = new ArrayList(_list97.size); for (int _i98 = 0; _i98 < _list97.size; ++_i98) { - ByteBuffer _elem99; // required + ByteBuffer _elem99; _elem99 = iprot.readBinary(); this.columns.add(_elem99); } iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 4: // TIMESTAMP - if (field.type == org.apache.thrift.protocol.TType.I64) { + if (field.type == TType.I64) { this.timestamp = iprot.readI64(); setTimestampIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -21334,7 +21901,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -21346,7 +21913,7 @@ public class Hbase { if (this.rows != null) { oprot.writeFieldBegin(ROWS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.rows.size())); + oprot.writeListBegin(new TList(TType.STRING, this.rows.size())); for (ByteBuffer _iter100 : this.rows) { oprot.writeBinary(_iter100); @@ -21358,7 +21925,7 @@ public class Hbase { if (this.columns != null) { oprot.writeFieldBegin(COLUMNS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.columns.size())); + oprot.writeListBegin(new TList(TType.STRING, this.columns.size())); for (ByteBuffer _iter101 : this.columns) { oprot.writeBinary(_iter101); @@ -21410,41 +21977,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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_bit_vector = new BitSet(1); - 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); - } - } + public static class getRowsWithColumnsTs_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("getRowsWithColumnsTs_result"); - } - - public static class getRowsWithColumnsTs_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getRowsWithColumnsTs_result"); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - - public List success; // required - public IOError io; // required + public List success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -21506,16 +22055,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, TRowResult.class)))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, TRowResult.class)))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getRowsWithColumnsTs_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(getRowsWithColumnsTs_result.class, metaDataMap); } public getRowsWithColumnsTs_result() { @@ -21584,7 +22133,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -21608,7 +22157,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -21652,7 +22201,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -21719,7 +22268,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -21729,7 +22278,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -21741,24 +22290,24 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list102 = iprot.readListBegin(); + TList _list102 = iprot.readListBegin(); this.success = new ArrayList(_list102.size); for (int _i103 = 0; _i103 < _list102.size; ++_i103) { - TRowResult _elem104; // required + TRowResult _elem104; _elem104 = new TRowResult(); _elem104.read(iprot); this.success.add(_elem104); @@ -21766,19 +22315,19 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -21788,13 +22337,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); for (TRowResult _iter105 : this.success) { _iter105.write(oprot); @@ -21835,50 +22384,34 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class mutateRow_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mutateRow_args"); + public static class mutateRow_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("mutateRow_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField MUTATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("mutations", org.apache.thrift.protocol.TType.LIST, (short)3); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_FIELD_DESC = new TField("row", TType.STRING, (short)2); + private static final TField MUTATIONS_FIELD_DESC = new TField("mutations", TType.LIST, (short)3); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * row key */ - public ByteBuffer row; // required + public ByteBuffer row; /** * list of mutation commands */ - public List mutations; // required + public List mutations; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -21952,18 +22485,18 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.MUTATIONS, new org.apache.thrift.meta_data.FieldMetaData("mutations", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, Mutation.class)))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW, new FieldMetaData("row", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.MUTATIONS, new FieldMetaData("mutations", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, Mutation.class)))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(mutateRow_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(mutateRow_args.class, metaDataMap); } public mutateRow_args() { @@ -22014,11 +22547,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -22026,7 +22559,7 @@ public class Hbase { * name of table */ public mutateRow_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -22039,7 +22572,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -22054,11 +22587,11 @@ public class Hbase { * row key */ public byte[] getRow() { - setRow(org.apache.thrift.TBaseHelper.rightSize(row)); - return row == null ? null : row.array(); + setRow(TBaseHelper.rightSize(row)); + return row.array(); } - public ByteBuffer bufferForRow() { + public ByteBuffer BufferForRow() { return row; } @@ -22066,7 +22599,7 @@ public class Hbase { * row key */ public mutateRow_args setRow(byte[] row) { - setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); + setRow(ByteBuffer.wrap(row)); return this; } @@ -22079,7 +22612,7 @@ public class Hbase { this.row = null; } - /** Returns true if field row is set (has been assigned a value) and false otherwise */ + /** Returns true if field row is set (has been asigned a value) and false otherwise */ public boolean isSetRow() { return this.row != null; } @@ -22124,7 +22657,7 @@ public class Hbase { this.mutations = null; } - /** Returns true if field mutations is set (has been assigned a value) and false otherwise */ + /** Returns true if field mutations is set (has been asigned a value) and false otherwise */ public boolean isSetMutations() { return this.mutations != null; } @@ -22179,7 +22712,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -22257,7 +22790,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -22267,7 +22800,7 @@ public class Hbase { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } @@ -22277,7 +22810,7 @@ public class Hbase { return lastComparison; } if (isSetMutations()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mutations, typedOther.mutations); + lastComparison = TBaseHelper.compareTo(this.mutations, typedOther.mutations); if (lastComparison != 0) { return lastComparison; } @@ -22289,38 +22822,38 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.row = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // MUTATIONS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list106 = iprot.readListBegin(); + TList _list106 = iprot.readListBegin(); this.mutations = new ArrayList(_list106.size); for (int _i107 = 0; _i107 < _list106.size; ++_i107) { - Mutation _elem108; // required + Mutation _elem108; _elem108 = new Mutation(); _elem108.read(iprot); this.mutations.add(_elem108); @@ -22328,11 +22861,11 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -22342,7 +22875,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -22359,7 +22892,7 @@ public class Hbase { if (this.mutations != null) { oprot.writeFieldBegin(MUTATIONS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.mutations.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.mutations.size())); for (Mutation _iter109 : this.mutations) { _iter109.write(oprot); @@ -22404,39 +22937,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class mutateRow_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mutateRow_result"); + public static class mutateRow_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("mutateRow_result"); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField IA_FIELD_DESC = new org.apache.thrift.protocol.TField("ia", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); + private static final TField IA_FIELD_DESC = new TField("ia", TType.STRUCT, (short)2); - public IOError io; // required - public IllegalArgument ia; // required + public IOError io; + public IllegalArgument ia; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { IO((short)1, "io"), IA((short)2, "ia"); @@ -22498,15 +23015,15 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - tmpMap.put(_Fields.IA, new org.apache.thrift.meta_data.FieldMetaData("ia", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); + tmpMap.put(_Fields.IA, new FieldMetaData("ia", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(mutateRow_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(mutateRow_result.class, metaDataMap); } public mutateRow_result() { @@ -22556,7 +23073,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -22580,7 +23097,7 @@ public class Hbase { this.ia = null; } - /** Returns true if field ia is set (has been assigned a value) and false otherwise */ + /** Returns true if field ia is set (has been asigned a value) and false otherwise */ public boolean isSetIa() { return this.ia != null; } @@ -22624,7 +23141,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -22691,7 +23208,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -22701,7 +23218,7 @@ public class Hbase { return lastComparison; } if (isSetIa()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ia, typedOther.ia); + lastComparison = TBaseHelper.compareTo(this.ia, typedOther.ia); if (lastComparison != 0) { return lastComparison; } @@ -22713,34 +23230,34 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // IA - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.ia = new IllegalArgument(); this.ia.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -22750,7 +23267,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetIo()) { @@ -22790,55 +23307,39 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class mutateRowTs_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mutateRowTs_args"); + public static class mutateRowTs_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("mutateRowTs_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField MUTATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("mutations", org.apache.thrift.protocol.TType.LIST, (short)3); - private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)4); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_FIELD_DESC = new TField("row", TType.STRING, (short)2); + private static final TField MUTATIONS_FIELD_DESC = new TField("mutations", TType.LIST, (short)3); + private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)4); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * row key */ - public ByteBuffer row; // required + public ByteBuffer row; /** * list of mutation commands */ - public List mutations; // required + public List mutations; /** * timestamp */ - public long timestamp; // required + public long timestamp; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -22920,20 +23421,20 @@ public class Hbase { private static final int __TIMESTAMP_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.MUTATIONS, new org.apache.thrift.meta_data.FieldMetaData("mutations", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, Mutation.class)))); - tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW, new FieldMetaData("row", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.MUTATIONS, new FieldMetaData("mutations", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, Mutation.class)))); + tmpMap.put(_Fields.TIMESTAMP, new FieldMetaData("timestamp", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(mutateRowTs_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(mutateRowTs_args.class, metaDataMap); } public mutateRowTs_args() { @@ -22992,11 +23493,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -23004,7 +23505,7 @@ public class Hbase { * name of table */ public mutateRowTs_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -23017,7 +23518,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -23032,11 +23533,11 @@ public class Hbase { * row key */ public byte[] getRow() { - setRow(org.apache.thrift.TBaseHelper.rightSize(row)); - return row == null ? null : row.array(); + setRow(TBaseHelper.rightSize(row)); + return row.array(); } - public ByteBuffer bufferForRow() { + public ByteBuffer BufferForRow() { return row; } @@ -23044,7 +23545,7 @@ public class Hbase { * row key */ public mutateRowTs_args setRow(byte[] row) { - setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); + setRow(ByteBuffer.wrap(row)); return this; } @@ -23057,7 +23558,7 @@ public class Hbase { this.row = null; } - /** Returns true if field row is set (has been assigned a value) and false otherwise */ + /** Returns true if field row is set (has been asigned a value) and false otherwise */ public boolean isSetRow() { return this.row != null; } @@ -23102,7 +23603,7 @@ public class Hbase { this.mutations = null; } - /** Returns true if field mutations is set (has been assigned a value) and false otherwise */ + /** Returns true if field mutations is set (has been asigned a value) and false otherwise */ public boolean isSetMutations() { return this.mutations != null; } @@ -23133,7 +23634,7 @@ public class Hbase { __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID); } - /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */ + /** Returns true if field timestamp is set (has been asigned a value) and false otherwise */ public boolean isSetTimestamp() { return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID); } @@ -23191,13 +23692,13 @@ public class Hbase { return getMutations(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return new Long(getTimestamp()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -23286,7 +23787,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -23296,7 +23797,7 @@ public class Hbase { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } @@ -23306,7 +23807,7 @@ public class Hbase { return lastComparison; } if (isSetMutations()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mutations, typedOther.mutations); + lastComparison = TBaseHelper.compareTo(this.mutations, typedOther.mutations); if (lastComparison != 0) { return lastComparison; } @@ -23316,7 +23817,7 @@ public class Hbase { return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); + lastComparison = TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); if (lastComparison != 0) { return lastComparison; } @@ -23328,38 +23829,38 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.row = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // MUTATIONS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list110 = iprot.readListBegin(); + TList _list110 = iprot.readListBegin(); this.mutations = new ArrayList(_list110.size); for (int _i111 = 0; _i111 < _list110.size; ++_i111) { - Mutation _elem112; // required + Mutation _elem112; _elem112 = new Mutation(); _elem112.read(iprot); this.mutations.add(_elem112); @@ -23367,19 +23868,19 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 4: // TIMESTAMP - if (field.type == org.apache.thrift.protocol.TType.I64) { + if (field.type == TType.I64) { this.timestamp = iprot.readI64(); setTimestampIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -23389,7 +23890,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -23406,7 +23907,7 @@ public class Hbase { if (this.mutations != null) { oprot.writeFieldBegin(MUTATIONS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.mutations.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.mutations.size())); for (Mutation _iter113 : this.mutations) { _iter113.write(oprot); @@ -23458,41 +23959,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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_bit_vector = new BitSet(1); - 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); } - } - - } - public static class mutateRowTs_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mutateRowTs_result"); + public static class mutateRowTs_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("mutateRowTs_result"); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField IA_FIELD_DESC = new org.apache.thrift.protocol.TField("ia", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); + private static final TField IA_FIELD_DESC = new TField("ia", TType.STRUCT, (short)2); - public IOError io; // required - public IllegalArgument ia; // required + public IOError io; + public IllegalArgument ia; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { IO((short)1, "io"), IA((short)2, "ia"); @@ -23554,15 +24037,15 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - tmpMap.put(_Fields.IA, new org.apache.thrift.meta_data.FieldMetaData("ia", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); + tmpMap.put(_Fields.IA, new FieldMetaData("ia", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(mutateRowTs_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(mutateRowTs_result.class, metaDataMap); } public mutateRowTs_result() { @@ -23612,7 +24095,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -23636,7 +24119,7 @@ public class Hbase { this.ia = null; } - /** Returns true if field ia is set (has been assigned a value) and false otherwise */ + /** Returns true if field ia is set (has been asigned a value) and false otherwise */ public boolean isSetIa() { return this.ia != null; } @@ -23680,7 +24163,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -23747,7 +24230,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -23757,7 +24240,7 @@ public class Hbase { return lastComparison; } if (isSetIa()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ia, typedOther.ia); + lastComparison = TBaseHelper.compareTo(this.ia, typedOther.ia); if (lastComparison != 0) { return lastComparison; } @@ -23769,34 +24252,34 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // IA - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.ia = new IllegalArgument(); this.ia.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -23806,7 +24289,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetIo()) { @@ -23846,45 +24329,29 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - } + public static class mutateRows_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("mutateRows_args"); - public static class mutateRows_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mutateRows_args"); - - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_BATCHES_FIELD_DESC = new org.apache.thrift.protocol.TField("rowBatches", org.apache.thrift.protocol.TType.LIST, (short)2); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_BATCHES_FIELD_DESC = new TField("rowBatches", TType.LIST, (short)2); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * list of row batches */ - public List rowBatches; // required + public List rowBatches; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -23952,16 +24419,16 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW_BATCHES, new org.apache.thrift.meta_data.FieldMetaData("rowBatches", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, BatchMutation.class)))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW_BATCHES, new FieldMetaData("rowBatches", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, BatchMutation.class)))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(mutateRows_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(mutateRows_args.class, metaDataMap); } public mutateRows_args() { @@ -24006,11 +24473,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -24018,7 +24485,7 @@ public class Hbase { * name of table */ public mutateRows_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -24031,7 +24498,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -24076,7 +24543,7 @@ public class Hbase { this.rowBatches = null; } - /** Returns true if field rowBatches is set (has been assigned a value) and false otherwise */ + /** Returns true if field rowBatches is set (has been asigned a value) and false otherwise */ public boolean isSetRowBatches() { return this.rowBatches != null; } @@ -24120,7 +24587,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -24187,7 +24654,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -24197,7 +24664,7 @@ public class Hbase { return lastComparison; } if (isSetRowBatches()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rowBatches, typedOther.rowBatches); + lastComparison = TBaseHelper.compareTo(this.rowBatches, typedOther.rowBatches); if (lastComparison != 0) { return lastComparison; } @@ -24209,31 +24676,31 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW_BATCHES - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list114 = iprot.readListBegin(); + TList _list114 = iprot.readListBegin(); this.rowBatches = new ArrayList(_list114.size); for (int _i115 = 0; _i115 < _list114.size; ++_i115) { - BatchMutation _elem116; // required + BatchMutation _elem116; _elem116 = new BatchMutation(); _elem116.read(iprot); this.rowBatches.add(_elem116); @@ -24241,11 +24708,11 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -24255,7 +24722,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -24267,7 +24734,7 @@ public class Hbase { if (this.rowBatches != null) { oprot.writeFieldBegin(ROW_BATCHES_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.rowBatches.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.rowBatches.size())); for (BatchMutation _iter117 : this.rowBatches) { _iter117.write(oprot); @@ -24304,39 +24771,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class mutateRows_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mutateRows_result"); + public static class mutateRows_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("mutateRows_result"); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField IA_FIELD_DESC = new org.apache.thrift.protocol.TField("ia", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); + private static final TField IA_FIELD_DESC = new TField("ia", TType.STRUCT, (short)2); - public IOError io; // required - public IllegalArgument ia; // required + public IOError io; + public IllegalArgument ia; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { IO((short)1, "io"), IA((short)2, "ia"); @@ -24398,15 +24849,15 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - tmpMap.put(_Fields.IA, new org.apache.thrift.meta_data.FieldMetaData("ia", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); + tmpMap.put(_Fields.IA, new FieldMetaData("ia", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(mutateRows_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(mutateRows_result.class, metaDataMap); } public mutateRows_result() { @@ -24456,7 +24907,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -24480,7 +24931,7 @@ public class Hbase { this.ia = null; } - /** Returns true if field ia is set (has been assigned a value) and false otherwise */ + /** Returns true if field ia is set (has been asigned a value) and false otherwise */ public boolean isSetIa() { return this.ia != null; } @@ -24524,7 +24975,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -24591,7 +25042,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -24601,7 +25052,7 @@ public class Hbase { return lastComparison; } if (isSetIa()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ia, typedOther.ia); + lastComparison = TBaseHelper.compareTo(this.ia, typedOther.ia); if (lastComparison != 0) { return lastComparison; } @@ -24613,34 +25064,34 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // IA - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.ia = new IllegalArgument(); this.ia.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -24650,7 +25101,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetIo()) { @@ -24690,50 +25141,34 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class mutateRowsTs_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mutateRowsTs_args"); + public static class mutateRowsTs_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("mutateRowsTs_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_BATCHES_FIELD_DESC = new org.apache.thrift.protocol.TField("rowBatches", org.apache.thrift.protocol.TType.LIST, (short)2); - private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)3); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_BATCHES_FIELD_DESC = new TField("rowBatches", TType.LIST, (short)2); + private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)3); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * list of row batches */ - public List rowBatches; // required + public List rowBatches; /** * timestamp */ - public long timestamp; // required + public long timestamp; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -24809,18 +25244,18 @@ public class Hbase { private static final int __TIMESTAMP_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW_BATCHES, new org.apache.thrift.meta_data.FieldMetaData("rowBatches", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, BatchMutation.class)))); - tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW_BATCHES, new FieldMetaData("rowBatches", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, BatchMutation.class)))); + tmpMap.put(_Fields.TIMESTAMP, new FieldMetaData("timestamp", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(mutateRowsTs_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(mutateRowsTs_args.class, metaDataMap); } public mutateRowsTs_args() { @@ -24873,11 +25308,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -24885,7 +25320,7 @@ public class Hbase { * name of table */ public mutateRowsTs_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -24898,7 +25333,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -24943,7 +25378,7 @@ public class Hbase { this.rowBatches = null; } - /** Returns true if field rowBatches is set (has been assigned a value) and false otherwise */ + /** Returns true if field rowBatches is set (has been asigned a value) and false otherwise */ public boolean isSetRowBatches() { return this.rowBatches != null; } @@ -24974,7 +25409,7 @@ public class Hbase { __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID); } - /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */ + /** Returns true if field timestamp is set (has been asigned a value) and false otherwise */ public boolean isSetTimestamp() { return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID); } @@ -25021,13 +25456,13 @@ public class Hbase { return getRowBatches(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return new Long(getTimestamp()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -25105,7 +25540,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -25115,7 +25550,7 @@ public class Hbase { return lastComparison; } if (isSetRowBatches()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rowBatches, typedOther.rowBatches); + lastComparison = TBaseHelper.compareTo(this.rowBatches, typedOther.rowBatches); if (lastComparison != 0) { return lastComparison; } @@ -25125,7 +25560,7 @@ public class Hbase { return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); + lastComparison = TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); if (lastComparison != 0) { return lastComparison; } @@ -25137,31 +25572,31 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW_BATCHES - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list118 = iprot.readListBegin(); + TList _list118 = iprot.readListBegin(); this.rowBatches = new ArrayList(_list118.size); for (int _i119 = 0; _i119 < _list118.size; ++_i119) { - BatchMutation _elem120; // required + BatchMutation _elem120; _elem120 = new BatchMutation(); _elem120.read(iprot); this.rowBatches.add(_elem120); @@ -25169,19 +25604,19 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // TIMESTAMP - if (field.type == org.apache.thrift.protocol.TType.I64) { + if (field.type == TType.I64) { this.timestamp = iprot.readI64(); setTimestampIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -25191,7 +25626,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -25203,7 +25638,7 @@ public class Hbase { if (this.rowBatches != null) { oprot.writeFieldBegin(ROW_BATCHES_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.rowBatches.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.rowBatches.size())); for (BatchMutation _iter121 : this.rowBatches) { _iter121.write(oprot); @@ -25247,39 +25682,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class mutateRowsTs_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("mutateRowsTs_result"); + public static class mutateRowsTs_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("mutateRowsTs_result"); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField IA_FIELD_DESC = new org.apache.thrift.protocol.TField("ia", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); + private static final TField IA_FIELD_DESC = new TField("ia", TType.STRUCT, (short)2); - public IOError io; // required - public IllegalArgument ia; // required + public IOError io; + public IllegalArgument ia; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { IO((short)1, "io"), IA((short)2, "ia"); @@ -25341,15 +25760,15 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - tmpMap.put(_Fields.IA, new org.apache.thrift.meta_data.FieldMetaData("ia", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); + tmpMap.put(_Fields.IA, new FieldMetaData("ia", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(mutateRowsTs_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(mutateRowsTs_result.class, metaDataMap); } public mutateRowsTs_result() { @@ -25399,7 +25818,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -25423,7 +25842,7 @@ public class Hbase { this.ia = null; } - /** Returns true if field ia is set (has been assigned a value) and false otherwise */ + /** Returns true if field ia is set (has been asigned a value) and false otherwise */ public boolean isSetIa() { return this.ia != null; } @@ -25467,7 +25886,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -25534,7 +25953,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -25544,7 +25963,7 @@ public class Hbase { return lastComparison; } if (isSetIa()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ia, typedOther.ia); + lastComparison = TBaseHelper.compareTo(this.ia, typedOther.ia); if (lastComparison != 0) { return lastComparison; } @@ -25556,34 +25975,34 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // IA - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.ia = new IllegalArgument(); this.ia.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -25593,7 +26012,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetIo()) { @@ -25633,55 +26052,39 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class atomicIncrement_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("atomicIncrement_args"); + public static class atomicIncrement_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("atomicIncrement_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.I64, (short)4); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_FIELD_DESC = new TField("row", TType.STRING, (short)2); + private static final TField COLUMN_FIELD_DESC = new TField("column", TType.STRING, (short)3); + private static final TField VALUE_FIELD_DESC = new TField("value", TType.I64, (short)4); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * row to increment */ - public ByteBuffer row; // required + public ByteBuffer row; /** * name of column */ - public ByteBuffer column; // required + public ByteBuffer column; /** * amount to increment by */ - public long value; // required + public long value; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -25763,19 +26166,19 @@ public class Hbase { private static final int __VALUE_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW, new FieldMetaData("row", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.COLUMN, new FieldMetaData("column", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.VALUE, new FieldMetaData("value", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(atomicIncrement_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(atomicIncrement_args.class, metaDataMap); } public atomicIncrement_args() { @@ -25830,11 +26233,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -25842,7 +26245,7 @@ public class Hbase { * name of table */ public atomicIncrement_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -25855,7 +26258,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -25870,11 +26273,11 @@ public class Hbase { * row to increment */ public byte[] getRow() { - setRow(org.apache.thrift.TBaseHelper.rightSize(row)); - return row == null ? null : row.array(); + setRow(TBaseHelper.rightSize(row)); + return row.array(); } - public ByteBuffer bufferForRow() { + public ByteBuffer BufferForRow() { return row; } @@ -25882,7 +26285,7 @@ public class Hbase { * row to increment */ public atomicIncrement_args setRow(byte[] row) { - setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); + setRow(ByteBuffer.wrap(row)); return this; } @@ -25895,7 +26298,7 @@ public class Hbase { this.row = null; } - /** Returns true if field row is set (has been assigned a value) and false otherwise */ + /** Returns true if field row is set (has been asigned a value) and false otherwise */ public boolean isSetRow() { return this.row != null; } @@ -25910,11 +26313,11 @@ public class Hbase { * name of column */ public byte[] getColumn() { - setColumn(org.apache.thrift.TBaseHelper.rightSize(column)); - return column == null ? null : column.array(); + setColumn(TBaseHelper.rightSize(column)); + return column.array(); } - public ByteBuffer bufferForColumn() { + public ByteBuffer BufferForColumn() { return column; } @@ -25922,7 +26325,7 @@ public class Hbase { * name of column */ public atomicIncrement_args setColumn(byte[] column) { - setColumn(column == null ? (ByteBuffer)null : ByteBuffer.wrap(column)); + setColumn(ByteBuffer.wrap(column)); return this; } @@ -25935,7 +26338,7 @@ public class Hbase { this.column = null; } - /** Returns true if field column is set (has been assigned a value) and false otherwise */ + /** Returns true if field column is set (has been asigned a value) and false otherwise */ public boolean isSetColumn() { return this.column != null; } @@ -25966,7 +26369,7 @@ public class Hbase { __isset_bit_vector.clear(__VALUE_ISSET_ID); } - /** Returns true if field value is set (has been assigned a value) and false otherwise */ + /** Returns true if field value is set (has been asigned a value) and false otherwise */ public boolean isSetValue() { return __isset_bit_vector.get(__VALUE_ISSET_ID); } @@ -26024,13 +26427,13 @@ public class Hbase { return getColumn(); case VALUE: - return Long.valueOf(getValue()); + return new Long(getValue()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -26119,7 +26522,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -26129,7 +26532,7 @@ public class Hbase { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } @@ -26139,7 +26542,7 @@ public class Hbase { return lastComparison; } if (isSetColumn()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column); + lastComparison = TBaseHelper.compareTo(this.column, typedOther.column); if (lastComparison != 0) { return lastComparison; } @@ -26149,7 +26552,7 @@ public class Hbase { return lastComparison; } if (isSetValue()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, typedOther.value); + lastComparison = TBaseHelper.compareTo(this.value, typedOther.value); if (lastComparison != 0) { return lastComparison; } @@ -26161,47 +26564,47 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.row = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // COLUMN - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.column = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 4: // VALUE - if (field.type == org.apache.thrift.protocol.TType.I64) { + if (field.type == TType.I64) { this.value = iprot.readI64(); setValueIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -26211,7 +26614,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -26273,41 +26676,25 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class atomicIncrement_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("atomicIncrement_result"); + public static class atomicIncrement_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("atomicIncrement_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I64, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField IA_FIELD_DESC = new org.apache.thrift.protocol.TField("ia", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.I64, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); + private static final TField IA_FIELD_DESC = new TField("ia", TType.STRUCT, (short)2); - public long success; // required - public IOError io; // required - public IllegalArgument ia; // required + public long success; + public IOError io; + public IllegalArgument ia; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"), IA((short)2, "ia"); @@ -26374,17 +26761,17 @@ public class Hbase { private static final int __SUCCESS_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - tmpMap.put(_Fields.IA, new org.apache.thrift.meta_data.FieldMetaData("ia", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I64))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); + tmpMap.put(_Fields.IA, new FieldMetaData("ia", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(atomicIncrement_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(atomicIncrement_result.class, metaDataMap); } public atomicIncrement_result() { @@ -26443,7 +26830,7 @@ public class Hbase { __isset_bit_vector.clear(__SUCCESS_ISSET_ID); } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return __isset_bit_vector.get(__SUCCESS_ISSET_ID); } @@ -26465,7 +26852,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -26489,7 +26876,7 @@ public class Hbase { this.ia = null; } - /** Returns true if field ia is set (has been assigned a value) and false otherwise */ + /** Returns true if field ia is set (has been asigned a value) and false otherwise */ public boolean isSetIa() { return this.ia != null; } @@ -26532,7 +26919,7 @@ public class Hbase { public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Long.valueOf(getSuccess()); + return new Long(getSuccess()); case IO: return getIo(); @@ -26544,7 +26931,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -26622,7 +27009,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -26632,7 +27019,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -26642,7 +27029,7 @@ public class Hbase { return lastComparison; } if (isSetIa()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ia, typedOther.ia); + lastComparison = TBaseHelper.compareTo(this.ia, typedOther.ia); if (lastComparison != 0) { return lastComparison; } @@ -26654,42 +27041,42 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.I64) { + if (field.type == TType.I64) { this.success = iprot.readI64(); setSuccessIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // IA - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.ia = new IllegalArgument(); this.ia.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -26699,7 +27086,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { @@ -26747,50 +27134,34 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class deleteAll_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteAll_args"); + public static class deleteAll_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("deleteAll_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_FIELD_DESC = new TField("row", TType.STRING, (short)2); + private static final TField COLUMN_FIELD_DESC = new TField("column", TType.STRING, (short)3); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * Row to update */ - public ByteBuffer row; // required + public ByteBuffer row; /** * name of column whose value is to be deleted */ - public ByteBuffer column; // required + public ByteBuffer column; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -26864,17 +27235,17 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW, new FieldMetaData("row", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.COLUMN, new FieldMetaData("column", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteAll_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(deleteAll_args.class, metaDataMap); } public deleteAll_args() { @@ -26921,11 +27292,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -26933,7 +27304,7 @@ public class Hbase { * name of table */ public deleteAll_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -26946,7 +27317,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -26961,11 +27332,11 @@ public class Hbase { * Row to update */ public byte[] getRow() { - setRow(org.apache.thrift.TBaseHelper.rightSize(row)); - return row == null ? null : row.array(); + setRow(TBaseHelper.rightSize(row)); + return row.array(); } - public ByteBuffer bufferForRow() { + public ByteBuffer BufferForRow() { return row; } @@ -26973,7 +27344,7 @@ public class Hbase { * Row to update */ public deleteAll_args setRow(byte[] row) { - setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); + setRow(ByteBuffer.wrap(row)); return this; } @@ -26986,7 +27357,7 @@ public class Hbase { this.row = null; } - /** Returns true if field row is set (has been assigned a value) and false otherwise */ + /** Returns true if field row is set (has been asigned a value) and false otherwise */ public boolean isSetRow() { return this.row != null; } @@ -27001,11 +27372,11 @@ public class Hbase { * name of column whose value is to be deleted */ public byte[] getColumn() { - setColumn(org.apache.thrift.TBaseHelper.rightSize(column)); - return column == null ? null : column.array(); + setColumn(TBaseHelper.rightSize(column)); + return column.array(); } - public ByteBuffer bufferForColumn() { + public ByteBuffer BufferForColumn() { return column; } @@ -27013,7 +27384,7 @@ public class Hbase { * name of column whose value is to be deleted */ public deleteAll_args setColumn(byte[] column) { - setColumn(column == null ? (ByteBuffer)null : ByteBuffer.wrap(column)); + setColumn(ByteBuffer.wrap(column)); return this; } @@ -27026,7 +27397,7 @@ public class Hbase { this.column = null; } - /** Returns true if field column is set (has been assigned a value) and false otherwise */ + /** Returns true if field column is set (has been asigned a value) and false otherwise */ public boolean isSetColumn() { return this.column != null; } @@ -27081,7 +27452,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -27159,7 +27530,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -27169,7 +27540,7 @@ public class Hbase { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } @@ -27179,7 +27550,7 @@ public class Hbase { return lastComparison; } if (isSetColumn()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column); + lastComparison = TBaseHelper.compareTo(this.column, typedOther.column); if (lastComparison != 0) { return lastComparison; } @@ -27191,39 +27562,39 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.row = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // COLUMN - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.column = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -27233,7 +27604,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -27288,37 +27659,21 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class deleteAll_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteAll_result"); + public static class deleteAll_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("deleteAll_result"); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public IOError io; // required + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { IO((short)1, "io"); private static final Map byName = new HashMap(); @@ -27377,13 +27732,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteAll_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(deleteAll_result.class, metaDataMap); } public deleteAll_result() { @@ -27427,7 +27782,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -27460,7 +27815,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -27516,7 +27871,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -27528,26 +27883,26 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -27557,7 +27912,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetIo()) { @@ -27585,55 +27940,39 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class deleteAllTs_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteAllTs_args"); + public static class deleteAllTs_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("deleteAllTs_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)4); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_FIELD_DESC = new TField("row", TType.STRING, (short)2); + private static final TField COLUMN_FIELD_DESC = new TField("column", TType.STRING, (short)3); + private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)4); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * Row to update */ - public ByteBuffer row; // required + public ByteBuffer row; /** * name of column whose value is to be deleted */ - public ByteBuffer column; // required + public ByteBuffer column; /** * timestamp */ - public long timestamp; // required + public long timestamp; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -27715,19 +28054,19 @@ public class Hbase { private static final int __TIMESTAMP_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW, new FieldMetaData("row", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.COLUMN, new FieldMetaData("column", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.TIMESTAMP, new FieldMetaData("timestamp", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteAllTs_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(deleteAllTs_args.class, metaDataMap); } public deleteAllTs_args() { @@ -27782,11 +28121,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -27794,7 +28133,7 @@ public class Hbase { * name of table */ public deleteAllTs_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -27807,7 +28146,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -27822,11 +28161,11 @@ public class Hbase { * Row to update */ public byte[] getRow() { - setRow(org.apache.thrift.TBaseHelper.rightSize(row)); - return row == null ? null : row.array(); + setRow(TBaseHelper.rightSize(row)); + return row.array(); } - public ByteBuffer bufferForRow() { + public ByteBuffer BufferForRow() { return row; } @@ -27834,7 +28173,7 @@ public class Hbase { * Row to update */ public deleteAllTs_args setRow(byte[] row) { - setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); + setRow(ByteBuffer.wrap(row)); return this; } @@ -27847,7 +28186,7 @@ public class Hbase { this.row = null; } - /** Returns true if field row is set (has been assigned a value) and false otherwise */ + /** Returns true if field row is set (has been asigned a value) and false otherwise */ public boolean isSetRow() { return this.row != null; } @@ -27862,11 +28201,11 @@ public class Hbase { * name of column whose value is to be deleted */ public byte[] getColumn() { - setColumn(org.apache.thrift.TBaseHelper.rightSize(column)); - return column == null ? null : column.array(); + setColumn(TBaseHelper.rightSize(column)); + return column.array(); } - public ByteBuffer bufferForColumn() { + public ByteBuffer BufferForColumn() { return column; } @@ -27874,7 +28213,7 @@ public class Hbase { * name of column whose value is to be deleted */ public deleteAllTs_args setColumn(byte[] column) { - setColumn(column == null ? (ByteBuffer)null : ByteBuffer.wrap(column)); + setColumn(ByteBuffer.wrap(column)); return this; } @@ -27887,7 +28226,7 @@ public class Hbase { this.column = null; } - /** Returns true if field column is set (has been assigned a value) and false otherwise */ + /** Returns true if field column is set (has been asigned a value) and false otherwise */ public boolean isSetColumn() { return this.column != null; } @@ -27918,7 +28257,7 @@ public class Hbase { __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID); } - /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */ + /** Returns true if field timestamp is set (has been asigned a value) and false otherwise */ public boolean isSetTimestamp() { return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID); } @@ -27976,13 +28315,13 @@ public class Hbase { return getColumn(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return new Long(getTimestamp()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -28071,7 +28410,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -28081,7 +28420,7 @@ public class Hbase { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } @@ -28091,7 +28430,7 @@ public class Hbase { return lastComparison; } if (isSetColumn()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column); + lastComparison = TBaseHelper.compareTo(this.column, typedOther.column); if (lastComparison != 0) { return lastComparison; } @@ -28101,7 +28440,7 @@ public class Hbase { return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); + lastComparison = TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); if (lastComparison != 0) { return lastComparison; } @@ -28113,47 +28452,47 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.row = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // COLUMN - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.column = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 4: // TIMESTAMP - if (field.type == org.apache.thrift.protocol.TType.I64) { + if (field.type == TType.I64) { this.timestamp = iprot.readI64(); setTimestampIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -28163,7 +28502,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -28225,37 +28564,21 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class deleteAllTs_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteAllTs_result"); + public static class deleteAllTs_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("deleteAllTs_result"); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public IOError io; // required + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { IO((short)1, "io"); private static final Map byName = new HashMap(); @@ -28314,13 +28637,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteAllTs_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(deleteAllTs_result.class, metaDataMap); } public deleteAllTs_result() { @@ -28364,7 +28687,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -28397,7 +28720,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -28453,7 +28776,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -28465,26 +28788,26 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -28494,7 +28817,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetIo()) { @@ -28522,45 +28845,29 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class deleteAllRow_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteAllRow_args"); + public static class deleteAllRow_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("deleteAllRow_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_FIELD_DESC = new TField("row", TType.STRING, (short)2); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * key of the row to be completely deleted. */ - public ByteBuffer row; // required + public ByteBuffer row; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -28628,15 +28935,15 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW, new FieldMetaData("row", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteAllRow_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(deleteAllRow_args.class, metaDataMap); } public deleteAllRow_args() { @@ -28677,11 +28984,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -28689,7 +28996,7 @@ public class Hbase { * name of table */ public deleteAllRow_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -28702,7 +29009,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -28717,11 +29024,11 @@ public class Hbase { * key of the row to be completely deleted. */ public byte[] getRow() { - setRow(org.apache.thrift.TBaseHelper.rightSize(row)); - return row == null ? null : row.array(); + setRow(TBaseHelper.rightSize(row)); + return row.array(); } - public ByteBuffer bufferForRow() { + public ByteBuffer BufferForRow() { return row; } @@ -28729,7 +29036,7 @@ public class Hbase { * key of the row to be completely deleted. */ public deleteAllRow_args setRow(byte[] row) { - setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); + setRow(ByteBuffer.wrap(row)); return this; } @@ -28742,7 +29049,7 @@ public class Hbase { this.row = null; } - /** Returns true if field row is set (has been assigned a value) and false otherwise */ + /** Returns true if field row is set (has been asigned a value) and false otherwise */ public boolean isSetRow() { return this.row != null; } @@ -28786,7 +29093,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -28853,7 +29160,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -28863,7 +29170,7 @@ public class Hbase { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } @@ -28875,32 +29182,32 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.row = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -28910,7 +29217,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -28952,37 +29259,21 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); - } - } + public static class deleteAllRow_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("deleteAllRow_result"); - } - - public static class deleteAllRow_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteAllRow_result"); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - - public IOError io; // required + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { IO((short)1, "io"); private static final Map byName = new HashMap(); @@ -29041,13 +29332,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteAllRow_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(deleteAllRow_result.class, metaDataMap); } public deleteAllRow_result() { @@ -29091,7 +29382,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -29124,7 +29415,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -29180,7 +29471,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -29192,26 +29483,26 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -29221,7 +29512,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetIo()) { @@ -29249,50 +29540,34 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class deleteAllRowTs_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteAllRowTs_args"); + public static class deleteAllRowTs_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("deleteAllRowTs_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)3); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField ROW_FIELD_DESC = new TField("row", TType.STRING, (short)2); + private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)3); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * key of the row to be completely deleted. */ - public ByteBuffer row; // required + public ByteBuffer row; /** * timestamp */ - public long timestamp; // required + public long timestamp; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -29368,17 +29643,17 @@ public class Hbase { private static final int __TIMESTAMP_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.ROW, new FieldMetaData("row", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.TIMESTAMP, new FieldMetaData("timestamp", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteAllRowTs_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(deleteAllRowTs_args.class, metaDataMap); } public deleteAllRowTs_args() { @@ -29427,11 +29702,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -29439,7 +29714,7 @@ public class Hbase { * name of table */ public deleteAllRowTs_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -29452,7 +29727,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -29467,11 +29742,11 @@ public class Hbase { * key of the row to be completely deleted. */ public byte[] getRow() { - setRow(org.apache.thrift.TBaseHelper.rightSize(row)); - return row == null ? null : row.array(); + setRow(TBaseHelper.rightSize(row)); + return row.array(); } - public ByteBuffer bufferForRow() { + public ByteBuffer BufferForRow() { return row; } @@ -29479,7 +29754,7 @@ public class Hbase { * key of the row to be completely deleted. */ public deleteAllRowTs_args setRow(byte[] row) { - setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); + setRow(ByteBuffer.wrap(row)); return this; } @@ -29492,7 +29767,7 @@ public class Hbase { this.row = null; } - /** Returns true if field row is set (has been assigned a value) and false otherwise */ + /** Returns true if field row is set (has been asigned a value) and false otherwise */ public boolean isSetRow() { return this.row != null; } @@ -29523,7 +29798,7 @@ public class Hbase { __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID); } - /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */ + /** Returns true if field timestamp is set (has been asigned a value) and false otherwise */ public boolean isSetTimestamp() { return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID); } @@ -29570,13 +29845,13 @@ public class Hbase { return getRow(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return new Long(getTimestamp()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -29654,7 +29929,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -29664,7 +29939,7 @@ public class Hbase { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } @@ -29674,7 +29949,7 @@ public class Hbase { return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); + lastComparison = TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); if (lastComparison != 0) { return lastComparison; } @@ -29686,40 +29961,40 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.row = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // TIMESTAMP - if (field.type == org.apache.thrift.protocol.TType.I64) { + if (field.type == TType.I64) { this.timestamp = iprot.readI64(); setTimestampIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -29729,7 +30004,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -29778,37 +30053,21 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class deleteAllRowTs_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteAllRowTs_result"); + public static class deleteAllRowTs_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("deleteAllRowTs_result"); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public IOError io; // required + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { IO((short)1, "io"); private static final Map byName = new HashMap(); @@ -29867,13 +30126,13 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteAllRowTs_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(deleteAllRowTs_result.class, metaDataMap); } public deleteAllRowTs_result() { @@ -29917,7 +30176,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -29950,7 +30209,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -30006,7 +30265,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -30018,26 +30277,26 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -30047,7 +30306,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetIo()) { @@ -30075,45 +30334,29 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerOpenWithScan_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerOpenWithScan_args"); + public static class scannerOpenWithScan_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerOpenWithScan_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField SCAN_FIELD_DESC = new org.apache.thrift.protocol.TField("scan", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField SCAN_FIELD_DESC = new TField("scan", TType.STRUCT, (short)2); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * Scan instance */ - public TScan scan; // required + public TScan scan; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -30181,15 +30424,15 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.SCAN, new org.apache.thrift.meta_data.FieldMetaData("scan", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TScan.class))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.SCAN, new FieldMetaData("scan", TFieldRequirementType.DEFAULT, + new StructMetaData(TType.STRUCT, TScan.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerOpenWithScan_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerOpenWithScan_args.class, metaDataMap); } public scannerOpenWithScan_args() { @@ -30230,11 +30473,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -30242,7 +30485,7 @@ public class Hbase { * name of table */ public scannerOpenWithScan_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -30255,7 +30498,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -30285,7 +30528,7 @@ public class Hbase { this.scan = null; } - /** Returns true if field scan is set (has been assigned a value) and false otherwise */ + /** Returns true if field scan is set (has been asigned a value) and false otherwise */ public boolean isSetScan() { return this.scan != null; } @@ -30329,7 +30572,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -30396,7 +30639,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -30406,7 +30649,7 @@ public class Hbase { return lastComparison; } if (isSetScan()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.scan, typedOther.scan); + lastComparison = TBaseHelper.compareTo(this.scan, typedOther.scan); if (lastComparison != 0) { return lastComparison; } @@ -30418,33 +30661,33 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // SCAN - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.scan = new TScan(); this.scan.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -30454,7 +30697,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -30496,39 +30739,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerOpenWithScan_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerOpenWithScan_result"); + public static class scannerOpenWithScan_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerOpenWithScan_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.I32, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public int success; // required - public IOError io; // required + public int success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -30592,15 +30819,15 @@ public class Hbase { private static final int __SUCCESS_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32 , "ScannerID"))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32 , "ScannerID"))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerOpenWithScan_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerOpenWithScan_result.class, metaDataMap); } public scannerOpenWithScan_result() { @@ -30653,7 +30880,7 @@ public class Hbase { __isset_bit_vector.clear(__SUCCESS_ISSET_ID); } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return __isset_bit_vector.get(__SUCCESS_ISSET_ID); } @@ -30675,7 +30902,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -30710,7 +30937,7 @@ public class Hbase { public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Integer.valueOf(getSuccess()); + return new Integer(getSuccess()); case IO: return getIo(); @@ -30719,7 +30946,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -30786,7 +31013,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -30796,7 +31023,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -30808,34 +31035,34 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.I32) { + if (field.type == TType.I32) { this.success = iprot.readI32(); setSuccessIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -30845,7 +31072,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { @@ -30881,53 +31108,37 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerOpen_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerOpen_args"); + public static class scannerOpen_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerOpen_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField START_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("startRow", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)3); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField START_ROW_FIELD_DESC = new TField("startRow", TType.STRING, (short)2); + private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.LIST, (short)3); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * Starting row in table to scan. * Send "" (empty string) to start at the first row. */ - public ByteBuffer startRow; // required + public ByteBuffer startRow; /** * columns to scan. If column name is a column family, all * columns of the specified column family are returned. It's also possible * to pass a regex in the column qualifier. */ - public List columns; // required + public List columns; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -31004,18 +31215,18 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.START_ROW, new org.apache.thrift.meta_data.FieldMetaData("startRow", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.START_ROW, new FieldMetaData("startRow", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.STRING , "Text")))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerOpen_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerOpen_args.class, metaDataMap); } public scannerOpen_args() { @@ -31066,11 +31277,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -31078,7 +31289,7 @@ public class Hbase { * name of table */ public scannerOpen_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -31091,7 +31302,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -31107,11 +31318,11 @@ public class Hbase { * Send "" (empty string) to start at the first row. */ public byte[] getStartRow() { - setStartRow(org.apache.thrift.TBaseHelper.rightSize(startRow)); - return startRow == null ? null : startRow.array(); + setStartRow(TBaseHelper.rightSize(startRow)); + return startRow.array(); } - public ByteBuffer bufferForStartRow() { + public ByteBuffer BufferForStartRow() { return startRow; } @@ -31120,7 +31331,7 @@ public class Hbase { * Send "" (empty string) to start at the first row. */ public scannerOpen_args setStartRow(byte[] startRow) { - setStartRow(startRow == null ? (ByteBuffer)null : ByteBuffer.wrap(startRow)); + setStartRow(ByteBuffer.wrap(startRow)); return this; } @@ -31133,7 +31344,7 @@ public class Hbase { this.startRow = null; } - /** Returns true if field startRow is set (has been assigned a value) and false otherwise */ + /** Returns true if field startRow is set (has been asigned a value) and false otherwise */ public boolean isSetStartRow() { return this.startRow != null; } @@ -31182,7 +31393,7 @@ public class Hbase { this.columns = null; } - /** Returns true if field columns is set (has been assigned a value) and false otherwise */ + /** Returns true if field columns is set (has been asigned a value) and false otherwise */ public boolean isSetColumns() { return this.columns != null; } @@ -31237,7 +31448,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -31315,7 +31526,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -31325,7 +31536,7 @@ public class Hbase { return lastComparison; } if (isSetStartRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, typedOther.startRow); + lastComparison = TBaseHelper.compareTo(this.startRow, typedOther.startRow); if (lastComparison != 0) { return lastComparison; } @@ -31335,7 +31546,7 @@ public class Hbase { return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = TBaseHelper.compareTo(this.columns, typedOther.columns); if (lastComparison != 0) { return lastComparison; } @@ -31347,49 +31558,49 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // START_ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.startRow = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // COLUMNS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list122 = iprot.readListBegin(); + TList _list122 = iprot.readListBegin(); this.columns = new ArrayList(_list122.size); for (int _i123 = 0; _i123 < _list122.size; ++_i123) { - ByteBuffer _elem124; // required + ByteBuffer _elem124; _elem124 = iprot.readBinary(); this.columns.add(_elem124); } iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -31399,7 +31610,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -31416,7 +31627,7 @@ public class Hbase { if (this.columns != null) { oprot.writeFieldBegin(COLUMNS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.columns.size())); + oprot.writeListBegin(new TList(TType.STRING, this.columns.size())); for (ByteBuffer _iter125 : this.columns) { oprot.writeBinary(_iter125); @@ -31461,39 +31672,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerOpen_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerOpen_result"); + public static class scannerOpen_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerOpen_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.I32, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public int success; // required - public IOError io; // required + public int success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -31557,15 +31752,15 @@ public class Hbase { private static final int __SUCCESS_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32 , "ScannerID"))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32 , "ScannerID"))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerOpen_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerOpen_result.class, metaDataMap); } public scannerOpen_result() { @@ -31618,7 +31813,7 @@ public class Hbase { __isset_bit_vector.clear(__SUCCESS_ISSET_ID); } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return __isset_bit_vector.get(__SUCCESS_ISSET_ID); } @@ -31640,7 +31835,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -31675,7 +31870,7 @@ public class Hbase { public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Integer.valueOf(getSuccess()); + return new Integer(getSuccess()); case IO: return getIo(); @@ -31684,7 +31879,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -31751,7 +31946,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -31761,7 +31956,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -31773,34 +31968,34 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.I32) { + if (field.type == TType.I32) { this.success = iprot.readI32(); setSuccessIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -31810,7 +32005,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { @@ -31846,59 +32041,43 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerOpenWithStop_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerOpenWithStop_args"); + public static class scannerOpenWithStop_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerOpenWithStop_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField START_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("startRow", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField STOP_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("stopRow", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)4); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField START_ROW_FIELD_DESC = new TField("startRow", TType.STRING, (short)2); + private static final TField STOP_ROW_FIELD_DESC = new TField("stopRow", TType.STRING, (short)3); + private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.LIST, (short)4); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * Starting row in table to scan. * Send "" (empty string) to start at the first row. */ - public ByteBuffer startRow; // required + public ByteBuffer startRow; /** * row to stop scanning on. This row is *not* included in the * scanner's results */ - public ByteBuffer stopRow; // required + public ByteBuffer stopRow; /** * columns to scan. If column name is a column family, all * columns of the specified column family are returned. It's also possible * to pass a regex in the column qualifier. */ - public List columns; // required + public List columns; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -31982,20 +32161,20 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.START_ROW, new org.apache.thrift.meta_data.FieldMetaData("startRow", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.STOP_ROW, new org.apache.thrift.meta_data.FieldMetaData("stopRow", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.START_ROW, new FieldMetaData("startRow", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.STOP_ROW, new FieldMetaData("stopRow", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.STRING , "Text")))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerOpenWithStop_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerOpenWithStop_args.class, metaDataMap); } public scannerOpenWithStop_args() { @@ -32052,11 +32231,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -32064,7 +32243,7 @@ public class Hbase { * name of table */ public scannerOpenWithStop_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -32077,7 +32256,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -32093,11 +32272,11 @@ public class Hbase { * Send "" (empty string) to start at the first row. */ public byte[] getStartRow() { - setStartRow(org.apache.thrift.TBaseHelper.rightSize(startRow)); - return startRow == null ? null : startRow.array(); + setStartRow(TBaseHelper.rightSize(startRow)); + return startRow.array(); } - public ByteBuffer bufferForStartRow() { + public ByteBuffer BufferForStartRow() { return startRow; } @@ -32106,7 +32285,7 @@ public class Hbase { * Send "" (empty string) to start at the first row. */ public scannerOpenWithStop_args setStartRow(byte[] startRow) { - setStartRow(startRow == null ? (ByteBuffer)null : ByteBuffer.wrap(startRow)); + setStartRow(ByteBuffer.wrap(startRow)); return this; } @@ -32119,7 +32298,7 @@ public class Hbase { this.startRow = null; } - /** Returns true if field startRow is set (has been assigned a value) and false otherwise */ + /** Returns true if field startRow is set (has been asigned a value) and false otherwise */ public boolean isSetStartRow() { return this.startRow != null; } @@ -32135,11 +32314,11 @@ public class Hbase { * scanner's results */ public byte[] getStopRow() { - setStopRow(org.apache.thrift.TBaseHelper.rightSize(stopRow)); - return stopRow == null ? null : stopRow.array(); + setStopRow(TBaseHelper.rightSize(stopRow)); + return stopRow.array(); } - public ByteBuffer bufferForStopRow() { + public ByteBuffer BufferForStopRow() { return stopRow; } @@ -32148,7 +32327,7 @@ public class Hbase { * scanner's results */ public scannerOpenWithStop_args setStopRow(byte[] stopRow) { - setStopRow(stopRow == null ? (ByteBuffer)null : ByteBuffer.wrap(stopRow)); + setStopRow(ByteBuffer.wrap(stopRow)); return this; } @@ -32161,7 +32340,7 @@ public class Hbase { this.stopRow = null; } - /** Returns true if field stopRow is set (has been assigned a value) and false otherwise */ + /** Returns true if field stopRow is set (has been asigned a value) and false otherwise */ public boolean isSetStopRow() { return this.stopRow != null; } @@ -32210,7 +32389,7 @@ public class Hbase { this.columns = null; } - /** Returns true if field columns is set (has been assigned a value) and false otherwise */ + /** Returns true if field columns is set (has been asigned a value) and false otherwise */ public boolean isSetColumns() { return this.columns != null; } @@ -32276,7 +32455,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -32365,7 +32544,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -32375,7 +32554,7 @@ public class Hbase { return lastComparison; } if (isSetStartRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, typedOther.startRow); + lastComparison = TBaseHelper.compareTo(this.startRow, typedOther.startRow); if (lastComparison != 0) { return lastComparison; } @@ -32385,7 +32564,7 @@ public class Hbase { return lastComparison; } if (isSetStopRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopRow, typedOther.stopRow); + lastComparison = TBaseHelper.compareTo(this.stopRow, typedOther.stopRow); if (lastComparison != 0) { return lastComparison; } @@ -32395,7 +32574,7 @@ public class Hbase { return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = TBaseHelper.compareTo(this.columns, typedOther.columns); if (lastComparison != 0) { return lastComparison; } @@ -32407,56 +32586,56 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // START_ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.startRow = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // STOP_ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.stopRow = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 4: // COLUMNS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list126 = iprot.readListBegin(); + TList _list126 = iprot.readListBegin(); this.columns = new ArrayList(_list126.size); for (int _i127 = 0; _i127 < _list126.size; ++_i127) { - ByteBuffer _elem128; // required + ByteBuffer _elem128; _elem128 = iprot.readBinary(); this.columns.add(_elem128); } iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -32466,7 +32645,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -32488,7 +32667,7 @@ public class Hbase { if (this.columns != null) { oprot.writeFieldBegin(COLUMNS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.columns.size())); + oprot.writeListBegin(new TList(TType.STRING, this.columns.size())); for (ByteBuffer _iter129 : this.columns) { oprot.writeBinary(_iter129); @@ -32541,39 +32720,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerOpenWithStop_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerOpenWithStop_result"); + public static class scannerOpenWithStop_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerOpenWithStop_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.I32, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public int success; // required - public IOError io; // required + public int success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -32637,15 +32800,15 @@ public class Hbase { private static final int __SUCCESS_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32 , "ScannerID"))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32 , "ScannerID"))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerOpenWithStop_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerOpenWithStop_result.class, metaDataMap); } public scannerOpenWithStop_result() { @@ -32698,7 +32861,7 @@ public class Hbase { __isset_bit_vector.clear(__SUCCESS_ISSET_ID); } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return __isset_bit_vector.get(__SUCCESS_ISSET_ID); } @@ -32720,7 +32883,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -32755,7 +32918,7 @@ public class Hbase { public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Integer.valueOf(getSuccess()); + return new Integer(getSuccess()); case IO: return getIo(); @@ -32764,7 +32927,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -32831,7 +32994,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -32841,7 +33004,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -32853,34 +33016,34 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.I32) { + if (field.type == TType.I32) { this.success = iprot.readI32(); setSuccessIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -32890,7 +33053,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { @@ -32926,50 +33089,34 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerOpenWithPrefix_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerOpenWithPrefix_args"); + public static class scannerOpenWithPrefix_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerOpenWithPrefix_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField START_AND_PREFIX_FIELD_DESC = new org.apache.thrift.protocol.TField("startAndPrefix", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)3); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField START_AND_PREFIX_FIELD_DESC = new TField("startAndPrefix", TType.STRING, (short)2); + private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.LIST, (short)3); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * the prefix (and thus start row) of the keys you want */ - public ByteBuffer startAndPrefix; // required + public ByteBuffer startAndPrefix; /** * the columns you want returned */ - public List columns; // required + public List columns; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -33043,18 +33190,18 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.START_AND_PREFIX, new org.apache.thrift.meta_data.FieldMetaData("startAndPrefix", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.START_AND_PREFIX, new FieldMetaData("startAndPrefix", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.STRING , "Text")))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerOpenWithPrefix_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerOpenWithPrefix_args.class, metaDataMap); } public scannerOpenWithPrefix_args() { @@ -33105,11 +33252,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -33117,7 +33264,7 @@ public class Hbase { * name of table */ public scannerOpenWithPrefix_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -33130,7 +33277,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -33145,11 +33292,11 @@ public class Hbase { * the prefix (and thus start row) of the keys you want */ public byte[] getStartAndPrefix() { - setStartAndPrefix(org.apache.thrift.TBaseHelper.rightSize(startAndPrefix)); - return startAndPrefix == null ? null : startAndPrefix.array(); + setStartAndPrefix(TBaseHelper.rightSize(startAndPrefix)); + return startAndPrefix.array(); } - public ByteBuffer bufferForStartAndPrefix() { + public ByteBuffer BufferForStartAndPrefix() { return startAndPrefix; } @@ -33157,7 +33304,7 @@ public class Hbase { * the prefix (and thus start row) of the keys you want */ public scannerOpenWithPrefix_args setStartAndPrefix(byte[] startAndPrefix) { - setStartAndPrefix(startAndPrefix == null ? (ByteBuffer)null : ByteBuffer.wrap(startAndPrefix)); + setStartAndPrefix(ByteBuffer.wrap(startAndPrefix)); return this; } @@ -33170,7 +33317,7 @@ public class Hbase { this.startAndPrefix = null; } - /** Returns true if field startAndPrefix is set (has been assigned a value) and false otherwise */ + /** Returns true if field startAndPrefix is set (has been asigned a value) and false otherwise */ public boolean isSetStartAndPrefix() { return this.startAndPrefix != null; } @@ -33215,7 +33362,7 @@ public class Hbase { this.columns = null; } - /** Returns true if field columns is set (has been assigned a value) and false otherwise */ + /** Returns true if field columns is set (has been asigned a value) and false otherwise */ public boolean isSetColumns() { return this.columns != null; } @@ -33270,7 +33417,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -33348,7 +33495,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -33358,7 +33505,7 @@ public class Hbase { return lastComparison; } if (isSetStartAndPrefix()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startAndPrefix, typedOther.startAndPrefix); + lastComparison = TBaseHelper.compareTo(this.startAndPrefix, typedOther.startAndPrefix); if (lastComparison != 0) { return lastComparison; } @@ -33368,7 +33515,7 @@ public class Hbase { return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = TBaseHelper.compareTo(this.columns, typedOther.columns); if (lastComparison != 0) { return lastComparison; } @@ -33380,49 +33527,49 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // START_AND_PREFIX - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.startAndPrefix = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // COLUMNS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list130 = iprot.readListBegin(); + TList _list130 = iprot.readListBegin(); this.columns = new ArrayList(_list130.size); for (int _i131 = 0; _i131 < _list130.size; ++_i131) { - ByteBuffer _elem132; // required + ByteBuffer _elem132; _elem132 = iprot.readBinary(); this.columns.add(_elem132); } iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -33432,7 +33579,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -33449,7 +33596,7 @@ public class Hbase { if (this.columns != null) { oprot.writeFieldBegin(COLUMNS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.columns.size())); + oprot.writeListBegin(new TList(TType.STRING, this.columns.size())); for (ByteBuffer _iter133 : this.columns) { oprot.writeBinary(_iter133); @@ -33494,39 +33641,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerOpenWithPrefix_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerOpenWithPrefix_result"); + public static class scannerOpenWithPrefix_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerOpenWithPrefix_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.I32, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public int success; // required - public IOError io; // required + public int success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -33590,15 +33721,15 @@ public class Hbase { private static final int __SUCCESS_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32 , "ScannerID"))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32 , "ScannerID"))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerOpenWithPrefix_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerOpenWithPrefix_result.class, metaDataMap); } public scannerOpenWithPrefix_result() { @@ -33651,7 +33782,7 @@ public class Hbase { __isset_bit_vector.clear(__SUCCESS_ISSET_ID); } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return __isset_bit_vector.get(__SUCCESS_ISSET_ID); } @@ -33673,7 +33804,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -33708,7 +33839,7 @@ public class Hbase { public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Integer.valueOf(getSuccess()); + return new Integer(getSuccess()); case IO: return getIo(); @@ -33717,7 +33848,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -33784,7 +33915,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -33794,7 +33925,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -33806,34 +33937,34 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.I32) { + if (field.type == TType.I32) { this.success = iprot.readI32(); setSuccessIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -33843,7 +33974,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { @@ -33879,58 +34010,42 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerOpenTs_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerOpenTs_args"); + public static class scannerOpenTs_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerOpenTs_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField START_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("startRow", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)3); - private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)4); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField START_ROW_FIELD_DESC = new TField("startRow", TType.STRING, (short)2); + private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.LIST, (short)3); + private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)4); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * Starting row in table to scan. * Send "" (empty string) to start at the first row. */ - public ByteBuffer startRow; // required + public ByteBuffer startRow; /** * columns to scan. If column name is a column family, all * columns of the specified column family are returned. It's also possible * to pass a regex in the column qualifier. */ - public List columns; // required + public List columns; /** * timestamp */ - public long timestamp; // required + public long timestamp; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -34015,20 +34130,20 @@ public class Hbase { private static final int __TIMESTAMP_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.START_ROW, new org.apache.thrift.meta_data.FieldMetaData("startRow", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); - tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.START_ROW, new FieldMetaData("startRow", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.STRING , "Text")))); + tmpMap.put(_Fields.TIMESTAMP, new FieldMetaData("timestamp", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerOpenTs_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerOpenTs_args.class, metaDataMap); } public scannerOpenTs_args() { @@ -34087,11 +34202,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -34099,7 +34214,7 @@ public class Hbase { * name of table */ public scannerOpenTs_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -34112,7 +34227,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -34128,11 +34243,11 @@ public class Hbase { * Send "" (empty string) to start at the first row. */ public byte[] getStartRow() { - setStartRow(org.apache.thrift.TBaseHelper.rightSize(startRow)); - return startRow == null ? null : startRow.array(); + setStartRow(TBaseHelper.rightSize(startRow)); + return startRow.array(); } - public ByteBuffer bufferForStartRow() { + public ByteBuffer BufferForStartRow() { return startRow; } @@ -34141,7 +34256,7 @@ public class Hbase { * Send "" (empty string) to start at the first row. */ public scannerOpenTs_args setStartRow(byte[] startRow) { - setStartRow(startRow == null ? (ByteBuffer)null : ByteBuffer.wrap(startRow)); + setStartRow(ByteBuffer.wrap(startRow)); return this; } @@ -34154,7 +34269,7 @@ public class Hbase { this.startRow = null; } - /** Returns true if field startRow is set (has been assigned a value) and false otherwise */ + /** Returns true if field startRow is set (has been asigned a value) and false otherwise */ public boolean isSetStartRow() { return this.startRow != null; } @@ -34203,7 +34318,7 @@ public class Hbase { this.columns = null; } - /** Returns true if field columns is set (has been assigned a value) and false otherwise */ + /** Returns true if field columns is set (has been asigned a value) and false otherwise */ public boolean isSetColumns() { return this.columns != null; } @@ -34234,7 +34349,7 @@ public class Hbase { __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID); } - /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */ + /** Returns true if field timestamp is set (has been asigned a value) and false otherwise */ public boolean isSetTimestamp() { return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID); } @@ -34292,13 +34407,13 @@ public class Hbase { return getColumns(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return new Long(getTimestamp()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -34387,7 +34502,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -34397,7 +34512,7 @@ public class Hbase { return lastComparison; } if (isSetStartRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, typedOther.startRow); + lastComparison = TBaseHelper.compareTo(this.startRow, typedOther.startRow); if (lastComparison != 0) { return lastComparison; } @@ -34407,7 +34522,7 @@ public class Hbase { return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = TBaseHelper.compareTo(this.columns, typedOther.columns); if (lastComparison != 0) { return lastComparison; } @@ -34417,7 +34532,7 @@ public class Hbase { return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); + lastComparison = TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); if (lastComparison != 0) { return lastComparison; } @@ -34429,57 +34544,57 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // START_ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.startRow = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // COLUMNS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list134 = iprot.readListBegin(); + TList _list134 = iprot.readListBegin(); this.columns = new ArrayList(_list134.size); for (int _i135 = 0; _i135 < _list134.size; ++_i135) { - ByteBuffer _elem136; // required + ByteBuffer _elem136; _elem136 = iprot.readBinary(); this.columns.add(_elem136); } iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 4: // TIMESTAMP - if (field.type == org.apache.thrift.protocol.TType.I64) { + if (field.type == TType.I64) { this.timestamp = iprot.readI64(); setTimestampIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -34489,7 +34604,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -34506,7 +34621,7 @@ public class Hbase { if (this.columns != null) { oprot.writeFieldBegin(COLUMNS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.columns.size())); + oprot.writeListBegin(new TList(TType.STRING, this.columns.size())); for (ByteBuffer _iter137 : this.columns) { oprot.writeBinary(_iter137); @@ -34558,41 +34673,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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_bit_vector = new BitSet(1); - 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); } - } - - } - public static class scannerOpenTs_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerOpenTs_result"); + public static class scannerOpenTs_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerOpenTs_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.I32, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public int success; // required - public IOError io; // required + public int success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -34656,15 +34753,15 @@ public class Hbase { private static final int __SUCCESS_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32 , "ScannerID"))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32 , "ScannerID"))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerOpenTs_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerOpenTs_result.class, metaDataMap); } public scannerOpenTs_result() { @@ -34717,7 +34814,7 @@ public class Hbase { __isset_bit_vector.clear(__SUCCESS_ISSET_ID); } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return __isset_bit_vector.get(__SUCCESS_ISSET_ID); } @@ -34739,7 +34836,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -34774,7 +34871,7 @@ public class Hbase { public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Integer.valueOf(getSuccess()); + return new Integer(getSuccess()); case IO: return getIo(); @@ -34783,7 +34880,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -34850,7 +34947,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -34860,7 +34957,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -34872,34 +34969,34 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.I32) { + if (field.type == TType.I32) { this.success = iprot.readI32(); setSuccessIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -34909,7 +35006,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { @@ -34945,64 +35042,48 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerOpenWithStopTs_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerOpenWithStopTs_args"); + public static class scannerOpenWithStopTs_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerOpenWithStopTs_args"); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField START_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("startRow", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField STOP_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("stopRow", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)4); - private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)5); + private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)1); + private static final TField START_ROW_FIELD_DESC = new TField("startRow", TType.STRING, (short)2); + private static final TField STOP_ROW_FIELD_DESC = new TField("stopRow", TType.STRING, (short)3); + private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.LIST, (short)4); + private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)5); /** * name of table */ - public ByteBuffer tableName; // required + public ByteBuffer tableName; /** * Starting row in table to scan. * Send "" (empty string) to start at the first row. */ - public ByteBuffer startRow; // required + public ByteBuffer startRow; /** * row to stop scanning on. This row is *not* included in the * scanner's results */ - public ByteBuffer stopRow; // required + public ByteBuffer stopRow; /** * columns to scan. If column name is a column family, all * columns of the specified column family are returned. It's also possible * to pass a regex in the column qualifier. */ - public List columns; // required + public List columns; /** * timestamp */ - public long timestamp; // required + public long timestamp; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * name of table */ @@ -35094,22 +35175,22 @@ public class Hbase { private static final int __TIMESTAMP_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.START_ROW, new org.apache.thrift.meta_data.FieldMetaData("startRow", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.STOP_ROW, new org.apache.thrift.meta_data.FieldMetaData("stopRow", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); - tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.START_ROW, new FieldMetaData("startRow", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.STOP_ROW, new FieldMetaData("stopRow", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.STRING , "Text")))); + tmpMap.put(_Fields.TIMESTAMP, new FieldMetaData("timestamp", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerOpenWithStopTs_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerOpenWithStopTs_args.class, metaDataMap); } public scannerOpenWithStopTs_args() { @@ -35174,11 +35255,11 @@ public class Hbase { * name of table */ public byte[] getTableName() { - setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName)); - return tableName == null ? null : tableName.array(); + setTableName(TBaseHelper.rightSize(tableName)); + return tableName.array(); } - public ByteBuffer bufferForTableName() { + public ByteBuffer BufferForTableName() { return tableName; } @@ -35186,7 +35267,7 @@ public class Hbase { * name of table */ public scannerOpenWithStopTs_args setTableName(byte[] tableName) { - setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); + setTableName(ByteBuffer.wrap(tableName)); return this; } @@ -35199,7 +35280,7 @@ public class Hbase { this.tableName = null; } - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + /** Returns true if field tableName is set (has been asigned a value) and false otherwise */ public boolean isSetTableName() { return this.tableName != null; } @@ -35215,11 +35296,11 @@ public class Hbase { * Send "" (empty string) to start at the first row. */ public byte[] getStartRow() { - setStartRow(org.apache.thrift.TBaseHelper.rightSize(startRow)); - return startRow == null ? null : startRow.array(); + setStartRow(TBaseHelper.rightSize(startRow)); + return startRow.array(); } - public ByteBuffer bufferForStartRow() { + public ByteBuffer BufferForStartRow() { return startRow; } @@ -35228,7 +35309,7 @@ public class Hbase { * Send "" (empty string) to start at the first row. */ public scannerOpenWithStopTs_args setStartRow(byte[] startRow) { - setStartRow(startRow == null ? (ByteBuffer)null : ByteBuffer.wrap(startRow)); + setStartRow(ByteBuffer.wrap(startRow)); return this; } @@ -35241,7 +35322,7 @@ public class Hbase { this.startRow = null; } - /** Returns true if field startRow is set (has been assigned a value) and false otherwise */ + /** Returns true if field startRow is set (has been asigned a value) and false otherwise */ public boolean isSetStartRow() { return this.startRow != null; } @@ -35257,11 +35338,11 @@ public class Hbase { * scanner's results */ public byte[] getStopRow() { - setStopRow(org.apache.thrift.TBaseHelper.rightSize(stopRow)); - return stopRow == null ? null : stopRow.array(); + setStopRow(TBaseHelper.rightSize(stopRow)); + return stopRow.array(); } - public ByteBuffer bufferForStopRow() { + public ByteBuffer BufferForStopRow() { return stopRow; } @@ -35270,7 +35351,7 @@ public class Hbase { * scanner's results */ public scannerOpenWithStopTs_args setStopRow(byte[] stopRow) { - setStopRow(stopRow == null ? (ByteBuffer)null : ByteBuffer.wrap(stopRow)); + setStopRow(ByteBuffer.wrap(stopRow)); return this; } @@ -35283,7 +35364,7 @@ public class Hbase { this.stopRow = null; } - /** Returns true if field stopRow is set (has been assigned a value) and false otherwise */ + /** Returns true if field stopRow is set (has been asigned a value) and false otherwise */ public boolean isSetStopRow() { return this.stopRow != null; } @@ -35332,7 +35413,7 @@ public class Hbase { this.columns = null; } - /** Returns true if field columns is set (has been assigned a value) and false otherwise */ + /** Returns true if field columns is set (has been asigned a value) and false otherwise */ public boolean isSetColumns() { return this.columns != null; } @@ -35363,7 +35444,7 @@ public class Hbase { __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID); } - /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */ + /** Returns true if field timestamp is set (has been asigned a value) and false otherwise */ public boolean isSetTimestamp() { return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID); } @@ -35432,13 +35513,13 @@ public class Hbase { return getColumns(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return new Long(getTimestamp()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -35538,7 +35619,7 @@ public class Hbase { return lastComparison; } if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); + lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName); if (lastComparison != 0) { return lastComparison; } @@ -35548,7 +35629,7 @@ public class Hbase { return lastComparison; } if (isSetStartRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, typedOther.startRow); + lastComparison = TBaseHelper.compareTo(this.startRow, typedOther.startRow); if (lastComparison != 0) { return lastComparison; } @@ -35558,7 +35639,7 @@ public class Hbase { return lastComparison; } if (isSetStopRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopRow, typedOther.stopRow); + lastComparison = TBaseHelper.compareTo(this.stopRow, typedOther.stopRow); if (lastComparison != 0) { return lastComparison; } @@ -35568,7 +35649,7 @@ public class Hbase { return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = TBaseHelper.compareTo(this.columns, typedOther.columns); if (lastComparison != 0) { return lastComparison; } @@ -35578,7 +35659,7 @@ public class Hbase { return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); + lastComparison = TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); if (lastComparison != 0) { return lastComparison; } @@ -35590,64 +35671,64 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // TABLE_NAME - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.tableName = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // START_ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.startRow = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // STOP_ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.stopRow = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 4: // COLUMNS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list138 = iprot.readListBegin(); + TList _list138 = iprot.readListBegin(); this.columns = new ArrayList(_list138.size); for (int _i139 = 0; _i139 < _list138.size; ++_i139) { - ByteBuffer _elem140; // required + ByteBuffer _elem140; _elem140 = iprot.readBinary(); this.columns.add(_elem140); } iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 5: // TIMESTAMP - if (field.type == org.apache.thrift.protocol.TType.I64) { + if (field.type == TType.I64) { this.timestamp = iprot.readI64(); setTimestampIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -35657,7 +35738,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -35679,7 +35760,7 @@ public class Hbase { if (this.columns != null) { oprot.writeFieldBegin(COLUMNS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.columns.size())); + oprot.writeListBegin(new TList(TType.STRING, this.columns.size())); for (ByteBuffer _iter141 : this.columns) { oprot.writeBinary(_iter141); @@ -35739,39 +35820,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerOpenWithStopTs_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerOpenWithStopTs_result"); + public static class scannerOpenWithStopTs_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerOpenWithStopTs_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.I32, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); - public int success; // required - public IOError io; // required + public int success; + public IOError io; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"); @@ -35835,15 +35900,15 @@ public class Hbase { private static final int __SUCCESS_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32 , "ScannerID"))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32 , "ScannerID"))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerOpenWithStopTs_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerOpenWithStopTs_result.class, metaDataMap); } public scannerOpenWithStopTs_result() { @@ -35896,7 +35961,7 @@ public class Hbase { __isset_bit_vector.clear(__SUCCESS_ISSET_ID); } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return __isset_bit_vector.get(__SUCCESS_ISSET_ID); } @@ -35918,7 +35983,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -35953,7 +36018,7 @@ public class Hbase { public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Integer.valueOf(getSuccess()); + return new Integer(getSuccess()); case IO: return getIo(); @@ -35962,7 +36027,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -36029,7 +36094,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -36039,7 +36104,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -36051,34 +36116,34 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.I32) { + if (field.type == TType.I32) { this.success = iprot.readI32(); setSuccessIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -36088,7 +36153,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { @@ -36124,40 +36189,24 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerGet_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerGet_args"); + public static class scannerGet_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerGet_args"); - private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.I32, (short)1); + private static final TField ID_FIELD_DESC = new TField("id", TType.I32, (short)1); /** * id of a scanner returned by scannerOpen */ - public int id; // required + public int id; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * id of a scanner returned by scannerOpen */ @@ -36221,13 +36270,13 @@ public class Hbase { private static final int __ID_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32 , "ScannerID"))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new FieldMetaData("id", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32 , "ScannerID"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerGet_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerGet_args.class, metaDataMap); } public scannerGet_args() { @@ -36280,7 +36329,7 @@ public class Hbase { __isset_bit_vector.clear(__ID_ISSET_ID); } - /** Returns true if field id is set (has been assigned a value) and false otherwise */ + /** Returns true if field id is set (has been asigned a value) and false otherwise */ public boolean isSetId() { return __isset_bit_vector.get(__ID_ISSET_ID); } @@ -36305,13 +36354,13 @@ public class Hbase { public Object getFieldValue(_Fields field) { switch (field) { case ID: - return Integer.valueOf(getId()); + return new Integer(getId()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -36367,7 +36416,7 @@ public class Hbase { return lastComparison; } if (isSetId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id); + lastComparison = TBaseHelper.compareTo(this.id, typedOther.id); if (lastComparison != 0) { return lastComparison; } @@ -36379,26 +36428,26 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // ID - if (field.type == org.apache.thrift.protocol.TType.I32) { + if (field.type == TType.I32) { this.id = iprot.readI32(); setIdIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -36408,7 +36457,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -36431,43 +36480,25 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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_bit_vector = new BitSet(1); - 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); } - } - - } - public static class scannerGet_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerGet_result"); + public static class scannerGet_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerGet_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField IA_FIELD_DESC = new org.apache.thrift.protocol.TField("ia", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); + private static final TField IA_FIELD_DESC = new TField("ia", TType.STRUCT, (short)2); - public List success; // required - public IOError io; // required - public IllegalArgument ia; // required + public List success; + public IOError io; + public IllegalArgument ia; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"), IA((short)2, "ia"); @@ -36532,18 +36563,18 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, TRowResult.class)))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - tmpMap.put(_Fields.IA, new org.apache.thrift.meta_data.FieldMetaData("ia", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, TRowResult.class)))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); + tmpMap.put(_Fields.IA, new FieldMetaData("ia", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerGet_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerGet_result.class, metaDataMap); } public scannerGet_result() { @@ -36618,7 +36649,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -36642,7 +36673,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -36666,7 +36697,7 @@ public class Hbase { this.ia = null; } - /** Returns true if field ia is set (has been assigned a value) and false otherwise */ + /** Returns true if field ia is set (has been asigned a value) and false otherwise */ public boolean isSetIa() { return this.ia != null; } @@ -36721,7 +36752,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -36799,7 +36830,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -36809,7 +36840,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -36819,7 +36850,7 @@ public class Hbase { return lastComparison; } if (isSetIa()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ia, typedOther.ia); + lastComparison = TBaseHelper.compareTo(this.ia, typedOther.ia); if (lastComparison != 0) { return lastComparison; } @@ -36831,24 +36862,24 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list142 = iprot.readListBegin(); + TList _list142 = iprot.readListBegin(); this.success = new ArrayList(_list142.size); for (int _i143 = 0; _i143 < _list142.size; ++_i143) { - TRowResult _elem144; // required + TRowResult _elem144; _elem144 = new TRowResult(); _elem144.read(iprot); this.success.add(_elem144); @@ -36856,27 +36887,27 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // IA - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.ia = new IllegalArgument(); this.ia.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -36886,13 +36917,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); for (TRowResult _iter145 : this.success) { _iter145.write(oprot); @@ -36945,45 +36976,29 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerGetList_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerGetList_args"); + public static class scannerGetList_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerGetList_args"); - private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.I32, (short)1); - private static final org.apache.thrift.protocol.TField NB_ROWS_FIELD_DESC = new org.apache.thrift.protocol.TField("nbRows", org.apache.thrift.protocol.TType.I32, (short)2); + private static final TField ID_FIELD_DESC = new TField("id", TType.I32, (short)1); + private static final TField NB_ROWS_FIELD_DESC = new TField("nbRows", TType.I32, (short)2); /** * id of a scanner returned by scannerOpen */ - public int id; // required + public int id; /** * number of results to return */ - public int nbRows; // required + public int nbRows; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * id of a scanner returned by scannerOpen */ @@ -37054,15 +37069,15 @@ public class Hbase { private static final int __NBROWS_ISSET_ID = 1; private BitSet __isset_bit_vector = new BitSet(2); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32 , "ScannerID"))); - tmpMap.put(_Fields.NB_ROWS, new org.apache.thrift.meta_data.FieldMetaData("nbRows", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new FieldMetaData("id", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32 , "ScannerID"))); + tmpMap.put(_Fields.NB_ROWS, new FieldMetaData("nbRows", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerGetList_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerGetList_args.class, metaDataMap); } public scannerGetList_args() { @@ -37121,7 +37136,7 @@ public class Hbase { __isset_bit_vector.clear(__ID_ISSET_ID); } - /** Returns true if field id is set (has been assigned a value) and false otherwise */ + /** Returns true if field id is set (has been asigned a value) and false otherwise */ public boolean isSetId() { return __isset_bit_vector.get(__ID_ISSET_ID); } @@ -37150,7 +37165,7 @@ public class Hbase { __isset_bit_vector.clear(__NBROWS_ISSET_ID); } - /** Returns true if field nbRows is set (has been assigned a value) and false otherwise */ + /** Returns true if field nbRows is set (has been asigned a value) and false otherwise */ public boolean isSetNbRows() { return __isset_bit_vector.get(__NBROWS_ISSET_ID); } @@ -37183,16 +37198,16 @@ public class Hbase { public Object getFieldValue(_Fields field) { switch (field) { case ID: - return Integer.valueOf(getId()); + return new Integer(getId()); case NB_ROWS: - return Integer.valueOf(getNbRows()); + return new Integer(getNbRows()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -37259,7 +37274,7 @@ public class Hbase { return lastComparison; } if (isSetId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id); + lastComparison = TBaseHelper.compareTo(this.id, typedOther.id); if (lastComparison != 0) { return lastComparison; } @@ -37269,7 +37284,7 @@ public class Hbase { return lastComparison; } if (isSetNbRows()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nbRows, typedOther.nbRows); + lastComparison = TBaseHelper.compareTo(this.nbRows, typedOther.nbRows); if (lastComparison != 0) { return lastComparison; } @@ -37281,34 +37296,34 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // ID - if (field.type == org.apache.thrift.protocol.TType.I32) { + if (field.type == TType.I32) { this.id = iprot.readI32(); setIdIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // NB_ROWS - if (field.type == org.apache.thrift.protocol.TType.I32) { + if (field.type == TType.I32) { this.nbRows = iprot.readI32(); setNbRowsIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -37318,7 +37333,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -37348,41 +37363,25 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerGetList_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerGetList_result"); + public static class scannerGetList_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerGetList_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField IA_FIELD_DESC = new org.apache.thrift.protocol.TField("ia", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); + private static final TField IA_FIELD_DESC = new TField("ia", TType.STRUCT, (short)2); - public List success; // required - public IOError io; // required - public IllegalArgument ia; // required + public List success; + public IOError io; + public IllegalArgument ia; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { SUCCESS((short)0, "success"), IO((short)1, "io"), IA((short)2, "ia"); @@ -37447,18 +37446,18 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - 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, TRowResult.class)))); - tmpMap.put(_Fields.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - tmpMap.put(_Fields.IA, new org.apache.thrift.meta_data.FieldMetaData("ia", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, + new ListMetaData(TType.LIST, + new StructMetaData(TType.STRUCT, TRowResult.class)))); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); + tmpMap.put(_Fields.IA, new FieldMetaData("ia", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerGetList_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerGetList_result.class, metaDataMap); } public scannerGetList_result() { @@ -37533,7 +37532,7 @@ public class Hbase { this.success = null; } - /** Returns true if field success is set (has been assigned a value) and false otherwise */ + /** Returns true if field success is set (has been asigned a value) and false otherwise */ public boolean isSetSuccess() { return this.success != null; } @@ -37557,7 +37556,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -37581,7 +37580,7 @@ public class Hbase { this.ia = null; } - /** Returns true if field ia is set (has been assigned a value) and false otherwise */ + /** Returns true if field ia is set (has been asigned a value) and false otherwise */ public boolean isSetIa() { return this.ia != null; } @@ -37636,7 +37635,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -37714,7 +37713,7 @@ public class Hbase { return lastComparison; } if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success); + lastComparison = TBaseHelper.compareTo(this.success, typedOther.success); if (lastComparison != 0) { return lastComparison; } @@ -37724,7 +37723,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -37734,7 +37733,7 @@ public class Hbase { return lastComparison; } if (isSetIa()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ia, typedOther.ia); + lastComparison = TBaseHelper.compareTo(this.ia, typedOther.ia); if (lastComparison != 0) { return lastComparison; } @@ -37746,24 +37745,24 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 0: // SUCCESS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list146 = iprot.readListBegin(); + TList _list146 = iprot.readListBegin(); this.success = new ArrayList(_list146.size); for (int _i147 = 0; _i147 < _list146.size; ++_i147) { - TRowResult _elem148; // required + TRowResult _elem148; _elem148 = new TRowResult(); _elem148.read(iprot); this.success.add(_elem148); @@ -37771,27 +37770,27 @@ public class Hbase { iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // IA - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.ia = new IllegalArgument(); this.ia.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -37801,13 +37800,13 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetSuccess()) { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.success.size())); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); for (TRowResult _iter149 : this.success) { _iter149.write(oprot); @@ -37860,40 +37859,24 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerClose_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerClose_args"); + public static class scannerClose_args implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerClose_args"); - private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.I32, (short)1); + private static final TField ID_FIELD_DESC = new TField("id", TType.I32, (short)1); /** * id of a scanner returned by scannerOpen */ - public int id; // required + public int id; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { /** * id of a scanner returned by scannerOpen */ @@ -37957,13 +37940,13 @@ public class Hbase { private static final int __ID_ISSET_ID = 0; private BitSet __isset_bit_vector = new BitSet(1); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32 , "ScannerID"))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ID, new FieldMetaData("id", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.I32 , "ScannerID"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerClose_args.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerClose_args.class, metaDataMap); } public scannerClose_args() { @@ -38016,7 +37999,7 @@ public class Hbase { __isset_bit_vector.clear(__ID_ISSET_ID); } - /** Returns true if field id is set (has been assigned a value) and false otherwise */ + /** Returns true if field id is set (has been asigned a value) and false otherwise */ public boolean isSetId() { return __isset_bit_vector.get(__ID_ISSET_ID); } @@ -38041,13 +38024,13 @@ public class Hbase { public Object getFieldValue(_Fields field) { switch (field) { case ID: - return Integer.valueOf(getId()); + return new Integer(getId()); } throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -38103,7 +38086,7 @@ public class Hbase { return lastComparison; } if (isSetId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id); + lastComparison = TBaseHelper.compareTo(this.id, typedOther.id); if (lastComparison != 0) { return lastComparison; } @@ -38115,26 +38098,26 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // ID - if (field.type == org.apache.thrift.protocol.TType.I32) { + if (field.type == TType.I32) { this.id = iprot.readI32(); setIdIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -38144,7 +38127,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -38167,39 +38150,23 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - public static class scannerClose_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("scannerClose_result"); + public static class scannerClose_result implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("scannerClose_result"); - private static final org.apache.thrift.protocol.TField IO_FIELD_DESC = new org.apache.thrift.protocol.TField("io", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField IA_FIELD_DESC = new org.apache.thrift.protocol.TField("ia", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final TField IO_FIELD_DESC = new TField("io", TType.STRUCT, (short)1); + private static final TField IA_FIELD_DESC = new TField("ia", TType.STRUCT, (short)2); - public IOError io; // required - public IllegalArgument ia; // required + public IOError io; + public IllegalArgument ia; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { IO((short)1, "io"), IA((short)2, "ia"); @@ -38261,15 +38228,15 @@ public class Hbase { // isset id assignments - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.IO, new org.apache.thrift.meta_data.FieldMetaData("io", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); - tmpMap.put(_Fields.IA, new org.apache.thrift.meta_data.FieldMetaData("ia", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IO, new FieldMetaData("io", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); + tmpMap.put(_Fields.IA, new FieldMetaData("ia", TFieldRequirementType.DEFAULT, + new FieldValueMetaData(TType.STRUCT))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(scannerClose_result.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(scannerClose_result.class, metaDataMap); } public scannerClose_result() { @@ -38319,7 +38286,7 @@ public class Hbase { this.io = null; } - /** Returns true if field io is set (has been assigned a value) and false otherwise */ + /** Returns true if field io is set (has been asigned a value) and false otherwise */ public boolean isSetIo() { return this.io != null; } @@ -38343,7 +38310,7 @@ public class Hbase { this.ia = null; } - /** Returns true if field ia is set (has been assigned a value) and false otherwise */ + /** Returns true if field ia is set (has been asigned a value) and false otherwise */ public boolean isSetIa() { return this.ia != null; } @@ -38387,7 +38354,7 @@ public class Hbase { throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -38454,7 +38421,7 @@ public class Hbase { return lastComparison; } if (isSetIo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.io, typedOther.io); + lastComparison = TBaseHelper.compareTo(this.io, typedOther.io); if (lastComparison != 0) { return lastComparison; } @@ -38464,7 +38431,7 @@ public class Hbase { return lastComparison; } if (isSetIa()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ia, typedOther.ia); + lastComparison = TBaseHelper.compareTo(this.ia, typedOther.ia); if (lastComparison != 0) { return lastComparison; } @@ -38476,34 +38443,34 @@ public class Hbase { return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // IO - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.io = new IOError(); this.io.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // IA - if (field.type == org.apache.thrift.protocol.TType.STRUCT) { + if (field.type == TType.STRUCT) { this.ia = new IllegalArgument(); this.ia.read(iprot); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -38513,7 +38480,7 @@ public class Hbase { validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { oprot.writeStructBegin(STRUCT_DESC); if (this.isSetIo()) { @@ -38553,26 +38520,10 @@ public class Hbase { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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 { - 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); } - } - - } - -} diff --git a/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java b/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java index 778e869..390e524 100644 --- a/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java +++ b/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.7.0) + * Autogenerated by Thrift * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -30,7 +30,7 @@ public class IOError extends Exception implements org.apache.thrift.TBase, jav private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)2); - public ByteBuffer value; // required - public long timestamp; // required + public ByteBuffer value; + public long timestamp; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -231,7 +231,7 @@ public class TCell implements org.apache.thrift.TBase, jav return getValue(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return new Long(getTimestamp()); } throw new IllegalStateException(); diff --git a/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRegionInfo.java b/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRegionInfo.java index 63df85c..cae90bc 100644 --- a/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRegionInfo.java +++ b/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRegionInfo.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.7.0) + * Autogenerated by Thrift * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -32,11 +32,11 @@ public class TRegionInfo implements org.apache.thrift.TBase columns; // required + public ByteBuffer row; + public Map columns; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -369,8 +369,8 @@ public class TRowResult implements org.apache.thrift.TBase(2*_map4.size); for (int _i5 = 0; _i5 < _map4.size; ++_i5) { - ByteBuffer _key6; // required - TCell _val7; // required + ByteBuffer _key6; + TCell _val7; _key6 = iprot.readBinary(); _val7 = new TCell(); _val7.read(iprot); diff --git a/src/main/java/org/apache/hadoop/hbase/thrift/generated/TScan.java b/src/main/java/org/apache/hadoop/hbase/thrift/generated/TScan.java index 3b894db..dfe5aaf 100644 --- a/src/main/java/org/apache/hadoop/hbase/thrift/generated/TScan.java +++ b/src/main/java/org/apache/hadoop/hbase/thrift/generated/TScan.java @@ -1,5 +1,5 @@ /** - * Autogenerated by Thrift Compiler (0.7.0) + * Autogenerated by Thrift * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ @@ -20,28 +20,34 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.thrift.*; +import org.apache.thrift.async.*; +import org.apache.thrift.meta_data.*; +import org.apache.thrift.transport.*; +import org.apache.thrift.protocol.*; + /** * A Scan object is used to specify scanner parameters when opening a scanner. */ -public class TScan implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TScan"); - - private static final org.apache.thrift.protocol.TField START_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("startRow", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField STOP_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("stopRow", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)3); - private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)4); - private static final org.apache.thrift.protocol.TField CACHING_FIELD_DESC = new org.apache.thrift.protocol.TField("caching", org.apache.thrift.protocol.TType.I32, (short)5); - private static final org.apache.thrift.protocol.TField FILTER_STRING_FIELD_DESC = new org.apache.thrift.protocol.TField("filterString", org.apache.thrift.protocol.TType.STRING, (short)6); - - public ByteBuffer startRow; // required - public ByteBuffer stopRow; // required - public long timestamp; // required - public List columns; // required - public int caching; // required - public ByteBuffer filterString; // required +public class TScan implements TBase, java.io.Serializable, Cloneable { + private static final TStruct STRUCT_DESC = new TStruct("TScan"); + + private static final TField START_ROW_FIELD_DESC = new TField("startRow", TType.STRING, (short)1); + private static final TField STOP_ROW_FIELD_DESC = new TField("stopRow", TType.STRING, (short)2); + private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)3); + private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.LIST, (short)4); + private static final TField CACHING_FIELD_DESC = new TField("caching", TType.I32, (short)5); + private static final TField FILTER_STRING_FIELD_DESC = new TField("filterString", TType.STRING, (short)6); + + public ByteBuffer startRow; + public ByteBuffer stopRow; + public long timestamp; + public List columns; + public int caching; + public ByteBuffer filterString; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements TFieldIdEnum { START_ROW((short)1, "startRow"), STOP_ROW((short)2, "stopRow"), TIMESTAMP((short)3, "timestamp"), @@ -118,24 +124,24 @@ public class TScan implements org.apache.thrift.TBase, jav private static final int __CACHING_ISSET_ID = 1; private BitSet __isset_bit_vector = new BitSet(2); - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final Map<_Fields, 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.START_ROW, new org.apache.thrift.meta_data.FieldMetaData("startRow", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.STOP_ROW, new org.apache.thrift.meta_data.FieldMetaData("stopRow", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); - tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text")))); - tmpMap.put(_Fields.CACHING, new org.apache.thrift.meta_data.FieldMetaData("caching", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.FILTER_STRING, new org.apache.thrift.meta_data.FieldMetaData("filterString", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); + Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.START_ROW, new FieldMetaData("startRow", TFieldRequirementType.OPTIONAL, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.STOP_ROW, new FieldMetaData("stopRow", TFieldRequirementType.OPTIONAL, + new FieldValueMetaData(TType.STRING , "Text"))); + tmpMap.put(_Fields.TIMESTAMP, new FieldMetaData("timestamp", TFieldRequirementType.OPTIONAL, + new FieldValueMetaData(TType.I64))); + tmpMap.put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.OPTIONAL, + new ListMetaData(TType.LIST, + new FieldValueMetaData(TType.STRING , "Text")))); + tmpMap.put(_Fields.CACHING, new FieldMetaData("caching", TFieldRequirementType.OPTIONAL, + new FieldValueMetaData(TType.I32))); + tmpMap.put(_Fields.FILTER_STRING, new FieldMetaData("filterString", TFieldRequirementType.OPTIONAL, + new FieldValueMetaData(TType.STRING , "Text"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TScan.class, metaDataMap); + FieldMetaData.addStructMetaDataMap(TScan.class, metaDataMap); } public TScan() { @@ -164,7 +170,7 @@ public class TScan implements org.apache.thrift.TBase, jav this.caching = other.caching; if (other.isSetFilterString()) { this.filterString = other.filterString; - } + } } public TScan deepCopy() { @@ -184,16 +190,16 @@ public class TScan implements org.apache.thrift.TBase, jav } public byte[] getStartRow() { - setStartRow(org.apache.thrift.TBaseHelper.rightSize(startRow)); - return startRow == null ? null : startRow.array(); + setStartRow(TBaseHelper.rightSize(startRow)); + return startRow.array(); } - public ByteBuffer bufferForStartRow() { + public ByteBuffer BufferForStartRow() { return startRow; } public TScan setStartRow(byte[] startRow) { - setStartRow(startRow == null ? (ByteBuffer)null : ByteBuffer.wrap(startRow)); + setStartRow(ByteBuffer.wrap(startRow)); return this; } @@ -206,7 +212,7 @@ public class TScan implements org.apache.thrift.TBase, jav this.startRow = null; } - /** Returns true if field startRow is set (has been assigned a value) and false otherwise */ + /** Returns true if field startRow is set (has been asigned a value) and false otherwise */ public boolean isSetStartRow() { return this.startRow != null; } @@ -218,16 +224,16 @@ public class TScan implements org.apache.thrift.TBase, jav } public byte[] getStopRow() { - setStopRow(org.apache.thrift.TBaseHelper.rightSize(stopRow)); - return stopRow == null ? null : stopRow.array(); + setStopRow(TBaseHelper.rightSize(stopRow)); + return stopRow.array(); } - public ByteBuffer bufferForStopRow() { + public ByteBuffer BufferForStopRow() { return stopRow; } public TScan setStopRow(byte[] stopRow) { - setStopRow(stopRow == null ? (ByteBuffer)null : ByteBuffer.wrap(stopRow)); + setStopRow(ByteBuffer.wrap(stopRow)); return this; } @@ -240,7 +246,7 @@ public class TScan implements org.apache.thrift.TBase, jav this.stopRow = null; } - /** Returns true if field stopRow is set (has been assigned a value) and false otherwise */ + /** Returns true if field stopRow is set (has been asigned a value) and false otherwise */ public boolean isSetStopRow() { return this.stopRow != null; } @@ -265,7 +271,7 @@ public class TScan implements org.apache.thrift.TBase, jav __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID); } - /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */ + /** Returns true if field timestamp is set (has been asigned a value) and false otherwise */ public boolean isSetTimestamp() { return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID); } @@ -302,7 +308,7 @@ public class TScan implements org.apache.thrift.TBase, jav this.columns = null; } - /** Returns true if field columns is set (has been assigned a value) and false otherwise */ + /** Returns true if field columns is set (has been asigned a value) and false otherwise */ public boolean isSetColumns() { return this.columns != null; } @@ -327,7 +333,7 @@ public class TScan implements org.apache.thrift.TBase, jav __isset_bit_vector.clear(__CACHING_ISSET_ID); } - /** Returns true if field caching is set (has been assigned a value) and false otherwise */ + /** Returns true if field caching is set (has been asigned a value) and false otherwise */ public boolean isSetCaching() { return __isset_bit_vector.get(__CACHING_ISSET_ID); } @@ -337,16 +343,16 @@ public class TScan implements org.apache.thrift.TBase, jav } public byte[] getFilterString() { - setFilterString(org.apache.thrift.TBaseHelper.rightSize(filterString)); - return filterString == null ? null : filterString.array(); + setFilterString(TBaseHelper.rightSize(filterString)); + return filterString.array(); } - public ByteBuffer bufferForFilterString() { + public ByteBuffer BufferForFilterString() { return filterString; } public TScan setFilterString(byte[] filterString) { - setFilterString(filterString == null ? (ByteBuffer)null : ByteBuffer.wrap(filterString)); + setFilterString(ByteBuffer.wrap(filterString)); return this; } @@ -359,7 +365,7 @@ public class TScan implements org.apache.thrift.TBase, jav this.filterString = null; } - /** Returns true if field filterString is set (has been assigned a value) and false otherwise */ + /** Returns true if field filterString is set (has been asigned a value) and false otherwise */ public boolean isSetFilterString() { return this.filterString != null; } @@ -417,10 +423,10 @@ public class TScan implements org.apache.thrift.TBase, jav unsetFilterString(); } else { setFilterString((ByteBuffer)value); - } + } break; - } + } } public Object getFieldValue(_Fields field) { @@ -432,13 +438,13 @@ public class TScan implements org.apache.thrift.TBase, jav return getStopRow(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return new Long(getTimestamp()); case COLUMNS: return getColumns(); case CACHING: - return Integer.valueOf(getCaching()); + return new Integer(getCaching()); case FILTER_STRING: return getFilterString(); @@ -447,7 +453,7 @@ public class TScan implements org.apache.thrift.TBase, jav throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -558,7 +564,7 @@ public class TScan implements org.apache.thrift.TBase, jav return lastComparison; } if (isSetStartRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, typedOther.startRow); + lastComparison = TBaseHelper.compareTo(this.startRow, typedOther.startRow); if (lastComparison != 0) { return lastComparison; } @@ -568,7 +574,7 @@ public class TScan implements org.apache.thrift.TBase, jav return lastComparison; } if (isSetStopRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopRow, typedOther.stopRow); + lastComparison = TBaseHelper.compareTo(this.stopRow, typedOther.stopRow); if (lastComparison != 0) { return lastComparison; } @@ -578,7 +584,7 @@ public class TScan implements org.apache.thrift.TBase, jav return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); + lastComparison = TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); if (lastComparison != 0) { return lastComparison; } @@ -588,7 +594,7 @@ public class TScan implements org.apache.thrift.TBase, jav return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = TBaseHelper.compareTo(this.columns, typedOther.columns); if (lastComparison != 0) { return lastComparison; } @@ -598,7 +604,7 @@ public class TScan implements org.apache.thrift.TBase, jav return lastComparison; } if (isSetCaching()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.caching, typedOther.caching); + lastComparison = TBaseHelper.compareTo(this.caching, typedOther.caching); if (lastComparison != 0) { return lastComparison; } @@ -608,7 +614,7 @@ public class TScan implements org.apache.thrift.TBase, jav return lastComparison; } if (isSetFilterString()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, typedOther.filterString); + lastComparison = TBaseHelper.compareTo(this.filterString, typedOther.filterString); if (lastComparison != 0) { return lastComparison; } @@ -620,72 +626,72 @@ public class TScan implements org.apache.thrift.TBase, jav return _Fields.findByThriftId(fieldId); } - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField field; + public void read(TProtocol iprot) throws TException { + TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == TType.STOP) { break; } switch (field.id) { case 1: // START_ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.startRow = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 2: // STOP_ROW - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.stopRow = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 3: // TIMESTAMP - if (field.type == org.apache.thrift.protocol.TType.I64) { + if (field.type == TType.I64) { this.timestamp = iprot.readI64(); setTimestampIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 4: // COLUMNS - if (field.type == org.apache.thrift.protocol.TType.LIST) { + if (field.type == TType.LIST) { { - org.apache.thrift.protocol.TList _list9 = iprot.readListBegin(); + TList _list9 = iprot.readListBegin(); this.columns = new ArrayList(_list9.size); for (int _i10 = 0; _i10 < _list9.size; ++_i10) { - ByteBuffer _elem11; // required + ByteBuffer _elem11; _elem11 = iprot.readBinary(); this.columns.add(_elem11); } iprot.readListEnd(); } } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 5: // CACHING - if (field.type == org.apache.thrift.protocol.TType.I32) { + if (field.type == TType.I32) { this.caching = iprot.readI32(); setCachingIsSet(true); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; case 6: // FILTER_STRING - if (field.type == org.apache.thrift.protocol.TType.STRING) { + if (field.type == TType.STRING) { this.filterString = iprot.readBinary(); } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } break; default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); + TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -695,7 +701,7 @@ public class TScan implements org.apache.thrift.TBase, jav validate(); } - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + public void write(TProtocol oprot) throws TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -722,7 +728,7 @@ public class TScan implements org.apache.thrift.TBase, jav if (isSetColumns()) { oprot.writeFieldBegin(COLUMNS_FIELD_DESC); { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.columns.size())); + oprot.writeListBegin(new TList(TType.STRING, this.columns.size())); for (ByteBuffer _iter12 : this.columns) { oprot.writeBinary(_iter12); @@ -808,27 +814,9 @@ public class TScan implements org.apache.thrift.TBase, jav return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() throws TException { // check for required fields } - 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_bit_vector = new BitSet(1); - 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); } - } - -} diff --git a/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java b/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java index 79edbfd..8ea537d 100644 --- a/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java +++ b/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKAssign.java @@ -203,6 +203,7 @@ public class ZKAssign { ZKUtil.setData(zkw, node, data.getBytes()); } + /** * Creates or force updates an unassigned node to the OFFLINE state for the * specified region. @@ -218,108 +219,36 @@ public class ZKAssign { * @param zkw zk reference * @param region region to be created as offline * @param serverName server event originates from - * @return the version of the znode created in OFFLINE state, -1 if - * unsuccessful. * @throws KeeperException if unexpected zookeeper exception * @throws KeeperException.NodeExistsException if node already exists */ - public static int createOrForceNodeOffline(ZooKeeperWatcher zkw, - HRegionInfo region, ServerName serverName) throws KeeperException { - return createOrForceNodeOffline(zkw, region, serverName, false, true); - } - - /** - * Creates or force updates an unassigned node to the OFFLINE state for the - * specified region. - *

- * Attempts to create the node but if it exists will force it to transition to - * and OFFLINE state. - *

- * Sets a watcher on the unassigned region node if the method is successful. - * - *

- * This method should be used when assigning a region. - * - * @param zkw - * zk reference - * @param region - * region to be created as offline - * @param serverName - * server event originates from - * @param hijack - * - true if to be hijacked and reassigned, false otherwise - * @param allowCreation - * - true if the node has to be created newly, false otherwise - * @throws KeeperException - * if unexpected zookeeper exception - * @return the version of the znode created in OFFLINE state, -1 if - * unsuccessful. - * @throws KeeperException.NodeExistsException - * if node already exists - */ - public static int createOrForceNodeOffline(ZooKeeperWatcher zkw, - HRegionInfo region, ServerName serverName, - boolean hijack, boolean allowCreation) + public static boolean createOrForceNodeOffline(ZooKeeperWatcher zkw, + HRegionInfo region, ServerName serverName) throws KeeperException { LOG.debug(zkw.prefix("Creating (or updating) unassigned node for " + region.getEncodedName() + " with OFFLINE state")); RegionTransitionData data = new RegionTransitionData( EventType.M_ZK_REGION_OFFLINE, region.getRegionName(), serverName); String node = getNodeName(zkw, region.getEncodedName()); - Stat stat = new Stat(); zkw.sync(node); int version = ZKUtil.checkExists(zkw, node); if (version == -1) { - // While trying to transit a node to OFFLINE that was in previously in - // OPENING state but before it could transit to OFFLINE state if RS had - // opened the region then the Master deletes the assigned region znode. - // In that case the znode will not exist. So we should not - // create the znode again which will lead to double assignment. - if (hijack && !allowCreation) { - return -1; - } - return ZKUtil.createAndWatch(zkw, node, data.getBytes()); + ZKUtil.createAndWatch(zkw, node, data.getBytes()); } else { - RegionTransitionData curDataInZNode = ZKAssign.getDataNoWatch(zkw, region - .getEncodedName(), stat); - // Do not move the node to OFFLINE if znode is in any of the following - // state. - // Because these are already executed states. - if (hijack && null != curDataInZNode) { - EventType eventType = curDataInZNode.getEventType(); - if (eventType.equals(EventType.RS_ZK_REGION_CLOSING) - || eventType.equals(EventType.RS_ZK_REGION_CLOSED) - || eventType.equals(EventType.RS_ZK_REGION_OPENED)) { - return -1; - } - } - - boolean setData = false; - try { - setData = ZKUtil.setData(zkw, node, data.getBytes(), version); - // Setdata throws KeeperException which aborts the Master. So we are - // catching it here. - // If just before setting the znode to OFFLINE if the RS has made any - // change to the - // znode state then we need to return -1. - } catch (KeeperException kpe) { - LOG.info("Version mismatch while setting the node to OFFLINE state."); - return -1; - } - if (!setData) { - return -1; + if (!ZKUtil.setData(zkw, node, data.getBytes(), version)) { + return false; } else { // We successfully forced to OFFLINE, reset watch and handle if // the state changed in between our set and the watch RegionTransitionData curData = - ZKAssign.getData(zkw, region.getEncodedName()); + ZKAssign.getData(zkw, region.getEncodedName()); if (curData.getEventType() != data.getEventType()) { // state changed, need to process - return -1; + return false; } } } - return stat.getVersion() + 1; + return true; } /** @@ -744,18 +673,6 @@ public class ZKAssign { "the node existed but was version " + stat.getVersion() + " not the expected version " + expectedVersion)); return -1; - } else if (beginState.equals(EventType.M_ZK_REGION_OFFLINE) - && endState.equals(EventType.RS_ZK_REGION_OPENING) - && expectedVersion == -1 && stat.getVersion() != 0) { - // the below check ensures that double assignment doesnot happen. - // When the node is created for the first time then the expected version - // that is passed will be -1 and the version in znode will be 0. - // In all other cases the version in znode will be > 0. - LOG.warn(zkw.prefix("Attempt to transition the " + "unassigned node for " - + encoded + " from " + beginState + " to " + endState + " failed, " - + "the node existed but was version " + stat.getVersion() - + " not the expected version " + expectedVersion)); - return -1; } // Verify it is in expected state diff --git a/src/main/resources/hbase-webapps/master/table.jsp b/src/main/resources/hbase-webapps/master/table.jsp index 5354e03..0118054 100644 --- a/src/main/resources/hbase-webapps/master/table.jsp +++ b/src/main/resources/hbase-webapps/master/table.jsp @@ -50,7 +50,7 @@ - +

Table action request accepted


<% @@ -82,7 +82,7 @@ - +

Table: <%= tableName %>


diff --git a/src/main/resources/hbase-webapps/master/zk.jsp b/src/main/resources/hbase-webapps/master/zk.jsp index b31d94c..2f3efd8 100644 --- a/src/main/resources/hbase-webapps/master/zk.jsp +++ b/src/main/resources/hbase-webapps/master/zk.jsp @@ -26,7 +26,7 @@ - +

ZooKeeper Dump


diff --git a/src/main/resources/hbase-webapps/static/hbase_logo.png b/src/main/resources/hbase-webapps/static/hbase_logo.png deleted file mode 100644 index 03fa793..0000000 Binary files a/src/main/resources/hbase-webapps/static/hbase_logo.png and /dev/null differ diff --git a/src/main/ruby/hbase/admin.rb b/src/main/ruby/hbase/admin.rb index 93a8029..09508f1 100644 --- a/src/main/ruby/hbase/admin.rb +++ b/src/main/ruby/hbase/admin.rb @@ -61,12 +61,6 @@ module Hbase end #---------------------------------------------------------------------------------------------- - # Requests a regionserver's HLog roll - def hlog_roll(server_name) - @admin.rollHLogWriter(server_name) - end - - #---------------------------------------------------------------------------------------------- # Requests a table or region split def split(table_or_region_name, split_point) if split_point == nil diff --git a/src/main/ruby/shell.rb b/src/main/ruby/shell.rb index 160355c..80f95ab 100644 --- a/src/main/ruby/shell.rb +++ b/src/main/ruby/shell.rb @@ -265,7 +265,6 @@ Shell.load_command_group( split unassign zk_dump - hlog_roll ] ) diff --git a/src/main/ruby/shell/commands/hlog_roll.rb b/src/main/ruby/shell/commands/hlog_roll.rb deleted file mode 100644 index 02c7c59..0000000 --- a/src/main/ruby/shell/commands/hlog_roll.rb +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright 2011 The Apache Software Foundation -# -# 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. -# -module Shell - module Commands - class HlogRoll < Command - def help - return <<-EOF -Roll the log writer. That is, start writing log messages to a new file. -The name of the regionserver should be given as the parameter. A -'server_name' is the host, port plus startcode of a regionserver. For -example: host187.example.com,60020,1289493121758 (find servername in -master ui or when you do detailed status in shell) -EOF - end - - def command(server_name) - format_simple_command do - admin.hlog_roll(server_name) - end - end - end - end -end diff --git a/src/site/resources/images/asf_logo_wide.png b/src/site/resources/images/asf_logo_wide.png new file mode 100644 index 0000000..c584eba Binary files /dev/null and b/src/site/resources/images/asf_logo_wide.png differ diff --git a/src/site/resources/images/hbase_logo.png b/src/site/resources/images/hbase_logo.png deleted file mode 100644 index 03fa793..0000000 Binary files a/src/site/resources/images/hbase_logo.png and /dev/null differ diff --git a/src/site/site.vm b/src/site/site.vm index 28f566e..05a4578 100644 --- a/src/site/site.vm +++ b/src/site/site.vm @@ -467,9 +467,7 @@