cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/4] Merge get_indexed_slices with get_range_slices
Date Mon, 02 Jan 2012 16:08:49 GMT
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3297a96e/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
index c3a01a2..a910614 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
@@ -51,8 +51,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
   private static final org.apache.thrift.protocol.TField COMPARATOR_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("comparator_type", org.apache.thrift.protocol.TType.STRING, (short)5);
   private static final org.apache.thrift.protocol.TField SUBCOMPARATOR_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("subcomparator_type", org.apache.thrift.protocol.TType.STRING, (short)6);
   private static final org.apache.thrift.protocol.TField COMMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("comment", org.apache.thrift.protocol.TType.STRING, (short)8);
-  private static final org.apache.thrift.protocol.TField ROW_CACHE_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("row_cache_size", org.apache.thrift.protocol.TType.DOUBLE, (short)9);
-  private static final org.apache.thrift.protocol.TField KEY_CACHE_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("key_cache_size", org.apache.thrift.protocol.TType.DOUBLE, (short)11);
   private static final org.apache.thrift.protocol.TField READ_REPAIR_CHANCE_FIELD_DESC = new org.apache.thrift.protocol.TField("read_repair_chance", org.apache.thrift.protocol.TType.DOUBLE, (short)12);
   private static final org.apache.thrift.protocol.TField COLUMN_METADATA_FIELD_DESC = new org.apache.thrift.protocol.TField("column_metadata", org.apache.thrift.protocol.TType.LIST, (short)13);
   private static final org.apache.thrift.protocol.TField GC_GRACE_SECONDS_FIELD_DESC = new org.apache.thrift.protocol.TField("gc_grace_seconds", org.apache.thrift.protocol.TType.I32, (short)14);
@@ -60,16 +58,12 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
   private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.I32, (short)16);
   private static final org.apache.thrift.protocol.TField MIN_COMPACTION_THRESHOLD_FIELD_DESC = new org.apache.thrift.protocol.TField("min_compaction_threshold", org.apache.thrift.protocol.TType.I32, (short)17);
   private static final org.apache.thrift.protocol.TField MAX_COMPACTION_THRESHOLD_FIELD_DESC = new org.apache.thrift.protocol.TField("max_compaction_threshold", org.apache.thrift.protocol.TType.I32, (short)18);
-  private static final org.apache.thrift.protocol.TField ROW_CACHE_SAVE_PERIOD_IN_SECONDS_FIELD_DESC = new org.apache.thrift.protocol.TField("row_cache_save_period_in_seconds", org.apache.thrift.protocol.TType.I32, (short)19);
-  private static final org.apache.thrift.protocol.TField KEY_CACHE_SAVE_PERIOD_IN_SECONDS_FIELD_DESC = new org.apache.thrift.protocol.TField("key_cache_save_period_in_seconds", org.apache.thrift.protocol.TType.I32, (short)20);
   private static final org.apache.thrift.protocol.TField REPLICATE_ON_WRITE_FIELD_DESC = new org.apache.thrift.protocol.TField("replicate_on_write", org.apache.thrift.protocol.TType.BOOL, (short)24);
   private static final org.apache.thrift.protocol.TField MERGE_SHARDS_CHANCE_FIELD_DESC = new org.apache.thrift.protocol.TField("merge_shards_chance", org.apache.thrift.protocol.TType.DOUBLE, (short)25);
   private static final org.apache.thrift.protocol.TField KEY_VALIDATION_CLASS_FIELD_DESC = new org.apache.thrift.protocol.TField("key_validation_class", org.apache.thrift.protocol.TType.STRING, (short)26);
-  private static final org.apache.thrift.protocol.TField ROW_CACHE_PROVIDER_FIELD_DESC = new org.apache.thrift.protocol.TField("row_cache_provider", org.apache.thrift.protocol.TType.STRING, (short)27);
   private static final org.apache.thrift.protocol.TField KEY_ALIAS_FIELD_DESC = new org.apache.thrift.protocol.TField("key_alias", org.apache.thrift.protocol.TType.STRING, (short)28);
   private static final org.apache.thrift.protocol.TField COMPACTION_STRATEGY_FIELD_DESC = new org.apache.thrift.protocol.TField("compaction_strategy", org.apache.thrift.protocol.TType.STRING, (short)29);
   private static final org.apache.thrift.protocol.TField COMPACTION_STRATEGY_OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("compaction_strategy_options", org.apache.thrift.protocol.TType.MAP, (short)30);
-  private static final org.apache.thrift.protocol.TField ROW_CACHE_KEYS_TO_SAVE_FIELD_DESC = new org.apache.thrift.protocol.TField("row_cache_keys_to_save", org.apache.thrift.protocol.TType.I32, (short)31);
   private static final org.apache.thrift.protocol.TField COMPRESSION_OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("compression_options", org.apache.thrift.protocol.TType.MAP, (short)32);
   private static final org.apache.thrift.protocol.TField BLOOM_FILTER_FP_CHANCE_FIELD_DESC = new org.apache.thrift.protocol.TField("bloom_filter_fp_chance", org.apache.thrift.protocol.TType.DOUBLE, (short)33);
 
@@ -79,8 +73,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
   public String comparator_type;
   public String subcomparator_type;
   public String comment;
-  public double row_cache_size;
-  public double key_cache_size;
   public double read_repair_chance;
   public List<ColumnDef> column_metadata;
   public int gc_grace_seconds;
@@ -88,16 +80,12 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
   public int id;
   public int min_compaction_threshold;
   public int max_compaction_threshold;
-  public int row_cache_save_period_in_seconds;
-  public int key_cache_save_period_in_seconds;
   public boolean replicate_on_write;
   public double merge_shards_chance;
   public String key_validation_class;
-  public String row_cache_provider;
   public ByteBuffer key_alias;
   public String compaction_strategy;
   public Map<String,String> compaction_strategy_options;
-  public int row_cache_keys_to_save;
   public Map<String,String> compression_options;
   public double bloom_filter_fp_chance;
 
@@ -109,8 +97,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     COMPARATOR_TYPE((short)5, "comparator_type"),
     SUBCOMPARATOR_TYPE((short)6, "subcomparator_type"),
     COMMENT((short)8, "comment"),
-    ROW_CACHE_SIZE((short)9, "row_cache_size"),
-    KEY_CACHE_SIZE((short)11, "key_cache_size"),
     READ_REPAIR_CHANCE((short)12, "read_repair_chance"),
     COLUMN_METADATA((short)13, "column_metadata"),
     GC_GRACE_SECONDS((short)14, "gc_grace_seconds"),
@@ -118,16 +104,12 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     ID((short)16, "id"),
     MIN_COMPACTION_THRESHOLD((short)17, "min_compaction_threshold"),
     MAX_COMPACTION_THRESHOLD((short)18, "max_compaction_threshold"),
-    ROW_CACHE_SAVE_PERIOD_IN_SECONDS((short)19, "row_cache_save_period_in_seconds"),
-    KEY_CACHE_SAVE_PERIOD_IN_SECONDS((short)20, "key_cache_save_period_in_seconds"),
     REPLICATE_ON_WRITE((short)24, "replicate_on_write"),
     MERGE_SHARDS_CHANCE((short)25, "merge_shards_chance"),
     KEY_VALIDATION_CLASS((short)26, "key_validation_class"),
-    ROW_CACHE_PROVIDER((short)27, "row_cache_provider"),
     KEY_ALIAS((short)28, "key_alias"),
     COMPACTION_STRATEGY((short)29, "compaction_strategy"),
     COMPACTION_STRATEGY_OPTIONS((short)30, "compaction_strategy_options"),
-    ROW_CACHE_KEYS_TO_SAVE((short)31, "row_cache_keys_to_save"),
     COMPRESSION_OPTIONS((short)32, "compression_options"),
     BLOOM_FILTER_FP_CHANCE((short)33, "bloom_filter_fp_chance");
 
@@ -156,10 +138,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
           return SUBCOMPARATOR_TYPE;
         case 8: // COMMENT
           return COMMENT;
-        case 9: // ROW_CACHE_SIZE
-          return ROW_CACHE_SIZE;
-        case 11: // KEY_CACHE_SIZE
-          return KEY_CACHE_SIZE;
         case 12: // READ_REPAIR_CHANCE
           return READ_REPAIR_CHANCE;
         case 13: // COLUMN_METADATA
@@ -174,26 +152,18 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
           return MIN_COMPACTION_THRESHOLD;
         case 18: // MAX_COMPACTION_THRESHOLD
           return MAX_COMPACTION_THRESHOLD;
