incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [29/39] Adding the column definition method to Thrift and the Shell.
Date Mon, 12 Aug 2013 15:49:08 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d0b113eb/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java
index 3c66dcc..90042e2 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java
@@ -49,15 +49,15 @@ import java.util.Arrays;
 //import org.slf4j.Logger;
 //import org.slf4j.LoggerFactory;
 
-/**
- * 
- */
 public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<ColumnDefinition, ColumnDefinition._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct STRUCT_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct("ColumnDefinition");
 
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField ANALYZER_CLASS_NAME_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("analyzerClassName", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)1);
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField FULL_TEXT_INDEX_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("fullTextIndex", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)2);
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField ALTERNATE_COLUMN_DEFINITIONS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("alternateColumnDefinitions", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, (short)3);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField FAMILY_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("family", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)1);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COLUMN_NAME_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("columnName", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)2);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField SUB_COLUMN_NAME_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("subColumnName", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)3);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField FIELD_LESS_INDEXING_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("fieldLessIndexing", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)4);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField FIELD_TYPE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("fieldType", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)5);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField PROPERTIES_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("properties", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, (short)6);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -65,15 +65,77 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
     schemes.put(TupleScheme.class, new ColumnDefinitionTupleSchemeFactory());
   }
 
-  public String analyzerClassName; // required
-  public boolean fullTextIndex; // required
-  public Map<String,AlternateColumnDefinition> alternateColumnDefinitions; // required
+  /**
+   * Required. The family the this column existing within.
+   */
+  public String family; // required
+  /**
+   * Required. The column name.
+   */
+  public String columnName; // required
+  /**
+   * If this column definition is for a sub column then provide the sub column name.  Otherwise leave this field null.
+   */
+  public String subColumnName; // required
+  /**
+   * If this column should be searchable without having to specify the name of the column in the query.
+   * NOTE: This will index the column as a full text field in a default field, so that means it's going to be indexed twice.
+   */
+  public boolean fieldLessIndexing; // required
+  /**
+   * The field type for the column.  The built in types are:
+   * <ul>
+   * <li>text - Full text indexing.</li>
+   * <li>string - Indexed string literal</li>
+   * <li>int - Converted to an integer and indexed numerically.</li>
+   * <li>long - Converted to an long and indexed numerically.</li>
+   * <li>float - Converted to an float and indexed numerically.</li>
+   * <li>double - Converted to an double and indexed numerically.</li>
+   * <li>stored - Not indexed, only stored.</li>
+   * </ul>
+   */
+  public String fieldType; // required
+  /**
+   * For any custom field types, you can pass in configuration properties.
+   */
+  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.blur.thirdparty.thrift_0_9_0.TFieldIdEnum {
-    ANALYZER_CLASS_NAME((short)1, "analyzerClassName"),
-    FULL_TEXT_INDEX((short)2, "fullTextIndex"),
-    ALTERNATE_COLUMN_DEFINITIONS((short)3, "alternateColumnDefinitions");
+    /**
+     * Required. The family the this column existing within.
+     */
+    FAMILY((short)1, "family"),
+    /**
+     * Required. The column name.
+     */
+    COLUMN_NAME((short)2, "columnName"),
+    /**
+     * If this column definition is for a sub column then provide the sub column name.  Otherwise leave this field null.
+     */
+    SUB_COLUMN_NAME((short)3, "subColumnName"),
+    /**
+     * If this column should be searchable without having to specify the name of the column in the query.
+     * NOTE: This will index the column as a full text field in a default field, so that means it's going to be indexed twice.
+     */
+    FIELD_LESS_INDEXING((short)4, "fieldLessIndexing"),
+    /**
+     * The field type for the column.  The built in types are:
+     * <ul>
+     * <li>text - Full text indexing.</li>
+     * <li>string - Indexed string literal</li>
+     * <li>int - Converted to an integer and indexed numerically.</li>
+     * <li>long - Converted to an long and indexed numerically.</li>
+     * <li>float - Converted to an float and indexed numerically.</li>
+     * <li>double - Converted to an double and indexed numerically.</li>
+     * <li>stored - Not indexed, only stored.</li>
+     * </ul>
+     */
+    FIELD_TYPE((short)5, "fieldType"),
+    /**
+     * For any custom field types, you can pass in configuration properties.
+     */
+    PROPERTIES((short)6, "properties");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -88,12 +150,18 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 1: // ANALYZER_CLASS_NAME
-          return ANALYZER_CLASS_NAME;
-        case 2: // FULL_TEXT_INDEX
-          return FULL_TEXT_INDEX;
-        case 3: // ALTERNATE_COLUMN_DEFINITIONS
-          return ALTERNATE_COLUMN_DEFINITIONS;
+        case 1: // FAMILY
+          return FAMILY;
+        case 2: // COLUMN_NAME
+          return COLUMN_NAME;
+        case 3: // SUB_COLUMN_NAME
+          return SUB_COLUMN_NAME;
+        case 4: // FIELD_LESS_INDEXING
+          return FIELD_LESS_INDEXING;
+        case 5: // FIELD_TYPE
+          return FIELD_TYPE;
+        case 6: // PROPERTIES
+          return PROPERTIES;
         default:
           return null;
       }
@@ -134,38 +202,48 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
   }
 
   // isset id assignments
-  private static final int __FULLTEXTINDEX_ISSET_ID = 0;
+  private static final int __FIELDLESSINDEXING_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   public static final Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.ANALYZER_CLASS_NAME, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("analyzerClassName", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.FAMILY, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("family", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
+        new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING)));
+    tmpMap.put(_Fields.COLUMN_NAME, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("columnName", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING)));
-    tmpMap.put(_Fields.FULL_TEXT_INDEX, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("fullTextIndex", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.SUB_COLUMN_NAME, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("subColumnName", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
+        new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING)));
+    tmpMap.put(_Fields.FIELD_LESS_INDEXING, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("fieldLessIndexing", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.ALTERNATE_COLUMN_DEFINITIONS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("alternateColumnDefinitions", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.FIELD_TYPE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("fieldType", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
+        new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING)));
+    tmpMap.put(_Fields.PROPERTIES, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("properties", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.MapMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, 
             new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING), 
-            new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, AlternateColumnDefinition.class))));
+            new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(ColumnDefinition.class, metaDataMap);
   }
 
   public ColumnDefinition() {
-    this.analyzerClassName = "org.apache.blur.analysis.NoStopWordStandardAnalyzer";
-
   }
 
   public ColumnDefinition(
-    String analyzerClassName,
-    boolean fullTextIndex,
-    Map<String,AlternateColumnDefinition> alternateColumnDefinitions)
+    String family,
+    String columnName,
+    String subColumnName,
+    boolean fieldLessIndexing,
+    String fieldType,
+    Map<String,String> properties)
   {
     this();
-    this.analyzerClassName = analyzerClassName;
-    this.fullTextIndex = fullTextIndex;
-    setFullTextIndexIsSet(true);
-    this.alternateColumnDefinitions = alternateColumnDefinitions;
+    this.family = family;
+    this.columnName = columnName;
+    this.subColumnName = subColumnName;
+    this.fieldLessIndexing = fieldLessIndexing;
+    setFieldLessIndexingIsSet(true);
+    this.fieldType = fieldType;
+    this.properties = properties;
   }
 
   /**
@@ -173,24 +251,33 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
    */
   public ColumnDefinition(ColumnDefinition other) {
     __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetAnalyzerClassName()) {
-      this.analyzerClassName = other.analyzerClassName;
+    if (other.isSetFamily()) {
+      this.family = other.family;
     }
-    this.fullTextIndex = other.fullTextIndex;
-    if (other.isSetAlternateColumnDefinitions()) {
-      Map<String,AlternateColumnDefinition> __this__alternateColumnDefinitions = new HashMap<String,AlternateColumnDefinition>();
-      for (Map.Entry<String, AlternateColumnDefinition> other_element : other.alternateColumnDefinitions.entrySet()) {
+    if (other.isSetColumnName()) {
+      this.columnName = other.columnName;
+    }
+    if (other.isSetSubColumnName()) {
+      this.subColumnName = other.subColumnName;
+    }
+    this.fieldLessIndexing = other.fieldLessIndexing;
+    if (other.isSetFieldType()) {
+      this.fieldType = other.fieldType;
+    }
+    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();
-        AlternateColumnDefinition other_element_value = other_element.getValue();
+        String other_element_value = other_element.getValue();
 
-        String __this__alternateColumnDefinitions_copy_key = other_element_key;
+        String __this__properties_copy_key = other_element_key;
 
-        AlternateColumnDefinition __this__alternateColumnDefinitions_copy_value = new AlternateColumnDefinition(other_element_value);
+        String __this__properties_copy_value = other_element_value;
 
-        __this__alternateColumnDefinitions.put(__this__alternateColumnDefinitions_copy_key, __this__alternateColumnDefinitions_copy_value);
+        __this__properties.put(__this__properties_copy_key, __this__properties_copy_value);
       }
-      this.alternateColumnDefinitions = __this__alternateColumnDefinitions;
+      this.properties = __this__properties;
     }
   }
 
