You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/08/30 02:03:49 UTC
[6/7] git commit: Upgrade Thrift to 0.9.1
Upgrade Thrift to 0.9.1
patch by Carl Yeksigian and Jake Farrell; reviewed by Aleksey Yeschenko
for CASSANDRA-5923
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bffd9ea8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bffd9ea8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bffd9ea8
Branch: refs/heads/trunk
Commit: bffd9ea8eb5358b5f138cbad8a387d5037d1ac12
Parents: c1e0f31
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Aug 30 02:54:10 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Aug 30 02:57:12 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +-
.../thrift/AuthenticationException.java | 25 +-
.../cassandra/thrift/AuthenticationRequest.java | 35 +-
.../thrift/AuthorizationException.java | 14 +-
.../org/apache/cassandra/thrift/CASResult.java | 24 +-
.../org/apache/cassandra/thrift/Cassandra.java | 4881 ++++++++++++++----
.../org/apache/cassandra/thrift/CfDef.java | 216 +-
.../org/apache/cassandra/thrift/CfSplit.java | 22 +-
.../org/apache/cassandra/thrift/Column.java | 26 +-
.../org/apache/cassandra/thrift/ColumnDef.java | 51 +-
.../cassandra/thrift/ColumnOrSuperColumn.java | 26 +-
.../apache/cassandra/thrift/ColumnParent.java | 18 +-
.../org/apache/cassandra/thrift/ColumnPath.java | 22 +-
.../apache/cassandra/thrift/Compression.java | 2 +-
.../cassandra/thrift/ConsistencyLevel.java | 2 +-
.../apache/cassandra/thrift/CounterColumn.java | 18 +-
.../cassandra/thrift/CounterSuperColumn.java | 24 +-
.../apache/cassandra/thrift/CqlMetadata.java | 70 +-
.../cassandra/thrift/CqlPreparedResult.java | 44 +-
.../org/apache/cassandra/thrift/CqlResult.java | 32 +-
.../apache/cassandra/thrift/CqlResultType.java | 2 +-
.../org/apache/cassandra/thrift/CqlRow.java | 24 +-
.../org/apache/cassandra/thrift/Deletion.java | 22 +-
.../cassandra/thrift/EndpointDetails.java | 22 +-
.../apache/cassandra/thrift/IndexClause.java | 28 +-
.../cassandra/thrift/IndexExpression.java | 22 +-
.../apache/cassandra/thrift/IndexOperator.java | 2 +-
.../org/apache/cassandra/thrift/IndexType.java | 2 +-
.../thrift/InvalidRequestException.java | 14 +-
.../org/apache/cassandra/thrift/KeyCount.java | 18 +-
.../org/apache/cassandra/thrift/KeyRange.java | 40 +-
.../org/apache/cassandra/thrift/KeySlice.java | 24 +-
.../org/apache/cassandra/thrift/KsDef.java | 61 +-
.../org/apache/cassandra/thrift/Mutation.java | 18 +-
.../cassandra/thrift/NotFoundException.java | 10 +-
.../thrift/SchemaDisagreementException.java | 10 +-
.../apache/cassandra/thrift/SlicePredicate.java | 29 +-
.../org/apache/cassandra/thrift/SliceRange.java | 26 +-
.../apache/cassandra/thrift/SuperColumn.java | 24 +-
.../cassandra/thrift/TimedOutException.java | 22 +-
.../org/apache/cassandra/thrift/TokenRange.java | 63 +-
.../org/apache/cassandra/thrift/TriggerDef.java | 39 +-
.../cassandra/thrift/UnavailableException.java | 21 +-
.../cassandra/thrift/cassandraConstants.java | 6 +-
lib/commons-lang-2.6.jar | Bin 284220 -> 0 bytes
lib/commons-lang3-3.1.jar | Bin 0 -> 315805 bytes
lib/libthrift-0.9.0.jar | Bin 347531 -> 0 bytes
lib/libthrift-0.9.1.jar | Bin 0 -> 217054 bytes
lib/licenses/commons-lang-3.1.txt | 202 +
lib/licenses/libthrift-0.9.1.txt | 202 +
lib/licenses/libthrift-0.9.txt | 202 -
lib/thrift-python-internal-only-0.7.0.zip | Bin 42854 -> 0 bytes
lib/thrift-python-internal-only-0.9.1.zip | Bin 0 -> 52477 bytes
src/java/org/apache/cassandra/auth/Auth.java | 2 +-
.../cassandra/auth/CassandraAuthorizer.java | 2 +-
.../org/apache/cassandra/auth/DataResource.java | 2 +-
.../cassandra/auth/PasswordAuthenticator.java | 2 +-
.../org/apache/cassandra/cli/CliClient.java | 2 +-
src/java/org/apache/cassandra/cli/CliUtils.java | 2 +-
.../org/apache/cassandra/config/CFMetaData.java | 10 +-
.../org/apache/cassandra/config/KSMetaData.java | 4 +-
.../org/apache/cassandra/cql/CFPropDefs.java | 2 +-
.../cql3/statements/CreateTableStatement.java | 2 +-
.../org/apache/cassandra/db/ColumnFamily.java | 2 +-
.../org/apache/cassandra/db/Directories.java | 2 +-
.../apache/cassandra/db/RangeSliceReply.java | 2 +-
.../org/apache/cassandra/db/RowMutation.java | 2 +-
.../org/apache/cassandra/db/SystemKeyspace.java | 2 +-
.../cassandra/db/commitlog/CommitLog.java | 2 +-
.../db/commitlog/CommitLogReplayer.java | 2 +-
.../cassandra/db/compaction/CompactionTask.java | 2 +-
.../cassandra/db/filter/NamesQueryFilter.java | 2 +-
.../cassandra/db/index/SecondaryIndex.java | 2 +-
.../db/index/SecondaryIndexManager.java | 2 +-
.../apache/cassandra/db/marshal/DateType.java | 2 +-
.../db/marshal/LocalByPartionerType.java | 3 +-
.../cassandra/db/marshal/TimestampType.java | 2 +-
.../apache/cassandra/db/marshal/TypeParser.java | 2 +-
.../apache/cassandra/db/marshal/UUIDType.java | 2 +-
.../dht/AbstractByteOrderedPartitioner.java | 2 +-
src/java/org/apache/cassandra/dht/Range.java | 2 +-
.../org/apache/cassandra/dht/RangeStreamer.java | 2 +-
.../apache/cassandra/gms/FailureDetector.java | 2 +-
.../apache/cassandra/gms/VersionedValue.java | 2 +-
.../hadoop/AbstractColumnFamilyInputFormat.java | 2 +-
.../io/compress/CompressionParameters.java | 4 +-
.../apache/cassandra/locator/TokenMetadata.java | 2 +-
.../apache/cassandra/security/SSLFactory.java | 2 +-
.../apache/cassandra/service/ClientState.java | 2 +-
.../apache/cassandra/service/ReadCallback.java | 2 +-
.../apache/cassandra/service/StorageProxy.java | 2 +-
.../cassandra/service/StorageService.java | 2 +-
.../thrift/CustomTNonBlockingServer.java | 18 +-
.../org/apache/cassandra/utils/FBUtilities.java | 2 +-
.../apache/cassandra/utils/SemanticVersion.java | 2 +-
test/data/serialization/2.0/db.RowMutation.bin | Bin 3599 -> 3599 bytes
.../apache/cassandra/client/TestRingCache.java | 2 +-
.../cassandra/db/ColumnFamilyStoreTest.java | 6 +-
.../org/apache/cassandra/db/KeyspaceTest.java | 2 +-
.../org/apache/cassandra/dht/RangeTest.java | 2 +-
.../ReplicationStrategyEndpointCacheTest.java | 2 +-
.../org/apache/cassandra/stress/Session.java | 2 +-
.../cassandra/stress/StressStatistics.java | 2 +-
104 files changed, 4884 insertions(+), 1959 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2d3ee24..863214c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@
(CASSANDRA-5722)
* Add ability for CQL3 to list partition keys (CASSANDRA-4536)
* Improve native protocol serialization (CASSANDRA-5664)
+ * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
Merged from 1.2:
* Fix CqlRecordWriter with composite keys (CASSANDRA-5949)
* Add snitch, schema version, cluster, partitioner to JMX (CASSANDRA-5881)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4fc9817..4d8ae14 100644
--- a/build.xml
+++ b/build.xml
@@ -340,7 +340,7 @@
<dependency groupId="com.google.guava" artifactId="guava" version="13.0.1"/>
<dependency groupId="commons-cli" artifactId="commons-cli" version="1.1"/>
<dependency groupId="commons-codec" artifactId="commons-codec" version="1.2"/>
- <dependency groupId="commons-lang" artifactId="commons-lang" version="2.6"/>
+ <dependency groupId="commons-lang" artifactId="commons-lang" version="3.1"/>
<dependency groupId="com.googlecode.concurrentlinkedhashmap" artifactId="concurrentlinkedhashmap-lru" version="1.3"/>
<dependency groupId="org.antlr" artifactId="antlr" version="3.2"/>
<dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.7.2"/>
@@ -355,7 +355,7 @@
<dependency groupId="com.github.stephenc" artifactId="jamm" version="0.2.5"/>
<dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0"/>
<dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/>
- <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.0"/>
+ <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.1"/>
<dependency groupId="junit" artifactId="junit" version="4.6" />
<dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
index a2e917c..b16c400 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -27,24 +27,37 @@ package org.apache.cassandra.thrift;
*/
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
import org.apache.thrift.scheme.TupleScheme;
import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
import java.util.EnumSet;
import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* invalid authentication request (invalid keyspace, user does not exist, or credentials invalid)
*/
-public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable {
+public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationException");
private static final org.apache.thrift.protocol.TField WHY_FIELD_DESC = new org.apache.thrift.protocol.TField("why", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -249,20 +262,20 @@ public class AuthenticationException extends TException implements org.apache.th
return builder.toHashCode();
}
+ @Override
public int compareTo(AuthenticationException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- AuthenticationException typedOther = (AuthenticationException)other;
- lastComparison = Boolean.valueOf(isSetWhy()).compareTo(typedOther.isSetWhy());
+ lastComparison = Boolean.valueOf(isSetWhy()).compareTo(other.isSetWhy());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetWhy()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, typedOther.why);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, other.why);
if (lastComparison != 0) {
return lastComparison;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
index 5697987..5778fa5 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -55,7 +57,7 @@ import org.slf4j.LoggerFactory;
/**
* Authentication requests can contain any data, dependent on the IAuthenticator used
*/
-public class AuthenticationRequest implements org.apache.thrift.TBase<AuthenticationRequest, AuthenticationRequest._Fields>, java.io.Serializable, Cloneable {
+public class AuthenticationRequest implements org.apache.thrift.TBase<AuthenticationRequest, AuthenticationRequest._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationRequest> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationRequest");
private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.MAP, (short)1);
@@ -153,18 +155,7 @@ public class AuthenticationRequest implements org.apache.thrift.TBase<Authentica
*/
public AuthenticationRequest(AuthenticationRequest other) {
if (other.isSetCredentials()) {
- Map<String,String> __this__credentials = new HashMap<String,String>();
- for (Map.Entry<String, String> other_element : other.credentials.entrySet()) {
-
- String other_element_key = other_element.getKey();
- String other_element_value = other_element.getValue();
-
- String __this__credentials_copy_key = other_element_key;
-
- String __this__credentials_copy_value = other_element_value;
-
- __this__credentials.put(__this__credentials_copy_key, __this__credentials_copy_value);
- }
+ Map<String,String> __this__credentials = new HashMap<String,String>(other.credentials);
this.credentials = __this__credentials;
}
}
@@ -285,20 +276,20 @@ public class AuthenticationRequest implements org.apache.thrift.TBase<Authentica
return builder.toHashCode();
}
+ @Override
public int compareTo(AuthenticationRequest other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- AuthenticationRequest typedOther = (AuthenticationRequest)other;
- lastComparison = Boolean.valueOf(isSetCredentials()).compareTo(typedOther.isSetCredentials());
+ lastComparison = Boolean.valueOf(isSetCredentials()).compareTo(other.isSetCredentials());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCredentials()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, typedOther.credentials);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, other.credentials);
if (lastComparison != 0) {
return lastComparison;
}
@@ -383,8 +374,8 @@ public class AuthenticationRequest implements org.apache.thrift.TBase<Authentica
struct.credentials = new HashMap<String,String>(2*_map80.size);
for (int _i81 = 0; _i81 < _map80.size; ++_i81)
{
- String _key82; // required
- String _val83; // required
+ String _key82;
+ String _val83;
_key82 = iprot.readString();
_val83 = iprot.readString();
struct.credentials.put(_key82, _val83);
@@ -459,8 +450,8 @@ public class AuthenticationRequest implements org.apache.thrift.TBase<Authentica
struct.credentials = new HashMap<String,String>(2*_map86.size);
for (int _i87 = 0; _i87 < _map86.size; ++_i87)
{
- String _key88; // required
- String _val89; // required
+ String _key88;
+ String _val89;
_key88 = iprot.readString();
_val89 = iprot.readString();
struct.credentials.put(_key88, _val89);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
index f3a8506..cd1bdf7 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -55,7 +57,7 @@ import org.slf4j.LoggerFactory;
/**
* invalid authorization request (user does not have access to keyspace)
*/
-public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable {
+public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException");
private static final org.apache.thrift.protocol.TField WHY_FIELD_DESC = new org.apache.thrift.protocol.TField("why", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -260,20 +262,20 @@ public class AuthorizationException extends TException implements org.apache.thr
return builder.toHashCode();
}
+ @Override
public int compareTo(AuthorizationException other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- AuthorizationException typedOther = (AuthorizationException)other;
- lastComparison = Boolean.valueOf(isSetWhy()).compareTo(typedOther.isSetWhy());
+ lastComparison = Boolean.valueOf(isSetWhy()).compareTo(other.isSetWhy());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetWhy()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, typedOther.why);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.why, other.why);
if (lastComparison != 0) {
return lastComparison;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bffd9ea8/interface/thrift/gen-java/org/apache/cassandra/thrift/CASResult.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CASResult.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CASResult.java
index d18241d..4d21bfe 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CASResult.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CASResult.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -27,7 +27,7 @@ package org.apache.cassandra.thrift;
*/
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;
import org.apache.thrift.scheme.StandardScheme;
@@ -37,6 +37,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -52,7 +54,7 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class CASResult implements org.apache.thrift.TBase<CASResult, CASResult._Fields>, java.io.Serializable, Cloneable {
+public class CASResult implements org.apache.thrift.TBase<CASResult, CASResult._Fields>, java.io.Serializable, Cloneable, Comparable<CASResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CASResult");
private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)1);
@@ -162,7 +164,7 @@ public class CASResult implements org.apache.thrift.TBase<CASResult, CASResult._
__isset_bitfield = other.__isset_bitfield;
this.success = other.success;
if (other.isSetCurrent_values()) {
- List<Column> __this__current_values = new ArrayList<Column>();
+ List<Column> __this__current_values = new ArrayList<Column>(other.current_values.size());
for (Column other_element : other.current_values) {
__this__current_values.add(new Column(other_element));
}
@@ -342,30 +344,30 @@ public class CASResult implements org.apache.thrift.TBase<CASResult, CASResult._
return builder.toHashCode();
}
+ @Override
public int compareTo(CASResult other) {
if (!getClass().equals(other.getClass())) {
return getClass().getName().compareTo(other.getClass().getName());
}
int lastComparison = 0;
- CASResult typedOther = (CASResult)other;
- lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+ lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetSuccess()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
if (lastComparison != 0) {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetCurrent_values()).compareTo(typedOther.isSetCurrent_values());
+ lastComparison = Boolean.valueOf(isSetCurrent_values()).compareTo(other.isSetCurrent_values());
if (lastComparison != 0) {
return lastComparison;
}
if (isSetCurrent_values()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.current_values, typedOther.current_values);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.current_values, other.current_values);
if (lastComparison != 0) {
return lastComparison;
}
@@ -464,7 +466,7 @@ public class CASResult implements org.apache.thrift.TBase<CASResult, CASResult._
struct.current_values = new ArrayList<Column>(_list48.size);
for (int _i49 = 0; _i49 < _list48.size; ++_i49)
{
- Column _elem50; // required
+ Column _elem50;
_elem50 = new Column();
_elem50.read(iprot);
struct.current_values.add(_elem50);
@@ -557,7 +559,7 @@ public class CASResult implements org.apache.thrift.TBase<CASResult, CASResult._
struct.current_values = new ArrayList<Column>(_list53.size);
for (int _i54 = 0; _i54 < _list53.size; ++_i54)
{
- Column _elem55; // required
+ Column _elem55;
_elem55 = new Column();
_elem55.read(iprot);
struct.current_values.add(_elem55);