cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r999542 [1/3] - in /cassandra/trunk: ./ conf/ interface/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/avro/ src/java/org/apache/cassandra/avro/ src/java/org/apache/cassandra/cli/ src/java/org/apache/cassandra/config/ src/java/...
Date Tue, 21 Sep 2010 18:56:25 GMT
Author: jbellis
Date: Tue Sep 21 18:56:23 2010
New Revision: 999542

URL: http://svn.apache.org/viewvc?rev=999542&view=rev
Log:
r/m Clock from Thrift api.  patch by jbellis; reviewed by slebresne for CASSANDRA-1501

Removed:
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Clock.java
Modified:
    cassandra/trunk/CHANGES.txt
    cassandra/trunk/conf/cassandra.yaml
    cassandra/trunk/interface/cassandra.genavro
    cassandra/trunk/interface/cassandra.thrift
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java
    cassandra/trunk/src/avro/internode.genavro
    cassandra/trunk/src/java/org/apache/cassandra/avro/AvroRecordFactory.java
    cassandra/trunk/src/java/org/apache/cassandra/avro/AvroValidation.java
    cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
    cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
    cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
    cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
    cassandra/trunk/src/java/org/apache/cassandra/config/RawColumnFamily.java
    cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java
    cassandra/trunk/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
    cassandra/trunk/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java
    cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
    cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
    cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java
    cassandra/trunk/test/conf/cassandra.yaml
    cassandra/trunk/test/system/__init__.py
    cassandra/trunk/test/system/test_thrift_server.py
    cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java
    cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java
    cassandra/trunk/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java

Modified: cassandra/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=999542&r1=999541&r2=999542&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Tue Sep 21 18:56:23 2010
@@ -82,6 +82,7 @@
  * fix replaying the last mutation in a commitlog unnecessarily (CASSANDRA-1512)
  * invoke getDefaultUncaughtExceptionHandler from DTPE with the original
    exception rather than the ExecutionException wrapper (CASSANDRA-1226)
+ * remove Clock from the Thrift (and Avro) API (CASSANDRA-1501)
 
 
 0.7-beta1

Modified: cassandra/trunk/conf/cassandra.yaml
URL: http://svn.apache.org/viewvc/cassandra/trunk/conf/cassandra.yaml?rev=999542&r1=999541&r2=999542&view=diff
==============================================================================
--- cassandra/trunk/conf/cassandra.yaml (original)
+++ cassandra/trunk/conf/cassandra.yaml Tue Sep 21 18:56:23 2010
@@ -320,8 +320,6 @@ keyspaces:
 
         - name: StandardByUUID1
           compare_with: TimeUUIDType
-          clock_type: Timestamp
-          reconciler: TimestampReconciler          
 
         - name: Super1
           column_type: Super

Modified: cassandra/trunk/interface/cassandra.genavro
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/cassandra.genavro?rev=999542&r1=999541&r2=999542&view=diff
==============================================================================
--- cassandra/trunk/interface/cassandra.genavro (original)
+++ cassandra/trunk/interface/cassandra.genavro Tue Sep 21 18:56:23 2010
@@ -33,14 +33,10 @@ protocol Cassandra {
         union { bytes, null } super_column;
     }
 
-    record Clock {
-        long timestamp;
-    }
-
     record Column {
         bytes name;
         bytes value;
-        Clock clock;
+        long timestamp;
         union { int, null } ttl;
     }
 
@@ -111,7 +107,7 @@ protocol Cassandra {
     }
 
     record Deletion {
-        Clock clock;
+        long timestamp;
         union { bytes, null } super_column;
         union { SlicePredicate, null } predicate;
     }