@@ -200,118 +287,272 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
 
   @Override
   public void clear() {
-    this.analyzerClassName = "org.apache.blur.analysis.NoStopWordStandardAnalyzer";
+    this.family = null;
+    this.columnName = null;
+    this.subColumnName = null;
+    setFieldLessIndexingIsSet(false);
+    this.fieldLessIndexing = false;
+    this.fieldType = null;
+    this.properties = null;
+  }
+
+  /**
+   * Required. The family the this column existing within.
+   */
+  public String getFamily() {
+    return this.family;
+  }
+
+  /**
+   * Required. The family the this column existing within.
+   */
+  public ColumnDefinition setFamily(String family) {
+    this.family = family;
+    return this;
+  }
+
+  public void unsetFamily() {
+    this.family = null;
+  }
+
+  /** Returns true if field family is set (has been assigned a value) and false otherwise */
+  public boolean isSetFamily() {
+    return this.family != null;
+  }
+
+  public void setFamilyIsSet(boolean value) {
+    if (!value) {
+      this.family = null;
+    }
+  }
+
+  /**
+   * Required. The column name.
+   */
+  public String getColumnName() {
+    return this.columnName;
+  }
+
+  /**
+   * Required. The column name.
+   */
+  public ColumnDefinition setColumnName(String columnName) {
+    this.columnName = columnName;
+    return this;
+  }
 
-    setFullTextIndexIsSet(false);
-    this.fullTextIndex = false;
-    this.alternateColumnDefinitions = null;
+  public void unsetColumnName() {
+    this.columnName = null;
   }
 
