You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by xe...@apache.org on 2011/08/31 22:30:21 UTC

svn commit: r1163801 [3/4] - in /cassandra/trunk: ./ interface/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/avro/ src/java/org/apache/cassandra/cli/ src/java/org/apache/cassandra/config/ src/java/org/apache/cassandra/io/compress/ src/jav...

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java Wed Aug 31 20:30:20 2011
@@ -72,7 +72,8 @@ public class CfDef implements org.apache
   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_FIELD_DESC = new org.apache.thrift.protocol.TField("compression", org.apache.thrift.protocol.TType.BOOL, (short)32);
+  private static final org.apache.thrift.protocol.TField COMPRESSION_FIELD_DESC = new org.apache.thrift.protocol.TField("compression", org.apache.thrift.protocol.TType.STRING, (short)32);
+  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)33);
 
   public String keyspace;
   public String name;
@@ -101,7 +102,8 @@ public class CfDef implements org.apache
   public String compaction_strategy;
   public Map<String,String> compaction_strategy_options;
   public int row_cache_keys_to_save;
-  public boolean compression;
+  public String compression;
+  public Map<String,String> compression_options;
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -132,7 +134,8 @@ public class CfDef implements org.apache
     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((short)32, "compression");
+    COMPRESSION((short)32, "compression"),
+    COMPRESSION_OPTIONS((short)33, "compression_options");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -203,6 +206,8 @@ public class CfDef implements org.apache
           return ROW_CACHE_KEYS_TO_SAVE;
         case 32: // COMPRESSION
           return COMPRESSION;
+        case 33: // COMPRESSION_OPTIONS
+          return COMPRESSION_OPTIONS;
         default:
           return null;
       }
@@ -257,8 +262,7 @@ public class CfDef implements org.apache
   private static final int __REPLICATE_ON_WRITE_ISSET_ID = 11;
   private static final int __MERGE_SHARDS_CHANCE_ISSET_ID = 12;
   private static final int __ROW_CACHE_KEYS_TO_SAVE_ISSET_ID = 13;
-  private static final int __COMPRESSION_ISSET_ID = 14;
-  private BitSet __isset_bit_vector = new BitSet(15);
+  private BitSet __isset_bit_vector = new BitSet(14);
 
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
@@ -321,7 +325,11 @@ public class CfDef implements org.apache
     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, new org.apache.thrift.meta_data.FieldMetaData("compression", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    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), 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CfDef.class, metaDataMap);
   }
@@ -426,7 +434,24 @@ public class CfDef implements org.apache
       this.compaction_strategy_options = __this__compaction_strategy_options;
     }
     this.row_cache_keys_to_save = other.row_cache_keys_to_save;
-    this.compression = other.compression;
+    if (other.isSetCompression()) {
+      this.compression = other.compression;
+    }
+    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()) {
+
+        String other_element_key = other_element.getKey();
+        String other_element_value = other_element.getValue();
+
+        String __this__compression_options_copy_key = other_element_key;
+
+        String __this__compression_options_copy_value = other_element_value;
+
+        __this__compression_options.put(__this__compression_options_copy_key, __this__compression_options_copy_value);
+      }
+      this.compression_options = __this__compression_options;
+    }
   }
 
   public CfDef deepCopy() {
@@ -479,8 +504,8 @@ public class CfDef implements org.apache
     this.compaction_strategy_options = null;
     setRow_cache_keys_to_saveIsSet(false);
     this.row_cache_keys_to_save = 0;
-    setCompressionIsSet(false);
-    this.compression = false;
+    this.compression = null;
+    this.compression_options = null;
   }
 
   public String getKeyspace() {
@@ -1153,27 +1178,63 @@ public class CfDef implements org.apache
     __isset_bit_vector.set(__ROW_CACHE_KEYS_TO_SAVE_ISSET_ID, value);
   }
 
-  public boolean isCompression() {
+  public String getCompression() {
     return this.compression;
   }
 
-  public CfDef setCompression(boolean compression) {
+  public CfDef setCompression(String compression) {
     this.compression = compression;
-    setCompressionIsSet(true);
     return this;
   }
 
   public void unsetCompression() {
-    __isset_bit_vector.clear(__COMPRESSION_ISSET_ID);
+    this.compression = null;
   }
 
   /** Returns true if field compression is set (has been assigned a value) and false otherwise */
   public boolean isSetCompression() {
-    return __isset_bit_vector.get(__COMPRESSION_ISSET_ID);
+    return this.compression != null;
   }
 
   public void setCompressionIsSet(boolean value) {
-    __isset_bit_vector.set(__COMPRESSION_ISSET_ID, value);
+    if (!value) {
+      this.compression = null;
+    }
+  }
+
+  public int getCompression_optionsSize() {
+    return (this.compression_options == null) ? 0 : this.compression_options.size();
+  }
+
+  public void putToCompression_options(String key, String val) {
+    if (this.compression_options == null) {
+      this.compression_options = new HashMap<String,String>();
+    }
+    this.compression_options.put(key, val);
+  }
+
+  public Map<String,String> getCompression_options() {
+    return this.compression_options;
+  }
+
+  public CfDef setCompression_options(Map<String,String> compression_options) {
+    this.compression_options = compression_options;
+    return this;
+  }
+
+  public void unsetCompression_options() {
+    this.compression_options = null;
+  }
+
+  /** Returns true if field compression_options is set (has been assigned a value) and false otherwise */
+  public boolean isSetCompression_options() {
+    return this.compression_options != null;
+  }
+
+  public void setCompression_optionsIsSet(boolean value) {
+    if (!value) {
+      this.compression_options = null;
+    }
   }
 
   public void setFieldValue(_Fields field, Object value) {
@@ -1398,7 +1459,15 @@ public class CfDef implements org.apache
       if (value == null) {
         unsetCompression();
       } else {
-        setCompression((Boolean)value);
+        setCompression((String)value);
+      }
+      break;
+
+    case COMPRESSION_OPTIONS:
+      if (value == null) {
+        unsetCompression_options();
+      } else {
+        setCompression_options((Map<String,String>)value);
       }
       break;
 
@@ -1489,7 +1558,10 @@ public class CfDef implements org.apache
       return new Integer(getRow_cache_keys_to_save());
 
     case COMPRESSION:
-      return new Boolean(isCompression());
+      return getCompression();
+
+    case COMPRESSION_OPTIONS:
+      return getCompression_options();
 
     }
     throw new IllegalStateException();
@@ -1558,6 +1630,8 @@ public class CfDef implements org.apache
       return isSetRow_cache_keys_to_save();
     case COMPRESSION:
       return isSetCompression();
+    case COMPRESSION_OPTIONS:
+      return isSetCompression_options();
     }
     throw new IllegalStateException();
   }
