Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-14172 Upgrade existing thrift binding using thrift 0.9.2 compiler.(Josh Elser)

This commit is contained in:
Enis Soztutar 2015-11-18 19:11:51 -08:00
parent c8fbaf0c96
commit 3aa3fae138
41 changed files with 8147 additions and 4450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-thrift/pom.xml
View File

@ -415,12 +415,12 @@
<requireProperty> <requireProperty>
<property>thrift.version</property> <property>thrift.version</property>
<message>"The Thrift version must be specified."</message> <message>"The Thrift version must be specified."</message>
<regex>0\.9\.2</regex> <regex>0\.9\.3</regex>
<regexMessage> <regexMessage>
- -
- -
[FATAL] ========================================================================================== [FATAL] ==========================================================================================
[FATAL] HBase Thrift requires the thrift generator version 0.9.2. [FATAL] HBase Thrift requires the thrift generator version 0.9.3.
[FATAL] Setting it to something else needs to be reviewed for wire and behavior compatibility. [FATAL] Setting it to something else needs to be reviewed for wire and behavior compatibility.
[FATAL] ========================================================================================== [FATAL] ==========================================================================================
- -

8
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
View File

@ -539,7 +539,7 @@ public class ThriftServerRunner implements Runnable {
CallQueue callQueue = CallQueue callQueue =
new CallQueue(new LinkedBlockingQueue<Call>(), metrics); new CallQueue(new LinkedBlockingQueue<Call>(), metrics);
ExecutorService executorService = createExecutor( ExecutorService executorService = createExecutor(
callQueue, serverArgs.getWorkerThreads()); callQueue, serverArgs.getMinWorkerThreads(), serverArgs.getMaxWorkerThreads());
serverArgs.executorService(executorService) serverArgs.executorService(executorService)
.processor(processor) .processor(processor)
.transportFactory(transportFactory) .transportFactory(transportFactory)
@ -551,7 +551,7 @@ public class ThriftServerRunner implements Runnable {
CallQueue callQueue = CallQueue callQueue =
new CallQueue(new LinkedBlockingQueue<Call>(), metrics); new CallQueue(new LinkedBlockingQueue<Call>(), metrics);
ExecutorService executorService = createExecutor( ExecutorService executorService = createExecutor(
callQueue, serverArgs.getWorkerThreads()); callQueue, serverArgs.getWorkerThreads(), serverArgs.getWorkerThreads());
serverArgs.executorService(executorService) serverArgs.executorService(executorService)
.processor(processor) .processor(processor)
.transportFactory(transportFactory) .transportFactory(transportFactory)
@ -597,11 +597,11 @@ public class ThriftServerRunner implements Runnable {
} }
ExecutorService createExecutor(BlockingQueue<Runnable> callQueue, ExecutorService createExecutor(BlockingQueue<Runnable> callQueue,
int workerThreads) { int minWorkers, int maxWorkers) {
ThreadFactoryBuilder tfb = new ThreadFactoryBuilder(); ThreadFactoryBuilder tfb = new ThreadFactoryBuilder();
tfb.setDaemon(true); tfb.setDaemon(true);
tfb.setNameFormat("thrift-worker-%d"); tfb.setNameFormat("thrift-worker-%d");
return new ThreadPoolExecutor(workerThreads, workerThreads, return new ThreadPoolExecutor(minWorkers, maxWorkers,
Long.MAX_VALUE, TimeUnit.SECONDS, callQueue, tfb.build()); Long.MAX_VALUE, TimeUnit.SECONDS, callQueue, tfb.build());
} }

24
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift.generated; package org.apache.hadoop.hbase.thrift.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,14 +29,17 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* An AlreadyExists exceptions signals that a table with the specified * An AlreadyExists exceptions signals that a table with the specified
* name already exists * name already exists
*/ */
public class AlreadyExists extends TException implements org.apache.thrift.TBase<AlreadyExists, AlreadyExists._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class AlreadyExists extends TException implements org.apache.thrift.TBase<AlreadyExists, AlreadyExists._Fields>, java.io.Serializable, Cloneable, Comparable<AlreadyExists> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlreadyExists"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlreadyExists");
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); 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);
@ -230,30 +234,30 @@ public class AlreadyExists extends TException implements org.apache.thrift.TBase
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_message = true && (isSetMessage()); boolean present_message = true && (isSetMessage());
builder.append(present_message); list.add(present_message);
if (present_message) if (present_message)
builder.append(message); list.add(message);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(AlreadyExists other) { public int compareTo(AlreadyExists other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
AlreadyExists typedOther = (AlreadyExists)other;
lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage()); lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetMessage()) { if (isSetMessage()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }

64
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift.generated; package org.apache.hadoop.hbase.thrift.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,13 +29,16 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* A BatchMutation object is used to apply a number of Mutations to a single row. * A BatchMutation object is used to apply a number of Mutations to a single row.
*/ */
public class BatchMutation implements org.apache.thrift.TBase<BatchMutation, BatchMutation._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class BatchMutation implements org.apache.thrift.TBase<BatchMutation, BatchMutation._Fields>, java.io.Serializable, Cloneable, Comparable<BatchMutation> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BatchMutation"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BatchMutation");
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)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)1);
@ -131,7 +135,7 @@ public class BatchMutation implements org.apache.thrift.TBase<BatchMutation, Bat
List<Mutation> mutations) List<Mutation> mutations)
{ {
this(); this();
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
this.mutations = mutations; this.mutations = mutations;
} }
@ -143,7 +147,7 @@ public class BatchMutation implements org.apache.thrift.TBase<BatchMutation, Bat
this.row = other.row; this.row = other.row;
} }
if (other.isSetMutations()) { if (other.isSetMutations()) {
List<Mutation> __this__mutations = new ArrayList<Mutation>(); List<Mutation> __this__mutations = new ArrayList<Mutation>(other.mutations.size());
for (Mutation other_element : other.mutations) { for (Mutation other_element : other.mutations) {
__this__mutations.add(new Mutation(other_element)); __this__mutations.add(new Mutation(other_element));
} }
@ -167,16 +171,16 @@ public class BatchMutation implements org.apache.thrift.TBase<BatchMutation, Bat
} }
public ByteBuffer bufferForRow() { public ByteBuffer bufferForRow() {
return row; return org.apache.thrift.TBaseHelper.copyBinary(row);
} }
public BatchMutation setRow(byte[] row) { public BatchMutation setRow(byte[] row) {
setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length));
return this; return this;
} }
public BatchMutation setRow(ByteBuffer row) { public BatchMutation setRow(ByteBuffer row) {
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
return this; return this;
} }
@ -318,45 +322,45 @@ public class BatchMutation implements org.apache.thrift.TBase<BatchMutation, Bat
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_row = true && (isSetRow()); boolean present_row = true && (isSetRow());
builder.append(present_row); list.add(present_row);
if (present_row) if (present_row)
builder.append(row); list.add(row);
boolean present_mutations = true && (isSetMutations()); boolean present_mutations = true && (isSetMutations());
builder.append(present_mutations); list.add(present_mutations);
if (present_mutations) if (present_mutations)
builder.append(mutations); list.add(mutations);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(BatchMutation other) { public int compareTo(BatchMutation other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
BatchMutation typedOther = (BatchMutation)other;
lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetRow()) { if (isSetRow()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetMutations()).compareTo(typedOther.isSetMutations()); lastComparison = Boolean.valueOf(isSetMutations()).compareTo(other.isSetMutations());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetMutations()) { if (isSetMutations()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mutations, typedOther.mutations); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mutations, other.mutations);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -385,7 +389,7 @@ public class BatchMutation implements org.apache.thrift.TBase<BatchMutation, Bat
if (this.row == null) { if (this.row == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.row); org.apache.thrift.TBaseHelper.toString(this.row, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");
@ -452,12 +456,12 @@ public class BatchMutation implements org.apache.thrift.TBase<BatchMutation, Bat
{ {
org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
struct.mutations = new ArrayList<Mutation>(_list0.size); struct.mutations = new ArrayList<Mutation>(_list0.size);
for (int _i1 = 0; _i1 < _list0.size; ++_i1) Mutation _elem1;
for (int _i2 = 0; _i2 < _list0.size; ++_i2)
{ {
Mutation _elem2; // required _elem1 = new Mutation();
_elem2 = new Mutation(); _elem1.read(iprot);
_elem2.read(iprot); struct.mutations.add(_elem1);
struct.mutations.add(_elem2);
} }
iprot.readListEnd(); iprot.readListEnd();
} }
@ -549,12 +553,12 @@ public class BatchMutation implements org.apache.thrift.TBase<BatchMutation, Bat
{ {
org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.mutations = new ArrayList<Mutation>(_list5.size); struct.mutations = new ArrayList<Mutation>(_list5.size);
for (int _i6 = 0; _i6 < _list5.size; ++_i6) Mutation _elem6;
for (int _i7 = 0; _i7 < _list5.size; ++_i7)
{ {
Mutation _elem7; // required _elem6 = new Mutation();
_elem7 = new Mutation(); _elem6.read(iprot);
_elem7.read(iprot); struct.mutations.add(_elem6);
struct.mutations.add(_elem7);
} }
} }
struct.setMutationsIsSet(true); struct.setMutationsIsSet(true);

110
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift.generated; package org.apache.hadoop.hbase.thrift.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,15 +29,18 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* An HColumnDescriptor contains information about a column family * An HColumnDescriptor contains information about a column family
* such as the number of versions, compression settings, etc. It is * such as the number of versions, compression settings, etc. It is
* used as input when creating a table or adding a column. * used as input when creating a table or adding a column.
*/ */
public class ColumnDescriptor implements org.apache.thrift.TBase<ColumnDescriptor, ColumnDescriptor._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class ColumnDescriptor implements org.apache.thrift.TBase<ColumnDescriptor, ColumnDescriptor._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnDescriptor> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnDescriptor"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnDescriptor");
private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -211,7 +215,7 @@ public class ColumnDescriptor implements org.apache.thrift.TBase<ColumnDescripto
int timeToLive) int timeToLive)
{ {
this(); this();
this.name = name; this.name = org.apache.thrift.TBaseHelper.copyBinary(name);
this.maxVersions = maxVersions; this.maxVersions = maxVersions;
setMaxVersionsIsSet(true); setMaxVersionsIsSet(true);
this.compression = compression; this.compression = compression;
@ -281,16 +285,16 @@ public class ColumnDescriptor implements org.apache.thrift.TBase<ColumnDescripto
} }
public ByteBuffer bufferForName() { public ByteBuffer bufferForName() {
return name; return org.apache.thrift.TBaseHelper.copyBinary(name);
} }
public ColumnDescriptor setName(byte[] name) { public ColumnDescriptor setName(byte[] name) {
setName(name == null ? (ByteBuffer)null : ByteBuffer.wrap(name)); this.name = name == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(name, name.length));
return this; return this;
} }
public ColumnDescriptor setName(ByteBuffer name) { public ColumnDescriptor setName(ByteBuffer name) {
this.name = name; this.name = org.apache.thrift.TBaseHelper.copyBinary(name);
return this; return this;
} }
@ -578,28 +582,28 @@ public class ColumnDescriptor implements org.apache.thrift.TBase<ColumnDescripto
return getName(); return getName();
case MAX_VERSIONS: case MAX_VERSIONS:
return Integer.valueOf(getMaxVersions()); return getMaxVersions();
case COMPRESSION: case COMPRESSION:
return getCompression(); return getCompression();
case IN_MEMORY: case IN_MEMORY:
return Boolean.valueOf(isInMemory()); return isInMemory();
case BLOOM_FILTER_TYPE: case BLOOM_FILTER_TYPE:
return getBloomFilterType(); return getBloomFilterType();
case BLOOM_FILTER_VECTOR_SIZE: case BLOOM_FILTER_VECTOR_SIZE:
return Integer.valueOf(getBloomFilterVectorSize()); return getBloomFilterVectorSize();
case BLOOM_FILTER_NB_HASHES: case BLOOM_FILTER_NB_HASHES:
return Integer.valueOf(getBloomFilterNbHashes()); return getBloomFilterNbHashes();
case BLOCK_CACHE_ENABLED: case BLOCK_CACHE_ENABLED:
return Boolean.valueOf(isBlockCacheEnabled()); return isBlockCacheEnabled();
case TIME_TO_LIVE: case TIME_TO_LIVE:
return Integer.valueOf(getTimeToLive()); return getTimeToLive();
} }
throw new IllegalStateException(); throw new IllegalStateException();
@ -733,150 +737,150 @@ public class ColumnDescriptor implements org.apache.thrift.TBase<ColumnDescripto
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_name = true && (isSetName()); boolean present_name = true && (isSetName());
builder.append(present_name); list.add(present_name);
if (present_name) if (present_name)
builder.append(name); list.add(name);
boolean present_maxVersions = true; boolean present_maxVersions = true;
builder.append(present_maxVersions); list.add(present_maxVersions);
if (present_maxVersions) if (present_maxVersions)
builder.append(maxVersions); list.add(maxVersions);
boolean present_compression = true && (isSetCompression()); boolean present_compression = true && (isSetCompression());
builder.append(present_compression); list.add(present_compression);
if (present_compression) if (present_compression)
builder.append(compression); list.add(compression);
boolean present_inMemory = true; boolean present_inMemory = true;
builder.append(present_inMemory); list.add(present_inMemory);
if (present_inMemory) if (present_inMemory)
builder.append(inMemory); list.add(inMemory);
boolean present_bloomFilterType = true && (isSetBloomFilterType()); boolean present_bloomFilterType = true && (isSetBloomFilterType());
builder.append(present_bloomFilterType); list.add(present_bloomFilterType);
if (present_bloomFilterType) if (present_bloomFilterType)
builder.append(bloomFilterType); list.add(bloomFilterType);
boolean present_bloomFilterVectorSize = true; boolean present_bloomFilterVectorSize = true;
builder.append(present_bloomFilterVectorSize); list.add(present_bloomFilterVectorSize);
if (present_bloomFilterVectorSize) if (present_bloomFilterVectorSize)
builder.append(bloomFilterVectorSize); list.add(bloomFilterVectorSize);
boolean present_bloomFilterNbHashes = true; boolean present_bloomFilterNbHashes = true;
builder.append(present_bloomFilterNbHashes); list.add(present_bloomFilterNbHashes);
if (present_bloomFilterNbHashes) if (present_bloomFilterNbHashes)
builder.append(bloomFilterNbHashes); list.add(bloomFilterNbHashes);
boolean present_blockCacheEnabled = true; boolean present_blockCacheEnabled = true;
builder.append(present_blockCacheEnabled); list.add(present_blockCacheEnabled);
if (present_blockCacheEnabled) if (present_blockCacheEnabled)
builder.append(blockCacheEnabled); list.add(blockCacheEnabled);
boolean present_timeToLive = true; boolean present_timeToLive = true;
builder.append(present_timeToLive); list.add(present_timeToLive);
if (present_timeToLive) if (present_timeToLive)
builder.append(timeToLive); list.add(timeToLive);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(ColumnDescriptor other) { public int compareTo(ColumnDescriptor other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
ColumnDescriptor typedOther = (ColumnDescriptor)other;
lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName()); lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetName()) { if (isSetName()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetMaxVersions()).compareTo(typedOther.isSetMaxVersions()); lastComparison = Boolean.valueOf(isSetMaxVersions()).compareTo(other.isSetMaxVersions());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetMaxVersions()) { if (isSetMaxVersions()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxVersions, typedOther.maxVersions); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxVersions, other.maxVersions);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetCompression()).compareTo(typedOther.isSetCompression()); lastComparison = Boolean.valueOf(isSetCompression()).compareTo(other.isSetCompression());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetCompression()) { if (isSetCompression()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.compression, typedOther.compression); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.compression, other.compression);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetInMemory()).compareTo(typedOther.isSetInMemory()); lastComparison = Boolean.valueOf(isSetInMemory()).compareTo(other.isSetInMemory());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetInMemory()) { if (isSetInMemory()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.inMemory, typedOther.inMemory); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.inMemory, other.inMemory);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetBloomFilterType()).compareTo(typedOther.isSetBloomFilterType()); lastComparison = Boolean.valueOf(isSetBloomFilterType()).compareTo(other.isSetBloomFilterType());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetBloomFilterType()) { if (isSetBloomFilterType()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bloomFilterType, typedOther.bloomFilterType); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bloomFilterType, other.bloomFilterType);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetBloomFilterVectorSize()).compareTo(typedOther.isSetBloomFilterVectorSize()); lastComparison = Boolean.valueOf(isSetBloomFilterVectorSize()).compareTo(other.isSetBloomFilterVectorSize());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetBloomFilterVectorSize()) { if (isSetBloomFilterVectorSize()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bloomFilterVectorSize, typedOther.bloomFilterVectorSize); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bloomFilterVectorSize, other.bloomFilterVectorSize);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetBloomFilterNbHashes()).compareTo(typedOther.isSetBloomFilterNbHashes()); lastComparison = Boolean.valueOf(isSetBloomFilterNbHashes()).compareTo(other.isSetBloomFilterNbHashes());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetBloomFilterNbHashes()) { if (isSetBloomFilterNbHashes()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bloomFilterNbHashes, typedOther.bloomFilterNbHashes); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.bloomFilterNbHashes, other.bloomFilterNbHashes);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetBlockCacheEnabled()).compareTo(typedOther.isSetBlockCacheEnabled()); lastComparison = Boolean.valueOf(isSetBlockCacheEnabled()).compareTo(other.isSetBlockCacheEnabled());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetBlockCacheEnabled()) { if (isSetBlockCacheEnabled()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.blockCacheEnabled, typedOther.blockCacheEnabled); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.blockCacheEnabled, other.blockCacheEnabled);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetTimeToLive()).compareTo(typedOther.isSetTimeToLive()); lastComparison = Boolean.valueOf(isSetTimeToLive()).compareTo(other.isSetTimeToLive());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetTimeToLive()) { if (isSetTimeToLive()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeToLive, typedOther.timeToLive); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeToLive, other.timeToLive);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -905,7 +909,7 @@ public class ColumnDescriptor implements org.apache.thrift.TBase<ColumnDescripto
if (this.name == null) { if (this.name == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.name); org.apache.thrift.TBaseHelper.toString(this.name, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");

7491
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/Hbase.java
View File

File diff suppressed because it is too large Load Diff

24
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift.generated; package org.apache.hadoop.hbase.thrift.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,15 +29,18 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* An IOError exception signals that an error occurred communicating * An IOError exception signals that an error occurred communicating
* to the Hbase master or an Hbase region server. Also used to return * to the Hbase master or an Hbase region server. Also used to return
* more general Hbase error conditions. * more general Hbase error conditions.
*/ */
public class IOError extends TException implements org.apache.thrift.TBase<IOError, IOError._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class IOError extends TException implements org.apache.thrift.TBase<IOError, IOError._Fields>, java.io.Serializable, Cloneable, Comparable<IOError> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IOError"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IOError");
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); 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);
@ -231,30 +235,30 @@ public class IOError extends TException implements org.apache.thrift.TBase<IOErr
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_message = true && (isSetMessage()); boolean present_message = true && (isSetMessage());
builder.append(present_message); list.add(present_message);
if (present_message) if (present_message)
builder.append(message); list.add(message);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(IOError other) { public int compareTo(IOError other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
IOError typedOther = (IOError)other;
lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage()); lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetMessage()) { if (isSetMessage()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }

24
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift.generated; package org.apache.hadoop.hbase.thrift.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,14 +29,17 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* An IllegalArgument exception indicates an illegal or invalid * An IllegalArgument exception indicates an illegal or invalid
* argument was passed into a procedure. * argument was passed into a procedure.
*/ */
public class IllegalArgument extends TException implements org.apache.thrift.TBase<IllegalArgument, IllegalArgument._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class IllegalArgument extends TException implements org.apache.thrift.TBase<IllegalArgument, IllegalArgument._Fields>, java.io.Serializable, Cloneable, Comparable<IllegalArgument> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IllegalArgument"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IllegalArgument");
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); 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);
@ -230,30 +234,30 @@ public class IllegalArgument extends TException implements org.apache.thrift.TBa
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_message = true && (isSetMessage()); boolean present_message = true && (isSetMessage());
builder.append(present_message); list.add(present_message);
if (present_message) if (present_message)
builder.append(message); list.add(message);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(IllegalArgument other) { public int compareTo(IllegalArgument other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
IllegalArgument typedOther = (IllegalArgument)other;
lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage()); lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetMessage()) { if (isSetMessage()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }

72
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift.generated; package org.apache.hadoop.hbase.thrift.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,13 +29,16 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* A Mutation object is used to either update or delete a column-value. * A Mutation object is used to either update or delete a column-value.
*/ */
public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fields>, java.io.Serializable, Cloneable, Comparable<Mutation> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Mutation"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Mutation");
private static final org.apache.thrift.protocol.TField IS_DELETE_FIELD_DESC = new org.apache.thrift.protocol.TField("isDelete", org.apache.thrift.protocol.TType.BOOL, (short)1); private static final org.apache.thrift.protocol.TField IS_DELETE_FIELD_DESC = new org.apache.thrift.protocol.TField("isDelete", org.apache.thrift.protocol.TType.BOOL, (short)1);
@ -155,8 +159,8 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie
this(); this();
this.isDelete = isDelete; this.isDelete = isDelete;
setIsDeleteIsSet(true); setIsDeleteIsSet(true);
this.column = column; this.column = org.apache.thrift.TBaseHelper.copyBinary(column);
this.value = value; this.value = org.apache.thrift.TBaseHelper.copyBinary(value);
this.writeToWAL = writeToWAL; this.writeToWAL = writeToWAL;
setWriteToWALIsSet(true); setWriteToWALIsSet(true);
} }
@ -219,16 +223,16 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie
} }
public ByteBuffer bufferForColumn() { public ByteBuffer bufferForColumn() {
return column; return org.apache.thrift.TBaseHelper.copyBinary(column);
} }
public Mutation setColumn(byte[] column) { public Mutation setColumn(byte[] column) {
setColumn(column == null ? (ByteBuffer)null : ByteBuffer.wrap(column)); this.column = column == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(column, column.length));
return this; return this;
} }
public Mutation setColumn(ByteBuffer column) { public Mutation setColumn(ByteBuffer column) {
this.column = column; this.column = org.apache.thrift.TBaseHelper.copyBinary(column);
return this; return this;
} }
@ -253,16 +257,16 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie
} }
public ByteBuffer bufferForValue() { public ByteBuffer bufferForValue() {
return value; return org.apache.thrift.TBaseHelper.copyBinary(value);
} }
public Mutation setValue(byte[] value) { public Mutation setValue(byte[] value) {
setValue(value == null ? (ByteBuffer)null : ByteBuffer.wrap(value)); this.value = value == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(value, value.length));
return this; return this;
} }
public Mutation setValue(ByteBuffer value) { public Mutation setValue(ByteBuffer value) {
this.value = value; this.value = org.apache.thrift.TBaseHelper.copyBinary(value);
return this; return this;
} }
@ -344,7 +348,7 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie
public Object getFieldValue(_Fields field) { public Object getFieldValue(_Fields field) {
switch (field) { switch (field) {
case IS_DELETE: case IS_DELETE:
return Boolean.valueOf(isIsDelete()); return isIsDelete();
case COLUMN: case COLUMN:
return getColumn(); return getColumn();
@ -353,7 +357,7 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie
return getValue(); return getValue();
case WRITE_TO_WAL: case WRITE_TO_WAL:
return Boolean.valueOf(isWriteToWAL()); return isWriteToWAL();
} }
throw new IllegalStateException(); throw new IllegalStateException();
@ -432,75 +436,75 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_isDelete = true; boolean present_isDelete = true;
builder.append(present_isDelete); list.add(present_isDelete);
if (present_isDelete) if (present_isDelete)
builder.append(isDelete); list.add(isDelete);
boolean present_column = true && (isSetColumn()); boolean present_column = true && (isSetColumn());
builder.append(present_column); list.add(present_column);
if (present_column) if (present_column)
builder.append(column); list.add(column);
boolean present_value = true && (isSetValue()); boolean present_value = true && (isSetValue());
builder.append(present_value); list.add(present_value);
if (present_value) if (present_value)
builder.append(value); list.add(value);
boolean present_writeToWAL = true; boolean present_writeToWAL = true;
builder.append(present_writeToWAL); list.add(present_writeToWAL);
if (present_writeToWAL) if (present_writeToWAL)
builder.append(writeToWAL); list.add(writeToWAL);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(Mutation other) { public int compareTo(Mutation other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
Mutation typedOther = (Mutation)other;
lastComparison = Boolean.valueOf(isSetIsDelete()).compareTo(typedOther.isSetIsDelete()); lastComparison = Boolean.valueOf(isSetIsDelete()).compareTo(other.isSetIsDelete());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetIsDelete()) { if (isSetIsDelete()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isDelete, typedOther.isDelete); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isDelete, other.isDelete);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetColumn()).compareTo(typedOther.isSetColumn()); lastComparison = Boolean.valueOf(isSetColumn()).compareTo(other.isSetColumn());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetColumn()) { if (isSetColumn()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, other.column);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetValue()).compareTo(typedOther.isSetValue()); lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetValue()) { if (isSetValue()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, typedOther.value); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetWriteToWAL()).compareTo(typedOther.isSetWriteToWAL()); lastComparison = Boolean.valueOf(isSetWriteToWAL()).compareTo(other.isSetWriteToWAL());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetWriteToWAL()) { if (isSetWriteToWAL()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.writeToWAL, typedOther.writeToWAL); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.writeToWAL, other.writeToWAL);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -533,7 +537,7 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie
if (this.column == null) { if (this.column == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.column); org.apache.thrift.TBaseHelper.toString(this.column, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");
@ -541,7 +545,7 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie
if (this.value == null) { if (this.value == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.value); org.apache.thrift.TBaseHelper.toString(this.value, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");

108
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TAppend.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift.generated; package org.apache.hadoop.hbase.thrift.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,13 +29,16 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* An Append object is used to specify the parameters for performing the append operation. * An Append object is used to specify the parameters for performing the append operation.
*/ */
public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields>, java.io.Serializable, Cloneable, Comparable<TAppend> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAppend"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAppend");
private static final org.apache.thrift.protocol.TField TABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("table", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField TABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("table", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -148,8 +152,8 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
List<ByteBuffer> values) List<ByteBuffer> values)
{ {
this(); this();
this.table = table; this.table = org.apache.thrift.TBaseHelper.copyBinary(table);
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
this.columns = columns; this.columns = columns;
this.values = values; this.values = values;
} }
@ -165,14 +169,14 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
this.row = other.row; this.row = other.row;
} }
if (other.isSetColumns()) { if (other.isSetColumns()) {
List<ByteBuffer> __this__columns = new ArrayList<ByteBuffer>(); List<ByteBuffer> __this__columns = new ArrayList<ByteBuffer>(other.columns.size());
for (ByteBuffer other_element : other.columns) { for (ByteBuffer other_element : other.columns) {
__this__columns.add(other_element); __this__columns.add(other_element);
} }
this.columns = __this__columns; this.columns = __this__columns;
} }
if (other.isSetValues()) { if (other.isSetValues()) {
List<ByteBuffer> __this__values = new ArrayList<ByteBuffer>(); List<ByteBuffer> __this__values = new ArrayList<ByteBuffer>(other.values.size());
for (ByteBuffer other_element : other.values) { for (ByteBuffer other_element : other.values) {
__this__values.add(other_element); __this__values.add(other_element);
} }
@ -198,16 +202,16 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
} }
public ByteBuffer bufferForTable() { public ByteBuffer bufferForTable() {
return table; return org.apache.thrift.TBaseHelper.copyBinary(table);
} }
public TAppend setTable(byte[] table) { public TAppend setTable(byte[] table) {
setTable(table == null ? (ByteBuffer)null : ByteBuffer.wrap(table)); this.table = table == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(table, table.length));
return this; return this;
} }
public TAppend setTable(ByteBuffer table) { public TAppend setTable(ByteBuffer table) {
this.table = table; this.table = org.apache.thrift.TBaseHelper.copyBinary(table);
return this; return this;
} }
@ -232,16 +236,16 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
} }
public ByteBuffer bufferForRow() { public ByteBuffer bufferForRow() {
return row; return org.apache.thrift.TBaseHelper.copyBinary(row);
} }
public TAppend setRow(byte[] row) { public TAppend setRow(byte[] row) {
setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length));
return this; return this;
} }
public TAppend setRow(ByteBuffer row) { public TAppend setRow(ByteBuffer row) {
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
return this; return this;
} }
@ -466,75 +470,75 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_table = true && (isSetTable()); boolean present_table = true && (isSetTable());
builder.append(present_table); list.add(present_table);
if (present_table) if (present_table)
builder.append(table); list.add(table);
boolean present_row = true && (isSetRow()); boolean present_row = true && (isSetRow());
builder.append(present_row); list.add(present_row);
if (present_row) if (present_row)
builder.append(row); list.add(row);
boolean present_columns = true && (isSetColumns()); boolean present_columns = true && (isSetColumns());
builder.append(present_columns); list.add(present_columns);
if (present_columns) if (present_columns)
builder.append(columns); list.add(columns);
boolean present_values = true && (isSetValues()); boolean present_values = true && (isSetValues());
builder.append(present_values); list.add(present_values);
if (present_values) if (present_values)
builder.append(values); list.add(values);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TAppend other) { public int compareTo(TAppend other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TAppend typedOther = (TAppend)other;
lastComparison = Boolean.valueOf(isSetTable()).compareTo(typedOther.isSetTable()); lastComparison = Boolean.valueOf(isSetTable()).compareTo(other.isSetTable());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetTable()) { if (isSetTable()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.table, typedOther.table); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.table, other.table);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetRow()) { if (isSetRow()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns()); lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetColumns()) { if (isSetColumns()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetValues()).compareTo(typedOther.isSetValues()); lastComparison = Boolean.valueOf(isSetValues()).compareTo(other.isSetValues());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetValues()) { if (isSetValues()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.values, typedOther.values); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.values, other.values);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -563,7 +567,7 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
if (this.table == null) { if (this.table == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.table); org.apache.thrift.TBaseHelper.toString(this.table, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");
@ -571,7 +575,7 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
if (this.row == null) { if (this.row == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.row); org.apache.thrift.TBaseHelper.toString(this.row, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");
@ -579,7 +583,7 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
if (this.columns == null) { if (this.columns == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.columns); org.apache.thrift.TBaseHelper.toString(this.columns, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");
@ -587,7 +591,7 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
if (this.values == null) { if (this.values == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.values); org.apache.thrift.TBaseHelper.toString(this.values, sb);
} }
first = false; first = false;
sb.append(")"); sb.append(")");
@ -654,11 +658,11 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
{ {
org.apache.thrift.protocol.TList _list34 = iprot.readListBegin(); org.apache.thrift.protocol.TList _list34 = iprot.readListBegin();
struct.columns = new ArrayList<ByteBuffer>(_list34.size); struct.columns = new ArrayList<ByteBuffer>(_list34.size);
for (int _i35 = 0; _i35 < _list34.size; ++_i35) ByteBuffer _elem35;
for (int _i36 = 0; _i36 < _list34.size; ++_i36)
{ {
ByteBuffer _elem36; // required _elem35 = iprot.readBinary();
_elem36 = iprot.readBinary(); struct.columns.add(_elem35);
struct.columns.add(_elem36);
} }
iprot.readListEnd(); iprot.readListEnd();
} }
@ -672,11 +676,11 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
{ {
org.apache.thrift.protocol.TList _list37 = iprot.readListBegin(); org.apache.thrift.protocol.TList _list37 = iprot.readListBegin();
struct.values = new ArrayList<ByteBuffer>(_list37.size); struct.values = new ArrayList<ByteBuffer>(_list37.size);
for (int _i38 = 0; _i38 < _list37.size; ++_i38) ByteBuffer _elem38;
for (int _i39 = 0; _i39 < _list37.size; ++_i39)
{ {
ByteBuffer _elem39; // required _elem38 = iprot.readBinary();
_elem39 = iprot.readBinary(); struct.values.add(_elem38);
struct.values.add(_elem39);
} }
iprot.readListEnd(); iprot.readListEnd();
} }
@ -807,11 +811,11 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
{ {
org.apache.thrift.protocol.TList _list44 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); org.apache.thrift.protocol.TList _list44 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.columns = new ArrayList<ByteBuffer>(_list44.size); struct.columns = new ArrayList<ByteBuffer>(_list44.size);
for (int _i45 = 0; _i45 < _list44.size; ++_i45) ByteBuffer _elem45;
for (int _i46 = 0; _i46 < _list44.size; ++_i46)
{ {
ByteBuffer _elem46; // required _elem45 = iprot.readBinary();
_elem46 = iprot.readBinary(); struct.columns.add(_elem45);
struct.columns.add(_elem46);
} }
} }
struct.setColumnsIsSet(true); struct.setColumnsIsSet(true);
@ -820,11 +824,11 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
{ {
org.apache.thrift.protocol.TList _list47 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); org.apache.thrift.protocol.TList _list47 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.values = new ArrayList<ByteBuffer>(_list47.size); struct.values = new ArrayList<ByteBuffer>(_list47.size);
for (int _i48 = 0; _i48 < _list47.size; ++_i48) ByteBuffer _elem48;
for (int _i49 = 0; _i49 < _list47.size; ++_i49)
{ {
ByteBuffer _elem49; // required _elem48 = iprot.readBinary();
_elem49 = iprot.readBinary(); struct.values.add(_elem48);
struct.values.add(_elem49);
} }
} }
struct.setValuesIsSet(true); struct.setValuesIsSet(true);

44
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TCell.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift.generated; package org.apache.hadoop.hbase.thrift.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,16 +29,19 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* TCell - Used to transport a cell value (byte[]) and the timestamp it was * TCell - Used to transport a cell value (byte[]) and the timestamp it was
* stored with together as a result for get and getRow methods. This promotes * stored with together as a result for get and getRow methods. This promotes
* the timestamp of a cell to a first-class value, making it easy to take * the timestamp of a cell to a first-class value, making it easy to take
* note of temporal data. Cell is used all the way from HStore up to HTable. * note of temporal data. Cell is used all the way from HStore up to HTable.
*/ */
public class TCell implements org.apache.thrift.TBase<TCell, TCell._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TCell implements org.apache.thrift.TBase<TCell, TCell._Fields>, java.io.Serializable, Cloneable, Comparable<TCell> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCell"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCell");
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 VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -135,7 +139,7 @@ public class TCell implements org.apache.thrift.TBase<TCell, TCell._Fields>, jav
long timestamp) long timestamp)
{ {
this(); this();
this.value = value; this.value = org.apache.thrift.TBaseHelper.copyBinary(value);
this.timestamp = timestamp; this.timestamp = timestamp;
setTimestampIsSet(true); setTimestampIsSet(true);
} }
@ -168,16 +172,16 @@ public class TCell implements org.apache.thrift.TBase<TCell, TCell._Fields>, jav
} }
public ByteBuffer bufferForValue() { public ByteBuffer bufferForValue() {
return value; return org.apache.thrift.TBaseHelper.copyBinary(value);
} }
public TCell setValue(byte[] value) { public TCell setValue(byte[] value) {
setValue(value == null ? (ByteBuffer)null : ByteBuffer.wrap(value)); this.value = value == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(value, value.length));
return this; return this;
} }
public TCell setValue(ByteBuffer value) { public TCell setValue(ByteBuffer value) {
this.value = value; this.value = org.apache.thrift.TBaseHelper.copyBinary(value);
return this; return this;
} }
@ -246,7 +250,7 @@ public class TCell implements org.apache.thrift.TBase<TCell, TCell._Fields>, jav
return getValue(); return getValue();
case TIMESTAMP: case TIMESTAMP:
return Long.valueOf(getTimestamp()); return getTimestamp();
} }
throw new IllegalStateException(); throw new IllegalStateException();
@ -303,45 +307,45 @@ public class TCell implements org.apache.thrift.TBase<TCell, TCell._Fields>, jav
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_value = true && (isSetValue()); boolean present_value = true && (isSetValue());
builder.append(present_value); list.add(present_value);
if (present_value) if (present_value)
builder.append(value); list.add(value);
boolean present_timestamp = true; boolean present_timestamp = true;
builder.append(present_timestamp); list.add(present_timestamp);
if (present_timestamp) if (present_timestamp)
builder.append(timestamp); list.add(timestamp);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TCell other) { public int compareTo(TCell other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TCell typedOther = (TCell)other;
lastComparison = Boolean.valueOf(isSetValue()).compareTo(typedOther.isSetValue()); lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetValue()) { if (isSetValue()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, typedOther.value); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp()); lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetTimestamp()) { if (isSetTimestamp()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -370,7 +374,7 @@ public class TCell implements org.apache.thrift.TBase<TCell, TCell._Fields>, jav
if (this.value == null) { if (this.value == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.value); org.apache.thrift.TBaseHelper.toString(this.value, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");

42
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TColumn.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift.generated; package org.apache.hadoop.hbase.thrift.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,13 +29,16 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* Holds column name and the cell. * Holds column name and the cell.
*/ */
public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields>, java.io.Serializable, Cloneable, Comparable<TColumn> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumn"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumn");
private static final org.apache.thrift.protocol.TField COLUMN_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("columnName", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField COLUMN_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("columnName", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -130,7 +134,7 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
TCell cell) TCell cell)
{ {
this(); this();
this.columnName = columnName; this.columnName = org.apache.thrift.TBaseHelper.copyBinary(columnName);
this.cell = cell; this.cell = cell;
} }
@ -162,16 +166,16 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
} }
public ByteBuffer bufferForColumnName() { public ByteBuffer bufferForColumnName() {
return columnName; return org.apache.thrift.TBaseHelper.copyBinary(columnName);
} }
public TColumn setColumnName(byte[] columnName) { public TColumn setColumnName(byte[] columnName) {
setColumnName(columnName == null ? (ByteBuffer)null : ByteBuffer.wrap(columnName)); this.columnName = columnName == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(columnName, columnName.length));
return this; return this;
} }
public TColumn setColumnName(ByteBuffer columnName) { public TColumn setColumnName(ByteBuffer columnName) {
this.columnName = columnName; this.columnName = org.apache.thrift.TBaseHelper.copyBinary(columnName);
return this; return this;
} }
@ -298,45 +302,45 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_columnName = true && (isSetColumnName()); boolean present_columnName = true && (isSetColumnName());
builder.append(present_columnName); list.add(present_columnName);
if (present_columnName) if (present_columnName)
builder.append(columnName); list.add(columnName);
boolean present_cell = true && (isSetCell()); boolean present_cell = true && (isSetCell());
builder.append(present_cell); list.add(present_cell);
if (present_cell) if (present_cell)
builder.append(cell); list.add(cell);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TColumn other) { public int compareTo(TColumn other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TColumn typedOther = (TColumn)other;
lastComparison = Boolean.valueOf(isSetColumnName()).compareTo(typedOther.isSetColumnName()); lastComparison = Boolean.valueOf(isSetColumnName()).compareTo(other.isSetColumnName());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetColumnName()) { if (isSetColumnName()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnName, typedOther.columnName); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnName, other.columnName);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetCell()).compareTo(typedOther.isSetCell()); lastComparison = Boolean.valueOf(isSetCell()).compareTo(other.isSetCell());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetCell()) { if (isSetCell()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cell, typedOther.cell); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cell, other.cell);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -365,7 +369,7 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
if (this.columnName == null) { if (this.columnName == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.columnName); org.apache.thrift.TBaseHelper.toString(this.columnName, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");

80
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TIncrement.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift.generated; package org.apache.hadoop.hbase.thrift.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,14 +29,17 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* For increments that are not incrementColumnValue * For increments that are not incrementColumnValue
* equivalents. * equivalents.
*/ */
public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncrement._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncrement._Fields>, java.io.Serializable, Cloneable, Comparable<TIncrement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIncrement"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIncrement");
private static final org.apache.thrift.protocol.TField TABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("table", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField TABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("table", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -149,9 +153,9 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
long ammount) long ammount)
{ {
this(); this();
this.table = table; this.table = org.apache.thrift.TBaseHelper.copyBinary(table);
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
this.column = column; this.column = org.apache.thrift.TBaseHelper.copyBinary(column);
this.ammount = ammount; this.ammount = ammount;
setAmmountIsSet(true); setAmmountIsSet(true);
} }
@ -192,16 +196,16 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
} }
public ByteBuffer bufferForTable() { public ByteBuffer bufferForTable() {
return table; return org.apache.thrift.TBaseHelper.copyBinary(table);
} }
public TIncrement setTable(byte[] table) { public TIncrement setTable(byte[] table) {
setTable(table == null ? (ByteBuffer)null : ByteBuffer.wrap(table)); this.table = table == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(table, table.length));
return this; return this;
} }
public TIncrement setTable(ByteBuffer table) { public TIncrement setTable(ByteBuffer table) {
this.table = table; this.table = org.apache.thrift.TBaseHelper.copyBinary(table);
return this; return this;
} }
@ -226,16 +230,16 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
} }
public ByteBuffer bufferForRow() { public ByteBuffer bufferForRow() {
return row; return org.apache.thrift.TBaseHelper.copyBinary(row);
} }
public TIncrement setRow(byte[] row) { public TIncrement setRow(byte[] row) {
setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length));
return this; return this;
} }
public TIncrement setRow(ByteBuffer row) { public TIncrement setRow(ByteBuffer row) {
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
return this; return this;
} }
@ -260,16 +264,16 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
} }
public ByteBuffer bufferForColumn() { public ByteBuffer bufferForColumn() {
return column; return org.apache.thrift.TBaseHelper.copyBinary(column);
} }
public TIncrement setColumn(byte[] column) { public TIncrement setColumn(byte[] column) {
setColumn(column == null ? (ByteBuffer)null : ByteBuffer.wrap(column)); this.column = column == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(column, column.length));
return this; return this;
} }
public TIncrement setColumn(ByteBuffer column) { public TIncrement setColumn(ByteBuffer column) {
this.column = column; this.column = org.apache.thrift.TBaseHelper.copyBinary(column);
return this; return this;
} }
@ -360,7 +364,7 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
return getColumn(); return getColumn();
case AMMOUNT: case AMMOUNT:
return Long.valueOf(getAmmount()); return getAmmount();
} }
throw new IllegalStateException(); throw new IllegalStateException();
@ -439,75 +443,75 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_table = true && (isSetTable()); boolean present_table = true && (isSetTable());
builder.append(present_table); list.add(present_table);
if (present_table) if (present_table)
builder.append(table); list.add(table);
boolean present_row = true && (isSetRow()); boolean present_row = true && (isSetRow());
builder.append(present_row); list.add(present_row);
if (present_row) if (present_row)
builder.append(row); list.add(row);
boolean present_column = true && (isSetColumn()); boolean present_column = true && (isSetColumn());
builder.append(present_column); list.add(present_column);
if (present_column) if (present_column)
builder.append(column); list.add(column);
boolean present_ammount = true; boolean present_ammount = true;
builder.append(present_ammount); list.add(present_ammount);
if (present_ammount) if (present_ammount)
builder.append(ammount); list.add(ammount);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TIncrement other) { public int compareTo(TIncrement other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TIncrement typedOther = (TIncrement)other;
lastComparison = Boolean.valueOf(isSetTable()).compareTo(typedOther.isSetTable()); lastComparison = Boolean.valueOf(isSetTable()).compareTo(other.isSetTable());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetTable()) { if (isSetTable()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.table, typedOther.table); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.table, other.table);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetRow()) { if (isSetRow()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetColumn()).compareTo(typedOther.isSetColumn()); lastComparison = Boolean.valueOf(isSetColumn()).compareTo(other.isSetColumn());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetColumn()) { if (isSetColumn()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, other.column);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetAmmount()).compareTo(typedOther.isSetAmmount()); lastComparison = Boolean.valueOf(isSetAmmount()).compareTo(other.isSetAmmount());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetAmmount()) { if (isSetAmmount()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ammount, typedOther.ammount); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ammount, other.ammount);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -536,7 +540,7 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
if (this.table == null) { if (this.table == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.table); org.apache.thrift.TBaseHelper.toString(this.table, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");
@ -544,7 +548,7 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
if (this.row == null) { if (this.row == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.row); org.apache.thrift.TBaseHelper.toString(this.row, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");
@ -552,7 +556,7 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
if (this.column == null) { if (this.column == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.column); org.apache.thrift.TBaseHelper.toString(this.column, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");

118
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRegionInfo.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift.generated; package org.apache.hadoop.hbase.thrift.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,13 +29,16 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* A TRegionInfo contains information about an HTable region. * A TRegionInfo contains information about an HTable region.
*/ */
public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegionInfo._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegionInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TRegionInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRegionInfo"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRegionInfo");
private static final org.apache.thrift.protocol.TField START_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("startKey", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField START_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("startKey", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -174,14 +178,14 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion
int port) int port)
{ {
this(); this();
this.startKey = startKey; this.startKey = org.apache.thrift.TBaseHelper.copyBinary(startKey);
this.endKey = endKey; this.endKey = org.apache.thrift.TBaseHelper.copyBinary(endKey);
this.id = id; this.id = id;
setIdIsSet(true); setIdIsSet(true);
this.name = name; this.name = org.apache.thrift.TBaseHelper.copyBinary(name);
this.version = version; this.version = version;
setVersionIsSet(true); setVersionIsSet(true);
this.serverName = serverName; this.serverName = org.apache.thrift.TBaseHelper.copyBinary(serverName);
this.port = port; this.port = port;
setPortIsSet(true); setPortIsSet(true);
} }
@ -232,16 +236,16 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion
} }
public ByteBuffer bufferForStartKey() { public ByteBuffer bufferForStartKey() {
return startKey; return org.apache.thrift.TBaseHelper.copyBinary(startKey);
} }
public TRegionInfo setStartKey(byte[] startKey) { public TRegionInfo setStartKey(byte[] startKey) {
setStartKey(startKey == null ? (ByteBuffer)null : ByteBuffer.wrap(startKey)); this.startKey = startKey == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(startKey, startKey.length));
return this; return this;
} }
public TRegionInfo setStartKey(ByteBuffer startKey) { public TRegionInfo setStartKey(ByteBuffer startKey) {
this.startKey = startKey; this.startKey = org.apache.thrift.TBaseHelper.copyBinary(startKey);
return this; return this;
} }
@ -266,16 +270,16 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion
} }
public ByteBuffer bufferForEndKey() { public ByteBuffer bufferForEndKey() {
return endKey; return org.apache.thrift.TBaseHelper.copyBinary(endKey);
} }
public TRegionInfo setEndKey(byte[] endKey) { public TRegionInfo setEndKey(byte[] endKey) {
setEndKey(endKey == null ? (ByteBuffer)null : ByteBuffer.wrap(endKey)); this.endKey = endKey == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(endKey, endKey.length));
return this; return this;
} }
public TRegionInfo setEndKey(ByteBuffer endKey) { public TRegionInfo setEndKey(ByteBuffer endKey) {
this.endKey = endKey; this.endKey = org.apache.thrift.TBaseHelper.copyBinary(endKey);
return this; return this;
} }
@ -323,16 +327,16 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion
} }
public ByteBuffer bufferForName() { public ByteBuffer bufferForName() {
return name; return org.apache.thrift.TBaseHelper.copyBinary(name);
} }
public TRegionInfo setName(byte[] name) { public TRegionInfo setName(byte[] name) {
setName(name == null ? (ByteBuffer)null : ByteBuffer.wrap(name)); this.name = name == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(name, name.length));
return this; return this;
} }
public TRegionInfo setName(ByteBuffer name) { public TRegionInfo setName(ByteBuffer name) {
this.name = name; this.name = org.apache.thrift.TBaseHelper.copyBinary(name);
return this; return this;
} }
@ -380,16 +384,16 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion
} }
public ByteBuffer bufferForServerName() { public ByteBuffer bufferForServerName() {
return serverName; return org.apache.thrift.TBaseHelper.copyBinary(serverName);
} }
public TRegionInfo setServerName(byte[] serverName) { public TRegionInfo setServerName(byte[] serverName) {
setServerName(serverName == null ? (ByteBuffer)null : ByteBuffer.wrap(serverName)); this.serverName = serverName == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(serverName, serverName.length));
return this; return this;
} }
public TRegionInfo setServerName(ByteBuffer serverName) { public TRegionInfo setServerName(ByteBuffer serverName) {
this.serverName = serverName; this.serverName = org.apache.thrift.TBaseHelper.copyBinary(serverName);
return this; return this;
} }
@ -501,19 +505,19 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion
return getEndKey(); return getEndKey();
case ID: case ID:
return Long.valueOf(getId()); return getId();
case NAME: case NAME:
return getName(); return getName();
case VERSION: case VERSION:
return Byte.valueOf(getVersion()); return getVersion();
case SERVER_NAME: case SERVER_NAME:
return getServerName(); return getServerName();
case PORT: case PORT:
return Integer.valueOf(getPort()); return getPort();
} }
throw new IllegalStateException(); throw new IllegalStateException();
@ -625,120 +629,120 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_startKey = true && (isSetStartKey()); boolean present_startKey = true && (isSetStartKey());
builder.append(present_startKey); list.add(present_startKey);
if (present_startKey) if (present_startKey)
builder.append(startKey); list.add(startKey);
boolean present_endKey = true && (isSetEndKey()); boolean present_endKey = true && (isSetEndKey());
builder.append(present_endKey); list.add(present_endKey);
if (present_endKey) if (present_endKey)
builder.append(endKey); list.add(endKey);
boolean present_id = true; boolean present_id = true;
builder.append(present_id); list.add(present_id);
if (present_id) if (present_id)
builder.append(id); list.add(id);
boolean present_name = true && (isSetName()); boolean present_name = true && (isSetName());
builder.append(present_name); list.add(present_name);
if (present_name) if (present_name)
builder.append(name); list.add(name);
boolean present_version = true; boolean present_version = true;
builder.append(present_version); list.add(present_version);
if (present_version) if (present_version)
builder.append(version); list.add(version);
boolean present_serverName = true && (isSetServerName()); boolean present_serverName = true && (isSetServerName());
builder.append(present_serverName); list.add(present_serverName);
if (present_serverName) if (present_serverName)
builder.append(serverName); list.add(serverName);
boolean present_port = true; boolean present_port = true;
builder.append(present_port); list.add(present_port);
if (present_port) if (present_port)
builder.append(port); list.add(port);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TRegionInfo other) { public int compareTo(TRegionInfo other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TRegionInfo typedOther = (TRegionInfo)other;
lastComparison = Boolean.valueOf(isSetStartKey()).compareTo(typedOther.isSetStartKey()); lastComparison = Boolean.valueOf(isSetStartKey()).compareTo(other.isSetStartKey());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetStartKey()) { if (isSetStartKey()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startKey, typedOther.startKey); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startKey, other.startKey);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetEndKey()).compareTo(typedOther.isSetEndKey()); lastComparison = Boolean.valueOf(isSetEndKey()).compareTo(other.isSetEndKey());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetEndKey()) { if (isSetEndKey()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endKey, typedOther.endKey); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endKey, other.endKey);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetId()).compareTo(typedOther.isSetId()); lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetId()) { if (isSetId()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName()); lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetName()) { if (isSetName()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetVersion()).compareTo(typedOther.isSetVersion()); lastComparison = Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetVersion()) { if (isSetVersion()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, typedOther.version); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetServerName()).compareTo(typedOther.isSetServerName()); lastComparison = Boolean.valueOf(isSetServerName()).compareTo(other.isSetServerName());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetServerName()) { if (isSetServerName()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverName, typedOther.serverName); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverName, other.serverName);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetPort()).compareTo(typedOther.isSetPort()); lastComparison = Boolean.valueOf(isSetPort()).compareTo(other.isSetPort());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetPort()) { if (isSetPort()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -767,7 +771,7 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion
if (this.startKey == null) { if (this.startKey == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.startKey); org.apache.thrift.TBaseHelper.toString(this.startKey, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");
@ -775,7 +779,7 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion
if (this.endKey == null) { if (this.endKey == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.endKey); org.apache.thrift.TBaseHelper.toString(this.endKey, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");
@ -787,7 +791,7 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion
if (this.name == null) { if (this.name == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.name); org.apache.thrift.TBaseHelper.toString(this.name, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");
@ -799,7 +803,7 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion
if (this.serverName == null) { if (this.serverName == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.serverName); org.apache.thrift.TBaseHelper.toString(this.serverName, sb);
} }
first = false; first = false;
if (!first) sb.append(", "); if (!first) sb.append(", ");

104
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRowResult.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift.generated; package org.apache.hadoop.hbase.thrift.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,13 +29,16 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* Holds row name and then a map of columns to cells. * Holds row name and then a map of columns to cells.
*/ */
public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResult._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResult._Fields>, java.io.Serializable, Cloneable, Comparable<TRowResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRowResult"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRowResult");
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)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)1);
@ -116,7 +120,7 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul
} }
// isset id assignments // isset id assignments
private _Fields optionals[] = {_Fields.COLUMNS,_Fields.SORTED_COLUMNS}; private static final _Fields optionals[] = {_Fields.COLUMNS,_Fields.SORTED_COLUMNS};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -140,7 +144,7 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul
ByteBuffer row) ByteBuffer row)
{ {
this(); this();
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
} }
/** /**
@ -151,7 +155,7 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul
this.row = other.row; this.row = other.row;
} }
if (other.isSetColumns()) { if (other.isSetColumns()) {
Map<ByteBuffer,TCell> __this__columns = new HashMap<ByteBuffer,TCell>(); Map<ByteBuffer,TCell> __this__columns = new HashMap<ByteBuffer,TCell>(other.columns.size());
for (Map.Entry<ByteBuffer, TCell> other_element : other.columns.entrySet()) { for (Map.Entry<ByteBuffer, TCell> other_element : other.columns.entrySet()) {
ByteBuffer other_element_key = other_element.getKey(); ByteBuffer other_element_key = other_element.getKey();
@ -166,7 +170,7 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul
this.columns = __this__columns; this.columns = __this__columns;
} }
if (other.isSetSortedColumns()) { if (other.isSetSortedColumns()) {
List<TColumn> __this__sortedColumns = new ArrayList<TColumn>(); List<TColumn> __this__sortedColumns = new ArrayList<TColumn>(other.sortedColumns.size());
for (TColumn other_element : other.sortedColumns) { for (TColumn other_element : other.sortedColumns) {
__this__sortedColumns.add(new TColumn(other_element)); __this__sortedColumns.add(new TColumn(other_element));
} }
@ -191,16 +195,16 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul
} }
public ByteBuffer bufferForRow() { public ByteBuffer bufferForRow() {
return row; return org.apache.thrift.TBaseHelper.copyBinary(row);
} }
public TRowResult setRow(byte[] row) { public TRowResult setRow(byte[] row) {
setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length));
return this; return this;
} }
public TRowResult setRow(ByteBuffer row) { public TRowResult setRow(ByteBuffer row) {
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
return this; return this;
} }
@ -399,60 +403,60 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_row = true && (isSetRow()); boolean present_row = true && (isSetRow());
builder.append(present_row); list.add(present_row);
if (present_row) if (present_row)
builder.append(row); list.add(row);
boolean present_columns = true && (isSetColumns()); boolean present_columns = true && (isSetColumns());
builder.append(present_columns); list.add(present_columns);
if (present_columns) if (present_columns)
builder.append(columns); list.add(columns);
boolean present_sortedColumns = true && (isSetSortedColumns()); boolean present_sortedColumns = true && (isSetSortedColumns());
builder.append(present_sortedColumns); list.add(present_sortedColumns);
if (present_sortedColumns) if (present_sortedColumns)
builder.append(sortedColumns); list.add(sortedColumns);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TRowResult other) { public int compareTo(TRowResult other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TRowResult typedOther = (TRowResult)other;
lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetRow()) { if (isSetRow()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns()); lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetColumns()) { if (isSetColumns()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetSortedColumns()).compareTo(typedOther.isSetSortedColumns()); lastComparison = Boolean.valueOf(isSetSortedColumns()).compareTo(other.isSetSortedColumns());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetSortedColumns()) { if (isSetSortedColumns()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sortedColumns, typedOther.sortedColumns); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sortedColumns, other.sortedColumns);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -481,7 +485,7 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul
if (this.row == null) { if (this.row == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.row); org.apache.thrift.TBaseHelper.toString(this.row, sb);
} }
first = false; first = false;
if (isSetColumns()) { if (isSetColumns()) {
@ -560,14 +564,14 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul
{ {
org.apache.thrift.protocol.TMap _map8 = iprot.readMapBegin(); org.apache.thrift.protocol.TMap _map8 = iprot.readMapBegin();
struct.columns = new HashMap<ByteBuffer,TCell>(2*_map8.size); struct.columns = new HashMap<ByteBuffer,TCell>(2*_map8.size);
for (int _i9 = 0; _i9 < _map8.size; ++_i9) ByteBuffer _key9;
TCell _val10;
for (int _i11 = 0; _i11 < _map8.size; ++_i11)
{ {
ByteBuffer _key10; // required _key9 = iprot.readBinary();
TCell _val11; // required _val10 = new TCell();
_key10 = iprot.readBinary(); _val10.read(iprot);
_val11 = new TCell(); struct.columns.put(_key9, _val10);
_val11.read(iprot);
struct.columns.put(_key10, _val11);
} }
iprot.readMapEnd(); iprot.readMapEnd();
} }
@ -581,12 +585,12 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul
{ {
org.apache.thrift.protocol.TList _list12 = iprot.readListBegin(); org.apache.thrift.protocol.TList _list12 = iprot.readListBegin();
struct.sortedColumns = new ArrayList<TColumn>(_list12.size); struct.sortedColumns = new ArrayList<TColumn>(_list12.size);
for (int _i13 = 0; _i13 < _list12.size; ++_i13) TColumn _elem13;
for (int _i14 = 0; _i14 < _list12.size; ++_i14)
{ {
TColumn _elem14; // required _elem13 = new TColumn();
_elem14 = new TColumn(); _elem13.read(iprot);
_elem14.read(iprot); struct.sortedColumns.add(_elem13);
struct.sortedColumns.add(_elem14);
} }
iprot.readListEnd(); iprot.readListEnd();
} }
@ -708,14 +712,14 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul
{ {
org.apache.thrift.protocol.TMap _map19 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); org.apache.thrift.protocol.TMap _map19 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.columns = new HashMap<ByteBuffer,TCell>(2*_map19.size); struct.columns = new HashMap<ByteBuffer,TCell>(2*_map19.size);
for (int _i20 = 0; _i20 < _map19.size; ++_i20) ByteBuffer _key20;
TCell _val21;
for (int _i22 = 0; _i22 < _map19.size; ++_i22)
{ {
ByteBuffer _key21; // required _key20 = iprot.readBinary();
TCell _val22; // required _val21 = new TCell();
_key21 = iprot.readBinary(); _val21.read(iprot);
_val22 = new TCell(); struct.columns.put(_key20, _val21);
_val22.read(iprot);
struct.columns.put(_key21, _val22);
} }
} }
struct.setColumnsIsSet(true); struct.setColumnsIsSet(true);
@ -724,12 +728,12 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul
{ {
org.apache.thrift.protocol.TList _list23 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); org.apache.thrift.protocol.TList _list23 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.sortedColumns = new ArrayList<TColumn>(_list23.size); struct.sortedColumns = new ArrayList<TColumn>(_list23.size);
for (int _i24 = 0; _i24 < _list23.size; ++_i24) TColumn _elem24;
for (int _i25 = 0; _i25 < _list23.size; ++_i25)
{ {
TColumn _elem25; // required _elem24 = new TColumn();
_elem25 = new TColumn(); _elem24.read(iprot);
_elem25.read(iprot); struct.sortedColumns.add(_elem24);
struct.sortedColumns.add(_elem25);
} }
} }
struct.setSortedColumnsIsSet(true); struct.setSortedColumnsIsSet(true);

144
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TScan.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift.generated; package org.apache.hadoop.hbase.thrift.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,13 +29,16 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* A Scan object is used to specify scanner parameters when opening a scanner. * A Scan object is used to specify scanner parameters when opening a scanner.
*/ */
public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, java.io.Serializable, Cloneable, Comparable<TScan> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TScan"); 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 START_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("startRow", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -152,7 +156,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
private static final int __SORTCOLUMNS_ISSET_ID = 3; private static final int __SORTCOLUMNS_ISSET_ID = 3;
private static final int __REVERSED_ISSET_ID = 4; private static final int __REVERSED_ISSET_ID = 4;
private byte __isset_bitfield = 0; private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.START_ROW,_Fields.STOP_ROW,_Fields.TIMESTAMP,_Fields.COLUMNS,_Fields.CACHING,_Fields.FILTER_STRING,_Fields.BATCH_SIZE,_Fields.SORT_COLUMNS,_Fields.REVERSED}; private static final _Fields optionals[] = {_Fields.START_ROW,_Fields.STOP_ROW,_Fields.TIMESTAMP,_Fields.COLUMNS,_Fields.CACHING,_Fields.FILTER_STRING,_Fields.BATCH_SIZE,_Fields.SORT_COLUMNS,_Fields.REVERSED};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -195,7 +199,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
} }
this.timestamp = other.timestamp; this.timestamp = other.timestamp;
if (other.isSetColumns()) { if (other.isSetColumns()) {
List<ByteBuffer> __this__columns = new ArrayList<ByteBuffer>(); List<ByteBuffer> __this__columns = new ArrayList<ByteBuffer>(other.columns.size());
for (ByteBuffer other_element : other.columns) { for (ByteBuffer other_element : other.columns) {
__this__columns.add(other_element); __this__columns.add(other_element);
} }
@ -238,16 +242,16 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
} }
public ByteBuffer bufferForStartRow() { public ByteBuffer bufferForStartRow() {
return startRow; return org.apache.thrift.TBaseHelper.copyBinary(startRow);
} }
public TScan setStartRow(byte[] startRow) { public TScan setStartRow(byte[] startRow) {
setStartRow(startRow == null ? (ByteBuffer)null : ByteBuffer.wrap(startRow)); this.startRow = startRow == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(startRow, startRow.length));
return this; return this;
} }
public TScan setStartRow(ByteBuffer startRow) { public TScan setStartRow(ByteBuffer startRow) {
this.startRow = startRow; this.startRow = org.apache.thrift.TBaseHelper.copyBinary(startRow);
return this; return this;
} }
@ -272,16 +276,16 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
} }
public ByteBuffer bufferForStopRow() { public ByteBuffer bufferForStopRow() {
return stopRow; return org.apache.thrift.TBaseHelper.copyBinary(stopRow);
} }
public TScan setStopRow(byte[] stopRow) { public TScan setStopRow(byte[] stopRow) {
setStopRow(stopRow == null ? (ByteBuffer)null : ByteBuffer.wrap(stopRow)); this.stopRow = stopRow == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(stopRow, stopRow.length));
return this; return this;
} }
public TScan setStopRow(ByteBuffer stopRow) { public TScan setStopRow(ByteBuffer stopRow) {
this.stopRow = stopRow; this.stopRow = org.apache.thrift.TBaseHelper.copyBinary(stopRow);
return this; return this;
} }
@ -391,16 +395,16 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
} }
public ByteBuffer bufferForFilterString() { public ByteBuffer bufferForFilterString() {
return filterString; return org.apache.thrift.TBaseHelper.copyBinary(filterString);
} }
public TScan setFilterString(byte[] filterString) { public TScan setFilterString(byte[] filterString) {
setFilterString(filterString == null ? (ByteBuffer)null : ByteBuffer.wrap(filterString)); this.filterString = filterString == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(filterString, filterString.length));
return this; return this;
} }
public TScan setFilterString(ByteBuffer filterString) { public TScan setFilterString(ByteBuffer filterString) {
this.filterString = filterString; this.filterString = org.apache.thrift.TBaseHelper.copyBinary(filterString);
return this; return this;
} }
@ -574,25 +578,25 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
return getStopRow(); return getStopRow();
case TIMESTAMP: case TIMESTAMP:
return Long.valueOf(getTimestamp()); return getTimestamp();
case COLUMNS: case COLUMNS:
return getColumns(); return getColumns();
case CACHING: case CACHING:
return Integer.valueOf(getCaching()); return getCaching();
case FILTER_STRING: case FILTER_STRING:
return getFilterString(); return getFilterString();
case BATCH_SIZE: case BATCH_SIZE:
return Integer.valueOf(getBatchSize()); return getBatchSize();
case SORT_COLUMNS: case SORT_COLUMNS:
return Boolean.valueOf(isSortColumns()); return isSortColumns();
case REVERSED: case REVERSED:
return Boolean.valueOf(isReversed()); return isReversed();
} }
throw new IllegalStateException(); throw new IllegalStateException();
@ -726,150 +730,150 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_startRow = true && (isSetStartRow()); boolean present_startRow = true && (isSetStartRow());
builder.append(present_startRow); list.add(present_startRow);
if (present_startRow) if (present_startRow)
builder.append(startRow); list.add(startRow);
boolean present_stopRow = true && (isSetStopRow()); boolean present_stopRow = true && (isSetStopRow());
builder.append(present_stopRow); list.add(present_stopRow);
if (present_stopRow) if (present_stopRow)
builder.append(stopRow); list.add(stopRow);
boolean present_timestamp = true && (isSetTimestamp()); boolean present_timestamp = true && (isSetTimestamp());
builder.append(present_timestamp); list.add(present_timestamp);
if (present_timestamp) if (present_timestamp)
builder.append(timestamp); list.add(timestamp);
boolean present_columns = true && (isSetColumns()); boolean present_columns = true && (isSetColumns());
builder.append(present_columns); list.add(present_columns);
if (present_columns) if (present_columns)
builder.append(columns); list.add(columns);
boolean present_caching = true && (isSetCaching()); boolean present_caching = true && (isSetCaching());
builder.append(present_caching); list.add(present_caching);
if (present_caching) if (present_caching)
builder.append(caching); list.add(caching);
boolean present_filterString = true && (isSetFilterString()); boolean present_filterString = true && (isSetFilterString());
builder.append(present_filterString); list.add(present_filterString);
if (present_filterString) if (present_filterString)
builder.append(filterString); list.add(filterString);
boolean present_batchSize = true && (isSetBatchSize()); boolean present_batchSize = true && (isSetBatchSize());
builder.append(present_batchSize); list.add(present_batchSize);
if (present_batchSize) if (present_batchSize)
builder.append(batchSize); list.add(batchSize);
boolean present_sortColumns = true && (isSetSortColumns()); boolean present_sortColumns = true && (isSetSortColumns());
builder.append(present_sortColumns); list.add(present_sortColumns);
if (present_sortColumns) if (present_sortColumns)
builder.append(sortColumns); list.add(sortColumns);
boolean present_reversed = true && (isSetReversed()); boolean present_reversed = true && (isSetReversed());
builder.append(present_reversed); list.add(present_reversed);
if (present_reversed) if (present_reversed)
builder.append(reversed); list.add(reversed);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TScan other) { public int compareTo(TScan other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TScan typedOther = (TScan)other;
lastComparison = Boolean.valueOf(isSetStartRow()).compareTo(typedOther.isSetStartRow()); lastComparison = Boolean.valueOf(isSetStartRow()).compareTo(other.isSetStartRow());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetStartRow()) { if (isSetStartRow()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, typedOther.startRow); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, other.startRow);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetStopRow()).compareTo(typedOther.isSetStopRow()); lastComparison = Boolean.valueOf(isSetStopRow()).compareTo(other.isSetStopRow());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetStopRow()) { if (isSetStopRow()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopRow, typedOther.stopRow); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopRow, other.stopRow);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp()); lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetTimestamp()) { if (isSetTimestamp()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns()); lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetColumns()) { if (isSetColumns()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetCaching()).compareTo(typedOther.isSetCaching()); lastComparison = Boolean.valueOf(isSetCaching()).compareTo(other.isSetCaching());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetCaching()) { if (isSetCaching()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.caching, typedOther.caching); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.caching, other.caching);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetFilterString()).compareTo(typedOther.isSetFilterString()); lastComparison = Boolean.valueOf(isSetFilterString()).compareTo(other.isSetFilterString());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetFilterString()) { if (isSetFilterString()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, typedOther.filterString); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, other.filterString);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetBatchSize()).compareTo(typedOther.isSetBatchSize()); lastComparison = Boolean.valueOf(isSetBatchSize()).compareTo(other.isSetBatchSize());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetBatchSize()) { if (isSetBatchSize()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.batchSize, typedOther.batchSize); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.batchSize, other.batchSize);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetSortColumns()).compareTo(typedOther.isSetSortColumns()); lastComparison = Boolean.valueOf(isSetSortColumns()).compareTo(other.isSetSortColumns());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetSortColumns()) { if (isSetSortColumns()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sortColumns, typedOther.sortColumns); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sortColumns, other.sortColumns);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetReversed()).compareTo(typedOther.isSetReversed()); lastComparison = Boolean.valueOf(isSetReversed()).compareTo(other.isSetReversed());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetReversed()) { if (isSetReversed()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reversed, typedOther.reversed); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reversed, other.reversed);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -899,7 +903,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
if (this.startRow == null) { if (this.startRow == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.startRow); org.apache.thrift.TBaseHelper.toString(this.startRow, sb);
} }
first = false; first = false;
} }
@ -909,7 +913,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
if (this.stopRow == null) { if (this.stopRow == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.stopRow); org.apache.thrift.TBaseHelper.toString(this.stopRow, sb);
} }
first = false; first = false;
} }
@ -925,7 +929,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
if (this.columns == null) { if (this.columns == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.columns); org.apache.thrift.TBaseHelper.toString(this.columns, sb);
} }
first = false; first = false;
} }
@ -941,7 +945,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
if (this.filterString == null) { if (this.filterString == null) {
sb.append("null"); sb.append("null");
} else { } else {
sb.append(this.filterString); org.apache.thrift.TBaseHelper.toString(this.filterString, sb);
} }
first = false; first = false;
} }
@ -1037,11 +1041,11 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
{ {
org.apache.thrift.protocol.TList _list26 = iprot.readListBegin(); org.apache.thrift.protocol.TList _list26 = iprot.readListBegin();
struct.columns = new ArrayList<ByteBuffer>(_list26.size); struct.columns = new ArrayList<ByteBuffer>(_list26.size);
for (int _i27 = 0; _i27 < _list26.size; ++_i27) ByteBuffer _elem27;
for (int _i28 = 0; _i28 < _list26.size; ++_i28)
{ {
ByteBuffer _elem28; // required _elem27 = iprot.readBinary();
_elem28 = iprot.readBinary(); struct.columns.add(_elem27);
struct.columns.add(_elem28);
} }
iprot.readListEnd(); iprot.readListEnd();
} }
@ -1266,11 +1270,11 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
{ {
org.apache.thrift.protocol.TList _list31 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); org.apache.thrift.protocol.TList _list31 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.columns = new ArrayList<ByteBuffer>(_list31.size); struct.columns = new ArrayList<ByteBuffer>(_list31.size);
for (int _i32 = 0; _i32 < _list31.size; ++_i32) ByteBuffer _elem32;
for (int _i33 = 0; _i33 < _list31.size; ++_i33)
{ {
ByteBuffer _elem33; // required _elem32 = iprot.readBinary();
_elem33 = iprot.readBinary(); struct.columns.add(_elem32);
struct.columns.add(_elem33);
} }
} }
struct.setColumnsIsSet(true); struct.setColumnsIsSet(true);