-  public String getAnalyzerClassName() {
-    return this.analyzerClassName;
+  /** Returns true if field columnName is set (has been assigned a value) and false otherwise */
+  public boolean isSetColumnName() {
+    return this.columnName != null;
   }
 
-  public ColumnDefinition setAnalyzerClassName(String analyzerClassName) {
-    this.analyzerClassName = analyzerClassName;
+  public void setColumnNameIsSet(boolean value) {
+    if (!value) {
+      this.columnName = null;
+    }
+  }
+
+  /**
+   * If this column definition is for a sub column then provide the sub column name.  Otherwise leave this field null.
+   */
+  public String getSubColumnName() {
+    return this.subColumnName;
+  }
+
+  /**
+   * If this column definition is for a sub column then provide the sub column name.  Otherwise leave this field null.
+   */
+  public ColumnDefinition setSubColumnName(String subColumnName) {
+    this.subColumnName = subColumnName;
     return this;
   }
 
-  public void unsetAnalyzerClassName() {
-    this.analyzerClassName = null;
+  public void unsetSubColumnName() {
+    this.subColumnName = null;
   }
 
-  /** Returns true if field analyzerClassName is set (has been assigned a value) and false otherwise */
-  public boolean isSetAnalyzerClassName() {
-    return this.analyzerClassName != null;
+  /** Returns true if field subColumnName is set (has been assigned a value) and false otherwise */
+  public boolean isSetSubColumnName() {
+    return this.subColumnName != null;
   }
 
-  public void setAnalyzerClassNameIsSet(boolean value) {
+  public void setSubColumnNameIsSet(boolean value) {
     if (!value) {
-      this.analyzerClassName = null;
+      this.subColumnName = null;
     }
   }
 
-  public boolean isFullTextIndex() {
-    return this.fullTextIndex;
+  /**
+   * If this column should be searchable without having to specify the name of the column in the query.
+   * NOTE: This will index the column as a full text field in a default field, so that means it's going to be indexed twice.
+   */
+  public boolean isFieldLessIndexing() {
+    return this.fieldLessIndexing;
+  }
+
+  /**
+   * If this column should be searchable without having to specify the name of the column in the query.
+   * NOTE: This will index the column as a full text field in a default field, so that means it's going to be indexed twice.
+   */
+  public ColumnDefinition setFieldLessIndexing(boolean fieldLessIndexing) {
+    this.fieldLessIndexing = fieldLessIndexing;
+    setFieldLessIndexingIsSet(true);
+    return this;
+  }
+
+  public void unsetFieldLessIndexing() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FIELDLESSINDEXING_ISSET_ID);
+  }
+
+  /** Returns true if field fieldLessIndexing is set (has been assigned a value) and false otherwise */
+  public boolean isSetFieldLessIndexing() {
+    return EncodingUtils.testBit(__isset_bitfield, __FIELDLESSINDEXING_ISSET_ID);
+  }
+
+  public void setFieldLessIndexingIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FIELDLESSINDEXING_ISSET_ID, value);
+  }
+
+  /**
+   * The field type for the column.  The built in types are:
+   * <ul>
+   * <li>text - Full text indexing.</li>
+   * <li>string - Indexed string literal</li>
+   * <li>int - Converted to an integer and indexed numerically.</li>
+   * <li>long - Converted to an long and indexed numerically.</li>
+   * <li>float - Converted to an float and indexed numerically.</li>
+   * <li>double - Converted to an double and indexed numerically.</li>
+   * <li>stored - Not indexed, only stored.</li>
+   * </ul>
+   */
+  public String getFieldType() {
+    return this.fieldType;
   }
 
-  public ColumnDefinition setFullTextIndex(boolean fullTextIndex) {
-    this.fullTextIndex = fullTextIndex;
-    setFullTextIndexIsSet(true);
+  /**
+   * The field type for the column.  The built in types are:
+   * <ul>
+   * <li>text - Full text indexing.</li>
+   * <li>string - Indexed string literal</li>
+   * <li>int - Converted to an integer and indexed numerically.</li>
+   * <li>long - Converted to an long and indexed numerically.</li>
+   * <li>float - Converted to an float and indexed numerically.</li>
+   * <li>double - Converted to an double and indexed numerically.</li>
+   * <li>stored - Not indexed, only stored.</li>
+   * </ul>
+   */
+  public ColumnDefinition setFieldType(String fieldType) {
+    this.fieldType = fieldType;
     return this;
   }
 
-  public void unsetFullTextIndex() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FULLTEXTINDEX_ISSET_ID);
+  public void unsetFieldType() {
+    this.fieldType = null;
   }
 
-  /** Returns true if field fullTextIndex is set (has been assigned a value) and false otherwise */
-  public boolean isSetFullTextIndex() {
-    return EncodingUtils.testBit(__isset_bitfield, __FULLTEXTINDEX_ISSET_ID);
+  /** Returns true if field fieldType is set (has been assigned a value) and false otherwise */
+  public boolean isSetFieldType() {
+    return this.fieldType != null;
   }
 
-  public void setFullTextIndexIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FULLTEXTINDEX_ISSET_ID, value);
+  public void setFieldTypeIsSet(boolean value) {
+    if (!value) {
+      this.fieldType = null;
+    }
   }
 
-  public int getAlternateColumnDefinitionsSize() {
-    return (this.alternateColumnDefinitions == null) ? 0 : this.alternateColumnDefinitions.size();
+  public int getPropertiesSize() {
+    return (this.properties == null) ? 0 : this.properties.size();
   }
 
-  public void putToAlternateColumnDefinitions(String key, AlternateColumnDefinition val) {
-    if (this.alternateColumnDefinitions == null) {
-      this.alternateColumnDefinitions = new HashMap<String,AlternateColumnDefinition>();
+  public void putToProperties(String key, String val) {
+    if (this.properties == null) {
+      this.properties = new HashMap<String,String>();
     }
-    this.alternateColumnDefinitions.put(key, val);
+    this.properties.put(key, val);
   }
 
-  public Map<String,AlternateColumnDefinition> getAlternateColumnDefinitions() {
-    return this.alternateColumnDefinitions;
+  /**
+   * For any custom field types, you can pass in configuration properties.
+   */
+  public Map<String,String> getProperties() {
+    return this.properties;
   }
 
-  public ColumnDefinition setAlternateColumnDefinitions(Map<String,AlternateColumnDefinition> alternateColumnDefinitions) {
-    this.alternateColumnDefinitions = alternateColumnDefinitions;
+  /**
+   * For any custom field types, you can pass in configuration properties.
+   */
+  public ColumnDefinition setProperties(Map<String,String> properties) {
+    this.properties = properties;
     return this;
   }
 
-  public void unsetAlternateColumnDefinitions() {
-    this.alternateColumnDefinitions = null;
+  public void unsetProperties() {
+    this.properties = null;
   }
 
-  /** Returns true if field alternateColumnDefinitions is set (has been assigned a value) and false otherwise */
-  public boolean isSetAlternateColumnDefinitions() {
-    return this.alternateColumnDefinitions != 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 setAlternateColumnDefinitionsIsSet(boolean value) {
+  public void setPropertiesIsSet(boolean value) {
     if (!value) {
-      this.alternateColumnDefinitions = null;
+      this.properties = null;
     }
   }
 
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
-    case ANALYZER_CLASS_NAME:
+    case FAMILY:
       if (value == null) {
-        unsetAnalyzerClassName();
+        unsetFamily();
       } else {
-        setAnalyzerClassName((String)value);
+        setFamily((String)value);
       }
       break;
 
-    case FULL_TEXT_INDEX:
+    case COLUMN_NAME:
       if (value == null) {
-        unsetFullTextIndex();
+        unsetColumnName();
       } else {
-        setFullTextIndex((Boolean)value);
+        setColumnName((String)value);
       }
       break;
 
-    case ALTERNATE_COLUMN_DEFINITIONS:
+    case SUB_COLUMN_NAME:
       if (value == null) {
-        unsetAlternateColumnDefinitions();
+        unsetSubColumnName();
       } else {
-        setAlternateColumnDefinitions((Map<String,AlternateColumnDefinition>)value);
+        setSubColumnName((String)value);
+      }
+      break;
+
+    case FIELD_LESS_INDEXING:
+      if (value == null) {
+        unsetFieldLessIndexing();
+      } else {
+        setFieldLessIndexing((Boolean)value);
+      }
+      break;
+
+    case FIELD_TYPE:
+      if (value == null) {
+        unsetFieldType();
+      } else {
+        setFieldType((String)value);
+      }
+      break;
+
+    case PROPERTIES:
+      if (value == null) {
+        unsetProperties();
+      } else {
+        setProperties((Map<String,String>)value);
       }
       break;
 
@@ -320,14 +561,23 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
 
   public Object getFieldValue(_Fields field) {
     switch (field) {
-    case ANALYZER_CLASS_NAME:
-      return getAnalyzerClassName();
+    case FAMILY:
+      return getFamily();
+
+    case COLUMN_NAME:
+      return getColumnName();
 
-    case FULL_TEXT_INDEX:
-      return Boolean.valueOf(isFullTextIndex());
+    case SUB_COLUMN_NAME:
+      return getSubColumnName();
 
-    case ALTERNATE_COLUMN_DEFINITIONS:
-      return getAlternateColumnDefinitions();
+    case FIELD_LESS_INDEXING:
+      return Boolean.valueOf(isFieldLessIndexing());
+
+    case FIELD_TYPE:
+      return getFieldType();
+
+    case PROPERTIES:
+      return getProperties();
 
     }
     throw new IllegalStateException();
@@ -340,12 +590,18 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
     }
 
     switch (field) {
-    case ANALYZER_CLASS_NAME:
-      return isSetAnalyzerClassName();
-    case FULL_TEXT_INDEX:
-      return isSetFullTextIndex();
-    case ALTERNATE_COLUMN_DEFINITIONS:
-      return isSetAlternateColumnDefinitions();
+    case FAMILY:
+      return isSetFamily();
+    case COLUMN_NAME:
+      return isSetColumnName();
+    case SUB_COLUMN_NAME:
+      return isSetSubColumnName();
+    case FIELD_LESS_INDEXING:
+      return isSetFieldLessIndexing();
+    case FIELD_TYPE:
+      return isSetFieldType();
+    case PROPERTIES:
+      return isSetProperties();
     }
     throw new IllegalStateException();
   }
@@ -363,30 +619,57 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
     if (that == null)
       return false;
 
-    boolean this_present_analyzerClassName = true && this.isSetAnalyzerClassName();
-    boolean that_present_analyzerClassName = true && that.isSetAnalyzerClassName();
-    if (this_present_analyzerClassName || that_present_analyzerClassName) {
-      if (!(this_present_analyzerClassName && that_present_analyzerClassName))
+    boolean this_present_family = true && this.isSetFamily();
+    boolean that_present_family = true && that.isSetFamily();
+    if (this_present_family || that_present_family) {
+      if (!(this_present_family && that_present_family))
+        return false;
+      if (!this.family.equals(that.family))
+        return false;
+    }
+
+    boolean this_present_columnName = true && this.isSetColumnName();
+    boolean that_present_columnName = true && that.isSetColumnName();
+    if (this_present_columnName || that_present_columnName) {
+      if (!(this_present_columnName && that_present_columnName))
+        return false;
+      if (!this.columnName.equals(that.columnName))
+        return false;
+    }
+
+    boolean this_present_subColumnName = true && this.isSetSubColumnName();
+    boolean that_present_subColumnName = true && that.isSetSubColumnName();
+    if (this_present_subColumnName || that_present_subColumnName) {
+      if (!(this_present_subColumnName && that_present_subColumnName))
+        return false;
+      if (!this.subColumnName.equals(that.subColumnName))
+        return false;
+    }
+
+    boolean this_present_fieldLessIndexing = true;
+    boolean that_present_fieldLessIndexing = true;
+    if (this_present_fieldLessIndexing || that_present_fieldLessIndexing) {
+      if (!(this_present_fieldLessIndexing && that_present_fieldLessIndexing))
         return false;
-      if (!this.analyzerClassName.equals(that.analyzerClassName))
+      if (this.fieldLessIndexing != that.fieldLessIndexing)
         return false;
     }
 
-    boolean this_present_fullTextIndex = true;
-    boolean that_present_fullTextIndex = true;
-    if (this_present_fullTextIndex || that_present_fullTextIndex) {
-      if (!(this_present_fullTextIndex && that_present_fullTextIndex))
+    boolean this_present_fieldType = true && this.isSetFieldType();
+    boolean that_present_fieldType = true && that.isSetFieldType();
+    if (this_present_fieldType || that_present_fieldType) {
+      if (!(this_present_fieldType && that_present_fieldType))
         return false;
-      if (this.fullTextIndex != that.fullTextIndex)
+      if (!this.fieldType.equals(that.fieldType))
         return false;
     }
 
-    boolean this_present_alternateColumnDefinitions = true && this.isSetAlternateColumnDefinitions();
-    boolean that_present_alternateColumnDefinitions = true && that.isSetAlternateColumnDefinitions();
-    if (this_present_alternateColumnDefinitions || that_present_alternateColumnDefinitions) {
-      if (!(this_present_alternateColumnDefinitions && that_present_alternateColumnDefinitions))
+    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.alternateColumnDefinitions.equals(that.alternateColumnDefinitions))
+      if (!this.properties.equals(that.properties))
         return false;
     }
 
@@ -406,32 +689,62 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
     int lastComparison = 0;
     ColumnDefinition typedOther = (ColumnDefinition)other;
 
-    lastComparison = Boolean.valueOf(isSetAnalyzerClassName()).compareTo(typedOther.isSetAnalyzerClassName());
+    lastComparison = Boolean.valueOf(isSetFamily()).compareTo(typedOther.isSetFamily());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetFamily()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.family, typedOther.family);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetColumnName()).compareTo(typedOther.isSetColumnName());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetAnalyzerClassName()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.analyzerClassName, typedOther.analyzerClassName);
+    if (isSetColumnName()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.columnName, typedOther.columnName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFullTextIndex()).compareTo(typedOther.isSetFullTextIndex());
+    lastComparison = Boolean.valueOf(isSetSubColumnName()).compareTo(typedOther.isSetSubColumnName());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetFullTextIndex()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.fullTextIndex, typedOther.fullTextIndex);
+    if (isSetSubColumnName()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.subColumnName, typedOther.subColumnName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAlternateColumnDefinitions()).compareTo(typedOther.isSetAlternateColumnDefinitions());
+    lastComparison = Boolean.valueOf(isSetFieldLessIndexing()).compareTo(typedOther.isSetFieldLessIndexing());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetAlternateColumnDefinitions()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.alternateColumnDefinitions, typedOther.alternateColumnDefinitions);
+    if (isSetFieldLessIndexing()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.fieldLessIndexing, typedOther.fieldLessIndexing);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetFieldType()).compareTo(typedOther.isSetFieldType());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetFieldType()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.fieldType, typedOther.fieldType);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetProperties()).compareTo(typedOther.isSetProperties());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetProperties()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.properties, typedOther.properties);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -456,23 +769,47 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
     StringBuilder sb = new StringBuilder("ColumnDefinition(");
     boolean first = true;
 
-    sb.append("analyzerClassName:");
-    if (this.analyzerClassName == null) {
+    sb.append("family:");
+    if (this.family == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.family);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("columnName:");
+    if (this.columnName == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.columnName);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("subColumnName:");
+    if (this.subColumnName == null) {
       sb.append("null");
     } else {
-      sb.append(this.analyzerClassName);
+      sb.append(this.subColumnName);
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("fullTextIndex:");
-    sb.append(this.fullTextIndex);
+    sb.append("fieldLessIndexing:");
+    sb.append(this.fieldLessIndexing);
     first = false;
     if (!first) sb.append(", ");
-    sb.append("alternateColumnDefinitions:");
-    if (this.alternateColumnDefinitions == null) {
+    sb.append("fieldType:");
+    if (this.fieldType == null) {
       sb.append("null");
     } else {
-      sb.append(this.alternateColumnDefinitions);
+      sb.append(this.fieldType);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("properties:");
+    if (this.properties == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.properties);
     }
     first = false;
     sb.append(")");
@@ -520,39 +857,62 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
           break;
         }
         switch (schemeField.id) {
-          case 1: // ANALYZER_CLASS_NAME
+          case 1: // FAMILY
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) {
+              struct.family = iprot.readString();
+              struct.setFamilyIsSet(true);
+            } else { 
+              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // COLUMN_NAME
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) {
-              struct.analyzerClassName = iprot.readString();
-              struct.setAnalyzerClassNameIsSet(true);
+              struct.columnName = iprot.readString();
+              struct.setColumnNameIsSet(true);
             } else { 
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 2: // FULL_TEXT_INDEX
+          case 3: // SUB_COLUMN_NAME
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) {
+              struct.subColumnName = iprot.readString();
+              struct.setSubColumnNameIsSet(true);
+            } else { 
+              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 4: // FIELD_LESS_INDEXING
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL) {
-              struct.fullTextIndex = iprot.readBool();
-              struct.setFullTextIndexIsSet(true);
+              struct.fieldLessIndexing = iprot.readBool();
+              struct.setFieldLessIndexingIsSet(true);
+            } else { 
+              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 5: // FIELD_TYPE
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) {
+              struct.fieldType = iprot.readString();
+              struct.setFieldTypeIsSet(true);
             } else { 
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 3: // ALTERNATE_COLUMN_DEFINITIONS
+          case 6: // PROPERTIES
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map120 = iprot.readMapBegin();
-                struct.alternateColumnDefinitions = new HashMap<String,AlternateColumnDefinition>(2*_map120.size);
-                for (int _i121 = 0; _i121 < _map120.size; ++_i121)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map186 = iprot.readMapBegin();
+                struct.properties = new HashMap<String,String>(2*_map186.size);
+                for (int _i187 = 0; _i187 < _map186.size; ++_i187)
                 {
-                  String _key122; // required
-                  AlternateColumnDefinition _val123; // optional
-                  _key122 = iprot.readString();
-                  _val123 = new AlternateColumnDefinition();
-                  _val123.read(iprot);
-                  struct.alternateColumnDefinitions.put(_key122, _val123);
+                  String _key188; // required
+                  String _val189; // optional
+                  _key188 = iprot.readString();
+                  _val189 = iprot.readString();
+                  struct.properties.put(_key188, _val189);
                 }
                 iprot.readMapEnd();
               }
-              struct.setAlternateColumnDefinitionsIsSet(true);
+              struct.setPropertiesIsSet(true);
             } else { 
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -572,22 +932,37 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.analyzerClassName != null) {
-        oprot.writeFieldBegin(ANALYZER_CLASS_NAME_FIELD_DESC);
-        oprot.writeString(struct.analyzerClassName);
+      if (struct.family != null) {
+        oprot.writeFieldBegin(FAMILY_FIELD_DESC);
+        oprot.writeString(struct.family);
+        oprot.writeFieldEnd();
+      }
+      if (struct.columnName != null) {
+        oprot.writeFieldBegin(COLUMN_NAME_FIELD_DESC);
+        oprot.writeString(struct.columnName);
+        oprot.writeFieldEnd();
+      }
+      if (struct.subColumnName != null) {
+        oprot.writeFieldBegin(SUB_COLUMN_NAME_FIELD_DESC);
+        oprot.writeString(struct.subColumnName);
         oprot.writeFieldEnd();
       }
-      oprot.writeFieldBegin(FULL_TEXT_INDEX_FIELD_DESC);
-      oprot.writeBool(struct.fullTextIndex);
+      oprot.writeFieldBegin(FIELD_LESS_INDEXING_FIELD_DESC);
+      oprot.writeBool(struct.fieldLessIndexing);
       oprot.writeFieldEnd();
-      if (struct.alternateColumnDefinitions != null) {
-        oprot.writeFieldBegin(ALTERNATE_COLUMN_DEFINITIONS_FIELD_DESC);
+      if (struct.fieldType != null) {
+        oprot.writeFieldBegin(FIELD_TYPE_FIELD_DESC);
+        oprot.writeString(struct.fieldType);
+        oprot.writeFieldEnd();
+      }
+      if (struct.properties != null) {
+        oprot.writeFieldBegin(PROPERTIES_FIELD_DESC);
         {
-          oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, struct.alternateColumnDefinitions.size()));
-          for (Map.Entry<String, AlternateColumnDefinition> _iter124 : struct.alternateColumnDefinitions.entrySet())
+          oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, struct.properties.size()));
+          for (Map.Entry<String, String> _iter190 : struct.properties.entrySet())
           {
-            oprot.writeString(_iter124.getKey());
-            _iter124.getValue().write(oprot);
+            oprot.writeString(_iter190.getKey());
+            oprot.writeString(_iter190.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -611,29 +986,47 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
     public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, ColumnDefinition struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       TTupleProtocol oprot = (TTupleProtocol) prot;
       BitSet optionals = new BitSet();
-      if (struct.isSetAnalyzerClassName()) {
+      if (struct.isSetFamily()) {
         optionals.set(0);
       }
-      if (struct.isSetFullTextIndex()) {
+      if (struct.isSetColumnName()) {
         optionals.set(1);
       }
-      if (struct.isSetAlternateColumnDefinitions()) {
+      if (struct.isSetSubColumnName()) {
         optionals.set(2);
       }
-      oprot.writeBitSet(optionals, 3);
-      if (struct.isSetAnalyzerClassName()) {
-        oprot.writeString(struct.analyzerClassName);
+      if (struct.isSetFieldLessIndexing()) {
+        optionals.set(3);
+      }
+      if (struct.isSetFieldType()) {
+        optionals.set(4);
+      }
+      if (struct.isSetProperties()) {
+        optionals.set(5);
+      }
+      oprot.writeBitSet(optionals, 6);
+      if (struct.isSetFamily()) {
+        oprot.writeString(struct.family);
+      }
+      if (struct.isSetColumnName()) {
+        oprot.writeString(struct.columnName);
       }
-      if (struct.isSetFullTextIndex()) {
-        oprot.writeBool(struct.fullTextIndex);
+      if (struct.isSetSubColumnName()) {
+        oprot.writeString(struct.subColumnName);
       }
-      if (struct.isSetAlternateColumnDefinitions()) {
+      if (struct.isSetFieldLessIndexing()) {
+        oprot.writeBool(struct.fieldLessIndexing);
+      }
+      if (struct.isSetFieldType()) {
+        oprot.writeString(struct.fieldType);
+      }
+      if (struct.isSetProperties()) {
         {
-          oprot.writeI32(struct.alternateColumnDefinitions.size());
-          for (Map.Entry<String, AlternateColumnDefinition> _iter125 : struct.alternateColumnDefinitions.entrySet())
+          oprot.writeI32(struct.properties.size());
+          for (Map.Entry<String, String> _iter191 : struct.properties.entrySet())
           {
-            oprot.writeString(_iter125.getKey());
-            _iter125.getValue().write(oprot);
+            oprot.writeString(_iter191.getKey());
+            oprot.writeString(_iter191.getValue());
           }
         }
       }
@@ -642,30 +1035,41 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
     @Override
     public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, ColumnDefinition struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      BitSet incoming = iprot.readBitSet(6);
       if (incoming.get(0)) {
-        struct.analyzerClassName = iprot.readString();
-        struct.setAnalyzerClassNameIsSet(true);
+        struct.family = iprot.readString();
+        struct.setFamilyIsSet(true);
       }
       if (incoming.get(1)) {
-        struct.fullTextIndex = iprot.readBool();
-        struct.setFullTextIndexIsSet(true);
+        struct.columnName = iprot.readString();
+        struct.setColumnNameIsSet(true);
       }
       if (incoming.get(2)) {
+        struct.subColumnName = iprot.readString();
+        struct.setSubColumnNameIsSet(true);
+      }
+      if (incoming.get(3)) {
+        struct.fieldLessIndexing = iprot.readBool();
+        struct.setFieldLessIndexingIsSet(true);
+      }
+      if (incoming.get(4)) {
+        struct.fieldType = iprot.readString();
+        struct.setFieldTypeIsSet(true);
+      }
+      if (incoming.get(5)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map126 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
-          struct.alternateColumnDefinitions = new HashMap<String,AlternateColumnDefinition>(2*_map126.size);
-          for (int _i127 = 0; _i127 < _map126.size; ++_i127)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map192 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
+          struct.properties = new HashMap<String,String>(2*_map192.size);
+          for (int _i193 = 0; _i193 < _map192.size; ++_i193)
           {
-            String _key128; // required
-            AlternateColumnDefinition _val129; // optional
-            _key128 = iprot.readString();
-            _val129 = new AlternateColumnDefinition();
-            _val129.read(iprot);
-            struct.alternateColumnDefinitions.put(_key128, _val129);
+            String _key194; // required
+            String _val195; // optional
+            _key194 = iprot.readString();
+            _val195 = iprot.readString();
+            struct.properties.put(_key194, _val195);
           }
         }
-        struct.setAlternateColumnDefinitionsIsSet(true);
+        struct.setPropertiesIsSet(true);
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d0b113eb/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnFamilyDefinition.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnFamilyDefinition.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnFamilyDefinition.java
deleted file mode 100644
index 6ab4b21..0000000
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnFamilyDefinition.java
+++ /dev/null
@@ -1,602 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.blur.thrift.generated;
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-import org.apache.blur.thirdparty.thrift_0_9_0.scheme.IScheme;
-import org.apache.blur.thirdparty.thrift_0_9_0.scheme.SchemeFactory;
-import org.apache.blur.thirdparty.thrift_0_9_0.scheme.StandardScheme;
-
-import org.apache.blur.thirdparty.thrift_0_9_0.scheme.TupleScheme;
-import org.apache.blur.thirdparty.thrift_0_9_0.protocol.TTupleProtocol;
-import org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolException;
-import org.apache.blur.thirdparty.thrift_0_9_0.EncodingUtils;
-import org.apache.blur.thirdparty.thrift_0_9_0.TException;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-
-/**
- * 
- */
-public class ColumnFamilyDefinition implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<ColumnFamilyDefinition, ColumnFamilyDefinition._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct STRUCT_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct("ColumnFamilyDefinition");
-
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField DEFAULT_DEFINITION_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("defaultDefinition", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COLUMN_DEFINITIONS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("columnDefinitions", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, (short)2);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ColumnFamilyDefinitionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ColumnFamilyDefinitionTupleSchemeFactory());
-  }
-
-  /**
-   * 
-   */
-  public ColumnDefinition defaultDefinition; // required
-  /**
-   * 
-   */
-  public Map<String,ColumnDefinition> columnDefinitions; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.blur.thirdparty.thrift_0_9_0.TFieldIdEnum {
-    /**
-     * 
-     */
-    DEFAULT_DEFINITION((short)1, "defaultDefinition"),
-    /**
-     * 
-     */
-    COLUMN_DEFINITIONS((short)2, "columnDefinitions");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // DEFAULT_DEFINITION
-          return DEFAULT_DEFINITION;
-        case 2: // COLUMN_DEFINITIONS
-          return COLUMN_DEFINITIONS;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.DEFAULT_DEFINITION, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("defaultDefinition", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
-        new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, ColumnDefinition.class)));
-    tmpMap.put(_Fields.COLUMN_DEFINITIONS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("columnDefinitions", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
-        new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.MapMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, 
-            new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING), 
-            new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, ColumnDefinition.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(ColumnFamilyDefinition.class, metaDataMap);
-  }
-
-  public ColumnFamilyDefinition() {
-  }
-
-  public ColumnFamilyDefinition(
-    ColumnDefinition defaultDefinition,
-    Map<String,ColumnDefinition> columnDefinitions)
-  {
-    this();
-    this.defaultDefinition = defaultDefinition;
-    this.columnDefinitions = columnDefinitions;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ColumnFamilyDefinition(ColumnFamilyDefinition other) {
-    if (other.isSetDefaultDefinition()) {
-      this.defaultDefinition = new ColumnDefinition(other.defaultDefinition);
-    }
-    if (other.isSetColumnDefinitions()) {
-      Map<String,ColumnDefinition> __this__columnDefinitions = new HashMap<String,ColumnDefinition>();
-      for (Map.Entry<String, ColumnDefinition> other_element : other.columnDefinitions.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        ColumnDefinition other_element_value = other_element.getValue();
-
-        String __this__columnDefinitions_copy_key = other_element_key;
-
-        ColumnDefinition __this__columnDefinitions_copy_value = new ColumnDefinition(other_element_value);
-
-        __this__columnDefinitions.put(__this__columnDefinitions_copy_key, __this__columnDefinitions_copy_value);
-      }
-      this.columnDefinitions = __this__columnDefinitions;
-    }
-  }
-
-  public ColumnFamilyDefinition deepCopy() {
-    return new ColumnFamilyDefinition(this);
-  }
-
-  @Override
-  public void clear() {
-    this.defaultDefinition = null;
-    this.columnDefinitions = null;
-  }
-
-  /**
-   * 
-   */
-  public ColumnDefinition getDefaultDefinition() {
-    return this.defaultDefinition;
-  }
-
-  /**
-   * 
-   */
-  public ColumnFamilyDefinition setDefaultDefinition(ColumnDefinition defaultDefinition) {
-    this.defaultDefinition = defaultDefinition;
-    return this;
-  }
-
-  public void unsetDefaultDefinition() {
-    this.defaultDefinition = null;
-  }
-
-  /** Returns true if field defaultDefinition is set (has been assigned a value) and false otherwise */
-  public boolean isSetDefaultDefinition() {
-    return this.defaultDefinition != null;
-  }
-
-  public void setDefaultDefinitionIsSet(boolean value) {
-    if (!value) {
-      this.defaultDefinition = null;
-    }
-  }
-
-  public int getColumnDefinitionsSize() {
-    return (this.columnDefinitions == null) ? 0 : this.columnDefinitions.size();
-  }
-
-  public void putToColumnDefinitions(String key, ColumnDefinition val) {
-    if (this.columnDefinitions == null) {
-      this.columnDefinitions = new HashMap<String,ColumnDefinition>();
-    }
-    this.columnDefinitions.put(key, val);
-  }
-
-  /**
-   * 
-   */
-  public Map<String,ColumnDefinition> getColumnDefinitions() {
-    return this.columnDefinitions;
-  }
-
-  /**
-   * 
-   */
-  public ColumnFamilyDefinition setColumnDefinitions(Map<String,ColumnDefinition> columnDefinitions) {
-    this.columnDefinitions = columnDefinitions;
-    return this;
-  }
-
-  public void unsetColumnDefinitions() {
-    this.columnDefinitions = null;
-  }
-
-  /** Returns true if field columnDefinitions is set (has been assigned a value) and false otherwise */
-  public boolean isSetColumnDefinitions() {
-    return this.columnDefinitions != null;
-  }
-
-  public void setColumnDefinitionsIsSet(boolean value) {
-    if (!value) {
-      this.columnDefinitions = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case DEFAULT_DEFINITION:
-      if (value == null) {
-        unsetDefaultDefinition();
-      } else {
-        setDefaultDefinition((ColumnDefinition)value);
-      }
-      break;
-
-    case COLUMN_DEFINITIONS:
-      if (value == null) {
-        unsetColumnDefinitions();
-      } else {
-        setColumnDefinitions((Map<String,ColumnDefinition>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case DEFAULT_DEFINITION:
-      return getDefaultDefinition();
-
-    case COLUMN_DEFINITIONS:
-      return getColumnDefinitions();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case DEFAULT_DEFINITION:
-      return isSetDefaultDefinition();
-    case COLUMN_DEFINITIONS:
-      return isSetColumnDefinitions();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ColumnFamilyDefinition)
-      return this.equals((ColumnFamilyDefinition)that);
-    return false;
-  }
-
-  public boolean equals(ColumnFamilyDefinition that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_defaultDefinition = true && this.isSetDefaultDefinition();
-    boolean that_present_defaultDefinition = true && that.isSetDefaultDefinition();
-    if (this_present_defaultDefinition || that_present_defaultDefinition) {
-      if (!(this_present_defaultDefinition && that_present_defaultDefinition))
-        return false;
-      if (!this.defaultDefinition.equals(that.defaultDefinition))
-        return false;
-    }
-
-    boolean this_present_columnDefinitions = true && this.isSetColumnDefinitions();
-    boolean that_present_columnDefinitions = true && that.isSetColumnDefinitions();
-    if (this_present_columnDefinitions || that_present_columnDefinitions) {
-      if (!(this_present_columnDefinitions && that_present_columnDefinitions))
-        return false;
-      if (!this.columnDefinitions.equals(that.columnDefinitions))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(ColumnFamilyDefinition other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    ColumnFamilyDefinition typedOther = (ColumnFamilyDefinition)other;
-
-    lastComparison = Boolean.valueOf(isSetDefaultDefinition()).compareTo(typedOther.isSetDefaultDefinition());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDefaultDefinition()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.defaultDefinition, typedOther.defaultDefinition);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetColumnDefinitions()).compareTo(typedOther.isSetColumnDefinitions());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetColumnDefinitions()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.columnDefinitions, typedOther.columnDefinitions);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol iprot) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol oprot) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ColumnFamilyDefinition(");
-    boolean first = true;
-
-    sb.append("defaultDefinition:");
-    if (this.defaultDefinition == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.defaultDefinition);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("columnDefinitions:");
-    if (this.columnDefinitions == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.columnDefinitions);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-    // check for required fields
-    // check for sub-struct validity
-    if (defaultDefinition != null) {
-      defaultDefinition.validate();
-    }
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TCompactProtocol(new org.apache.blur.thirdparty.thrift_0_9_0.transport.TIOStreamTransport(out)));
-    } catch (org.apache.blur.thirdparty.thrift_0_9_0.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.blur.thirdparty.thrift_0_9_0.protocol.TCompactProtocol(new org.apache.blur.thirdparty.thrift_0_9_0.transport.TIOStreamTransport(in)));
-    } catch (org.apache.blur.thirdparty.thrift_0_9_0.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class ColumnFamilyDefinitionStandardSchemeFactory implements SchemeFactory {
-    public ColumnFamilyDefinitionStandardScheme getScheme() {
-      return new ColumnFamilyDefinitionStandardScheme();
-    }
-  }
-
-  private static class ColumnFamilyDefinitionStandardScheme extends StandardScheme<ColumnFamilyDefinition> {
-
-    public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol iprot, ColumnFamilyDefinition struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-      org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // DEFAULT_DEFINITION
-            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT) {
-              struct.defaultDefinition = new ColumnDefinition();
-              struct.defaultDefinition.read(iprot);
-              struct.setDefaultDefinitionIsSet(true);
-            } else { 
-              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // COLUMN_DEFINITIONS
-            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
-              {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map130 = iprot.readMapBegin();
-                struct.columnDefinitions = new HashMap<String,ColumnDefinition>(2*_map130.size);
-                for (int _i131 = 0; _i131 < _map130.size; ++_i131)
-                {
-                  String _key132; // required
-                  ColumnDefinition _val133; // optional
-                  _key132 = iprot.readString();
-                  _val133 = new ColumnDefinition();
-                  _val133.read(iprot);
-                  struct.columnDefinitions.put(_key132, _val133);
-                }
-                iprot.readMapEnd();
-              }
-              struct.setColumnDefinitionsIsSet(true);
-            } else { 
-              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      struct.validate();
-    }
-
-    public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol oprot, ColumnFamilyDefinition struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.defaultDefinition != null) {
-        oprot.writeFieldBegin(DEFAULT_DEFINITION_FIELD_DESC);
-        struct.defaultDefinition.write(oprot);
-        oprot.writeFieldEnd();
-      }
-      if (struct.columnDefinitions != null) {
-        oprot.writeFieldBegin(COLUMN_DEFINITIONS_FIELD_DESC);
-        {
-          oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, struct.columnDefinitions.size()));
-          for (Map.Entry<String, ColumnDefinition> _iter134 : struct.columnDefinitions.entrySet())
-          {
-            oprot.writeString(_iter134.getKey());
-            _iter134.getValue().write(oprot);
-          }
-          oprot.writeMapEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ColumnFamilyDefinitionTupleSchemeFactory implements SchemeFactory {
-    public ColumnFamilyDefinitionTupleScheme getScheme() {
-      return new ColumnFamilyDefinitionTupleScheme();
-    }
-  }
-
-  private static class ColumnFamilyDefinitionTupleScheme extends TupleScheme<ColumnFamilyDefinition> {
-
-    @Override
-    public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, ColumnFamilyDefinition struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetDefaultDefinition()) {
-        optionals.set(0);
-      }
-      if (struct.isSetColumnDefinitions()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetDefaultDefinition()) {
-        struct.defaultDefinition.write(oprot);
-      }
-      if (struct.isSetColumnDefinitions()) {
-        {
-          oprot.writeI32(struct.columnDefinitions.size());
-          for (Map.Entry<String, ColumnDefinition> _iter135 : struct.columnDefinitions.entrySet())
-          {
-            oprot.writeString(_iter135.getKey());
-            _iter135.getValue().write(oprot);
-          }
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, ColumnFamilyDefinition struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.defaultDefinition = new ColumnDefinition();
-        struct.defaultDefinition.read(iprot);
-        struct.setDefaultDefinitionIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map136 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
-          struct.columnDefinitions = new HashMap<String,ColumnDefinition>(2*_map136.size);
-          for (int _i137 = 0; _i137 < _map136.size; ++_i137)
-          {
-            String _key138; // required
-            ColumnDefinition _val139; // optional
-            _key138 = iprot.readString();
-            _val139 = new ColumnDefinition();
-            _val139.read(iprot);
-            struct.columnDefinitions.put(_key138, _val139);
-          }
-        }
-        struct.setColumnDefinitionsIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d0b113eb/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnPreCache.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnPreCache.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnPreCache.java
index 5fa4570..0097fe0 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnPreCache.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnPreCache.java
@@ -373,13 +373,13 @@ public class ColumnPreCache implements org.apache.blur.thirdparty.thrift_0_9_0.T
           case 1: // PRE_CACHE_COLS
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list150 = iprot.readListBegin();
-                struct.preCacheCols = new ArrayList<String>(_list150.size);
-                for (int _i151 = 0; _i151 < _list150.size; ++_i151)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list120 = iprot.readListBegin();
+                struct.preCacheCols = new ArrayList<String>(_list120.size);
+                for (int _i121 = 0; _i121 < _list120.size; ++_i121)
                 {
-                  String _elem152; // required
-                  _elem152 = iprot.readString();
-                  struct.preCacheCols.add(_elem152);
+                  String _elem122; // required
+                  _elem122 = iprot.readString();
+                  struct.preCacheCols.add(_elem122);
                 }
                 iprot.readListEnd();
               }
@@ -407,9 +407,9 @@ public class ColumnPreCache implements org.apache.blur.thirdparty.thrift_0_9_0.T
         oprot.writeFieldBegin(PRE_CACHE_COLS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, struct.preCacheCols.size()));
-          for (String _iter153 : struct.preCacheCols)
+          for (String _iter123 : struct.preCacheCols)
           {
-            oprot.writeString(_iter153);
+            oprot.writeString(_iter123);
           }
           oprot.writeListEnd();
         }
@@ -440,9 +440,9 @@ public class ColumnPreCache implements org.apache.blur.thirdparty.thrift_0_9_0.T
       if (struct.isSetPreCacheCols()) {
         {
           oprot.writeI32(struct.preCacheCols.size());
-          for (String _iter154 : struct.preCacheCols)
+          for (String _iter124 : struct.preCacheCols)
           {
-            oprot.writeString(_iter154);
+            oprot.writeString(_iter124);
           }
         }
       }
@@ -454,13 +454,13 @@ public class ColumnPreCache implements org.apache.blur.thirdparty.thrift_0_9_0.T
       BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list155 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
-          struct.preCacheCols = new ArrayList<String>(_list155.size);
-          for (int _i156 = 0; _i156 < _list155.size; ++_i156)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list125 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
+          struct.preCacheCols = new ArrayList<String>(_list125.size);
+          for (int _i126 = 0; _i126 < _list125.size; ++_i126)
           {
-            String _elem157; // required
-            _elem157 = iprot.readString();
-            struct.preCacheCols.add(_elem157);
+            String _elem127; // required
+            _elem127 = iprot.readString();
+            struct.preCacheCols.add(_elem127);
           }
         }
         struct.setPreCacheColsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d0b113eb/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java
index ac83b9a..b864754 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java
@@ -652,15 +652,15 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
           case 2: // STR_MAP
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map186 = iprot.readMapBegin();
-                struct.strMap = new HashMap<String,String>(2*_map186.size);
-                for (int _i187 = 0; _i187 < _map186.size; ++_i187)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map156 = iprot.readMapBegin();
+                struct.strMap = new HashMap<String,String>(2*_map156.size);
+                for (int _i157 = 0; _i157 < _map156.size; ++_i157)
                 {
-                  String _key188; // required
-                  String _val189; // optional
-                  _key188 = iprot.readString();
-                  _val189 = iprot.readString();
-                  struct.strMap.put(_key188, _val189);
+                  String _key158; // required
+                  String _val159; // optional
+                  _key158 = iprot.readString();
+                  _val159 = iprot.readString();
+                  struct.strMap.put(_key158, _val159);
                 }
                 iprot.readMapEnd();
               }
@@ -672,15 +672,15 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
           case 3: // LONG_MAP
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map190 = iprot.readMapBegin();
-                struct.longMap = new HashMap<String,Long>(2*_map190.size);
-                for (int _i191 = 0; _i191 < _map190.size; ++_i191)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map160 = iprot.readMapBegin();
+                struct.longMap = new HashMap<String,Long>(2*_map160.size);
+                for (int _i161 = 0; _i161 < _map160.size; ++_i161)
                 {
-                  String _key192; // required
-                  long _val193; // optional
-                  _key192 = iprot.readString();
-                  _val193 = iprot.readI64();
-                  struct.longMap.put(_key192, _val193);
+                  String _key162; // required
+                  long _val163; // optional
+                  _key162 = iprot.readString();
+                  _val163 = iprot.readI64();
+                  struct.longMap.put(_key162, _val163);
                 }
                 iprot.readMapEnd();
               }
@@ -692,15 +692,15 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
           case 4: // DOUBLE_MAP
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map194 = iprot.readMapBegin();
-                struct.doubleMap = new HashMap<String,Double>(2*_map194.size);
-                for (int _i195 = 0; _i195 < _map194.size; ++_i195)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map164 = iprot.readMapBegin();
+                struct.doubleMap = new HashMap<String,Double>(2*_map164.size);
+                for (int _i165 = 0; _i165 < _map164.size; ++_i165)
                 {
-                  String _key196; // required
-                  double _val197; // optional
-                  _key196 = iprot.readString();
-                  _val197 = iprot.readDouble();
-                  struct.doubleMap.put(_key196, _val197);
+                  String _key166; // required
+                  double _val167; // optional
+                  _key166 = iprot.readString();
+                  _val167 = iprot.readDouble();
+                  struct.doubleMap.put(_key166, _val167);
                 }
                 iprot.readMapEnd();
               }
@@ -733,10 +733,10 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
         oprot.writeFieldBegin(STR_MAP_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, struct.strMap.size()));
-          for (Map.Entry<String, String> _iter198 : struct.strMap.entrySet())
+          for (Map.Entry<String, String> _iter168 : struct.strMap.entrySet())
           {
-            oprot.writeString(_iter198.getKey());
-            oprot.writeString(_iter198.getValue());
+            oprot.writeString(_iter168.getKey());
+            oprot.writeString(_iter168.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -746,10 +746,10 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
         oprot.writeFieldBegin(LONG_MAP_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, struct.longMap.size()));
-          for (Map.Entry<String, Long> _iter199 : struct.longMap.entrySet())
+          for (Map.Entry<String, Long> _iter169 : struct.longMap.entrySet())
           {
-            oprot.writeString(_iter199.getKey());
-            oprot.writeI64(_iter199.getValue());
+            oprot.writeString(_iter169.getKey());
+            oprot.writeI64(_iter169.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -759,10 +759,10 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
         oprot.writeFieldBegin(DOUBLE_MAP_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.DOUBLE, struct.doubleMap.size()));
-          for (Map.Entry<String, Double> _iter200 : struct.doubleMap.entrySet())
+          for (Map.Entry<String, Double> _iter170 : struct.doubleMap.entrySet())
           {
-            oprot.writeString(_iter200.getKey());
-            oprot.writeDouble(_iter200.getValue());
+            oprot.writeString(_iter170.getKey());
+            oprot.writeDouble(_iter170.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -805,30 +805,30 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
       if (struct.isSetStrMap()) {
         {
           oprot.writeI32(struct.strMap.size());
-          for (Map.Entry<String, String> _iter201 : struct.strMap.entrySet())
+          for (Map.Entry<String, String> _iter171 : struct.strMap.entrySet())
           {
-            oprot.writeString(_iter201.getKey());
-            oprot.writeString(_iter201.getValue());
+            oprot.writeString(_iter171.getKey());
+            oprot.writeString(_iter171.getValue());
           }
         }
       }
       if (struct.isSetLongMap()) {
         {
           oprot.writeI32(struct.longMap.size());
-          for (Map.Entry<String, Long> _iter202 : struct.longMap.entrySet())
+          for (Map.Entry<String, Long> _iter172 : struct.longMap.entrySet())
           {
-            oprot.writeString(_iter202.getKey());
-            oprot.writeI64(_iter202.getValue());
+            oprot.writeString(_iter172.getKey());
+            oprot.writeI64(_iter172.getValue());
           }
         }
       }
       if (struct.isSetDoubleMap()) {
         {
           oprot.writeI32(struct.doubleMap.size());
-          for (Map.Entry<String, Double> _iter203 : struct.doubleMap.entrySet())
+          for (Map.Entry<String, Double> _iter173 : struct.doubleMap.entrySet())
           {
-            oprot.writeString(_iter203.getKey());
-            oprot.writeDouble(_iter203.getValue());
+            oprot.writeString(_iter173.getKey());
+            oprot.writeDouble(_iter173.getValue());
           }
         }
       }
@@ -844,45 +844,45 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
       }
       if (incoming.get(1)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map204 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
-          struct.strMap = new HashMap<String,String>(2*_map204.size);
-          for (int _i205 = 0; _i205 < _map204.size; ++_i205)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map174 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
+          struct.strMap = new HashMap<String,String>(2*_map174.size);
+          for (int _i175 = 0; _i175 < _map174.size; ++_i175)
           {
-            String _key206; // required
-            String _val207; // optional
-            _key206 = iprot.readString();
-            _val207 = iprot.readString();
-            struct.strMap.put(_key206, _val207);
+            String _key176; // required
+            String _val177; // optional
+            _key176 = iprot.readString();
+            _val177 = iprot.readString();
+            struct.strMap.put(_key176, _val177);
           }
         }
         struct.setStrMapIsSet(true);
       }
       if (incoming.get(2)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map208 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, iprot.readI32());
-          struct.longMap = new HashMap<String,Long>(2*_map208.size);
-          for (int _i209 = 0; _i209 < _map208.size; ++_i209)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map178 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, iprot.readI32());
+          struct.longMap = new HashMap<String,Long>(2*_map178.size);
+          for (int _i179 = 0; _i179 < _map178.size; ++_i179)
           {
-            String _key210; // required
-            long _val211; // optional
-            _key210 = iprot.readString();
-            _val211 = iprot.readI64();
-            struct.longMap.put(_key210, _val211);
+            String _key180; // required
+            long _val181; // optional
+            _key180 = iprot.readString();
+            _val181 = iprot.readI64();
+            struct.longMap.put(_key180, _val181);
           }
         }
         struct.setLongMapIsSet(true);
       }
       if (incoming.get(3)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map212 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.DOUBLE, iprot.readI32());
-          struct.doubleMap = new HashMap<String,Double>(2*_map212.size);
-          for (int _i213 = 0; _i213 < _map212.size; ++_i213)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map182 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.DOUBLE, iprot.readI32());
+          struct.doubleMap = new HashMap<String,Double>(2*_map182.size);
+          for (int _i183 = 0; _i183 < _map182.size; ++_i183)
           {
-            String _key214; // required
-            double _val215; // optional
-            _key214 = iprot.readString();
-            _val215 = iprot.readDouble();
-            struct.doubleMap.put(_key214, _val215);
+            String _key184; // required
+            double _val185; // optional
+            _key184 = iprot.readString();
+            _val185 = iprot.readDouble();
+            struct.doubleMap.put(_key184, _val185);
           }
         }
         struct.setDoubleMapIsSet(true);


Mime
View raw message