@@ -1823,7 +1897,16 @@ public class CfDef implements org.apache
     if (this_present_compression || that_present_compression) {
       if (!(this_present_compression && that_present_compression))
         return false;
-      if (this.compression != that.compression)
+      if (!this.compression.equals(that.compression))
+        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) {
+      if (!(this_present_compression_options && that_present_compression_options))
+        return false;
+      if (!this.compression_options.equals(that.compression_options))
         return false;
     }
 
@@ -1974,6 +2057,11 @@ public class CfDef implements org.apache
     if (present_compression)
       builder.append(compression);
 
+    boolean present_compression_options = true && (isSetCompression_options());
+    builder.append(present_compression_options);
+    if (present_compression_options)
+      builder.append(compression_options);
+
     return builder.toHashCode();
   }
 
@@ -2265,6 +2353,16 @@ public class CfDef implements org.apache
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetCompression_options()).compareTo(typedOther.isSetCompression_options());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetCompression_options()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.compression_options, typedOther.compression_options);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -2509,9 +2607,27 @@ public class CfDef implements org.apache
           }
           break;
         case 32: // COMPRESSION
-          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
-            this.compression = iprot.readBool();
-            setCompressionIsSet(true);
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
+            this.compression = iprot.readString();
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
+        case 33: // COMPRESSION_OPTIONS
+          if (field.type == org.apache.thrift.protocol.TType.MAP) {
+            {
+              org.apache.thrift.protocol.TMap _map41 = iprot.readMapBegin();
+              this.compression_options = new HashMap<String,String>(2*_map41.size);
+              for (int _i42 = 0; _i42 < _map41.size; ++_i42)
+              {
+                String _key43;
+                String _val44;
+                _key43 = iprot.readString();
+                _val44 = iprot.readString();
+                this.compression_options.put(_key43, _val44);
+              }
+              iprot.readMapEnd();
+            }
           } else { 
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
@@ -2589,9 +2705,9 @@ public class CfDef implements org.apache
         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 _iter41 : this.column_metadata)
+          for (ColumnDef _iter45 : this.column_metadata)
           {
-            _iter41.write(oprot);
+            _iter45.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -2688,10 +2804,10 @@ public class CfDef implements org.apache
         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> _iter42 : this.compaction_strategy_options.entrySet())
+          for (Map.Entry<String, String> _iter46 : this.compaction_strategy_options.entrySet())
           {
-            oprot.writeString(_iter42.getKey());
-            oprot.writeString(_iter42.getValue());
+            oprot.writeString(_iter46.getKey());
+            oprot.writeString(_iter46.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -2703,10 +2819,27 @@ public class CfDef implements org.apache
       oprot.writeI32(this.row_cache_keys_to_save);
       oprot.writeFieldEnd();
     }
-    if (isSetCompression()) {
-      oprot.writeFieldBegin(COMPRESSION_FIELD_DESC);
-      oprot.writeBool(this.compression);
-      oprot.writeFieldEnd();
+    if (this.compression != null) {
+      if (isSetCompression()) {
+        oprot.writeFieldBegin(COMPRESSION_FIELD_DESC);
+        oprot.writeString(this.compression);
+        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> _iter47 : this.compression_options.entrySet())
+          {
+            oprot.writeString(_iter47.getKey());
+            oprot.writeString(_iter47.getValue());
+          }
+          oprot.writeMapEnd();
+        }
+        oprot.writeFieldEnd();
+      }
     }
     oprot.writeFieldStop();
     oprot.writeStructEnd();
@@ -2929,7 +3062,21 @@ public class CfDef implements org.apache
     if (isSetCompression()) {
       if (!first) sb.append(", ");
       sb.append("compression:");
-      sb.append(this.compression);
+      if (this.compression == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.compression);
+      }
+      first = false;
+    }
+    if (isSetCompression_options()) {
+      if (!first) sb.append(", ");
+      sb.append("compression_options:");
+      if (this.compression_options == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.compression_options);
+      }
       first = false;
     }
     sb.append(")");