5
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftServer.java
View File

@ -245,10 +245,11 @@ public class ThriftServer extends Configured implements Tool {
log.info("starting HBase HsHA Thrift server on " + inetSocketAddress.toString()); log.info("starting HBase HsHA Thrift server on " + inetSocketAddress.toString());
THsHaServer.Args serverArgs = new THsHaServer.Args(serverTransport); THsHaServer.Args serverArgs = new THsHaServer.Args(serverTransport);
if (workerThreads > 0) { if (workerThreads > 0) {
serverArgs.workerThreads(workerThreads); // Could support the min & max threads, avoiding to preserve existing functionality.
serverArgs.minWorkerThreads(workerThreads).maxWorkerThreads(workerThreads);
} }
ExecutorService executorService = createExecutor( ExecutorService executorService = createExecutor(
serverArgs.getWorkerThreads(), metrics); workerThreads, metrics);
serverArgs.executorService(executorService); serverArgs.executorService(executorService);
serverArgs.processor(processor); serverArgs.processor(processor);
serverArgs.transportFactory(transportFactory); serverArgs.transportFactory(transportFactory);

132
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TAppend.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,10 +29,13 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields>, java.io.Serializable, Cloneable { @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields>, java.io.Serializable, Cloneable, Comparable<TAppend> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAppend"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAppend");
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)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)1);
@ -131,7 +135,7 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
} }
// isset id assignments // isset id assignments
private _Fields optionals[] = {_Fields.ATTRIBUTES,_Fields.DURABILITY,_Fields.CELL_VISIBILITY}; private static final _Fields optionals[] = {_Fields.ATTRIBUTES,_Fields.DURABILITY,_Fields.CELL_VISIBILITY};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -160,7 +164,7 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
List<TColumnValue> columns) List<TColumnValue> columns)
{ {
this(); this();
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
this.columns = columns; this.columns = columns;
} }
@ -170,30 +174,16 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
public TAppend(TAppend other) { public TAppend(TAppend other) {
if (other.isSetRow()) { if (other.isSetRow()) {
this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row); this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
;
} }
if (other.isSetColumns()) { if (other.isSetColumns()) {
List<TColumnValue> __this__columns = new ArrayList<TColumnValue>(); List<TColumnValue> __this__columns = new ArrayList<TColumnValue>(other.columns.size());
for (TColumnValue other_element : other.columns) { for (TColumnValue other_element : other.columns) {
__this__columns.add(new TColumnValue(other_element)); __this__columns.add(new TColumnValue(other_element));
} }
this.columns = __this__columns; this.columns = __this__columns;
} }
if (other.isSetAttributes()) { if (other.isSetAttributes()) {
Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(); Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(other.attributes);
for (Map.Entry<ByteBuffer, ByteBuffer> other_element : other.attributes.entrySet()) {
ByteBuffer other_element_key = other_element.getKey();
ByteBuffer other_element_value = other_element.getValue();
ByteBuffer __this__attributes_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key);
;
ByteBuffer __this__attributes_copy_value = org.apache.thrift.TBaseHelper.copyBinary(other_element_value);
;
__this__attributes.put(__this__attributes_copy_key, __this__attributes_copy_value);
}
this.attributes = __this__attributes; this.attributes = __this__attributes;
} }
if (other.isSetDurability()) { if (other.isSetDurability()) {
@ -223,16 +213,16 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
} }
public ByteBuffer bufferForRow() { public ByteBuffer bufferForRow() {
return row; return org.apache.thrift.TBaseHelper.copyBinary(row);
} }
public TAppend setRow(byte[] row) { public TAppend setRow(byte[] row) {
setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length));
return this; return this;
} }
public TAppend setRow(ByteBuffer row) { public TAppend setRow(ByteBuffer row) {
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
return this; return this;
} }
@ -531,90 +521,90 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_row = true && (isSetRow()); boolean present_row = true && (isSetRow());
builder.append(present_row); list.add(present_row);
if (present_row) if (present_row)
builder.append(row); list.add(row);
boolean present_columns = true && (isSetColumns()); boolean present_columns = true && (isSetColumns());
builder.append(present_columns); list.add(present_columns);
if (present_columns) if (present_columns)
builder.append(columns); list.add(columns);
boolean present_attributes = true && (isSetAttributes()); boolean present_attributes = true && (isSetAttributes());
builder.append(present_attributes); list.add(present_attributes);
if (present_attributes) if (present_attributes)
builder.append(attributes); list.add(attributes);
boolean present_durability = true && (isSetDurability()); boolean present_durability = true && (isSetDurability());
builder.append(present_durability); list.add(present_durability);
if (present_durability) if (present_durability)
builder.append(durability.getValue()); list.add(durability.getValue());
boolean present_cellVisibility = true && (isSetCellVisibility()); boolean present_cellVisibility = true && (isSetCellVisibility());
builder.append(present_cellVisibility); list.add(present_cellVisibility);
if (present_cellVisibility) if (present_cellVisibility)
builder.append(cellVisibility); list.add(cellVisibility);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TAppend other) { public int compareTo(TAppend other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TAppend typedOther = (TAppend)other;
lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetRow()) { if (isSetRow()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns()); lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetColumns()) { if (isSetColumns()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes()); lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(other.isSetAttributes());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetAttributes()) { if (isSetAttributes()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, other.attributes);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetDurability()).compareTo(typedOther.isSetDurability()); lastComparison = Boolean.valueOf(isSetDurability()).compareTo(other.isSetDurability());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetDurability()) { if (isSetDurability()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, typedOther.durability); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, other.durability);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetCellVisibility()).compareTo(typedOther.isSetCellVisibility()); lastComparison = Boolean.valueOf(isSetCellVisibility()).compareTo(other.isSetCellVisibility());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetCellVisibility()) { if (isSetCellVisibility()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cellVisibility, typedOther.cellVisibility); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cellVisibility, other.cellVisibility);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -749,12 +739,12 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
{ {
org.apache.thrift.protocol.TList _list88 = iprot.readListBegin(); org.apache.thrift.protocol.TList _list88 = iprot.readListBegin();
struct.columns = new ArrayList<TColumnValue>(_list88.size); struct.columns = new ArrayList<TColumnValue>(_list88.size);
for (int _i89 = 0; _i89 < _list88.size; ++_i89) TColumnValue _elem89;
for (int _i90 = 0; _i90 < _list88.size; ++_i90)
{ {
TColumnValue _elem90; // required _elem89 = new TColumnValue();
_elem90 = new TColumnValue(); _elem89.read(iprot);
_elem90.read(iprot); struct.columns.add(_elem89);
struct.columns.add(_elem90);
} }
iprot.readListEnd(); iprot.readListEnd();
} }
@ -768,13 +758,13 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
{ {
org.apache.thrift.protocol.TMap _map91 = iprot.readMapBegin(); org.apache.thrift.protocol.TMap _map91 = iprot.readMapBegin();
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map91.size); struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map91.size);
for (int _i92 = 0; _i92 < _map91.size; ++_i92) ByteBuffer _key92;
ByteBuffer _val93;
for (int _i94 = 0; _i94 < _map91.size; ++_i94)
{ {
ByteBuffer _key93; // required _key92 = iprot.readBinary();
ByteBuffer _val94; // required _val93 = iprot.readBinary();
_key93 = iprot.readBinary(); struct.attributes.put(_key92, _val93);
_val94 = iprot.readBinary();
struct.attributes.put(_key93, _val94);
} }
iprot.readMapEnd(); iprot.readMapEnd();
} }
@ -785,7 +775,7 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
break; break;
case 4: // DURABILITY case 4: // DURABILITY
if (schemeField.type == org.apache.thrift.protocol.TType.I32) { if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.durability = TDurability.findByValue(iprot.readI32()); struct.durability = org.apache.hadoop.hbase.thrift2.generated.TDurability.findByValue(iprot.readI32());
struct.setDurabilityIsSet(true); struct.setDurabilityIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@ -923,12 +913,12 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
{ {
org.apache.thrift.protocol.TList _list99 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); org.apache.thrift.protocol.TList _list99 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.columns = new ArrayList<TColumnValue>(_list99.size); struct.columns = new ArrayList<TColumnValue>(_list99.size);
for (int _i100 = 0; _i100 < _list99.size; ++_i100) TColumnValue _elem100;
for (int _i101 = 0; _i101 < _list99.size; ++_i101)
{ {
TColumnValue _elem101; // required _elem100 = new TColumnValue();
_elem101 = new TColumnValue(); _elem100.read(iprot);
_elem101.read(iprot); struct.columns.add(_elem100);
struct.columns.add(_elem101);
} }
} }
struct.setColumnsIsSet(true); struct.setColumnsIsSet(true);
@ -937,19 +927,19 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields
{ {
org.apache.thrift.protocol.TMap _map102 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); org.apache.thrift.protocol.TMap _map102 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map102.size); struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map102.size);
for (int _i103 = 0; _i103 < _map102.size; ++_i103) ByteBuffer _key103;
ByteBuffer _val104;
for (int _i105 = 0; _i105 < _map102.size; ++_i105)
{ {
ByteBuffer _key104; // required _key103 = iprot.readBinary();
ByteBuffer _val105; // required _val104 = iprot.readBinary();
_key104 = iprot.readBinary(); struct.attributes.put(_key103, _val104);
_val105 = iprot.readBinary();
struct.attributes.put(_key104, _val105);
} }
} }
struct.setAttributesIsSet(true); struct.setAttributesIsSet(true);
} }
if (incoming.get(1)) { if (incoming.get(1)) {
struct.durability = TDurability.findByValue(iprot.readI32()); struct.durability = org.apache.hadoop.hbase.thrift2.generated.TDurability.findByValue(iprot.readI32());
struct.setDurabilityIsSet(true); struct.setDurabilityIsSet(true);
} }
if (incoming.get(2)) { if (incoming.get(2)) {

47
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TAuthorization.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,10 +29,13 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class TAuthorization implements org.apache.thrift.TBase<TAuthorization, TAuthorization._Fields>, java.io.Serializable, Cloneable { @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TAuthorization implements org.apache.thrift.TBase<TAuthorization, TAuthorization._Fields>, java.io.Serializable, Cloneable, Comparable<TAuthorization> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAuthorization"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAuthorization");
private static final org.apache.thrift.protocol.TField LABELS_FIELD_DESC = new org.apache.thrift.protocol.TField("labels", org.apache.thrift.protocol.TType.LIST, (short)1); private static final org.apache.thrift.protocol.TField LABELS_FIELD_DESC = new org.apache.thrift.protocol.TField("labels", org.apache.thrift.protocol.TType.LIST, (short)1);
@ -103,7 +107,7 @@ public class TAuthorization implements org.apache.thrift.TBase<TAuthorization, T
} }
// isset id assignments // isset id assignments
private _Fields optionals[] = {_Fields.LABELS}; private static final _Fields optionals[] = {_Fields.LABELS};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -122,10 +126,7 @@ public class TAuthorization implements org.apache.thrift.TBase<TAuthorization, T
*/ */
public TAuthorization(TAuthorization other) { public TAuthorization(TAuthorization other) {
if (other.isSetLabels()) { if (other.isSetLabels()) {
List<String> __this__labels = new ArrayList<String>(); List<String> __this__labels = new ArrayList<String>(other.labels);
for (String other_element : other.labels) {
__this__labels.add(other_element);
}
this.labels = __this__labels; this.labels = __this__labels;
} }
} }
@ -240,30 +241,30 @@ public class TAuthorization implements org.apache.thrift.TBase<TAuthorization, T
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_labels = true && (isSetLabels()); boolean present_labels = true && (isSetLabels());
builder.append(present_labels); list.add(present_labels);
if (present_labels) if (present_labels)
builder.append(labels); list.add(labels);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TAuthorization other) { public int compareTo(TAuthorization other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TAuthorization typedOther = (TAuthorization)other;
lastComparison = Boolean.valueOf(isSetLabels()).compareTo(typedOther.isSetLabels()); lastComparison = Boolean.valueOf(isSetLabels()).compareTo(other.isSetLabels());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetLabels()) { if (isSetLabels()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.labels, typedOther.labels); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.labels, other.labels);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -345,11 +346,11 @@ public class TAuthorization implements org.apache.thrift.TBase<TAuthorization, T
{ {
org.apache.thrift.protocol.TList _list8 = iprot.readListBegin(); org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
struct.labels = new ArrayList<String>(_list8.size); struct.labels = new ArrayList<String>(_list8.size);
for (int _i9 = 0; _i9 < _list8.size; ++_i9) String _elem9;
for (int _i10 = 0; _i10 < _list8.size; ++_i10)
{ {
String _elem10; // required _elem9 = iprot.readString();
_elem10 = iprot.readString(); struct.labels.add(_elem9);
struct.labels.add(_elem10);
} }
iprot.readListEnd(); iprot.readListEnd();
} }
@ -428,11 +429,11 @@ public class TAuthorization implements org.apache.thrift.TBase<TAuthorization, T
{ {
org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.labels = new ArrayList<String>(_list13.size); struct.labels = new ArrayList<String>(_list13.size);
for (int _i14 = 0; _i14 < _list13.size; ++_i14) String _elem14;
for (int _i15 = 0; _i15 < _list13.size; ++_i15)
{ {
String _elem15; // required _elem14 = iprot.readString();
_elem15 = iprot.readString(); struct.labels.add(_elem14);
struct.labels.add(_elem15);
} }
} }
struct.setLabelsIsSet(true); struct.setLabelsIsSet(true);

26
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TCellVisibility.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,10 +29,13 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class TCellVisibility implements org.apache.thrift.TBase<TCellVisibility, TCellVisibility._Fields>, java.io.Serializable, Cloneable { @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TCellVisibility implements org.apache.thrift.TBase<TCellVisibility, TCellVisibility._Fields>, java.io.Serializable, Cloneable, Comparable<TCellVisibility> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCellVisibility"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCellVisibility");
private static final org.apache.thrift.protocol.TField EXPRESSION_FIELD_DESC = new org.apache.thrift.protocol.TField("expression", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField EXPRESSION_FIELD_DESC = new org.apache.thrift.protocol.TField("expression", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -103,7 +107,7 @@ public class TCellVisibility implements org.apache.thrift.TBase<TCellVisibility,
} }
// isset id assignments // isset id assignments
private _Fields optionals[] = {_Fields.EXPRESSION}; private static final _Fields optionals[] = {_Fields.EXPRESSION};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -220,30 +224,30 @@ public class TCellVisibility implements org.apache.thrift.TBase<TCellVisibility,
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_expression = true && (isSetExpression()); boolean present_expression = true && (isSetExpression());
builder.append(present_expression); list.add(present_expression);
if (present_expression) if (present_expression)
builder.append(expression); list.add(expression);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TCellVisibility other) { public int compareTo(TCellVisibility other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TCellVisibility typedOther = (TCellVisibility)other;
lastComparison = Boolean.valueOf(isSetExpression()).compareTo(typedOther.isSetExpression()); lastComparison = Boolean.valueOf(isSetExpression()).compareTo(other.isSetExpression());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetExpression()) { if (isSetExpression()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.expression, typedOther.expression); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.expression, other.expression);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }

60
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumn.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,15 +29,18 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* Addresses a single cell or multiple cells * Addresses a single cell or multiple cells
* in a HBase table by column family and optionally * in a HBase table by column family and optionally
* a column qualifier and timestamp * a column qualifier and timestamp
*/ */
public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields>, java.io.Serializable, Cloneable, Comparable<TColumn> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumn"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumn");
private static final org.apache.thrift.protocol.TField FAMILY_FIELD_DESC = new org.apache.thrift.protocol.TField("family", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField FAMILY_FIELD_DESC = new org.apache.thrift.protocol.TField("family", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -120,7 +124,7 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
// isset id assignments // isset id assignments
private static final int __TIMESTAMP_ISSET_ID = 0; private static final int __TIMESTAMP_ISSET_ID = 0;
private byte __isset_bitfield = 0; private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.QUALIFIER,_Fields.TIMESTAMP}; private static final _Fields optionals[] = {_Fields.QUALIFIER,_Fields.TIMESTAMP};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -141,7 +145,7 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
ByteBuffer family) ByteBuffer family)
{ {
this(); this();
this.family = family; this.family = org.apache.thrift.TBaseHelper.copyBinary(family);
} }
/** /**
@ -151,11 +155,9 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
__isset_bitfield = other.__isset_bitfield; __isset_bitfield = other.__isset_bitfield;
if (other.isSetFamily()) { if (other.isSetFamily()) {
this.family = org.apache.thrift.TBaseHelper.copyBinary(other.family); this.family = org.apache.thrift.TBaseHelper.copyBinary(other.family);
;
} }
if (other.isSetQualifier()) { if (other.isSetQualifier()) {
this.qualifier = org.apache.thrift.TBaseHelper.copyBinary(other.qualifier); this.qualifier = org.apache.thrift.TBaseHelper.copyBinary(other.qualifier);
;
} }
this.timestamp = other.timestamp; this.timestamp = other.timestamp;
} }
@ -178,16 +180,16 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
} }
public ByteBuffer bufferForFamily() { public ByteBuffer bufferForFamily() {
return family; return org.apache.thrift.TBaseHelper.copyBinary(family);
} }
public TColumn setFamily(byte[] family) { public TColumn setFamily(byte[] family) {
setFamily(family == null ? (ByteBuffer)null : ByteBuffer.wrap(family)); this.family = family == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(family, family.length));
return this; return this;
} }
public TColumn setFamily(ByteBuffer family) { public TColumn setFamily(ByteBuffer family) {
this.family = family; this.family = org.apache.thrift.TBaseHelper.copyBinary(family);
return this; return this;
} }
@ -212,16 +214,16 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
} }
public ByteBuffer bufferForQualifier() { public ByteBuffer bufferForQualifier() {
return qualifier; return org.apache.thrift.TBaseHelper.copyBinary(qualifier);
} }
public TColumn setQualifier(byte[] qualifier) { public TColumn setQualifier(byte[] qualifier) {
setQualifier(qualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(qualifier)); this.qualifier = qualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(qualifier, qualifier.length));
return this; return this;
} }
public TColumn setQualifier(ByteBuffer qualifier) { public TColumn setQualifier(ByteBuffer qualifier) {
this.qualifier = qualifier; this.qualifier = org.apache.thrift.TBaseHelper.copyBinary(qualifier);
return this; return this;
} }
@ -301,7 +303,7 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
return getQualifier(); return getQualifier();
case TIMESTAMP: case TIMESTAMP:
return Long.valueOf(getTimestamp()); return getTimestamp();
} }
throw new IllegalStateException(); throw new IllegalStateException();
@ -369,60 +371,60 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_family = true && (isSetFamily()); boolean present_family = true && (isSetFamily());
builder.append(present_family); list.add(present_family);
if (present_family) if (present_family)
builder.append(family); list.add(family);
boolean present_qualifier = true && (isSetQualifier()); boolean present_qualifier = true && (isSetQualifier());
builder.append(present_qualifier); list.add(present_qualifier);
if (present_qualifier) if (present_qualifier)
builder.append(qualifier); list.add(qualifier);
boolean present_timestamp = true && (isSetTimestamp()); boolean present_timestamp = true && (isSetTimestamp());
builder.append(present_timestamp); list.add(present_timestamp);
if (present_timestamp) if (present_timestamp)
builder.append(timestamp); list.add(timestamp);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TColumn other) { public int compareTo(TColumn other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TColumn typedOther = (TColumn)other;
lastComparison = Boolean.valueOf(isSetFamily()).compareTo(typedOther.isSetFamily()); lastComparison = Boolean.valueOf(isSetFamily()).compareTo(other.isSetFamily());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetFamily()) { if (isSetFamily()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.family, typedOther.family); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.family, other.family);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetQualifier()).compareTo(typedOther.isSetQualifier()); lastComparison = Boolean.valueOf(isSetQualifier()).compareTo(other.isSetQualifier());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetQualifier()) { if (isSetQualifier()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.qualifier, typedOther.qualifier); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.qualifier, other.qualifier);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp()); lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetTimestamp()) { if (isSetTimestamp()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }

62
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnIncrement.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,13 +29,16 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* Represents a single cell and the amount to increment it by * Represents a single cell and the amount to increment it by
*/ */
public class TColumnIncrement implements org.apache.thrift.TBase<TColumnIncrement, TColumnIncrement._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TColumnIncrement implements org.apache.thrift.TBase<TColumnIncrement, TColumnIncrement._Fields>, java.io.Serializable, Cloneable, Comparable<TColumnIncrement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumnIncrement"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumnIncrement");
private static final org.apache.thrift.protocol.TField FAMILY_FIELD_DESC = new org.apache.thrift.protocol.TField("family", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField FAMILY_FIELD_DESC = new org.apache.thrift.protocol.TField("family", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -118,7 +122,7 @@ public class TColumnIncrement implements org.apache.thrift.TBase<TColumnIncremen
// isset id assignments // isset id assignments
private static final int __AMOUNT_ISSET_ID = 0; private static final int __AMOUNT_ISSET_ID = 0;
private byte __isset_bitfield = 0; private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.AMOUNT}; private static final _Fields optionals[] = {_Fields.AMOUNT};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -142,8 +146,8 @@ public class TColumnIncrement implements org.apache.thrift.TBase<TColumnIncremen
ByteBuffer qualifier) ByteBuffer qualifier)
{ {
this(); this();
this.family = family; this.family = org.apache.thrift.TBaseHelper.copyBinary(family);
this.qualifier = qualifier; this.qualifier = org.apache.thrift.TBaseHelper.copyBinary(qualifier);
} }
/** /**
@ -153,11 +157,9 @@ public class TColumnIncrement implements org.apache.thrift.TBase<TColumnIncremen
__isset_bitfield = other.__isset_bitfield; __isset_bitfield = other.__isset_bitfield;
if (other.isSetFamily()) { if (other.isSetFamily()) {
this.family = org.apache.thrift.TBaseHelper.copyBinary(other.family); this.family = org.apache.thrift.TBaseHelper.copyBinary(other.family);
;
} }
if (other.isSetQualifier()) { if (other.isSetQualifier()) {
this.qualifier = org.apache.thrift.TBaseHelper.copyBinary(other.qualifier); this.qualifier = org.apache.thrift.TBaseHelper.copyBinary(other.qualifier);
;
} }
this.amount = other.amount; this.amount = other.amount;
} }
@ -180,16 +182,16 @@ public class TColumnIncrement implements org.apache.thrift.TBase<TColumnIncremen
} }
public ByteBuffer bufferForFamily() { public ByteBuffer bufferForFamily() {
return family; return org.apache.thrift.TBaseHelper.copyBinary(family);
} }
public TColumnIncrement setFamily(byte[] family) { public TColumnIncrement setFamily(byte[] family) {
setFamily(family == null ? (ByteBuffer)null : ByteBuffer.wrap(family)); this.family = family == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(family, family.length));
return this; return this;
} }
public TColumnIncrement setFamily(ByteBuffer family) { public TColumnIncrement setFamily(ByteBuffer family) {
this.family = family; this.family = org.apache.thrift.TBaseHelper.copyBinary(family);
return this; return this;
} }
@ -214,16 +216,16 @@ public class TColumnIncrement implements org.apache.thrift.TBase<TColumnIncremen
} }
public ByteBuffer bufferForQualifier() { public ByteBuffer bufferForQualifier() {
return qualifier; return org.apache.thrift.TBaseHelper.copyBinary(qualifier);
} }
public TColumnIncrement setQualifier(byte[] qualifier) { public TColumnIncrement setQualifier(byte[] qualifier) {
setQualifier(qualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(qualifier)); this.qualifier = qualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(qualifier, qualifier.length));
return this; return this;
} }
public TColumnIncrement setQualifier(ByteBuffer qualifier) { public TColumnIncrement setQualifier(ByteBuffer qualifier) {
this.qualifier = qualifier; this.qualifier = org.apache.thrift.TBaseHelper.copyBinary(qualifier);
return this; return this;
} }
@ -303,7 +305,7 @@ public class TColumnIncrement implements org.apache.thrift.TBase<TColumnIncremen
return getQualifier(); return getQualifier();
case AMOUNT: case AMOUNT:
return Long.valueOf(getAmount()); return getAmount();
} }
throw new IllegalStateException(); throw new IllegalStateException();
@ -371,60 +373,60 @@ public class TColumnIncrement implements org.apache.thrift.TBase<TColumnIncremen
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_family = true && (isSetFamily()); boolean present_family = true && (isSetFamily());
builder.append(present_family); list.add(present_family);
if (present_family) if (present_family)
builder.append(family); list.add(family);
boolean present_qualifier = true && (isSetQualifier()); boolean present_qualifier = true && (isSetQualifier());
builder.append(present_qualifier); list.add(present_qualifier);
if (present_qualifier) if (present_qualifier)
builder.append(qualifier); list.add(qualifier);
boolean present_amount = true && (isSetAmount()); boolean present_amount = true && (isSetAmount());
builder.append(present_amount); list.add(present_amount);
if (present_amount) if (present_amount)
builder.append(amount); list.add(amount);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TColumnIncrement other) { public int compareTo(TColumnIncrement other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TColumnIncrement typedOther = (TColumnIncrement)other;
lastComparison = Boolean.valueOf(isSetFamily()).compareTo(typedOther.isSetFamily()); lastComparison = Boolean.valueOf(isSetFamily()).compareTo(other.isSetFamily());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetFamily()) { if (isSetFamily()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.family, typedOther.family); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.family, other.family);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetQualifier()).compareTo(typedOther.isSetQualifier()); lastComparison = Boolean.valueOf(isSetQualifier()).compareTo(other.isSetQualifier());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetQualifier()) { if (isSetQualifier()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.qualifier, typedOther.qualifier); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.qualifier, other.qualifier);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetAmount()).compareTo(typedOther.isSetAmount()); lastComparison = Boolean.valueOf(isSetAmount()).compareTo(other.isSetAmount());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetAmount()) { if (isSetAmount()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.amount, typedOther.amount); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.amount, other.amount);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }

94
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,13 +29,16 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* Represents a single cell and its value. * Represents a single cell and its value.
*/ */
public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColumnValue._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColumnValue._Fields>, java.io.Serializable, Cloneable, Comparable<TColumnValue> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumnValue"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumnValue");
private static final org.apache.thrift.protocol.TField FAMILY_FIELD_DESC = new org.apache.thrift.protocol.TField("family", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField FAMILY_FIELD_DESC = new org.apache.thrift.protocol.TField("family", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -128,7 +132,7 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu
// isset id assignments // isset id assignments
private static final int __TIMESTAMP_ISSET_ID = 0; private static final int __TIMESTAMP_ISSET_ID = 0;
private byte __isset_bitfield = 0; private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.TIMESTAMP,_Fields.TAGS}; private static final _Fields optionals[] = {_Fields.TIMESTAMP,_Fields.TAGS};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -155,9 +159,9 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu
ByteBuffer value) ByteBuffer value)
{ {
this(); this();
this.family = family; this.family = org.apache.thrift.TBaseHelper.copyBinary(family);
this.qualifier = qualifier; this.qualifier = org.apache.thrift.TBaseHelper.copyBinary(qualifier);
this.value = value; this.value = org.apache.thrift.TBaseHelper.copyBinary(value);
} }
/** /**
@ -167,20 +171,16 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu
__isset_bitfield = other.__isset_bitfield; __isset_bitfield = other.__isset_bitfield;
if (other.isSetFamily()) { if (other.isSetFamily()) {
this.family = org.apache.thrift.TBaseHelper.copyBinary(other.family); this.family = org.apache.thrift.TBaseHelper.copyBinary(other.family);
;
} }
if (other.isSetQualifier()) { if (other.isSetQualifier()) {
this.qualifier = org.apache.thrift.TBaseHelper.copyBinary(other.qualifier); this.qualifier = org.apache.thrift.TBaseHelper.copyBinary(other.qualifier);
;
} }
if (other.isSetValue()) { if (other.isSetValue()) {
this.value = org.apache.thrift.TBaseHelper.copyBinary(other.value); this.value = org.apache.thrift.TBaseHelper.copyBinary(other.value);
;
} }
this.timestamp = other.timestamp; this.timestamp = other.timestamp;
if (other.isSetTags()) { if (other.isSetTags()) {
this.tags = org.apache.thrift.TBaseHelper.copyBinary(other.tags); this.tags = org.apache.thrift.TBaseHelper.copyBinary(other.tags);
;
} }
} }
@ -204,16 +204,16 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu
} }
public ByteBuffer bufferForFamily() { public ByteBuffer bufferForFamily() {
return family; return org.apache.thrift.TBaseHelper.copyBinary(family);
} }
public TColumnValue setFamily(byte[] family) { public TColumnValue setFamily(byte[] family) {
setFamily(family == null ? (ByteBuffer)null : ByteBuffer.wrap(family)); this.family = family == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(family, family.length));
return this; return this;
} }
public TColumnValue setFamily(ByteBuffer family) { public TColumnValue setFamily(ByteBuffer family) {
this.family = family; this.family = org.apache.thrift.TBaseHelper.copyBinary(family);
return this; return this;
} }
@ -238,16 +238,16 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu
} }
public ByteBuffer bufferForQualifier() { public ByteBuffer bufferForQualifier() {
return qualifier; return org.apache.thrift.TBaseHelper.copyBinary(qualifier);
} }
public TColumnValue setQualifier(byte[] qualifier) { public TColumnValue setQualifier(byte[] qualifier) {
setQualifier(qualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(qualifier)); this.qualifier = qualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(qualifier, qualifier.length));
return this; return this;
} }
public TColumnValue setQualifier(ByteBuffer qualifier) { public TColumnValue setQualifier(ByteBuffer qualifier) {
this.qualifier = qualifier; this.qualifier = org.apache.thrift.TBaseHelper.copyBinary(qualifier);
return this; return this;
} }
@ -272,16 +272,16 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu
} }
public ByteBuffer bufferForValue() { public ByteBuffer bufferForValue() {
return value; return org.apache.thrift.TBaseHelper.copyBinary(value);
} }
public TColumnValue setValue(byte[] value) { public TColumnValue setValue(byte[] value) {
setValue(value == null ? (ByteBuffer)null : ByteBuffer.wrap(value)); this.value = value == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(value, value.length));
return this; return this;
} }
public TColumnValue setValue(ByteBuffer value) { public TColumnValue setValue(ByteBuffer value) {
this.value = value; this.value = org.apache.thrift.TBaseHelper.copyBinary(value);
return this; return this;
} }
@ -329,16 +329,16 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu
} }
public ByteBuffer bufferForTags() { public ByteBuffer bufferForTags() {
return tags; return org.apache.thrift.TBaseHelper.copyBinary(tags);
} }
public TColumnValue setTags(byte[] tags) { public TColumnValue setTags(byte[] tags) {
setTags(tags == null ? (ByteBuffer)null : ByteBuffer.wrap(tags)); this.tags = tags == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(tags, tags.length));
return this; return this;
} }
public TColumnValue setTags(ByteBuffer tags) { public TColumnValue setTags(ByteBuffer tags) {
this.tags = tags; this.tags = org.apache.thrift.TBaseHelper.copyBinary(tags);
return this; return this;
} }
@ -414,7 +414,7 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu
return getValue(); return getValue();
case TIMESTAMP: case TIMESTAMP:
return Long.valueOf(getTimestamp()); return getTimestamp();
case TAGS: case TAGS:
return getTags(); return getTags();
@ -507,90 +507,90 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_family = true && (isSetFamily()); boolean present_family = true && (isSetFamily());
builder.append(present_family); list.add(present_family);
if (present_family) if (present_family)
builder.append(family); list.add(family);
boolean present_qualifier = true && (isSetQualifier()); boolean present_qualifier = true && (isSetQualifier());
builder.append(present_qualifier); list.add(present_qualifier);
if (present_qualifier) if (present_qualifier)
builder.append(qualifier); list.add(qualifier);
boolean present_value = true && (isSetValue()); boolean present_value = true && (isSetValue());
builder.append(present_value); list.add(present_value);
if (present_value) if (present_value)
builder.append(value); list.add(value);
boolean present_timestamp = true && (isSetTimestamp()); boolean present_timestamp = true && (isSetTimestamp());
builder.append(present_timestamp); list.add(present_timestamp);
if (present_timestamp) if (present_timestamp)
builder.append(timestamp); list.add(timestamp);
boolean present_tags = true && (isSetTags()); boolean present_tags = true && (isSetTags());
builder.append(present_tags); list.add(present_tags);
if (present_tags) if (present_tags)
builder.append(tags); list.add(tags);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TColumnValue other) { public int compareTo(TColumnValue other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TColumnValue typedOther = (TColumnValue)other;
lastComparison = Boolean.valueOf(isSetFamily()).compareTo(typedOther.isSetFamily()); lastComparison = Boolean.valueOf(isSetFamily()).compareTo(other.isSetFamily());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetFamily()) { if (isSetFamily()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.family, typedOther.family); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.family, other.family);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetQualifier()).compareTo(typedOther.isSetQualifier()); lastComparison = Boolean.valueOf(isSetQualifier()).compareTo(other.isSetQualifier());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetQualifier()) { if (isSetQualifier()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.qualifier, typedOther.qualifier); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.qualifier, other.qualifier);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetValue()).compareTo(typedOther.isSetValue()); lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetValue()) { if (isSetValue()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, typedOther.value); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp()); lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetTimestamp()) { if (isSetTimestamp()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetTags()).compareTo(typedOther.isSetTags()); lastComparison = Boolean.valueOf(isSetTags()).compareTo(other.isSetTags());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetTags()) { if (isSetTags()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tags, typedOther.tags); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tags, other.tags);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }

146
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDelete.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,9 +29,11 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* Used to perform Delete operations on a single row. * Used to perform Delete operations on a single row.
* *
@ -57,7 +60,8 @@ import org.slf4j.LoggerFactory;
* by changing the durability. If you don't provide durability, it defaults to * by changing the durability. If you don't provide durability, it defaults to
* column family's default setting for durability. * column family's default setting for durability.
*/ */
public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields>, java.io.Serializable, Cloneable, Comparable<TDelete> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDelete"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDelete");
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)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)1);
@ -172,7 +176,7 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
// isset id assignments // isset id assignments
private static final int __TIMESTAMP_ISSET_ID = 0; private static final int __TIMESTAMP_ISSET_ID = 0;
private byte __isset_bitfield = 0; private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.COLUMNS,_Fields.TIMESTAMP,_Fields.DELETE_TYPE,_Fields.ATTRIBUTES,_Fields.DURABILITY}; private static final _Fields optionals[] = {_Fields.COLUMNS,_Fields.TIMESTAMP,_Fields.DELETE_TYPE,_Fields.ATTRIBUTES,_Fields.DURABILITY};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -204,7 +208,7 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
ByteBuffer row) ByteBuffer row)
{ {
this(); this();
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
} }
/** /**
@ -214,10 +218,9 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
__isset_bitfield = other.__isset_bitfield; __isset_bitfield = other.__isset_bitfield;
if (other.isSetRow()) { if (other.isSetRow()) {
this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row); this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
;
} }
if (other.isSetColumns()) { if (other.isSetColumns()) {
List<TColumn> __this__columns = new ArrayList<TColumn>(); List<TColumn> __this__columns = new ArrayList<TColumn>(other.columns.size());
for (TColumn other_element : other.columns) { for (TColumn other_element : other.columns) {
__this__columns.add(new TColumn(other_element)); __this__columns.add(new TColumn(other_element));
} }
@ -228,20 +231,7 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
this.deleteType = other.deleteType; this.deleteType = other.deleteType;
} }
if (other.isSetAttributes()) { if (other.isSetAttributes()) {
Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(); Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(other.attributes);
for (Map.Entry<ByteBuffer, ByteBuffer> other_element : other.attributes.entrySet()) {
ByteBuffer other_element_key = other_element.getKey();
ByteBuffer other_element_value = other_element.getValue();
ByteBuffer __this__attributes_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key);
;
ByteBuffer __this__attributes_copy_value = org.apache.thrift.TBaseHelper.copyBinary(other_element_value);
;
__this__attributes.put(__this__attributes_copy_key, __this__attributes_copy_value);
}
this.attributes = __this__attributes; this.attributes = __this__attributes;
} }
if (other.isSetDurability()) { if (other.isSetDurability()) {
@ -271,16 +261,16 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
} }
public ByteBuffer bufferForRow() { public ByteBuffer bufferForRow() {
return row; return org.apache.thrift.TBaseHelper.copyBinary(row);
} }
public TDelete setRow(byte[] row) { public TDelete setRow(byte[] row) {
setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length));
return this; return this;
} }
public TDelete setRow(ByteBuffer row) { public TDelete setRow(ByteBuffer row) {
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
return this; return this;
} }
@ -522,7 +512,7 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
return getColumns(); return getColumns();
case TIMESTAMP: case TIMESTAMP:
return Long.valueOf(getTimestamp()); return getTimestamp();
case DELETE_TYPE: case DELETE_TYPE:
return getDeleteType(); return getDeleteType();
@ -632,105 +622,105 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_row = true && (isSetRow()); boolean present_row = true && (isSetRow());
builder.append(present_row); list.add(present_row);
if (present_row) if (present_row)
builder.append(row); list.add(row);
boolean present_columns = true && (isSetColumns()); boolean present_columns = true && (isSetColumns());
builder.append(present_columns); list.add(present_columns);
if (present_columns) if (present_columns)
builder.append(columns); list.add(columns);
boolean present_timestamp = true && (isSetTimestamp()); boolean present_timestamp = true && (isSetTimestamp());
builder.append(present_timestamp); list.add(present_timestamp);
if (present_timestamp) if (present_timestamp)
builder.append(timestamp); list.add(timestamp);
boolean present_deleteType = true && (isSetDeleteType()); boolean present_deleteType = true && (isSetDeleteType());
builder.append(present_deleteType); list.add(present_deleteType);
if (present_deleteType) if (present_deleteType)
builder.append(deleteType.getValue()); list.add(deleteType.getValue());
boolean present_attributes = true && (isSetAttributes()); boolean present_attributes = true && (isSetAttributes());
builder.append(present_attributes); list.add(present_attributes);
if (present_attributes) if (present_attributes)
builder.append(attributes); list.add(attributes);
boolean present_durability = true && (isSetDurability()); boolean present_durability = true && (isSetDurability());
builder.append(present_durability); list.add(present_durability);
if (present_durability) if (present_durability)
builder.append(durability.getValue()); list.add(durability.getValue());
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TDelete other) { public int compareTo(TDelete other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TDelete typedOther = (TDelete)other;
lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetRow()) { if (isSetRow()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns()); lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetColumns()) { if (isSetColumns()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp()); lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetTimestamp()) { if (isSetTimestamp()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetDeleteType()).compareTo(typedOther.isSetDeleteType()); lastComparison = Boolean.valueOf(isSetDeleteType()).compareTo(other.isSetDeleteType());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetDeleteType()) { if (isSetDeleteType()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deleteType, typedOther.deleteType); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deleteType, other.deleteType);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes()); lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(other.isSetAttributes());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetAttributes()) { if (isSetAttributes()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, other.attributes);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetDurability()).compareTo(typedOther.isSetDurability()); lastComparison = Boolean.valueOf(isSetDurability()).compareTo(other.isSetDurability());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetDurability()) { if (isSetDurability()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, typedOther.durability); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, other.durability);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -869,12 +859,12 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
{ {
org.apache.thrift.protocol.TList _list52 = iprot.readListBegin(); org.apache.thrift.protocol.TList _list52 = iprot.readListBegin();
struct.columns = new ArrayList<TColumn>(_list52.size); struct.columns = new ArrayList<TColumn>(_list52.size);
for (int _i53 = 0; _i53 < _list52.size; ++_i53) TColumn _elem53;
for (int _i54 = 0; _i54 < _list52.size; ++_i54)
{ {
TColumn _elem54; // required _elem53 = new TColumn();
_elem54 = new TColumn(); _elem53.read(iprot);
_elem54.read(iprot); struct.columns.add(_elem53);
struct.columns.add(_elem54);
} }
iprot.readListEnd(); iprot.readListEnd();
} }
@ -893,7 +883,7 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
break; break;
case 4: // DELETE_TYPE case 4: // DELETE_TYPE
if (schemeField.type == org.apache.thrift.protocol.TType.I32) { if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.deleteType = TDeleteType.findByValue(iprot.readI32()); struct.deleteType = org.apache.hadoop.hbase.thrift2.generated.TDeleteType.findByValue(iprot.readI32());
struct.setDeleteTypeIsSet(true); struct.setDeleteTypeIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@ -904,13 +894,13 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
{ {
org.apache.thrift.protocol.TMap _map55 = iprot.readMapBegin(); org.apache.thrift.protocol.TMap _map55 = iprot.readMapBegin();
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map55.size); struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map55.size);
for (int _i56 = 0; _i56 < _map55.size; ++_i56) ByteBuffer _key56;
ByteBuffer _val57;
for (int _i58 = 0; _i58 < _map55.size; ++_i58)
{ {
ByteBuffer _key57; // required _key56 = iprot.readBinary();
ByteBuffer _val58; // required _val57 = iprot.readBinary();
_key57 = iprot.readBinary(); struct.attributes.put(_key56, _val57);
_val58 = iprot.readBinary();
struct.attributes.put(_key57, _val58);
} }
iprot.readMapEnd(); iprot.readMapEnd();
} }
@ -921,7 +911,7 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
break; break;
case 7: // DURABILITY case 7: // DURABILITY
if (schemeField.type == org.apache.thrift.protocol.TType.I32) { if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.durability = TDurability.findByValue(iprot.readI32()); struct.durability = org.apache.hadoop.hbase.thrift2.generated.TDurability.findByValue(iprot.readI32());
struct.setDurabilityIsSet(true); struct.setDurabilityIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@ -1070,12 +1060,12 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
{ {
org.apache.thrift.protocol.TList _list63 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); org.apache.thrift.protocol.TList _list63 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.columns = new ArrayList<TColumn>(_list63.size); struct.columns = new ArrayList<TColumn>(_list63.size);
for (int _i64 = 0; _i64 < _list63.size; ++_i64) TColumn _elem64;
for (int _i65 = 0; _i65 < _list63.size; ++_i65)
{ {
TColumn _elem65; // required _elem64 = new TColumn();
_elem65 = new TColumn(); _elem64.read(iprot);
_elem65.read(iprot); struct.columns.add(_elem64);
struct.columns.add(_elem65);
} }
} }
struct.setColumnsIsSet(true); struct.setColumnsIsSet(true);
@ -1085,26 +1075,26 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
struct.setTimestampIsSet(true); struct.setTimestampIsSet(true);
} }
if (incoming.get(2)) { if (incoming.get(2)) {
struct.deleteType = TDeleteType.findByValue(iprot.readI32()); struct.deleteType = org.apache.hadoop.hbase.thrift2.generated.TDeleteType.findByValue(iprot.readI32());
struct.setDeleteTypeIsSet(true); struct.setDeleteTypeIsSet(true);
} }
if (incoming.get(3)) { if (incoming.get(3)) {
{ {
org.apache.thrift.protocol.TMap _map66 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); org.apache.thrift.protocol.TMap _map66 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map66.size); struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map66.size);
for (int _i67 = 0; _i67 < _map66.size; ++_i67) ByteBuffer _key67;
ByteBuffer _val68;
for (int _i69 = 0; _i69 < _map66.size; ++_i69)
{ {
ByteBuffer _key68; // required _key67 = iprot.readBinary();
ByteBuffer _val69; // required _val68 = iprot.readBinary();
_key68 = iprot.readBinary(); struct.attributes.put(_key67, _val68);
_val69 = iprot.readBinary();
struct.attributes.put(_key68, _val69);
} }
} }
struct.setAttributesIsSet(true); struct.setAttributesIsSet(true);
} }
if (incoming.get(4)) { if (incoming.get(4)) {
struct.durability = TDurability.findByValue(iprot.readI32()); struct.durability = org.apache.hadoop.hbase.thrift2.generated.TDurability.findByValue(iprot.readI32());
struct.setDurabilityIsSet(true); struct.setDurabilityIsSet(true);
} }
} }

2
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDeleteType.java
View File

@ -1,5 +1,5 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated

2
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDurability.java
View File

@ -1,5 +1,5 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated

163
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,9 +29,11 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* Used to perform Get operations on a single row. * Used to perform Get operations on a single row.
* *
@ -44,7 +47,8 @@ import org.slf4j.LoggerFactory;
* If you specify a time range and a timestamp the range is ignored. * If you specify a time range and a timestamp the range is ignored.
* Timestamps on TColumns are ignored. * Timestamps on TColumns are ignored.
*/ */
public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.io.Serializable, Cloneable, Comparable<TGet> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGet"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGet");
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)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)1);
@ -154,7 +158,7 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
private static final int __TIMESTAMP_ISSET_ID = 0; private static final int __TIMESTAMP_ISSET_ID = 0;
private static final int __MAXVERSIONS_ISSET_ID = 1; private static final int __MAXVERSIONS_ISSET_ID = 1;
private byte __isset_bitfield = 0; private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.COLUMNS,_Fields.TIMESTAMP,_Fields.TIME_RANGE,_Fields.MAX_VERSIONS,_Fields.FILTER_STRING,_Fields.ATTRIBUTES,_Fields.AUTHORIZATIONS}; private static final _Fields optionals[] = {_Fields.COLUMNS,_Fields.TIMESTAMP,_Fields.TIME_RANGE,_Fields.MAX_VERSIONS,_Fields.FILTER_STRING,_Fields.ATTRIBUTES,_Fields.AUTHORIZATIONS};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -188,7 +192,7 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
ByteBuffer row) ByteBuffer row)
{ {
this(); this();
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
} }
/** /**
@ -198,10 +202,9 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
__isset_bitfield = other.__isset_bitfield; __isset_bitfield = other.__isset_bitfield;
if (other.isSetRow()) { if (other.isSetRow()) {
this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row); this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
;
} }
if (other.isSetColumns()) { if (other.isSetColumns()) {
List<TColumn> __this__columns = new ArrayList<TColumn>(); List<TColumn> __this__columns = new ArrayList<TColumn>(other.columns.size());
for (TColumn other_element : other.columns) { for (TColumn other_element : other.columns) {
__this__columns.add(new TColumn(other_element)); __this__columns.add(new TColumn(other_element));
} }
@ -214,23 +217,9 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
this.maxVersions = other.maxVersions; this.maxVersions = other.maxVersions;
if (other.isSetFilterString()) { if (other.isSetFilterString()) {
this.filterString = org.apache.thrift.TBaseHelper.copyBinary(other.filterString); this.filterString = org.apache.thrift.TBaseHelper.copyBinary(other.filterString);
;
} }
if (other.isSetAttributes()) { if (other.isSetAttributes()) {
Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(); Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(other.attributes);
for (Map.Entry<ByteBuffer, ByteBuffer> other_element : other.attributes.entrySet()) {
ByteBuffer other_element_key = other_element.getKey();
ByteBuffer other_element_value = other_element.getValue();
ByteBuffer __this__attributes_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key);
;
ByteBuffer __this__attributes_copy_value = org.apache.thrift.TBaseHelper.copyBinary(other_element_value);
;
__this__attributes.put(__this__attributes_copy_key, __this__attributes_copy_value);
}
this.attributes = __this__attributes; this.attributes = __this__attributes;
} }
if (other.isSetAuthorizations()) { if (other.isSetAuthorizations()) {
@ -262,16 +251,16 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
} }
public ByteBuffer bufferForRow() { public ByteBuffer bufferForRow() {
return row; return org.apache.thrift.TBaseHelper.copyBinary(row);
} }
public TGet setRow(byte[] row) { public TGet setRow(byte[] row) {
setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length));
return this; return this;
} }
public TGet setRow(ByteBuffer row) { public TGet setRow(ByteBuffer row) {
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
return this; return this;
} }
@ -405,16 +394,16 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
} }
public ByteBuffer bufferForFilterString() { public ByteBuffer bufferForFilterString() {
return filterString; return org.apache.thrift.TBaseHelper.copyBinary(filterString);
} }
public TGet setFilterString(byte[] filterString) { public TGet setFilterString(byte[] filterString) {
setFilterString(filterString == null ? (ByteBuffer)null : ByteBuffer.wrap(filterString)); this.filterString = filterString == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(filterString, filterString.length));
return this; return this;
} }
public TGet setFilterString(ByteBuffer filterString) { public TGet setFilterString(ByteBuffer filterString) {
this.filterString = filterString; this.filterString = org.apache.thrift.TBaseHelper.copyBinary(filterString);
return this; return this;
} }
@ -570,13 +559,13 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
return getColumns(); return getColumns();
case TIMESTAMP: case TIMESTAMP:
return Long.valueOf(getTimestamp()); return getTimestamp();
case TIME_RANGE: case TIME_RANGE:
return getTimeRange(); return getTimeRange();
case MAX_VERSIONS: case MAX_VERSIONS:
return Integer.valueOf(getMaxVersions()); return getMaxVersions();
case FILTER_STRING: case FILTER_STRING:
return getFilterString(); return getFilterString();
@ -708,135 +697,135 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_row = true && (isSetRow()); boolean present_row = true && (isSetRow());
builder.append(present_row); list.add(present_row);
if (present_row) if (present_row)
builder.append(row); list.add(row);
boolean present_columns = true && (isSetColumns()); boolean present_columns = true && (isSetColumns());
builder.append(present_columns); list.add(present_columns);
if (present_columns) if (present_columns)
builder.append(columns); list.add(columns);
boolean present_timestamp = true && (isSetTimestamp()); boolean present_timestamp = true && (isSetTimestamp());
builder.append(present_timestamp); list.add(present_timestamp);
if (present_timestamp) if (present_timestamp)
builder.append(timestamp); list.add(timestamp);
boolean present_timeRange = true && (isSetTimeRange()); boolean present_timeRange = true && (isSetTimeRange());
builder.append(present_timeRange); list.add(present_timeRange);
if (present_timeRange) if (present_timeRange)
builder.append(timeRange); list.add(timeRange);
boolean present_maxVersions = true && (isSetMaxVersions()); boolean present_maxVersions = true && (isSetMaxVersions());
builder.append(present_maxVersions); list.add(present_maxVersions);
if (present_maxVersions) if (present_maxVersions)
builder.append(maxVersions); list.add(maxVersions);
boolean present_filterString = true && (isSetFilterString()); boolean present_filterString = true && (isSetFilterString());
builder.append(present_filterString); list.add(present_filterString);
if (present_filterString) if (present_filterString)
builder.append(filterString); list.add(filterString);
boolean present_attributes = true && (isSetAttributes()); boolean present_attributes = true && (isSetAttributes());
builder.append(present_attributes); list.add(present_attributes);
if (present_attributes) if (present_attributes)
builder.append(attributes); list.add(attributes);
boolean present_authorizations = true && (isSetAuthorizations()); boolean present_authorizations = true && (isSetAuthorizations());
builder.append(present_authorizations); list.add(present_authorizations);
if (present_authorizations) if (present_authorizations)
builder.append(authorizations); list.add(authorizations);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TGet other) { public int compareTo(TGet other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TGet typedOther = (TGet)other;
lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetRow()) { if (isSetRow()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns()); lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetColumns()) { if (isSetColumns()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp()); lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetTimestamp()) { if (isSetTimestamp()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetTimeRange()).compareTo(typedOther.isSetTimeRange()); lastComparison = Boolean.valueOf(isSetTimeRange()).compareTo(other.isSetTimeRange());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetTimeRange()) { if (isSetTimeRange()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeRange, typedOther.timeRange); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeRange, other.timeRange);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetMaxVersions()).compareTo(typedOther.isSetMaxVersions()); lastComparison = Boolean.valueOf(isSetMaxVersions()).compareTo(other.isSetMaxVersions());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetMaxVersions()) { if (isSetMaxVersions()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxVersions, typedOther.maxVersions); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxVersions, other.maxVersions);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetFilterString()).compareTo(typedOther.isSetFilterString()); lastComparison = Boolean.valueOf(isSetFilterString()).compareTo(other.isSetFilterString());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetFilterString()) { if (isSetFilterString()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, typedOther.filterString); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, other.filterString);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes()); lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(other.isSetAttributes());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetAttributes()) { if (isSetAttributes()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, other.attributes);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(typedOther.isSetAuthorizations()); lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetAuthorizations()) { if (isSetAuthorizations()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, typedOther.authorizations); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, other.authorizations);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -997,12 +986,12 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
{ {
org.apache.thrift.protocol.TList _list16 = iprot.readListBegin(); org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
struct.columns = new ArrayList<TColumn>(_list16.size); struct.columns = new ArrayList<TColumn>(_list16.size);
for (int _i17 = 0; _i17 < _list16.size; ++_i17) TColumn _elem17;
for (int _i18 = 0; _i18 < _list16.size; ++_i18)
{ {
TColumn _elem18; // required _elem17 = new TColumn();
_elem18 = new TColumn(); _elem17.read(iprot);
_elem18.read(iprot); struct.columns.add(_elem17);
struct.columns.add(_elem18);
} }
iprot.readListEnd(); iprot.readListEnd();
} }
@ -1049,13 +1038,13 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
{ {
org.apache.thrift.protocol.TMap _map19 = iprot.readMapBegin(); org.apache.thrift.protocol.TMap _map19 = iprot.readMapBegin();
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map19.size); struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map19.size);
for (int _i20 = 0; _i20 < _map19.size; ++_i20) ByteBuffer _key20;
ByteBuffer _val21;
for (int _i22 = 0; _i22 < _map19.size; ++_i22)
{ {
ByteBuffer _key21; // required _key20 = iprot.readBinary();
ByteBuffer _val22; // required _val21 = iprot.readBinary();
_key21 = iprot.readBinary(); struct.attributes.put(_key20, _val21);
_val22 = iprot.readBinary();
struct.attributes.put(_key21, _val22);
} }
iprot.readMapEnd(); iprot.readMapEnd();
} }
@ -1240,12 +1229,12 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
{ {
org.apache.thrift.protocol.TList _list27 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); org.apache.thrift.protocol.TList _list27 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.columns = new ArrayList<TColumn>(_list27.size); struct.columns = new ArrayList<TColumn>(_list27.size);
for (int _i28 = 0; _i28 < _list27.size; ++_i28) TColumn _elem28;
for (int _i29 = 0; _i29 < _list27.size; ++_i29)
{ {
TColumn _elem29; // required _elem28 = new TColumn();
_elem29 = new TColumn(); _elem28.read(iprot);
_elem29.read(iprot); struct.columns.add(_elem28);
struct.columns.add(_elem29);
} }
} }
struct.setColumnsIsSet(true); struct.setColumnsIsSet(true);
@ -1271,13 +1260,13 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i
{ {
org.apache.thrift.protocol.TMap _map30 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); org.apache.thrift.protocol.TMap _map30 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map30.size); struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map30.size);
for (int _i31 = 0; _i31 < _map30.size; ++_i31) ByteBuffer _key31;
ByteBuffer _val32;
for (int _i33 = 0; _i33 < _map30.size; ++_i33)
{ {
ByteBuffer _key32; // required _key31 = iprot.readBinary();
ByteBuffer _val33; // required _val32 = iprot.readBinary();
_key32 = iprot.readBinary(); struct.attributes.put(_key31, _val32);
_val33 = iprot.readBinary();
struct.attributes.put(_key32, _val33);
} }
} }
struct.setAttributesIsSet(true); struct.setAttributesIsSet(true);

2508
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java
View File

File diff suppressed because it is too large Load Diff

105
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THRegionInfo.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,10 +29,13 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THRegionInfo._Fields>, java.io.Serializable, Cloneable { @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THRegionInfo._Fields>, java.io.Serializable, Cloneable, Comparable<THRegionInfo> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("THRegionInfo"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("THRegionInfo");
private static final org.apache.thrift.protocol.TField REGION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("regionId", org.apache.thrift.protocol.TType.I64, (short)1); private static final org.apache.thrift.protocol.TField REGION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("regionId", org.apache.thrift.protocol.TType.I64, (short)1);
@ -138,7 +142,7 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
private static final int __SPLIT_ISSET_ID = 2; private static final int __SPLIT_ISSET_ID = 2;
private static final int __REPLICAID_ISSET_ID = 3; private static final int __REPLICAID_ISSET_ID = 3;
private byte __isset_bitfield = 0; private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.START_KEY,_Fields.END_KEY,_Fields.OFFLINE,_Fields.SPLIT,_Fields.REPLICA_ID}; private static final _Fields optionals[] = {_Fields.START_KEY,_Fields.END_KEY,_Fields.OFFLINE,_Fields.SPLIT,_Fields.REPLICA_ID};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -170,7 +174,7 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
this(); this();
this.regionId = regionId; this.regionId = regionId;
setRegionIdIsSet(true); setRegionIdIsSet(true);
this.tableName = tableName; this.tableName = org.apache.thrift.TBaseHelper.copyBinary(tableName);
} }
/** /**
@ -181,15 +185,12 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
this.regionId = other.regionId; this.regionId = other.regionId;
if (other.isSetTableName()) { if (other.isSetTableName()) {
this.tableName = org.apache.thrift.TBaseHelper.copyBinary(other.tableName); this.tableName = org.apache.thrift.TBaseHelper.copyBinary(other.tableName);
;
} }
if (other.isSetStartKey()) { if (other.isSetStartKey()) {
this.startKey = org.apache.thrift.TBaseHelper.copyBinary(other.startKey); this.startKey = org.apache.thrift.TBaseHelper.copyBinary(other.startKey);
;
} }
if (other.isSetEndKey()) { if (other.isSetEndKey()) {
this.endKey = org.apache.thrift.TBaseHelper.copyBinary(other.endKey); this.endKey = org.apache.thrift.TBaseHelper.copyBinary(other.endKey);
;
} }
this.offline = other.offline; this.offline = other.offline;
this.split = other.split; this.split = other.split;
@ -244,16 +245,16 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
} }
public ByteBuffer bufferForTableName() { public ByteBuffer bufferForTableName() {
return tableName; return org.apache.thrift.TBaseHelper.copyBinary(tableName);
} }
public THRegionInfo setTableName(byte[] tableName) { public THRegionInfo setTableName(byte[] tableName) {
setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName)); this.tableName = tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(tableName, tableName.length));
return this; return this;
} }
public THRegionInfo setTableName(ByteBuffer tableName) { public THRegionInfo setTableName(ByteBuffer tableName) {
this.tableName = tableName; this.tableName = org.apache.thrift.TBaseHelper.copyBinary(tableName);
return this; return this;
} }
@ -278,16 +279,16 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
} }
public ByteBuffer bufferForStartKey() { public ByteBuffer bufferForStartKey() {
return startKey; return org.apache.thrift.TBaseHelper.copyBinary(startKey);
} }
public THRegionInfo setStartKey(byte[] startKey) { public THRegionInfo setStartKey(byte[] startKey) {
setStartKey(startKey == null ? (ByteBuffer)null : ByteBuffer.wrap(startKey)); this.startKey = startKey == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(startKey, startKey.length));
return this; return this;
} }
public THRegionInfo setStartKey(ByteBuffer startKey) { public THRegionInfo setStartKey(ByteBuffer startKey) {
this.startKey = startKey; this.startKey = org.apache.thrift.TBaseHelper.copyBinary(startKey);
return this; return this;
} }
@ -312,16 +313,16 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
} }
public ByteBuffer bufferForEndKey() { public ByteBuffer bufferForEndKey() {
return endKey; return org.apache.thrift.TBaseHelper.copyBinary(endKey);
} }
public THRegionInfo setEndKey(byte[] endKey) { public THRegionInfo setEndKey(byte[] endKey) {
setEndKey(endKey == null ? (ByteBuffer)null : ByteBuffer.wrap(endKey)); this.endKey = endKey == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(endKey, endKey.length));
return this; return this;
} }
public THRegionInfo setEndKey(ByteBuffer endKey) { public THRegionInfo setEndKey(ByteBuffer endKey) {
this.endKey = endKey; this.endKey = org.apache.thrift.TBaseHelper.copyBinary(endKey);
return this; return this;
} }
@ -473,7 +474,7 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
public Object getFieldValue(_Fields field) { public Object getFieldValue(_Fields field) {
switch (field) { switch (field) {
case REGION_ID: case REGION_ID:
return Long.valueOf(getRegionId()); return getRegionId();
case TABLE_NAME: case TABLE_NAME:
return getTableName(); return getTableName();
@ -485,13 +486,13 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
return getEndKey(); return getEndKey();
case OFFLINE: case OFFLINE:
return Boolean.valueOf(isOffline()); return isOffline();
case SPLIT: case SPLIT:
return Boolean.valueOf(isSplit()); return isSplit();
case REPLICA_ID: case REPLICA_ID:
return Integer.valueOf(getReplicaId()); return getReplicaId();
} }
throw new IllegalStateException(); throw new IllegalStateException();
@ -603,120 +604,120 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_regionId = true; boolean present_regionId = true;
builder.append(present_regionId); list.add(present_regionId);
if (present_regionId) if (present_regionId)
builder.append(regionId); list.add(regionId);
boolean present_tableName = true && (isSetTableName()); boolean present_tableName = true && (isSetTableName());
builder.append(present_tableName); list.add(present_tableName);
if (present_tableName) if (present_tableName)
builder.append(tableName); list.add(tableName);
boolean present_startKey = true && (isSetStartKey()); boolean present_startKey = true && (isSetStartKey());
builder.append(present_startKey); list.add(present_startKey);
if (present_startKey) if (present_startKey)
builder.append(startKey); list.add(startKey);
boolean present_endKey = true && (isSetEndKey()); boolean present_endKey = true && (isSetEndKey());
builder.append(present_endKey); list.add(present_endKey);
if (present_endKey) if (present_endKey)
builder.append(endKey); list.add(endKey);
boolean present_offline = true && (isSetOffline()); boolean present_offline = true && (isSetOffline());
builder.append(present_offline); list.add(present_offline);
if (present_offline) if (present_offline)
builder.append(offline); list.add(offline);
boolean present_split = true && (isSetSplit()); boolean present_split = true && (isSetSplit());
builder.append(present_split); list.add(present_split);
if (present_split) if (present_split)
builder.append(split); list.add(split);
boolean present_replicaId = true && (isSetReplicaId()); boolean present_replicaId = true && (isSetReplicaId());
builder.append(present_replicaId); list.add(present_replicaId);
if (present_replicaId) if (present_replicaId)
builder.append(replicaId); list.add(replicaId);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(THRegionInfo other) { public int compareTo(THRegionInfo other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
THRegionInfo typedOther = (THRegionInfo)other;
lastComparison = Boolean.valueOf(isSetRegionId()).compareTo(typedOther.isSetRegionId()); lastComparison = Boolean.valueOf(isSetRegionId()).compareTo(other.isSetRegionId());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetRegionId()) { if (isSetRegionId()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.regionId, typedOther.regionId); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.regionId, other.regionId);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetTableName()).compareTo(typedOther.isSetTableName()); lastComparison = Boolean.valueOf(isSetTableName()).compareTo(other.isSetTableName());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetTableName()) { if (isSetTableName()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, other.tableName);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetStartKey()).compareTo(typedOther.isSetStartKey()); lastComparison = Boolean.valueOf(isSetStartKey()).compareTo(other.isSetStartKey());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetStartKey()) { if (isSetStartKey()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startKey, typedOther.startKey); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startKey, other.startKey);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetEndKey()).compareTo(typedOther.isSetEndKey()); lastComparison = Boolean.valueOf(isSetEndKey()).compareTo(other.isSetEndKey());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetEndKey()) { if (isSetEndKey()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endKey, typedOther.endKey); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endKey, other.endKey);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetOffline()).compareTo(typedOther.isSetOffline()); lastComparison = Boolean.valueOf(isSetOffline()).compareTo(other.isSetOffline());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetOffline()) { if (isSetOffline()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.offline, typedOther.offline); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.offline, other.offline);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetSplit()).compareTo(typedOther.isSetSplit()); lastComparison = Boolean.valueOf(isSetSplit()).compareTo(other.isSetSplit());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetSplit()) { if (isSetSplit()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.split, typedOther.split); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.split, other.split);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetReplicaId()).compareTo(typedOther.isSetReplicaId()); lastComparison = Boolean.valueOf(isSetReplicaId()).compareTo(other.isSetReplicaId());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetReplicaId()) { if (isSetReplicaId()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replicaId, typedOther.replicaId); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replicaId, other.replicaId);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }

32
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THRegionLocation.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,10 +29,13 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class THRegionLocation implements org.apache.thrift.TBase<THRegionLocation, THRegionLocation._Fields>, java.io.Serializable, Cloneable { @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class THRegionLocation implements org.apache.thrift.TBase<THRegionLocation, THRegionLocation._Fields>, java.io.Serializable, Cloneable, Comparable<THRegionLocation> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("THRegionLocation"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("THRegionLocation");
private static final org.apache.thrift.protocol.TField SERVER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("serverName", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField SERVER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("serverName", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@ -285,45 +289,45 @@ public class THRegionLocation implements org.apache.thrift.TBase<THRegionLocatio
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_serverName = true && (isSetServerName()); boolean present_serverName = true && (isSetServerName());
builder.append(present_serverName); list.add(present_serverName);
if (present_serverName) if (present_serverName)
builder.append(serverName); list.add(serverName);
boolean present_regionInfo = true && (isSetRegionInfo()); boolean present_regionInfo = true && (isSetRegionInfo());
builder.append(present_regionInfo); list.add(present_regionInfo);
if (present_regionInfo) if (present_regionInfo)
builder.append(regionInfo); list.add(regionInfo);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(THRegionLocation other) { public int compareTo(THRegionLocation other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
THRegionLocation typedOther = (THRegionLocation)other;
lastComparison = Boolean.valueOf(isSetServerName()).compareTo(typedOther.isSetServerName()); lastComparison = Boolean.valueOf(isSetServerName()).compareTo(other.isSetServerName());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetServerName()) { if (isSetServerName()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverName, typedOther.serverName); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverName, other.serverName);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetRegionInfo()).compareTo(typedOther.isSetRegionInfo()); lastComparison = Boolean.valueOf(isSetRegionInfo()).compareTo(other.isSetRegionInfo());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetRegionInfo()) { if (isSetRegionInfo()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.regionInfo, typedOther.regionInfo); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.regionInfo, other.regionInfo);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }

26
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,15 +29,18 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* A TIOError exception signals that an error occurred communicating * A TIOError exception signals that an error occurred communicating
* to the HBase master or a HBase region server. Also used to return * to the HBase master or a HBase region server. Also used to return
* more general HBase error conditions. * more general HBase error conditions.
*/ */
public class TIOError extends TException implements org.apache.thrift.TBase<TIOError, TIOError._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TIOError extends TException implements org.apache.thrift.TBase<TIOError, TIOError._Fields>, java.io.Serializable, Cloneable, Comparable<TIOError> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIOError"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIOError");
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); 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);
@ -108,7 +112,7 @@ public class TIOError extends TException implements org.apache.thrift.TBase<TIOE
} }
// isset id assignments // isset id assignments
private _Fields optionals[] = {_Fields.MESSAGE}; private static final _Fields optionals[] = {_Fields.MESSAGE};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -225,30 +229,30 @@ public class TIOError extends TException implements org.apache.thrift.TBase<TIOE
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_message = true && (isSetMessage()); boolean present_message = true && (isSetMessage());
builder.append(present_message); list.add(present_message);
if (present_message) if (present_message)
builder.append(message); list.add(message);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TIOError other) { public int compareTo(TIOError other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TIOError typedOther = (TIOError)other;
lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage()); lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetMessage()) { if (isSetMessage()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }

26
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIllegalArgument.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,14 +29,17 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* A TIllegalArgument exception indicates an illegal or invalid * A TIllegalArgument exception indicates an illegal or invalid
* argument was passed into a procedure. * argument was passed into a procedure.
*/ */
public class TIllegalArgument extends TException implements org.apache.thrift.TBase<TIllegalArgument, TIllegalArgument._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TIllegalArgument extends TException implements org.apache.thrift.TBase<TIllegalArgument, TIllegalArgument._Fields>, java.io.Serializable, Cloneable, Comparable<TIllegalArgument> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIllegalArgument"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIllegalArgument");
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); 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);
@ -107,7 +111,7 @@ public class TIllegalArgument extends TException implements org.apache.thrift.TB
} }
// isset id assignments // isset id assignments
private _Fields optionals[] = {_Fields.MESSAGE}; private static final _Fields optionals[] = {_Fields.MESSAGE};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -224,30 +228,30 @@ public class TIllegalArgument extends TException implements org.apache.thrift.TB
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_message = true && (isSetMessage()); boolean present_message = true && (isSetMessage());
builder.append(present_message); list.add(present_message);
if (present_message) if (present_message)
builder.append(message); list.add(message);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TIllegalArgument other) { public int compareTo(TIllegalArgument other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TIllegalArgument typedOther = (TIllegalArgument)other;
lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage()); lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetMessage()) { if (isSetMessage()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }

132
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,9 +29,11 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* Used to perform Increment operations for a single row. * Used to perform Increment operations for a single row.
* *
@ -38,7 +41,8 @@ import org.slf4j.LoggerFactory;
* by changing the durability. If you don't provide durability, it defaults to * by changing the durability. If you don't provide durability, it defaults to
* column family's default setting for durability. * column family's default setting for durability.
*/ */
public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncrement._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncrement._Fields>, java.io.Serializable, Cloneable, Comparable<TIncrement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIncrement"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIncrement");
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)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)1);
@ -138,7 +142,7 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
} }
// isset id assignments // isset id assignments
private _Fields optionals[] = {_Fields.ATTRIBUTES,_Fields.DURABILITY,_Fields.CELL_VISIBILITY}; private static final _Fields optionals[] = {_Fields.ATTRIBUTES,_Fields.DURABILITY,_Fields.CELL_VISIBILITY};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -167,7 +171,7 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
List<TColumnIncrement> columns) List<TColumnIncrement> columns)
{ {
this(); this();
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
this.columns = columns; this.columns = columns;
} }
@ -177,30 +181,16 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
public TIncrement(TIncrement other) { public TIncrement(TIncrement other) {
if (other.isSetRow()) { if (other.isSetRow()) {
this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row); this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
;
} }
if (other.isSetColumns()) { if (other.isSetColumns()) {
List<TColumnIncrement> __this__columns = new ArrayList<TColumnIncrement>(); List<TColumnIncrement> __this__columns = new ArrayList<TColumnIncrement>(other.columns.size());
for (TColumnIncrement other_element : other.columns) { for (TColumnIncrement other_element : other.columns) {
__this__columns.add(new TColumnIncrement(other_element)); __this__columns.add(new TColumnIncrement(other_element));
} }
this.columns = __this__columns; this.columns = __this__columns;
} }
if (other.isSetAttributes()) { if (other.isSetAttributes()) {
Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(); Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(other.attributes);
for (Map.Entry<ByteBuffer, ByteBuffer> other_element : other.attributes.entrySet()) {
ByteBuffer other_element_key = other_element.getKey();
ByteBuffer other_element_value = other_element.getValue();
ByteBuffer __this__attributes_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key);
;
ByteBuffer __this__attributes_copy_value = org.apache.thrift.TBaseHelper.copyBinary(other_element_value);
;
__this__attributes.put(__this__attributes_copy_key, __this__attributes_copy_value);
}
this.attributes = __this__attributes; this.attributes = __this__attributes;
} }
if (other.isSetDurability()) { if (other.isSetDurability()) {
@ -230,16 +220,16 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
} }
public ByteBuffer bufferForRow() { public ByteBuffer bufferForRow() {
return row; return org.apache.thrift.TBaseHelper.copyBinary(row);
} }
public TIncrement setRow(byte[] row) { public TIncrement setRow(byte[] row) {
setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length));
return this; return this;
} }
public TIncrement setRow(ByteBuffer row) { public TIncrement setRow(ByteBuffer row) {
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
return this; return this;
} }
@ -538,90 +528,90 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_row = true && (isSetRow()); boolean present_row = true && (isSetRow());
builder.append(present_row); list.add(present_row);
if (present_row) if (present_row)
builder.append(row); list.add(row);
boolean present_columns = true && (isSetColumns()); boolean present_columns = true && (isSetColumns());
builder.append(present_columns); list.add(present_columns);
if (present_columns) if (present_columns)
builder.append(columns); list.add(columns);
boolean present_attributes = true && (isSetAttributes()); boolean present_attributes = true && (isSetAttributes());
builder.append(present_attributes); list.add(present_attributes);
if (present_attributes) if (present_attributes)
builder.append(attributes); list.add(attributes);
boolean present_durability = true && (isSetDurability()); boolean present_durability = true && (isSetDurability());
builder.append(present_durability); list.add(present_durability);
if (present_durability) if (present_durability)
builder.append(durability.getValue()); list.add(durability.getValue());
boolean present_cellVisibility = true && (isSetCellVisibility()); boolean present_cellVisibility = true && (isSetCellVisibility());
builder.append(present_cellVisibility); list.add(present_cellVisibility);
if (present_cellVisibility) if (present_cellVisibility)
builder.append(cellVisibility); list.add(cellVisibility);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TIncrement other) { public int compareTo(TIncrement other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TIncrement typedOther = (TIncrement)other;
lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetRow()) { if (isSetRow()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns()); lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetColumns()) { if (isSetColumns()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes()); lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(other.isSetAttributes());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetAttributes()) { if (isSetAttributes()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, other.attributes);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetDurability()).compareTo(typedOther.isSetDurability()); lastComparison = Boolean.valueOf(isSetDurability()).compareTo(other.isSetDurability());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetDurability()) { if (isSetDurability()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, typedOther.durability); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, other.durability);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetCellVisibility()).compareTo(typedOther.isSetCellVisibility()); lastComparison = Boolean.valueOf(isSetCellVisibility()).compareTo(other.isSetCellVisibility());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetCellVisibility()) { if (isSetCellVisibility()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cellVisibility, typedOther.cellVisibility); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cellVisibility, other.cellVisibility);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -756,12 +746,12 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
{ {
org.apache.thrift.protocol.TList _list70 = iprot.readListBegin(); org.apache.thrift.protocol.TList _list70 = iprot.readListBegin();
struct.columns = new ArrayList<TColumnIncrement>(_list70.size); struct.columns = new ArrayList<TColumnIncrement>(_list70.size);
for (int _i71 = 0; _i71 < _list70.size; ++_i71) TColumnIncrement _elem71;
for (int _i72 = 0; _i72 < _list70.size; ++_i72)
{ {
TColumnIncrement _elem72; // required _elem71 = new TColumnIncrement();
_elem72 = new TColumnIncrement(); _elem71.read(iprot);
_elem72.read(iprot); struct.columns.add(_elem71);
struct.columns.add(_elem72);
} }
iprot.readListEnd(); iprot.readListEnd();
} }
@ -775,13 +765,13 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
{ {
org.apache.thrift.protocol.TMap _map73 = iprot.readMapBegin(); org.apache.thrift.protocol.TMap _map73 = iprot.readMapBegin();
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map73.size); struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map73.size);
for (int _i74 = 0; _i74 < _map73.size; ++_i74) ByteBuffer _key74;
ByteBuffer _val75;
for (int _i76 = 0; _i76 < _map73.size; ++_i76)
{ {
ByteBuffer _key75; // required _key74 = iprot.readBinary();
ByteBuffer _val76; // required _val75 = iprot.readBinary();
_key75 = iprot.readBinary(); struct.attributes.put(_key74, _val75);
_val76 = iprot.readBinary();
struct.attributes.put(_key75, _val76);
} }
iprot.readMapEnd(); iprot.readMapEnd();
} }
@ -792,7 +782,7 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
break; break;
case 5: // DURABILITY case 5: // DURABILITY
if (schemeField.type == org.apache.thrift.protocol.TType.I32) { if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.durability = TDurability.findByValue(iprot.readI32()); struct.durability = org.apache.hadoop.hbase.thrift2.generated.TDurability.findByValue(iprot.readI32());
struct.setDurabilityIsSet(true); struct.setDurabilityIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@ -930,12 +920,12 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
{ {
org.apache.thrift.protocol.TList _list81 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); org.apache.thrift.protocol.TList _list81 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.columns = new ArrayList<TColumnIncrement>(_list81.size); struct.columns = new ArrayList<TColumnIncrement>(_list81.size);
for (int _i82 = 0; _i82 < _list81.size; ++_i82) TColumnIncrement _elem82;
for (int _i83 = 0; _i83 < _list81.size; ++_i83)
{ {
TColumnIncrement _elem83; // required _elem82 = new TColumnIncrement();
_elem83 = new TColumnIncrement(); _elem82.read(iprot);
_elem83.read(iprot); struct.columns.add(_elem82);
struct.columns.add(_elem83);
} }
} }
struct.setColumnsIsSet(true); struct.setColumnsIsSet(true);
@ -944,19 +934,19 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
{ {
org.apache.thrift.protocol.TMap _map84 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); org.apache.thrift.protocol.TMap _map84 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map84.size); struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map84.size);
for (int _i85 = 0; _i85 < _map84.size; ++_i85) ByteBuffer _key85;
ByteBuffer _val86;
for (int _i87 = 0; _i87 < _map84.size; ++_i87)
{ {
ByteBuffer _key86; // required _key85 = iprot.readBinary();
ByteBuffer _val87; // required _val86 = iprot.readBinary();
_key86 = iprot.readBinary(); struct.attributes.put(_key85, _val86);
_val87 = iprot.readBinary();
struct.attributes.put(_key86, _val87);
} }
} }
struct.setAttributesIsSet(true); struct.setAttributesIsSet(true);
} }
if (incoming.get(1)) { if (incoming.get(1)) {
struct.durability = TDurability.findByValue(iprot.readI32()); struct.durability = org.apache.hadoop.hbase.thrift2.generated.TDurability.findByValue(iprot.readI32());
struct.setDurabilityIsSet(true); struct.setDurabilityIsSet(true);
} }
if (incoming.get(2)) { if (incoming.get(2)) {

20
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TMutation.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,9 +29,11 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* Atomic mutation for the specified row. It can be either Put or Delete. * Atomic mutation for the specified row. It can be either Put or Delete.
*/ */
@ -186,6 +189,7 @@ public class TMutation extends org.apache.thrift.TUnion<TMutation, TMutation._Fi
throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!"); throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
} }
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
return null; return null;
} }
} }
@ -334,19 +338,19 @@ public class TMutation extends org.apache.thrift.TUnion<TMutation, TMutation._Fi
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder hcb = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
hcb.append(this.getClass().getName()); list.add(this.getClass().getName());
org.apache.thrift.TFieldIdEnum setField = getSetField(); org.apache.thrift.TFieldIdEnum setField = getSetField();
if (setField != null) { if (setField != null) {
hcb.append(setField.getThriftFieldId()); list.add(setField.getThriftFieldId());
Object value = getFieldValue(); Object value = getFieldValue();
if (value instanceof org.apache.thrift.TEnum) { if (value instanceof org.apache.thrift.TEnum) {
hcb.append(((org.apache.thrift.TEnum)getFieldValue()).getValue()); list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
} else { } else {
hcb.append(value); list.add(value);
} }
} }
return hcb.toHashCode(); return list.hashCode();
} }
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try { try {

142
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,9 +29,11 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* Used to perform Put operations for a single row. * Used to perform Put operations for a single row.
* *
@ -43,7 +46,8 @@ import org.slf4j.LoggerFactory;
* by changing the durability. If you don't provide durability, it defaults to * by changing the durability. If you don't provide durability, it defaults to
* column family's default setting for durability. * column family's default setting for durability.
*/ */
public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.io.Serializable, Cloneable, Comparable<TPut> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TPut"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TPut");
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)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)1);
@ -150,7 +154,7 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
// isset id assignments // isset id assignments
private static final int __TIMESTAMP_ISSET_ID = 0; private static final int __TIMESTAMP_ISSET_ID = 0;
private byte __isset_bitfield = 0; private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.TIMESTAMP,_Fields.ATTRIBUTES,_Fields.DURABILITY,_Fields.CELL_VISIBILITY}; private static final _Fields optionals[] = {_Fields.TIMESTAMP,_Fields.ATTRIBUTES,_Fields.DURABILITY,_Fields.CELL_VISIBILITY};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -181,7 +185,7 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
List<TColumnValue> columnValues) List<TColumnValue> columnValues)
{ {
this(); this();
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
this.columnValues = columnValues; this.columnValues = columnValues;
} }
@ -192,10 +196,9 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
__isset_bitfield = other.__isset_bitfield; __isset_bitfield = other.__isset_bitfield;
if (other.isSetRow()) { if (other.isSetRow()) {
this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row); this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
;
} }
if (other.isSetColumnValues()) { if (other.isSetColumnValues()) {
List<TColumnValue> __this__columnValues = new ArrayList<TColumnValue>(); List<TColumnValue> __this__columnValues = new ArrayList<TColumnValue>(other.columnValues.size());
for (TColumnValue other_element : other.columnValues) { for (TColumnValue other_element : other.columnValues) {
__this__columnValues.add(new TColumnValue(other_element)); __this__columnValues.add(new TColumnValue(other_element));
} }
@ -203,20 +206,7 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
} }
this.timestamp = other.timestamp; this.timestamp = other.timestamp;
if (other.isSetAttributes()) { if (other.isSetAttributes()) {
Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(); Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(other.attributes);
for (Map.Entry<ByteBuffer, ByteBuffer> other_element : other.attributes.entrySet()) {
ByteBuffer other_element_key = other_element.getKey();
ByteBuffer other_element_value = other_element.getValue();
ByteBuffer __this__attributes_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key);
;
ByteBuffer __this__attributes_copy_value = org.apache.thrift.TBaseHelper.copyBinary(other_element_value);
;
__this__attributes.put(__this__attributes_copy_key, __this__attributes_copy_value);
}
this.attributes = __this__attributes; this.attributes = __this__attributes;
} }
if (other.isSetDurability()) { if (other.isSetDurability()) {
@ -248,16 +238,16 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
} }
public ByteBuffer bufferForRow() { public ByteBuffer bufferForRow() {
return row; return org.apache.thrift.TBaseHelper.copyBinary(row);
} }
public TPut setRow(byte[] row) { public TPut setRow(byte[] row) {
setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length));
return this; return this;
} }
public TPut setRow(ByteBuffer row) { public TPut setRow(ByteBuffer row) {
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
return this; return this;
} }
@ -491,7 +481,7 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
return getColumnValues(); return getColumnValues();
case TIMESTAMP: case TIMESTAMP:
return Long.valueOf(getTimestamp()); return getTimestamp();
case ATTRIBUTES: case ATTRIBUTES:
return getAttributes(); return getAttributes();
@ -601,105 +591,105 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_row = true && (isSetRow()); boolean present_row = true && (isSetRow());
builder.append(present_row); list.add(present_row);
if (present_row) if (present_row)
builder.append(row); list.add(row);
boolean present_columnValues = true && (isSetColumnValues()); boolean present_columnValues = true && (isSetColumnValues());
builder.append(present_columnValues); list.add(present_columnValues);
if (present_columnValues) if (present_columnValues)
builder.append(columnValues); list.add(columnValues);
boolean present_timestamp = true && (isSetTimestamp()); boolean present_timestamp = true && (isSetTimestamp());
builder.append(present_timestamp); list.add(present_timestamp);
if (present_timestamp) if (present_timestamp)
builder.append(timestamp); list.add(timestamp);
boolean present_attributes = true && (isSetAttributes()); boolean present_attributes = true && (isSetAttributes());
builder.append(present_attributes); list.add(present_attributes);
if (present_attributes) if (present_attributes)
builder.append(attributes); list.add(attributes);
boolean present_durability = true && (isSetDurability()); boolean present_durability = true && (isSetDurability());
builder.append(present_durability); list.add(present_durability);
if (present_durability) if (present_durability)
builder.append(durability.getValue()); list.add(durability.getValue());
boolean present_cellVisibility = true && (isSetCellVisibility()); boolean present_cellVisibility = true && (isSetCellVisibility());
builder.append(present_cellVisibility); list.add(present_cellVisibility);
if (present_cellVisibility) if (present_cellVisibility)
builder.append(cellVisibility); list.add(cellVisibility);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TPut other) { public int compareTo(TPut other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TPut typedOther = (TPut)other;
lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetRow()) { if (isSetRow()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetColumnValues()).compareTo(typedOther.isSetColumnValues()); lastComparison = Boolean.valueOf(isSetColumnValues()).compareTo(other.isSetColumnValues());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetColumnValues()) { if (isSetColumnValues()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnValues, typedOther.columnValues); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnValues, other.columnValues);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp()); lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetTimestamp()) { if (isSetTimestamp()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes()); lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(other.isSetAttributes());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetAttributes()) { if (isSetAttributes()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, other.attributes);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetDurability()).compareTo(typedOther.isSetDurability()); lastComparison = Boolean.valueOf(isSetDurability()).compareTo(other.isSetDurability());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetDurability()) { if (isSetDurability()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, typedOther.durability); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, other.durability);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetCellVisibility()).compareTo(typedOther.isSetCellVisibility()); lastComparison = Boolean.valueOf(isSetCellVisibility()).compareTo(other.isSetCellVisibility());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetCellVisibility()) { if (isSetCellVisibility()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cellVisibility, typedOther.cellVisibility); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cellVisibility, other.cellVisibility);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -842,12 +832,12 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
{ {
org.apache.thrift.protocol.TList _list34 = iprot.readListBegin(); org.apache.thrift.protocol.TList _list34 = iprot.readListBegin();
struct.columnValues = new ArrayList<TColumnValue>(_list34.size); struct.columnValues = new ArrayList<TColumnValue>(_list34.size);
for (int _i35 = 0; _i35 < _list34.size; ++_i35) TColumnValue _elem35;
for (int _i36 = 0; _i36 < _list34.size; ++_i36)
{ {
TColumnValue _elem36; // required _elem35 = new TColumnValue();
_elem36 = new TColumnValue(); _elem35.read(iprot);
_elem36.read(iprot); struct.columnValues.add(_elem35);
struct.columnValues.add(_elem36);
} }
iprot.readListEnd(); iprot.readListEnd();
} }
@ -869,13 +859,13 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
{ {
org.apache.thrift.protocol.TMap _map37 = iprot.readMapBegin(); org.apache.thrift.protocol.TMap _map37 = iprot.readMapBegin();
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map37.size); struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map37.size);
for (int _i38 = 0; _i38 < _map37.size; ++_i38) ByteBuffer _key38;
ByteBuffer _val39;
for (int _i40 = 0; _i40 < _map37.size; ++_i40)
{ {
ByteBuffer _key39; // required _key38 = iprot.readBinary();
ByteBuffer _val40; // required _val39 = iprot.readBinary();
_key39 = iprot.readBinary(); struct.attributes.put(_key38, _val39);
_val40 = iprot.readBinary();
struct.attributes.put(_key39, _val40);
} }
iprot.readMapEnd(); iprot.readMapEnd();
} }
@ -886,7 +876,7 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
break; break;
case 6: // DURABILITY case 6: // DURABILITY
if (schemeField.type == org.apache.thrift.protocol.TType.I32) { if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.durability = TDurability.findByValue(iprot.readI32()); struct.durability = org.apache.hadoop.hbase.thrift2.generated.TDurability.findByValue(iprot.readI32());
struct.setDurabilityIsSet(true); struct.setDurabilityIsSet(true);
} else { } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@ -1035,12 +1025,12 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
{ {
org.apache.thrift.protocol.TList _list45 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); org.apache.thrift.protocol.TList _list45 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.columnValues = new ArrayList<TColumnValue>(_list45.size); struct.columnValues = new ArrayList<TColumnValue>(_list45.size);
for (int _i46 = 0; _i46 < _list45.size; ++_i46) TColumnValue _elem46;
for (int _i47 = 0; _i47 < _list45.size; ++_i47)
{ {
TColumnValue _elem47; // required _elem46 = new TColumnValue();
_elem47 = new TColumnValue(); _elem46.read(iprot);
_elem47.read(iprot); struct.columnValues.add(_elem46);
struct.columnValues.add(_elem47);
} }
} }
struct.setColumnValuesIsSet(true); struct.setColumnValuesIsSet(true);
@ -1053,19 +1043,19 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
{ {
org.apache.thrift.protocol.TMap _map48 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); org.apache.thrift.protocol.TMap _map48 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map48.size); struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map48.size);
for (int _i49 = 0; _i49 < _map48.size; ++_i49) ByteBuffer _key49;
ByteBuffer _val50;
for (int _i51 = 0; _i51 < _map48.size; ++_i51)
{ {
ByteBuffer _key50; // required _key49 = iprot.readBinary();
ByteBuffer _val51; // required _val50 = iprot.readBinary();
_key50 = iprot.readBinary(); struct.attributes.put(_key49, _val50);
_val51 = iprot.readBinary();
struct.attributes.put(_key50, _val51);
} }
} }
struct.setAttributesIsSet(true); struct.setAttributesIsSet(true);
} }
if (incoming.get(2)) { if (incoming.get(2)) {
struct.durability = TDurability.findByValue(iprot.readI32()); struct.durability = org.apache.hadoop.hbase.thrift2.generated.TDurability.findByValue(iprot.readI32());
struct.setDurabilityIsSet(true); struct.setDurabilityIsSet(true);
} }
if (incoming.get(3)) { if (incoming.get(3)) {

63
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,13 +29,16 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* if no Result is found, row and columnValues will not be set. * if no Result is found, row and columnValues will not be set.
*/ */
public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields>, java.io.Serializable, Cloneable, Comparable<TResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TResult"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TResult");
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)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)1);
@ -111,7 +115,7 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
} }
// isset id assignments // isset id assignments
private _Fields optionals[] = {_Fields.ROW}; private static final _Fields optionals[] = {_Fields.ROW};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -140,10 +144,9 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
public TResult(TResult other) { public TResult(TResult other) {
if (other.isSetRow()) { if (other.isSetRow()) {
this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row); this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
;
} }
if (other.isSetColumnValues()) { if (other.isSetColumnValues()) {
List<TColumnValue> __this__columnValues = new ArrayList<TColumnValue>(); List<TColumnValue> __this__columnValues = new ArrayList<TColumnValue>(other.columnValues.size());
for (TColumnValue other_element : other.columnValues) { for (TColumnValue other_element : other.columnValues) {
__this__columnValues.add(new TColumnValue(other_element)); __this__columnValues.add(new TColumnValue(other_element));
} }
@ -167,16 +170,16 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
} }
public ByteBuffer bufferForRow() { public ByteBuffer bufferForRow() {
return row; return org.apache.thrift.TBaseHelper.copyBinary(row);
} }
public TResult setRow(byte[] row) { public TResult setRow(byte[] row) {
setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length));
return this; return this;
} }
public TResult setRow(ByteBuffer row) { public TResult setRow(ByteBuffer row) {
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
return this; return this;
} }
@ -318,45 +321,45 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_row = true && (isSetRow()); boolean present_row = true && (isSetRow());
builder.append(present_row); list.add(present_row);
if (present_row) if (present_row)
builder.append(row); list.add(row);
boolean present_columnValues = true && (isSetColumnValues()); boolean present_columnValues = true && (isSetColumnValues());
builder.append(present_columnValues); list.add(present_columnValues);
if (present_columnValues) if (present_columnValues)
builder.append(columnValues); list.add(columnValues);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TResult other) { public int compareTo(TResult other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TResult typedOther = (TResult)other;
lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetRow()) { if (isSetRow()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetColumnValues()).compareTo(typedOther.isSetColumnValues()); lastComparison = Boolean.valueOf(isSetColumnValues()).compareTo(other.isSetColumnValues());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetColumnValues()) { if (isSetColumnValues()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnValues, typedOther.columnValues); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnValues, other.columnValues);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -457,12 +460,12 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
{ {
org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
struct.columnValues = new ArrayList<TColumnValue>(_list0.size); struct.columnValues = new ArrayList<TColumnValue>(_list0.size);
for (int _i1 = 0; _i1 < _list0.size; ++_i1) TColumnValue _elem1;
for (int _i2 = 0; _i2 < _list0.size; ++_i2)
{ {
TColumnValue _elem2; // required _elem1 = new TColumnValue();
_elem2 = new TColumnValue(); _elem1.read(iprot);
_elem2.read(iprot); struct.columnValues.add(_elem1);
struct.columnValues.add(_elem2);
} }
iprot.readListEnd(); iprot.readListEnd();
} }
@ -545,12 +548,12 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
{ {
org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.columnValues = new ArrayList<TColumnValue>(_list5.size); struct.columnValues = new ArrayList<TColumnValue>(_list5.size);
for (int _i6 = 0; _i6 < _list5.size; ++_i6) TColumnValue _elem6;
for (int _i7 = 0; _i7 < _list5.size; ++_i7)
{ {
TColumnValue _elem7; // required _elem6 = new TColumnValue();
_elem7 = new TColumnValue(); _elem6.read(iprot);
_elem7.read(iprot); struct.columnValues.add(_elem6);
struct.columnValues.add(_elem7);
} }
} }
struct.setColumnValuesIsSet(true); struct.setColumnValuesIsSet(true);

63
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TRowMutations.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,13 +29,16 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* A TRowMutations object is used to apply a number of Mutations to a single row. * A TRowMutations object is used to apply a number of Mutations to a single row.
*/ */
public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRowMutations._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRowMutations._Fields>, java.io.Serializable, Cloneable, Comparable<TRowMutations> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRowMutations"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRowMutations");
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)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)1);
@ -131,7 +135,7 @@ public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRo
List<TMutation> mutations) List<TMutation> mutations)
{ {
this(); this();
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
this.mutations = mutations; this.mutations = mutations;
} }
@ -141,10 +145,9 @@ public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRo
public TRowMutations(TRowMutations other) { public TRowMutations(TRowMutations other) {
if (other.isSetRow()) { if (other.isSetRow()) {
this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row); this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
;
} }
if (other.isSetMutations()) { if (other.isSetMutations()) {
List<TMutation> __this__mutations = new ArrayList<TMutation>(); List<TMutation> __this__mutations = new ArrayList<TMutation>(other.mutations.size());
for (TMutation other_element : other.mutations) { for (TMutation other_element : other.mutations) {
__this__mutations.add(new TMutation(other_element)); __this__mutations.add(new TMutation(other_element));
} }
@ -168,16 +171,16 @@ public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRo
} }
public ByteBuffer bufferForRow() { public ByteBuffer bufferForRow() {
return row; return org.apache.thrift.TBaseHelper.copyBinary(row);
} }
public TRowMutations setRow(byte[] row) { public TRowMutations setRow(byte[] row) {
setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length));
return this; return this;
} }
public TRowMutations setRow(ByteBuffer row) { public TRowMutations setRow(ByteBuffer row) {
this.row = row; this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
return this; return this;
} }
@ -319,45 +322,45 @@ public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRo
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_row = true && (isSetRow()); boolean present_row = true && (isSetRow());
builder.append(present_row); list.add(present_row);
if (present_row) if (present_row)
builder.append(row); list.add(row);
boolean present_mutations = true && (isSetMutations()); boolean present_mutations = true && (isSetMutations());
builder.append(present_mutations); list.add(present_mutations);
if (present_mutations) if (present_mutations)
builder.append(mutations); list.add(mutations);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TRowMutations other) { public int compareTo(TRowMutations other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TRowMutations typedOther = (TRowMutations)other;
lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetRow()) { if (isSetRow()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetMutations()).compareTo(typedOther.isSetMutations()); lastComparison = Boolean.valueOf(isSetMutations()).compareTo(other.isSetMutations());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetMutations()) { if (isSetMutations()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mutations, typedOther.mutations); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mutations, other.mutations);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -459,12 +462,12 @@ public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRo
{ {
org.apache.thrift.protocol.TList _list124 = iprot.readListBegin(); org.apache.thrift.protocol.TList _list124 = iprot.readListBegin();
struct.mutations = new ArrayList<TMutation>(_list124.size); struct.mutations = new ArrayList<TMutation>(_list124.size);
for (int _i125 = 0; _i125 < _list124.size; ++_i125) TMutation _elem125;
for (int _i126 = 0; _i126 < _list124.size; ++_i126)
{ {
TMutation _elem126; // required _elem125 = new TMutation();
_elem126 = new TMutation(); _elem125.read(iprot);
_elem126.read(iprot); struct.mutations.add(_elem125);
struct.mutations.add(_elem126);
} }
iprot.readListEnd(); iprot.readListEnd();
} }
@ -540,12 +543,12 @@ public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRo
{ {
org.apache.thrift.protocol.TList _list129 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); org.apache.thrift.protocol.TList _list129 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.mutations = new ArrayList<TMutation>(_list129.size); struct.mutations = new ArrayList<TMutation>(_list129.size);
for (int _i130 = 0; _i130 < _list129.size; ++_i130) TMutation _elem130;
for (int _i131 = 0; _i131 < _list129.size; ++_i131)
{ {
TMutation _elem131; // required _elem130 = new TMutation();
_elem131 = new TMutation(); _elem130.read(iprot);
_elem131.read(iprot); struct.mutations.add(_elem130);
struct.mutations.add(_elem131);
} }
} }
struct.setMutationsIsSet(true); struct.setMutationsIsSet(true);