-        case 19: // ROW_CACHE_SAVE_PERIOD_IN_SECONDS
-          return ROW_CACHE_SAVE_PERIOD_IN_SECONDS;
-        case 20: // KEY_CACHE_SAVE_PERIOD_IN_SECONDS
-          return KEY_CACHE_SAVE_PERIOD_IN_SECONDS;
         case 24: // REPLICATE_ON_WRITE
           return REPLICATE_ON_WRITE;
         case 25: // MERGE_SHARDS_CHANCE
           return MERGE_SHARDS_CHANCE;
         case 26: // KEY_VALIDATION_CLASS
           return KEY_VALIDATION_CLASS;
-        case 27: // ROW_CACHE_PROVIDER
-          return ROW_CACHE_PROVIDER;
         case 28: // KEY_ALIAS
           return KEY_ALIAS;
         case 29: // COMPACTION_STRATEGY
           return COMPACTION_STRATEGY;
         case 30: // COMPACTION_STRATEGY_OPTIONS
           return COMPACTION_STRATEGY_OPTIONS;
-        case 31: // ROW_CACHE_KEYS_TO_SAVE
-          return ROW_CACHE_KEYS_TO_SAVE;
         case 32: // COMPRESSION_OPTIONS
           return COMPRESSION_OPTIONS;
         case 33: // BLOOM_FILTER_FP_CHANCE
@@ -238,20 +208,15 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
   }
 
   // isset id assignments