@@ -2946,5 +3093,23 @@ public class CfDef implements org.apache
     }
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java Wed Aug 31 20:30:20 2011
@@ -639,5 +639,23 @@ public class Column implements org.apach
     }
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java Wed Aug 31 20:30:20 2011
@@ -788,5 +788,21 @@ public class ColumnDef implements org.ap
     }
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java Wed Aug 31 20:30:20 2011
@@ -632,5 +632,21 @@ public class ColumnOrSuperColumn impleme
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java Wed Aug 31 20:30:20 2011
@@ -444,5 +444,21 @@ public class ColumnParent implements org
     }
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java Wed Aug 31 20:30:20 2011
@@ -555,5 +555,21 @@ public class ColumnPath implements org.a
     }
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java Wed Aug 31 20:30:20 2011
@@ -438,5 +438,23 @@ public class CounterColumn implements or
     // alas, we cannot check 'value' because it's a primitive and you chose the non-beans generator.
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java Wed Aug 31 20:30:20 2011
@@ -477,5 +477,21 @@ public class CounterSuperColumn implemen
     }
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java Wed Aug 31 20:30:20 2011
@@ -469,14 +469,14 @@ public class CqlResult implements org.ap
         case 2: // ROWS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list56 = iprot.readListBegin();
-              this.rows = new ArrayList<CqlRow>(_list56.size);
-              for (int _i57 = 0; _i57 < _list56.size; ++_i57)
+              org.apache.thrift.protocol.TList _list61 = iprot.readListBegin();
+              this.rows = new ArrayList<CqlRow>(_list61.size);
+              for (int _i62 = 0; _i62 < _list61.size; ++_i62)
               {
-                CqlRow _elem58;
-                _elem58 = new CqlRow();
-                _elem58.read(iprot);
-                this.rows.add(_elem58);
+                CqlRow _elem63;
+                _elem63 = new CqlRow();
+                _elem63.read(iprot);
+                this.rows.add(_elem63);
               }
               iprot.readListEnd();
             }
@@ -517,9 +517,9 @@ public class CqlResult implements org.ap
         oprot.writeFieldBegin(ROWS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.rows.size()));
-          for (CqlRow _iter59 : this.rows)
+          for (CqlRow _iter64 : this.rows)
           {
-            _iter59.write(oprot);
+            _iter64.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -574,5 +574,23 @@ public class CqlResult implements org.ap
     }
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java Wed Aug 31 20:30:20 2011
@@ -395,14 +395,14 @@ public class CqlRow implements org.apach
         case 2: // COLUMNS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list52 = iprot.readListBegin();
-              this.columns = new ArrayList<Column>(_list52.size);
-              for (int _i53 = 0; _i53 < _list52.size; ++_i53)
+              org.apache.thrift.protocol.TList _list57 = iprot.readListBegin();
+              this.columns = new ArrayList<Column>(_list57.size);
+              for (int _i58 = 0; _i58 < _list57.size; ++_i58)
               {
-                Column _elem54;
-                _elem54 = new Column();
-                _elem54.read(iprot);
-                this.columns.add(_elem54);
+                Column _elem59;
+                _elem59 = new Column();
+                _elem59.read(iprot);
+                this.columns.add(_elem59);
               }
               iprot.readListEnd();
             }
@@ -434,9 +434,9 @@ public class CqlRow implements org.apach
       oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.columns.size()));
-        for (Column _iter55 : this.columns)
+        for (Column _iter60 : this.columns)
         {
-          _iter55.write(oprot);
+          _iter60.write(oprot);
         }
         oprot.writeListEnd();
       }
@@ -480,5 +480,21 @@ public class CqlRow implements org.apach
     }
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java Wed Aug 31 20:30:20 2011
@@ -529,5 +529,23 @@ public class Deletion implements org.apa
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java Wed Aug 31 20:30:20 2011
@@ -575,5 +575,23 @@ public class IndexClause implements org.
     // alas, we cannot check 'count' because it's a primitive and you chose the non-beans generator.
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java Wed Aug 31 20:30:20 2011
@@ -563,5 +563,21 @@ public class IndexExpression implements 
     }
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java Wed Aug 31 20:30:20 2011
@@ -335,5 +335,21 @@ public class InvalidRequestException ext
     }
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java Wed Aug 31 20:30:20 2011
@@ -438,5 +438,23 @@ public class KeyCount implements org.apa
     // alas, we cannot check 'count' because it's a primitive and you chose the non-beans generator.
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java Wed Aug 31 20:30:20 2011
@@ -746,5 +746,23 @@ public class KeyRange implements org.apa
     // alas, we cannot check 'count' because it's a primitive and you chose the non-beans generator.
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java Wed Aug 31 20:30:20 2011
@@ -484,5 +484,21 @@ public class KeySlice implements org.apa
     }
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java Wed Aug 31 20:30:20 2011
@@ -718,15 +718,15 @@ public class KsDef implements org.apache
         case 3: // STRATEGY_OPTIONS
           if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              org.apache.thrift.protocol.TMap _map43 = iprot.readMapBegin();
-              this.strategy_options = new HashMap<String,String>(2*_map43.size);
-              for (int _i44 = 0; _i44 < _map43.size; ++_i44)
+              org.apache.thrift.protocol.TMap _map48 = iprot.readMapBegin();
+              this.strategy_options = new HashMap<String,String>(2*_map48.size);
+              for (int _i49 = 0; _i49 < _map48.size; ++_i49)
               {
-                String _key45;
-                String _val46;
-                _key45 = iprot.readString();
-                _val46 = iprot.readString();
-                this.strategy_options.put(_key45, _val46);
+                String _key50;
+                String _val51;
+                _key50 = iprot.readString();
+                _val51 = iprot.readString();
+                this.strategy_options.put(_key50, _val51);
               }
               iprot.readMapEnd();
             }