196
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,14 +29,17 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
/** /**
* Any timestamps in the columns are ignored, use timeRange to select by timestamp. * Any timestamps in the columns are ignored, use timeRange to select by timestamp.
* Max versions defaults to 1. * Max versions defaults to 1.
*/ */
public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, java.io.Serializable, Cloneable { @Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, java.io.Serializable, Cloneable, Comparable<TScan> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TScan"); 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 START_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("startRow", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -162,7 +166,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
private static final int __BATCHSIZE_ISSET_ID = 2; private static final int __BATCHSIZE_ISSET_ID = 2;
private static final int __REVERSED_ISSET_ID = 3; private static final int __REVERSED_ISSET_ID = 3;
private byte __isset_bitfield = 0; private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.START_ROW,_Fields.STOP_ROW,_Fields.COLUMNS,_Fields.CACHING,_Fields.MAX_VERSIONS,_Fields.TIME_RANGE,_Fields.FILTER_STRING,_Fields.BATCH_SIZE,_Fields.ATTRIBUTES,_Fields.AUTHORIZATIONS,_Fields.REVERSED}; private static final _Fields optionals[] = {_Fields.START_ROW,_Fields.STOP_ROW,_Fields.COLUMNS,_Fields.CACHING,_Fields.MAX_VERSIONS,_Fields.TIME_RANGE,_Fields.FILTER_STRING,_Fields.BATCH_SIZE,_Fields.ATTRIBUTES,_Fields.AUTHORIZATIONS,_Fields.REVERSED};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -207,14 +211,12 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
__isset_bitfield = other.__isset_bitfield; __isset_bitfield = other.__isset_bitfield;
if (other.isSetStartRow()) { if (other.isSetStartRow()) {
this.startRow = org.apache.thrift.TBaseHelper.copyBinary(other.startRow); this.startRow = org.apache.thrift.TBaseHelper.copyBinary(other.startRow);
;
} }
if (other.isSetStopRow()) { if (other.isSetStopRow()) {
this.stopRow = org.apache.thrift.TBaseHelper.copyBinary(other.stopRow); this.stopRow = org.apache.thrift.TBaseHelper.copyBinary(other.stopRow);
;
} }
if (other.isSetColumns()) { if (other.isSetColumns()) {
List<TColumn> __this__columns = new ArrayList<TColumn>(); List<TColumn> __this__columns = new ArrayList<TColumn>(other.columns.size());
for (TColumn other_element : other.columns) { for (TColumn other_element : other.columns) {
__this__columns.add(new TColumn(other_element)); __this__columns.add(new TColumn(other_element));
} }
@ -227,24 +229,10 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
} }
if (other.isSetFilterString()) { if (other.isSetFilterString()) {
this.filterString = org.apache.thrift.TBaseHelper.copyBinary(other.filterString); this.filterString = org.apache.thrift.TBaseHelper.copyBinary(other.filterString);
;
} }
this.batchSize = other.batchSize; this.batchSize = other.batchSize;
if (other.isSetAttributes()) { if (other.isSetAttributes()) {
Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(); Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(other.attributes);
for (Map.Entry<ByteBuffer, ByteBuffer> other_element : other.attributes.entrySet()) {
ByteBuffer other_element_key = other_element.getKey();
ByteBuffer other_element_value = other_element.getValue();
ByteBuffer __this__attributes_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key);
;
ByteBuffer __this__attributes_copy_value = org.apache.thrift.TBaseHelper.copyBinary(other_element_value);
;
__this__attributes.put(__this__attributes_copy_key, __this__attributes_copy_value);
}
this.attributes = __this__attributes; this.attributes = __this__attributes;
} }
if (other.isSetAuthorizations()) { if (other.isSetAuthorizations()) {
@ -282,16 +270,16 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
} }
public ByteBuffer bufferForStartRow() { public ByteBuffer bufferForStartRow() {
return startRow; return org.apache.thrift.TBaseHelper.copyBinary(startRow);
} }
public TScan setStartRow(byte[] startRow) { public TScan setStartRow(byte[] startRow) {
setStartRow(startRow == null ? (ByteBuffer)null : ByteBuffer.wrap(startRow)); this.startRow = startRow == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(startRow, startRow.length));
return this; return this;
} }
public TScan setStartRow(ByteBuffer startRow) { public TScan setStartRow(ByteBuffer startRow) {
this.startRow = startRow; this.startRow = org.apache.thrift.TBaseHelper.copyBinary(startRow);
return this; return this;
} }
@ -316,16 +304,16 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
} }
public ByteBuffer bufferForStopRow() { public ByteBuffer bufferForStopRow() {
return stopRow; return org.apache.thrift.TBaseHelper.copyBinary(stopRow);
} }
public TScan setStopRow(byte[] stopRow) { public TScan setStopRow(byte[] stopRow) {
setStopRow(stopRow == null ? (ByteBuffer)null : ByteBuffer.wrap(stopRow)); this.stopRow = stopRow == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(stopRow, stopRow.length));
return this; return this;
} }
public TScan setStopRow(ByteBuffer stopRow) { public TScan setStopRow(ByteBuffer stopRow) {
this.stopRow = stopRow; this.stopRow = org.apache.thrift.TBaseHelper.copyBinary(stopRow);
return this; return this;
} }
@ -459,16 +447,16 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
} }
public ByteBuffer bufferForFilterString() { public ByteBuffer bufferForFilterString() {
return filterString; return org.apache.thrift.TBaseHelper.copyBinary(filterString);
} }
public TScan setFilterString(byte[] filterString) { public TScan setFilterString(byte[] filterString) {
setFilterString(filterString == null ? (ByteBuffer)null : ByteBuffer.wrap(filterString)); this.filterString = filterString == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(filterString, filterString.length));
return this; return this;
} }
public TScan setFilterString(ByteBuffer filterString) { public TScan setFilterString(ByteBuffer filterString) {
this.filterString = filterString; this.filterString = org.apache.thrift.TBaseHelper.copyBinary(filterString);
return this; return this;
} }
@ -697,10 +685,10 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
return getColumns(); return getColumns();
case CACHING: case CACHING:
return Integer.valueOf(getCaching()); return getCaching();
case MAX_VERSIONS: case MAX_VERSIONS:
return Integer.valueOf(getMaxVersions()); return getMaxVersions();
case TIME_RANGE: case TIME_RANGE:
return getTimeRange(); return getTimeRange();
@ -709,7 +697,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
return getFilterString(); return getFilterString();
case BATCH_SIZE: case BATCH_SIZE:
return Integer.valueOf(getBatchSize()); return getBatchSize();
case ATTRIBUTES: case ATTRIBUTES:
return getAttributes(); return getAttributes();
@ -718,7 +706,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
return getAuthorizations(); return getAuthorizations();
case REVERSED: case REVERSED:
return Boolean.valueOf(isReversed()); return isReversed();
} }
throw new IllegalStateException(); throw new IllegalStateException();
@ -874,180 +862,180 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_startRow = true && (isSetStartRow()); boolean present_startRow = true && (isSetStartRow());
builder.append(present_startRow); list.add(present_startRow);
if (present_startRow) if (present_startRow)
builder.append(startRow); list.add(startRow);
boolean present_stopRow = true && (isSetStopRow()); boolean present_stopRow = true && (isSetStopRow());
builder.append(present_stopRow); list.add(present_stopRow);
if (present_stopRow) if (present_stopRow)
builder.append(stopRow); list.add(stopRow);
boolean present_columns = true && (isSetColumns()); boolean present_columns = true && (isSetColumns());
builder.append(present_columns); list.add(present_columns);
if (present_columns) if (present_columns)
builder.append(columns); list.add(columns);
boolean present_caching = true && (isSetCaching()); boolean present_caching = true && (isSetCaching());
builder.append(present_caching); list.add(present_caching);
if (present_caching) if (present_caching)
builder.append(caching); list.add(caching);
boolean present_maxVersions = true && (isSetMaxVersions()); boolean present_maxVersions = true && (isSetMaxVersions());
builder.append(present_maxVersions); list.add(present_maxVersions);
if (present_maxVersions) if (present_maxVersions)
builder.append(maxVersions); list.add(maxVersions);
boolean present_timeRange = true && (isSetTimeRange()); boolean present_timeRange = true && (isSetTimeRange());
builder.append(present_timeRange); list.add(present_timeRange);
if (present_timeRange) if (present_timeRange)
builder.append(timeRange); list.add(timeRange);
boolean present_filterString = true && (isSetFilterString()); boolean present_filterString = true && (isSetFilterString());
builder.append(present_filterString); list.add(present_filterString);
if (present_filterString) if (present_filterString)
builder.append(filterString); list.add(filterString);
boolean present_batchSize = true && (isSetBatchSize()); boolean present_batchSize = true && (isSetBatchSize());
builder.append(present_batchSize); list.add(present_batchSize);
if (present_batchSize) if (present_batchSize)
builder.append(batchSize); list.add(batchSize);
boolean present_attributes = true && (isSetAttributes()); boolean present_attributes = true && (isSetAttributes());
builder.append(present_attributes); list.add(present_attributes);
if (present_attributes) if (present_attributes)
builder.append(attributes); list.add(attributes);
boolean present_authorizations = true && (isSetAuthorizations()); boolean present_authorizations = true && (isSetAuthorizations());
builder.append(present_authorizations); list.add(present_authorizations);
if (present_authorizations) if (present_authorizations)
builder.append(authorizations); list.add(authorizations);
boolean present_reversed = true && (isSetReversed()); boolean present_reversed = true && (isSetReversed());
builder.append(present_reversed); list.add(present_reversed);
if (present_reversed) if (present_reversed)
builder.append(reversed); list.add(reversed);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TScan other) { public int compareTo(TScan other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TScan typedOther = (TScan)other;
lastComparison = Boolean.valueOf(isSetStartRow()).compareTo(typedOther.isSetStartRow()); lastComparison = Boolean.valueOf(isSetStartRow()).compareTo(other.isSetStartRow());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetStartRow()) { if (isSetStartRow()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, typedOther.startRow); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, other.startRow);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetStopRow()).compareTo(typedOther.isSetStopRow()); lastComparison = Boolean.valueOf(isSetStopRow()).compareTo(other.isSetStopRow());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetStopRow()) { if (isSetStopRow()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopRow, typedOther.stopRow); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopRow, other.stopRow);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns()); lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetColumns()) { if (isSetColumns()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetCaching()).compareTo(typedOther.isSetCaching()); lastComparison = Boolean.valueOf(isSetCaching()).compareTo(other.isSetCaching());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetCaching()) { if (isSetCaching()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.caching, typedOther.caching); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.caching, other.caching);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetMaxVersions()).compareTo(typedOther.isSetMaxVersions()); lastComparison = Boolean.valueOf(isSetMaxVersions()).compareTo(other.isSetMaxVersions());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetMaxVersions()) { if (isSetMaxVersions()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxVersions, typedOther.maxVersions); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxVersions, other.maxVersions);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetTimeRange()).compareTo(typedOther.isSetTimeRange()); lastComparison = Boolean.valueOf(isSetTimeRange()).compareTo(other.isSetTimeRange());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetTimeRange()) { if (isSetTimeRange()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeRange, typedOther.timeRange); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeRange, other.timeRange);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetFilterString()).compareTo(typedOther.isSetFilterString()); lastComparison = Boolean.valueOf(isSetFilterString()).compareTo(other.isSetFilterString());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetFilterString()) { if (isSetFilterString()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, typedOther.filterString); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, other.filterString);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetBatchSize()).compareTo(typedOther.isSetBatchSize()); lastComparison = Boolean.valueOf(isSetBatchSize()).compareTo(other.isSetBatchSize());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetBatchSize()) { if (isSetBatchSize()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.batchSize, typedOther.batchSize); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.batchSize, other.batchSize);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes()); lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(other.isSetAttributes());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetAttributes()) { if (isSetAttributes()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, other.attributes);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(typedOther.isSetAuthorizations()); lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetAuthorizations()) { if (isSetAuthorizations()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, typedOther.authorizations); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, other.authorizations);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetReversed()).compareTo(typedOther.isSetReversed()); lastComparison = Boolean.valueOf(isSetReversed()).compareTo(other.isSetReversed());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetReversed()) { if (isSetReversed()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reversed, typedOther.reversed); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reversed, other.reversed);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
@ -1237,12 +1225,12 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
{ {
org.apache.thrift.protocol.TList _list106 = iprot.readListBegin(); org.apache.thrift.protocol.TList _list106 = iprot.readListBegin();
struct.columns = new ArrayList<TColumn>(_list106.size); struct.columns = new ArrayList<TColumn>(_list106.size);
for (int _i107 = 0; _i107 < _list106.size; ++_i107) TColumn _elem107;
for (int _i108 = 0; _i108 < _list106.size; ++_i108)
{ {
TColumn _elem108; // required _elem107 = new TColumn();
_elem108 = new TColumn(); _elem107.read(iprot);
_elem108.read(iprot); struct.columns.add(_elem107);
struct.columns.add(_elem108);
} }
iprot.readListEnd(); iprot.readListEnd();
} }
@ -1297,13 +1285,13 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
{ {
org.apache.thrift.protocol.TMap _map109 = iprot.readMapBegin(); org.apache.thrift.protocol.TMap _map109 = iprot.readMapBegin();
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map109.size); struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map109.size);
for (int _i110 = 0; _i110 < _map109.size; ++_i110) ByteBuffer _key110;
ByteBuffer _val111;
for (int _i112 = 0; _i112 < _map109.size; ++_i112)
{ {
ByteBuffer _key111; // required _key110 = iprot.readBinary();
ByteBuffer _val112; // required _val111 = iprot.readBinary();
_key111 = iprot.readBinary(); struct.attributes.put(_key110, _val111);
_val112 = iprot.readBinary();
struct.attributes.put(_key111, _val112);
} }
iprot.readMapEnd(); iprot.readMapEnd();
} }
@ -1544,12 +1532,12 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
{ {
org.apache.thrift.protocol.TList _list117 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); org.apache.thrift.protocol.TList _list117 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.columns = new ArrayList<TColumn>(_list117.size); struct.columns = new ArrayList<TColumn>(_list117.size);
for (int _i118 = 0; _i118 < _list117.size; ++_i118) TColumn _elem118;
for (int _i119 = 0; _i119 < _list117.size; ++_i119)
{ {
TColumn _elem119; // required _elem118 = new TColumn();
_elem119 = new TColumn(); _elem118.read(iprot);
_elem119.read(iprot); struct.columns.add(_elem118);
struct.columns.add(_elem119);
} }
} }
struct.setColumnsIsSet(true); struct.setColumnsIsSet(true);
@ -1579,13 +1567,13 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, jav
{ {
org.apache.thrift.protocol.TMap _map120 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); org.apache.thrift.protocol.TMap _map120 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map120.size); struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map120.size);
for (int _i121 = 0; _i121 < _map120.size; ++_i121) ByteBuffer _key121;
ByteBuffer _val122;
for (int _i123 = 0; _i123 < _map120.size; ++_i123)
{ {
ByteBuffer _key122; // required _key121 = iprot.readBinary();
ByteBuffer _val123; // required _val122 = iprot.readBinary();
_key122 = iprot.readBinary(); struct.attributes.put(_key121, _val122);
_val123 = iprot.readBinary();
struct.attributes.put(_key122, _val123);
} }
} }
struct.setAttributesIsSet(true); struct.setAttributesIsSet(true);

