From 59ec4109e45d8b84f6f18ea66179840f50de6b25 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Thu, 27 Aug 2009 20:47:21 +0000 Subject: [PATCH] bump thrift version to 808609 to fix regression from THRIFT-562. patch by jbellis for CASSANDRA-387 git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808620 13f79535-47bb-0310-9956-ffa450edef68 --- .../cassandra/service/BatchMutation.java | 6 - .../apache/cassandra/service/Cassandra.java | 216 ------------------ .../org/apache/cassandra/service/Column.java | 10 - .../cassandra/service/ColumnParent.java | 3 - .../apache/cassandra/service/ColumnPath.java | 3 - .../service/InvalidRequestException.java | 3 - .../apache/cassandra/service/SliceRange.java | 14 -- .../apache/cassandra/service/SuperColumn.java | 6 - ...rift-r806014.jar => libthrift-r808609.jar} | Bin 9 files changed, 261 deletions(-) rename lib/{libthrift-r806014.jar => libthrift-r808609.jar} (100%) diff --git a/interface/gen-java/org/apache/cassandra/service/BatchMutation.java b/interface/gen-java/org/apache/cassandra/service/BatchMutation.java index 46382840ed..68a04921b0 100644 --- a/interface/gen-java/org/apache/cassandra/service/BatchMutation.java +++ b/interface/gen-java/org/apache/cassandra/service/BatchMutation.java @@ -364,12 +364,6 @@ public class BatchMutation implements TBase, java.io.Serializable, Cloneable { 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 } diff --git a/interface/gen-java/org/apache/cassandra/service/Cassandra.java b/interface/gen-java/org/apache/cassandra/service/Cassandra.java index 000d4d9d9d..f70bdcfd8b 100644 --- a/interface/gen-java/org/apache/cassandra/service/Cassandra.java +++ b/interface/gen-java/org/apache/cassandra/service/Cassandra.java @@ -1413,9 +1413,6 @@ public class Cassandra { // 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 class Cassandra { 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 class Cassandra { 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 @@ public class Cassandra { // 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 class Cassandra { 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 class Cassandra { 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 @@ public class Cassandra { // 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 class Cassandra { 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 class Cassandra { 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 @@ public class Cassandra { // 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 class Cassandra { 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 class Cassandra { 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 @@ public class Cassandra { // 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 class Cassandra { 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 @@ public class Cassandra { // 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 class Cassandra { 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 @@ public class Cassandra { // 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 class Cassandra { 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 class Cassandra { 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 @@ public class Cassandra { // 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 class Cassandra { 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 class Cassandra { 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 @@ public class Cassandra { // 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 class Cassandra { 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 class Cassandra { 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 @@ public class Cassandra { // 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 class Cassandra { 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 class Cassandra { 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 class Cassandra { 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 class Cassandra { 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 class Cassandra { 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 class Cassandra { 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 class Cassandra { 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 class Cassandra { 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 } diff --git a/interface/gen-java/org/apache/cassandra/service/Column.java b/interface/gen-java/org/apache/cassandra/service/Column.java index 500a7d9f33..59042473c2 100644 --- a/interface/gen-java/org/apache/cassandra/service/Column.java +++ b/interface/gen-java/org/apache/cassandra/service/Column.java @@ -366,9 +366,6 @@ public class Column implements TBase, java.io.Serializable, Cloneable, Comparabl // 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 class Column implements TBase, java.io.Serializable, Cloneable, Comparabl 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 } diff --git a/interface/gen-java/org/apache/cassandra/service/ColumnParent.java b/interface/gen-java/org/apache/cassandra/service/ColumnParent.java index eff5be75c3..3f4102441f 100644 --- a/interface/gen-java/org/apache/cassandra/service/ColumnParent.java +++ b/interface/gen-java/org/apache/cassandra/service/ColumnParent.java @@ -347,9 +347,6 @@ public class ColumnParent implements TBase, java.io.Serializable, Cloneable, Com 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 } diff --git a/interface/gen-java/org/apache/cassandra/service/ColumnPath.java b/interface/gen-java/org/apache/cassandra/service/ColumnPath.java index 98014b8f2f..4f6f662dac 100644 --- a/interface/gen-java/org/apache/cassandra/service/ColumnPath.java +++ b/interface/gen-java/org/apache/cassandra/service/ColumnPath.java @@ -441,9 +441,6 @@ public class ColumnPath implements TBase, java.io.Serializable, Cloneable, Compa 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 } diff --git a/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java b/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java index a37009bfd6..4d48206ba8 100644 --- a/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java +++ b/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java @@ -253,9 +253,6 @@ public class InvalidRequestException extends Exception implements TBase, java.io 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 } diff --git a/interface/gen-java/org/apache/cassandra/service/SliceRange.java b/interface/gen-java/org/apache/cassandra/service/SliceRange.java index 142126373b..cf060e20fb 100644 --- a/interface/gen-java/org/apache/cassandra/service/SliceRange.java +++ b/interface/gen-java/org/apache/cassandra/service/SliceRange.java @@ -441,12 +441,6 @@ public class SliceRange implements TBase, java.io.Serializable, Cloneable, Compa // 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 class SliceRange implements TBase, java.io.Serializable, Cloneable, Compa 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 } diff --git a/interface/gen-java/org/apache/cassandra/service/SuperColumn.java b/interface/gen-java/org/apache/cassandra/service/SuperColumn.java index a2e7c7e4cc..dc682f0b46 100644 --- a/interface/gen-java/org/apache/cassandra/service/SuperColumn.java +++ b/interface/gen-java/org/apache/cassandra/service/SuperColumn.java @@ -365,12 +365,6 @@ public class SuperColumn implements TBase, java.io.Serializable, Cloneable, Comp 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 } diff --git a/lib/libthrift-r806014.jar b/lib/libthrift-r808609.jar similarity index 100% rename from lib/libthrift-r806014.jar rename to lib/libthrift-r808609.jar