You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2010/03/01 21:02:35 UTC
svn commit: r917685 [3/3] - in /incubator/cassandra/trunk: ./
interface/thrift/gen-java/org/apache/cassandra/thrift/ lib/ test/system/
Propchange: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 1 20:02:34 2010
@@ -1,6 +1,6 @@
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Cassandra.java:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/Cassandra.java:888872-903502
-/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:911237-916976
+/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:911237-917571
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java:749219-768588
/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:749219-904544
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java Mon Mar 1 20:02:34 2010
@@ -373,29 +373,32 @@
int lastComparison = 0;
Column typedOther = (Column)other;
- lastComparison = Boolean.valueOf(isSetName()).compareTo(isSetName());
+ lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(name, typedOther.name);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetName()) { lastComparison = TBaseHelper.compareTo(name, typedOther.name);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetValue()).compareTo(isSetValue());
+ lastComparison = Boolean.valueOf(isSetValue()).compareTo(typedOther.isSetValue());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(value, typedOther.value);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetValue()) { lastComparison = TBaseHelper.compareTo(value, typedOther.value);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(isSetTimestamp());
+ lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(timestamp, typedOther.timestamp);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetTimestamp()) { lastComparison = TBaseHelper.compareTo(timestamp, typedOther.timestamp);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
return 0;
}
@@ -409,36 +412,33 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case NAME:
- if (field.type == TType.STRING) {
- this.name = iprot.readBinary();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case VALUE:
- if (field.type == TType.STRING) {
- this.value = iprot.readBinary();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case TIMESTAMP:
- if (field.type == TType.I64) {
- this.timestamp = iprot.readI64();
- setTimestampIsSet(true);
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- }
- iprot.readFieldEnd();
+ switch (field.id) {
+ case 1: // NAME
+ if (field.type == TType.STRING) {
+ this.name = iprot.readBinary();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 2: // VALUE
+ if (field.type == TType.STRING) {
+ this.value = iprot.readBinary();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 3: // TIMESTAMP
+ if (field.type == TType.I64) {
+ this.timestamp = iprot.readI64();
+ setTimestampIsSet(true);
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Propchange: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 1 20:02:34 2010
@@ -1,7 +1,7 @@
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/column_t.java:774578-792198
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Column.java:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/Column.java:888872-903502
-/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:911237-916976
+/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:911237-917571
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java:749219-794428
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/column_t.java:749219-768588
/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:749219-904544
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java Mon Mar 1 20:02:34 2010
@@ -307,21 +307,23 @@
int lastComparison = 0;
ColumnOrSuperColumn typedOther = (ColumnOrSuperColumn)other;
- lastComparison = Boolean.valueOf(isSetColumn()).compareTo(isSetColumn());
+ lastComparison = Boolean.valueOf(isSetColumn()).compareTo(typedOther.isSetColumn());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(column, typedOther.column);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetColumn()) { lastComparison = TBaseHelper.compareTo(column, typedOther.column);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(isSetSuper_column());
+ lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(typedOther.isSetSuper_column());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(super_column, typedOther.super_column);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetSuper_column()) { lastComparison = TBaseHelper.compareTo(super_column, typedOther.super_column);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
return 0;
}
@@ -335,30 +337,27 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case COLUMN:
- if (field.type == TType.STRUCT) {
- this.column = new Column();
- this.column.read(iprot);
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case SUPER_COLUMN:
- if (field.type == TType.STRUCT) {
- this.super_column = new SuperColumn();
- this.super_column.read(iprot);
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- }
- iprot.readFieldEnd();
+ switch (field.id) {
+ case 1: // COLUMN
+ if (field.type == TType.STRUCT) {
+ this.column = new Column();
+ this.column.read(iprot);
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 2: // SUPER_COLUMN
+ if (field.type == TType.STRUCT) {
+ this.super_column = new SuperColumn();
+ this.super_column.read(iprot);
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java Mon Mar 1 20:02:34 2010
@@ -311,21 +311,23 @@
int lastComparison = 0;
ColumnParent typedOther = (ColumnParent)other;
- lastComparison = Boolean.valueOf(isSetColumn_family()).compareTo(isSetColumn_family());
+ lastComparison = Boolean.valueOf(isSetColumn_family()).compareTo(typedOther.isSetColumn_family());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(column_family, typedOther.column_family);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetColumn_family()) { lastComparison = TBaseHelper.compareTo(column_family, typedOther.column_family);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(isSetSuper_column());
+ lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(typedOther.isSetSuper_column());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(super_column, typedOther.super_column);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetSuper_column()) { lastComparison = TBaseHelper.compareTo(super_column, typedOther.super_column);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
return 0;
}
@@ -339,28 +341,25 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case COLUMN_FAMILY:
- if (field.type == TType.STRING) {
- this.column_family = iprot.readString();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case SUPER_COLUMN:
- if (field.type == TType.STRING) {
- this.super_column = iprot.readBinary();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- }
- iprot.readFieldEnd();
+ switch (field.id) {
+ case 3: // COLUMN_FAMILY
+ if (field.type == TType.STRING) {
+ this.column_family = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 4: // SUPER_COLUMN
+ if (field.type == TType.STRING) {
+ this.super_column = iprot.readBinary();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java Mon Mar 1 20:02:34 2010
@@ -370,29 +370,32 @@
int lastComparison = 0;
ColumnPath typedOther = (ColumnPath)other;
- lastComparison = Boolean.valueOf(isSetColumn_family()).compareTo(isSetColumn_family());
+ lastComparison = Boolean.valueOf(isSetColumn_family()).compareTo(typedOther.isSetColumn_family());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(column_family, typedOther.column_family);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetColumn_family()) { lastComparison = TBaseHelper.compareTo(column_family, typedOther.column_family);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(isSetSuper_column());
+ lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(typedOther.isSetSuper_column());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(super_column, typedOther.super_column);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetSuper_column()) { lastComparison = TBaseHelper.compareTo(super_column, typedOther.super_column);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetColumn()).compareTo(isSetColumn());
+ lastComparison = Boolean.valueOf(isSetColumn()).compareTo(typedOther.isSetColumn());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(column, typedOther.column);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetColumn()) { lastComparison = TBaseHelper.compareTo(column, typedOther.column);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
return 0;
}
@@ -406,35 +409,32 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case COLUMN_FAMILY:
- if (field.type == TType.STRING) {
- this.column_family = iprot.readString();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case SUPER_COLUMN:
- if (field.type == TType.STRING) {
- this.super_column = iprot.readBinary();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case COLUMN:
- if (field.type == TType.STRING) {
- this.column = iprot.readBinary();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- }
- iprot.readFieldEnd();
+ switch (field.id) {
+ case 3: // COLUMN_FAMILY
+ if (field.type == TType.STRING) {
+ this.column_family = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 4: // SUPER_COLUMN
+ if (field.type == TType.STRING) {
+ this.super_column = iprot.readBinary();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 5: // COLUMN
+ if (field.type == TType.STRING) {
+ this.column = iprot.readBinary();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java Mon Mar 1 20:02:34 2010
@@ -66,12 +66,6 @@
ALL(5),
ANY(6);
- private static final Map<Integer, ConsistencyLevel> BY_VALUE = new HashMap<Integer,ConsistencyLevel>() {{
- for(ConsistencyLevel val : ConsistencyLevel.values()) {
- put(val.getValue(), val);
- }
- }};
-
private final int value;
private ConsistencyLevel(int value) {
@@ -90,6 +84,23 @@
* @return null if the value is not found.
*/
public static ConsistencyLevel findByValue(int value) {
- return BY_VALUE.get(value);
+ switch (value) {
+ case 0:
+ return ZERO;
+ case 1:
+ return ONE;
+ case 2:
+ return QUORUM;
+ case 3:
+ return DCQUORUM;
+ case 4:
+ return DCQUORUMSYNC;
+ case 5:
+ return ALL;
+ case 6:
+ return ANY;
+ default:
+ return null;
+ }
}
}
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java Mon Mar 1 20:02:34 2010
@@ -361,29 +361,32 @@
int lastComparison = 0;
Deletion typedOther = (Deletion)other;
- lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(isSetTimestamp());
+ lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(timestamp, typedOther.timestamp);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetTimestamp()) { lastComparison = TBaseHelper.compareTo(timestamp, typedOther.timestamp);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(isSetSuper_column());
+ lastComparison = Boolean.valueOf(isSetSuper_column()).compareTo(typedOther.isSetSuper_column());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(super_column, typedOther.super_column);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetSuper_column()) { lastComparison = TBaseHelper.compareTo(super_column, typedOther.super_column);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetPredicate()).compareTo(isSetPredicate());
+ lastComparison = Boolean.valueOf(isSetPredicate()).compareTo(typedOther.isSetPredicate());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(predicate, typedOther.predicate);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetPredicate()) { lastComparison = TBaseHelper.compareTo(predicate, typedOther.predicate);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
return 0;
}
@@ -397,37 +400,34 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case TIMESTAMP:
- if (field.type == TType.I64) {
- this.timestamp = iprot.readI64();
- setTimestampIsSet(true);
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case SUPER_COLUMN:
- if (field.type == TType.STRING) {
- this.super_column = iprot.readBinary();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case PREDICATE:
- if (field.type == TType.STRUCT) {
- this.predicate = new SlicePredicate();
- this.predicate.read(iprot);
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- }
- iprot.readFieldEnd();
+ switch (field.id) {
+ case 1: // TIMESTAMP
+ if (field.type == TType.I64) {
+ this.timestamp = iprot.readI64();
+ setTimestampIsSet(true);
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 2: // SUPER_COLUMN
+ if (field.type == TType.STRING) {
+ this.super_column = iprot.readBinary();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 3: // PREDICATE
+ if (field.type == TType.STRUCT) {
+ this.predicate = new SlicePredicate();
+ this.predicate.read(iprot);
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java Mon Mar 1 20:02:34 2010
@@ -254,13 +254,14 @@
int lastComparison = 0;
InvalidRequestException typedOther = (InvalidRequestException)other;
- lastComparison = Boolean.valueOf(isSetWhy()).compareTo(isSetWhy());
+ lastComparison = Boolean.valueOf(isSetWhy()).compareTo(typedOther.isSetWhy());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(why, typedOther.why);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetWhy()) { lastComparison = TBaseHelper.compareTo(why, typedOther.why);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
return 0;
}
@@ -274,21 +275,18 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case WHY:
- if (field.type == TType.STRING) {
- this.why = iprot.readString();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- }
- iprot.readFieldEnd();
+ switch (field.id) {
+ case 1: // WHY
+ if (field.type == TType.STRING) {
+ this.why = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Propchange: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 1 20:02:34 2010
@@ -1,6 +1,6 @@
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:888872-903502
-/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:911237-916976
+/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:911237-917571
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:749219-768588
/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:749219-904544
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java Mon Mar 1 20:02:34 2010
@@ -478,45 +478,50 @@
int lastComparison = 0;
KeyRange typedOther = (KeyRange)other;
- lastComparison = Boolean.valueOf(isSetStart_key()).compareTo(isSetStart_key());
+ lastComparison = Boolean.valueOf(isSetStart_key()).compareTo(typedOther.isSetStart_key());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(start_key, typedOther.start_key);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetStart_key()) { lastComparison = TBaseHelper.compareTo(start_key, typedOther.start_key);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetEnd_key()).compareTo(isSetEnd_key());
+ lastComparison = Boolean.valueOf(isSetEnd_key()).compareTo(typedOther.isSetEnd_key());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(end_key, typedOther.end_key);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetEnd_key()) { lastComparison = TBaseHelper.compareTo(end_key, typedOther.end_key);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetStart_token()).compareTo(isSetStart_token());
+ lastComparison = Boolean.valueOf(isSetStart_token()).compareTo(typedOther.isSetStart_token());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(start_token, typedOther.start_token);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetStart_token()) { lastComparison = TBaseHelper.compareTo(start_token, typedOther.start_token);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetEnd_token()).compareTo(isSetEnd_token());
+ lastComparison = Boolean.valueOf(isSetEnd_token()).compareTo(typedOther.isSetEnd_token());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(end_token, typedOther.end_token);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetEnd_token()) { lastComparison = TBaseHelper.compareTo(end_token, typedOther.end_token);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetCount()).compareTo(isSetCount());
+ lastComparison = Boolean.valueOf(isSetCount()).compareTo(typedOther.isSetCount());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(count, typedOther.count);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetCount()) { lastComparison = TBaseHelper.compareTo(count, typedOther.count);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
return 0;
}
@@ -530,50 +535,47 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case START_KEY:
- if (field.type == TType.STRING) {
- this.start_key = iprot.readString();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case END_KEY:
- if (field.type == TType.STRING) {
- this.end_key = iprot.readString();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case START_TOKEN:
- if (field.type == TType.STRING) {
- this.start_token = iprot.readString();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case END_TOKEN:
- if (field.type == TType.STRING) {
- this.end_token = iprot.readString();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case COUNT:
- if (field.type == TType.I32) {
- this.count = iprot.readI32();
- setCountIsSet(true);
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- }
- iprot.readFieldEnd();
+ switch (field.id) {
+ case 1: // START_KEY
+ if (field.type == TType.STRING) {
+ this.start_key = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 2: // END_KEY
+ if (field.type == TType.STRING) {
+ this.end_key = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 3: // START_TOKEN
+ if (field.type == TType.STRING) {
+ this.start_token = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 4: // END_TOKEN
+ if (field.type == TType.STRING) {
+ this.end_token = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 5: // COUNT
+ if (field.type == TType.I32) {
+ this.count = iprot.readI32();
+ setCountIsSet(true);
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java Mon Mar 1 20:02:34 2010
@@ -333,21 +333,23 @@
int lastComparison = 0;
KeySlice typedOther = (KeySlice)other;
- lastComparison = Boolean.valueOf(isSetKey()).compareTo(isSetKey());
+ lastComparison = Boolean.valueOf(isSetKey()).compareTo(typedOther.isSetKey());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(key, typedOther.key);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetKey()) { lastComparison = TBaseHelper.compareTo(key, typedOther.key);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetColumns()).compareTo(isSetColumns());
+ lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(columns, typedOther.columns);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetColumns()) { lastComparison = TBaseHelper.compareTo(columns, typedOther.columns);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
return 0;
}
@@ -361,39 +363,36 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case KEY:
- if (field.type == TType.STRING) {
- this.key = iprot.readString();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case COLUMNS:
- if (field.type == TType.LIST) {
+ switch (field.id) {
+ case 1: // KEY
+ if (field.type == TType.STRING) {
+ this.key = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 2: // COLUMNS
+ if (field.type == TType.LIST) {
+ {
+ TList _list8 = iprot.readListBegin();
+ this.columns = new ArrayList<ColumnOrSuperColumn>(_list8.size);
+ for (int _i9 = 0; _i9 < _list8.size; ++_i9)
{
- TList _list8 = iprot.readListBegin();
- this.columns = new ArrayList<ColumnOrSuperColumn>(_list8.size);
- for (int _i9 = 0; _i9 < _list8.size; ++_i9)
- {
- ColumnOrSuperColumn _elem10;
- _elem10 = new ColumnOrSuperColumn();
- _elem10.read(iprot);
- this.columns.add(_elem10);
- }
- iprot.readListEnd();
+ ColumnOrSuperColumn _elem10;
+ _elem10 = new ColumnOrSuperColumn();
+ _elem10.read(iprot);
+ this.columns.add(_elem10);
}
- } else {
- TProtocolUtil.skip(iprot, field.type);
+ iprot.readListEnd();
}
- break;
- }
- iprot.readFieldEnd();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java Mon Mar 1 20:02:34 2010
@@ -302,21 +302,23 @@
int lastComparison = 0;
Mutation typedOther = (Mutation)other;
- lastComparison = Boolean.valueOf(isSetColumn_or_supercolumn()).compareTo(isSetColumn_or_supercolumn());
+ lastComparison = Boolean.valueOf(isSetColumn_or_supercolumn()).compareTo(typedOther.isSetColumn_or_supercolumn());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(column_or_supercolumn, typedOther.column_or_supercolumn);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetColumn_or_supercolumn()) { lastComparison = TBaseHelper.compareTo(column_or_supercolumn, typedOther.column_or_supercolumn);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetDeletion()).compareTo(isSetDeletion());
+ lastComparison = Boolean.valueOf(isSetDeletion()).compareTo(typedOther.isSetDeletion());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(deletion, typedOther.deletion);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetDeletion()) { lastComparison = TBaseHelper.compareTo(deletion, typedOther.deletion);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
return 0;
}
@@ -330,30 +332,27 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case COLUMN_OR_SUPERCOLUMN:
- if (field.type == TType.STRUCT) {
- this.column_or_supercolumn = new ColumnOrSuperColumn();
- this.column_or_supercolumn.read(iprot);
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case DELETION:
- if (field.type == TType.STRUCT) {
- this.deletion = new Deletion();
- this.deletion.read(iprot);
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- }
- iprot.readFieldEnd();
+ switch (field.id) {
+ case 1: // COLUMN_OR_SUPERCOLUMN
+ if (field.type == TType.STRUCT) {
+ this.column_or_supercolumn = new ColumnOrSuperColumn();
+ this.column_or_supercolumn.read(iprot);
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 2: // DELETION
+ if (field.type == TType.STRUCT) {
+ this.deletion = new Deletion();
+ this.deletion.read(iprot);
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java Mon Mar 1 20:02:34 2010
@@ -202,14 +202,11 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- }
- iprot.readFieldEnd();
+ switch (field.id) {
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Propchange: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 1 20:02:34 2010
@@ -1,5 +1,5 @@
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:888872-903502
-/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:911237-916976
+/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:911237-917571
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:749219-768588
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java Mon Mar 1 20:02:34 2010
@@ -331,21 +331,23 @@
int lastComparison = 0;
SlicePredicate typedOther = (SlicePredicate)other;
- lastComparison = Boolean.valueOf(isSetColumn_names()).compareTo(isSetColumn_names());
+ lastComparison = Boolean.valueOf(isSetColumn_names()).compareTo(typedOther.isSetColumn_names());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(column_names, typedOther.column_names);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetColumn_names()) { lastComparison = TBaseHelper.compareTo(column_names, typedOther.column_names);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetSlice_range()).compareTo(isSetSlice_range());
+ lastComparison = Boolean.valueOf(isSetSlice_range()).compareTo(typedOther.isSetSlice_range());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(slice_range, typedOther.slice_range);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetSlice_range()) { lastComparison = TBaseHelper.compareTo(slice_range, typedOther.slice_range);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
return 0;
}
@@ -359,39 +361,36 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case COLUMN_NAMES:
- if (field.type == TType.LIST) {
+ switch (field.id) {
+ case 1: // COLUMN_NAMES
+ if (field.type == TType.LIST) {
+ {
+ TList _list4 = iprot.readListBegin();
+ this.column_names = new ArrayList<byte[]>(_list4.size);
+ for (int _i5 = 0; _i5 < _list4.size; ++_i5)
{
- TList _list4 = iprot.readListBegin();
- this.column_names = new ArrayList<byte[]>(_list4.size);
- for (int _i5 = 0; _i5 < _list4.size; ++_i5)
- {
- byte[] _elem6;
- _elem6 = iprot.readBinary();
- this.column_names.add(_elem6);
- }
- iprot.readListEnd();
+ byte[] _elem6;
+ _elem6 = iprot.readBinary();
+ this.column_names.add(_elem6);
}
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case SLICE_RANGE:
- if (field.type == TType.STRUCT) {
- this.slice_range = new SliceRange();
- this.slice_range.read(iprot);
- } else {
- TProtocolUtil.skip(iprot, field.type);
+ iprot.readListEnd();
}
- break;
- }
- iprot.readFieldEnd();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 2: // SLICE_RANGE
+ if (field.type == TType.STRUCT) {
+ this.slice_range = new SliceRange();
+ this.slice_range.read(iprot);
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java Mon Mar 1 20:02:34 2010
@@ -441,37 +441,41 @@
int lastComparison = 0;
SliceRange typedOther = (SliceRange)other;
- lastComparison = Boolean.valueOf(isSetStart()).compareTo(isSetStart());
+ lastComparison = Boolean.valueOf(isSetStart()).compareTo(typedOther.isSetStart());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(start, typedOther.start);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetStart()) { lastComparison = TBaseHelper.compareTo(start, typedOther.start);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetFinish()).compareTo(isSetFinish());
+ lastComparison = Boolean.valueOf(isSetFinish()).compareTo(typedOther.isSetFinish());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(finish, typedOther.finish);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetFinish()) { lastComparison = TBaseHelper.compareTo(finish, typedOther.finish);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetReversed()).compareTo(isSetReversed());
+ lastComparison = Boolean.valueOf(isSetReversed()).compareTo(typedOther.isSetReversed());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(reversed, typedOther.reversed);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetReversed()) { lastComparison = TBaseHelper.compareTo(reversed, typedOther.reversed);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetCount()).compareTo(isSetCount());
+ lastComparison = Boolean.valueOf(isSetCount()).compareTo(typedOther.isSetCount());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(count, typedOther.count);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetCount()) { lastComparison = TBaseHelper.compareTo(count, typedOther.count);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
return 0;
}
@@ -485,44 +489,41 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case START:
- if (field.type == TType.STRING) {
- this.start = iprot.readBinary();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case FINISH:
- if (field.type == TType.STRING) {
- this.finish = iprot.readBinary();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case REVERSED:
- if (field.type == TType.BOOL) {
- this.reversed = iprot.readBool();
- setReversedIsSet(true);
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case COUNT:
- if (field.type == TType.I32) {
- this.count = iprot.readI32();
- setCountIsSet(true);
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- }
- iprot.readFieldEnd();
+ switch (field.id) {
+ case 1: // START
+ if (field.type == TType.STRING) {
+ this.start = iprot.readBinary();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 2: // FINISH
+ if (field.type == TType.STRING) {
+ this.finish = iprot.readBinary();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 3: // REVERSED
+ if (field.type == TType.BOOL) {
+ this.reversed = iprot.readBool();
+ setReversedIsSet(true);
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 4: // COUNT
+ if (field.type == TType.I32) {
+ this.count = iprot.readI32();
+ setCountIsSet(true);
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java Mon Mar 1 20:02:34 2010
@@ -333,21 +333,23 @@
int lastComparison = 0;
SuperColumn typedOther = (SuperColumn)other;
- lastComparison = Boolean.valueOf(isSetName()).compareTo(isSetName());
+ lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(name, typedOther.name);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetName()) { lastComparison = TBaseHelper.compareTo(name, typedOther.name);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetColumns()).compareTo(isSetColumns());
+ lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(columns, typedOther.columns);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetColumns()) { lastComparison = TBaseHelper.compareTo(columns, typedOther.columns);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
return 0;
}
@@ -361,39 +363,36 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case NAME:
- if (field.type == TType.STRING) {
- this.name = iprot.readBinary();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case COLUMNS:
- if (field.type == TType.LIST) {
+ switch (field.id) {
+ case 1: // NAME
+ if (field.type == TType.STRING) {
+ this.name = iprot.readBinary();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 2: // COLUMNS
+ if (field.type == TType.LIST) {
+ {
+ TList _list0 = iprot.readListBegin();
+ this.columns = new ArrayList<Column>(_list0.size);
+ for (int _i1 = 0; _i1 < _list0.size; ++_i1)
{
- TList _list0 = iprot.readListBegin();
- this.columns = new ArrayList<Column>(_list0.size);
- for (int _i1 = 0; _i1 < _list0.size; ++_i1)
- {
- Column _elem2;
- _elem2 = new Column();
- _elem2.read(iprot);
- this.columns.add(_elem2);
- }
- iprot.readListEnd();
+ Column _elem2;
+ _elem2 = new Column();
+ _elem2.read(iprot);
+ this.columns.add(_elem2);
}
- } else {
- TProtocolUtil.skip(iprot, field.type);
+ iprot.readListEnd();
}
- break;
- }
- iprot.readFieldEnd();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Propchange: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 1 20:02:34 2010
@@ -1,7 +1,7 @@
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:774578-792198
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:810145-834239,834349-834350
/incubator/cassandra/branches/cassandra-0.5/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:888872-903502
-/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:911237-916976
+/incubator/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:911237-917571
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:749219-794428
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:749219-768588
/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:749219-904544
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java Mon Mar 1 20:02:34 2010
@@ -202,14 +202,11 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- }
- iprot.readFieldEnd();
+ switch (field.id) {
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java Mon Mar 1 20:02:34 2010
@@ -382,29 +382,32 @@
int lastComparison = 0;
TokenRange typedOther = (TokenRange)other;
- lastComparison = Boolean.valueOf(isSetStart_token()).compareTo(isSetStart_token());
+ lastComparison = Boolean.valueOf(isSetStart_token()).compareTo(typedOther.isSetStart_token());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(start_token, typedOther.start_token);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetStart_token()) { lastComparison = TBaseHelper.compareTo(start_token, typedOther.start_token);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetEnd_token()).compareTo(isSetEnd_token());
+ lastComparison = Boolean.valueOf(isSetEnd_token()).compareTo(typedOther.isSetEnd_token());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(end_token, typedOther.end_token);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetEnd_token()) { lastComparison = TBaseHelper.compareTo(end_token, typedOther.end_token);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
- lastComparison = Boolean.valueOf(isSetEndpoints()).compareTo(isSetEndpoints());
+ lastComparison = Boolean.valueOf(isSetEndpoints()).compareTo(typedOther.isSetEndpoints());
if (lastComparison != 0) {
return lastComparison;
}
- lastComparison = TBaseHelper.compareTo(endpoints, typedOther.endpoints);
- if (lastComparison != 0) {
- return lastComparison;
+ if (isSetEndpoints()) { lastComparison = TBaseHelper.compareTo(endpoints, typedOther.endpoints);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
}
return 0;
}
@@ -418,45 +421,42 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- case START_TOKEN:
- if (field.type == TType.STRING) {
- this.start_token = iprot.readString();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case END_TOKEN:
- if (field.type == TType.STRING) {
- this.end_token = iprot.readString();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case ENDPOINTS:
- if (field.type == TType.LIST) {
+ switch (field.id) {
+ case 1: // START_TOKEN
+ if (field.type == TType.STRING) {
+ this.start_token = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 2: // END_TOKEN
+ if (field.type == TType.STRING) {
+ this.end_token = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case 3: // ENDPOINTS
+ if (field.type == TType.LIST) {
+ {
+ TList _list12 = iprot.readListBegin();
+ this.endpoints = new ArrayList<String>(_list12.size);
+ for (int _i13 = 0; _i13 < _list12.size; ++_i13)
{
- TList _list12 = iprot.readListBegin();
- this.endpoints = new ArrayList<String>(_list12.size);
- for (int _i13 = 0; _i13 < _list12.size; ++_i13)
- {
- String _elem14;
- _elem14 = iprot.readString();
- this.endpoints.add(_elem14);
- }
- iprot.readListEnd();
+ String _elem14;
+ _elem14 = iprot.readString();
+ this.endpoints.add(_elem14);
}
- } else {
- TProtocolUtil.skip(iprot, field.type);
+ iprot.readListEnd();
}
- break;
- }
- iprot.readFieldEnd();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Modified: incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java (original)
+++ incubator/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java Mon Mar 1 20:02:34 2010
@@ -202,14 +202,11 @@
if (field.type == TType.STOP) {
break;
}
- _Fields fieldId = _Fields.findByThriftId(field.id);
- if (fieldId == null) {
- TProtocolUtil.skip(iprot, field.type);
- } else {
- switch (fieldId) {
- }
- iprot.readFieldEnd();
+ switch (field.id) {
+ default:
+ TProtocolUtil.skip(iprot, field.type);
}
+ iprot.readFieldEnd();
}
iprot.readStructEnd();
Modified: incubator/cassandra/trunk/test/system/test_thrift_server.py
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/system/test_thrift_server.py?rev=917685&r1=917684&r2=917685&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/system/test_thrift_server.py (original)
+++ incubator/cassandra/trunk/test/system/test_thrift_server.py Mon Mar 1 20:02:34 2010
@@ -493,6 +493,8 @@
_expect_exception(lambda: client.insert('Keyspace1', 'key1', ColumnPath('Standard1', column='x'*(2**16)), 'value', 0, ConsistencyLevel.ONE), InvalidRequestException)
def test_bad_calls(self):
+ # missing arguments
+ _expect_exception(lambda: client.insert(None, None, None, None, None, None), TApplicationException)
# supercolumn in a non-super CF
_expect_exception(lambda: client.insert('Keyspace1', 'key1', ColumnPath('Standard1', 'x', 'y'), 'value', 0, ConsistencyLevel.ONE), InvalidRequestException)
# key too long