46
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TServerName.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,10 +29,13 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class TServerName implements org.apache.thrift.TBase<TServerName, TServerName._Fields>, java.io.Serializable, Cloneable { @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TServerName implements org.apache.thrift.TBase<TServerName, TServerName._Fields>, java.io.Serializable, Cloneable, Comparable<TServerName> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TServerName"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TServerName");
private static final org.apache.thrift.protocol.TField HOST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("hostName", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField HOST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("hostName", org.apache.thrift.protocol.TType.STRING, (short)1);
@ -116,7 +120,7 @@ public class TServerName implements org.apache.thrift.TBase<TServerName, TServer
private static final int __PORT_ISSET_ID = 0; private static final int __PORT_ISSET_ID = 0;
private static final int __STARTCODE_ISSET_ID = 1; private static final int __STARTCODE_ISSET_ID = 1;
private byte __isset_bitfield = 0; private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.PORT,_Fields.START_CODE}; private static final _Fields optionals[] = {_Fields.PORT,_Fields.START_CODE};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static { static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@ -270,10 +274,10 @@ public class TServerName implements org.apache.thrift.TBase<TServerName, TServer
return getHostName(); return getHostName();
case PORT: case PORT:
return Integer.valueOf(getPort()); return getPort();
case START_CODE: case START_CODE:
return Long.valueOf(getStartCode()); return getStartCode();
} }
throw new IllegalStateException(); throw new IllegalStateException();
@ -341,60 +345,60 @@ public class TServerName implements org.apache.thrift.TBase<TServerName, TServer
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_hostName = true && (isSetHostName()); boolean present_hostName = true && (isSetHostName());
builder.append(present_hostName); list.add(present_hostName);
if (present_hostName) if (present_hostName)
builder.append(hostName); list.add(hostName);
boolean present_port = true && (isSetPort()); boolean present_port = true && (isSetPort());
builder.append(present_port); list.add(present_port);
if (present_port) if (present_port)
builder.append(port); list.add(port);
boolean present_startCode = true && (isSetStartCode()); boolean present_startCode = true && (isSetStartCode());
builder.append(present_startCode); list.add(present_startCode);
if (present_startCode) if (present_startCode)
builder.append(startCode); list.add(startCode);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TServerName other) { public int compareTo(TServerName other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TServerName typedOther = (TServerName)other;
lastComparison = Boolean.valueOf(isSetHostName()).compareTo(typedOther.isSetHostName()); lastComparison = Boolean.valueOf(isSetHostName()).compareTo(other.isSetHostName());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetHostName()) { if (isSetHostName()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hostName, typedOther.hostName); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hostName, other.hostName);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetPort()).compareTo(typedOther.isSetPort()); lastComparison = Boolean.valueOf(isSetPort()).compareTo(other.isSetPort());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetPort()) { if (isSetPort()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetStartCode()).compareTo(typedOther.isSetStartCode()); lastComparison = Boolean.valueOf(isSetStartCode()).compareTo(other.isSetStartCode());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetStartCode()) { if (isSetStartCode()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startCode, typedOther.startCode); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startCode, other.startCode);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }

36
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TTimeRange.java
View File

@ -1,12 +1,11 @@
/** /**
* Autogenerated by Thrift Compiler (0.9.0) * Autogenerated by Thrift Compiler (0.9.3)
* *
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated * @generated
*/ */
package org.apache.hadoop.hbase.thrift2.generated; package org.apache.hadoop.hbase.thrift2.generated;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.StandardScheme;
@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils; import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException; import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -28,10 +29,13 @@ import java.util.Collections;
import java.util.BitSet; import java.util.BitSet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import javax.annotation.Generated;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class TTimeRange implements org.apache.thrift.TBase<TTimeRange, TTimeRange._Fields>, java.io.Serializable, Cloneable { @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
public class TTimeRange implements org.apache.thrift.TBase<TTimeRange, TTimeRange._Fields>, java.io.Serializable, Cloneable, Comparable<TTimeRange> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTimeRange"); private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTimeRange");
private static final org.apache.thrift.protocol.TField MIN_STAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("minStamp", org.apache.thrift.protocol.TType.I64, (short)1); private static final org.apache.thrift.protocol.TField MIN_STAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("minStamp", org.apache.thrift.protocol.TType.I64, (short)1);
@ -227,10 +231,10 @@ public class TTimeRange implements org.apache.thrift.TBase<TTimeRange, TTimeRang
public Object getFieldValue(_Fields field) { public Object getFieldValue(_Fields field) {
switch (field) { switch (field) {
case MIN_STAMP: case MIN_STAMP:
return Long.valueOf(getMinStamp()); return getMinStamp();
case MAX_STAMP: case MAX_STAMP:
return Long.valueOf(getMaxStamp()); return getMaxStamp();
} }
throw new IllegalStateException(); throw new IllegalStateException();
@ -287,45 +291,45 @@ public class TTimeRange implements org.apache.thrift.TBase<TTimeRange, TTimeRang
@Override @Override
public int hashCode() { public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder(); List<Object> list = new ArrayList<Object>();
boolean present_minStamp = true; boolean present_minStamp = true;
builder.append(present_minStamp); list.add(present_minStamp);
if (present_minStamp) if (present_minStamp)
builder.append(minStamp); list.add(minStamp);
boolean present_maxStamp = true; boolean present_maxStamp = true;
builder.append(present_maxStamp); list.add(present_maxStamp);
if (present_maxStamp) if (present_maxStamp)
builder.append(maxStamp); list.add(maxStamp);
return builder.toHashCode(); return list.hashCode();
} }
@Override
public int compareTo(TTimeRange other) { public int compareTo(TTimeRange other) {
if (!getClass().equals(other.getClass())) { if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName()); return getClass().getName().compareTo(other.getClass().getName());
} }
int lastComparison = 0; int lastComparison = 0;
TTimeRange typedOther = (TTimeRange)other;
lastComparison = Boolean.valueOf(isSetMinStamp()).compareTo(typedOther.isSetMinStamp()); lastComparison = Boolean.valueOf(isSetMinStamp()).compareTo(other.isSetMinStamp());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetMinStamp()) { if (isSetMinStamp()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.minStamp, typedOther.minStamp); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.minStamp, other.minStamp);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
} }
lastComparison = Boolean.valueOf(isSetMaxStamp()).compareTo(typedOther.isSetMaxStamp()); lastComparison = Boolean.valueOf(isSetMaxStamp()).compareTo(other.isSetMaxStamp());
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }
if (isSetMaxStamp()) { if (isSetMaxStamp()) {
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxStamp, typedOther.maxStamp); lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxStamp, other.maxStamp);
if (lastComparison != 0) { if (lastComparison != 0) {
return lastComparison; return lastComparison;
} }

2
pom.xml
View File

@ -1195,7 +1195,7 @@
<mockito-all.version>1.10.8</mockito-all.version> <mockito-all.version>1.10.8</mockito-all.version>
<protobuf.version>2.5.0</protobuf.version> <protobuf.version>2.5.0</protobuf.version>
<thrift.path>thrift</thrift.path> <thrift.path>thrift</thrift.path>
<thrift.version>0.9.2</thrift.version> <thrift.version>0.9.3</thrift.version>
<zookeeper.version>3.4.6</zookeeper.version> <zookeeper.version>3.4.6</zookeeper.version>
<slf4j.version>1.7.7</slf4j.version> <slf4j.version>1.7.7</slf4j.version>
<clover.version>4.0.3</clover.version> <clover.version>4.0.3</clover.version>