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 2009/08/27 22:47:22 UTC
svn commit: r808620 - in /incubator/cassandra/trunk:
interface/gen-java/org/apache/cassandra/service/ lib/
Author: jbellis
Date: Thu Aug 27 20:47:21 2009
New Revision: 808620
URL: http://svn.apache.org/viewvc?rev=808620&view=rev
Log:
bump thrift version to 808609 to fix regression from THRIFT-562. patch by jbellis for CASSANDRA-387
Added:
incubator/cassandra/trunk/lib/libthrift-r808609.jar
- copied, changed from r808597, incubator/cassandra/trunk/lib/libthrift-r806014.jar
Removed:
incubator/cassandra/trunk/lib/libthrift-r806014.jar
Modified:
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutation.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnParent.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SliceRange.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java
Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutation.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutation.java?rev=808620&r1=808619&r2=808620&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutation.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutation.java Thu Aug 27 20:47:21 2009
@@ -364,12 +364,6 @@
public void validate() throws TException {
// check for required fields
- if (key == null) {
- throw new TProtocolException("Required field 'key' was not present! Struct: " + toString());
- }
- if (cfmap == null) {
- throw new TProtocolException("Required field 'cfmap' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java?rev=808620&r1=808619&r2=808620&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java Thu Aug 27 20:47:21 2009
@@ -1413,9 +1413,6 @@
// check for required fields of primitive type, which can't be checked in the validate method
- if (!isSetConsistency_level()) {
- throw new TProtocolException("Required field 'consistency_level' was not found in serialized data! Struct: " + toString());
- }
validate();
}
@@ -1504,19 +1501,6 @@
public void validate() throws TException {
// check for required fields
- if (keyspace == null) {
- throw new TProtocolException("Required field 'keyspace' was not present! Struct: " + toString());
- }
- if (key == null) {
- throw new TProtocolException("Required field 'key' was not present! Struct: " + toString());
- }
- if (column_parent == null) {
- throw new TProtocolException("Required field 'column_parent' was not present! Struct: " + toString());
- }
- if (predicate == null) {
- throw new TProtocolException("Required field 'predicate' was not present! Struct: " + toString());
- }
- // 'consistency_level' is only checked in read() because it's a primitive and you chose the non-beans generator.
// check that fields of type enum have valid values
if (isSetConsistency_level() && !ConsistencyLevel.VALID_VALUES.contains(consistency_level)){
throw new TProtocolException("The field 'consistency_level' has been assigned the invalid value " + consistency_level);
@@ -1926,15 +1910,6 @@
public void validate() throws TException {
// check for required fields
- if (success == null) {
- throw new TProtocolException("Required field 'success' was not present! Struct: " + toString());
- }
- if (ire == null) {
- throw new TProtocolException("Required field 'ire' was not present! Struct: " + toString());
- }
- if (nfe == null) {
- throw new TProtocolException("Required field 'nfe' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
@@ -2436,9 +2411,6 @@
// check for required fields of primitive type, which can't be checked in the validate method
- if (!isSetConsistency_level()) {
- throw new TProtocolException("Required field 'consistency_level' was not found in serialized data! Struct: " + toString());
- }
validate();
}
@@ -2533,19 +2505,6 @@
public void validate() throws TException {
// check for required fields
- if (keyspace == null) {
- throw new TProtocolException("Required field 'keyspace' was not present! Struct: " + toString());
- }
- if (keys == null) {
- throw new TProtocolException("Required field 'keys' was not present! Struct: " + toString());
- }
- if (column_parent == null) {
- throw new TProtocolException("Required field 'column_parent' was not present! Struct: " + toString());
- }
- if (predicate == null) {
- throw new TProtocolException("Required field 'predicate' was not present! Struct: " + toString());
- }
- // 'consistency_level' is only checked in read() because it's a primitive and you chose the non-beans generator.
// check that fields of type enum have valid values
if (isSetConsistency_level() && !ConsistencyLevel.VALID_VALUES.contains(consistency_level)){
throw new TProtocolException("The field 'consistency_level' has been assigned the invalid value " + consistency_level);
@@ -2876,12 +2835,6 @@
public void validate() throws TException {
// check for required fields
- if (success == null) {
- throw new TProtocolException("Required field 'success' was not present! Struct: " + toString());
- }
- if (ire == null) {
- throw new TProtocolException("Required field 'ire' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
@@ -3296,9 +3249,6 @@
// check for required fields of primitive type, which can't be checked in the validate method
- if (!isSetConsistency_level()) {
- throw new TProtocolException("Required field 'consistency_level' was not found in serialized data! Struct: " + toString());
- }
validate();
}
@@ -3374,16 +3324,6 @@
public void validate() throws TException {
// check for required fields
- if (keyspace == null) {
- throw new TProtocolException("Required field 'keyspace' was not present! Struct: " + toString());
- }
- if (key == null) {
- throw new TProtocolException("Required field 'key' was not present! Struct: " + toString());
- }
- if (column_path == null) {
- throw new TProtocolException("Required field 'column_path' was not present! Struct: " + toString());
- }
- // 'consistency_level' is only checked in read() because it's a primitive and you chose the non-beans generator.
// check that fields of type enum have valid values
if (isSetConsistency_level() && !ConsistencyLevel.VALID_VALUES.contains(consistency_level)){
throw new TProtocolException("The field 'consistency_level' has been assigned the invalid value " + consistency_level);
@@ -3772,15 +3712,6 @@
public void validate() throws TException {
// check for required fields
- if (success == null) {
- throw new TProtocolException("Required field 'success' was not present! Struct: " + toString());
- }
- if (ire == null) {
- throw new TProtocolException("Required field 'ire' was not present! Struct: " + toString());
- }
- if (nfe == null) {
- throw new TProtocolException("Required field 'nfe' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
@@ -4210,9 +4141,6 @@
// check for required fields of primitive type, which can't be checked in the validate method
- if (!isSetConsistency_level()) {
- throw new TProtocolException("Required field 'consistency_level' was not found in serialized data! Struct: " + toString());
- }
validate();
}
@@ -4294,16 +4222,6 @@
public void validate() throws TException {
// check for required fields
- if (keyspace == null) {
- throw new TProtocolException("Required field 'keyspace' was not present! Struct: " + toString());
- }
- if (keys == null) {
- throw new TProtocolException("Required field 'keys' was not present! Struct: " + toString());
- }
- if (column_path == null) {
- throw new TProtocolException("Required field 'column_path' was not present! Struct: " + toString());
- }
- // 'consistency_level' is only checked in read() because it's a primitive and you chose the non-beans generator.
// check that fields of type enum have valid values
if (isSetConsistency_level() && !ConsistencyLevel.VALID_VALUES.contains(consistency_level)){
throw new TProtocolException("The field 'consistency_level' has been assigned the invalid value " + consistency_level);
@@ -4614,12 +4532,6 @@
public void validate() throws TException {
// check for required fields
- if (success == null) {
- throw new TProtocolException("Required field 'success' was not present! Struct: " + toString());
- }
- if (ire == null) {
- throw new TProtocolException("Required field 'ire' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
@@ -5034,9 +4946,6 @@
// check for required fields of primitive type, which can't be checked in the validate method
- if (!isSetConsistency_level()) {
- throw new TProtocolException("Required field 'consistency_level' was not found in serialized data! Struct: " + toString());
- }
validate();
}
@@ -5112,16 +5021,6 @@
public void validate() throws TException {
// check for required fields
- if (keyspace == null) {
- throw new TProtocolException("Required field 'keyspace' was not present! Struct: " + toString());
- }
- if (key == null) {
- throw new TProtocolException("Required field 'key' was not present! Struct: " + toString());
- }
- if (column_parent == null) {
- throw new TProtocolException("Required field 'column_parent' was not present! Struct: " + toString());
- }
- // 'consistency_level' is only checked in read() because it's a primitive and you chose the non-beans generator.
// check that fields of type enum have valid values
if (isSetConsistency_level() && !ConsistencyLevel.VALID_VALUES.contains(consistency_level)){
throw new TProtocolException("The field 'consistency_level' has been assigned the invalid value " + consistency_level);
@@ -5383,9 +5282,6 @@
// check for required fields of primitive type, which can't be checked in the validate method
- if (!isSetSuccess()) {
- throw new TProtocolException("Required field 'success' was not found in serialized data! Struct: " + toString());
- }
validate();
}
@@ -5427,10 +5323,6 @@
public void validate() throws TException {
// check for required fields
- // 'success' is only checked in read() because it's a primitive and you chose the non-beans generator.
- if (ire == null) {
- throw new TProtocolException("Required field 'ire' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
@@ -5988,12 +5880,6 @@
// check for required fields of primitive type, which can't be checked in the validate method
- if (!isSetTimestamp()) {
- throw new TProtocolException("Required field 'timestamp' was not found in serialized data! Struct: " + toString());
- }
- if (!isSetConsistency_level()) {
- throw new TProtocolException("Required field 'consistency_level' was not found in serialized data! Struct: " + toString());
- }
validate();
}
@@ -6094,20 +5980,6 @@
public void validate() throws TException {
// check for required fields
- if (keyspace == null) {
- throw new TProtocolException("Required field 'keyspace' was not present! Struct: " + toString());
- }
- if (key == null) {
- throw new TProtocolException("Required field 'key' was not present! Struct: " + toString());
- }
- if (column_path == null) {
- throw new TProtocolException("Required field 'column_path' was not present! Struct: " + toString());
- }
- if (value == null) {
- throw new TProtocolException("Required field 'value' was not present! Struct: " + toString());
- }
- // 'timestamp' is only checked in read() because it's a primitive and you chose the non-beans generator.
- // 'consistency_level' is only checked in read() because it's a primitive and you chose the non-beans generator.
// check that fields of type enum have valid values
if (isSetConsistency_level() && !ConsistencyLevel.VALID_VALUES.contains(consistency_level)){
throw new TProtocolException("The field 'consistency_level' has been assigned the invalid value " + consistency_level);
@@ -6412,12 +6284,6 @@
public void validate() throws TException {
// check for required fields
- if (ire == null) {
- throw new TProtocolException("Required field 'ire' was not present! Struct: " + toString());
- }
- if (ue == null) {
- throw new TProtocolException("Required field 'ue' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
@@ -6726,9 +6592,6 @@
// check for required fields of primitive type, which can't be checked in the validate method
- if (!isSetConsistency_level()) {
- throw new TProtocolException("Required field 'consistency_level' was not found in serialized data! Struct: " + toString());
- }
validate();
}
@@ -6791,13 +6654,6 @@
public void validate() throws TException {
// check for required fields
- if (keyspace == null) {
- throw new TProtocolException("Required field 'keyspace' was not present! Struct: " + toString());
- }
- if (batch_mutation == null) {
- throw new TProtocolException("Required field 'batch_mutation' was not present! Struct: " + toString());
- }
- // 'consistency_level' is only checked in read() because it's a primitive and you chose the non-beans generator.
// check that fields of type enum have valid values
if (isSetConsistency_level() && !ConsistencyLevel.VALID_VALUES.contains(consistency_level)){
throw new TProtocolException("The field 'consistency_level' has been assigned the invalid value " + consistency_level);
@@ -7102,12 +6958,6 @@
public void validate() throws TException {
// check for required fields
- if (ire == null) {
- throw new TProtocolException("Required field 'ire' was not present! Struct: " + toString());
- }
- if (ue == null) {
- throw new TProtocolException("Required field 'ue' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
@@ -7593,12 +7443,6 @@
// check for required fields of primitive type, which can't be checked in the validate method
- if (!isSetTimestamp()) {
- throw new TProtocolException("Required field 'timestamp' was not found in serialized data! Struct: " + toString());
- }
- if (!isSetConsistency_level()) {
- throw new TProtocolException("Required field 'consistency_level' was not found in serialized data! Struct: " + toString());
- }
validate();
}
@@ -7681,17 +7525,6 @@
public void validate() throws TException {
// check for required fields
- if (keyspace == null) {
- throw new TProtocolException("Required field 'keyspace' was not present! Struct: " + toString());
- }
- if (key == null) {
- throw new TProtocolException("Required field 'key' was not present! Struct: " + toString());
- }
- if (column_path == null) {
- throw new TProtocolException("Required field 'column_path' was not present! Struct: " + toString());
- }
- // 'timestamp' is only checked in read() because it's a primitive and you chose the non-beans generator.
- // 'consistency_level' is only checked in read() because it's a primitive and you chose the non-beans generator.
// check that fields of type enum have valid values
if (isSetConsistency_level() && !ConsistencyLevel.VALID_VALUES.contains(consistency_level)){
throw new TProtocolException("The field 'consistency_level' has been assigned the invalid value " + consistency_level);
@@ -7996,12 +7829,6 @@
public void validate() throws TException {
// check for required fields
- if (ire == null) {
- throw new TProtocolException("Required field 'ire' was not present! Struct: " + toString());
- }
- if (ue == null) {
- throw new TProtocolException("Required field 'ue' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
@@ -8478,9 +8305,6 @@
// check for required fields of primitive type, which can't be checked in the validate method
- if (!isSetCount()) {
- throw new TProtocolException("Required field 'count' was not found in serialized data! Struct: " + toString());
- }
validate();
}
@@ -8561,19 +8385,6 @@
public void validate() throws TException {
// check for required fields
- if (keyspace == null) {
- throw new TProtocolException("Required field 'keyspace' was not present! Struct: " + toString());
- }
- if (column_family == null) {
- throw new TProtocolException("Required field 'column_family' was not present! Struct: " + toString());
- }
- if (start == null) {
- throw new TProtocolException("Required field 'start' was not present! Struct: " + toString());
- }
- if (finish == null) {
- throw new TProtocolException("Required field 'finish' was not present! Struct: " + toString());
- }
- // 'count' is only checked in read() because it's a primitive and you chose the non-beans generator.
// check that fields of type enum have valid values
}
@@ -8895,12 +8706,6 @@
public void validate() throws TException {
// check for required fields
- if (success == null) {
- throw new TProtocolException("Required field 'success' was not present! Struct: " + toString());
- }
- if (ire == null) {
- throw new TProtocolException("Required field 'ire' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
@@ -9118,9 +8923,6 @@
public void validate() throws TException {
// check for required fields
- if (property == null) {
- throw new TProtocolException("Required field 'property' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
@@ -9337,9 +9139,6 @@
public void validate() throws TException {
// check for required fields
- if (success == null) {
- throw new TProtocolException("Required field 'success' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
@@ -9557,9 +9356,6 @@
public void validate() throws TException {
// check for required fields
- if (property == null) {
- throw new TProtocolException("Required field 'property' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
@@ -9797,9 +9593,6 @@
public void validate() throws TException {
// check for required fields
- if (success == null) {
- throw new TProtocolException("Required field 'success' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
@@ -10017,9 +9810,6 @@
public void validate() throws TException {
// check for required fields
- if (keyspace == null) {
- throw new TProtocolException("Required field 'keyspace' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
@@ -10358,12 +10148,6 @@
public void validate() throws TException {
// check for required fields
- if (success == null) {
- throw new TProtocolException("Required field 'success' was not present! Struct: " + toString());
- }
- if (nfe == null) {
- throw new TProtocolException("Required field 'nfe' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java?rev=808620&r1=808619&r2=808620&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java Thu Aug 27 20:47:21 2009
@@ -366,9 +366,6 @@
// check for required fields of primitive type, which can't be checked in the validate method
- if (!isSetTimestamp()) {
- throw new TProtocolException("Required field 'timestamp' was not found in serialized data! Struct: " + toString());
- }
validate();
}
@@ -433,13 +430,6 @@
public void validate() throws TException {
// check for required fields
- if (name == null) {
- throw new TProtocolException("Required field 'name' was not present! Struct: " + toString());
- }
- if (value == null) {
- throw new TProtocolException("Required field 'value' was not present! Struct: " + toString());
- }
- // 'timestamp' is only checked in read() because it's a primitive and you chose the non-beans generator.
// check that fields of type enum have valid values
}
Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnParent.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnParent.java?rev=808620&r1=808619&r2=808620&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnParent.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnParent.java Thu Aug 27 20:47:21 2009
@@ -347,9 +347,6 @@
public void validate() throws TException {
// check for required fields
- if (column_family == null) {
- throw new TProtocolException("Required field 'column_family' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java?rev=808620&r1=808619&r2=808620&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java Thu Aug 27 20:47:21 2009
@@ -441,9 +441,6 @@
public void validate() throws TException {
// check for required fields
- if (column_family == null) {
- throw new TProtocolException("Required field 'column_family' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java?rev=808620&r1=808619&r2=808620&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java Thu Aug 27 20:47:21 2009
@@ -253,9 +253,6 @@
public void validate() throws TException {
// check for required fields
- if (why == null) {
- throw new TProtocolException("Required field 'why' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SliceRange.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SliceRange.java?rev=808620&r1=808619&r2=808620&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SliceRange.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SliceRange.java Thu Aug 27 20:47:21 2009
@@ -441,12 +441,6 @@
// check for required fields of primitive type, which can't be checked in the validate method
- if (!isSetReversed()) {
- throw new TProtocolException("Required field 'reversed' was not found in serialized data! Struct: " + toString());
- }
- if (!isSetCount()) {
- throw new TProtocolException("Required field 'count' was not found in serialized data! Struct: " + toString());
- }
validate();
}
@@ -518,14 +512,6 @@
public void validate() throws TException {
// check for required fields
- if (start == null) {
- throw new TProtocolException("Required field 'start' was not present! Struct: " + toString());
- }
- if (finish == null) {
- throw new TProtocolException("Required field 'finish' was not present! Struct: " + toString());
- }
- // 'reversed' is only checked in read() because it's a primitive and you chose the non-beans generator.
- // 'count' is only checked in read() because it's a primitive and you chose the non-beans generator.
// check that fields of type enum have valid values
}
Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java?rev=808620&r1=808619&r2=808620&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java Thu Aug 27 20:47:21 2009
@@ -365,12 +365,6 @@
public void validate() throws TException {
// check for required fields
- if (name == null) {
- throw new TProtocolException("Required field 'name' was not present! Struct: " + toString());
- }
- if (columns == null) {
- throw new TProtocolException("Required field 'columns' was not present! Struct: " + toString());
- }
// check that fields of type enum have valid values
}
Copied: incubator/cassandra/trunk/lib/libthrift-r808609.jar (from r808597, incubator/cassandra/trunk/lib/libthrift-r806014.jar)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/lib/libthrift-r808609.jar?p2=incubator/cassandra/trunk/lib/libthrift-r808609.jar&p1=incubator/cassandra/trunk/lib/libthrift-r806014.jar&r1=808597&r2=808620&rev=808620&view=diff
==============================================================================
(empty)