@@ -745,14 +745,14 @@ public class KsDef implements org.apache
         case 5: // CF_DEFS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list47 = iprot.readListBegin();
-              this.cf_defs = new ArrayList<CfDef>(_list47.size);
-              for (int _i48 = 0; _i48 < _list47.size; ++_i48)
+              org.apache.thrift.protocol.TList _list52 = iprot.readListBegin();
+              this.cf_defs = new ArrayList<CfDef>(_list52.size);
+              for (int _i53 = 0; _i53 < _list52.size; ++_i53)
               {
-                CfDef _elem49;
-                _elem49 = new CfDef();
-                _elem49.read(iprot);
-                this.cf_defs.add(_elem49);
+                CfDef _elem54;
+                _elem54 = new CfDef();
+                _elem54.read(iprot);
+                this.cf_defs.add(_elem54);
               }
               iprot.readListEnd();
             }
@@ -798,10 +798,10 @@ public class KsDef implements org.apache
         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> _iter50 : this.strategy_options.entrySet())
+          for (Map.Entry<String, String> _iter55 : this.strategy_options.entrySet())
           {
-            oprot.writeString(_iter50.getKey());
-            oprot.writeString(_iter50.getValue());
+            oprot.writeString(_iter55.getKey());
+            oprot.writeString(_iter55.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -817,9 +817,9 @@ public class KsDef implements org.apache
       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 _iter51 : this.cf_defs)
+        for (CfDef _iter56 : this.cf_defs)
         {
-          _iter51.write(oprot);
+          _iter56.write(oprot);
         }
         oprot.writeListEnd();
       }
@@ -901,5 +901,23 @@ public class KsDef implements org.apache
     }
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java Wed Aug 31 20:30:20 2011
@@ -428,5 +428,21 @@ public class Mutation implements org.apa
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java Wed Aug 31 20:30:20 2011
@@ -231,5 +231,21 @@ public class NotFoundException extends E
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: 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=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java Wed Aug 31 20:30:20 2011
@@ -231,5 +231,21 @@ public class SchemaDisagreementException
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java Wed Aug 31 20:30:20 2011
@@ -473,5 +473,21 @@ public class SlicePredicate implements o
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java Wed Aug 31 20:30:20 2011
@@ -659,5 +659,23 @@ public class SliceRange implements org.a
     // alas, we cannot check 'count' because it's a primitive and you chose the non-beans generator.
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java Wed Aug 31 20:30:20 2011
@@ -483,5 +483,21 @@ public class SuperColumn implements org.
     }
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java Wed Aug 31 20:30:20 2011
@@ -231,5 +231,21 @@ public class TimedOutException extends E
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java Wed Aug 31 20:30:20 2011
@@ -562,5 +562,21 @@ public class TokenRange implements org.a
     }
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java (original)
+++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java Wed Aug 31 20:30:20 2011
@@ -231,5 +231,21 @@ public class UnavailableException extend
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: cassandra/trunk/src/avro/internode.genavro
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/avro/internode.genavro?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/src/avro/internode.genavro (original)
+++ cassandra/trunk/src/avro/internode.genavro Wed Aug 31 20:30:20 2011
@@ -72,7 +72,8 @@ protocol InterNode {
         union { null, bytes } key_alias = null;
         union { null, string } compaction_strategy = null;
         union { null, map<string> } compaction_strategy_options = null;
-        boolean compression = false;
+        union { null, string } compression = null;
+        union { null, map<string> } compression_options = null;
     }
 
     @aliases(["org.apache.cassandra.config.avro.KsDef"])

Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java Wed Aug 31 20:30:20 2011
@@ -137,7 +137,8 @@ public class CliClient
         KEY_VALIDATION_CLASS,
         COMPACTION_STRATEGY,
         COMPACTION_STRATEGY_OPTIONS,
-        COMPRESSION
+        COMPRESSION,
+        COMPRESSION_OPTIONS,
     }
 
     private static final String DEFAULT_PLACEMENT_STRATEGY = "org.apache.cassandra.locator.NetworkTopologyStrategy";
@@ -1255,7 +1256,10 @@ public class CliClient
                 cfDef.setCompaction_strategy_options(getStrategyOptionsFromTree(statement.getChild(i+1)));
                 break;
             case COMPRESSION:
-                cfDef.setCompression(Boolean.parseBoolean(mValue));
+                cfDef.setCompression(mValue.toLowerCase().equals("null") ? null : CliUtils.unescapeSQLString(mValue));
+                break;
+            case COMPRESSION_OPTIONS:
+                cfDef.setCompression_options(getStrategyOptionsFromTree(statement.getChild(i+1)));
                 break;
             default:
                 //must match one of the above or we'd throw an exception at the valueOf statement above.
@@ -1932,7 +1936,7 @@ public class CliClient
         sessionState.out.printf("      Compaction min/max thresholds: %s/%s%n", cf_def.min_compaction_threshold, cf_def.max_compaction_threshold);
         sessionState.out.printf("      Read repair chance: %s%n", cf_def.read_repair_chance);
         sessionState.out.printf("      Replicate on write: %s%n", cf_def.replicate_on_write);
-        sessionState.out.printf("      Compression enabled: %s%n", cf_def.compression);
+        sessionState.out.printf("      Compression: %s%n", cf_def.compression);
 
         // if we have connection to the cfMBean established
         if (cfMBean != null)

Modified: cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java Wed Aug 31 20:30:20 2011
@@ -35,6 +35,8 @@ import org.apache.cassandra.db.marshal.*
 import org.apache.cassandra.db.migration.Migration;
 import org.apache.cassandra.db.migration.avro.ColumnDef;
 import org.apache.cassandra.io.IColumnSerializer;