-  private static final int __ROW_CACHE_SIZE_ISSET_ID = 0;
-  private static final int __KEY_CACHE_SIZE_ISSET_ID = 1;
-  private static final int __READ_REPAIR_CHANCE_ISSET_ID = 2;
-  private static final int __GC_GRACE_SECONDS_ISSET_ID = 3;
-  private static final int __ID_ISSET_ID = 4;
-  private static final int __MIN_COMPACTION_THRESHOLD_ISSET_ID = 5;
-  private static final int __MAX_COMPACTION_THRESHOLD_ISSET_ID = 6;
-  private static final int __ROW_CACHE_SAVE_PERIOD_IN_SECONDS_ISSET_ID = 7;
-  private static final int __KEY_CACHE_SAVE_PERIOD_IN_SECONDS_ISSET_ID = 8;
-  private static final int __REPLICATE_ON_WRITE_ISSET_ID = 9;
-  private static final int __MERGE_SHARDS_CHANCE_ISSET_ID = 10;
-  private static final int __ROW_CACHE_KEYS_TO_SAVE_ISSET_ID = 11;
-  private static final int __BLOOM_FILTER_FP_CHANCE_ISSET_ID = 12;
-  private BitSet __isset_bit_vector = new BitSet(13);
+  private static final int __READ_REPAIR_CHANCE_ISSET_ID = 0;
+  private static final int __GC_GRACE_SECONDS_ISSET_ID = 1;
+  private static final int __ID_ISSET_ID = 2;
+  private static final int __MIN_COMPACTION_THRESHOLD_ISSET_ID = 3;
+  private static final int __MAX_COMPACTION_THRESHOLD_ISSET_ID = 4;
+  private static final int __REPLICATE_ON_WRITE_ISSET_ID = 5;
+  private static final int __MERGE_SHARDS_CHANCE_ISSET_ID = 6;
+  private static final int __BLOOM_FILTER_FP_CHANCE_ISSET_ID = 7;
+  private BitSet __isset_bit_vector = new BitSet(8);
 
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
@@ -268,10 +233,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.COMMENT, new org.apache.thrift.meta_data.FieldMetaData("comment", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.ROW_CACHE_SIZE, new org.apache.thrift.meta_data.FieldMetaData("row_cache_size", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.KEY_CACHE_SIZE, new org.apache.thrift.meta_data.FieldMetaData("key_cache_size", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     tmpMap.put(_Fields.READ_REPAIR_CHANCE, new org.apache.thrift.meta_data.FieldMetaData("read_repair_chance", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     tmpMap.put(_Fields.COLUMN_METADATA, new org.apache.thrift.meta_data.FieldMetaData("column_metadata", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -287,18 +248,12 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.MAX_COMPACTION_THRESHOLD, new org.apache.thrift.meta_data.FieldMetaData("max_compaction_threshold", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.ROW_CACHE_SAVE_PERIOD_IN_SECONDS, new org.apache.thrift.meta_data.FieldMetaData("row_cache_save_period_in_seconds", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.KEY_CACHE_SAVE_PERIOD_IN_SECONDS, new org.apache.thrift.meta_data.FieldMetaData("key_cache_save_period_in_seconds", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.REPLICATE_ON_WRITE, new org.apache.thrift.meta_data.FieldMetaData("replicate_on_write", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.MERGE_SHARDS_CHANCE, new org.apache.thrift.meta_data.FieldMetaData("merge_shards_chance", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     tmpMap.put(_Fields.KEY_VALIDATION_CLASS, new org.apache.thrift.meta_data.FieldMetaData("key_validation_class", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.ROW_CACHE_PROVIDER, new org.apache.thrift.meta_data.FieldMetaData("row_cache_provider", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.KEY_ALIAS, new org.apache.thrift.meta_data.FieldMetaData("key_alias", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
     tmpMap.put(_Fields.COMPACTION_STRATEGY, new org.apache.thrift.meta_data.FieldMetaData("compaction_strategy", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -307,8 +262,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    tmpMap.put(_Fields.ROW_CACHE_KEYS_TO_SAVE, new org.apache.thrift.meta_data.FieldMetaData("row_cache_keys_to_save", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.COMPRESSION_OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("compression_options", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
@@ -324,10 +277,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
 
     this.comparator_type = "BytesType";
 
-    this.row_cache_size = (double)0;
-
-    this.key_cache_size = (double)200000;
-
     this.read_repair_chance = 1;
 
   }
@@ -365,8 +314,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     if (other.isSetComment()) {
       this.comment = other.comment;
     }
-    this.row_cache_size = other.row_cache_size;
-    this.key_cache_size = other.key_cache_size;
     this.read_repair_chance = other.read_repair_chance;
     if (other.isSetColumn_metadata()) {
       List<ColumnDef> __this__column_metadata = new ArrayList<ColumnDef>();
@@ -382,16 +329,11 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     this.id = other.id;
     this.min_compaction_threshold = other.min_compaction_threshold;
     this.max_compaction_threshold = other.max_compaction_threshold;
-    this.row_cache_save_period_in_seconds = other.row_cache_save_period_in_seconds;
-    this.key_cache_save_period_in_seconds = other.key_cache_save_period_in_seconds;
     this.replicate_on_write = other.replicate_on_write;
     this.merge_shards_chance = other.merge_shards_chance;
     if (other.isSetKey_validation_class()) {
       this.key_validation_class = other.key_validation_class;
     }
-    if (other.isSetRow_cache_provider()) {
-      this.row_cache_provider = other.row_cache_provider;
-    }
     if (other.isSetKey_alias()) {
       this.key_alias = org.apache.thrift.TBaseHelper.copyBinary(other.key_alias);
 ;
@@ -414,7 +356,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
       }
       this.compaction_strategy_options = __this__compaction_strategy_options;
     }
-    this.row_cache_keys_to_save = other.row_cache_keys_to_save;
     if (other.isSetCompression_options()) {
       Map<String,String> __this__compression_options = new HashMap<String,String>();
       for (Map.Entry<String, String> other_element : other.compression_options.entrySet()) {
@@ -447,10 +388,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
 
     this.subcomparator_type = null;
     this.comment = null;
-    this.row_cache_size = (double)0;
-
-    this.key_cache_size = (double)200000;
-
     this.read_repair_chance = 1;
 
     this.column_metadata = null;
@@ -463,21 +400,14 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     this.min_compaction_threshold = 0;
     setMax_compaction_thresholdIsSet(false);
     this.max_compaction_threshold = 0;
-    setRow_cache_save_period_in_secondsIsSet(false);
-    this.row_cache_save_period_in_seconds = 0;
-    setKey_cache_save_period_in_secondsIsSet(false);
-    this.key_cache_save_period_in_seconds = 0;
     setReplicate_on_writeIsSet(false);
     this.replicate_on_write = false;
     setMerge_shards_chanceIsSet(false);
     this.merge_shards_chance = 0.0;
     this.key_validation_class = null;
-    this.row_cache_provider = null;
     this.key_alias = null;
     this.compaction_strategy = null;
     this.compaction_strategy_options = null;
-    setRow_cache_keys_to_saveIsSet(false);
-    this.row_cache_keys_to_save = 0;
     this.compression_options = null;
     setBloom_filter_fp_chanceIsSet(false);
     this.bloom_filter_fp_chance = 0.0;
@@ -627,52 +557,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     }
   }
 
-  public double getRow_cache_size() {
-    return this.row_cache_size;
-  }
-
-  public CfDef setRow_cache_size(double row_cache_size) {
-    this.row_cache_size = row_cache_size;
-    setRow_cache_sizeIsSet(true);
-    return this;
-  }
-
-  public void unsetRow_cache_size() {
-    __isset_bit_vector.clear(__ROW_CACHE_SIZE_ISSET_ID);
-  }
-
-  /** Returns true if field row_cache_size is set (has been assigned a value) and false otherwise */
-  public boolean isSetRow_cache_size() {
-    return __isset_bit_vector.get(__ROW_CACHE_SIZE_ISSET_ID);
-  }
-
-  public void setRow_cache_sizeIsSet(boolean value) {
-    __isset_bit_vector.set(__ROW_CACHE_SIZE_ISSET_ID, value);
-  }
-
-  public double getKey_cache_size() {
-    return this.key_cache_size;
-  }
-
-  public CfDef setKey_cache_size(double key_cache_size) {
-    this.key_cache_size = key_cache_size;
-    setKey_cache_sizeIsSet(true);
-    return this;
-  }
-
-  public void unsetKey_cache_size() {
-    __isset_bit_vector.clear(__KEY_CACHE_SIZE_ISSET_ID);
-  }
-
-  /** Returns true if field key_cache_size is set (has been assigned a value) and false otherwise */
-  public boolean isSetKey_cache_size() {
-    return __isset_bit_vector.get(__KEY_CACHE_SIZE_ISSET_ID);
-  }
-
-  public void setKey_cache_sizeIsSet(boolean value) {
-    __isset_bit_vector.set(__KEY_CACHE_SIZE_ISSET_ID, value);
-  }
-
   public double getRead_repair_chance() {
     return this.read_repair_chance;
   }
@@ -851,52 +735,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     __isset_bit_vector.set(__MAX_COMPACTION_THRESHOLD_ISSET_ID, value);
   }
 
-  public int getRow_cache_save_period_in_seconds() {
-    return this.row_cache_save_period_in_seconds;
-  }
-
-  public CfDef setRow_cache_save_period_in_seconds(int row_cache_save_period_in_seconds) {
-    this.row_cache_save_period_in_seconds = row_cache_save_period_in_seconds;
-    setRow_cache_save_period_in_secondsIsSet(true);
-    return this;
-  }
-
-  public void unsetRow_cache_save_period_in_seconds() {
-    __isset_bit_vector.clear(__ROW_CACHE_SAVE_PERIOD_IN_SECONDS_ISSET_ID);
-  }
-
-  /** Returns true if field row_cache_save_period_in_seconds is set (has been assigned a value) and false otherwise */
-  public boolean isSetRow_cache_save_period_in_seconds() {
-    return __isset_bit_vector.get(__ROW_CACHE_SAVE_PERIOD_IN_SECONDS_ISSET_ID);
-  }
-
-  public void setRow_cache_save_period_in_secondsIsSet(boolean value) {
-    __isset_bit_vector.set(__ROW_CACHE_SAVE_PERIOD_IN_SECONDS_ISSET_ID, value);
-  }
-
-  public int getKey_cache_save_period_in_seconds() {
-    return this.key_cache_save_period_in_seconds;
-  }
-
-  public CfDef setKey_cache_save_period_in_seconds(int key_cache_save_period_in_seconds) {
-    this.key_cache_save_period_in_seconds = key_cache_save_period_in_seconds;
-    setKey_cache_save_period_in_secondsIsSet(true);
-    return this;
-  }
-
-  public void unsetKey_cache_save_period_in_seconds() {
-    __isset_bit_vector.clear(__KEY_CACHE_SAVE_PERIOD_IN_SECONDS_ISSET_ID);
-  }
-
-  /** Returns true if field key_cache_save_period_in_seconds is set (has been assigned a value) and false otherwise */
-  public boolean isSetKey_cache_save_period_in_seconds() {
-    return __isset_bit_vector.get(__KEY_CACHE_SAVE_PERIOD_IN_SECONDS_ISSET_ID);
-  }
-
-  public void setKey_cache_save_period_in_secondsIsSet(boolean value) {
-    __isset_bit_vector.set(__KEY_CACHE_SAVE_PERIOD_IN_SECONDS_ISSET_ID, value);
-  }
-
   public boolean isReplicate_on_write() {
     return this.replicate_on_write;
   }
@@ -967,30 +805,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     }
   }
 
-  public String getRow_cache_provider() {
-    return this.row_cache_provider;
-  }
-
-  public CfDef setRow_cache_provider(String row_cache_provider) {
-    this.row_cache_provider = row_cache_provider;
-    return this;
-  }
-
-  public void unsetRow_cache_provider() {
-    this.row_cache_provider = null;
-  }
-
-  /** Returns true if field row_cache_provider is set (has been assigned a value) and false otherwise */
-  public boolean isSetRow_cache_provider() {
-    return this.row_cache_provider != null;
-  }
-
-  public void setRow_cache_providerIsSet(boolean value) {
-    if (!value) {
-      this.row_cache_provider = null;
-    }
-  }
-
   public byte[] getKey_alias() {
     setKey_alias(org.apache.thrift.TBaseHelper.rightSize(key_alias));
     return key_alias == null ? null : key_alias.array();
@@ -1084,29 +898,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     }
   }
 
-  public int getRow_cache_keys_to_save() {
-    return this.row_cache_keys_to_save;
-  }
-
-  public CfDef setRow_cache_keys_to_save(int row_cache_keys_to_save) {
-    this.row_cache_keys_to_save = row_cache_keys_to_save;
-    setRow_cache_keys_to_saveIsSet(true);
-    return this;
-  }
-
-  public void unsetRow_cache_keys_to_save() {
-    __isset_bit_vector.clear(__ROW_CACHE_KEYS_TO_SAVE_ISSET_ID);
-  }
-
-  /** Returns true if field row_cache_keys_to_save is set (has been assigned a value) and false otherwise */
-  public boolean isSetRow_cache_keys_to_save() {
-    return __isset_bit_vector.get(__ROW_CACHE_KEYS_TO_SAVE_ISSET_ID);
-  }
-
-  public void setRow_cache_keys_to_saveIsSet(boolean value) {
-    __isset_bit_vector.set(__ROW_CACHE_KEYS_TO_SAVE_ISSET_ID, value);
-  }
-
   public int getCompression_optionsSize() {
     return (this.compression_options == null) ? 0 : this.compression_options.size();
   }
@@ -1215,22 +1006,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
       }
       break;
 
-    case ROW_CACHE_SIZE:
-      if (value == null) {
-        unsetRow_cache_size();
-      } else {
-        setRow_cache_size((Double)value);
-      }
-      break;
-
-    case KEY_CACHE_SIZE:
-      if (value == null) {
-        unsetKey_cache_size();
-      } else {
-        setKey_cache_size((Double)value);
-      }
-      break;
-
     case READ_REPAIR_CHANCE:
       if (value == null) {
         unsetRead_repair_chance();
@@ -1287,22 +1062,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
       }
       break;
 
-    case ROW_CACHE_SAVE_PERIOD_IN_SECONDS:
-      if (value == null) {
-        unsetRow_cache_save_period_in_seconds();
-      } else {
-        setRow_cache_save_period_in_seconds((Integer)value);
-      }
-      break;
-
-    case KEY_CACHE_SAVE_PERIOD_IN_SECONDS:
-      if (value == null) {
-        unsetKey_cache_save_period_in_seconds();
-      } else {
-        setKey_cache_save_period_in_seconds((Integer)value);
-      }
-      break;
-
     case REPLICATE_ON_WRITE:
       if (value == null) {
         unsetReplicate_on_write();
@@ -1327,14 +1086,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
       }
       break;
 
-    case ROW_CACHE_PROVIDER:
-      if (value == null) {
-        unsetRow_cache_provider();
-      } else {
-        setRow_cache_provider((String)value);
-      }
-      break;
-
     case KEY_ALIAS:
       if (value == null) {
         unsetKey_alias();
@@ -1359,14 +1110,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
       }
       break;
 
-    case ROW_CACHE_KEYS_TO_SAVE:
-      if (value == null) {
-        unsetRow_cache_keys_to_save();
-      } else {
-        setRow_cache_keys_to_save((Integer)value);
-      }
-      break;
-
     case COMPRESSION_OPTIONS:
       if (value == null) {
         unsetCompression_options();
@@ -1406,12 +1149,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     case COMMENT:
       return getComment();
 
-    case ROW_CACHE_SIZE:
-      return new Double(getRow_cache_size());
-
-    case KEY_CACHE_SIZE:
-      return new Double(getKey_cache_size());
-
     case READ_REPAIR_CHANCE:
       return new Double(getRead_repair_chance());
 
@@ -1433,12 +1170,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     case MAX_COMPACTION_THRESHOLD:
       return new Integer(getMax_compaction_threshold());
 
-    case ROW_CACHE_SAVE_PERIOD_IN_SECONDS:
-      return new Integer(getRow_cache_save_period_in_seconds());
-
-    case KEY_CACHE_SAVE_PERIOD_IN_SECONDS:
-      return new Integer(getKey_cache_save_period_in_seconds());
-
     case REPLICATE_ON_WRITE:
       return new Boolean(isReplicate_on_write());
 
@@ -1448,9 +1179,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     case KEY_VALIDATION_CLASS:
       return getKey_validation_class();
 
-    case ROW_CACHE_PROVIDER:
-      return getRow_cache_provider();
-
     case KEY_ALIAS:
       return getKey_alias();
 
@@ -1460,9 +1188,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     case COMPACTION_STRATEGY_OPTIONS:
       return getCompaction_strategy_options();
 
-    case ROW_CACHE_KEYS_TO_SAVE:
-      return new Integer(getRow_cache_keys_to_save());
-
     case COMPRESSION_OPTIONS:
       return getCompression_options();
 
@@ -1492,10 +1217,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
       return isSetSubcomparator_type();
     case COMMENT:
       return isSetComment();
-    case ROW_CACHE_SIZE:
-      return isSetRow_cache_size();
-    case KEY_CACHE_SIZE:
-      return isSetKey_cache_size();
     case READ_REPAIR_CHANCE:
       return isSetRead_repair_chance();
     case COLUMN_METADATA:
@@ -1510,26 +1231,18 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
       return isSetMin_compaction_threshold();
     case MAX_COMPACTION_THRESHOLD:
       return isSetMax_compaction_threshold();
-    case ROW_CACHE_SAVE_PERIOD_IN_SECONDS:
-      return isSetRow_cache_save_period_in_seconds();
-    case KEY_CACHE_SAVE_PERIOD_IN_SECONDS:
-      return isSetKey_cache_save_period_in_seconds();
     case REPLICATE_ON_WRITE:
       return isSetReplicate_on_write();
     case MERGE_SHARDS_CHANCE:
       return isSetMerge_shards_chance();
     case KEY_VALIDATION_CLASS:
       return isSetKey_validation_class();
-    case ROW_CACHE_PROVIDER:
-      return isSetRow_cache_provider();
     case KEY_ALIAS:
       return isSetKey_alias();
     case COMPACTION_STRATEGY:
       return isSetCompaction_strategy();
     case COMPACTION_STRATEGY_OPTIONS:
       return isSetCompaction_strategy_options();
-    case ROW_CACHE_KEYS_TO_SAVE:
-      return isSetRow_cache_keys_to_save();
     case COMPRESSION_OPTIONS:
       return isSetCompression_options();
     case BLOOM_FILTER_FP_CHANCE:
@@ -1605,24 +1318,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         return false;
     }
 
-    boolean this_present_row_cache_size = true && this.isSetRow_cache_size();
-    boolean that_present_row_cache_size = true && that.isSetRow_cache_size();
-    if (this_present_row_cache_size || that_present_row_cache_size) {
-      if (!(this_present_row_cache_size && that_present_row_cache_size))
-        return false;
-      if (this.row_cache_size != that.row_cache_size)
-        return false;
-    }
-
-    boolean this_present_key_cache_size = true && this.isSetKey_cache_size();
-    boolean that_present_key_cache_size = true && that.isSetKey_cache_size();
-    if (this_present_key_cache_size || that_present_key_cache_size) {
-      if (!(this_present_key_cache_size && that_present_key_cache_size))
-        return false;
-      if (this.key_cache_size != that.key_cache_size)
-        return false;
-    }
-
     boolean this_present_read_repair_chance = true && this.isSetRead_repair_chance();
     boolean that_present_read_repair_chance = true && that.isSetRead_repair_chance();
     if (this_present_read_repair_chance || that_present_read_repair_chance) {
@@ -1686,24 +1381,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         return false;
     }
 
-    boolean this_present_row_cache_save_period_in_seconds = true && this.isSetRow_cache_save_period_in_seconds();
-    boolean that_present_row_cache_save_period_in_seconds = true && that.isSetRow_cache_save_period_in_seconds();
-    if (this_present_row_cache_save_period_in_seconds || that_present_row_cache_save_period_in_seconds) {
-      if (!(this_present_row_cache_save_period_in_seconds && that_present_row_cache_save_period_in_seconds))
-        return false;
-      if (this.row_cache_save_period_in_seconds != that.row_cache_save_period_in_seconds)
-        return false;
-    }
-
-    boolean this_present_key_cache_save_period_in_seconds = true && this.isSetKey_cache_save_period_in_seconds();
-    boolean that_present_key_cache_save_period_in_seconds = true && that.isSetKey_cache_save_period_in_seconds();
-    if (this_present_key_cache_save_period_in_seconds || that_present_key_cache_save_period_in_seconds) {
-      if (!(this_present_key_cache_save_period_in_seconds && that_present_key_cache_save_period_in_seconds))
-        return false;
-      if (this.key_cache_save_period_in_seconds != that.key_cache_save_period_in_seconds)
-        return false;
-    }
-
     boolean this_present_replicate_on_write = true && this.isSetReplicate_on_write();
     boolean that_present_replicate_on_write = true && that.isSetReplicate_on_write();
     if (this_present_replicate_on_write || that_present_replicate_on_write) {
@@ -1731,15 +1408,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         return false;
     }
 
-    boolean this_present_row_cache_provider = true && this.isSetRow_cache_provider();
-    boolean that_present_row_cache_provider = true && that.isSetRow_cache_provider();
-    if (this_present_row_cache_provider || that_present_row_cache_provider) {
-      if (!(this_present_row_cache_provider && that_present_row_cache_provider))
-        return false;
-      if (!this.row_cache_provider.equals(that.row_cache_provider))
-        return false;
-    }
-
     boolean this_present_key_alias = true && this.isSetKey_alias();
     boolean that_present_key_alias = true && that.isSetKey_alias();
     if (this_present_key_alias || that_present_key_alias) {
@@ -1767,15 +1435,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         return false;
     }
 
-    boolean this_present_row_cache_keys_to_save = true && this.isSetRow_cache_keys_to_save();
-    boolean that_present_row_cache_keys_to_save = true && that.isSetRow_cache_keys_to_save();
-    if (this_present_row_cache_keys_to_save || that_present_row_cache_keys_to_save) {
-      if (!(this_present_row_cache_keys_to_save && that_present_row_cache_keys_to_save))
-        return false;
-      if (this.row_cache_keys_to_save != that.row_cache_keys_to_save)
-        return false;
-    }
-
     boolean this_present_compression_options = true && this.isSetCompression_options();
     boolean that_present_compression_options = true && that.isSetCompression_options();
     if (this_present_compression_options || that_present_compression_options) {
@@ -1831,16 +1490,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     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_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)
@@ -1876,16 +1525,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     if (present_max_compaction_threshold)
       builder.append(max_compaction_threshold);
 
-    boolean present_row_cache_save_period_in_seconds = true && (isSetRow_cache_save_period_in_seconds());
-    builder.append(present_row_cache_save_period_in_seconds);
-    if (present_row_cache_save_period_in_seconds)
-      builder.append(row_cache_save_period_in_seconds);
-
-    boolean present_key_cache_save_period_in_seconds = true && (isSetKey_cache_save_period_in_seconds());
-    builder.append(present_key_cache_save_period_in_seconds);
-    if (present_key_cache_save_period_in_seconds)
-      builder.append(key_cache_save_period_in_seconds);
-
     boolean present_replicate_on_write = true && (isSetReplicate_on_write());
     builder.append(present_replicate_on_write);
     if (present_replicate_on_write)
@@ -1901,11 +1540,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     if (present_key_validation_class)
       builder.append(key_validation_class);
 
-    boolean present_row_cache_provider = true && (isSetRow_cache_provider());
-    builder.append(present_row_cache_provider);
-    if (present_row_cache_provider)
-      builder.append(row_cache_provider);
-
     boolean present_key_alias = true && (isSetKey_alias());
     builder.append(present_key_alias);
     if (present_key_alias)
@@ -1921,11 +1555,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
     if (present_compaction_strategy_options)
       builder.append(compaction_strategy_options);
 
-    boolean present_row_cache_keys_to_save = true && (isSetRow_cache_keys_to_save());
-    builder.append(present_row_cache_keys_to_save);
-    if (present_row_cache_keys_to_save)
-      builder.append(row_cache_keys_to_save);
-
     boolean present_compression_options = true && (isSetCompression_options());
     builder.append(present_compression_options);
     if (present_compression_options)
@@ -2007,26 +1636,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRow_cache_size()).compareTo(typedOther.isSetRow_cache_size());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRow_cache_size()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_cache_size, typedOther.row_cache_size);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetKey_cache_size()).compareTo(typedOther.isSetKey_cache_size());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetKey_cache_size()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key_cache_size, typedOther.key_cache_size);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetRead_repair_chance()).compareTo(typedOther.isSetRead_repair_chance());
     if (lastComparison != 0) {
       return lastComparison;
@@ -2097,26 +1706,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRow_cache_save_period_in_seconds()).compareTo(typedOther.isSetRow_cache_save_period_in_seconds());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRow_cache_save_period_in_seconds()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_cache_save_period_in_seconds, typedOther.row_cache_save_period_in_seconds);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetKey_cache_save_period_in_seconds()).compareTo(typedOther.isSetKey_cache_save_period_in_seconds());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetKey_cache_save_period_in_seconds()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key_cache_save_period_in_seconds, typedOther.key_cache_save_period_in_seconds);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetReplicate_on_write()).compareTo(typedOther.isSetReplicate_on_write());
     if (lastComparison != 0) {
       return lastComparison;
@@ -2147,16 +1736,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRow_cache_provider()).compareTo(typedOther.isSetRow_cache_provider());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRow_cache_provider()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_cache_provider, typedOther.row_cache_provider);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetKey_alias()).compareTo(typedOther.isSetKey_alias());
     if (lastComparison != 0) {
       return lastComparison;
@@ -2187,16 +1766,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRow_cache_keys_to_save()).compareTo(typedOther.isSetRow_cache_keys_to_save());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRow_cache_keys_to_save()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_cache_keys_to_save, typedOther.row_cache_keys_to_save);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetCompression_options()).compareTo(typedOther.isSetCompression_options());
     if (lastComparison != 0) {
       return lastComparison;
@@ -2276,22 +1845,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case 9: // ROW_CACHE_SIZE
-          if (field.type == org.apache.thrift.protocol.TType.DOUBLE) {
-            this.row_cache_size = iprot.readDouble();
-            setRow_cache_sizeIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 11: // KEY_CACHE_SIZE
-          if (field.type == org.apache.thrift.protocol.TType.DOUBLE) {
-            this.key_cache_size = iprot.readDouble();
-            setKey_cache_sizeIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
         case 12: // READ_REPAIR_CHANCE
           if (field.type == org.apache.thrift.protocol.TType.DOUBLE) {
             this.read_repair_chance = iprot.readDouble();
@@ -2303,14 +1856,14 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         case 13: // COLUMN_METADATA
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list42 = iprot.readListBegin();
-              this.column_metadata = new ArrayList<ColumnDef>(_list42.size);
-              for (int _i43 = 0; _i43 < _list42.size; ++_i43)
+              org.apache.thrift.protocol.TList _list46 = iprot.readListBegin();
+              this.column_metadata = new ArrayList<ColumnDef>(_list46.size);
+              for (int _i47 = 0; _i47 < _list46.size; ++_i47)
               {
-                ColumnDef _elem44;
-                _elem44 = new ColumnDef();
-                _elem44.read(iprot);
-                this.column_metadata.add(_elem44);
+                ColumnDef _elem48;
+                _elem48 = new ColumnDef();
+                _elem48.read(iprot);
+                this.column_metadata.add(_elem48);
               }
               iprot.readListEnd();
             }
@@ -2357,22 +1910,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case 19: // ROW_CACHE_SAVE_PERIOD_IN_SECONDS
-          if (field.type == org.apache.thrift.protocol.TType.I32) {
-            this.row_cache_save_period_in_seconds = iprot.readI32();
-            setRow_cache_save_period_in_secondsIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 20: // KEY_CACHE_SAVE_PERIOD_IN_SECONDS
-          if (field.type == org.apache.thrift.protocol.TType.I32) {
-            this.key_cache_save_period_in_seconds = iprot.readI32();
-            setKey_cache_save_period_in_secondsIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
         case 24: // REPLICATE_ON_WRITE
           if (field.type == org.apache.thrift.protocol.TType.BOOL) {
             this.replicate_on_write = iprot.readBool();
@@ -2396,13 +1933,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case 27: // ROW_CACHE_PROVIDER
-          if (field.type == org.apache.thrift.protocol.TType.STRING) {
-            this.row_cache_provider = iprot.readString();
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
         case 28: // KEY_ALIAS
           if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.key_alias = iprot.readBinary();
@@ -2420,15 +1950,15 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         case 30: // COMPACTION_STRATEGY_OPTIONS
           if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              org.apache.thrift.protocol.TMap _map45 = iprot.readMapBegin();
-              this.compaction_strategy_options = new HashMap<String,String>(2*_map45.size);
-              for (int _i46 = 0; _i46 < _map45.size; ++_i46)
+              org.apache.thrift.protocol.TMap _map49 = iprot.readMapBegin();
+              this.compaction_strategy_options = new HashMap<String,String>(2*_map49.size);
+              for (int _i50 = 0; _i50 < _map49.size; ++_i50)
               {
-                String _key47;
-                String _val48;
-                _key47 = iprot.readString();
-                _val48 = iprot.readString();
-                this.compaction_strategy_options.put(_key47, _val48);
+                String _key51;
+                String _val52;
+                _key51 = iprot.readString();
+                _val52 = iprot.readString();
+                this.compaction_strategy_options.put(_key51, _val52);
               }
               iprot.readMapEnd();
             }
@@ -2436,26 +1966,18 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case 31: // ROW_CACHE_KEYS_TO_SAVE
-          if (field.type == org.apache.thrift.protocol.TType.I32) {
-            this.row_cache_keys_to_save = iprot.readI32();
-            setRow_cache_keys_to_saveIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
         case 32: // COMPRESSION_OPTIONS
           if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              org.apache.thrift.protocol.TMap _map49 = iprot.readMapBegin();
-              this.compression_options = new HashMap<String,String>(2*_map49.size);
-              for (int _i50 = 0; _i50 < _map49.size; ++_i50)
+              org.apache.thrift.protocol.TMap _map53 = iprot.readMapBegin();
+              this.compression_options = new HashMap<String,String>(2*_map53.size);
+              for (int _i54 = 0; _i54 < _map53.size; ++_i54)
               {
-                String _key51;
-                String _val52;
-                _key51 = iprot.readString();
-                _val52 = iprot.readString();
-                this.compression_options.put(_key51, _val52);
+                String _key55;
+                String _val56;
+                _key55 = iprot.readString();
+                _val56 = iprot.readString();
+                this.compression_options.put(_key55, _val56);
               }
               iprot.readMapEnd();
             }
@@ -2524,16 +2046,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         oprot.writeFieldEnd();
       }
     }
-    if (isSetRow_cache_size()) {
-      oprot.writeFieldBegin(ROW_CACHE_SIZE_FIELD_DESC);
-      oprot.writeDouble(this.row_cache_size);
-      oprot.writeFieldEnd();
-    }
-    if (isSetKey_cache_size()) {
-      oprot.writeFieldBegin(KEY_CACHE_SIZE_FIELD_DESC);
-      oprot.writeDouble(this.key_cache_size);
-      oprot.writeFieldEnd();
-    }
     if (isSetRead_repair_chance()) {
       oprot.writeFieldBegin(READ_REPAIR_CHANCE_FIELD_DESC);
       oprot.writeDouble(this.read_repair_chance);
@@ -2544,9 +2056,9 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         oprot.writeFieldBegin(COLUMN_METADATA_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.column_metadata.size()));
-          for (ColumnDef _iter53 : this.column_metadata)
+          for (ColumnDef _iter57 : this.column_metadata)
           {
-            _iter53.write(oprot);
+            _iter57.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -2580,16 +2092,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
       oprot.writeI32(this.max_compaction_threshold);
       oprot.writeFieldEnd();
     }
-    if (isSetRow_cache_save_period_in_seconds()) {
-      oprot.writeFieldBegin(ROW_CACHE_SAVE_PERIOD_IN_SECONDS_FIELD_DESC);
-      oprot.writeI32(this.row_cache_save_period_in_seconds);
-      oprot.writeFieldEnd();
-    }
-    if (isSetKey_cache_save_period_in_seconds()) {
-      oprot.writeFieldBegin(KEY_CACHE_SAVE_PERIOD_IN_SECONDS_FIELD_DESC);
-      oprot.writeI32(this.key_cache_save_period_in_seconds);
-      oprot.writeFieldEnd();
-    }
     if (isSetReplicate_on_write()) {
       oprot.writeFieldBegin(REPLICATE_ON_WRITE_FIELD_DESC);
       oprot.writeBool(this.replicate_on_write);
@@ -2607,13 +2109,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         oprot.writeFieldEnd();
       }
     }
-    if (this.row_cache_provider != null) {
-      if (isSetRow_cache_provider()) {
-        oprot.writeFieldBegin(ROW_CACHE_PROVIDER_FIELD_DESC);
-        oprot.writeString(this.row_cache_provider);
-        oprot.writeFieldEnd();
-      }
-    }
     if (this.key_alias != null) {
       if (isSetKey_alias()) {
         oprot.writeFieldBegin(KEY_ALIAS_FIELD_DESC);
@@ -2633,30 +2128,25 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
         oprot.writeFieldBegin(COMPACTION_STRATEGY_OPTIONS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.compaction_strategy_options.size()));
-          for (Map.Entry<String, String> _iter54 : this.compaction_strategy_options.entrySet())
+          for (Map.Entry<String, String> _iter58 : this.compaction_strategy_options.entrySet())
           {
-            oprot.writeString(_iter54.getKey());
-            oprot.writeString(_iter54.getValue());
+            oprot.writeString(_iter58.getKey());
+            oprot.writeString(_iter58.getValue());
           }
           oprot.writeMapEnd();
         }
         oprot.writeFieldEnd();
       }
     }
-    if (isSetRow_cache_keys_to_save()) {
-      oprot.writeFieldBegin(ROW_CACHE_KEYS_TO_SAVE_FIELD_DESC);
-      oprot.writeI32(this.row_cache_keys_to_save);
-      oprot.writeFieldEnd();
-    }
     if (this.compression_options != null) {
       if (isSetCompression_options()) {
         oprot.writeFieldBegin(COMPRESSION_OPTIONS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.compression_options.size()));
-          for (Map.Entry<String, String> _iter55 : this.compression_options.entrySet())
+          for (Map.Entry<String, String> _iter59 : this.compression_options.entrySet())
           {
-            oprot.writeString(_iter55.getKey());
-            oprot.writeString(_iter55.getValue());
+            oprot.writeString(_iter59.getKey());
+            oprot.writeString(_iter59.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -2732,18 +2222,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
       }
       first = false;
     }
-    if (isSetRow_cache_size()) {
-      if (!first) sb.append(", ");
-      sb.append("row_cache_size:");
-      sb.append(this.row_cache_size);
-      first = false;
-    }
-    if (isSetKey_cache_size()) {
-      if (!first) sb.append(", ");
-      sb.append("key_cache_size:");
-      sb.append(this.key_cache_size);
-      first = false;
-    }
     if (isSetRead_repair_chance()) {
       if (!first) sb.append(", ");
       sb.append("read_repair_chance:");
@@ -2794,18 +2272,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
       sb.append(this.max_compaction_threshold);
       first = false;
     }
-    if (isSetRow_cache_save_period_in_seconds()) {
-      if (!first) sb.append(", ");
-      sb.append("row_cache_save_period_in_seconds:");
-      sb.append(this.row_cache_save_period_in_seconds);
-      first = false;
-    }
-    if (isSetKey_cache_save_period_in_seconds()) {
-      if (!first) sb.append(", ");
-      sb.append("key_cache_save_period_in_seconds:");
-      sb.append(this.key_cache_save_period_in_seconds);
-      first = false;
-    }
     if (isSetReplicate_on_write()) {
       if (!first) sb.append(", ");
       sb.append("replicate_on_write:");
@@ -2828,16 +2294,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
       }
       first = false;
     }
-    if (isSetRow_cache_provider()) {
-      if (!first) sb.append(", ");
-      sb.append("row_cache_provider:");
-      if (this.row_cache_provider == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.row_cache_provider);
-      }
-      first = false;
-    }
     if (isSetKey_alias()) {
       if (!first) sb.append(", ");
       sb.append("key_alias:");
@@ -2868,12 +2324,6 @@ public class CfDef implements org.apache.thrift.TBase<CfDef, CfDef._Fields>, jav
       }
       first = false;
     }
-    if (isSetRow_cache_keys_to_save()) {
-      if (!first) sb.append(", ");
-      sb.append("row_cache_keys_to_save:");
-      sb.append(this.row_cache_keys_to_save);
-      first = false;
-    }
     if (isSetCompression_options()) {
       if (!first) sb.append(", ");
       sb.append("compression_options:");

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3297a96e/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java
index d485fc1..b31b255 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java
@@ -650,15 +650,15 @@ public class ColumnDef implements org.apache.thrift.TBase<ColumnDef, ColumnDef._
         case 5: // INDEX_OPTIONS
           if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              org.apache.thrift.protocol.TMap _map37 = iprot.readMapBegin();
-              this.index_options = new HashMap<String,String>(2*_map37.size);
-              for (int _i38 = 0; _i38 < _map37.size; ++_i38)
+              org.apache.thrift.protocol.TMap _map41 = iprot.readMapBegin();
+              this.index_options = new HashMap<String,String>(2*_map41.size);
+              for (int _i42 = 0; _i42 < _map41.size; ++_i42)
               {
-                String _key39;
-                String _val40;
-                _key39 = iprot.readString();
-                _val40 = iprot.readString();
-                this.index_options.put(_key39, _val40);
+                String _key43;
+                String _val44;
+                _key43 = iprot.readString();
+                _val44 = iprot.readString();
+                this.index_options.put(_key43, _val44);
               }
               iprot.readMapEnd();
             }
@@ -710,10 +710,10 @@ public class ColumnDef implements org.apache.thrift.TBase<ColumnDef, ColumnDef._
         oprot.writeFieldBegin(INDEX_OPTIONS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.index_options.size()));
