incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [34/51] [abbrv] Massive changes to the the thrift API. Getting closer to the final version, this commit also removes the controller from the architecture.
Date Tue, 11 Dec 2012 02:21:00 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/aee531c2/interface/gen-java/org/apache/blur/thrift/generated/Sort.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/Sort.java b/interface/gen-java/org/apache/blur/thrift/generated/Sort.java
index 2e4d1e9..3dcf8b9 100644
--- a/interface/gen-java/org/apache/blur/thrift/generated/Sort.java
+++ b/interface/gen-java/org/apache/blur/thrift/generated/Sort.java
@@ -358,14 +358,14 @@ public class Sort implements org.apache.thrift.TBase<Sort, Sort._Fields>, java.i
           case 1: // FIELDS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list84 = iprot.readListBegin();
-                struct.fields = new ArrayList<SortField>(_list84.size);
-                for (int _i85 = 0; _i85 < _list84.size; ++_i85)
+                org.apache.thrift.protocol.TList _list64 = iprot.readListBegin();
+                struct.fields = new ArrayList<SortField>(_list64.size);
+                for (int _i65 = 0; _i65 < _list64.size; ++_i65)
                 {
-                  SortField _elem86; // required
-                  _elem86 = new SortField();
-                  _elem86.read(iprot);
-                  struct.fields.add(_elem86);
+                  SortField _elem66; // required
+                  _elem66 = new SortField();
+                  _elem66.read(iprot);
+                  struct.fields.add(_elem66);
                 }
                 iprot.readListEnd();
               }
@@ -393,9 +393,9 @@ public class Sort implements org.apache.thrift.TBase<Sort, Sort._Fields>, java.i
         oprot.writeFieldBegin(FIELDS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.fields.size()));
-          for (SortField _iter87 : struct.fields)
+          for (SortField _iter67 : struct.fields)
           {
-            _iter87.write(oprot);
+            _iter67.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -426,9 +426,9 @@ public class Sort implements org.apache.thrift.TBase<Sort, Sort._Fields>, java.i
       if (struct.isSetFields()) {
         {
           oprot.writeI32(struct.fields.size());
-          for (SortField _iter88 : struct.fields)
+          for (SortField _iter68 : struct.fields)
           {
-            _iter88.write(oprot);
+            _iter68.write(oprot);
           }
         }
       }
@@ -440,14 +440,14 @@ public class Sort implements org.apache.thrift.TBase<Sort, Sort._Fields>, java.i
       BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list89 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.fields = new ArrayList<SortField>(_list89.size);
-          for (int _i90 = 0; _i90 < _list89.size; ++_i90)
+          org.apache.thrift.protocol.TList _list69 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.fields = new ArrayList<SortField>(_list69.size);
+          for (int _i70 = 0; _i70 < _list69.size; ++_i70)
           {
-            SortField _elem91; // required
-            _elem91 = new SortField();
-            _elem91.read(iprot);
-            struct.fields.add(_elem91);
+            SortField _elem71; // required
+            _elem71 = new SortField();
+            _elem71.read(iprot);
+            struct.fields.add(_elem71);
           }
         }
         struct.setFieldsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/aee531c2/interface/gen-java/org/apache/blur/thrift/generated/SortType.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/SortType.java b/interface/gen-java/org/apache/blur/thrift/generated/SortType.java