+import org.apache.cassandra.io.compress.CompressionParameters;
+import org.apache.cassandra.io.compress.ICompressor;
 import org.apache.cassandra.thrift.InvalidRequestException;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.apache.cassandra.utils.FBUtilities;
@@ -69,7 +71,6 @@ public final class CFMetaData
     public final static String DEFAULT_ROW_CACHE_PROVIDER = "org.apache.cassandra.cache.ConcurrentLinkedHashCacheProvider";
     public final static String DEFAULT_COMPACTION_STRATEGY_CLASS = "SizeTieredCompactionStrategy";
     public final static ByteBuffer DEFAULT_KEY_NAME = ByteBufferUtil.bytes("KEY");
-    public final static boolean DEFAULT_COMPRESSION = false;
 
     public static final CFMetaData StatusCf = newSystemMetadata(SystemTable.STATUS_CF, 0, "persistent metadata for the local node", BytesType.instance, null, DEFAULT_SYSTEM_MEMTABLE_THROUGHPUT_IN_MB);
     public static final CFMetaData HintsCf = newSystemMetadata(HintedHandOffManager.HINTS_CF, 1, "hinted handoff data", BytesType.instance, BytesType.instance, Math.min(256, Math.max(32, DEFAULT_MEMTABLE_THROUGHPUT_IN_MB / 2)));
@@ -121,12 +122,13 @@ public final class CFMetaData
     private double mergeShardsChance;                 // default 0.1, chance [0.0, 1.0] of merging old shards during replication
     private IRowCacheProvider rowCacheProvider;
     private ByteBuffer keyAlias;                      // default NULL
-    private boolean compression;
 
     private Map<ByteBuffer, ColumnDefinition> column_metadata;
     public Class<? extends AbstractCompactionStrategy> compactionStrategyClass;
     public Map<String, String> compactionStrategyOptions;
 
+    private CompressionParameters compressionParameters;
+
     public CFMetaData comment(String prop) { comment = enforceCommentNotNull(prop); return this;}
     public CFMetaData rowCacheSize(double prop) {rowCacheSize = prop; return this;}
     public CFMetaData keyCacheSize(double prop) {keyCacheSize = prop; return this;}
@@ -144,11 +146,11 @@ public final class CFMetaData
     public CFMetaData memOps(double prop) {memtableOperationsInMillions = prop; return this;}
     public CFMetaData mergeShardsChance(double prop) {mergeShardsChance = prop; return this;}
     public CFMetaData keyAlias(ByteBuffer prop) {keyAlias = prop; return this;}
-    public CFMetaData compression(boolean prop) {compression = prop; return this; }
     public CFMetaData columnMetadata(Map<ByteBuffer,ColumnDefinition> prop) {column_metadata = prop; return this;}
     public CFMetaData rowCacheProvider(IRowCacheProvider prop) { rowCacheProvider = prop; return this;}
     public CFMetaData compactionStrategyClass(Class<? extends AbstractCompactionStrategy> prop) {compactionStrategyClass = prop; return this;}
     public CFMetaData compactionStrategyOptions(Map<String, String> prop) {compactionStrategyOptions = prop; return this;}
+    public CFMetaData compressionParameters(CompressionParameters prop) {compressionParameters = prop; return this;}
 
     public CFMetaData(String keyspace, String name, ColumnFamilyType type, AbstractType comp, AbstractType subcc)
     {
@@ -195,7 +197,6 @@ public final class CFMetaData
         memtableThroughputInMb       = DEFAULT_MEMTABLE_THROUGHPUT_IN_MB;
         memtableOperationsInMillions = DEFAULT_MEMTABLE_OPERATIONS_IN_MILLIONS;
         mergeShardsChance            = DEFAULT_MERGE_SHARDS_CHANCE;
-        compression                  = DEFAULT_COMPRESSION;
         try
         {
             rowCacheProvider             = FBUtilities.newCacheProvider(DEFAULT_ROW_CACHE_PROVIDER);
@@ -221,6 +222,8 @@ public final class CFMetaData
             throw new AssertionError(e);
         }
         compactionStrategyOptions = new HashMap<String, String>();
+
+        compressionParameters = new CompressionParameters(null);
     }
 
     private static CFMetaData newSystemMetadata(String cfName, int cfId, String comment, AbstractType comparator, AbstractType subcc, int memtableThroughPutInMB)
@@ -282,7 +285,7 @@ public final class CFMetaData
                       .columnMetadata(oldCFMD.column_metadata)
                       .compactionStrategyClass(oldCFMD.compactionStrategyClass)
                       .compactionStrategyOptions(oldCFMD.compactionStrategyOptions)