@@ -144,10 +140,8 @@ protocol Cassandra {
         string keyspace;
         string name;
         union { string, null } column_type;
-        union { string, null } clock_type;
         union { string, null } comparator_type;
         union { string, null } subcomparator_type;
-        union { string, null } reconciler;
         union { string, null } comment;
         union { double, null } row_cache_size;
         union { boolean, null } preload_row_cache;
@@ -294,7 +288,7 @@ protocol Cassandra {
     
     void remove(bytes key,
                 ColumnPath column_path,
-                Clock clock,
+                long timestamp,
                 ConsistencyLevel consistency_level)
     throws InvalidRequestException, UnavailableException, TimedOutException;
 

Modified: cassandra/trunk/interface/cassandra.thrift
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/cassandra.thrift?rev=999542&r1=999541&r2=999542&view=diff
==============================================================================
--- cassandra/trunk/interface/cassandra.thrift (original)
+++ cassandra/trunk/interface/cassandra.thrift Tue Sep 21 18:56:23 2010
@@ -46,33 +46,23 @@ namespace rb CassandraThrift
 #           for every edit that doesn't result in a change to major/minor.
 #
 # See the Semantic Versioning Specification (SemVer) http://semver.org.
-const string VERSION = "16.1.0"
+const string VERSION = "17.0.0"
 
 
 #
 # data structures
 #
 
-/** Encapsulate types of conflict resolution.
- *
- * @param timestamp. User-supplied timestamp. When two columns with this type of clock conflict, the one with the
- *                   highest timestamp is the one whose value the system will converge to. No other assumptions
- *                   are made about what the timestamp represents, but using microseconds-since-epoch is customary.
- */
-struct Clock {
-   1: required i64 timestamp,
-}
-
 /** Basic unit of data within a ColumnFamily.
  * @param name, the name by which this column is set and retrieved.  Maximum 64KB long.
  * @param value. The data associated with the name.  Maximum 2GB long, but in practice you should limit it to small numbers of MB (since Thrift must read the full value into memory to operate on it).
- * @param clock. The clock is used for conflict detection/resolution when two columns with same name need to be compared.
+ * @param timestamp. The timestamp is used for conflict detection/resolution when two columns with same name need to be compared.
  * @param ttl. An optional, positive delay (in seconds) after which the column will be automatically deleted. 
  */
 struct Column {
    1: required binary name,
    2: required binary value,
-   3: required Clock clock,
+   3: required i64 timestamp,
    4: optional i32 ttl,
 }
 
@@ -296,7 +286,7 @@ struct KeyCount {
 }
 
 struct Deletion {
-    1: required Clock clock,
+    1: required i64 timestamp,
     2: optional binary super_column,
     3: optional SlicePredicate predicate,
 }
@@ -342,10 +332,8 @@ struct CfDef {
     1: required string keyspace,
     2: required string name,
     3: optional string column_type="Standard",
-    4: optional string clock_type="Timestamp",
     5: optional string comparator_type="BytesType",
     6: optional string subcomparator_type,
-    7: optional string reconciler,
     8: optional string comment,
     9: optional double row_cache_size=0,
     10: optional bool preload_row_cache=0,
@@ -452,13 +440,13 @@ service Cassandra {
        throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te),
 
   /**
-    Remove data from the row specified by key at the granularity specified by column_path, and the given clock. Note
+    Remove data from the row specified by key at the granularity specified by column_path, and the given timestamp. Note
     that all the values in column_path besides column_path.column_family are truly optional: you can remove the entire
     row by just specifying the ColumnFamily, or you can remove a SuperColumn or a single Column by specifying those levels too.
    */
   void remove(1:required binary key,
               2:required ColumnPath column_path,
-              3:required Clock clock,
+              3:required i64 timestamp,
               4:ConsistencyLevel consistency_level=ONE)
        throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te),
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java?rev=999542&r1=999541&r2=999542&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java Tue Sep 21 18:56:23 2010
@@ -26,6 +26,7 @@ package org.apache.cassandra.thrift;
  */
 
 
+import org.apache.commons.lang.builder.HashCodeBuilder;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -247,7 +248,14 @@ public class AuthenticationException ext
 
   @Override
   public int hashCode() {
-    return 0;
+    HashCodeBuilder builder = new HashCodeBuilder();
+
+    boolean present_why = true && (isSetWhy());
+    builder.append(present_why);
+    if (present_why)
+      builder.append(why);
+
+    return builder.toHashCode();
   }
 
   public int compareTo(AuthenticationException other) {

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java?rev=999542&r1=999541&r2=999542&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java Tue Sep 21 18:56:23 2010
@@ -26,6 +26,7 @@ package org.apache.cassandra.thrift;
  */
 
 
+import org.apache.commons.lang.builder.HashCodeBuilder;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -272,7 +273,14 @@ public class AuthenticationRequest imple
 
   @Override
   public int hashCode() {
-    return 0;
+    HashCodeBuilder builder = new HashCodeBuilder();
+
+    boolean present_credentials = true && (isSetCredentials());
+    builder.append(present_credentials);
+    if (present_credentials)
+      builder.append(credentials);
+
+    return builder.toHashCode();
   }
 
   public int compareTo(AuthenticationRequest other) {

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java?rev=999542&r1=999541&r2=999542&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java Tue Sep 21 18:56:23 2010
@@ -26,6 +26,7 @@ package org.apache.cassandra.thrift;
  */
 
 
+import org.apache.commons.lang.builder.HashCodeBuilder;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -247,7 +248,14 @@ public class AuthorizationException exte
 
   @Override
   public int hashCode() {
-    return 0;
+    HashCodeBuilder builder = new HashCodeBuilder();
+
+    boolean present_why = true && (isSetWhy());
+    builder.append(present_why);
+    if (present_why)
+      builder.append(why);
+
+    return builder.toHashCode();
   }
 
   public int compareTo(AuthorizationException other) {

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java?rev=999542&r1=999541&r2=999542&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java Tue Sep 21 18:56:23 2010
@@ -26,6 +26,7 @@ package org.apache.cassandra.thrift;
  */
 
 
+import org.apache.commons.lang.builder.HashCodeBuilder;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -137,16 +138,16 @@ public class Cassandra {
     public void insert(byte[] key, ColumnParent column_parent, Column column, ConsistencyLevel consistency_level) throws InvalidRequestException, UnavailableException, TimedOutException, TException;
 
     /**
-     * Remove data from the row specified by key at the granularity specified by column_path, and the given clock. Note
+     * Remove data from the row specified by key at the granularity specified by column_path, and the given timestamp. Note
      * that all the values in column_path besides column_path.column_family are truly optional: you can remove the entire
      * row by just specifying the ColumnFamily, or you can remove a SuperColumn or a single Column by specifying those levels too.
      * 
      * @param key
      * @param column_path
-     * @param clock
+     * @param timestamp
      * @param consistency_level
      */
-    public void remove(byte[] key, ColumnPath column_path, Clock clock, ConsistencyLevel consistency_level) throws InvalidRequestException, UnavailableException, TimedOutException, TException;
+    public void remove(byte[] key, ColumnPath column_path, long timestamp, ConsistencyLevel consistency_level) throws InvalidRequestException, UnavailableException, TimedOutException, TException;
 
     /**
      *   Mutate many columns or super columns for many row keys. See also: Mutation.
@@ -315,7 +316,7 @@ public class Cassandra {
 
     public void insert(byte[] key, ColumnParent column_parent, Column column, ConsistencyLevel consistency_level, AsyncMethodCallback<AsyncClient.insert_call> resultHandler) throws TException;
 
-    public void remove(byte[] key, ColumnPath column_path, Clock clock, ConsistencyLevel consistency_level, AsyncMethodCallback<AsyncClient.remove_call> resultHandler) throws TException;
+    public void remove(byte[] key, ColumnPath column_path, long timestamp, ConsistencyLevel consistency_level, AsyncMethodCallback<AsyncClient.remove_call> resultHandler) throws TException;
 
     public void batch_mutate(Map<byte[],Map<String,List<Mutation>>> mutation_map, ConsistencyLevel consistency_level, AsyncMethodCallback<AsyncClient.batch_mutate_call> resultHandler) throws TException;
 
@@ -850,19 +851,19 @@ public class Cassandra {
       return;
     }
 
-    public void remove(byte[] key, ColumnPath column_path, Clock clock, ConsistencyLevel consistency_level) throws InvalidRequestException, UnavailableException, TimedOutException, TException
+    public void remove(byte[] key, ColumnPath column_path, long timestamp, ConsistencyLevel consistency_level) throws InvalidRequestException, UnavailableException, TimedOutException, TException
     {
-      send_remove(key, column_path, clock, consistency_level);
+      send_remove(key, column_path, timestamp, consistency_level);
       recv_remove();
     }
 
-    public void send_remove(byte[] key, ColumnPath column_path, Clock clock, ConsistencyLevel consistency_level) throws TException
+    public void send_remove(byte[] key, ColumnPath column_path, long timestamp, ConsistencyLevel consistency_level) throws TException
     {
       oprot_.writeMessageBegin(new TMessage("remove", TMessageType.CALL, ++seqid_));
       remove_args args = new remove_args();
       args.setKey(key);
       args.setColumn_path(column_path);
-      args.setClock(clock);
+      args.setTimestamp(timestamp);
       args.setConsistency_level(consistency_level);
       args.write(oprot_);
       oprot_.writeMessageEnd();
@@ -1983,22 +1984,22 @@ public class Cassandra {
       }
     }
 
-    public void remove(byte[] key, ColumnPath column_path, Clock clock, ConsistencyLevel consistency_level, AsyncMethodCallback<remove_call> resultHandler) throws TException {
+    public void remove(byte[] key, ColumnPath column_path, long timestamp, ConsistencyLevel consistency_level, AsyncMethodCallback<remove_call> resultHandler) throws TException {
       checkReady();
-      remove_call method_call = new remove_call(key, column_path, clock, consistency_level, resultHandler, this, protocolFactory, transport);
+      remove_call method_call = new remove_call(key, column_path, timestamp, consistency_level, resultHandler, this, protocolFactory, transport);
       manager.call(method_call);
     }
 
     public static class remove_call extends TAsyncMethodCall {
       private byte[] key;
       private ColumnPath column_path;
-      private Clock clock;
+      private long timestamp;
       private ConsistencyLevel consistency_level;
-      public remove_call(byte[] key, ColumnPath column_path, Clock clock, ConsistencyLevel consistency_level, AsyncMethodCallback<remove_call> resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException {
+      public remove_call(byte[] key, ColumnPath column_path, long timestamp, ConsistencyLevel consistency_level, AsyncMethodCallback<remove_call> resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.key = key;
         this.column_path = column_path;
-        this.clock = clock;
+        this.timestamp = timestamp;
         this.consistency_level = consistency_level;
       }
 
@@ -2007,7 +2008,7 @@ public class Cassandra {
         remove_args args = new remove_args();
         args.setKey(key);
         args.setColumn_path(column_path);
-        args.setClock(clock);
+        args.setTimestamp(timestamp);
         args.setConsistency_level(consistency_level);
         args.write(prot);
         prot.writeMessageEnd();
@@ -3082,7 +3083,7 @@ public class Cassandra {
         iprot.readMessageEnd();
         remove_result result = new remove_result();
         try {
-          iface_.remove(args.key, args.column_path, args.clock, args.consistency_level);
+          iface_.remove(args.key, args.column_path, args.timestamp, args.consistency_level);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
         } catch (UnavailableException ue) {
@@ -3936,7 +3937,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_auth_request = true && (isSetAuth_request());
+      builder.append(present_auth_request);
+      if (present_auth_request)
+        builder.append(auth_request);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(login_args other) {
@@ -4282,7 +4290,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_authnx = true && (isSetAuthnx());
+      builder.append(present_authnx);
+      if (present_authnx)
+        builder.append(authnx);
+
+      boolean present_authzx = true && (isSetAuthzx());
+      builder.append(present_authzx);
+      if (present_authzx)
+        builder.append(authzx);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(login_result other) {
@@ -4595,7 +4615,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_keyspace = true && (isSetKeyspace());
+      builder.append(present_keyspace);
+      if (present_keyspace)
+        builder.append(keyspace);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(set_keyspace_args other) {
@@ -4882,7 +4909,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(set_keyspace_result other) {
@@ -5301,7 +5335,24 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_key = true && (isSetKey());
+      builder.append(present_key);
+      if (present_key)
+        builder.append(key);
+
+      boolean present_column_path = true && (isSetColumn_path());
+      builder.append(present_column_path);
+      if (present_column_path)
+        builder.append(column_path);
+
+      boolean present_consistency_level = true && (isSetConsistency_level());
+      builder.append(present_consistency_level);
+      if (present_consistency_level)
+        builder.append(consistency_level.getValue());
+
+      return builder.toHashCode();
     }
 
     public int compareTo(get_args other) {
@@ -5890,7 +5941,34 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      boolean present_nfe = true && (isSetNfe());
+      builder.append(present_nfe);
+      if (present_nfe)
+        builder.append(nfe);
+
+      boolean present_ue = true && (isSetUe());
+      builder.append(present_ue);
+      if (present_ue)
+        builder.append(ue);
+
+      boolean present_te = true && (isSetTe());
+      builder.append(present_te);
+      if (present_te)
+        builder.append(te);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(get_result other) {
@@ -6483,7 +6561,29 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_key = true && (isSetKey());
+      builder.append(present_key);
+      if (present_key)
+        builder.append(key);
+
+      boolean present_column_parent = true && (isSetColumn_parent());
+      builder.append(present_column_parent);
+      if (present_column_parent)
+        builder.append(column_parent);
+
+      boolean present_predicate = true && (isSetPredicate());
+      builder.append(present_predicate);
+      if (present_predicate)
+        builder.append(predicate);
+
+      boolean present_consistency_level = true && (isSetConsistency_level());
+      builder.append(present_consistency_level);
+      if (present_consistency_level)
+        builder.append(consistency_level.getValue());
+
+      return builder.toHashCode();
     }
 
     public int compareTo(get_slice_args other) {
@@ -7067,7 +7167,29 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      boolean present_ue = true && (isSetUe());
+      builder.append(present_ue);
+      if (present_ue)
+        builder.append(ue);
+
+      boolean present_te = true && (isSetTe());
+      builder.append(present_te);
+      if (present_te)
+        builder.append(te);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(get_slice_result other) {
@@ -7648,7 +7770,29 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_key = true && (isSetKey());
+      builder.append(present_key);
+      if (present_key)
+        builder.append(key);
+
+      boolean present_column_parent = true && (isSetColumn_parent());
+      builder.append(present_column_parent);
+      if (present_column_parent)
+        builder.append(column_parent);
+
+      boolean present_predicate = true && (isSetPredicate());
+      builder.append(present_predicate);
+      if (present_predicate)
+        builder.append(predicate);
+
+      boolean present_consistency_level = true && (isSetConsistency_level());
+      builder.append(present_consistency_level);
+      if (present_consistency_level)
+        builder.append(consistency_level.getValue());
+
+      return builder.toHashCode();
     }
 
     public int compareTo(get_count_args other) {
@@ -8214,7 +8358,29 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true;
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      boolean present_ue = true && (isSetUe());
+      builder.append(present_ue);
+      if (present_ue)
+        builder.append(ue);
+
+      boolean present_te = true && (isSetTe());
+      builder.append(present_te);
+      if (present_te)
+        builder.append(te);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(get_count_result other) {
@@ -8795,7 +8961,29 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_keys = true && (isSetKeys());
+      builder.append(present_keys);
+      if (present_keys)
+        builder.append(keys);
+
+      boolean present_column_parent = true && (isSetColumn_parent());
+      builder.append(present_column_parent);
+      if (present_column_parent)
+        builder.append(column_parent);
+
+      boolean present_predicate = true && (isSetPredicate());
+      builder.append(present_predicate);
+      if (present_predicate)
+        builder.append(predicate);
+
+      boolean present_consistency_level = true && (isSetConsistency_level());
+      builder.append(present_consistency_level);
+      if (present_consistency_level)
+        builder.append(consistency_level.getValue());
+
+      return builder.toHashCode();
     }
 
     public int compareTo(multiget_slice_args other) {
@@ -9401,7 +9589,29 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      boolean present_ue = true && (isSetUe());
+      builder.append(present_ue);
+      if (present_ue)
+        builder.append(ue);
+
+      boolean present_te = true && (isSetTe());
+      builder.append(present_te);
+      if (present_te)
+        builder.append(te);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(multiget_slice_result other) {
@@ -10023,7 +10233,29 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_keys = true && (isSetKeys());
+      builder.append(present_keys);
+      if (present_keys)
+        builder.append(keys);
+
+      boolean present_column_parent = true && (isSetColumn_parent());
+      builder.append(present_column_parent);
+      if (present_column_parent)
+        builder.append(column_parent);
+
+      boolean present_predicate = true && (isSetPredicate());
+      builder.append(present_predicate);
+      if (present_predicate)
+        builder.append(predicate);
+
+      boolean present_consistency_level = true && (isSetConsistency_level());
+      builder.append(present_consistency_level);
+      if (present_consistency_level)
+        builder.append(consistency_level.getValue());
+
+      return builder.toHashCode();
     }
 
     public int compareTo(multiget_count_args other) {
@@ -10625,7 +10857,29 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      boolean present_ue = true && (isSetUe());
+      builder.append(present_ue);
+      if (present_ue)
+        builder.append(ue);
+
+      boolean present_te = true && (isSetTe());
+      builder.append(present_te);
+      if (present_te)
+        builder.append(te);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(multiget_count_result other) {
@@ -11207,7 +11461,29 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_column_parent = true && (isSetColumn_parent());
+      builder.append(present_column_parent);
+      if (present_column_parent)
+        builder.append(column_parent);
+
+      boolean present_predicate = true && (isSetPredicate());
+      builder.append(present_predicate);
+      if (present_predicate)
+        builder.append(predicate);
+
+      boolean present_range = true && (isSetRange());
+      builder.append(present_range);
+      if (present_range)
+        builder.append(range);
+
+      boolean present_consistency_level = true && (isSetConsistency_level());
+      builder.append(present_consistency_level);
+      if (present_consistency_level)
+        builder.append(consistency_level.getValue());
+
+      return builder.toHashCode();
     }
 
     public int compareTo(get_range_slices_args other) {
@@ -11787,7 +12063,29 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      boolean present_ue = true && (isSetUe());
+      builder.append(present_ue);
+      if (present_ue)
+        builder.append(ue);
+
+      boolean present_te = true && (isSetTe());
+      builder.append(present_te);
+      if (present_te)
+        builder.append(te);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(get_range_slices_result other) {
@@ -12367,7 +12665,29 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_column_parent = true && (isSetColumn_parent());
+      builder.append(present_column_parent);
+      if (present_column_parent)
+        builder.append(column_parent);
+
+      boolean present_index_clause = true && (isSetIndex_clause());
+      builder.append(present_index_clause);
+      if (present_index_clause)
+        builder.append(index_clause);
+
+      boolean present_column_predicate = true && (isSetColumn_predicate());
+      builder.append(present_column_predicate);
+      if (present_column_predicate)
+        builder.append(column_predicate);
+
+      boolean present_consistency_level = true && (isSetConsistency_level());
+      builder.append(present_consistency_level);
+      if (present_consistency_level)
+        builder.append(consistency_level.getValue());
+
+      return builder.toHashCode();
     }
 
     public int compareTo(get_indexed_slices_args other) {
@@ -12947,7 +13267,29 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      boolean present_ue = true && (isSetUe());
+      builder.append(present_ue);
+      if (present_ue)
+        builder.append(ue);
+
+      boolean present_te = true && (isSetTe());
+      builder.append(present_te);
+      if (present_te)
+        builder.append(te);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(get_indexed_slices_result other) {
@@ -13528,7 +13870,29 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_key = true && (isSetKey());
+      builder.append(present_key);
+      if (present_key)
+        builder.append(key);
+
+      boolean present_column_parent = true && (isSetColumn_parent());
+      builder.append(present_column_parent);
+      if (present_column_parent)
+        builder.append(column_parent);
+
+      boolean present_column = true && (isSetColumn());
+      builder.append(present_column);
+      if (present_column)
+        builder.append(column);
+
+      boolean present_consistency_level = true && (isSetConsistency_level());
+      builder.append(present_consistency_level);
+      if (present_consistency_level)
+        builder.append(consistency_level.getValue());
+
+      return builder.toHashCode();
     }
 
     public int compareTo(insert_args other) {
@@ -14034,7 +14398,24 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      boolean present_ue = true && (isSetUe());
+      builder.append(present_ue);
+      if (present_ue)
+        builder.append(ue);
+
+      boolean present_te = true && (isSetTe());
+      builder.append(present_te);
+      if (present_te)
+        builder.append(te);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(insert_result other) {
@@ -14183,12 +14564,12 @@ public class Cassandra {
 
     private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)1);
     private static final TField COLUMN_PATH_FIELD_DESC = new TField("column_path", TType.STRUCT, (short)2);
-    private static final TField CLOCK_FIELD_DESC = new TField("clock", TType.STRUCT, (short)3);
+    private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)3);
     private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)4);
 
     public byte[] key;
     public ColumnPath column_path;
-    public Clock clock;
+    public long timestamp;
     /**
      * 
      * @see ConsistencyLevel
@@ -14199,7 +14580,7 @@ public class Cassandra {
     public enum _Fields implements TFieldIdEnum {
       KEY((short)1, "key"),
       COLUMN_PATH((short)2, "column_path"),
-      CLOCK((short)3, "clock"),
+      TIMESTAMP((short)3, "timestamp"),
       /**
        * 
        * @see ConsistencyLevel
@@ -14223,8 +14604,8 @@ public class Cassandra {
             return KEY;
           case 2: // COLUMN_PATH
             return COLUMN_PATH;
-          case 3: // CLOCK
-            return CLOCK;
+          case 3: // TIMESTAMP
+            return TIMESTAMP;
           case 4: // CONSISTENCY_LEVEL
             return CONSISTENCY_LEVEL;
           default:
@@ -14267,6 +14648,8 @@ public class Cassandra {
     }
 
     // isset id assignments
+    private static final int __TIMESTAMP_ISSET_ID = 0;
+    private BitSet __isset_bit_vector = new BitSet(1);
 
     public static final Map<_Fields, FieldMetaData> metaDataMap;
     static {
@@ -14275,8 +14658,8 @@ public class Cassandra {
           new FieldValueMetaData(TType.STRING)));
       tmpMap.put(_Fields.COLUMN_PATH, new FieldMetaData("column_path", TFieldRequirementType.REQUIRED, 
           new StructMetaData(TType.STRUCT, ColumnPath.class)));
-      tmpMap.put(_Fields.CLOCK, new FieldMetaData("clock", TFieldRequirementType.REQUIRED, 
-          new StructMetaData(TType.STRUCT, Clock.class)));
+      tmpMap.put(_Fields.TIMESTAMP, new FieldMetaData("timestamp", TFieldRequirementType.REQUIRED, 
+          new FieldValueMetaData(TType.I64)));
       tmpMap.put(_Fields.CONSISTENCY_LEVEL, new FieldMetaData("consistency_level", TFieldRequirementType.DEFAULT, 
           new EnumMetaData(TType.ENUM, ConsistencyLevel.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -14291,13 +14674,14 @@ public class Cassandra {
     public remove_args(
       byte[] key,
       ColumnPath column_path,
-      Clock clock,
+      long timestamp,
       ConsistencyLevel consistency_level)
     {
       this();
       this.key = key;
       this.column_path = column_path;
-      this.clock = clock;
+      this.timestamp = timestamp;
+      setTimestampIsSet(true);
       this.consistency_level = consistency_level;
     }
 
@@ -14305,6 +14689,8 @@ public class Cassandra {
      * Performs a deep copy on <i>other</i>.
      */
     public remove_args(remove_args other) {
+      __isset_bit_vector.clear();
+      __isset_bit_vector.or(other.__isset_bit_vector);
       if (other.isSetKey()) {
         this.key = new byte[other.key.length];
         System.arraycopy(other.key, 0, key, 0, other.key.length);
@@ -14312,9 +14698,7 @@ public class Cassandra {
       if (other.isSetColumn_path()) {
         this.column_path = new ColumnPath(other.column_path);
       }
-      if (other.isSetClock()) {
-        this.clock = new Clock(other.clock);
-      }
+      this.timestamp = other.timestamp;
       if (other.isSetConsistency_level()) {
         this.consistency_level = other.consistency_level;
       }
@@ -14377,28 +14761,27 @@ public class Cassandra {
       }
     }
 
-    public Clock getClock() {
-      return this.clock;
+    public long getTimestamp() {
+      return this.timestamp;
     }
 
-    public remove_args setClock(Clock clock) {
-      this.clock = clock;
+    public remove_args setTimestamp(long timestamp) {
+      this.timestamp = timestamp;
+      setTimestampIsSet(true);
       return this;
     }
 
-    public void unsetClock() {
-      this.clock = null;
+    public void unsetTimestamp() {
+      __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID);
     }
 
-    /** Returns true if field clock is set (has been asigned a value) and false otherwise */
-    public boolean isSetClock() {
-      return this.clock != null;
+    /** Returns true if field timestamp is set (has been asigned a value) and false otherwise */
+    public boolean isSetTimestamp() {
+      return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID);
     }
 
-    public void setClockIsSet(boolean value) {
-      if (!value) {
-        this.clock = null;
-      }
+    public void setTimestampIsSet(boolean value) {
+      __isset_bit_vector.set(__TIMESTAMP_ISSET_ID, value);
     }
 
     /**
@@ -14451,11 +14834,11 @@ public class Cassandra {
         }
         break;
 
-      case CLOCK:
+      case TIMESTAMP:
         if (value == null) {
-          unsetClock();
+          unsetTimestamp();
         } else {
-          setClock((Clock)value);
+          setTimestamp((Long)value);
         }
         break;
 
@@ -14482,8 +14865,8 @@ public class Cassandra {
       case COLUMN_PATH:
         return getColumn_path();
 
-      case CLOCK:
-        return getClock();
+      case TIMESTAMP:
+        return new Long(getTimestamp());
 
       case CONSISTENCY_LEVEL:
         return getConsistency_level();
@@ -14503,8 +14886,8 @@ public class Cassandra {
         return isSetKey();
       case COLUMN_PATH:
         return isSetColumn_path();
-      case CLOCK:
-        return isSetClock();
+      case TIMESTAMP:
+        return isSetTimestamp();
       case CONSISTENCY_LEVEL:
         return isSetConsistency_level();
       }
@@ -14546,12 +14929,12 @@ public class Cassandra {
           return false;
       }
 
-      boolean this_present_clock = true && this.isSetClock();
-      boolean that_present_clock = true && that.isSetClock();
-      if (this_present_clock || that_present_clock) {
-        if (!(this_present_clock && that_present_clock))
+      boolean this_present_timestamp = true;
+      boolean that_present_timestamp = true;
+      if (this_present_timestamp || that_present_timestamp) {
+        if (!(this_present_timestamp && that_present_timestamp))
           return false;
-        if (!this.clock.equals(that.clock))
+        if (this.timestamp != that.timestamp)
           return false;
       }
 
@@ -14569,7 +14952,29 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_key = true && (isSetKey());
+      builder.append(present_key);
+      if (present_key)
+        builder.append(key);
+
+      boolean present_column_path = true && (isSetColumn_path());
+      builder.append(present_column_path);
+      if (present_column_path)
+        builder.append(column_path);
+
+      boolean present_timestamp = true;
+      builder.append(present_timestamp);
+      if (present_timestamp)
+        builder.append(timestamp);
+
+      boolean present_consistency_level = true && (isSetConsistency_level());
+      builder.append(present_consistency_level);
+      if (present_consistency_level)
+        builder.append(consistency_level.getValue());
+
+      return builder.toHashCode();
     }
 
     public int compareTo(remove_args other) {
@@ -14598,11 +15003,11 @@ public class Cassandra {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetClock()).compareTo(typedOther.isSetClock());
+      lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetClock()) {        lastComparison = TBaseHelper.compareTo(this.clock, typedOther.clock);
+      if (isSetTimestamp()) {        lastComparison = TBaseHelper.compareTo(this.timestamp, typedOther.timestamp);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -14644,10 +15049,10 @@ public class Cassandra {
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case 3: // CLOCK
-            if (field.type == TType.STRUCT) {
-              this.clock = new Clock();
-              this.clock.read(iprot);
+          case 3: // TIMESTAMP
+            if (field.type == TType.I64) {
+              this.timestamp = iprot.readI64();
+              setTimestampIsSet(true);
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -14667,6 +15072,9 @@ public class Cassandra {
       iprot.readStructEnd();
 
       // 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();
     }
 
@@ -14684,11 +15092,9 @@ public class Cassandra {
         this.column_path.write(oprot);
         oprot.writeFieldEnd();
       }
-      if (this.clock != null) {
-        oprot.writeFieldBegin(CLOCK_FIELD_DESC);
-        this.clock.write(oprot);
-        oprot.writeFieldEnd();
-      }
+      oprot.writeFieldBegin(TIMESTAMP_FIELD_DESC);
+      oprot.writeI64(this.timestamp);
+      oprot.writeFieldEnd();
       if (this.consistency_level != null) {
         oprot.writeFieldBegin(CONSISTENCY_LEVEL_FIELD_DESC);
         oprot.writeI32(this.consistency_level.getValue());
@@ -14724,12 +15130,8 @@ public class Cassandra {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("clock:");
-      if (this.clock == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.clock);
-      }
+      sb.append("timestamp:");
+      sb.append(this.timestamp);
       first = false;
       if (!first) sb.append(", ");
       sb.append("consistency_level:");
@@ -14751,9 +15153,7 @@ public class Cassandra {
       if (column_path == null) {
         throw new TProtocolException("Required field 'column_path' was not present! Struct: " + toString());
       }
-      if (clock == null) {
-        throw new TProtocolException("Required field 'clock' was not present! Struct: " + toString());
-      }
+      // alas, we cannot check 'timestamp' because it's a primitive and you chose the non-beans generator.
     }
 
   }
@@ -15072,7 +15472,24 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      boolean present_ue = true && (isSetUe());
+      builder.append(present_ue);
+      if (present_ue)
+        builder.append(ue);
+
+      boolean present_te = true && (isSetTe());
+      builder.append(present_te);
+      if (present_te)
+        builder.append(te);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(remove_result other) {
@@ -15533,7 +15950,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_mutation_map = true && (isSetMutation_map());
+      builder.append(present_mutation_map);
+      if (present_mutation_map)
+        builder.append(mutation_map);
+
+      boolean present_consistency_level = true && (isSetConsistency_level());
+      builder.append(present_consistency_level);
+      if (present_consistency_level)
+        builder.append(consistency_level.getValue());
+
+      return builder.toHashCode();
     }
 
     public int compareTo(batch_mutate_args other) {
@@ -16026,7 +16455,24 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      boolean present_ue = true && (isSetUe());
+      builder.append(present_ue);
+      if (present_ue)
+        builder.append(ue);
+
+      boolean present_te = true && (isSetTe());
+      builder.append(present_te);
+      if (present_te)
+        builder.append(te);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(batch_mutate_result other) {
@@ -16368,7 +16814,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_cfname = true && (isSetCfname());
+      builder.append(present_cfname);
+      if (present_cfname)
+        builder.append(cfname);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(truncate_args other) {
@@ -16713,7 +17166,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      boolean present_ue = true && (isSetUe());
+      builder.append(present_ue);
+      if (present_ue)
+        builder.append(ue);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(truncate_result other) {
@@ -16961,7 +17426,9 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_schema_versions_args other) {
@@ -17304,7 +17771,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_schema_versions_result other) {
@@ -17588,7 +18067,9 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_keyspaces_args other) {
@@ -17864,7 +18345,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_keyspaces_result other) {
@@ -18100,7 +18588,9 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_cluster_name_args other) {
@@ -18356,7 +18846,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_cluster_name_result other) {
@@ -18574,7 +19071,9 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_version_args other) {
@@ -18830,7 +19329,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_version_result other) {
@@ -19113,7 +19619,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_keyspace = true && (isSetKeyspace());
+      builder.append(present_keyspace);
+      if (present_keyspace)
+        builder.append(keyspace);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_ring_args other) {
@@ -19478,7 +19991,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_ring_result other) {
@@ -19743,7 +20268,9 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_partitioner_args other) {
@@ -19999,7 +20526,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_partitioner_result other) {
@@ -20282,7 +20816,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_keyspace = true && (isSetKeyspace());
+      builder.append(present_keyspace);
+      if (present_keyspace)
+        builder.append(keyspace);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_keyspace_args other) {
@@ -20627,7 +21168,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_nfe = true && (isSetNfe());
+      builder.append(present_nfe);
+      if (present_nfe)
+        builder.append(nfe);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_keyspace_result other) {
@@ -21116,7 +21669,29 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_cfName = true && (isSetCfName());
+      builder.append(present_cfName);
+      if (present_cfName)
+        builder.append(cfName);
+
+      boolean present_start_token = true && (isSetStart_token());
+      builder.append(present_start_token);
+      if (present_start_token)
+        builder.append(start_token);
+
+      boolean present_end_token = true && (isSetEnd_token());
+      builder.append(present_end_token);
+      if (present_end_token)
+        builder.append(end_token);
+
+      boolean present_keys_per_split = true;
+      builder.append(present_keys_per_split);
+      if (present_keys_per_split)
+        builder.append(keys_per_split);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_splits_args other) {
@@ -21515,7 +22090,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(describe_splits_result other) {
@@ -21815,7 +22397,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_cf_def = true && (isSetCf_def());
+      builder.append(present_cf_def);
+      if (present_cf_def)
+        builder.append(cf_def);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_add_column_family_args other) {
@@ -22161,7 +22750,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_add_column_family_result other) {
@@ -22473,7 +23074,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_column_family = true && (isSetColumn_family());
+      builder.append(present_column_family);
+      if (present_column_family)
+        builder.append(column_family);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_drop_column_family_args other) {
@@ -22818,7 +23426,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_drop_column_family_result other) {
@@ -23188,7 +23808,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_old_name = true && (isSetOld_name());
+      builder.append(present_old_name);
+      if (present_old_name)
+        builder.append(old_name);
+
+      boolean present_new_name = true && (isSetNew_name());
+      builder.append(present_new_name);
+      if (present_new_name)
+        builder.append(new_name);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_rename_column_family_args other) {
@@ -23565,7 +24197,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_rename_column_family_result other) {
@@ -23877,7 +24521,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_ks_def = true && (isSetKs_def());
+      builder.append(present_ks_def);
+      if (present_ks_def)
+        builder.append(ks_def);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_add_keyspace_args other) {
@@ -24223,7 +24874,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_add_keyspace_result other) {
@@ -24535,7 +25198,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_keyspace = true && (isSetKeyspace());
+      builder.append(present_keyspace);
+      if (present_keyspace)
+        builder.append(keyspace);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_drop_keyspace_args other) {
@@ -24880,7 +25550,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_drop_keyspace_result other) {
@@ -25250,7 +25932,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_old_name = true && (isSetOld_name());
+      builder.append(present_old_name);
+      if (present_old_name)
+        builder.append(old_name);
+
+      boolean present_new_name = true && (isSetNew_name());
+      builder.append(present_new_name);
+      if (present_new_name)
+        builder.append(new_name);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_rename_keyspace_args other) {
@@ -25627,7 +26321,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_rename_keyspace_result other) {
@@ -25939,7 +26645,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_ks_def = true && (isSetKs_def());
+      builder.append(present_ks_def);
+      if (present_ks_def)
+        builder.append(ks_def);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_update_keyspace_args other) {
@@ -26285,7 +26998,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_update_keyspace_result other) {
@@ -26597,7 +27322,14 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_cf_def = true && (isSetCf_def());
+      builder.append(present_cf_def);
+      if (present_cf_def)
+        builder.append(cf_def);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_update_column_family_args other) {
@@ -26943,7 +27675,19 @@ public class Cassandra {
 
     @Override
     public int hashCode() {
-      return 0;
+      HashCodeBuilder builder = new HashCodeBuilder();
+
+      boolean present_success = true && (isSetSuccess());
+      builder.append(present_success);
+      if (present_success)
+        builder.append(success);
+
+      boolean present_ire = true && (isSetIre());
+      builder.append(present_ire);
+      if (present_ire)
+        builder.append(ire);
+
+      return builder.toHashCode();
     }
 
     public int compareTo(system_update_column_family_result other) {

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java?rev=999542&r1=999541&r2=999542&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java Tue Sep 21 18:56:23 2010
@@ -26,6 +26,7 @@ package org.apache.cassandra.thrift;
  */
 
 
+import org.apache.commons.lang.builder.HashCodeBuilder;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -52,10 +53,8 @@ public class CfDef implements TBase<CfDe
   private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
   private static final TField NAME_FIELD_DESC = new TField("name", TType.STRING, (short)2);
   private static final TField COLUMN_TYPE_FIELD_DESC = new TField("column_type", TType.STRING, (short)3);
-  private static final TField CLOCK_TYPE_FIELD_DESC = new TField("clock_type", TType.STRING, (short)4);
   private static final TField COMPARATOR_TYPE_FIELD_DESC = new TField("comparator_type", TType.STRING, (short)5);
   private static final TField SUBCOMPARATOR_TYPE_FIELD_DESC = new TField("subcomparator_type", TType.STRING, (short)6);
-  private static final TField RECONCILER_FIELD_DESC = new TField("reconciler", TType.STRING, (short)7);
   private static final TField COMMENT_FIELD_DESC = new TField("comment", TType.STRING, (short)8);
   private static final TField ROW_CACHE_SIZE_FIELD_DESC = new TField("row_cache_size", TType.DOUBLE, (short)9);
   private static final TField PRELOAD_ROW_CACHE_FIELD_DESC = new TField("preload_row_cache", TType.BOOL, (short)10);
@@ -71,10 +70,8 @@ public class CfDef implements TBase<CfDe
   public String keyspace;
   public String name;
   public String column_type;
-  public String clock_type;
   public String comparator_type;
   public String subcomparator_type;
-  public String reconciler;
   public String comment;
   public double row_cache_size;
   public boolean preload_row_cache;
@@ -92,10 +89,8 @@ public class CfDef implements TBase<CfDe
     KEYSPACE((short)1, "keyspace"),
     NAME((short)2, "name"),
     COLUMN_TYPE((short)3, "column_type"),
-    CLOCK_TYPE((short)4, "clock_type"),
     COMPARATOR_TYPE((short)5, "comparator_type"),
     SUBCOMPARATOR_TYPE((short)6, "subcomparator_type"),
-    RECONCILER((short)7, "reconciler"),
     COMMENT((short)8, "comment"),
     ROW_CACHE_SIZE((short)9, "row_cache_size"),
     PRELOAD_ROW_CACHE((short)10, "preload_row_cache"),
@@ -127,14 +122,10 @@ public class CfDef implements TBase<CfDe
           return NAME;
         case 3: // COLUMN_TYPE
           return COLUMN_TYPE;
-        case 4: // CLOCK_TYPE
-          return CLOCK_TYPE;
         case 5: // COMPARATOR_TYPE
           return COMPARATOR_TYPE;
         case 6: // SUBCOMPARATOR_TYPE
           return SUBCOMPARATOR_TYPE;
-        case 7: // RECONCILER
-          return RECONCILER;
         case 8: // COMMENT
           return COMMENT;
         case 9: // ROW_CACHE_SIZE
@@ -216,14 +207,10 @@ public class CfDef implements TBase<CfDe
         new FieldValueMetaData(TType.STRING)));
     tmpMap.put(_Fields.COLUMN_TYPE, new FieldMetaData("column_type", TFieldRequirementType.OPTIONAL, 
         new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.CLOCK_TYPE, new FieldMetaData("clock_type", TFieldRequirementType.OPTIONAL, 
-        new FieldValueMetaData(TType.STRING)));
     tmpMap.put(_Fields.COMPARATOR_TYPE, new FieldMetaData("comparator_type", TFieldRequirementType.OPTIONAL, 
         new FieldValueMetaData(TType.STRING)));
     tmpMap.put(_Fields.SUBCOMPARATOR_TYPE, new FieldMetaData("subcomparator_type", TFieldRequirementType.OPTIONAL, 
         new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.RECONCILER, new FieldMetaData("reconciler", TFieldRequirementType.OPTIONAL, 
-        new FieldValueMetaData(TType.STRING)));
     tmpMap.put(_Fields.COMMENT, new FieldMetaData("comment", TFieldRequirementType.OPTIONAL, 
         new FieldValueMetaData(TType.STRING)));
     tmpMap.put(_Fields.ROW_CACHE_SIZE, new FieldMetaData("row_cache_size", TFieldRequirementType.OPTIONAL, 
@@ -254,8 +241,6 @@ public class CfDef implements TBase<CfDe
   public CfDef() {
     this.column_type = "Standard";
 
-    this.clock_type = "Timestamp";
-
     this.comparator_type = "BytesType";
 
     this.row_cache_size = (double)0;
@@ -292,18 +277,12 @@ public class CfDef implements TBase<CfDe
     if (other.isSetColumn_type()) {
       this.column_type = other.column_type;
     }
-    if (other.isSetClock_type()) {
-      this.clock_type = other.clock_type;
-    }
     if (other.isSetComparator_type()) {
       this.comparator_type = other.comparator_type;
     }
     if (other.isSetSubcomparator_type()) {
       this.subcomparator_type = other.subcomparator_type;
     }
-    if (other.isSetReconciler()) {
-      this.reconciler = other.reconciler;
-    }
     if (other.isSetComment()) {
       this.comment = other.comment;
     }
@@ -408,30 +387,6 @@ public class CfDef implements TBase<CfDe
     }
   }
 
-  public String getClock_type() {
-    return this.clock_type;
-  }
-
-  public CfDef setClock_type(String clock_type) {
-    this.clock_type = clock_type;
-    return this;
-  }
-
-  public void unsetClock_type() {
-    this.clock_type = null;
-  }
-
-  /** Returns true if field clock_type is set (has been asigned a value) and false otherwise */
-  public boolean isSetClock_type() {
-    return this.clock_type != null;
-  }
-
-  public void setClock_typeIsSet(boolean value) {
-    if (!value) {
-      this.clock_type = null;
-    }
-  }
-
   public String getComparator_type() {
     return this.comparator_type;
   }
@@ -480,30 +435,6 @@ public class CfDef implements TBase<CfDe
     }
   }
 
-  public String getReconciler() {
-    return this.reconciler;
-  }
-
-  public CfDef setReconciler(String reconciler) {
-    this.reconciler = reconciler;
-    return this;
-  }
-
-  public void unsetReconciler() {
-    this.reconciler = null;
-  }
-
-  /** Returns true if field reconciler is set (has been asigned a value) and false otherwise */
-  public boolean isSetReconciler() {
-    return this.reconciler != null;
-  }
-
-  public void setReconcilerIsSet(boolean value) {
-    if (!value) {
-      this.reconciler = null;
-    }
-  }
-
   public String getComment() {
     return this.comment;
   }
@@ -801,14 +732,6 @@ public class CfDef implements TBase<CfDe
       }
       break;
 
-    case CLOCK_TYPE:
-      if (value == null) {
-        unsetClock_type();
-      } else {
-        setClock_type((String)value);
-      }
-      break;
-
     case COMPARATOR_TYPE:
       if (value == null) {
         unsetComparator_type();
@@ -825,14 +748,6 @@ public class CfDef implements TBase<CfDe
       }
       break;
 
-    case RECONCILER:
-      if (value == null) {
-        unsetReconciler();
-      } else {
-        setReconciler((String)value);
-      }
-      break;
-
     case COMMENT:
       if (value == null) {
         unsetComment();
@@ -939,18 +854,12 @@ public class CfDef implements TBase<CfDe
     case COLUMN_TYPE:
       return getColumn_type();
 
-    case CLOCK_TYPE:
-      return getClock_type();
-
     case COMPARATOR_TYPE:
       return getComparator_type();
 
     case SUBCOMPARATOR_TYPE:
       return getSubcomparator_type();
 
-    case RECONCILER:
-      return getReconciler();
-
     case COMMENT:
       return getComment();
 
@@ -1001,14 +910,10 @@ public class CfDef implements TBase<CfDe
       return isSetName();
     case COLUMN_TYPE:
       return isSetColumn_type();
-    case CLOCK_TYPE:
-      return isSetClock_type();
     case COMPARATOR_TYPE:
       return isSetComparator_type();
     case SUBCOMPARATOR_TYPE:
       return isSetSubcomparator_type();
-    case RECONCILER:
-      return isSetReconciler();
     case COMMENT:
       return isSetComment();
     case ROW_CACHE_SIZE:
@@ -1079,15 +984,6 @@ public class CfDef implements TBase<CfDe
         return false;
     }
 
-    boolean this_present_clock_type = true && this.isSetClock_type();
-    boolean that_present_clock_type = true && that.isSetClock_type();
-    if (this_present_clock_type || that_present_clock_type) {
-      if (!(this_present_clock_type && that_present_clock_type))
-        return false;
-      if (!this.clock_type.equals(that.clock_type))
-        return false;
-    }
-
     boolean this_present_comparator_type = true && this.isSetComparator_type();
     boolean that_present_comparator_type = true && that.isSetComparator_type();
     if (this_present_comparator_type || that_present_comparator_type) {
@@ -1106,15 +1002,6 @@ public class CfDef implements TBase<CfDe
         return false;
     }
 
-    boolean this_present_reconciler = true && this.isSetReconciler();
-    boolean that_present_reconciler = true && that.isSetReconciler();
-    if (this_present_reconciler || that_present_reconciler) {
-      if (!(this_present_reconciler && that_present_reconciler))
-        return false;
-      if (!this.reconciler.equals(that.reconciler))
-        return false;
-    }
-
     boolean this_present_comment = true && this.isSetComment();
     boolean that_present_comment = true && that.isSetComment();
     if (this_present_comment || that_present_comment) {
@@ -1219,7 +1106,89 @@ public class CfDef implements TBase<CfDe
 
   @Override
   public int hashCode() {
-    return 0;
+    HashCodeBuilder builder = new HashCodeBuilder();
+
+    boolean present_keyspace = true && (isSetKeyspace());
+    builder.append(present_keyspace);
+    if (present_keyspace)
+      builder.append(keyspace);
+
+    boolean present_name = true && (isSetName());
+    builder.append(present_name);
+    if (present_name)
+      builder.append(name);
+
+    boolean present_column_type = true && (isSetColumn_type());
+    builder.append(present_column_type);
+    if (present_column_type)
+      builder.append(column_type);
+
+    boolean present_comparator_type = true && (isSetComparator_type());
+    builder.append(present_comparator_type);
+    if (present_comparator_type)
+      builder.append(comparator_type);
+
+    boolean present_subcomparator_type = true && (isSetSubcomparator_type());
+    builder.append(present_subcomparator_type);
+    if (present_subcomparator_type)
+      builder.append(subcomparator_type);
+
+    boolean present_comment = true && (isSetComment());
+    builder.append(present_comment);
+    if (present_comment)
+      builder.append(comment);
+
+    boolean present_row_cache_size = true && (isSetRow_cache_size());
+    builder.append(present_row_cache_size);
+    if (present_row_cache_size)
+      builder.append(row_cache_size);
+
+    boolean present_preload_row_cache = true && (isSetPreload_row_cache());
+    builder.append(present_preload_row_cache);
+    if (present_preload_row_cache)
+      builder.append(preload_row_cache);
+
+    boolean present_key_cache_size = true && (isSetKey_cache_size());
+    builder.append(present_key_cache_size);
+    if (present_key_cache_size)
+      builder.append(key_cache_size);
+
+    boolean present_read_repair_chance = true && (isSetRead_repair_chance());
+    builder.append(present_read_repair_chance);
+    if (present_read_repair_chance)
+      builder.append(read_repair_chance);
+
+    boolean present_column_metadata = true && (isSetColumn_metadata());
+    builder.append(present_column_metadata);
+    if (present_column_metadata)
+      builder.append(column_metadata);
+
+    boolean present_gc_grace_seconds = true && (isSetGc_grace_seconds());
+    builder.append(present_gc_grace_seconds);
+    if (present_gc_grace_seconds)
+      builder.append(gc_grace_seconds);
+
+    boolean present_default_validation_class = true && (isSetDefault_validation_class());
+    builder.append(present_default_validation_class);
+    if (present_default_validation_class)
+      builder.append(default_validation_class);
+
+    boolean present_id = true && (isSetId());
+    builder.append(present_id);
+    if (present_id)
+      builder.append(id);
+
+    boolean present_min_compaction_threshold = true && (isSetMin_compaction_threshold());
+    builder.append(present_min_compaction_threshold);
+    if (present_min_compaction_threshold)
+      builder.append(min_compaction_threshold);
+
+    boolean present_max_compaction_threshold = true && (isSetMax_compaction_threshold());
+    builder.append(present_max_compaction_threshold);
+    if (present_max_compaction_threshold)
+      builder.append(max_compaction_threshold);
+
+    return builder.toHashCode();
   }
 
   public int compareTo(CfDef other) {
@@ -1257,15 +1226,6 @@ public class CfDef implements TBase<CfDe
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetClock_type()).compareTo(typedOther.isSetClock_type());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetClock_type()) {      lastComparison = TBaseHelper.compareTo(this.clock_type, typedOther.clock_type);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetComparator_type()).compareTo(typedOther.isSetComparator_type());
     if (lastComparison != 0) {
       return lastComparison;
@@ -1284,15 +1244,6 @@ public class CfDef implements TBase<CfDe
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetReconciler()).compareTo(typedOther.isSetReconciler());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetReconciler()) {      lastComparison = TBaseHelper.compareTo(this.reconciler, typedOther.reconciler);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetComment()).compareTo(typedOther.isSetComment());
     if (lastComparison != 0) {
       return lastComparison;
@@ -1426,13 +1377,6 @@ public class CfDef implements TBase<CfDe
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case 4: // CLOCK_TYPE
-          if (field.type == TType.STRING) {
-            this.clock_type = iprot.readString();
-          } else { 
-            TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
         case 5: // COMPARATOR_TYPE
           if (field.type == TType.STRING) {
             this.comparator_type = iprot.readString();
@@ -1447,13 +1391,6 @@ public class CfDef implements TBase<CfDe
             TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case 7: // RECONCILER
-          if (field.type == TType.STRING) {
-            this.reconciler = iprot.readString();
-          } else { 
-            TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
         case 8: // COMMENT
           if (field.type == TType.STRING) {
             this.comment = iprot.readString();
@@ -1582,13 +1519,6 @@ public class CfDef implements TBase<CfDe
         oprot.writeFieldEnd();
       }
     }
-    if (this.clock_type != null) {
-      if (isSetClock_type()) {
-        oprot.writeFieldBegin(CLOCK_TYPE_FIELD_DESC);
-        oprot.writeString(this.clock_type);
-        oprot.writeFieldEnd();
-      }
-    }
     if (this.comparator_type != null) {
       if (isSetComparator_type()) {
         oprot.writeFieldBegin(COMPARATOR_TYPE_FIELD_DESC);
@@ -1603,13 +1533,6 @@ public class CfDef implements TBase<CfDe
         oprot.writeFieldEnd();
       }
     }
-    if (this.reconciler != null) {
-      if (isSetReconciler()) {
-        oprot.writeFieldBegin(RECONCILER_FIELD_DESC);
-        oprot.writeString(this.reconciler);
-        oprot.writeFieldEnd();
-      }
-    }
     if (this.comment != null) {
       if (isSetComment()) {
         oprot.writeFieldBegin(COMMENT_FIELD_DESC);
@@ -1712,16 +1635,6 @@ public class CfDef implements TBase<CfDe
       }
       first = false;
     }
-    if (isSetClock_type()) {
-      if (!first) sb.append(", ");
-      sb.append("clock_type:");
-      if (this.clock_type == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.clock_type);
-      }
-      first = false;
-    }
     if (isSetComparator_type()) {
       if (!first) sb.append(", ");
       sb.append("comparator_type:");
@@ -1742,16 +1655,6 @@ public class CfDef implements TBase<CfDe
       }
       first = false;
     }
-    if (isSetReconciler()) {
-      if (!first) sb.append(", ");
-      sb.append("reconciler:");
-      if (this.reconciler == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.reconciler);
-      }
-      first = false;
-    }
     if (isSetComment()) {
       if (!first) sb.append(", ");
       sb.append("comment:");



Mime
View raw message