Author: jbellis
Date: Wed Jul 14 02:47:03 2010
New Revision: 963928
URL: http://svn.apache.org/viewvc?rev=963928&view=rev
Log:
upgrade to latest thrift. patch by Nate McCall; reviewed by jbellis for
CASSANDRA-1266
Added:
cassandra/trunk/lib/libthrift-r959516.jar
cassandra/trunk/libthrift-r959516.txt
- copied, changed from r963842,
cassandra/trunk/lib/licenses/libthrift-r917130.txt
Removed:
cassandra/trunk/lib/libthrift-r917130.jar
cassandra/trunk/lib/licenses/libthrift-r917130.txt
Modified:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Clock.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/RowPredicate.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java
Modified:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java?rev=963928&r1=963927&r2=963928&view=diff
==============================================================================
---
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
(original)
+++
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
Wed Jul 14 02:47:03 2010
@@ -41,13 +41,15 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.thrift.*;
+import org.apache.thrift.async.*;
import org.apache.thrift.meta_data.*;
+import org.apache.thrift.transport.*;
import org.apache.thrift.protocol.*;
/**
* invalid authentication request (invalid keyspace, user does not exist, or
credentials invalid)
*/
-public class AuthenticationException extends Exception implements
TBase<AuthenticationException._Fields>, java.io.Serializable, Cloneable,
Comparable<AuthenticationException> {
+public class AuthenticationException extends Exception implements
TBase<AuthenticationException, AuthenticationException._Fields>,
java.io.Serializable, Cloneable {
private static final TStruct STRUCT_DESC = new
TStruct("AuthenticationException");
private static final TField WHY_FIELD_DESC = new TField("why", TType.STRING,
(short)1);
@@ -58,12 +60,10 @@ public class AuthenticationException ext
public enum _Fields implements TFieldIdEnum {
WHY((short)1, "why");
- private static final Map<Integer, _Fields> byId = new HashMap<Integer,
_Fields>();
private static final Map<String, _Fields> byName = new HashMap<String,
_Fields>();
static {
for (_Fields field : EnumSet.allOf(_Fields.class)) {
- byId.put((int)field._thriftId, field);
byName.put(field.getFieldName(), field);
}
}
@@ -72,7 +72,12 @@ public class AuthenticationException ext
* Find the _Fields constant that matches fieldId, or null if its not
found.
*/
public static _Fields findByThriftId(int fieldId) {
- return byId.get(fieldId);
+ switch(fieldId) {
+ case 1: // WHY
+ return WHY;
+ default:
+ return null;
+ }
}
/**
@@ -111,12 +116,12 @@ public class AuthenticationException ext
// isset id assignments
- public static final Map<_Fields, FieldMetaData> metaDataMap =
Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class)
{{
- put(_Fields.WHY, new FieldMetaData("why", TFieldRequirementType.REQUIRED,
- new FieldValueMetaData(TType.STRING)));
- }});
-
+ public static final Map<_Fields, FieldMetaData> metaDataMap;
static {
+ Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields,
FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.WHY, new FieldMetaData("why",
TFieldRequirementType.REQUIRED,
+ new FieldValueMetaData(TType.STRING)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
FieldMetaData.addStructMetaDataMap(AuthenticationException.class,
metaDataMap);
}
@@ -257,7 +262,7 @@ public class AuthenticationException ext
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetWhy()) { lastComparison = TBaseHelper.compareTo(why,
typedOther.why);
+ if (isSetWhy()) { lastComparison = TBaseHelper.compareTo(this.why,
typedOther.why);
if (lastComparison != 0) {
return lastComparison;
}
Modified:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java?rev=963928&r1=963927&r2=963928&view=diff
==============================================================================
---
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
(original)
+++
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
Wed Jul 14 02:47:03 2010
@@ -41,13 +41,15 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.thrift.*;
+import org.apache.thrift.async.*;
import org.apache.thrift.meta_data.*;
+import org.apache.thrift.transport.*;
import org.apache.thrift.protocol.*;
/**
* Authentication requests can contain any data, dependent on the
AuthenticationBackend used
*/
-public class AuthenticationRequest implements
TBase<AuthenticationRequest._Fields>, java.io.Serializable, Cloneable {
+public class AuthenticationRequest implements TBase<AuthenticationRequest,
AuthenticationRequest._Fields>, java.io.Serializable, Cloneable {
private static final TStruct STRUCT_DESC = new
TStruct("AuthenticationRequest");
private static final TField CREDENTIALS_FIELD_DESC = new
TField("credentials", TType.MAP, (short)1);
@@ -58,12 +60,10 @@ public class AuthenticationRequest imple
public enum _Fields implements TFieldIdEnum {
CREDENTIALS((short)1, "credentials");
- private static final Map<Integer, _Fields> byId = new HashMap<Integer,
_Fields>();
private static final Map<String, _Fields> byName = new HashMap<String,
_Fields>();
static {
for (_Fields field : EnumSet.allOf(_Fields.class)) {
- byId.put((int)field._thriftId, field);
byName.put(field.getFieldName(), field);
}
}
@@ -72,7 +72,12 @@ public class AuthenticationRequest imple
* Find the _Fields constant that matches fieldId, or null if its not
found.
*/
public static _Fields findByThriftId(int fieldId) {
- return byId.get(fieldId);
+ switch(fieldId) {
+ case 1: // CREDENTIALS
+ return CREDENTIALS;
+ default:
+ return null;
+ }
}
/**
@@ -111,14 +116,14 @@ public class AuthenticationRequest imple
// isset id assignments
- public static final Map<_Fields, FieldMetaData> metaDataMap =
Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class)
{{
- put(_Fields.CREDENTIALS, new FieldMetaData("credentials",
TFieldRequirementType.REQUIRED,
+ public static final Map<_Fields, FieldMetaData> metaDataMap;
+ static {
+ Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields,
FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.CREDENTIALS, new FieldMetaData("credentials",
TFieldRequirementType.REQUIRED,
new MapMetaData(TType.MAP,
new FieldValueMetaData(TType.STRING),
new FieldValueMetaData(TType.STRING))));
- }});
-
- static {
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
FieldMetaData.addStructMetaDataMap(AuthenticationRequest.class,
metaDataMap);
}
@@ -270,6 +275,26 @@ public class AuthenticationRequest imple
return 0;
}
+ 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());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetCredentials()) { lastComparison =
TBaseHelper.compareTo(this.credentials, typedOther.credentials);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
public void read(TProtocol iprot) throws TException {
TField field;
iprot.readStructBegin();
Modified:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java?rev=963928&r1=963927&r2=963928&view=diff
==============================================================================
---
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
(original)
+++
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
Wed Jul 14 02:47:03 2010
@@ -41,13 +41,15 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.thrift.*;
+import org.apache.thrift.async.*;
import org.apache.thrift.meta_data.*;
+import org.apache.thrift.transport.*;
import org.apache.thrift.protocol.*;
/**
* invalid authorization request (user does not have access to keyspace)
*/
-public class AuthorizationException extends Exception implements
TBase<AuthorizationException._Fields>, java.io.Serializable, Cloneable,
Comparable<AuthorizationException> {
+public class AuthorizationException extends Exception implements
TBase<AuthorizationException, AuthorizationException._Fields>,
java.io.Serializable, Cloneable {
private static final TStruct STRUCT_DESC = new
TStruct("AuthorizationException");
private static final TField WHY_FIELD_DESC = new TField("why", TType.STRING,
(short)1);
@@ -58,12 +60,10 @@ public class AuthorizationException exte
public enum _Fields implements TFieldIdEnum {
WHY((short)1, "why");
- private static final Map<Integer, _Fields> byId = new HashMap<Integer,
_Fields>();
private static final Map<String, _Fields> byName = new HashMap<String,
_Fields>();
static {
for (_Fields field : EnumSet.allOf(_Fields.class)) {
- byId.put((int)field._thriftId, field);
byName.put(field.getFieldName(), field);
}
}
@@ -72,7 +72,12 @@ public class AuthorizationException exte
* Find the _Fields constant that matches fieldId, or null if its not
found.
*/
public static _Fields findByThriftId(int fieldId) {
- return byId.get(fieldId);
+ switch(fieldId) {
+ case 1: // WHY
+ return WHY;
+ default:
+ return null;
+ }
}
/**
@@ -111,12 +116,12 @@ public class AuthorizationException exte
// isset id assignments
- public static final Map<_Fields, FieldMetaData> metaDataMap =
Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class)
{{
- put(_Fields.WHY, new FieldMetaData("why", TFieldRequirementType.REQUIRED,
- new FieldValueMetaData(TType.STRING)));
- }});
-
+ public static final Map<_Fields, FieldMetaData> metaDataMap;
static {
+ Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields,
FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.WHY, new FieldMetaData("why",
TFieldRequirementType.REQUIRED,
+ new FieldValueMetaData(TType.STRING)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
FieldMetaData.addStructMetaDataMap(AuthorizationException.class,
metaDataMap);
}
@@ -257,7 +262,7 @@ public class AuthorizationException exte
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetWhy()) { lastComparison = TBaseHelper.compareTo(why,
typedOther.why);
+ if (isSetWhy()) { lastComparison = TBaseHelper.compareTo(this.why,
typedOther.why);
if (lastComparison != 0) {
return lastComparison;
}