index 3508bfc..991dd14 100644
--- a/interface/gen-java/org/apache/blur/thrift/generated/SortType.java
+++ b/interface/gen-java/org/apache/blur/thrift/generated/SortType.java
@@ -32,55 +32,44 @@ import org.apache.thrift.TEnum;
 
 public enum SortType implements org.apache.thrift.TEnum {
   /**
-   * Sort by document score (relevance).  Sort values are Float and higher
-   * values are at the front.
+   * Sort by document score (relevance).  Sort values are Float and higher values are at the front.
    */
   SCORE(0),
   /**
-   * Sort by document number (index order).  Sort values are Integer and lower
-   * values are at the front.
+   * Sort by document number (index order).  Sort values are Integer and lower values are at the front.
    */
   DOC(1),
   /**
-   * Sort using term values as Strings.  Sort values are String and lower
-   * values are at the front.
+   * Sort using term values as Strings.  Sort values are String and lower values are at the front.
    */
   STRING(2),
   /**
-   * Sort using term values as encoded Integers.  Sort values are Integer and
-   * lower values are at the front.
+   * Sort using term values as encoded Integers.  Sort values are Integer and lower values are at the front.
    */
   INT(3),
   /**
-   * Sort using term values as encoded Floats.  Sort values are Float and
-   * lower values are at the front.
+   * Sort using term values as encoded Floats.  Sort values are Float and lower values are at the front.
    */
   FLOAT(4),
   /**
-   * Sort using term values as encoded Longs.  Sort values are Long and
-   * lower values are at the front.
+   * Sort using term values as encoded Longs.  Sort values are Long and lower values are at the front.
    */
   LONG(5),
   /**
-   * Sort using term values as encoded Doubles.  Sort values are Double and
-   * lower values are at the front.
+   * Sort using term values as encoded Doubles.  Sort values are Double and lower values are at the front.
    */
   DOUBLE(6),
   /**
-   * Sort using term values as encoded Shorts.  Sort values are Short and
-   * lower values are at the front.
+   * Sort using term values as encoded Shorts.  Sort values are Short and lower values are at the front.
    */
   SHORT(7),
   /**
-   * Sort using term values as encoded Bytes.  Sort values are Byte and
-   * lower values are at the front.
+   * Sort using term values as encoded Bytes.  Sort values are Byte and lower values are at the front.
    */
   BYTE(8),
   /**
-   * Sort using term values as Strings, but comparing by
-   * value (using String.compareTo) for all comparisons.
-   * This is typically slower than {@link #STRING}, which
-   * uses ordinals to do the sorting.
+   * Sort using term values as Strings, but comparing by value (using String.compareTo) for all
+   * comparisons. This is typically slower than {@link #STRING}, which uses ordinals to do the sorting.
    */
   STRING_VAL(9),
   /**

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/aee531c2/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java b/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
index e1f714f..d205bbf 100644
--- a/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
+++ b/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
@@ -55,19 +55,13 @@ import org.slf4j.LoggerFactory;
 public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor, TableDescriptor._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableDescriptor");
 
-  private static final org.apache.thrift.protocol.TField IS_ENABLED_FIELD_DESC = new org.apache.thrift.protocol.TField("isEnabled", org.apache.thrift.protocol.TType.BOOL, (short)1);
-  private static final org.apache.thrift.protocol.TField ANALYZER_DEFINITION_FIELD_DESC = new org.apache.thrift.protocol.TField("analyzerDefinition", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField ENABLED_FIELD_DESC = new org.apache.thrift.protocol.TField("enabled", org.apache.thrift.protocol.TType.BOOL, (short)2);
   private static final org.apache.thrift.protocol.TField SHARD_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("shardCount", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField TABLE_URI_FIELD_DESC = new org.apache.thrift.protocol.TField("tableUri", org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField COMPRESSION_CLASS_FIELD_DESC = new org.apache.thrift.protocol.TField("compressionClass", org.apache.thrift.protocol.TType.STRING, (short)5);
-  private static final org.apache.thrift.protocol.TField COMPRESSION_BLOCK_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("compressionBlockSize", org.apache.thrift.protocol.TType.I32, (short)6);
-  private static final org.apache.thrift.protocol.TField CLUSTER_FIELD_DESC = new org.apache.thrift.protocol.TField("cluster", org.apache.thrift.protocol.TType.STRING, (short)7);
-  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)8);
-  private static final org.apache.thrift.protocol.TField SIMILARITY_CLASS_FIELD_DESC = new org.apache.thrift.protocol.TField("similarityClass", org.apache.thrift.protocol.TType.STRING, (short)9);
-  private static final org.apache.thrift.protocol.TField BLOCK_CACHING_FIELD_DESC = new org.apache.thrift.protocol.TField("blockCaching", org.apache.thrift.protocol.TType.BOOL, (short)10);
-  private static final org.apache.thrift.protocol.TField BLOCK_CACHING_FILE_TYPES_FIELD_DESC = new org.apache.thrift.protocol.TField("blockCachingFileTypes", org.apache.thrift.protocol.TType.SET, (short)11);
-  private static final org.apache.thrift.protocol.TField READ_ONLY_FIELD_DESC = new org.apache.thrift.protocol.TField("readOnly", org.apache.thrift.protocol.TType.BOOL, (short)12);
-  private static final org.apache.thrift.protocol.TField COLUMN_PRE_CACHE_FIELD_DESC = new org.apache.thrift.protocol.TField("columnPreCache", org.apache.thrift.protocol.TType.STRUCT, (short)13);
+  private static final org.apache.thrift.protocol.TField STORAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("storagePath", org.apache.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.thrift.protocol.TField ANALYZER_FIELD_DESC = new org.apache.thrift.protocol.TField("analyzer", org.apache.thrift.protocol.TType.STRUCT, (short)5);
+  private static final org.apache.thrift.protocol.TField READ_ONLY_FIELD_DESC = new org.apache.thrift.protocol.TField("readOnly", org.apache.thrift.protocol.TType.BOOL, (short)6);
+  private static final org.apache.thrift.protocol.TField PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("properties", org.apache.thrift.protocol.TType.MAP, (short)7);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -78,11 +72,11 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
   /**
    * 
    */
-  public boolean isEnabled; // required
+  public String name; // required
   /**
    * 
    */
-  public AnalyzerDefinition analyzerDefinition; // required
+  public boolean enabled; // required
   /**
    * 
    */
@@ -90,55 +84,30 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
   /**
    * 
    */
-  public String tableUri; // required
-  /**
-   * 
-   */
-  public String compressionClass; // required
-  /**
-   * 
-   */
-  public int compressionBlockSize; // required
-  /**
-   * 
-   */
-  public String cluster; // required
-  /**
-   * 
-   */
-  public String name; // required
+  public String storagePath; // required
   /**
    * 
    */
-  public String similarityClass; // required
+  public Analyzer analyzer; // required
   /**
    * 
    */
-  public boolean blockCaching; // required
-  /**
-   * 
-   */
-  public Set<String> blockCachingFileTypes; // required
-  /**
-   * If a table is set to be readonly, that means that mutates through Thrift are NOT allowed.  However
-   * updates through MapReduce are allowed and in fact they are only allowed if the table is in readOnly mode.
-   */
   public boolean readOnly; // required
   /**
-   * Sets what column families and columns to prefetch into block cache on shard open.
+   * compressionClass,compressionBlockSize,similarityClass,blockCaching = 1,blockCachingFileTypes,columnPreCache
    */
-  public ColumnPreCache columnPreCache; // required
+  public Map<String,String> properties; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     /**
      * 
      */
-    IS_ENABLED((short)1, "isEnabled"),
+    NAME((short)1, "name"),
     /**
      * 
      */
-    ANALYZER_DEFINITION((short)2, "analyzerDefinition"),
+    ENABLED((short)2, "enabled"),
     /**
      * 
      */
@@ -146,44 +115,19 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
     /**
      * 
      */
-    TABLE_URI((short)4, "tableUri"),
-    /**
-     * 
-     */
-    COMPRESSION_CLASS((short)5, "compressionClass"),
-    /**
-     * 
-     */
-    COMPRESSION_BLOCK_SIZE((short)6, "compressionBlockSize"),
-    /**
-     * 
-     */
-    CLUSTER((short)7, "cluster"),
-    /**
-     * 
-     */
-    NAME((short)8, "name"),
+    STORAGE_PATH((short)4, "storagePath"),
     /**
      * 
      */
-    SIMILARITY_CLASS((short)9, "similarityClass"),
+    ANALYZER((short)5, "analyzer"),
     /**
      * 
      */
-    BLOCK_CACHING((short)10, "blockCaching"),
+    READ_ONLY((short)6, "readOnly"),
     /**
-     * 
-     */
-    BLOCK_CACHING_FILE_TYPES((short)11, "blockCachingFileTypes"),
-    /**
-     * If a table is set to be readonly, that means that mutates through Thrift are NOT allowed.  However
-     * updates through MapReduce are allowed and in fact they are only allowed if the table is in readOnly mode.
-     */
-    READ_ONLY((short)12, "readOnly"),
-    /**
-     * Sets what column families and columns to prefetch into block cache on shard open.
+     * compressionClass,compressionBlockSize,similarityClass,blockCaching = 1,blockCachingFileTypes,columnPreCache
      */
-    COLUMN_PRE_CACHE((short)13, "columnPreCache");
+    PROPERTIES((short)7, "properties");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -198,32 +142,20 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 1: // IS_ENABLED
-          return IS_ENABLED;
-        case 2: // ANALYZER_DEFINITION
-          return ANALYZER_DEFINITION;
+        case 1: // NAME
+          return NAME;
+        case 2: // ENABLED
+          return ENABLED;
         case 3: // SHARD_COUNT
           return SHARD_COUNT;
-        case 4: // TABLE_URI
-          return TABLE_URI;
-        case 5: // COMPRESSION_CLASS
-          return COMPRESSION_CLASS;
-        case 6: // COMPRESSION_BLOCK_SIZE
-          return COMPRESSION_BLOCK_SIZE;
-        case 7: // CLUSTER
-          return CLUSTER;
-        case 8: // NAME
-          return NAME;
-        case 9: // SIMILARITY_CLASS
-          return SIMILARITY_CLASS;
-        case 10: // BLOCK_CACHING
-          return BLOCK_CACHING;
-        case 11: // BLOCK_CACHING_FILE_TYPES
-          return BLOCK_CACHING_FILE_TYPES;
-        case 12: // READ_ONLY
+        case 4: // STORAGE_PATH
+          return STORAGE_PATH;
+        case 5: // ANALYZER
+          return ANALYZER;
+        case 6: // READ_ONLY
           return READ_ONLY;
-        case 13: // COLUMN_PRE_CACHE
-          return COLUMN_PRE_CACHE;
+        case 7: // PROPERTIES
+          return PROPERTIES;
         default:
           return null;
       }
@@ -264,97 +196,62 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
   }
 
   // isset id assignments
-  private static final int __ISENABLED_ISSET_ID = 0;
+  private static final int __ENABLED_ISSET_ID = 0;
   private static final int __SHARDCOUNT_ISSET_ID = 1;