-          for (Map.Entry<String, String> _iter41 : this.index_options.entrySet())
+          for (Map.Entry<String, String> _iter45 : this.index_options.entrySet())
           {
-            oprot.writeString(_iter41.getKey());
-            oprot.writeString(_iter41.getValue());
+            oprot.writeString(_iter45.getKey());
+            oprot.writeString(_iter45.getValue());
           }
           oprot.writeMapEnd();
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3297a96e/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java
index f78ea29..f3627e3 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlMetadata.java
@@ -554,15 +554,15 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
         case 1: // NAME_TYPES
           if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              org.apache.thrift.protocol.TMap _map69 = iprot.readMapBegin();
-              this.name_types = new HashMap<ByteBuffer,String>(2*_map69.size);
-              for (int _i70 = 0; _i70 < _map69.size; ++_i70)
+              org.apache.thrift.protocol.TMap _map73 = iprot.readMapBegin();
+              this.name_types = new HashMap<ByteBuffer,String>(2*_map73.size);
+              for (int _i74 = 0; _i74 < _map73.size; ++_i74)
               {
-                ByteBuffer _key71;
-                String _val72;
-                _key71 = iprot.readBinary();
-                _val72 = iprot.readString();
-                this.name_types.put(_key71, _val72);
+                ByteBuffer _key75;
+                String _val76;
+                _key75 = iprot.readBinary();
+                _val76 = iprot.readString();
+                this.name_types.put(_key75, _val76);
               }
               iprot.readMapEnd();
             }