-                      .compression(oldCFMD.compression);
+                      .compressionParameters(oldCFMD.compressionParameters);
     }
     
     /**
@@ -331,7 +334,6 @@ public final class CFMetaData
         cf.memtable_operations_in_millions = memtableOperationsInMillions;
         cf.merge_shards_chance = mergeShardsChance;
         cf.key_alias = keyAlias;
-        cf.compression = compression;
         cf.column_metadata = new ArrayList<ColumnDef>(column_metadata.size());
         for (ColumnDefinition cd : column_metadata.values())
             cf.column_metadata.add(cd.toAvro());
@@ -343,6 +345,16 @@ public final class CFMetaData
             for (Map.Entry<String, String> e : compactionStrategyOptions.entrySet())
                 cf.compaction_strategy_options.put(new Utf8(e.getKey()), new Utf8(e.getValue()));
         }
+        if (compressionParameters.compressorClass != null)
+        {
+            cf.compression = new Utf8(compressionParameters.compressorClass.getName());
+            if (compressionParameters.compressionOptions != null)
+            {
+                cf.compression_options = new HashMap<CharSequence, CharSequence>();
+                for (Map.Entry<String, String> e : compressionParameters.compressionOptions.entrySet())
+                    cf.compression_options.put(new Utf8(e.getKey()), new Utf8(e.getValue()));
+            }
+        }
         return cf;
     }
 
@@ -422,6 +434,16 @@ public final class CFMetaData
                 newCFMD.compactionStrategyOptions.put(e.getKey().toString(), e.getValue().toString());
         }
 
+        CompressionParameters cp;
+        try
+        {
+            cp = new CompressionParameters(cf.compression, cf.compression_options);
+        }
+        catch (ConfigurationException e)
+        {
+            throw new RuntimeException(e);
+        }
+
         return newCFMD.comment(cf.comment.toString())
                       .rowCacheSize(cf.row_cache_size)
                       .keyCacheSize(cf.key_cache_size)
@@ -431,7 +453,7 @@ public final class CFMetaData
                       .defaultValidator(validator)
                       .keyValidator(keyValidator)
                       .columnMetadata(column_metadata)
-                      .compression(cf.compression);
+                      .compressionParameters(cp);
     }
     
     public String getComment()
@@ -524,14 +546,9 @@ public final class CFMetaData
         return keyAlias == null ? DEFAULT_KEY_NAME : keyAlias;
     }
 
-    public boolean useCompression()
-    {
-        return compression;
-    }
-
-    public void useCompression(boolean flag)
+    public CompressionParameters compressionParameters()
     {
-        compression = flag;
+        return compressionParameters;
     }
 
     public Map<ByteBuffer, ColumnDefinition> getColumn_metadata()
@@ -581,9 +598,9 @@ public final class CFMetaData
             .append(memtableOperationsInMillions, rhs.memtableOperationsInMillions)
             .append(mergeShardsChance, rhs.mergeShardsChance)
             .append(keyAlias, rhs.keyAlias)
-            .append(compression, rhs.compression)
             .append(compactionStrategyClass, rhs.compactionStrategyClass)
             .append(compactionStrategyOptions, rhs.compactionStrategyOptions)
+            .append(compressionParameters, rhs.compressionParameters)
             .isEquals();
     }
 
@@ -614,9 +631,9 @@ public final class CFMetaData
             .append(memtableOperationsInMillions)
             .append(mergeShardsChance)
             .append(keyAlias)
-            .append(compression)
             .append(compactionStrategyClass)
             .append(compactionStrategyOptions)
+            .append(compressionParameters)
             .toHashCode();
     }
 
@@ -661,8 +678,6 @@ public final class CFMetaData
             cf_def.compaction_strategy = DEFAULT_COMPACTION_STRATEGY_CLASS;
         if (null == cf_def.compaction_strategy_options)
             cf_def.compaction_strategy_options = Collections.emptyMap();
-        if (!cf_def.isSetCompression())
-            cf_def.setCompression(CFMetaData.DEFAULT_COMPRESSION);
     }
 
     public static CFMetaData fromThrift(org.apache.cassandra.thrift.CfDef cf_def) throws InvalidRequestException, ConfigurationException
@@ -699,6 +714,8 @@ public final class CFMetaData
         if (cf_def.isSetCompaction_strategy_options())
             newCFMD.compactionStrategyOptions(new HashMap<String, String>(cf_def.compaction_strategy_options));
 
+        CompressionParameters cp = new CompressionParameters(cf_def.compression, cf_def.compression_options);
+
         return newCFMD.comment(cf_def.comment)
                       .rowCacheSize(cf_def.row_cache_size)
                       .keyCacheSize(cf_def.key_cache_size)
@@ -707,7 +724,7 @@ public final class CFMetaData
                       .defaultValidator(TypeParser.parse(cf_def.default_validation_class))
                       .keyValidator(TypeParser.parse(cf_def.key_validation_class))
                       .columnMetadata(ColumnDefinition.fromThrift(cf_def.column_metadata))
-                      .compression(cf_def.compression);
+                      .compressionParameters(cp);
     }
 
     /** updates CFMetaData in-place to match cf_def */
@@ -760,7 +777,6 @@ public final class CFMetaData
         if (cf_def.row_cache_provider != null)
             rowCacheProvider = FBUtilities.newCacheProvider(cf_def.row_cache_provider.toString());
         keyAlias = cf_def.key_alias;
-        compression = cf_def.compression;
 
         // adjust column definitions. figure out who is coming and going.
         Set<ByteBuffer> toRemove = new HashSet<ByteBuffer>();
@@ -814,6 +830,8 @@ public final class CFMetaData
                 compactionStrategyOptions.put(e.getKey().toString(), e.getValue().toString());
         }
 
+        compressionParameters = new CompressionParameters(cf_def.compression, cf_def.compression_options);
+
         logger.debug("application result is {}", this);
     }
 
@@ -890,7 +908,6 @@ public final class CFMetaData
         def.setMemtable_operations_in_millions(memtableOperationsInMillions);
         def.setMerge_shards_chance(mergeShardsChance);
         def.setKey_alias(getKeyName());