-  private static final int __COMPRESSIONBLOCKSIZE_ISSET_ID = 2;
-  private static final int __BLOCKCACHING_ISSET_ID = 3;
-  private static final int __READONLY_ISSET_ID = 4;
+  private static final int __READONLY_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.IS_ENABLED, new org.apache.thrift.meta_data.FieldMetaData("isEnabled", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.ENABLED, new org.apache.thrift.meta_data.FieldMetaData("enabled", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.ANALYZER_DEFINITION, new org.apache.thrift.meta_data.FieldMetaData("analyzerDefinition", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AnalyzerDefinition.class)));
     tmpMap.put(_Fields.SHARD_COUNT, new org.apache.thrift.meta_data.FieldMetaData("shardCount", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.TABLE_URI, new org.apache.thrift.meta_data.FieldMetaData("tableUri", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.COMPRESSION_CLASS, new org.apache.thrift.meta_data.FieldMetaData("compressionClass", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.COMPRESSION_BLOCK_SIZE, new org.apache.thrift.meta_data.FieldMetaData("compressionBlockSize", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.CLUSTER, new org.apache.thrift.meta_data.FieldMetaData("cluster", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.STORAGE_PATH, new org.apache.thrift.meta_data.FieldMetaData("storagePath", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.SIMILARITY_CLASS, new org.apache.thrift.meta_data.FieldMetaData("similarityClass", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.BLOCK_CACHING, new org.apache.thrift.meta_data.FieldMetaData("blockCaching", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.BLOCK_CACHING_FILE_TYPES, new org.apache.thrift.meta_data.FieldMetaData("blockCachingFileTypes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.ANALYZER, new org.apache.thrift.meta_data.FieldMetaData("analyzer", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Analyzer.class)));
     tmpMap.put(_Fields.READ_ONLY, new org.apache.thrift.meta_data.FieldMetaData("readOnly", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.COLUMN_PRE_CACHE, new org.apache.thrift.meta_data.FieldMetaData("columnPreCache", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnPreCache.class)));
+    tmpMap.put(_Fields.PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("properties", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        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(TableDescriptor.class, metaDataMap);
   }
 
   public TableDescriptor() {
-    this.isEnabled = true;
+    this.enabled = true;
 
     this.shardCount = 1;
 
-    this.compressionClass = "org.apache.hadoop.io.compress.DefaultCodec";
-
-    this.compressionBlockSize = 32768;
-
-    this.cluster = "default";
-
-    this.blockCaching = true;
-
     this.readOnly = false;
 
   }
 
   public TableDescriptor(
-    boolean isEnabled,
-    AnalyzerDefinition analyzerDefinition,
-    int shardCount,
-    String tableUri,
-    String compressionClass,
-    int compressionBlockSize,
-    String cluster,
     String name,
-    String similarityClass,
-    boolean blockCaching,
-    Set<String> blockCachingFileTypes,
+    boolean enabled,
+    int shardCount,
+    String storagePath,
+    Analyzer analyzer,
     boolean readOnly,
-    ColumnPreCache columnPreCache)
+    Map<String,String> properties)
   {
     this();
-    this.isEnabled = isEnabled;
-    setIsEnabledIsSet(true);
-    this.analyzerDefinition = analyzerDefinition;
+    this.name = name;
+    this.enabled = enabled;
+    setEnabledIsSet(true);
     this.shardCount = shardCount;
     setShardCountIsSet(true);
-    this.tableUri = tableUri;
-    this.compressionClass = compressionClass;
-    this.compressionBlockSize = compressionBlockSize;
-    setCompressionBlockSizeIsSet(true);
-    this.cluster = cluster;
-    this.name = name;
-    this.similarityClass = similarityClass;
-    this.blockCaching = blockCaching;
-    setBlockCachingIsSet(true);
-    this.blockCachingFileTypes = blockCachingFileTypes;
+    this.storagePath = storagePath;
+    this.analyzer = analyzer;
     this.readOnly = readOnly;
     setReadOnlyIsSet(true);
-    this.columnPreCache = columnPreCache;
+    this.properties = properties;
   }
 
   /**
@@ -362,38 +259,32 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
    */
   public TableDescriptor(TableDescriptor other) {
     __isset_bitfield = other.__isset_bitfield;
-    this.isEnabled = other.isEnabled;
-    if (other.isSetAnalyzerDefinition()) {
-      this.analyzerDefinition = new AnalyzerDefinition(other.analyzerDefinition);
-    }
-    this.shardCount = other.shardCount;
-    if (other.isSetTableUri()) {
-      this.tableUri = other.tableUri;
-    }
-    if (other.isSetCompressionClass()) {
-      this.compressionClass = other.compressionClass;
-    }
-    this.compressionBlockSize = other.compressionBlockSize;
-    if (other.isSetCluster()) {
-      this.cluster = other.cluster;
-    }
     if (other.isSetName()) {
       this.name = other.name;
     }
-    if (other.isSetSimilarityClass()) {
-      this.similarityClass = other.similarityClass;
+    this.enabled = other.enabled;
+    this.shardCount = other.shardCount;
+    if (other.isSetStoragePath()) {
+      this.storagePath = other.storagePath;
     }
-    this.blockCaching = other.blockCaching;
-    if (other.isSetBlockCachingFileTypes()) {
-      Set<String> __this__blockCachingFileTypes = new HashSet<String>();
-      for (String other_element : other.blockCachingFileTypes) {
-        __this__blockCachingFileTypes.add(other_element);
-      }
-      this.blockCachingFileTypes = __this__blockCachingFileTypes;
+    if (other.isSetAnalyzer()) {
+      this.analyzer = new Analyzer(other.analyzer);
     }
     this.readOnly = other.readOnly;
-    if (other.isSetColumnPreCache()) {
-      this.columnPreCache = new ColumnPreCache(other.columnPreCache);
+    if (other.isSetProperties()) {
+      Map<String,String> __this__properties = new HashMap<String,String>();
+      for (Map.Entry<String, String> other_element : other.properties.entrySet()) {
+
+        String other_element_key = other_element.getKey();
+        String other_element_value = other_element.getValue();
+
+        String __this__properties_copy_key = other_element_key;
+
+        String __this__properties_copy_value = other_element_value;
+
+        __this__properties.put(__this__properties_copy_key, __this__properties_copy_value);
+      }
+      this.properties = __this__properties;
     }
   }
 
@@ -403,85 +294,75 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
 
   @Override
   public void clear() {
-    this.isEnabled = true;
+    this.name = null;
+    this.enabled = true;
 
-    this.analyzerDefinition = null;
     this.shardCount = 1;
 
-    this.tableUri = null;
-    this.compressionClass = "org.apache.hadoop.io.compress.DefaultCodec";
-
-    this.compressionBlockSize = 32768;
-
-    this.cluster = "default";
-
-    this.name = null;
-    this.similarityClass = null;
-    this.blockCaching = true;
-
-    this.blockCachingFileTypes = null;
+    this.storagePath = null;
+    this.analyzer = null;
     this.readOnly = false;
 
-    this.columnPreCache = null;
+    this.properties = null;
   }
 
   /**
    * 
    */
-  public boolean isIsEnabled() {
-    return this.isEnabled;
+  public String getName() {
+    return this.name;
   }
 
   /**
    * 
    */
-  public TableDescriptor setIsEnabled(boolean isEnabled) {
-    this.isEnabled = isEnabled;
-    setIsEnabledIsSet(true);
+  public TableDescriptor setName(String name) {
+    this.name = name;
     return this;
   }
 
-  public void unsetIsEnabled() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISENABLED_ISSET_ID);
+  public void unsetName() {
+    this.name = null;
   }
 
-  /** Returns true if field isEnabled is set (has been assigned a value) and false otherwise */
-  public boolean isSetIsEnabled() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISENABLED_ISSET_ID);
+  /** Returns true if field name is set (has been assigned a value) and false otherwise */
+  public boolean isSetName() {
+    return this.name != null;
   }
 
-  public void setIsEnabledIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISENABLED_ISSET_ID, value);
+  public void setNameIsSet(boolean value) {
+    if (!value) {
+      this.name = null;
+    }
   }
 
   /**
    * 
    */
-  public AnalyzerDefinition getAnalyzerDefinition() {
-    return this.analyzerDefinition;
+  public boolean isEnabled() {
+    return this.enabled;
   }
 
   /**
    * 
    */
-  public TableDescriptor setAnalyzerDefinition(AnalyzerDefinition analyzerDefinition) {
-    this.analyzerDefinition = analyzerDefinition;
+  public TableDescriptor setEnabled(boolean enabled) {
+    this.enabled = enabled;
+    setEnabledIsSet(true);
     return this;
   }
 
-  public void unsetAnalyzerDefinition() {
-    this.analyzerDefinition = null;
+  public void unsetEnabled() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ENABLED_ISSET_ID);
   }
 
-  /** Returns true if field analyzerDefinition is set (has been assigned a value) and false otherwise */
-  public boolean isSetAnalyzerDefinition() {
-    return this.analyzerDefinition != null;
+  /** Returns true if field enabled is set (has been assigned a value) and false otherwise */
+  public boolean isSetEnabled() {
+    return EncodingUtils.testBit(__isset_bitfield, __ENABLED_ISSET_ID);
   }
 
-  public void setAnalyzerDefinitionIsSet(boolean value) {
-    if (!value) {
-      this.analyzerDefinition = null;
-    }
+  public void setEnabledIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ENABLED_ISSET_ID, value);
   }
 
   /**
@@ -516,267 +397,72 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
   /**
    * 
    */
-  public String getTableUri() {
-    return this.tableUri;
-  }
-
-  /**
-   * 
-   */
-  public TableDescriptor setTableUri(String tableUri) {
-    this.tableUri = tableUri;
-    return this;
-  }
-
-  public void unsetTableUri() {
-    this.tableUri = null;
-  }
-
-  /** Returns true if field tableUri is set (has been assigned a value) and false otherwise */
-  public boolean isSetTableUri() {
-    return this.tableUri != null;
-  }
-
-  public void setTableUriIsSet(boolean value) {
-    if (!value) {
-      this.tableUri = null;
-    }
-  }
-
-  /**
-   * 
-   */
-  public String getCompressionClass() {
-    return this.compressionClass;
-  }
-
-  /**
-   * 
-   */
-  public TableDescriptor setCompressionClass(String compressionClass) {
-    this.compressionClass = compressionClass;
-    return this;
-  }
-
-  public void unsetCompressionClass() {
-    this.compressionClass = null;
-  }
-
-  /** Returns true if field compressionClass is set (has been assigned a value) and false otherwise */
-  public boolean isSetCompressionClass() {
-    return this.compressionClass != null;
-  }
-
-  public void setCompressionClassIsSet(boolean value) {
-    if (!value) {
-      this.compressionClass = null;
-    }
-  }
-
-  /**
-   * 
-   */
-  public int getCompressionBlockSize() {
-    return this.compressionBlockSize;
-  }
-
-  /**
-   * 
-   */
-  public TableDescriptor setCompressionBlockSize(int compressionBlockSize) {
-    this.compressionBlockSize = compressionBlockSize;
-    setCompressionBlockSizeIsSet(true);
-    return this;
-  }
-
-  public void unsetCompressionBlockSize() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __COMPRESSIONBLOCKSIZE_ISSET_ID);
-  }
-
-  /** Returns true if field compressionBlockSize is set (has been assigned a value) and false otherwise */
-  public boolean isSetCompressionBlockSize() {
-    return EncodingUtils.testBit(__isset_bitfield, __COMPRESSIONBLOCKSIZE_ISSET_ID);
-  }
-
-  public void setCompressionBlockSizeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __COMPRESSIONBLOCKSIZE_ISSET_ID, value);
-  }
-
-  /**
-   * 
-   */
-  public String getCluster() {
-    return this.cluster;
-  }
-
-  /**
-   * 
-   */
-  public TableDescriptor setCluster(String cluster) {
-    this.cluster = cluster;
-    return this;
-  }
-
-  public void unsetCluster() {
-    this.cluster = null;
-  }
-
-  /** Returns true if field cluster is set (has been assigned a value) and false otherwise */
-  public boolean isSetCluster() {
-    return this.cluster != null;
-  }
-
-  public void setClusterIsSet(boolean value) {
-    if (!value) {
-      this.cluster = null;
-    }
-  }
-
-  /**
-   * 
-   */
-  public String getName() {
-    return this.name;
+  public String getStoragePath() {
+    return this.storagePath;
   }
 
   /**
    * 
    */
-  public TableDescriptor setName(String name) {
-    this.name = name;
+  public TableDescriptor setStoragePath(String storagePath) {
+    this.storagePath = storagePath;
     return this;
   }
 
-  public void unsetName() {
-    this.name = null;
+  public void unsetStoragePath() {
+    this.storagePath = null;
   }
 
-  /** Returns true if field name is set (has been assigned a value) and false otherwise */
-  public boolean isSetName() {
-    return this.name != null;
+  /** Returns true if field storagePath is set (has been assigned a value) and false otherwise */
+  public boolean isSetStoragePath() {
+    return this.storagePath != null;
   }
 
-  public void setNameIsSet(boolean value) {
+  public void setStoragePathIsSet(boolean value) {
     if (!value) {
-      this.name = null;
+      this.storagePath = null;
     }
   }
 
   /**
    * 
    */
-  public String getSimilarityClass() {
-    return this.similarityClass;
+  public Analyzer getAnalyzer() {
+    return this.analyzer;
   }
 
   /**
    * 
    */
-  public TableDescriptor setSimilarityClass(String similarityClass) {
-    this.similarityClass = similarityClass;
+  public TableDescriptor setAnalyzer(Analyzer analyzer) {
+    this.analyzer = analyzer;
     return this;
   }
 
-  public void unsetSimilarityClass() {
-    this.similarityClass = null;
+  public void unsetAnalyzer() {
+    this.analyzer = null;
   }
 
-  /** Returns true if field similarityClass is set (has been assigned a value) and false otherwise */
-  public boolean isSetSimilarityClass() {
-    return this.similarityClass != null;
+  /** Returns true if field analyzer is set (has been assigned a value) and false otherwise */
+  public boolean isSetAnalyzer() {
+    return this.analyzer != null;
   }
 
-  public void setSimilarityClassIsSet(boolean value) {
+  public void setAnalyzerIsSet(boolean value) {
     if (!value) {
-      this.similarityClass = null;
+      this.analyzer = null;
     }
   }
 
   /**
    * 
    */
-  public boolean isBlockCaching() {
-    return this.blockCaching;
-  }
-
-  /**
-   * 
-   */
-  public TableDescriptor setBlockCaching(boolean blockCaching) {
-    this.blockCaching = blockCaching;
-    setBlockCachingIsSet(true);
-    return this;
-  }
-
-  public void unsetBlockCaching() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __BLOCKCACHING_ISSET_ID);
-  }
-
-  /** Returns true if field blockCaching is set (has been assigned a value) and false otherwise */
-  public boolean isSetBlockCaching() {
-    return EncodingUtils.testBit(__isset_bitfield, __BLOCKCACHING_ISSET_ID);
-  }
-
-  public void setBlockCachingIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __BLOCKCACHING_ISSET_ID, value);
-  }
-
-  public int getBlockCachingFileTypesSize() {
-    return (this.blockCachingFileTypes == null) ? 0 : this.blockCachingFileTypes.size();
-  }
-
-  public java.util.Iterator<String> getBlockCachingFileTypesIterator() {
-    return (this.blockCachingFileTypes == null) ? null : this.blockCachingFileTypes.iterator();
-  }
-
-  public void addToBlockCachingFileTypes(String elem) {
-    if (this.blockCachingFileTypes == null) {
-      this.blockCachingFileTypes = new HashSet<String>();
-    }
-    this.blockCachingFileTypes.add(elem);
-  }
-
-  /**
-   * 
-   */
-  public Set<String> getBlockCachingFileTypes() {
-    return this.blockCachingFileTypes;
-  }
-
-  /**
-   * 
-   */
-  public TableDescriptor setBlockCachingFileTypes(Set<String> blockCachingFileTypes) {
-    this.blockCachingFileTypes = blockCachingFileTypes;
-    return this;
-  }
-
-  public void unsetBlockCachingFileTypes() {
-    this.blockCachingFileTypes = null;
-  }
-
-  /** Returns true if field blockCachingFileTypes is set (has been assigned a value) and false otherwise */
-  public boolean isSetBlockCachingFileTypes() {
-    return this.blockCachingFileTypes != null;
-  }
-
-  public void setBlockCachingFileTypesIsSet(boolean value) {
-    if (!value) {
-      this.blockCachingFileTypes = null;
-    }
-  }
-
-  /**
-   * If a table is set to be readonly, that means that mutates through Thrift are NOT allowed.  However
-   * updates through MapReduce are allowed and in fact they are only allowed if the table is in readOnly mode.
-   */
   public boolean isReadOnly() {
     return this.readOnly;
   }
 
   /**
-   * If a table is set to be readonly, that means that mutates through Thrift are NOT allowed.  However
-   * updates through MapReduce are allowed and in fact they are only allowed if the table is in readOnly mode.
+   * 
    */
   public TableDescriptor setReadOnly(boolean readOnly) {
     this.readOnly = readOnly;
@@ -797,51 +483,62 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
     __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __READONLY_ISSET_ID, value);
   }
 
+  public int getPropertiesSize() {
+    return (this.properties == null) ? 0 : this.properties.size();
+  }
+
+  public void putToProperties(String key, String val) {
+    if (this.properties == null) {
+      this.properties = new HashMap<String,String>();
+    }
+    this.properties.put(key, val);
+  }
+
   /**
-   * Sets what column families and columns to prefetch into block cache on shard open.
+   * compressionClass,compressionBlockSize,similarityClass,blockCaching = 1,blockCachingFileTypes,columnPreCache
    */
-  public ColumnPreCache getColumnPreCache() {
-    return this.columnPreCache;
+  public Map<String,String> getProperties() {
+    return this.properties;
   }
 
   /**
-   * Sets what column families and columns to prefetch into block cache on shard open.
+   * compressionClass,compressionBlockSize,similarityClass,blockCaching = 1,blockCachingFileTypes,columnPreCache
    */
-  public TableDescriptor setColumnPreCache(ColumnPreCache columnPreCache) {
-    this.columnPreCache = columnPreCache;
+  public TableDescriptor setProperties(Map<String,String> properties) {
+    this.properties = properties;
     return this;
   }
 
-  public void unsetColumnPreCache() {
-    this.columnPreCache = null;
+  public void unsetProperties() {
+    this.properties = null;
   }
 
-  /** Returns true if field columnPreCache is set (has been assigned a value) and false otherwise */
-  public boolean isSetColumnPreCache() {
-    return this.columnPreCache != null;
+  /** Returns true if field properties is set (has been assigned a value) and false otherwise */
+  public boolean isSetProperties() {
+    return this.properties != null;
   }
 
-  public void setColumnPreCacheIsSet(boolean value) {
+  public void setPropertiesIsSet(boolean value) {
     if (!value) {
-      this.columnPreCache = null;
+      this.properties = null;
     }
   }
 
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
-    case IS_ENABLED:
+    case NAME:
       if (value == null) {
-        unsetIsEnabled();
+        unsetName();
       } else {
-        setIsEnabled((Boolean)value);
+        setName((String)value);
       }
       break;
 
-    case ANALYZER_DEFINITION:
+    case ENABLED:
       if (value == null) {
-        unsetAnalyzerDefinition();
+        unsetEnabled();
       } else {
-        setAnalyzerDefinition((AnalyzerDefinition)value);
+        setEnabled((Boolean)value);
       }
       break;
 
@@ -853,67 +550,19 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
       }
       break;
 
-    case TABLE_URI:
-      if (value == null) {
-        unsetTableUri();
-      } else {
-        setTableUri((String)value);
-      }
-      break;
-
-    case COMPRESSION_CLASS:
-      if (value == null) {
-        unsetCompressionClass();
-      } else {
-        setCompressionClass((String)value);
-      }
-      break;
-
-    case COMPRESSION_BLOCK_SIZE:
-      if (value == null) {
-        unsetCompressionBlockSize();
-      } else {
-        setCompressionBlockSize((Integer)value);
-      }
-      break;
-
-    case CLUSTER:
-      if (value == null) {
-        unsetCluster();
-      } else {
-        setCluster((String)value);
-      }
-      break;
-
-    case NAME:
-      if (value == null) {
-        unsetName();
-      } else {
-        setName((String)value);
-      }
-      break;
-
-    case SIMILARITY_CLASS:
+    case STORAGE_PATH:
       if (value == null) {
-        unsetSimilarityClass();
+        unsetStoragePath();
       } else {
-        setSimilarityClass((String)value);
+        setStoragePath((String)value);
       }
       break;
 
-    case BLOCK_CACHING:
+    case ANALYZER:
       if (value == null) {
-        unsetBlockCaching();
+        unsetAnalyzer();
       } else {
-        setBlockCaching((Boolean)value);
-      }
-      break;
-
-    case BLOCK_CACHING_FILE_TYPES:
-      if (value == null) {
-        unsetBlockCachingFileTypes();
-      } else {
-        setBlockCachingFileTypes((Set<String>)value);
+        setAnalyzer((Analyzer)value);
       }
       break;
 
@@ -925,11 +574,11 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
       }
       break;
 
-    case COLUMN_PRE_CACHE:
+    case PROPERTIES:
       if (value == null) {
-        unsetColumnPreCache();
+        unsetProperties();
       } else {
-        setColumnPreCache((ColumnPreCache)value);
+        setProperties((Map<String,String>)value);
       }
       break;
 
@@ -938,44 +587,26 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
 
   public Object getFieldValue(_Fields field) {
     switch (field) {
-    case IS_ENABLED:
-      return Boolean.valueOf(isIsEnabled());
+    case NAME:
+      return getName();
 
-    case ANALYZER_DEFINITION:
-      return getAnalyzerDefinition();
+    case ENABLED:
+      return Boolean.valueOf(isEnabled());
 
     case SHARD_COUNT:
       return Integer.valueOf(getShardCount());
 
-    case TABLE_URI:
-      return getTableUri();
-
-    case COMPRESSION_CLASS:
-      return getCompressionClass();
+    case STORAGE_PATH:
+      return getStoragePath();
 
-    case COMPRESSION_BLOCK_SIZE:
-      return Integer.valueOf(getCompressionBlockSize());
-
-    case CLUSTER:
-      return getCluster();
-
-    case NAME:
-      return getName();
-
-    case SIMILARITY_CLASS:
-      return getSimilarityClass();
-
-    case BLOCK_CACHING:
-      return Boolean.valueOf(isBlockCaching());
-
-    case BLOCK_CACHING_FILE_TYPES:
-      return getBlockCachingFileTypes();
+    case ANALYZER:
+      return getAnalyzer();
 
     case READ_ONLY:
       return Boolean.valueOf(isReadOnly());
 
-    case COLUMN_PRE_CACHE:
-      return getColumnPreCache();
+    case PROPERTIES:
+      return getProperties();
 
     }
     throw new IllegalStateException();
@@ -988,32 +619,20 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
     }
 
     switch (field) {
-    case IS_ENABLED:
-      return isSetIsEnabled();
-    case ANALYZER_DEFINITION:
-      return isSetAnalyzerDefinition();
-    case SHARD_COUNT:
-      return isSetShardCount();
-    case TABLE_URI:
-      return isSetTableUri();
-    case COMPRESSION_CLASS:
-      return isSetCompressionClass();
-    case COMPRESSION_BLOCK_SIZE:
-      return isSetCompressionBlockSize();
-    case CLUSTER:
-      return isSetCluster();
     case NAME:
       return isSetName();
-    case SIMILARITY_CLASS:
-      return isSetSimilarityClass();
-    case BLOCK_CACHING:
-      return isSetBlockCaching();
-    case BLOCK_CACHING_FILE_TYPES:
-      return isSetBlockCachingFileTypes();
+    case ENABLED:
+      return isSetEnabled();
+    case SHARD_COUNT:
+      return isSetShardCount();
+    case STORAGE_PATH:
+      return isSetStoragePath();
+    case ANALYZER:
+      return isSetAnalyzer();
     case READ_ONLY:
       return isSetReadOnly();
-    case COLUMN_PRE_CACHE:
-      return isSetColumnPreCache();
+    case PROPERTIES:
+      return isSetProperties();
     }
     throw new IllegalStateException();
   }
@@ -1031,21 +650,21 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
     if (that == null)
       return false;
 
-    boolean this_present_isEnabled = true;
-    boolean that_present_isEnabled = true;
-    if (this_present_isEnabled || that_present_isEnabled) {
-      if (!(this_present_isEnabled && that_present_isEnabled))
+    boolean this_present_name = true && this.isSetName();
+    boolean that_present_name = true && that.isSetName();
+    if (this_present_name || that_present_name) {
+      if (!(this_present_name && that_present_name))
         return false;
-      if (this.isEnabled != that.isEnabled)
+      if (!this.name.equals(that.name))
         return false;
     }
 
-    boolean this_present_analyzerDefinition = true && this.isSetAnalyzerDefinition();
-    boolean that_present_analyzerDefinition = true && that.isSetAnalyzerDefinition();
-    if (this_present_analyzerDefinition || that_present_analyzerDefinition) {
-      if (!(this_present_analyzerDefinition && that_present_analyzerDefinition))
+    boolean this_present_enabled = true;
+    boolean that_present_enabled = true;
+    if (this_present_enabled || that_present_enabled) {
+      if (!(this_present_enabled && that_present_enabled))
         return false;
-      if (!this.analyzerDefinition.equals(that.analyzerDefinition))
+      if (this.enabled != that.enabled)
         return false;
     }
 
@@ -1058,75 +677,21 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
         return false;
     }
 
-    boolean this_present_tableUri = true && this.isSetTableUri();
-    boolean that_present_tableUri = true && that.isSetTableUri();
-    if (this_present_tableUri || that_present_tableUri) {
-      if (!(this_present_tableUri && that_present_tableUri))
-        return false;
-      if (!this.tableUri.equals(that.tableUri))
-        return false;
-    }
-
-    boolean this_present_compressionClass = true && this.isSetCompressionClass();
-    boolean that_present_compressionClass = true && that.isSetCompressionClass();
-    if (this_present_compressionClass || that_present_compressionClass) {
-      if (!(this_present_compressionClass && that_present_compressionClass))
-        return false;
-      if (!this.compressionClass.equals(that.compressionClass))
-        return false;
-    }
-
-    boolean this_present_compressionBlockSize = true;
-    boolean that_present_compressionBlockSize = true;
-    if (this_present_compressionBlockSize || that_present_compressionBlockSize) {
-      if (!(this_present_compressionBlockSize && that_present_compressionBlockSize))
+    boolean this_present_storagePath = true && this.isSetStoragePath();
+    boolean that_present_storagePath = true && that.isSetStoragePath();
+    if (this_present_storagePath || that_present_storagePath) {
+      if (!(this_present_storagePath && that_present_storagePath))
         return false;
-      if (this.compressionBlockSize != that.compressionBlockSize)
+      if (!this.storagePath.equals(that.storagePath))
         return false;
     }
 
-    boolean this_present_cluster = true && this.isSetCluster();
-    boolean that_present_cluster = true && that.isSetCluster();
-    if (this_present_cluster || that_present_cluster) {
-      if (!(this_present_cluster && that_present_cluster))
+    boolean this_present_analyzer = true && this.isSetAnalyzer();
+    boolean that_present_analyzer = true && that.isSetAnalyzer();
+    if (this_present_analyzer || that_present_analyzer) {
+      if (!(this_present_analyzer && that_present_analyzer))
         return false;
-      if (!this.cluster.equals(that.cluster))
-        return false;
-    }
-
-    boolean this_present_name = true && this.isSetName();
-    boolean that_present_name = true && that.isSetName();
-    if (this_present_name || that_present_name) {
-      if (!(this_present_name && that_present_name))
-        return false;
-      if (!this.name.equals(that.name))
-        return false;
-    }
-
-    boolean this_present_similarityClass = true && this.isSetSimilarityClass();
-    boolean that_present_similarityClass = true && that.isSetSimilarityClass();
-    if (this_present_similarityClass || that_present_similarityClass) {
-      if (!(this_present_similarityClass && that_present_similarityClass))
-        return false;
-      if (!this.similarityClass.equals(that.similarityClass))
-        return false;
-    }
-
-    boolean this_present_blockCaching = true;
-    boolean that_present_blockCaching = true;
-    if (this_present_blockCaching || that_present_blockCaching) {
-      if (!(this_present_blockCaching && that_present_blockCaching))
-        return false;
-      if (this.blockCaching != that.blockCaching)
-        return false;
-    }
-
-    boolean this_present_blockCachingFileTypes = true && this.isSetBlockCachingFileTypes();
-    boolean that_present_blockCachingFileTypes = true && that.isSetBlockCachingFileTypes();
-    if (this_present_blockCachingFileTypes || that_present_blockCachingFileTypes) {
-      if (!(this_present_blockCachingFileTypes && that_present_blockCachingFileTypes))
-        return false;
-      if (!this.blockCachingFileTypes.equals(that.blockCachingFileTypes))
+      if (!this.analyzer.equals(that.analyzer))
         return false;
     }
 
@@ -1139,12 +704,12 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
         return false;
     }
 
-    boolean this_present_columnPreCache = true && this.isSetColumnPreCache();
-    boolean that_present_columnPreCache = true && that.isSetColumnPreCache();
-    if (this_present_columnPreCache || that_present_columnPreCache) {
-      if (!(this_present_columnPreCache && that_present_columnPreCache))
+    boolean this_present_properties = true && this.isSetProperties();
+    boolean that_present_properties = true && that.isSetProperties();
+    if (this_present_properties || that_present_properties) {
+      if (!(this_present_properties && that_present_properties))
         return false;
-      if (!this.columnPreCache.equals(that.columnPreCache))
+      if (!this.properties.equals(that.properties))
         return false;
     }
 
@@ -1164,22 +729,22 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
     int lastComparison = 0;
     TableDescriptor typedOther = (TableDescriptor)other;
 
-    lastComparison = Boolean.valueOf(isSetIsEnabled()).compareTo(typedOther.isSetIsEnabled());
+    lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetIsEnabled()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isEnabled, typedOther.isEnabled);
+    if (isSetName()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAnalyzerDefinition()).compareTo(typedOther.isSetAnalyzerDefinition());
+    lastComparison = Boolean.valueOf(isSetEnabled()).compareTo(typedOther.isSetEnabled());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetAnalyzerDefinition()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.analyzerDefinition, typedOther.analyzerDefinition);
+    if (isSetEnabled()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.enabled, typedOther.enabled);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1194,82 +759,22 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTableUri()).compareTo(typedOther.isSetTableUri());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetTableUri()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableUri, typedOther.tableUri);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetCompressionClass()).compareTo(typedOther.isSetCompressionClass());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetCompressionClass()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.compressionClass, typedOther.compressionClass);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetCompressionBlockSize()).compareTo(typedOther.isSetCompressionBlockSize());
+    lastComparison = Boolean.valueOf(isSetStoragePath()).compareTo(typedOther.isSetStoragePath());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetCompressionBlockSize()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.compressionBlockSize, typedOther.compressionBlockSize);
+    if (isSetStoragePath()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.storagePath, typedOther.storagePath);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCluster()).compareTo(typedOther.isSetCluster());
+    lastComparison = Boolean.valueOf(isSetAnalyzer()).compareTo(typedOther.isSetAnalyzer());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetCluster()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cluster, typedOther.cluster);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetSimilarityClass()).compareTo(typedOther.isSetSimilarityClass());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSimilarityClass()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.similarityClass, typedOther.similarityClass);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetBlockCaching()).compareTo(typedOther.isSetBlockCaching());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetBlockCaching()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.blockCaching, typedOther.blockCaching);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetBlockCachingFileTypes()).compareTo(typedOther.isSetBlockCachingFileTypes());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetBlockCachingFileTypes()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.blockCachingFileTypes, typedOther.blockCachingFileTypes);
+    if (isSetAnalyzer()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.analyzer, typedOther.analyzer);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1284,12 +789,12 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColumnPreCache()).compareTo(typedOther.isSetColumnPreCache());
+    lastComparison = Boolean.valueOf(isSetProperties()).compareTo(typedOther.isSetProperties());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetColumnPreCache()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnPreCache, typedOther.columnPreCache);
+    if (isSetProperties()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.properties, typedOther.properties);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1314,75 +819,35 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
     StringBuilder sb = new StringBuilder("TableDescriptor(");
     boolean first = true;
 
-    sb.append("isEnabled:");
-    sb.append(this.isEnabled);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("analyzerDefinition:");
-    if (this.analyzerDefinition == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.analyzerDefinition);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("shardCount:");
-    sb.append(this.shardCount);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("tableUri:");
-    if (this.tableUri == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.tableUri);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("compressionClass:");
-    if (this.compressionClass == null) {
+    sb.append("name:");
+    if (this.name == null) {
       sb.append("null");
     } else {
-      sb.append(this.compressionClass);
+      sb.append(this.name);
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("compressionBlockSize:");
-    sb.append(this.compressionBlockSize);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("cluster:");
-    if (this.cluster == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.cluster);
-    }
+    sb.append("enabled:");
+    sb.append(this.enabled);
     first = false;
     if (!first) sb.append(", ");
-    sb.append("name:");
-    if (this.name == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.name);
-    }
+    sb.append("shardCount:");
+    sb.append(this.shardCount);
     first = false;
     if (!first) sb.append(", ");
-    sb.append("similarityClass:");
-    if (this.similarityClass == null) {
+    sb.append("storagePath:");
+    if (this.storagePath == null) {
       sb.append("null");
     } else {
-      sb.append(this.similarityClass);
+      sb.append(this.storagePath);
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("blockCaching:");
-    sb.append(this.blockCaching);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("blockCachingFileTypes:");
-    if (this.blockCachingFileTypes == null) {
+    sb.append("analyzer:");
+    if (this.analyzer == null) {
       sb.append("null");
     } else {
-      sb.append(this.blockCachingFileTypes);
+      sb.append(this.analyzer);
     }
     first = false;
     if (!first) sb.append(", ");
@@ -1390,11 +855,11 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
     sb.append(this.readOnly);
     first = false;
     if (!first) sb.append(", ");
-    sb.append("columnPreCache:");
-    if (this.columnPreCache == null) {
+    sb.append("properties:");
+    if (this.properties == null) {
       sb.append("null");
     } else {
-      sb.append(this.columnPreCache);
+      sb.append(this.properties);
     }
     first = false;
     sb.append(")");
@@ -1404,11 +869,8 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
   public void validate() throws org.apache.thrift.TException {
     // check for required fields
     // check for sub-struct validity
-    if (analyzerDefinition != null) {
-      analyzerDefinition.validate();
-    }
-    if (columnPreCache != null) {
-      columnPreCache.validate();
+    if (analyzer != null) {
+      analyzer.validate();
     }
   }
 
@@ -1448,19 +910,18 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
           break;
         }
         switch (schemeField.id) {
-          case 1: // IS_ENABLED
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.isEnabled = iprot.readBool();
-              struct.setIsEnabledIsSet(true);
+          case 1: // NAME
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.name = iprot.readString();
+              struct.setNameIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 2: // ANALYZER_DEFINITION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.analyzerDefinition = new AnalyzerDefinition();
-              struct.analyzerDefinition.read(iprot);
-              struct.setAnalyzerDefinitionIsSet(true);
+          case 2: // ENABLED
+            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+              struct.enabled = iprot.readBool();
+              struct.setEnabledIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -1473,93 +934,47 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 4: // TABLE_URI
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tableUri = iprot.readString();
-              struct.setTableUriIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // COMPRESSION_CLASS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.compressionClass = iprot.readString();
-              struct.setCompressionClassIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // COMPRESSION_BLOCK_SIZE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.compressionBlockSize = iprot.readI32();
-              struct.setCompressionBlockSizeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // CLUSTER
+          case 4: // STORAGE_PATH
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.cluster = iprot.readString();
-              struct.setClusterIsSet(true);
+              struct.storagePath = iprot.readString();
+              struct.setStoragePathIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 8: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // SIMILARITY_CLASS
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.similarityClass = iprot.readString();
-              struct.setSimilarityClassIsSet(true);
+          case 5: // ANALYZER
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.analyzer = new Analyzer();
+              struct.analyzer.read(iprot);
+              struct.setAnalyzerIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 10: // BLOCK_CACHING
+          case 6: // READ_ONLY
             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.blockCaching = iprot.readBool();
-              struct.setBlockCachingIsSet(true);
+              struct.readOnly = iprot.readBool();
+              struct.setReadOnlyIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 11: // BLOCK_CACHING_FILE_TYPES
-            if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
+          case 7: // PROPERTIES
+            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TSet _set66 = iprot.readSetBegin();
-                struct.blockCachingFileTypes = new HashSet<String>(2*_set66.size);
-                for (int _i67 = 0; _i67 < _set66.size; ++_i67)
+                org.apache.thrift.protocol.TMap _map54 = iprot.readMapBegin();
+                struct.properties = new HashMap<String,String>(2*_map54.size);
+                for (int _i55 = 0; _i55 < _map54.size; ++_i55)
                 {
-                  String _elem68; // required
-                  _elem68 = iprot.readString();
-                  struct.blockCachingFileTypes.add(_elem68);
+                  String _key56; // required
+                  String _val57; // optional
+                  _key56 = iprot.readString();
+                  _val57 = iprot.readString();
+                  struct.properties.put(_key56, _val57);
                 }
-                iprot.readSetEnd();
+                iprot.readMapEnd();
               }
-              struct.setBlockCachingFileTypesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 12: // READ_ONLY
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.readOnly = iprot.readBool();
-              struct.setReadOnlyIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 13: // COLUMN_PRE_CACHE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.columnPreCache = new ColumnPreCache();
-              struct.columnPreCache.read(iprot);
-              struct.setColumnPreCacheIsSet(true);
+              struct.setPropertiesIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -1579,68 +994,43 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      oprot.writeFieldBegin(IS_ENABLED_FIELD_DESC);
-      oprot.writeBool(struct.isEnabled);
-      oprot.writeFieldEnd();
-      if (struct.analyzerDefinition != null) {
-        oprot.writeFieldBegin(ANALYZER_DEFINITION_FIELD_DESC);
-        struct.analyzerDefinition.write(oprot);
+      if (struct.name != null) {
+        oprot.writeFieldBegin(NAME_FIELD_DESC);
+        oprot.writeString(struct.name);
         oprot.writeFieldEnd();
       }
+      oprot.writeFieldBegin(ENABLED_FIELD_DESC);
+      oprot.writeBool(struct.enabled);
+      oprot.writeFieldEnd();
       oprot.writeFieldBegin(SHARD_COUNT_FIELD_DESC);
       oprot.writeI32(struct.shardCount);
       oprot.writeFieldEnd();
-      if (struct.tableUri != null) {
-        oprot.writeFieldBegin(TABLE_URI_FIELD_DESC);
-        oprot.writeString(struct.tableUri);
+      if (struct.storagePath != null) {
+        oprot.writeFieldBegin(STORAGE_PATH_FIELD_DESC);
+        oprot.writeString(struct.storagePath);
         oprot.writeFieldEnd();
       }
-      if (struct.compressionClass != null) {
-        oprot.writeFieldBegin(COMPRESSION_CLASS_FIELD_DESC);
-        oprot.writeString(struct.compressionClass);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(COMPRESSION_BLOCK_SIZE_FIELD_DESC);
-      oprot.writeI32(struct.compressionBlockSize);
-      oprot.writeFieldEnd();
-      if (struct.cluster != null) {
-        oprot.writeFieldBegin(CLUSTER_FIELD_DESC);
-        oprot.writeString(struct.cluster);
-        oprot.writeFieldEnd();
-      }
-      if (struct.name != null) {
-        oprot.writeFieldBegin(NAME_FIELD_DESC);
-        oprot.writeString(struct.name);
+      if (struct.analyzer != null) {
+        oprot.writeFieldBegin(ANALYZER_FIELD_DESC);
+        struct.analyzer.write(oprot);
         oprot.writeFieldEnd();
       }
-      if (struct.similarityClass != null) {
-        oprot.writeFieldBegin(SIMILARITY_CLASS_FIELD_DESC);
-        oprot.writeString(struct.similarityClass);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(BLOCK_CACHING_FIELD_DESC);
-      oprot.writeBool(struct.blockCaching);
+      oprot.writeFieldBegin(READ_ONLY_FIELD_DESC);
+      oprot.writeBool(struct.readOnly);
       oprot.writeFieldEnd();
-      if (struct.blockCachingFileTypes != null) {
-        oprot.writeFieldBegin(BLOCK_CACHING_FILE_TYPES_FIELD_DESC);
+      if (struct.properties != null) {
+        oprot.writeFieldBegin(PROPERTIES_FIELD_DESC);
         {
-          oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.blockCachingFileTypes.size()));
-          for (String _iter69 : struct.blockCachingFileTypes)
+          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.properties.size()));
+          for (Map.Entry<String, String> _iter58 : struct.properties.entrySet())
           {
-            oprot.writeString(_iter69);
+            oprot.writeString(_iter58.getKey());
+            oprot.writeString(_iter58.getValue());
           }
-          oprot.writeSetEnd();
+          oprot.writeMapEnd();
         }
         oprot.writeFieldEnd();
       }
-      oprot.writeFieldBegin(READ_ONLY_FIELD_DESC);
-      oprot.writeBool(struct.readOnly);
-      oprot.writeFieldEnd();
-      if (struct.columnPreCache != null) {
-        oprot.writeFieldBegin(COLUMN_PRE_CACHE_FIELD_DESC);
-        struct.columnPreCache.write(oprot);
-        oprot.writeFieldEnd();
-      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -1659,159 +1049,101 @@ public class TableDescriptor implements org.apache.thrift.TBase<TableDescriptor,
     public void write(org.apache.thrift.protocol.TProtocol prot, TableDescriptor struct) throws org.apache.thrift.TException {
       TTupleProtocol oprot = (TTupleProtocol) prot;
       BitSet optionals = new BitSet();
-      if (struct.isSetIsEnabled()) {
+      if (struct.isSetName()) {
         optionals.set(0);
       }
-      if (struct.isSetAnalyzerDefinition()) {
+      if (struct.isSetEnabled()) {
         optionals.set(1);
       }
       if (struct.isSetShardCount()) {
         optionals.set(2);
       }
-      if (struct.isSetTableUri()) {
+      if (struct.isSetStoragePath()) {
         optionals.set(3);
       }
-      if (struct.isSetCompressionClass()) {
+      if (struct.isSetAnalyzer()) {
         optionals.set(4);
       }
-      if (struct.isSetCompressionBlockSize()) {
+      if (struct.isSetReadOnly()) {
         optionals.set(5);
       }
-      if (struct.isSetCluster()) {
+      if (struct.isSetProperties()) {
         optionals.set(6);
       }
+      oprot.writeBitSet(optionals, 7);
       if (struct.isSetName()) {
-        optionals.set(7);
-      }
-      if (struct.isSetSimilarityClass()) {
-        optionals.set(8);
-      }
-      if (struct.isSetBlockCaching()) {
-        optionals.set(9);
-      }
-      if (struct.isSetBlockCachingFileTypes()) {
-        optionals.set(10);
-      }
-      if (struct.isSetReadOnly()) {
-        optionals.set(11);
-      }
-      if (struct.isSetColumnPreCache()) {
-        optionals.set(12);
-      }
-      oprot.writeBitSet(optionals, 13);
-      if (struct.isSetIsEnabled()) {
-        oprot.writeBool(struct.isEnabled);
+        oprot.writeString(struct.name);
       }
-      if (struct.isSetAnalyzerDefinition()) {
-        struct.analyzerDefinition.write(oprot);
+      if (struct.isSetEnabled()) {
+        oprot.writeBool(struct.enabled);
       }
       if (struct.isSetShardCount()) {
         oprot.writeI32(struct.shardCount);
       }
-      if (struct.isSetTableUri()) {
-        oprot.writeString(struct.tableUri);
+      if (struct.isSetStoragePath()) {
+        oprot.writeString(struct.storagePath);
       }
-      if (struct.isSetCompressionClass()) {
-        oprot.writeString(struct.compressionClass);
+      if (struct.isSetAnalyzer()) {
+        struct.analyzer.write(oprot);
       }
-      if (struct.isSetCompressionBlockSize()) {
-        oprot.writeI32(struct.compressionBlockSize);
-      }
-      if (struct.isSetCluster()) {
-        oprot.writeString(struct.cluster);
-      }
-      if (struct.isSetName()) {
-        oprot.writeString(struct.name);
-      }
-      if (struct.isSetSimilarityClass()) {
-        oprot.writeString(struct.similarityClass);
-      }
-      if (struct.isSetBlockCaching()) {
-        oprot.writeBool(struct.blockCaching);
+      if (struct.isSetReadOnly()) {
+        oprot.writeBool(struct.readOnly);
       }
-      if (struct.isSetBlockCachingFileTypes()) {
+      if (struct.isSetProperties()) {
         {
-          oprot.writeI32(struct.blockCachingFileTypes.size());
-          for (String _iter70 : struct.blockCachingFileTypes)
+          oprot.writeI32(struct.properties.size());
+          for (Map.Entry<String, String> _iter59 : struct.properties.entrySet())
           {
-            oprot.writeString(_iter70);
+            oprot.writeString(_iter59.getKey());
+            oprot.writeString(_iter59.getValue());
           }
         }
       }
-      if (struct.isSetReadOnly()) {
-        oprot.writeBool(struct.readOnly);
-      }
-      if (struct.isSetColumnPreCache()) {
-        struct.columnPreCache.write(oprot);
-      }
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TableDescriptor struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(13);
+      BitSet incoming = iprot.readBitSet(7);
       if (incoming.get(0)) {
-        struct.isEnabled = iprot.readBool();
-        struct.setIsEnabledIsSet(true);
+        struct.name = iprot.readString();
+        struct.setNameIsSet(true);
       }
       if (incoming.get(1)) {
-        struct.analyzerDefinition = new AnalyzerDefinition();
-        struct.analyzerDefinition.read(iprot);
-        struct.setAnalyzerDefinitionIsSet(true);
+        struct.enabled = iprot.readBool();
+        struct.setEnabledIsSet(true);
       }
       if (incoming.get(2)) {
         struct.shardCount = iprot.readI32();
         struct.setShardCountIsSet(true);
       }
       if (incoming.get(3)) {
-        struct.tableUri = iprot.readString();
-        struct.setTableUriIsSet(true);
+        struct.storagePath = iprot.readString();
+        struct.setStoragePathIsSet(true);
       }
       if (incoming.get(4)) {
-        struct.compressionClass = iprot.readString();
-        struct.setCompressionClassIsSet(true);
+        struct.analyzer = new Analyzer();
+        struct.analyzer.read(iprot);
+        struct.setAnalyzerIsSet(true);
       }
       if (incoming.get(5)) {
-        struct.compressionBlockSize = iprot.readI32();
-        struct.setCompressionBlockSizeIsSet(true);
+        struct.readOnly = iprot.readBool();
+        struct.setReadOnlyIsSet(true);
       }
       if (incoming.get(6)) {
-        struct.cluster = iprot.readString();
-        struct.setClusterIsSet(true);
-      }
-      if (incoming.get(7)) {
-        struct.name = iprot.readString();
-        struct.setNameIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.similarityClass = iprot.readString();
-        struct.setSimilarityClassIsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.blockCaching = iprot.readBool();
-        struct.setBlockCachingIsSet(true);
-      }
-      if (incoming.get(10)) {
         {
-          org.apache.thrift.protocol.TSet _set71 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.blockCachingFileTypes = new HashSet<String>(2*_set71.size);
-          for (int _i72 = 0; _i72 < _set71.size; ++_i72)
+          org.apache.thrift.protocol.TMap _map60 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.properties = new HashMap<String,String>(2*_map60.size);
+          for (int _i61 = 0; _i61 < _map60.size; ++_i61)
           {
-            String _elem73; // required
-            _elem73 = iprot.readString();
-            struct.blockCachingFileTypes.add(_elem73);
+            String _key62; // required
+            String _val63; // optional
+            _key62 = iprot.readString();
+            _val63 = iprot.readString();
+            struct.properties.put(_key62, _val63);
           }
         }
-        struct.setBlockCachingFileTypesIsSet(true);
-      }
-      if (incoming.get(11)) {
-        struct.readOnly = iprot.readBool();
-        struct.setReadOnlyIsSet(true);
-      }
-      if (incoming.get(12)) {
-        struct.columnPreCache = new ColumnPreCache();
-        struct.columnPreCache.read(iprot);
-        struct.setColumnPreCacheIsSet(true);
+        struct.setPropertiesIsSet(true);
       }
     }
   }


Mime
View raw message