@@ -573,15 +573,15 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
         case 2: // VALUE_TYPES
           if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              org.apache.thrift.protocol.TMap _map73 = iprot.readMapBegin();
-              this.value_types = new HashMap<ByteBuffer,String>(2*_map73.size);
-              for (int _i74 = 0; _i74 < _map73.size; ++_i74)
+              org.apache.thrift.protocol.TMap _map77 = iprot.readMapBegin();
+              this.value_types = new HashMap<ByteBuffer,String>(2*_map77.size);
+              for (int _i78 = 0; _i78 < _map77.size; ++_i78)
               {
-                ByteBuffer _key75;
-                String _val76;
-                _key75 = iprot.readBinary();
-                _val76 = iprot.readString();
-                this.value_types.put(_key75, _val76);
+                ByteBuffer _key79;
+                String _val80;
+                _key79 = iprot.readBinary();
+                _val80 = iprot.readString();
+                this.value_types.put(_key79, _val80);
               }
               iprot.readMapEnd();
             }
@@ -622,10 +622,10 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
       oprot.writeFieldBegin(NAME_TYPES_FIELD_DESC);
       {
         oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.name_types.size()));
-        for (Map.Entry<ByteBuffer, String> _iter77 : this.name_types.entrySet())
+        for (Map.Entry<ByteBuffer, String> _iter81 : this.name_types.entrySet())
         {
-          oprot.writeBinary(_iter77.getKey());
-          oprot.writeString(_iter77.getValue());
+          oprot.writeBinary(_iter81.getKey());
+          oprot.writeString(_iter81.getValue());
         }
         oprot.writeMapEnd();
       }