-        def.setCompression(compression);
         List<org.apache.cassandra.thrift.ColumnDef> column_meta = new ArrayList<org.apache.cassandra.thrift.ColumnDef>(column_metadata.size());
         for (ColumnDefinition cd : column_metadata.values())
         {
@@ -905,6 +922,11 @@ public final class CFMetaData
         def.setColumn_metadata(column_meta);
         def.setCompaction_strategy(compactionStrategyClass.getName());
         def.setCompaction_strategy_options(new HashMap<String, String>(compactionStrategyOptions));
+        if (compressionParameters.compressorClass != null)
+        {
+            def.setCompression(compressionParameters.compressorClass.getName());
+            def.setCompression_options(compressionParameters.compressionOptions);
+        }
         return def;
     }
 
@@ -1026,10 +1048,11 @@ public final class CFMetaData
             .append("memtableOperationsInMillions", memtableOperationsInMillions)
             .append("mergeShardsChance", mergeShardsChance)
             .append("keyAlias", keyAlias)
-            .append("compression", compression)
             .append("column_metadata", column_metadata)
             .append("compactionStrategyClass", compactionStrategyClass)
             .append("compactionStrategyOptions", compactionStrategyOptions)
+            .append("compressorClass", compressionParameters.compressorClass)
+            .append("compressionOptions", compressionParameters.compressionOptions)
             .toString();
     }
 }

