cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eev...@apache.org
Subject svn commit: r1081971 - in /cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift: Cassandra.java ConsistencyLevel.java SchemaDisagreementException.java
Date Tue, 15 Mar 2011 22:52:11 GMT
Author: eevans
Date: Tue Mar 15 22:52:10 2011
New Revision: 1081971

URL: http://svn.apache.org/viewvc?rev=1081971&view=rev
Log:
thrift generated code

Patch by eevans; reviewed by brandon.williams for CASSANDRA-2334

Added:
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java
Modified:
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
    cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java

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=1081971&r1=1081970&r2=1081971&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 Mar 15 22:52:10 2011
@@ -306,42 +306,42 @@ public class Cassandra {
      * 
      * @param cf_def
      */
-    public String system_add_column_family(CfDef cf_def) throws InvalidRequestException, TException;
+    public String system_add_column_family(CfDef cf_def) throws InvalidRequestException, SchemaDisagreementException, TException;
 
     /**
      * drops a column family. returns the new schema id.
      * 
      * @param column_family
      */
-    public String system_drop_column_family(String column_family) throws InvalidRequestException, TException;
+    public String system_drop_column_family(String column_family) throws InvalidRequestException, SchemaDisagreementException, TException;
 
     /**
      * adds a keyspace and any column families that are part of it. returns the new schema id.
      * 
      * @param ks_def
      */
-    public String system_add_keyspace(KsDef ks_def) throws InvalidRequestException, TException;
+    public String system_add_keyspace(KsDef ks_def) throws InvalidRequestException, SchemaDisagreementException, TException;
 
     /**
      * drops a keyspace and any column families that are part of it. returns the new schema id.
      * 
      * @param keyspace
      */
-    public String system_drop_keyspace(String keyspace) throws InvalidRequestException, TException;
+    public String system_drop_keyspace(String keyspace) throws InvalidRequestException, SchemaDisagreementException, TException;
 
     /**
      * updates properties of a keyspace. returns the new schema id.
      * 
      * @param ks_def
      */
-    public String system_update_keyspace(KsDef ks_def) throws InvalidRequestException, TException;
+    public String system_update_keyspace(KsDef ks_def) throws InvalidRequestException, SchemaDisagreementException, TException;
 
     /**
      * updates properties of a column family. returns the new schema id.
      * 
      * @param cf_def
      */
-    public String system_update_column_family(CfDef cf_def) throws InvalidRequestException, TException;
+    public String system_update_column_family(CfDef cf_def) throws InvalidRequestException, SchemaDisagreementException, TException;
 
     /**
      * Executes a CQL (Cassandra Query Language) statement and returns a
@@ -350,7 +350,7 @@ public class Cassandra {
      * @param query
      * @param compression
      */
-    public CqlResult execute_cql_query(ByteBuffer query, Compression compression) throws InvalidRequestException, UnavailableException, TimedOutException, TException;
+    public CqlResult execute_cql_query(ByteBuffer query, Compression compression) throws InvalidRequestException, UnavailableException, TimedOutException, SchemaDisagreementException, TException;
 
   }
 
@@ -1667,7 +1667,7 @@ public class Cassandra {
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "describe_splits failed: unknown result");
     }
 