@@ -635,10 +635,10 @@ public class CqlMetadata implements org.apache.thrift.TBase<CqlMetadata, CqlMeta
       oprot.writeFieldBegin(VALUE_TYPES_FIELD_DESC);
       {
         oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.value_types.size()));
-        for (Map.Entry<ByteBuffer, String> _iter78 : this.value_types.entrySet())
+        for (Map.Entry<ByteBuffer, String> _iter82 : this.value_types.entrySet())
         {
-          oprot.writeBinary(_iter78.getKey());
-          oprot.writeString(_iter78.getValue());
+          oprot.writeBinary(_iter82.getKey());
+          oprot.writeString(_iter82.getValue());
         }
         oprot.writeMapEnd();
       }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3297a96e/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
index 8375bb1..824f978 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
@@ -541,14 +541,14 @@ public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._
         case 2: // ROWS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list79 = iprot.readListBegin();
-              this.rows = new ArrayList<CqlRow>(_list79.size);
-              for (int _i80 = 0; _i80 < _list79.size; ++_i80)
+              org.apache.thrift.protocol.TList _list83 = iprot.readListBegin();
+              this.rows = new ArrayList<CqlRow>(_list83.size);
+              for (int _i84 = 0; _i84 < _list83.size; ++_i84)
               {
-                CqlRow _elem81;
-                _elem81 = new CqlRow();
-                _elem81.read(iprot);
-                this.rows.add(_elem81);
+                CqlRow _elem85;
+                _elem85 = new CqlRow();
+                _elem85.read(iprot);
+                this.rows.add(_elem85);
               }
               iprot.readListEnd();
             }