Modified: cassandra/trunk/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java Wed Aug 31 20:30:20 2011
@@ -30,7 +30,6 @@ import org.apache.cassandra.utils.FBUtil
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xerial.snappy.Snappy;
 
 public class CompressedRandomAccessReader extends RandomAccessReader
 {
@@ -75,7 +74,7 @@ public class CompressedRandomAccessReade
 
     private final CompressionMetadata metadata;
     // used by reBuffer() to escape creating lots of temporary buffers
-    private final byte[] compressed;
+    private byte[] compressed;
 
     // re-use single crc object
     private final Checksum checksum = new CRC32();
@@ -88,9 +87,9 @@ public class CompressedRandomAccessReade
 
     public CompressedRandomAccessReader(String dataFilePath, CompressionMetadata metadata, boolean skipIOCache) throws IOException
     {
-        super(new File(dataFilePath), metadata.chunkLength, skipIOCache);
+        super(new File(dataFilePath), metadata.chunkLength(), skipIOCache);
         this.metadata = metadata;
-        compressed = new byte[Snappy.maxCompressedLength(metadata.chunkLength)];
+        compressed = new byte[metadata.compressor().initialCompressedBufferLength(metadata.chunkLength())];
         // can't use super.read(...) methods
         // that is why we are allocating special InputStream to read data from disk
         // from already open file descriptor
@@ -109,10 +108,13 @@ public class CompressedRandomAccessReade
         if (channel.position() != chunk.offset)
             channel.position(chunk.offset);
 
+        if (compressed.length < chunk.length)
+            compressed = new byte[chunk.length];
+
         if (source.read(compressed, 0, chunk.length) != chunk.length)
             throw new IOException(String.format("(%s) failed to read %d bytes from offset %d.", getPath(), chunk.length, chunk.offset));
 
-        validBufferBytes = Snappy.rawUncompress(compressed, 0, chunk.length, buffer, 0);
+        validBufferBytes = metadata.compressor().uncompress(compressed, 0, chunk.length, buffer, 0);
 
         checksum.update(buffer, 0, validBufferBytes);
 
@@ -149,6 +151,6 @@ public class CompressedRandomAccessReade
     @Override
     public String toString()
     {
-        return String.format("%s - chunk length %d, data length %d.", getPath(), metadata.chunkLength, metadata.dataLength);
+        return String.format("%s - chunk length %d, data length %d.", getPath(), metadata.chunkLength(), metadata.dataLength);
     }
 }

Modified: cassandra/trunk/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java Wed Aug 31 20:30:20 2011
@@ -26,15 +26,11 @@ import java.util.zip.Checksum;
 import org.apache.cassandra.io.util.FileMark;
 import org.apache.cassandra.io.util.SequentialWriter;
 
-import org.xerial.snappy.Snappy;
-
 public class CompressedSequentialWriter extends SequentialWriter
 {
-    public static final int CHUNK_LENGTH = 65536;
-
-    public static SequentialWriter open(String dataFilePath, String indexFilePath, boolean skipIOCache) throws IOException
+    public static SequentialWriter open(String dataFilePath, String indexFilePath, boolean skipIOCache, CompressionParameters parameters) throws IOException
     {
-        return new CompressedSequentialWriter(new File(dataFilePath), indexFilePath, skipIOCache);
+        return new CompressedSequentialWriter(new File(dataFilePath), indexFilePath, skipIOCache, parameters);
     }
 
     // holds offset in the file where current chunk should be written
@@ -43,25 +39,27 @@ public class CompressedSequentialWriter 
 
     // index file writer (random I/O)
     private final CompressionMetadata.Writer metadataWriter;
+    private final ICompressor compressor;
 
     // used to store compressed data
-    private final byte[] compressed;
+    private final ICompressor.WrappedArray compressed;
 
     // holds a number of already written chunks
     private int chunkCount = 0;
 
     private final Checksum checksum = new CRC32();
 
-    public CompressedSequentialWriter(File file, String indexFilePath, boolean skipIOCache) throws IOException
+    public CompressedSequentialWriter(File file, String indexFilePath, boolean skipIOCache, CompressionParameters parameters) throws IOException
     {
-        super(file, CHUNK_LENGTH, skipIOCache);
+        super(file, parameters.chunkLength, skipIOCache);
+        this.compressor = parameters.compressor;
 
         // buffer for compression should be the same size as buffer itself
-        compressed = new byte[Snappy.maxCompressedLength(buffer.length)];
+        compressed = new ICompressor.WrappedArray(new byte[compressor.initialCompressedBufferLength(buffer.length)]);
 
         /* Index File (-CompressionInfo.db component) and it's header */
         metadataWriter = new CompressionMetadata.Writer(indexFilePath);
-        metadataWriter.writeHeader(Snappy.class.getSimpleName(), CHUNK_LENGTH);
+        metadataWriter.writeHeader(parameters);
     }
 
     @Override
@@ -82,7 +80,7 @@ public class CompressedSequentialWriter 
         seekToChunkStart();
 
         // compressing data with buffer re-use
-        int compressedLength = Snappy.rawCompress(buffer, 0, validBufferBytes, compressed, 0);
+        int compressedLength = compressor.compress(buffer, 0, validBufferBytes, compressed, 0);
 
         // update checksum
         checksum.update(buffer, 0, validBufferBytes);
@@ -91,10 +89,10 @@ public class CompressedSequentialWriter 
         metadataWriter.writeLong(chunkOffset);
         chunkCount++;
 
-        assert compressedLength <= compressed.length;
+        assert compressedLength <= compressed.buffer.length;
 
         // write data itself
-        out.write(compressed, 0, compressedLength);
+        out.write(compressed.buffer, 0, compressedLength);
         // write corresponding checksum
         out.writeInt((int) checksum.getValue());
 
@@ -137,12 +135,14 @@ public class CompressedSequentialWriter 
 
         // compressed chunk size (- 4 bytes reserved for checksum)
         int chunkSize = (int) (metadataWriter.chunkOffsetBy(realMark.nextChunkIndex) - chunkOffset - 4);
+        if (compressed.buffer.length < chunkSize)
+            compressed.buffer = new byte[chunkSize];
 
         out.seek(chunkOffset);
-        out.readFully(compressed, 0, chunkSize);
+        out.readFully(compressed.buffer, 0, chunkSize);
 
         // decompress data chunk and store its length
-        int validBytes = Snappy.rawUncompress(compressed, 0, chunkSize, buffer, 0);
+        int validBytes = compressor.uncompress(compressed.buffer, 0, chunkSize, buffer, 0);
 
         checksum.update(buffer, 0, validBytes);
 

Modified: cassandra/trunk/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java?rev=1163801&r1=1163800&r2=1163801&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java Wed Aug 31 20:30:20 2011
@@ -19,7 +19,10 @@
 package org.apache.cassandra.io.compress;
 
 import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
 
+import org.apache.cassandra.config.ConfigurationException;
 import org.apache.cassandra.io.util.FileUtils;
 
 /**
@@ -27,13 +30,11 @@ import org.apache.cassandra.io.util.File
  */
 public class CompressionMetadata
 {
-
-    public final int chunkLength;
     public final long dataLength;
     public final long compressedFileLength;
     public final long[] chunkOffsets;
     public final String indexFilePath;
-    public final String algorithm;
+    public final CompressionParameters parameters;
 
     public CompressionMetadata(String indexFilePath, long compressedLength) throws IOException
     {
@@ -41,8 +42,25 @@ public class CompressionMetadata
 
         DataInputStream stream = new DataInputStream(new FileInputStream(indexFilePath));
 
-        algorithm = stream.readUTF();
-        chunkLength = stream.readInt();
+        String compressorName = stream.readUTF();
+        int optionCount = stream.readInt();
+        Map<String, String> options = new HashMap<String, String>();
+        for (int i = 0; i < optionCount; ++i)
+        {
+            String key = stream.readUTF();
+            String value = stream.readUTF();
+            options.put(key, value);
+        }
+        int chunkLength = stream.readInt();
+        try
+        {
+            parameters = new CompressionParameters(compressorName, options, chunkLength);
+        }
+        catch (ConfigurationException e)
+        {
+            throw new RuntimeException("Cannot create CompressionParameters for stored parameters", e);
+        }
+
         dataLength = stream.readLong();
         compressedFileLength = compressedLength;
         chunkOffsets = readChunkOffsets(stream);
@@ -50,6 +68,16 @@ public class CompressionMetadata
         FileUtils.closeQuietly(stream);
     }
 
+    public ICompressor compressor()
+    {
+        return parameters.compressor;
+    }
+
+    public int chunkLength()
+    {
+        return parameters.chunkLength;
+    }
+
     /**
      * Read offsets of the individual chunks from the given input.
      *
@@ -92,7 +120,7 @@ public class CompressionMetadata
     public Chunk chunkFor(long position) throws IOException
     {
         // position of the chunk
-        int idx = (int) (position / chunkLength);
+        int idx = (int) (position / parameters.chunkLength);
 
         if (idx >= chunkOffsets.length)
             throw new EOFException();
@@ -115,13 +143,19 @@ public class CompressionMetadata
             super(path, "rw");
         }
 
-        public void writeHeader(String algorithm, int chunkLength) throws IOException
+        public void writeHeader(CompressionParameters parameters) throws IOException
         {
             // algorithm
-            writeUTF(algorithm);
+            writeUTF(parameters.compressorClass.getSimpleName());
+            writeInt(parameters.compressionOptions.size());
+            for (Map.Entry<String, String> entry : parameters.compressionOptions.entrySet())
+            {
+                writeUTF(entry.getKey());
+                writeUTF(entry.getValue());
+            }
 
             // store the length of the chunk
-            writeInt(chunkLength);
+            writeInt(parameters.chunkLength);
             // store position and reserve a place for uncompressed data length and chunks count
             dataLengthOffset = getFilePointer();
             writeLong(-1);