-    public String system_add_column_family(CfDef cf_def) throws InvalidRequestException, TException
+    public String system_add_column_family(CfDef cf_def) throws InvalidRequestException, SchemaDisagreementException, TException
     {
       send_system_add_column_family(cf_def);
       return recv_system_add_column_family();
@@ -1683,7 +1683,7 @@ public class Cassandra {
       oprot_.getTransport().flush();
     }
 
-    public String recv_system_add_column_family() throws InvalidRequestException, TException
+    public String recv_system_add_column_family() throws InvalidRequestException, SchemaDisagreementException, TException
     {
       TMessage msg = iprot_.readMessageBegin();
       if (msg.type == TMessageType.EXCEPTION) {
@@ -1703,10 +1703,13 @@ public class Cassandra {
       if (result.ire != null) {
         throw result.ire;
       }
+      if (result.sde != null) {
+        throw result.sde;
+      }
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "system_add_column_family failed: unknown result");
     }
 
-    public String system_drop_column_family(String column_family) throws InvalidRequestException, TException
+    public String system_drop_column_family(String column_family) throws InvalidRequestException, SchemaDisagreementException, TException
     {
       send_system_drop_column_family(column_family);
       return recv_system_drop_column_family();
@@ -1722,7 +1725,7 @@ public class Cassandra {
       oprot_.getTransport().flush();
     }
 
-    public String recv_system_drop_column_family() throws InvalidRequestException, TException
+    public String recv_system_drop_column_family() throws InvalidRequestException, SchemaDisagreementException, TException
     {
       TMessage msg = iprot_.readMessageBegin();
       if (msg.type == TMessageType.EXCEPTION) {
@@ -1742,10 +1745,13 @@ public class Cassandra {
       if (result.ire != null) {
         throw result.ire;
       }
+      if (result.sde != null) {
+        throw result.sde;
+      }
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "system_drop_column_family failed: unknown result");
     }
 
-    public String system_add_keyspace(KsDef ks_def) throws InvalidRequestException, TException
+    public String system_add_keyspace(KsDef ks_def) throws InvalidRequestException, SchemaDisagreementException, TException
     {
       send_system_add_keyspace(ks_def);
       return recv_system_add_keyspace();
@@ -1761,7 +1767,7 @@ public class Cassandra {
       oprot_.getTransport().flush();
     }
 
-    public String recv_system_add_keyspace() throws InvalidRequestException, TException
+    public String recv_system_add_keyspace() throws InvalidRequestException, SchemaDisagreementException, TException
     {
       TMessage msg = iprot_.readMessageBegin();
       if (msg.type == TMessageType.EXCEPTION) {
@@ -1781,10 +1787,13 @@ public class Cassandra {
       if (result.ire != null) {
         throw result.ire;
       }
+      if (result.sde != null) {
+        throw result.sde;
+      }
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "system_add_keyspace failed: unknown result");
     }
 
-    public String system_drop_keyspace(String keyspace) throws InvalidRequestException, TException
+    public String system_drop_keyspace(String keyspace) throws InvalidRequestException, SchemaDisagreementException, TException
     {
       send_system_drop_keyspace(keyspace);
       return recv_system_drop_keyspace();
@@ -1800,7 +1809,7 @@ public class Cassandra {
       oprot_.getTransport().flush();
     }
 
-    public String recv_system_drop_keyspace() throws InvalidRequestException, TException
+    public String recv_system_drop_keyspace() throws InvalidRequestException, SchemaDisagreementException, TException
     {
       TMessage msg = iprot_.readMessageBegin();
       if (msg.type == TMessageType.EXCEPTION) {
@@ -1820,10 +1829,13 @@ public class Cassandra {
       if (result.ire != null) {
         throw result.ire;
       }
+      if (result.sde != null) {
+        throw result.sde;
+      }
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "system_drop_keyspace failed: unknown result");
     }
 
-    public String system_update_keyspace(KsDef ks_def) throws InvalidRequestException, TException
+    public String system_update_keyspace(KsDef ks_def) throws InvalidRequestException, SchemaDisagreementException, TException
     {
       send_system_update_keyspace(ks_def);
       return recv_system_update_keyspace();
@@ -1839,7 +1851,7 @@ public class Cassandra {
       oprot_.getTransport().flush();
     }
 
-    public String recv_system_update_keyspace() throws InvalidRequestException, TException
+    public String recv_system_update_keyspace() throws InvalidRequestException, SchemaDisagreementException, TException
     {
       TMessage msg = iprot_.readMessageBegin();
       if (msg.type == TMessageType.EXCEPTION) {
@@ -1859,10 +1871,13 @@ public class Cassandra {
       if (result.ire != null) {
         throw result.ire;
       }
+      if (result.sde != null) {
+        throw result.sde;
+      }
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "system_update_keyspace failed: unknown result");
     }
 
-    public String system_update_column_family(CfDef cf_def) throws InvalidRequestException, TException
+    public String system_update_column_family(CfDef cf_def) throws InvalidRequestException, SchemaDisagreementException, TException
     {
       send_system_update_column_family(cf_def);
       return recv_system_update_column_family();
@@ -1878,7 +1893,7 @@ public class Cassandra {
       oprot_.getTransport().flush();
     }
 
-    public String recv_system_update_column_family() throws InvalidRequestException, TException
+    public String recv_system_update_column_family() throws InvalidRequestException, SchemaDisagreementException, TException
     {
       TMessage msg = iprot_.readMessageBegin();
       if (msg.type == TMessageType.EXCEPTION) {
@@ -1898,10 +1913,13 @@ public class Cassandra {
       if (result.ire != null) {
         throw result.ire;
       }
+      if (result.sde != null) {
+        throw result.sde;
+      }
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "system_update_column_family failed: unknown result");
     }
 
-    public CqlResult execute_cql_query(ByteBuffer query, Compression compression) throws InvalidRequestException, UnavailableException, TimedOutException, TException
+    public CqlResult execute_cql_query(ByteBuffer query, Compression compression) throws InvalidRequestException, UnavailableException, TimedOutException, SchemaDisagreementException, TException
     {
       send_execute_cql_query(query, compression);
       return recv_execute_cql_query();
@@ -1918,7 +1936,7 @@ public class Cassandra {
       oprot_.getTransport().flush();
     }
 
-    public CqlResult recv_execute_cql_query() throws InvalidRequestException, UnavailableException, TimedOutException, TException
+    public CqlResult recv_execute_cql_query() throws InvalidRequestException, UnavailableException, TimedOutException, SchemaDisagreementException, TException
     {
       TMessage msg = iprot_.readMessageBegin();
       if (msg.type == TMessageType.EXCEPTION) {
@@ -1944,6 +1962,9 @@ public class Cassandra {
       if (result.te != null) {
         throw result.te;
       }
+      if (result.sde != null) {
+        throw result.sde;
+      }
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "execute_cql_query failed: unknown result");
     }
 
@@ -2968,7 +2989,7 @@ public class Cassandra {
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws InvalidRequestException, TException {
+      public String getResult() throws InvalidRequestException, SchemaDisagreementException, TException {
         if (getState() != State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -2999,7 +3020,7 @@ public class Cassandra {
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws InvalidRequestException, TException {
+      public String getResult() throws InvalidRequestException, SchemaDisagreementException, TException {
         if (getState() != State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -3030,7 +3051,7 @@ public class Cassandra {
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws InvalidRequestException, TException {
+      public String getResult() throws InvalidRequestException, SchemaDisagreementException, TException {
         if (getState() != State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -3061,7 +3082,7 @@ public class Cassandra {
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws InvalidRequestException, TException {
+      public String getResult() throws InvalidRequestException, SchemaDisagreementException, TException {
         if (getState() != State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -3092,7 +3113,7 @@ public class Cassandra {
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws InvalidRequestException, TException {
+      public String getResult() throws InvalidRequestException, SchemaDisagreementException, TException {
         if (getState() != State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -3123,7 +3144,7 @@ public class Cassandra {
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws InvalidRequestException, TException {
+      public String getResult() throws InvalidRequestException, SchemaDisagreementException, TException {
         if (getState() != State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -3157,7 +3178,7 @@ public class Cassandra {
         prot.writeMessageEnd();
       }
 
-      public CqlResult getResult() throws InvalidRequestException, UnavailableException, TimedOutException, TException {
+      public CqlResult getResult() throws InvalidRequestException, UnavailableException, TimedOutException, SchemaDisagreementException, TException {
         if (getState() != State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -4348,6 +4369,8 @@ public class Cassandra {
           result.success = iface_.system_add_column_family(args.cf_def);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
+        } catch (SchemaDisagreementException sde) {
+          result.sde = sde;
         } catch (Throwable th) {
           LOGGER.error("Internal error processing system_add_column_family", th);
           TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing system_add_column_family");
@@ -4386,6 +4409,8 @@ public class Cassandra {
           result.success = iface_.system_drop_column_family(args.column_family);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
+        } catch (SchemaDisagreementException sde) {
+          result.sde = sde;
         } catch (Throwable th) {
           LOGGER.error("Internal error processing system_drop_column_family", th);
           TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing system_drop_column_family");
@@ -4424,6 +4449,8 @@ public class Cassandra {
           result.success = iface_.system_add_keyspace(args.ks_def);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
+        } catch (SchemaDisagreementException sde) {
+          result.sde = sde;
         } catch (Throwable th) {
           LOGGER.error("Internal error processing system_add_keyspace", th);
           TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing system_add_keyspace");
@@ -4462,6 +4489,8 @@ public class Cassandra {
           result.success = iface_.system_drop_keyspace(args.keyspace);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
+        } catch (SchemaDisagreementException sde) {
+          result.sde = sde;
         } catch (Throwable th) {
           LOGGER.error("Internal error processing system_drop_keyspace", th);
           TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing system_drop_keyspace");
@@ -4500,6 +4529,8 @@ public class Cassandra {
           result.success = iface_.system_update_keyspace(args.ks_def);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
+        } catch (SchemaDisagreementException sde) {
+          result.sde = sde;
         } catch (Throwable th) {
           LOGGER.error("Internal error processing system_update_keyspace", th);
           TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing system_update_keyspace");
@@ -4538,6 +4569,8 @@ public class Cassandra {
           result.success = iface_.system_update_column_family(args.cf_def);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
+        } catch (SchemaDisagreementException sde) {
+          result.sde = sde;
         } catch (Throwable th) {
           LOGGER.error("Internal error processing system_update_column_family", th);
           TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing system_update_column_family");
@@ -4580,6 +4613,8 @@ public class Cassandra {
           result.ue = ue;
         } catch (TimedOutException te) {
           result.te = te;
+        } catch (SchemaDisagreementException sde) {
+          result.sde = sde;
         } catch (Throwable th) {
           LOGGER.error("Internal error processing execute_cql_query", th);
           TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing execute_cql_query");
@@ -30887,14 +30922,17 @@ public class Cassandra {
 
     private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRING, (short)0);
     private static final TField IRE_FIELD_DESC = new TField("ire", TType.STRUCT, (short)1);
+    private static final TField SDE_FIELD_DESC = new TField("sde", TType.STRUCT, (short)2);
 
     public String success;
     public InvalidRequestException ire;
+    public SchemaDisagreementException sde;
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements TFieldIdEnum {
       SUCCESS((short)0, "success"),
-      IRE((short)1, "ire");
+      IRE((short)1, "ire"),
+      SDE((short)2, "sde");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -30913,6 +30951,8 @@ public class Cassandra {
             return SUCCESS;
           case 1: // IRE
             return IRE;
+          case 2: // SDE
+            return SDE;
           default:
             return null;
         }
@@ -30961,6 +31001,8 @@ public class Cassandra {
           new FieldValueMetaData(TType.STRING)));
       tmpMap.put(_Fields.IRE, new FieldMetaData("ire", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRUCT)));
+      tmpMap.put(_Fields.SDE, new FieldMetaData("sde", TFieldRequirementType.DEFAULT, 
+          new FieldValueMetaData(TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       FieldMetaData.addStructMetaDataMap(system_add_column_family_result.class, metaDataMap);
     }
@@ -30970,11 +31012,13 @@ public class Cassandra {
 
     public system_add_column_family_result(
       String success,
-      InvalidRequestException ire)
+      InvalidRequestException ire,
+      SchemaDisagreementException sde)
     {
       this();
       this.success = success;
       this.ire = ire;
+      this.sde = sde;
     }
 
     /**
@@ -30987,6 +31031,9 @@ public class Cassandra {
       if (other.isSetIre()) {
         this.ire = new InvalidRequestException(other.ire);
       }
+      if (other.isSetSde()) {
+        this.sde = new SchemaDisagreementException(other.sde);
+      }
     }
 
     public system_add_column_family_result deepCopy() {
@@ -30997,6 +31044,7 @@ public class Cassandra {
     public void clear() {
       this.success = null;
       this.ire = null;
+      this.sde = null;
     }
 
     public String getSuccess() {
@@ -31047,6 +31095,30 @@ public class Cassandra {
       }
     }
 
+    public SchemaDisagreementException getSde() {
+      return this.sde;
+    }
+
+    public system_add_column_family_result setSde(SchemaDisagreementException sde) {
+      this.sde = sde;
+      return this;
+    }
+
+    public void unsetSde() {
+      this.sde = null;
+    }
+
+    /** Returns true if field sde is set (has been asigned a value) and false otherwise */
+    public boolean isSetSde() {
+      return this.sde != null;
+    }
+
+    public void setSdeIsSet(boolean value) {
+      if (!value) {
+        this.sde = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case SUCCESS:
@@ -31065,6 +31137,14 @@ public class Cassandra {
         }
         break;
 
+      case SDE:
+        if (value == null) {
+          unsetSde();
+        } else {
+          setSde((SchemaDisagreementException)value);
+        }
+        break;
+
       }
     }
 
@@ -31076,6 +31156,9 @@ public class Cassandra {
       case IRE:
         return getIre();
 
+      case SDE:
+        return getSde();
+
       }
       throw new IllegalStateException();
     }
@@ -31091,6 +31174,8 @@ public class Cassandra {
         return isSetSuccess();
       case IRE:
         return isSetIre();
+      case SDE:
+        return isSetSde();
       }
       throw new IllegalStateException();
     }
@@ -31126,6 +31211,15 @@ public class Cassandra {
           return false;
       }
 
+      boolean this_present_sde = true && this.isSetSde();
+      boolean that_present_sde = true && that.isSetSde();
+      if (this_present_sde || that_present_sde) {
+        if (!(this_present_sde && that_present_sde))
+          return false;
+        if (!this.sde.equals(that.sde))
+          return false;
+      }
+
       return true;
     }
 
@@ -31143,6 +31237,11 @@ public class Cassandra {
       if (present_ire)
         builder.append(ire);
 
+      boolean present_sde = true && (isSetSde());
+      builder.append(present_sde);
+      if (present_sde)
+        builder.append(sde);
+
       return builder.toHashCode();
     }
 
@@ -31174,6 +31273,16 @@ public class Cassandra {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetSde()).compareTo(typedOther.isSetSde());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSde()) {
+        lastComparison = TBaseHelper.compareTo(this.sde, typedOther.sde);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -31206,6 +31315,14 @@ public class Cassandra {
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
+          case 2: // SDE
+            if (field.type == TType.STRUCT) {
+              this.sde = new SchemaDisagreementException();
+              this.sde.read(iprot);
+            } else { 
+              TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             TProtocolUtil.skip(iprot, field.type);
         }
@@ -31228,6 +31345,10 @@ public class Cassandra {
         oprot.writeFieldBegin(IRE_FIELD_DESC);
         this.ire.write(oprot);
         oprot.writeFieldEnd();
+      } else if (this.isSetSde()) {
+        oprot.writeFieldBegin(SDE_FIELD_DESC);
+        this.sde.write(oprot);
+        oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
@@ -31253,6 +31374,14 @@ public class Cassandra {
         sb.append(this.ire);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("sde:");
+      if (this.sde == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.sde);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -31559,14 +31688,17 @@ public class Cassandra {
 
     private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRING, (short)0);
     private static final TField IRE_FIELD_DESC = new TField("ire", TType.STRUCT, (short)1);
+    private static final TField SDE_FIELD_DESC = new TField("sde", TType.STRUCT, (short)2);
 
     public String success;
     public InvalidRequestException ire;
+    public SchemaDisagreementException sde;
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements TFieldIdEnum {
       SUCCESS((short)0, "success"),
-      IRE((short)1, "ire");
+      IRE((short)1, "ire"),
+      SDE((short)2, "sde");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -31585,6 +31717,8 @@ public class Cassandra {
             return SUCCESS;
           case 1: // IRE
             return IRE;
+          case 2: // SDE
+            return SDE;
           default:
             return null;
         }
@@ -31633,6 +31767,8 @@ public class Cassandra {
           new FieldValueMetaData(TType.STRING)));
       tmpMap.put(_Fields.IRE, new FieldMetaData("ire", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRUCT)));
+      tmpMap.put(_Fields.SDE, new FieldMetaData("sde", TFieldRequirementType.DEFAULT, 
+          new FieldValueMetaData(TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       FieldMetaData.addStructMetaDataMap(system_drop_column_family_result.class, metaDataMap);
     }
@@ -31642,11 +31778,13 @@ public class Cassandra {
 
     public system_drop_column_family_result(
       String success,
-      InvalidRequestException ire)
+      InvalidRequestException ire,
+      SchemaDisagreementException sde)
     {
       this();
       this.success = success;
       this.ire = ire;
+      this.sde = sde;
     }
 
     /**
@@ -31659,6 +31797,9 @@ public class Cassandra {
       if (other.isSetIre()) {
         this.ire = new InvalidRequestException(other.ire);
       }
+      if (other.isSetSde()) {
+        this.sde = new SchemaDisagreementException(other.sde);
+      }
     }
 
     public system_drop_column_family_result deepCopy() {
@@ -31669,6 +31810,7 @@ public class Cassandra {
     public void clear() {
       this.success = null;
       this.ire = null;
+      this.sde = null;
     }
 
     public String getSuccess() {
@@ -31719,6 +31861,30 @@ public class Cassandra {
       }
     }
 
+    public SchemaDisagreementException getSde() {
+      return this.sde;
+    }
+
+    public system_drop_column_family_result setSde(SchemaDisagreementException sde) {
+      this.sde = sde;
+      return this;
+    }
+
+    public void unsetSde() {
+      this.sde = null;
+    }
+
+    /** Returns true if field sde is set (has been asigned a value) and false otherwise */
+    public boolean isSetSde() {
+      return this.sde != null;
+    }
+
+    public void setSdeIsSet(boolean value) {
+      if (!value) {
+        this.sde = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case SUCCESS:
@@ -31737,6 +31903,14 @@ public class Cassandra {
         }
         break;
 
+      case SDE:
+        if (value == null) {
+          unsetSde();
+        } else {
+          setSde((SchemaDisagreementException)value);
+        }
+        break;
+
       }
     }
 
@@ -31748,6 +31922,9 @@ public class Cassandra {
       case IRE:
         return getIre();
 
+      case SDE:
+        return getSde();
+
       }
       throw new IllegalStateException();
     }
@@ -31763,6 +31940,8 @@ public class Cassandra {
         return isSetSuccess();
       case IRE:
         return isSetIre();
+      case SDE:
+        return isSetSde();
       }
       throw new IllegalStateException();
     }
@@ -31798,6 +31977,15 @@ public class Cassandra {
           return false;
       }
 
+      boolean this_present_sde = true && this.isSetSde();
+      boolean that_present_sde = true && that.isSetSde();
+      if (this_present_sde || that_present_sde) {
+        if (!(this_present_sde && that_present_sde))
+          return false;
+        if (!this.sde.equals(that.sde))
+          return false;
+      }
+
       return true;
     }
 
@@ -31815,6 +32003,11 @@ public class Cassandra {
       if (present_ire)
         builder.append(ire);
 
+      boolean present_sde = true && (isSetSde());
+      builder.append(present_sde);
+      if (present_sde)
+        builder.append(sde);
+
       return builder.toHashCode();
     }
 
@@ -31846,6 +32039,16 @@ public class Cassandra {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetSde()).compareTo(typedOther.isSetSde());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSde()) {
+        lastComparison = TBaseHelper.compareTo(this.sde, typedOther.sde);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -31878,6 +32081,14 @@ public class Cassandra {
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
+          case 2: // SDE
+            if (field.type == TType.STRUCT) {
+              this.sde = new SchemaDisagreementException();
+              this.sde.read(iprot);
+            } else { 
+              TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             TProtocolUtil.skip(iprot, field.type);
         }
@@ -31900,6 +32111,10 @@ public class Cassandra {
         oprot.writeFieldBegin(IRE_FIELD_DESC);
         this.ire.write(oprot);
         oprot.writeFieldEnd();
+      } else if (this.isSetSde()) {
+        oprot.writeFieldBegin(SDE_FIELD_DESC);
+        this.sde.write(oprot);
+        oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
@@ -31925,6 +32140,14 @@ public class Cassandra {
         sb.append(this.ire);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("sde:");
+      if (this.sde == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.sde);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -32232,14 +32455,17 @@ public class Cassandra {
 
     private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRING, (short)0);
     private static final TField IRE_FIELD_DESC = new TField("ire", TType.STRUCT, (short)1);
+    private static final TField SDE_FIELD_DESC = new TField("sde", TType.STRUCT, (short)2);
 
     public String success;
     public InvalidRequestException ire;
+    public SchemaDisagreementException sde;
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements TFieldIdEnum {
       SUCCESS((short)0, "success"),
-      IRE((short)1, "ire");
+      IRE((short)1, "ire"),
+      SDE((short)2, "sde");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -32258,6 +32484,8 @@ public class Cassandra {
             return SUCCESS;
           case 1: // IRE
             return IRE;
+          case 2: // SDE
+            return SDE;
           default:
             return null;
         }
@@ -32306,6 +32534,8 @@ public class Cassandra {
           new FieldValueMetaData(TType.STRING)));
       tmpMap.put(_Fields.IRE, new FieldMetaData("ire", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRUCT)));
+      tmpMap.put(_Fields.SDE, new FieldMetaData("sde", TFieldRequirementType.DEFAULT, 
+          new FieldValueMetaData(TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       FieldMetaData.addStructMetaDataMap(system_add_keyspace_result.class, metaDataMap);
     }
@@ -32315,11 +32545,13 @@ public class Cassandra {
 
     public system_add_keyspace_result(
       String success,
-      InvalidRequestException ire)
+      InvalidRequestException ire,
+      SchemaDisagreementException sde)
     {
       this();
       this.success = success;
       this.ire = ire;
+      this.sde = sde;
     }
 
     /**
@@ -32332,6 +32564,9 @@ public class Cassandra {
       if (other.isSetIre()) {
         this.ire = new InvalidRequestException(other.ire);
       }
+      if (other.isSetSde()) {
+        this.sde = new SchemaDisagreementException(other.sde);
+      }
     }
 
     public system_add_keyspace_result deepCopy() {
@@ -32342,6 +32577,7 @@ public class Cassandra {
     public void clear() {
       this.success = null;
       this.ire = null;
+      this.sde = null;
     }
 
     public String getSuccess() {
@@ -32392,6 +32628,30 @@ public class Cassandra {
       }
     }
 
+    public SchemaDisagreementException getSde() {
+      return this.sde;
+    }
+
+    public system_add_keyspace_result setSde(SchemaDisagreementException sde) {
+      this.sde = sde;
+      return this;
+    }
+
+    public void unsetSde() {
+      this.sde = null;
+    }
+
+    /** Returns true if field sde is set (has been asigned a value) and false otherwise */
+    public boolean isSetSde() {
+      return this.sde != null;
+    }
+
+    public void setSdeIsSet(boolean value) {
+      if (!value) {
+        this.sde = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case SUCCESS:
@@ -32410,6 +32670,14 @@ public class Cassandra {
         }
         break;
 
+      case SDE:
+        if (value == null) {
+          unsetSde();
+        } else {
+          setSde((SchemaDisagreementException)value);
+        }
+        break;
+
       }
     }
 
@@ -32421,6 +32689,9 @@ public class Cassandra {
       case IRE:
         return getIre();
 
+      case SDE:
+        return getSde();
+
       }
       throw new IllegalStateException();
     }
@@ -32436,6 +32707,8 @@ public class Cassandra {
         return isSetSuccess();
       case IRE:
         return isSetIre();
+      case SDE:
+        return isSetSde();
       }
       throw new IllegalStateException();
     }
@@ -32471,6 +32744,15 @@ public class Cassandra {
           return false;
       }
 
+      boolean this_present_sde = true && this.isSetSde();
+      boolean that_present_sde = true && that.isSetSde();
+      if (this_present_sde || that_present_sde) {
+        if (!(this_present_sde && that_present_sde))
+          return false;
+        if (!this.sde.equals(that.sde))
+          return false;
+      }
+
       return true;
     }
 
@@ -32488,6 +32770,11 @@ public class Cassandra {
       if (present_ire)
         builder.append(ire);
 
+      boolean present_sde = true && (isSetSde());
+      builder.append(present_sde);
+      if (present_sde)
+        builder.append(sde);
+
       return builder.toHashCode();
     }
 
@@ -32519,6 +32806,16 @@ public class Cassandra {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetSde()).compareTo(typedOther.isSetSde());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSde()) {
+        lastComparison = TBaseHelper.compareTo(this.sde, typedOther.sde);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -32551,6 +32848,14 @@ public class Cassandra {
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
+          case 2: // SDE
+            if (field.type == TType.STRUCT) {
+              this.sde = new SchemaDisagreementException();
+              this.sde.read(iprot);
+            } else { 
+              TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             TProtocolUtil.skip(iprot, field.type);
         }
@@ -32573,6 +32878,10 @@ public class Cassandra {
         oprot.writeFieldBegin(IRE_FIELD_DESC);
         this.ire.write(oprot);
         oprot.writeFieldEnd();
+      } else if (this.isSetSde()) {
+        oprot.writeFieldBegin(SDE_FIELD_DESC);
+        this.sde.write(oprot);
+        oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
@@ -32598,6 +32907,14 @@ public class Cassandra {
         sb.append(this.ire);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("sde:");
+      if (this.sde == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.sde);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -32904,14 +33221,17 @@ public class Cassandra {
 
     private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRING, (short)0);
     private static final TField IRE_FIELD_DESC = new TField("ire", TType.STRUCT, (short)1);
+    private static final TField SDE_FIELD_DESC = new TField("sde", TType.STRUCT, (short)2);
 
     public String success;
     public InvalidRequestException ire;
+    public SchemaDisagreementException sde;
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements TFieldIdEnum {
       SUCCESS((short)0, "success"),
-      IRE((short)1, "ire");
+      IRE((short)1, "ire"),
+      SDE((short)2, "sde");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -32930,6 +33250,8 @@ public class Cassandra {
             return SUCCESS;
           case 1: // IRE
             return IRE;
+          case 2: // SDE
+            return SDE;
           default:
             return null;
         }
@@ -32978,6 +33300,8 @@ public class Cassandra {
           new FieldValueMetaData(TType.STRING)));
       tmpMap.put(_Fields.IRE, new FieldMetaData("ire", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRUCT)));
+      tmpMap.put(_Fields.SDE, new FieldMetaData("sde", TFieldRequirementType.DEFAULT, 
+          new FieldValueMetaData(TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       FieldMetaData.addStructMetaDataMap(system_drop_keyspace_result.class, metaDataMap);
     }
@@ -32987,11 +33311,13 @@ public class Cassandra {
 
     public system_drop_keyspace_result(
       String success,
-      InvalidRequestException ire)
+      InvalidRequestException ire,
+      SchemaDisagreementException sde)
     {
       this();
       this.success = success;
       this.ire = ire;
+      this.sde = sde;
     }
 
     /**
@@ -33004,6 +33330,9 @@ public class Cassandra {
       if (other.isSetIre()) {
         this.ire = new InvalidRequestException(other.ire);
       }
+      if (other.isSetSde()) {
+        this.sde = new SchemaDisagreementException(other.sde);
+      }
     }
 
     public system_drop_keyspace_result deepCopy() {
@@ -33014,6 +33343,7 @@ public class Cassandra {
     public void clear() {
       this.success = null;
       this.ire = null;
+      this.sde = null;
     }
 
     public String getSuccess() {
@@ -33064,6 +33394,30 @@ public class Cassandra {
       }
     }
 
+    public SchemaDisagreementException getSde() {
+      return this.sde;
+    }
+
+    public system_drop_keyspace_result setSde(SchemaDisagreementException sde) {
+      this.sde = sde;
+      return this;
+    }
+
+    public void unsetSde() {
+      this.sde = null;
+    }
+
+    /** Returns true if field sde is set (has been asigned a value) and false otherwise */
+    public boolean isSetSde() {
+      return this.sde != null;
+    }
+
+    public void setSdeIsSet(boolean value) {
+      if (!value) {
+        this.sde = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case SUCCESS:
@@ -33082,6 +33436,14 @@ public class Cassandra {
         }
         break;
 
+      case SDE:
+        if (value == null) {
+          unsetSde();
+        } else {
+          setSde((SchemaDisagreementException)value);
+        }
+        break;
+
       }
     }
 
@@ -33093,6 +33455,9 @@ public class Cassandra {
       case IRE:
         return getIre();
 
+      case SDE:
+        return getSde();
+
       }
       throw new IllegalStateException();
     }
@@ -33108,6 +33473,8 @@ public class Cassandra {
         return isSetSuccess();
       case IRE:
         return isSetIre();
+      case SDE:
+        return isSetSde();
       }
       throw new IllegalStateException();
     }
@@ -33143,6 +33510,15 @@ public class Cassandra {
           return false;
       }
 
+      boolean this_present_sde = true && this.isSetSde();
+      boolean that_present_sde = true && that.isSetSde();
+      if (this_present_sde || that_present_sde) {
+        if (!(this_present_sde && that_present_sde))
+          return false;
+        if (!this.sde.equals(that.sde))
+          return false;
+      }
+
       return true;
     }
 
@@ -33160,6 +33536,11 @@ public class Cassandra {
       if (present_ire)
         builder.append(ire);
 
+      boolean present_sde = true && (isSetSde());
+      builder.append(present_sde);
+      if (present_sde)
+        builder.append(sde);
+
       return builder.toHashCode();
     }
 
@@ -33191,6 +33572,16 @@ public class Cassandra {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetSde()).compareTo(typedOther.isSetSde());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSde()) {
+        lastComparison = TBaseHelper.compareTo(this.sde, typedOther.sde);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -33223,6 +33614,14 @@ public class Cassandra {
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
+          case 2: // SDE
+            if (field.type == TType.STRUCT) {
+              this.sde = new SchemaDisagreementException();
+              this.sde.read(iprot);
+            } else { 
+              TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             TProtocolUtil.skip(iprot, field.type);
         }
@@ -33245,6 +33644,10 @@ public class Cassandra {
         oprot.writeFieldBegin(IRE_FIELD_DESC);
         this.ire.write(oprot);
         oprot.writeFieldEnd();
+      } else if (this.isSetSde()) {
+        oprot.writeFieldBegin(SDE_FIELD_DESC);
+        this.sde.write(oprot);
+        oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
@@ -33270,6 +33673,14 @@ public class Cassandra {
         sb.append(this.ire);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("sde:");
+      if (this.sde == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.sde);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -33577,14 +33988,17 @@ public class Cassandra {
 
     private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRING, (short)0);
     private static final TField IRE_FIELD_DESC = new TField("ire", TType.STRUCT, (short)1);
+    private static final TField SDE_FIELD_DESC = new TField("sde", TType.STRUCT, (short)2);
 
     public String success;
     public InvalidRequestException ire;
+    public SchemaDisagreementException sde;
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements TFieldIdEnum {
       SUCCESS((short)0, "success"),
-      IRE((short)1, "ire");
+      IRE((short)1, "ire"),
+      SDE((short)2, "sde");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -33603,6 +34017,8 @@ public class Cassandra {
             return SUCCESS;
           case 1: // IRE
             return IRE;
+          case 2: // SDE
+            return SDE;
           default:
             return null;
         }
@@ -33651,6 +34067,8 @@ public class Cassandra {
           new FieldValueMetaData(TType.STRING)));
       tmpMap.put(_Fields.IRE, new FieldMetaData("ire", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRUCT)));
+      tmpMap.put(_Fields.SDE, new FieldMetaData("sde", TFieldRequirementType.DEFAULT, 
+          new FieldValueMetaData(TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       FieldMetaData.addStructMetaDataMap(system_update_keyspace_result.class, metaDataMap);
     }
@@ -33660,11 +34078,13 @@ public class Cassandra {
 
     public system_update_keyspace_result(
       String success,
-      InvalidRequestException ire)
+      InvalidRequestException ire,
+      SchemaDisagreementException sde)
     {
       this();
       this.success = success;
       this.ire = ire;
+      this.sde = sde;
     }
 
     /**
@@ -33677,6 +34097,9 @@ public class Cassandra {
       if (other.isSetIre()) {
         this.ire = new InvalidRequestException(other.ire);
       }
+      if (other.isSetSde()) {
+        this.sde = new SchemaDisagreementException(other.sde);
+      }
     }
 
     public system_update_keyspace_result deepCopy() {
@@ -33687,6 +34110,7 @@ public class Cassandra {
     public void clear() {
       this.success = null;
       this.ire = null;
+      this.sde = null;
     }
 
     public String getSuccess() {
@@ -33737,6 +34161,30 @@ public class Cassandra {
       }
     }
 
+    public SchemaDisagreementException getSde() {
+      return this.sde;
+    }
+
+    public system_update_keyspace_result setSde(SchemaDisagreementException sde) {
+      this.sde = sde;
+      return this;
+    }
+
+    public void unsetSde() {
+      this.sde = null;
+    }
+
+    /** Returns true if field sde is set (has been asigned a value) and false otherwise */
+    public boolean isSetSde() {
+      return this.sde != null;
+    }
+
+    public void setSdeIsSet(boolean value) {
+      if (!value) {
+        this.sde = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case SUCCESS:
@@ -33755,6 +34203,14 @@ public class Cassandra {
         }
         break;
 
+      case SDE:
+        if (value == null) {
+          unsetSde();
+        } else {
+          setSde((SchemaDisagreementException)value);
+        }
+        break;
+
       }
     }
 
@@ -33766,6 +34222,9 @@ public class Cassandra {
       case IRE:
         return getIre();
 
+      case SDE:
+        return getSde();
+
       }
       throw new IllegalStateException();
     }
@@ -33781,6 +34240,8 @@ public class Cassandra {
         return isSetSuccess();
       case IRE:
         return isSetIre();
+      case SDE:
+        return isSetSde();
       }
       throw new IllegalStateException();
     }
@@ -33816,6 +34277,15 @@ public class Cassandra {
           return false;
       }
 
+      boolean this_present_sde = true && this.isSetSde();
+      boolean that_present_sde = true && that.isSetSde();
+      if (this_present_sde || that_present_sde) {
+        if (!(this_present_sde && that_present_sde))
+          return false;
+        if (!this.sde.equals(that.sde))
+          return false;
+      }
+
       return true;
     }
 
@@ -33833,6 +34303,11 @@ public class Cassandra {
       if (present_ire)
         builder.append(ire);
 
+      boolean present_sde = true && (isSetSde());
+      builder.append(present_sde);
+      if (present_sde)
+        builder.append(sde);
+
       return builder.toHashCode();
     }
 
@@ -33864,6 +34339,16 @@ public class Cassandra {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetSde()).compareTo(typedOther.isSetSde());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSde()) {
+        lastComparison = TBaseHelper.compareTo(this.sde, typedOther.sde);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -33896,6 +34381,14 @@ public class Cassandra {
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
+          case 2: // SDE
+            if (field.type == TType.STRUCT) {
+              this.sde = new SchemaDisagreementException();
+              this.sde.read(iprot);
+            } else { 
+              TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             TProtocolUtil.skip(iprot, field.type);
         }
@@ -33918,6 +34411,10 @@ public class Cassandra {
         oprot.writeFieldBegin(IRE_FIELD_DESC);
         this.ire.write(oprot);
         oprot.writeFieldEnd();
+      } else if (this.isSetSde()) {
+        oprot.writeFieldBegin(SDE_FIELD_DESC);
+        this.sde.write(oprot);
+        oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
@@ -33943,6 +34440,14 @@ public class Cassandra {
         sb.append(this.ire);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("sde:");
+      if (this.sde == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.sde);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -34250,14 +34755,17 @@ public class Cassandra {
 
     private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRING, (short)0);
     private static final TField IRE_FIELD_DESC = new TField("ire", TType.STRUCT, (short)1);
+    private static final TField SDE_FIELD_DESC = new TField("sde", TType.STRUCT, (short)2);
 
     public String success;
     public InvalidRequestException ire;
+    public SchemaDisagreementException sde;
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements TFieldIdEnum {
       SUCCESS((short)0, "success"),
-      IRE((short)1, "ire");
+      IRE((short)1, "ire"),
+      SDE((short)2, "sde");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -34276,6 +34784,8 @@ public class Cassandra {
             return SUCCESS;
           case 1: // IRE
             return IRE;
+          case 2: // SDE
+            return SDE;
           default:
             return null;
         }
@@ -34324,6 +34834,8 @@ public class Cassandra {
           new FieldValueMetaData(TType.STRING)));
       tmpMap.put(_Fields.IRE, new FieldMetaData("ire", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRUCT)));
+      tmpMap.put(_Fields.SDE, new FieldMetaData("sde", TFieldRequirementType.DEFAULT, 
+          new FieldValueMetaData(TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       FieldMetaData.addStructMetaDataMap(system_update_column_family_result.class, metaDataMap);
     }
@@ -34333,11 +34845,13 @@ public class Cassandra {
 
     public system_update_column_family_result(
       String success,
-      InvalidRequestException ire)
+      InvalidRequestException ire,
+      SchemaDisagreementException sde)
     {
       this();
       this.success = success;
       this.ire = ire;
+      this.sde = sde;
     }
 
     /**
@@ -34350,6 +34864,9 @@ public class Cassandra {
       if (other.isSetIre()) {
         this.ire = new InvalidRequestException(other.ire);
       }
+      if (other.isSetSde()) {
+        this.sde = new SchemaDisagreementException(other.sde);
+      }
     }
 
     public system_update_column_family_result deepCopy() {
@@ -34360,6 +34877,7 @@ public class Cassandra {
     public void clear() {
       this.success = null;
       this.ire = null;
+      this.sde = null;
     }
 
     public String getSuccess() {
@@ -34410,6 +34928,30 @@ public class Cassandra {
       }
     }
 
+    public SchemaDisagreementException getSde() {
+      return this.sde;
+    }
+
+    public system_update_column_family_result setSde(SchemaDisagreementException sde) {
+      this.sde = sde;
+      return this;
+    }
+
+    public void unsetSde() {
+      this.sde = null;
+    }
+
+    /** Returns true if field sde is set (has been asigned a value) and false otherwise */
+    public boolean isSetSde() {
+      return this.sde != null;
+    }
+
+    public void setSdeIsSet(boolean value) {
+      if (!value) {
+        this.sde = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case SUCCESS:
@@ -34428,6 +34970,14 @@ public class Cassandra {
         }
         break;
 
+      case SDE:
+        if (value == null) {
+          unsetSde();
+        } else {
+          setSde((SchemaDisagreementException)value);
+        }
+        break;
+
       }
     }
 
@@ -34439,6 +34989,9 @@ public class Cassandra {
       case IRE:
         return getIre();
 
+      case SDE:
+        return getSde();
+
       }
       throw new IllegalStateException();
     }
@@ -34454,6 +35007,8 @@ public class Cassandra {
         return isSetSuccess();
       case IRE:
         return isSetIre();
+      case SDE:
+        return isSetSde();
       }
       throw new IllegalStateException();
     }
@@ -34489,6 +35044,15 @@ public class Cassandra {
           return false;
       }
 
+      boolean this_present_sde = true && this.isSetSde();
+      boolean that_present_sde = true && that.isSetSde();
+      if (this_present_sde || that_present_sde) {
+        if (!(this_present_sde && that_present_sde))
+          return false;
+        if (!this.sde.equals(that.sde))
+          return false;
+      }
+
       return true;
     }
 
@@ -34506,6 +35070,11 @@ public class Cassandra {
       if (present_ire)
         builder.append(ire);
 
+      boolean present_sde = true && (isSetSde());
+      builder.append(present_sde);
+      if (present_sde)
+        builder.append(sde);
+
       return builder.toHashCode();
     }
 
@@ -34537,6 +35106,16 @@ public class Cassandra {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetSde()).compareTo(typedOther.isSetSde());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSde()) {
+        lastComparison = TBaseHelper.compareTo(this.sde, typedOther.sde);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -34569,6 +35148,14 @@ public class Cassandra {
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
+          case 2: // SDE
+            if (field.type == TType.STRUCT) {
+              this.sde = new SchemaDisagreementException();
+              this.sde.read(iprot);
+            } else { 
+              TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             TProtocolUtil.skip(iprot, field.type);
         }
@@ -34591,6 +35178,10 @@ public class Cassandra {
         oprot.writeFieldBegin(IRE_FIELD_DESC);
         this.ire.write(oprot);
         oprot.writeFieldEnd();
+      } else if (this.isSetSde()) {
+        oprot.writeFieldBegin(SDE_FIELD_DESC);
+        this.sde.write(oprot);
+        oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
@@ -34616,6 +35207,14 @@ public class Cassandra {
         sb.append(this.ire);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("sde:");
+      if (this.sde == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.sde);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -35048,18 +35647,21 @@ public class Cassandra {
     private static final TField IRE_FIELD_DESC = new TField("ire", TType.STRUCT, (short)1);
     private static final TField UE_FIELD_DESC = new TField("ue", TType.STRUCT, (short)2);
     private static final TField TE_FIELD_DESC = new TField("te", TType.STRUCT, (short)3);
+    private static final TField SDE_FIELD_DESC = new TField("sde", TType.STRUCT, (short)4);
 
     public CqlResult success;
     public InvalidRequestException ire;
     public UnavailableException ue;
     public TimedOutException te;
+    public SchemaDisagreementException sde;
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements TFieldIdEnum {
       SUCCESS((short)0, "success"),
       IRE((short)1, "ire"),
       UE((short)2, "ue"),
-      TE((short)3, "te");
+      TE((short)3, "te"),
+      SDE((short)4, "sde");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -35082,6 +35684,8 @@ public class Cassandra {
             return UE;
           case 3: // TE
             return TE;
+          case 4: // SDE
+            return SDE;
           default:
             return null;
         }
@@ -35134,6 +35738,8 @@ public class Cassandra {
           new FieldValueMetaData(TType.STRUCT)));
       tmpMap.put(_Fields.TE, new FieldMetaData("te", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRUCT)));
+      tmpMap.put(_Fields.SDE, new FieldMetaData("sde", TFieldRequirementType.DEFAULT, 
+          new FieldValueMetaData(TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       FieldMetaData.addStructMetaDataMap(execute_cql_query_result.class, metaDataMap);
     }
@@ -35145,13 +35751,15 @@ public class Cassandra {
       CqlResult success,
       InvalidRequestException ire,
       UnavailableException ue,
-      TimedOutException te)
+      TimedOutException te,
+      SchemaDisagreementException sde)
     {
       this();
       this.success = success;
       this.ire = ire;
       this.ue = ue;
       this.te = te;
+      this.sde = sde;
     }
 
     /**
@@ -35170,6 +35778,9 @@ public class Cassandra {
       if (other.isSetTe()) {
         this.te = new TimedOutException(other.te);
       }
+      if (other.isSetSde()) {
+        this.sde = new SchemaDisagreementException(other.sde);
+      }
     }
 
     public execute_cql_query_result deepCopy() {
@@ -35182,6 +35793,7 @@ public class Cassandra {
       this.ire = null;
       this.ue = null;
       this.te = null;
+      this.sde = null;
     }
 
     public CqlResult getSuccess() {
@@ -35280,6 +35892,30 @@ public class Cassandra {
       }
     }
 
+    public SchemaDisagreementException getSde() {
+      return this.sde;
+    }
+
+    public execute_cql_query_result setSde(SchemaDisagreementException sde) {
+      this.sde = sde;
+      return this;
+    }
+
+    public void unsetSde() {
+      this.sde = null;
+    }
+
+    /** Returns true if field sde is set (has been asigned a value) and false otherwise */
+    public boolean isSetSde() {
+      return this.sde != null;
+    }
+
+    public void setSdeIsSet(boolean value) {
+      if (!value) {
+        this.sde = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case SUCCESS:
@@ -35314,6 +35950,14 @@ public class Cassandra {
         }
         break;
 
+      case SDE:
+        if (value == null) {
+          unsetSde();
+        } else {
+          setSde((SchemaDisagreementException)value);
+        }
+        break;
+
       }
     }
 
@@ -35331,6 +35975,9 @@ public class Cassandra {
       case TE:
         return getTe();
 
+      case SDE:
+        return getSde();
+
       }
       throw new IllegalStateException();
     }
@@ -35350,6 +35997,8 @@ public class Cassandra {
         return isSetUe();
       case TE:
         return isSetTe();
+      case SDE:
+        return isSetSde();
       }
       throw new IllegalStateException();
     }
@@ -35403,6 +36052,15 @@ public class Cassandra {
           return false;
       }
 
+      boolean this_present_sde = true && this.isSetSde();
+      boolean that_present_sde = true && that.isSetSde();
+      if (this_present_sde || that_present_sde) {
+        if (!(this_present_sde && that_present_sde))
+          return false;
+        if (!this.sde.equals(that.sde))
+          return false;
+      }
+
       return true;
     }
 
@@ -35430,6 +36088,11 @@ public class Cassandra {
       if (present_te)
         builder.append(te);
 
+      boolean present_sde = true && (isSetSde());
+      builder.append(present_sde);
+      if (present_sde)
+        builder.append(sde);
+
       return builder.toHashCode();
     }
 
@@ -35481,6 +36144,16 @@ public class Cassandra {
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetSde()).compareTo(typedOther.isSetSde());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSde()) {
+        lastComparison = TBaseHelper.compareTo(this.sde, typedOther.sde);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -35530,6 +36203,14 @@ public class Cassandra {
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
+          case 4: // SDE
+            if (field.type == TType.STRUCT) {
+              this.sde = new SchemaDisagreementException();
+              this.sde.read(iprot);
+            } else { 
+              TProtocolUtil.skip(iprot, field.type);
+            }
+            break;
           default:
             TProtocolUtil.skip(iprot, field.type);
         }
@@ -35560,6 +36241,10 @@ public class Cassandra {
         oprot.writeFieldBegin(TE_FIELD_DESC);
         this.te.write(oprot);
         oprot.writeFieldEnd();
+      } else if (this.isSetSde()) {
+        oprot.writeFieldBegin(SDE_FIELD_DESC);
+        this.sde.write(oprot);
+        oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
@@ -35601,6 +36286,14 @@ public class Cassandra {
         sb.append(this.te);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("sde:");
+      if (this.sde == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.sde);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java?rev=1081971&r1=1081970&r2=1081971&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java Tue Mar 15 22:52:10 2011
@@ -32,13 +32,26 @@ import java.util.HashMap;
 import org.apache.thrift.TEnum;
 
 /**
- * The ConsistencyLevel is an enum that controls both read and write behavior based on the ReplicationFactor of the keyspace.
- * The different consistency levels have different meanings, depending on if you're doing a write or read
- * operation. Note that if W + R > ReplicationFactor, where W is the number of nodes to block for on write, and R
- * the number to block for on reads, you will have strongly consistent behavior; that is, readers will always see the most
- * recent write. Of these, the most interesting is to do QUORUM reads and writes, which gives you consistency while still
- * allowing availability in the face of node failures up to half of <ReplicationFactor>. Of course if latency is more
- * important than consistency then you can use lower values for either or both.
+ * The ConsistencyLevel is an enum that controls both read and write
+ * behavior based on the ReplicationFactor of the keyspace.  The
+ * different consistency levels have different meanings, depending on
+ * if you're doing a write or read operation.
+ * 
+ * If W + R > ReplicationFactor, where W is the number of nodes to
+ * block for on write, and R the number to block for on reads, you
+ * will have strongly consistent behavior; that is, readers will
+ * always see the most recent write. Of these, the most interesting is
+ * to do QUORUM reads and writes, which gives you consistency while
+ * still allowing availability in the face of node failures up to half
+ * of <ReplicationFactor>. Of course if latency is more important than
+ * consistency then you can use lower values for either or both.
+ * 
+ * Some ConsistencyLevels (ONE, TWO, THREE) refer to a specific number
+ * of replicas rather than a logical concept that adjusts
+ * automatically with the replication factor.  Of these, only ONE is
+ * commonly used; TWO and (even more rarely) THREE are only useful
+ * when you care more about guaranteeing a certain level of
+ * durability, than consistency.
  * 
  * Write consistency levels make the following guarantees before reporting success to the client:
  *   ANY          Ensure that the write has been written once somewhere, including possibly being hinted in a non-target node.

Added: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java?rev=1081971&view=auto
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java (added)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java Tue Mar 15 22:52:10 2011
@@ -0,0 +1,241 @@
+/**
+ * Autogenerated by Thrift
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.cassandra.thrift;
+/*
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ */
+
+
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.thrift.*;
+import org.apache.thrift.async.*;
+import org.apache.thrift.meta_data.*;
+import org.apache.thrift.transport.*;
+import org.apache.thrift.protocol.*;
+
+/**
+ * schemas are not in agreement across all nodes
+ */
+public class SchemaDisagreementException extends Exception implements TBase<SchemaDisagreementException, SchemaDisagreementException._Fields>, java.io.Serializable, Cloneable {
+  private static final TStruct STRUCT_DESC = new TStruct("SchemaDisagreementException");
+
+
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements TFieldIdEnum {
+;
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+  public static final Map<_Fields, FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    FieldMetaData.addStructMetaDataMap(SchemaDisagreementException.class, metaDataMap);
+  }
+
+  public SchemaDisagreementException() {
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public SchemaDisagreementException(SchemaDisagreementException other) {
+  }
+
+  public SchemaDisagreementException deepCopy() {
+    return new SchemaDisagreementException(this);
+  }
+
+  @Override
+  public void clear() {
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof SchemaDisagreementException)
+      return this.equals((SchemaDisagreementException)that);
+    return false;
+  }
+
+  public boolean equals(SchemaDisagreementException that) {
+    if (that == null)
+      return false;
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    HashCodeBuilder builder = new HashCodeBuilder();
+
+    return builder.toHashCode();
+  }
+
+  public int compareTo(SchemaDisagreementException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    SchemaDisagreementException typedOther = (SchemaDisagreementException)other;
+
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(TProtocol iprot) throws TException {
+    TField field;
+    iprot.readStructBegin();
+    while (true)
+    {
+      field = iprot.readFieldBegin();
+      if (field.type == TType.STOP) { 
+        break;
+      }
+      switch (field.id) {
+        default:
+          TProtocolUtil.skip(iprot, field.type);
+      }
+      iprot.readFieldEnd();
+    }
+    iprot.readStructEnd();
+
+    // check for required fields of primitive type, which can't be checked in the validate method
+    validate();
+  }
+
+  public void write(TProtocol oprot) throws TException {
+    validate();
+
+    oprot.writeStructBegin(STRUCT_DESC);
+    oprot.writeFieldStop();
+    oprot.writeStructEnd();
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("SchemaDisagreementException(");
+    boolean first = true;
+
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws TException {
+    // check for required fields
+  }
+
+}
+



Mime
View raw message