@@ -597,9 +597,9 @@ public class CqlResult implements org.apache.thrift.TBase<CqlResult, CqlResult._
         oprot.writeFieldBegin(ROWS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.rows.size()));
-          for (CqlRow _iter82 : this.rows)
+          for (CqlRow _iter86 : this.rows)
           {
-            _iter82.write(oprot);
+            _iter86.write(oprot);
           }
           oprot.writeListEnd();
         }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3297a96e/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
index 45f6349..ea2fb9b 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
@@ -395,14 +395,14 @@ public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>,
         case 2: // COLUMNS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list65 = iprot.readListBegin();
-              this.columns = new ArrayList<Column>(_list65.size);
-              for (int _i66 = 0; _i66 < _list65.size; ++_i66)
+              org.apache.thrift.protocol.TList _list69 = iprot.readListBegin();
+              this.columns = new ArrayList<Column>(_list69.size);
+              for (int _i70 = 0; _i70 < _list69.size; ++_i70)
               {
-                Column _elem67;
-                _elem67 = new Column();
-                _elem67.read(iprot);
-                this.columns.add(_elem67);
+                Column _elem71;
+                _elem71 = new Column();
+                _elem71.read(iprot);
+                this.columns.add(_elem71);
               }
               iprot.readListEnd();
             }
@@ -434,9 +434,9 @@ public class CqlRow implements org.apache.thrift.TBase<CqlRow, CqlRow._Fields>,
       oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.columns.size()));
-        for (Column _iter68 : this.columns)
+        for (Column _iter72 : this.columns)
         {
-          _iter68.write(oprot);
+          _iter72.write(oprot);
         }
         oprot.writeListEnd();
       }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3297a96e/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
index d938da5..6f3d5d2 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
@@ -42,6 +42,9 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * @Deprecated: use a KeyRange with row_filter in get_range_slices instead
+ */
 public class IndexClause implements org.apache.thrift.TBase<IndexClause, IndexClause._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IndexClause");
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3297a96e/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
index 1420704..60e3b79 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
@@ -57,12 +57,14 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
   private static final org.apache.thrift.protocol.TField END_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("end_key", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField START_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("start_token", org.apache.thrift.protocol.TType.STRING, (short)3);
   private static final org.apache.thrift.protocol.TField END_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("end_token", org.apache.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.thrift.protocol.TField ROW_FILTER_FIELD_DESC = new org.apache.thrift.protocol.TField("row_filter", org.apache.thrift.protocol.TType.LIST, (short)6);
   private static final org.apache.thrift.protocol.TField COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("count", org.apache.thrift.protocol.TType.I32, (short)5);
 
   public ByteBuffer start_key;
   public ByteBuffer end_key;
   public String start_token;
   public String end_token;
+  public List<IndexExpression> row_filter;
   public int count;
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -71,6 +73,7 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
     END_KEY((short)2, "end_key"),
     START_TOKEN((short)3, "start_token"),
     END_TOKEN((short)4, "end_token"),
+    ROW_FILTER((short)6, "row_filter"),
     COUNT((short)5, "count");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -94,6 +97,8 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
           return START_TOKEN;
         case 4: // END_TOKEN
           return END_TOKEN;
+        case 6: // ROW_FILTER
+          return ROW_FILTER;
         case 5: // COUNT
           return COUNT;
         default:
@@ -150,6 +155,9 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.END_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("end_token", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.ROW_FILTER, new org.apache.thrift.meta_data.FieldMetaData("row_filter", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, IndexExpression.class))));
     tmpMap.put(_Fields.COUNT, new org.apache.thrift.meta_data.FieldMetaData("count", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -189,6 +197,13 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
     if (other.isSetEnd_token()) {
       this.end_token = other.end_token;
     }
+    if (other.isSetRow_filter()) {
+      List<IndexExpression> __this__row_filter = new ArrayList<IndexExpression>();
+      for (IndexExpression other_element : other.row_filter) {
+        __this__row_filter.add(new IndexExpression(other_element));
+      }
+      this.row_filter = __this__row_filter;
+    }
     this.count = other.count;
   }
 
@@ -202,6 +217,7 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
     this.end_key = null;
     this.start_token = null;
     this.end_token = null;
+    this.row_filter = null;
     this.count = 100;
 
   }
@@ -322,6 +338,45 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
     }
   }
 
+  public int getRow_filterSize() {
+    return (this.row_filter == null) ? 0 : this.row_filter.size();
+  }
+
+  public java.util.Iterator<IndexExpression> getRow_filterIterator() {
+    return (this.row_filter == null) ? null : this.row_filter.iterator();
+  }
+
+  public void addToRow_filter(IndexExpression elem) {
+    if (this.row_filter == null) {
+      this.row_filter = new ArrayList<IndexExpression>();
+    }
+    this.row_filter.add(elem);
+  }
+
+  public List<IndexExpression> getRow_filter() {
+    return this.row_filter;
+  }
+
+  public KeyRange setRow_filter(List<IndexExpression> row_filter) {
+    this.row_filter = row_filter;
+    return this;
+  }
+
+  public void unsetRow_filter() {
+    this.row_filter = null;
+  }
+
+  /** Returns true if field row_filter is set (has been assigned a value) and false otherwise */
+  public boolean isSetRow_filter() {
+    return this.row_filter != null;
+  }
+
+  public void setRow_filterIsSet(boolean value) {
+    if (!value) {
+      this.row_filter = null;
+    }
+  }
+
   public int getCount() {
     return this.count;
   }
@@ -379,6 +434,14 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
       }
       break;
 
+    case ROW_FILTER:
+      if (value == null) {
+        unsetRow_filter();
+      } else {
+        setRow_filter((List<IndexExpression>)value);
+      }
+      break;
+
     case COUNT:
       if (value == null) {
         unsetCount();
@@ -404,6 +467,9 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
     case END_TOKEN:
       return getEnd_token();
 
+    case ROW_FILTER:
+      return getRow_filter();
+
     case COUNT:
       return new Integer(getCount());
 
@@ -426,6 +492,8 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
       return isSetStart_token();
     case END_TOKEN:
       return isSetEnd_token();
+    case ROW_FILTER:
+      return isSetRow_filter();
     case COUNT:
       return isSetCount();
     }
@@ -481,6 +549,15 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
         return false;
     }
 
+    boolean this_present_row_filter = true && this.isSetRow_filter();
+    boolean that_present_row_filter = true && that.isSetRow_filter();
+    if (this_present_row_filter || that_present_row_filter) {
+      if (!(this_present_row_filter && that_present_row_filter))
+        return false;
+      if (!this.row_filter.equals(that.row_filter))
+        return false;
+    }
+
     boolean this_present_count = true;
     boolean that_present_count = true;
     if (this_present_count || that_present_count) {
@@ -517,6 +594,11 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
     if (present_end_token)
       builder.append(end_token);
 
+    boolean present_row_filter = true && (isSetRow_filter());
+    builder.append(present_row_filter);
+    if (present_row_filter)
+      builder.append(row_filter);
+
     boolean present_count = true;
     builder.append(present_count);
     if (present_count)
@@ -573,6 +655,16 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetRow_filter()).compareTo(typedOther.isSetRow_filter());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetRow_filter()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row_filter, typedOther.row_filter);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     lastComparison = Boolean.valueOf(isSetCount()).compareTo(typedOther.isSetCount());
     if (lastComparison != 0) {
       return lastComparison;
@@ -628,6 +720,24 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
+        case 6: // ROW_FILTER
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
+            {
+              org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
+              this.row_filter = new ArrayList<IndexExpression>(_list16.size);
+              for (int _i17 = 0; _i17 < _list16.size; ++_i17)
+              {
+                IndexExpression _elem18;
+                _elem18 = new IndexExpression();
+                _elem18.read(iprot);
+                this.row_filter.add(_elem18);
+              }
+              iprot.readListEnd();
+            }
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
         case 5: // COUNT
           if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.count = iprot.readI32();
@@ -685,6 +795,20 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
     oprot.writeFieldBegin(COUNT_FIELD_DESC);
     oprot.writeI32(this.count);
     oprot.writeFieldEnd();
+    if (this.row_filter != null) {
+      if (isSetRow_filter()) {
+        oprot.writeFieldBegin(ROW_FILTER_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.row_filter.size()));
+          for (IndexExpression _iter19 : this.row_filter)
+          {
+            _iter19.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+    }
     oprot.writeFieldStop();
     oprot.writeStructEnd();
   }
@@ -733,6 +857,16 @@ public class KeyRange implements org.apache.thrift.TBase<KeyRange, KeyRange._Fie
       }
       first = false;
     }
+    if (isSetRow_filter()) {
+      if (!first) sb.append(", ");
+      sb.append("row_filter:");
+      if (this.row_filter == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.row_filter);
+      }
+      first = false;
+    }
     if (!first) sb.append(", ");
     sb.append("count:");
     sb.append(this.count);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3297a96e/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
index 77615fc..9d7e305 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
@@ -399,14 +399,14 @@ public class KeySlice implements org.apache.thrift.TBase<KeySlice, KeySlice._Fie
         case 2: // COLUMNS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
-              this.columns = new ArrayList<ColumnOrSuperColumn>(_list16.size);
-              for (int _i17 = 0; _i17 < _list16.size; ++_i17)
+              org.apache.thrift.protocol.TList _list20 = iprot.readListBegin();
+              this.columns = new ArrayList<ColumnOrSuperColumn>(_list20.size);
+              for (int _i21 = 0; _i21 < _list20.size; ++_i21)
               {
-                ColumnOrSuperColumn _elem18;
-                _elem18 = new ColumnOrSuperColumn();
-                _elem18.read(iprot);
-                this.columns.add(_elem18);
+                ColumnOrSuperColumn _elem22;
+                _elem22 = new ColumnOrSuperColumn();
+                _elem22.read(iprot);
+                this.columns.add(_elem22);
               }
               iprot.readListEnd();
             }
@@ -438,9 +438,9 @@ public class KeySlice implements org.apache.thrift.TBase<KeySlice, KeySlice._Fie
       oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.columns.size()));
-        for (ColumnOrSuperColumn _iter19 : this.columns)
+        for (ColumnOrSuperColumn _iter23 : this.columns)
         {
-          _iter19.write(oprot);
+          _iter23.write(oprot);
         }
         oprot.writeListEnd();
       }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3297a96e/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
index 813363b..89ff25a 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
@@ -718,15 +718,15 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
         case 3: // STRATEGY_OPTIONS
           if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              org.apache.thrift.protocol.TMap _map56 = iprot.readMapBegin();
-              this.strategy_options = new HashMap<String,String>(2*_map56.size);
-              for (int _i57 = 0; _i57 < _map56.size; ++_i57)
+              org.apache.thrift.protocol.TMap _map60 = iprot.readMapBegin();
+              this.strategy_options = new HashMap<String,String>(2*_map60.size);
+              for (int _i61 = 0; _i61 < _map60.size; ++_i61)
               {
-                String _key58;
-                String _val59;
-                _key58 = iprot.readString();
-                _val59 = iprot.readString();
-                this.strategy_options.put(_key58, _val59);
+                String _key62;
+                String _val63;
+                _key62 = iprot.readString();
+                _val63 = iprot.readString();
+                this.strategy_options.put(_key62, _val63);
               }
               iprot.readMapEnd();
             }
@@ -745,14 +745,14 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
         case 5: // CF_DEFS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list60 = iprot.readListBegin();
-              this.cf_defs = new ArrayList<CfDef>(_list60.size);
-              for (int _i61 = 0; _i61 < _list60.size; ++_i61)
+              org.apache.thrift.protocol.TList _list64 = iprot.readListBegin();
+              this.cf_defs = new ArrayList<CfDef>(_list64.size);
+              for (int _i65 = 0; _i65 < _list64.size; ++_i65)
               {
-                CfDef _elem62;
-                _elem62 = new CfDef();
-                _elem62.read(iprot);
-                this.cf_defs.add(_elem62);
+                CfDef _elem66;
+                _elem66 = new CfDef();
+                _elem66.read(iprot);
+                this.cf_defs.add(_elem66);
               }
               iprot.readListEnd();
             }
@@ -798,10 +798,10 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
         oprot.writeFieldBegin(STRATEGY_OPTIONS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.strategy_options.size()));
-          for (Map.Entry<String, String> _iter63 : this.strategy_options.entrySet())
+          for (Map.Entry<String, String> _iter67 : this.strategy_options.entrySet())
           {
-            oprot.writeString(_iter63.getKey());
-            oprot.writeString(_iter63.getValue());
+            oprot.writeString(_iter67.getKey());
+            oprot.writeString(_iter67.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -817,9 +817,9 @@ public class KsDef implements org.apache.thrift.TBase<KsDef, KsDef._Fields>, jav
       oprot.writeFieldBegin(CF_DEFS_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.cf_defs.size()));
-        for (CfDef _iter64 : this.cf_defs)
+        for (CfDef _iter68 : this.cf_defs)
         {
-          _iter64.write(oprot);
+          _iter68.write(oprot);
         }
         oprot.writeListEnd();
       }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3297a96e/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
index 67eec83..9f7922c 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
@@ -654,13 +654,13 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
         case 3: // ENDPOINTS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list20 = iprot.readListBegin();
-              this.endpoints = new ArrayList<String>(_list20.size);
-              for (int _i21 = 0; _i21 < _list20.size; ++_i21)
+              org.apache.thrift.protocol.TList _list24 = iprot.readListBegin();
+              this.endpoints = new ArrayList<String>(_list24.size);
+              for (int _i25 = 0; _i25 < _list24.size; ++_i25)
               {
-                String _elem22;
-                _elem22 = iprot.readString();
-                this.endpoints.add(_elem22);
+                String _elem26;
+                _elem26 = iprot.readString();
+                this.endpoints.add(_elem26);
               }
               iprot.readListEnd();
             }
@@ -671,13 +671,13 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
         case 4: // RPC_ENDPOINTS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list23 = iprot.readListBegin();
-              this.rpc_endpoints = new ArrayList<String>(_list23.size);
-              for (int _i24 = 0; _i24 < _list23.size; ++_i24)
+              org.apache.thrift.protocol.TList _list27 = iprot.readListBegin();
+              this.rpc_endpoints = new ArrayList<String>(_list27.size);
+              for (int _i28 = 0; _i28 < _list27.size; ++_i28)
               {
-                String _elem25;
-                _elem25 = iprot.readString();
-                this.rpc_endpoints.add(_elem25);
+                String _elem29;
+                _elem29 = iprot.readString();
+                this.rpc_endpoints.add(_elem29);
               }
               iprot.readListEnd();
             }
@@ -688,14 +688,14 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
         case 5: // ENDPOINT_DETAILS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list26 = iprot.readListBegin();
-              this.endpoint_details = new ArrayList<EndpointDetails>(_list26.size);
-              for (int _i27 = 0; _i27 < _list26.size; ++_i27)
+              org.apache.thrift.protocol.TList _list30 = iprot.readListBegin();
+              this.endpoint_details = new ArrayList<EndpointDetails>(_list30.size);
+              for (int _i31 = 0; _i31 < _list30.size; ++_i31)
               {
-                EndpointDetails _elem28;
-                _elem28 = new EndpointDetails();
-                _elem28.read(iprot);
-                this.endpoint_details.add(_elem28);
+                EndpointDetails _elem32;
+                _elem32 = new EndpointDetails();
+                _elem32.read(iprot);
+                this.endpoint_details.add(_elem32);
               }
               iprot.readListEnd();
             }
@@ -732,9 +732,9 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
       oprot.writeFieldBegin(ENDPOINTS_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.endpoints.size()));
-        for (String _iter29 : this.endpoints)
+        for (String _iter33 : this.endpoints)
         {
-          oprot.writeString(_iter29);
+          oprot.writeString(_iter33);
         }
         oprot.writeListEnd();
       }
@@ -745,9 +745,9 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
         oprot.writeFieldBegin(RPC_ENDPOINTS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.rpc_endpoints.size()));
-          for (String _iter30 : this.rpc_endpoints)
+          for (String _iter34 : this.rpc_endpoints)
           {
-            oprot.writeString(_iter30);
+            oprot.writeString(_iter34);
           }
           oprot.writeListEnd();
         }
@@ -759,9 +759,9 @@ public class TokenRange implements org.apache.thrift.TBase<TokenRange, TokenRang
         oprot.writeFieldBegin(ENDPOINT_DETAILS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.endpoint_details.size()));
-          for (EndpointDetails _iter31 : this.endpoint_details)
+          for (EndpointDetails _iter35 : this.endpoint_details)
           {
-            _iter31.write(oprot);
+            _iter35.write(oprot);
           }
           oprot.writeListEnd();
         }


Mime
View raw message