incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [7/20] Generated the thrift code with new package names.
Date Mon, 03 Sep 2012 16:06:56 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c9a4a8eb/interface/gen-java/com/nearinfinity/blur/thrift/generated/ColumnDefinition.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/com/nearinfinity/blur/thrift/generated/ColumnDefinition.java b/interface/gen-java/com/nearinfinity/blur/thrift/generated/ColumnDefinition.java
deleted file mode 100644
index 8e182ae..0000000
--- a/interface/gen-java/com/nearinfinity/blur/thrift/generated/ColumnDefinition.java
+++ /dev/null
@@ -1,549 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.7.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- */
-package com.nearinfinity.blur.thrift.generated;
-
-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 ColumnDefinition implements org.apache.thrift.TBase<ColumnDefinition, ColumnDefinition._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnDefinition");
-
-  private static final org.apache.thrift.protocol.TField ANALYZER_CLASS_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("analyzerClassName", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField FULL_TEXT_INDEX_FIELD_DESC = new org.apache.thrift.protocol.TField("fullTextIndex", org.apache.thrift.protocol.TType.BOOL, (short)2);
-  private static final org.apache.thrift.protocol.TField ALTERNATE_COLUMN_DEFINITIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("alternateColumnDefinitions", org.apache.thrift.protocol.TType.MAP, (short)3);
-
-  public String analyzerClassName; // required
-  public boolean fullTextIndex; // required
-  public Map<String,AlternateColumnDefinition> alternateColumnDefinitions; // 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 {
-    ANALYZER_CLASS_NAME((short)1, "analyzerClassName"),
-    FULL_TEXT_INDEX((short)2, "fullTextIndex"),
-    ALTERNATE_COLUMN_DEFINITIONS((short)3, "alternateColumnDefinitions");
-
-    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: // 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;
-        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
-  private static final int __FULLTEXTINDEX_ISSET_ID = 0;
-  private BitSet __isset_bit_vector = new BitSet(1);
-
-  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.ANALYZER_CLASS_NAME, new org.apache.thrift.meta_data.FieldMetaData("analyzerClassName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.FULL_TEXT_INDEX, new org.apache.thrift.meta_data.FieldMetaData("fullTextIndex", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.ALTERNATE_COLUMN_DEFINITIONS, new org.apache.thrift.meta_data.FieldMetaData("alternateColumnDefinitions", 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.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AlternateColumnDefinition.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ColumnDefinition.class, metaDataMap);
-  }
-
-  public ColumnDefinition() {
-    this.analyzerClassName = "org.apache.lucene.analysis.standard.StandardAnalyzer";
-
-  }
-
-  public ColumnDefinition(
-    String analyzerClassName,
-    boolean fullTextIndex,
-    Map<String,AlternateColumnDefinition> alternateColumnDefinitions)
-  {
-    this();
-    this.analyzerClassName = analyzerClassName;
-    this.fullTextIndex = fullTextIndex;
-    setFullTextIndexIsSet(true);
-    this.alternateColumnDefinitions = alternateColumnDefinitions;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ColumnDefinition(ColumnDefinition other) {
-    __isset_bit_vector.clear();
-    __isset_bit_vector.or(other.__isset_bit_vector);
-    if (other.isSetAnalyzerClassName()) {
-      this.analyzerClassName = other.analyzerClassName;
-    }
-    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()) {
-
-        String other_element_key = other_element.getKey();
-        AlternateColumnDefinition other_element_value = other_element.getValue();
-
-        String __this__alternateColumnDefinitions_copy_key = other_element_key;
-
-        AlternateColumnDefinition __this__alternateColumnDefinitions_copy_value = new AlternateColumnDefinition(other_element_value);
-
-        __this__alternateColumnDefinitions.put(__this__alternateColumnDefinitions_copy_key, __this__alternateColumnDefinitions_copy_value);
-      }
-      this.alternateColumnDefinitions = __this__alternateColumnDefinitions;
-    }
-  }
-
-  public ColumnDefinition deepCopy() {
-    return new ColumnDefinition(this);
-  }
-
-  @Override
-  public void clear() {
-    this.analyzerClassName = "org.apache.lucene.analysis.standard.StandardAnalyzer";
-
-    setFullTextIndexIsSet(false);
-    this.fullTextIndex = false;
-    this.alternateColumnDefinitions = null;
-  }
-
-  public String getAnalyzerClassName() {
-    return this.analyzerClassName;
-  }
-
-  public ColumnDefinition setAnalyzerClassName(String analyzerClassName) {
-    this.analyzerClassName = analyzerClassName;
-    return this;
-  }
-
-  public void unsetAnalyzerClassName() {
-    this.analyzerClassName = null;
-  }
-
-  /** Returns true if field analyzerClassName is set (has been assigned a value) and false otherwise */
-  public boolean isSetAnalyzerClassName() {
-    return this.analyzerClassName != null;
-  }
-
-  public void setAnalyzerClassNameIsSet(boolean value) {
-    if (!value) {
-      this.analyzerClassName = null;
-    }
-  }
-
-  public boolean isFullTextIndex() {
-    return this.fullTextIndex;
-  }
-
-  public ColumnDefinition setFullTextIndex(boolean fullTextIndex) {
-    this.fullTextIndex = fullTextIndex;
-    setFullTextIndexIsSet(true);
-    return this;
-  }
-
-  public void unsetFullTextIndex() {
-    __isset_bit_vector.clear(__FULLTEXTINDEX_ISSET_ID);
-  }
-
-  /** Returns true if field fullTextIndex is set (has been assigned a value) and false otherwise */
-  public boolean isSetFullTextIndex() {
-    return __isset_bit_vector.get(__FULLTEXTINDEX_ISSET_ID);
-  }
-
-  public void setFullTextIndexIsSet(boolean value) {
-    __isset_bit_vector.set(__FULLTEXTINDEX_ISSET_ID, value);
-  }
-
-  public int getAlternateColumnDefinitionsSize() {
-    return (this.alternateColumnDefinitions == null) ? 0 : this.alternateColumnDefinitions.size();
-  }
-
-  public void putToAlternateColumnDefinitions(String key, AlternateColumnDefinition val) {
-    if (this.alternateColumnDefinitions == null) {
-      this.alternateColumnDefinitions = new HashMap<String,AlternateColumnDefinition>();
-    }
-    this.alternateColumnDefinitions.put(key, val);
-  }
-
-  public Map<String,AlternateColumnDefinition> getAlternateColumnDefinitions() {
-    return this.alternateColumnDefinitions;
-  }
-
-  public ColumnDefinition setAlternateColumnDefinitions(Map<String,AlternateColumnDefinition> alternateColumnDefinitions) {
-    this.alternateColumnDefinitions = alternateColumnDefinitions;
-    return this;
-  }
-
-  public void unsetAlternateColumnDefinitions() {
-    this.alternateColumnDefinitions = null;
-  }
-
-  /** Returns true if field alternateColumnDefinitions is set (has been assigned a value) and false otherwise */
-  public boolean isSetAlternateColumnDefinitions() {
-    return this.alternateColumnDefinitions != null;
-  }
-
-  public void setAlternateColumnDefinitionsIsSet(boolean value) {
-    if (!value) {
-      this.alternateColumnDefinitions = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case ANALYZER_CLASS_NAME:
-      if (value == null) {
-        unsetAnalyzerClassName();
-      } else {
-        setAnalyzerClassName((String)value);
-      }
-      break;
-
-    case FULL_TEXT_INDEX:
-      if (value == null) {
-        unsetFullTextIndex();
-      } else {
-        setFullTextIndex((Boolean)value);
-      }
-      break;
-
-    case ALTERNATE_COLUMN_DEFINITIONS:
-      if (value == null) {
-        unsetAlternateColumnDefinitions();
-      } else {
-        setAlternateColumnDefinitions((Map<String,AlternateColumnDefinition>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case ANALYZER_CLASS_NAME:
-      return getAnalyzerClassName();
-
-    case FULL_TEXT_INDEX:
-      return Boolean.valueOf(isFullTextIndex());
-
-    case ALTERNATE_COLUMN_DEFINITIONS:
-      return getAlternateColumnDefinitions();
-
-    }
-    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 ANALYZER_CLASS_NAME:
-      return isSetAnalyzerClassName();
-    case FULL_TEXT_INDEX:
-      return isSetFullTextIndex();
-    case ALTERNATE_COLUMN_DEFINITIONS:
-      return isSetAlternateColumnDefinitions();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ColumnDefinition)
-      return this.equals((ColumnDefinition)that);
-    return false;
-  }
-
-  public boolean equals(ColumnDefinition that) {
-    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))
-        return false;
-      if (!this.analyzerClassName.equals(that.analyzerClassName))
-        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))
-        return false;
-      if (this.fullTextIndex != that.fullTextIndex)
-        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))
-        return false;
-      if (!this.alternateColumnDefinitions.equals(that.alternateColumnDefinitions))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(ColumnDefinition other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    ColumnDefinition typedOther = (ColumnDefinition)other;
-
-    lastComparison = Boolean.valueOf(isSetAnalyzerClassName()).compareTo(typedOther.isSetAnalyzerClassName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetAnalyzerClassName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.analyzerClassName, typedOther.analyzerClassName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetFullTextIndex()).compareTo(typedOther.isSetFullTextIndex());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetFullTextIndex()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fullTextIndex, typedOther.fullTextIndex);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetAlternateColumnDefinitions()).compareTo(typedOther.isSetAlternateColumnDefinitions());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetAlternateColumnDefinitions()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.alternateColumnDefinitions, typedOther.alternateColumnDefinitions);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // ANALYZER_CLASS_NAME
-          if (field.type == org.apache.thrift.protocol.TType.STRING) {
-            this.analyzerClassName = iprot.readString();
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2: // FULL_TEXT_INDEX
-          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
-            this.fullTextIndex = iprot.readBool();
-            setFullTextIndexIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 3: // ALTERNATE_COLUMN_DEFINITIONS
-          if (field.type == org.apache.thrift.protocol.TType.MAP) {
-            {
-              org.apache.thrift.protocol.TMap _map60 = iprot.readMapBegin();
-              this.alternateColumnDefinitions = new HashMap<String,AlternateColumnDefinition>(2*_map60.size);
-              for (int _i61 = 0; _i61 < _map60.size; ++_i61)
-              {
-                String _key62; // required
-                AlternateColumnDefinition _val63; // required
-                _key62 = iprot.readString();
-                _val63 = new AlternateColumnDefinition();
-                _val63.read(iprot);
-                this.alternateColumnDefinitions.put(_key62, _val63);
-              }
-              iprot.readMapEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-
-    // check for required fields of primitive type, which can't be checked in the validate method
-    validate();
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    if (this.analyzerClassName != null) {
-      oprot.writeFieldBegin(ANALYZER_CLASS_NAME_FIELD_DESC);
-      oprot.writeString(this.analyzerClassName);
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldBegin(FULL_TEXT_INDEX_FIELD_DESC);
-    oprot.writeBool(this.fullTextIndex);
-    oprot.writeFieldEnd();
-    if (this.alternateColumnDefinitions != null) {
-      oprot.writeFieldBegin(ALTERNATE_COLUMN_DEFINITIONS_FIELD_DESC);
-      {
-        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.alternateColumnDefinitions.size()));
-        for (Map.Entry<String, AlternateColumnDefinition> _iter64 : this.alternateColumnDefinitions.entrySet())
-        {
-          oprot.writeString(_iter64.getKey());
-          _iter64.getValue().write(oprot);
-        }
-        oprot.writeMapEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ColumnDefinition(");
-    boolean first = true;
-
-    sb.append("analyzerClassName:");
-    if (this.analyzerClassName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.analyzerClassName);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("fullTextIndex:");
-    sb.append(this.fullTextIndex);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("alternateColumnDefinitions:");
-    if (this.alternateColumnDefinitions == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.alternateColumnDefinitions);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bit_vector = new BitSet(1);
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c9a4a8eb/interface/gen-java/com/nearinfinity/blur/thrift/generated/ColumnFamilyDefinition.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/com/nearinfinity/blur/thrift/generated/ColumnFamilyDefinition.java b/interface/gen-java/com/nearinfinity/blur/thrift/generated/ColumnFamilyDefinition.java
deleted file mode 100644
index f8ad551..0000000
--- a/interface/gen-java/com/nearinfinity/blur/thrift/generated/ColumnFamilyDefinition.java
+++ /dev/null
@@ -1,482 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.7.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- */
-package com.nearinfinity.blur.thrift.generated;
-
-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.thrift.TBase<ColumnFamilyDefinition, ColumnFamilyDefinition._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnFamilyDefinition");
-
-  private static final org.apache.thrift.protocol.TField DEFAULT_DEFINITION_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultDefinition", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField COLUMN_DEFINITIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("columnDefinitions", org.apache.thrift.protocol.TType.MAP, (short)2);
-
-  /**
-   * 
-   */
-  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.thrift.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.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.DEFAULT_DEFINITION, new org.apache.thrift.meta_data.FieldMetaData("defaultDefinition", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnDefinition.class)));
-    tmpMap.put(_Fields.COLUMN_DEFINITIONS, new org.apache.thrift.meta_data.FieldMetaData("columnDefinitions", 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.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnDefinition.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.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.thrift.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.thrift.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.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // DEFAULT_DEFINITION
-          if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
-            this.defaultDefinition = new ColumnDefinition();
-            this.defaultDefinition.read(iprot);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2: // COLUMN_DEFINITIONS
-          if (field.type == org.apache.thrift.protocol.TType.MAP) {
-            {
-              org.apache.thrift.protocol.TMap _map65 = iprot.readMapBegin();
-              this.columnDefinitions = new HashMap<String,ColumnDefinition>(2*_map65.size);
-              for (int _i66 = 0; _i66 < _map65.size; ++_i66)
-              {
-                String _key67; // required
-                ColumnDefinition _val68; // required
-                _key67 = iprot.readString();
-                _val68 = new ColumnDefinition();
-                _val68.read(iprot);
-                this.columnDefinitions.put(_key67, _val68);
-              }
-              iprot.readMapEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-
-    // check for required fields of primitive type, which can't be checked in the validate method
-    validate();
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    if (this.defaultDefinition != null) {
-      oprot.writeFieldBegin(DEFAULT_DEFINITION_FIELD_DESC);
-      this.defaultDefinition.write(oprot);
-      oprot.writeFieldEnd();
-    }
-    if (this.columnDefinitions != null) {
-      oprot.writeFieldBegin(COLUMN_DEFINITIONS_FIELD_DESC);
-      {
-        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.columnDefinitions.size()));
-        for (Map.Entry<String, ColumnDefinition> _iter69 : this.columnDefinitions.entrySet())
-        {
-          oprot.writeString(_iter69.getKey());
-          _iter69.getValue().write(oprot);
-        }
-        oprot.writeMapEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
-  }
-
-  @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.thrift.TException {
-    // check for required fields
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c9a4a8eb/interface/gen-java/com/nearinfinity/blur/thrift/generated/ColumnPreCache.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/com/nearinfinity/blur/thrift/generated/ColumnPreCache.java b/interface/gen-java/com/nearinfinity/blur/thrift/generated/ColumnPreCache.java
deleted file mode 100644
index 0631516..0000000
--- a/interface/gen-java/com/nearinfinity/blur/thrift/generated/ColumnPreCache.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.7.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- */
-package com.nearinfinity.blur.thrift.generated;
-
-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 ColumnPreCache implements org.apache.thrift.TBase<ColumnPreCache, ColumnPreCache._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnPreCache");
-
-  private static final org.apache.thrift.protocol.TField PRE_CACHE_COLS_FIELD_DESC = new org.apache.thrift.protocol.TField("preCacheCols", org.apache.thrift.protocol.TType.LIST, (short)1);
-
-  /**
-   * This map sets what column families and columns to prefetch into block cache on shard open.
-   */
-  public List<String> preCacheCols; // 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 {
-    /**
-     * This map sets what column families and columns to prefetch into block cache on shard open.
-     */
-    PRE_CACHE_COLS((short)1, "preCacheCols");
-
-    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: // PRE_CACHE_COLS
-          return PRE_CACHE_COLS;
-        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.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.PRE_CACHE_COLS, new org.apache.thrift.meta_data.FieldMetaData("preCacheCols", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ColumnPreCache.class, metaDataMap);
-  }
-
-  public ColumnPreCache() {
-  }
-
-  public ColumnPreCache(
-    List<String> preCacheCols)
-  {
-    this();
-    this.preCacheCols = preCacheCols;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ColumnPreCache(ColumnPreCache other) {
-    if (other.isSetPreCacheCols()) {
-      List<String> __this__preCacheCols = new ArrayList<String>();
-      for (String other_element : other.preCacheCols) {
-        __this__preCacheCols.add(other_element);
-      }
-      this.preCacheCols = __this__preCacheCols;
-    }
-  }
-
-  public ColumnPreCache deepCopy() {
-    return new ColumnPreCache(this);
-  }
-
-  @Override
-  public void clear() {
-    this.preCacheCols = null;
-  }
-
-  public int getPreCacheColsSize() {
-    return (this.preCacheCols == null) ? 0 : this.preCacheCols.size();
-  }
-
-  public java.util.Iterator<String> getPreCacheColsIterator() {
-    return (this.preCacheCols == null) ? null : this.preCacheCols.iterator();
-  }
-
-  public void addToPreCacheCols(String elem) {
-    if (this.preCacheCols == null) {
-      this.preCacheCols = new ArrayList<String>();
-    }
-    this.preCacheCols.add(elem);
-  }
-
-  /**
-   * This map sets what column families and columns to prefetch into block cache on shard open.
-   */
-  public List<String> getPreCacheCols() {
-    return this.preCacheCols;
-  }
-
-  /**
-   * This map sets what column families and columns to prefetch into block cache on shard open.
-   */
-  public ColumnPreCache setPreCacheCols(List<String> preCacheCols) {
-    this.preCacheCols = preCacheCols;
-    return this;
-  }
-
-  public void unsetPreCacheCols() {
-    this.preCacheCols = null;
-  }
-
-  /** Returns true if field preCacheCols is set (has been assigned a value) and false otherwise */
-  public boolean isSetPreCacheCols() {
-    return this.preCacheCols != null;
-  }
-
-  public void setPreCacheColsIsSet(boolean value) {
-    if (!value) {
-      this.preCacheCols = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case PRE_CACHE_COLS:
-      if (value == null) {
-        unsetPreCacheCols();
-      } else {
-        setPreCacheCols((List<String>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case PRE_CACHE_COLS:
-      return getPreCacheCols();
-
-    }
-    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 PRE_CACHE_COLS:
-      return isSetPreCacheCols();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ColumnPreCache)
-      return this.equals((ColumnPreCache)that);
-    return false;
-  }
-
-  public boolean equals(ColumnPreCache that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_preCacheCols = true && this.isSetPreCacheCols();
-    boolean that_present_preCacheCols = true && that.isSetPreCacheCols();
-    if (this_present_preCacheCols || that_present_preCacheCols) {
-      if (!(this_present_preCacheCols && that_present_preCacheCols))
-        return false;
-      if (!this.preCacheCols.equals(that.preCacheCols))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(ColumnPreCache other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    ColumnPreCache typedOther = (ColumnPreCache)other;
-
-    lastComparison = Boolean.valueOf(isSetPreCacheCols()).compareTo(typedOther.isSetPreCacheCols());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPreCacheCols()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.preCacheCols, typedOther.preCacheCols);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // PRE_CACHE_COLS
-          if (field.type == org.apache.thrift.protocol.TType.LIST) {
-            {
-              org.apache.thrift.protocol.TList _list75 = iprot.readListBegin();
-              this.preCacheCols = new ArrayList<String>(_list75.size);
-              for (int _i76 = 0; _i76 < _list75.size; ++_i76)
-              {
-                String _elem77; // required
-                _elem77 = iprot.readString();
-                this.preCacheCols.add(_elem77);
-              }
-              iprot.readListEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-
-    // check for required fields of primitive type, which can't be checked in the validate method
-    validate();
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    if (this.preCacheCols != null) {
-      oprot.writeFieldBegin(PRE_CACHE_COLS_FIELD_DESC);
-      {
-        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.preCacheCols.size()));
-        for (String _iter78 : this.preCacheCols)
-        {
-          oprot.writeString(_iter78);
-        }
-        oprot.writeListEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ColumnPreCache(");
-    boolean first = true;
-
-    sb.append("preCacheCols:");
-    if (this.preCacheCols == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.preCacheCols);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c9a4a8eb/interface/gen-java/com/nearinfinity/blur/thrift/generated/CpuTime.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/com/nearinfinity/blur/thrift/generated/CpuTime.java b/interface/gen-java/com/nearinfinity/blur/thrift/generated/CpuTime.java
deleted file mode 100644
index 73a3109..0000000
--- a/interface/gen-java/com/nearinfinity/blur/thrift/generated/CpuTime.java
+++ /dev/null
@@ -1,430 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.7.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- */
-package com.nearinfinity.blur.thrift.generated;
-
-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 CpuTime implements org.apache.thrift.TBase<CpuTime, CpuTime._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CpuTime");
-
-  private static final org.apache.thrift.protocol.TField CPU_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("cpuTime", org.apache.thrift.protocol.TType.I64, (short)1);
-  private static final org.apache.thrift.protocol.TField REAL_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("realTime", org.apache.thrift.protocol.TType.I64, (short)2);
-
-  /**
-   * 
-   */
-  public long cpuTime; // required
-  /**
-   * 
-   */
-  public long realTime; // 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 {
-    /**
-     * 
-     */
-    CPU_TIME((short)1, "cpuTime"),
-    /**
-     * 
-     */
-    REAL_TIME((short)2, "realTime");
-
-    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: // CPU_TIME
-          return CPU_TIME;
-        case 2: // REAL_TIME
-          return REAL_TIME;
-        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
-  private static final int __CPUTIME_ISSET_ID = 0;
-  private static final int __REALTIME_ISSET_ID = 1;
-  private BitSet __isset_bit_vector = new BitSet(2);
-
-  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.CPU_TIME, new org.apache.thrift.meta_data.FieldMetaData("cpuTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.REAL_TIME, new org.apache.thrift.meta_data.FieldMetaData("realTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CpuTime.class, metaDataMap);
-  }
-
-  public CpuTime() {
-  }
-
-  public CpuTime(
-    long cpuTime,
-    long realTime)
-  {
-    this();
-    this.cpuTime = cpuTime;
-    setCpuTimeIsSet(true);
-    this.realTime = realTime;
-    setRealTimeIsSet(true);
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public CpuTime(CpuTime other) {
-    __isset_bit_vector.clear();
-    __isset_bit_vector.or(other.__isset_bit_vector);
-    this.cpuTime = other.cpuTime;
-    this.realTime = other.realTime;
-  }
-
-  public CpuTime deepCopy() {
-    return new CpuTime(this);
-  }
-
-  @Override
-  public void clear() {
-    setCpuTimeIsSet(false);
-    this.cpuTime = 0;
-    setRealTimeIsSet(false);
-    this.realTime = 0;
-  }
-
-  /**
-   * 
-   */
-  public long getCpuTime() {
-    return this.cpuTime;
-  }
-
-  /**
-   * 
-   */
-  public CpuTime setCpuTime(long cpuTime) {
-    this.cpuTime = cpuTime;
-    setCpuTimeIsSet(true);
-    return this;
-  }
-
-  public void unsetCpuTime() {
-    __isset_bit_vector.clear(__CPUTIME_ISSET_ID);
-  }
-
-  /** Returns true if field cpuTime is set (has been assigned a value) and false otherwise */
-  public boolean isSetCpuTime() {
-    return __isset_bit_vector.get(__CPUTIME_ISSET_ID);
-  }
-
-  public void setCpuTimeIsSet(boolean value) {
-    __isset_bit_vector.set(__CPUTIME_ISSET_ID, value);
-  }
-
-  /**
-   * 
-   */
-  public long getRealTime() {
-    return this.realTime;
-  }
-
-  /**
-   * 
-   */
-  public CpuTime setRealTime(long realTime) {
-    this.realTime = realTime;
-    setRealTimeIsSet(true);
-    return this;
-  }
-
-  public void unsetRealTime() {
-    __isset_bit_vector.clear(__REALTIME_ISSET_ID);
-  }
-
-  /** Returns true if field realTime is set (has been assigned a value) and false otherwise */
-  public boolean isSetRealTime() {
-    return __isset_bit_vector.get(__REALTIME_ISSET_ID);
-  }
-
-  public void setRealTimeIsSet(boolean value) {
-    __isset_bit_vector.set(__REALTIME_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case CPU_TIME:
-      if (value == null) {
-        unsetCpuTime();
-      } else {
-        setCpuTime((Long)value);
-      }
-      break;
-
-    case REAL_TIME:
-      if (value == null) {
-        unsetRealTime();
-      } else {
-        setRealTime((Long)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case CPU_TIME:
-      return Long.valueOf(getCpuTime());
-
-    case REAL_TIME:
-      return Long.valueOf(getRealTime());
-
-    }
-    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 CPU_TIME:
-      return isSetCpuTime();
-    case REAL_TIME:
-      return isSetRealTime();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof CpuTime)
-      return this.equals((CpuTime)that);
-    return false;
-  }
-
-  public boolean equals(CpuTime that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_cpuTime = true;
-    boolean that_present_cpuTime = true;
-    if (this_present_cpuTime || that_present_cpuTime) {
-      if (!(this_present_cpuTime && that_present_cpuTime))
-        return false;
-      if (this.cpuTime != that.cpuTime)
-        return false;
-    }
-
-    boolean this_present_realTime = true;
-    boolean that_present_realTime = true;
-    if (this_present_realTime || that_present_realTime) {
-      if (!(this_present_realTime && that_present_realTime))
-        return false;
-      if (this.realTime != that.realTime)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(CpuTime other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    CpuTime typedOther = (CpuTime)other;
-
-    lastComparison = Boolean.valueOf(isSetCpuTime()).compareTo(typedOther.isSetCpuTime());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetCpuTime()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cpuTime, typedOther.cpuTime);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetRealTime()).compareTo(typedOther.isSetRealTime());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRealTime()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.realTime, typedOther.realTime);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // CPU_TIME
-          if (field.type == org.apache.thrift.protocol.TType.I64) {
-            this.cpuTime = iprot.readI64();
-            setCpuTimeIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2: // REAL_TIME
-          if (field.type == org.apache.thrift.protocol.TType.I64) {
-            this.realTime = iprot.readI64();
-            setRealTimeIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-
-    // check for required fields of primitive type, which can't be checked in the validate method
-    validate();
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    oprot.writeFieldBegin(CPU_TIME_FIELD_DESC);
-    oprot.writeI64(this.cpuTime);
-    oprot.writeFieldEnd();
-    oprot.writeFieldBegin(REAL_TIME_FIELD_DESC);
-    oprot.writeI64(this.realTime);
-    oprot.writeFieldEnd();
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("CpuTime(");
-    boolean first = true;
-
-    sb.append("cpuTime:");
-    sb.append(this.cpuTime);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("realTime:");
-    sb.append(this.realTime);
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bit_vector = new BitSet(1);
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c9a4a8eb/interface/gen-java/com/nearinfinity/blur/thrift/generated/ExpertQuery.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/com/nearinfinity/blur/thrift/generated/ExpertQuery.java b/interface/gen-java/com/nearinfinity/blur/thrift/generated/ExpertQuery.java
deleted file mode 100644
index 31f3a9b..0000000
--- a/interface/gen-java/com/nearinfinity/blur/thrift/generated/ExpertQuery.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.7.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- */
-package com.nearinfinity.blur.thrift.generated;
-
-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;
-
-/**
- * The expert query allows for submission of a serialized query and filter object to be executed against all the queries.
- */
-public class ExpertQuery implements org.apache.thrift.TBase<ExpertQuery, ExpertQuery._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExpertQuery");
-
-  private static final org.apache.thrift.protocol.TField QUERY_FIELD_DESC = new org.apache.thrift.protocol.TField("query", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField FILTER_FIELD_DESC = new org.apache.thrift.protocol.TField("filter", org.apache.thrift.protocol.TType.STRING, (short)2);
-
-  /**
-   * The serialized query.
-   */
-  public ByteBuffer query; // required
-  /**
-   * The serialized filter.
-   */
-  public ByteBuffer filter; // 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 {
-    /**
-     * The serialized query.
-     */
-    QUERY((short)1, "query"),
-    /**
-     * The serialized filter.
-     */
-    FILTER((short)2, "filter");
-
-    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: // QUERY
-          return QUERY;
-        case 2: // FILTER
-          return FILTER;
-        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.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.QUERY, new org.apache.thrift.meta_data.FieldMetaData("query", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    tmpMap.put(_Fields.FILTER, new org.apache.thrift.meta_data.FieldMetaData("filter", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExpertQuery.class, metaDataMap);
-  }
-
-  public ExpertQuery() {
-  }
-
-  public ExpertQuery(
-    ByteBuffer query,
-    ByteBuffer filter)
-  {
-    this();
-    this.query = query;
-    this.filter = filter;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ExpertQuery(ExpertQuery other) {
-    if (other.isSetQuery()) {
-      this.query = org.apache.thrift.TBaseHelper.copyBinary(other.query);
-;
-    }
-    if (other.isSetFilter()) {
-      this.filter = org.apache.thrift.TBaseHelper.copyBinary(other.filter);
-;
-    }
-  }
-
-  public ExpertQuery deepCopy() {
-    return new ExpertQuery(this);
-  }
-
-  @Override
-  public void clear() {
-    this.query = null;
-    this.filter = null;
-  }
-
-  /**
-   * The serialized query.
-   */
-  public byte[] getQuery() {
-    setQuery(org.apache.thrift.TBaseHelper.rightSize(query));
-    return query == null ? null : query.array();
-  }
-
-  public ByteBuffer bufferForQuery() {
-    return query;
-  }
-
-  /**
-   * The serialized query.
-   */
-  public ExpertQuery setQuery(byte[] query) {
-    setQuery(query == null ? (ByteBuffer)null : ByteBuffer.wrap(query));
-    return this;
-  }
-
-  public ExpertQuery setQuery(ByteBuffer query) {
-    this.query = query;
-    return this;
-  }
-
-  public void unsetQuery() {
-    this.query = null;
-  }
-
-  /** Returns true if field query is set (has been assigned a value) and false otherwise */
-  public boolean isSetQuery() {
-    return this.query != null;
-  }
-
-  public void setQueryIsSet(boolean value) {
-    if (!value) {
-      this.query = null;
-    }
-  }
-
-  /**
-   * The serialized filter.
-   */
-  public byte[] getFilter() {
-    setFilter(org.apache.thrift.TBaseHelper.rightSize(filter));
-    return filter == null ? null : filter.array();
-  }
-
-  public ByteBuffer bufferForFilter() {
-    return filter;
-  }
-
-  /**
-   * The serialized filter.
-   */
-  public ExpertQuery setFilter(byte[] filter) {
-    setFilter(filter == null ? (ByteBuffer)null : ByteBuffer.wrap(filter));
-    return this;
-  }
-
-  public ExpertQuery setFilter(ByteBuffer filter) {
-    this.filter = filter;
-    return this;
-  }
-
-  public void unsetFilter() {
-    this.filter = null;
-  }
-
-  /** Returns true if field filter is set (has been assigned a value) and false otherwise */
-  public boolean isSetFilter() {
-    return this.filter != null;
-  }
-
-  public void setFilterIsSet(boolean value) {
-    if (!value) {
-      this.filter = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case QUERY:
-      if (value == null) {
-        unsetQuery();
-      } else {
-        setQuery((ByteBuffer)value);
-      }
-      break;
-
-    case FILTER:
-      if (value == null) {
-        unsetFilter();
-      } else {
-        setFilter((ByteBuffer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case QUERY:
-      return getQuery();
-
-    case FILTER:
-      return getFilter();
-
-    }
-    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 QUERY:
-      return isSetQuery();
-    case FILTER:
-      return isSetFilter();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ExpertQuery)
-      return this.equals((ExpertQuery)that);
-    return false;
-  }
-
-  public boolean equals(ExpertQuery that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_query = true && this.isSetQuery();
-    boolean that_present_query = true && that.isSetQuery();
-    if (this_present_query || that_present_query) {
-      if (!(this_present_query && that_present_query))
-        return false;
-      if (!this.query.equals(that.query))
-        return false;
-    }
-
-    boolean this_present_filter = true && this.isSetFilter();
-    boolean that_present_filter = true && that.isSetFilter();
-    if (this_present_filter || that_present_filter) {
-      if (!(this_present_filter && that_present_filter))
-        return false;
-      if (!this.filter.equals(that.filter))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(ExpertQuery other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    ExpertQuery typedOther = (ExpertQuery)other;
-
-    lastComparison = Boolean.valueOf(isSetQuery()).compareTo(typedOther.isSetQuery());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetQuery()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.query, typedOther.query);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetFilter()).compareTo(typedOther.isSetFilter());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetFilter()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filter, typedOther.filter);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // QUERY
-          if (field.type == org.apache.thrift.protocol.TType.STRING) {
-            this.query = iprot.readBinary();
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2: // FILTER
-          if (field.type == org.apache.thrift.protocol.TType.STRING) {
-            this.filter = iprot.readBinary();
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-
-    // check for required fields of primitive type, which can't be checked in the validate method
-    validate();
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    if (this.query != null) {
-      oprot.writeFieldBegin(QUERY_FIELD_DESC);
-      oprot.writeBinary(this.query);
-      oprot.writeFieldEnd();
-    }
-    if (this.filter != null) {
-      oprot.writeFieldBegin(FILTER_FIELD_DESC);
-      oprot.writeBinary(this.filter);
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ExpertQuery(");
-    boolean first = true;
-
-    sb.append("query:");
-    if (this.query == null) {
-      sb.append("null");
-    } else {
-      org.apache.thrift.TBaseHelper.toString(this.query, sb);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("filter:");
-    if (this.filter == null) {
-      sb.append("null");
-    } else {
-      org.apache.thrift.TBaseHelper.toString(this.filter, sb);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c9a4a8eb/interface/gen-java/com/nearinfinity/blur/thrift/generated/Facet.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/com/nearinfinity/blur/thrift/generated/Facet.java b/interface/gen-java/com/nearinfinity/blur/thrift/generated/Facet.java
deleted file mode 100644
index 51755c3..0000000
--- a/interface/gen-java/com/nearinfinity/blur/thrift/generated/Facet.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.7.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- */
-package com.nearinfinity.blur.thrift.generated;
-
-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;
-
-/**
- * Blur facet.
- */
-public class Facet implements org.apache.thrift.TBase<Facet, Facet._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Facet");
-
-  private static final org.apache.thrift.protocol.TField QUERY_STR_FIELD_DESC = new org.apache.thrift.protocol.TField("queryStr", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField MINIMUM_NUMBER_OF_BLUR_RESULTS_FIELD_DESC = new org.apache.thrift.protocol.TField("minimumNumberOfBlurResults", org.apache.thrift.protocol.TType.I64, (short)2);
-
-  public String queryStr; // required
-  public long minimumNumberOfBlurResults; // 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 {
-    QUERY_STR((short)1, "queryStr"),
-    MINIMUM_NUMBER_OF_BLUR_RESULTS((short)2, "minimumNumberOfBlurResults");
-
-    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: // QUERY_STR
-          return QUERY_STR;
-        case 2: // MINIMUM_NUMBER_OF_BLUR_RESULTS
-          return MINIMUM_NUMBER_OF_BLUR_RESULTS;
-        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
-  private static final int __MINIMUMNUMBEROFBLURRESULTS_ISSET_ID = 0;
-  private BitSet __isset_bit_vector = new BitSet(1);
-
-  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.QUERY_STR, new org.apache.thrift.meta_data.FieldMetaData("queryStr", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.MINIMUM_NUMBER_OF_BLUR_RESULTS, new org.apache.thrift.meta_data.FieldMetaData("minimumNumberOfBlurResults", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Facet.class, metaDataMap);
-  }
-
-  public Facet() {
-    this.minimumNumberOfBlurResults = 9223372036854775807L;
-
-  }
-
-  public Facet(
-    String queryStr,
-    long minimumNumberOfBlurResults)
-  {
-    this();
-    this.queryStr = queryStr;
-    this.minimumNumberOfBlurResults = minimumNumberOfBlurResults;
-    setMinimumNumberOfBlurResultsIsSet(true);
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public Facet(Facet other) {
-    __isset_bit_vector.clear();
-    __isset_bit_vector.or(other.__isset_bit_vector);
-    if (other.isSetQueryStr()) {
-      this.queryStr = other.queryStr;
-    }
-    this.minimumNumberOfBlurResults = other.minimumNumberOfBlurResults;
-  }
-
-  public Facet deepCopy() {
-    return new Facet(this);
-  }
-
-  @Override
-  public void clear() {
-    this.queryStr = null;
-    this.minimumNumberOfBlurResults = 9223372036854775807L;
-
-  }
-
-  public String getQueryStr() {
-    return this.queryStr;
-  }
-
-  public Facet setQueryStr(String queryStr) {
-    this.queryStr = queryStr;
-    return this;
-  }
-
-  public void unsetQueryStr() {
-    this.queryStr = null;
-  }
-
-  /** Returns true if field queryStr is set (has been assigned a value) and false otherwise */
-  public boolean isSetQueryStr() {
-    return this.queryStr != null;
-  }
-
-  public void setQueryStrIsSet(boolean value) {
-    if (!value) {
-      this.queryStr = null;
-    }
-  }
-
-  public long getMinimumNumberOfBlurResults() {
-    return this.minimumNumberOfBlurResults;
-  }
-
-  public Facet setMinimumNumberOfBlurResults(long minimumNumberOfBlurResults) {
-    this.minimumNumberOfBlurResults = minimumNumberOfBlurResults;
-    setMinimumNumberOfBlurResultsIsSet(true);
-    return this;
-  }
-
-  public void unsetMinimumNumberOfBlurResults() {
-    __isset_bit_vector.clear(__MINIMUMNUMBEROFBLURRESULTS_ISSET_ID);
-  }
-
-  /** Returns true if field minimumNumberOfBlurResults is set (has been assigned a value) and false otherwise */
-  public boolean isSetMinimumNumberOfBlurResults() {
-    return __isset_bit_vector.get(__MINIMUMNUMBEROFBLURRESULTS_ISSET_ID);
-  }
-
-  public void setMinimumNumberOfBlurResultsIsSet(boolean value) {
-    __isset_bit_vector.set(__MINIMUMNUMBEROFBLURRESULTS_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case QUERY_STR:
-      if (value == null) {
-        unsetQueryStr();
-      } else {
-        setQueryStr((String)value);
-      }
-      break;
-
-    case MINIMUM_NUMBER_OF_BLUR_RESULTS:
-      if (value == null) {
-        unsetMinimumNumberOfBlurResults();
-      } else {
-        setMinimumNumberOfBlurResults((Long)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case QUERY_STR:
-      return getQueryStr();
-
-    case MINIMUM_NUMBER_OF_BLUR_RESULTS:
-      return Long.valueOf(getMinimumNumberOfBlurResults());
-
-    }
-    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 QUERY_STR:
-      return isSetQueryStr();
-    case MINIMUM_NUMBER_OF_BLUR_RESULTS:
-      return isSetMinimumNumberOfBlurResults();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof Facet)
-      return this.equals((Facet)that);
-    return false;
-  }
-
-  public boolean equals(Facet that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_queryStr = true && this.isSetQueryStr();
-    boolean that_present_queryStr = true && that.isSetQueryStr();
-    if (this_present_queryStr || that_present_queryStr) {
-      if (!(this_present_queryStr && that_present_queryStr))
-        return false;
-      if (!this.queryStr.equals(that.queryStr))
-        return false;
-    }
-
-    boolean this_present_minimumNumberOfBlurResults = true;
-    boolean that_present_minimumNumberOfBlurResults = true;
-    if (this_present_minimumNumberOfBlurResults || that_present_minimumNumberOfBlurResults) {
-      if (!(this_present_minimumNumberOfBlurResults && that_present_minimumNumberOfBlurResults))
-        return false;
-      if (this.minimumNumberOfBlurResults != that.minimumNumberOfBlurResults)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(Facet other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    Facet typedOther = (Facet)other;
-
-    lastComparison = Boolean.valueOf(isSetQueryStr()).compareTo(typedOther.isSetQueryStr());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetQueryStr()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryStr, typedOther.queryStr);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetMinimumNumberOfBlurResults()).compareTo(typedOther.isSetMinimumNumberOfBlurResults());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetMinimumNumberOfBlurResults()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.minimumNumberOfBlurResults, typedOther.minimumNumberOfBlurResults);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // QUERY_STR
-          if (field.type == org.apache.thrift.protocol.TType.STRING) {
-            this.queryStr = iprot.readString();
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2: // MINIMUM_NUMBER_OF_BLUR_RESULTS
-          if (field.type == org.apache.thrift.protocol.TType.I64) {
-            this.minimumNumberOfBlurResults = iprot.readI64();
-            setMinimumNumberOfBlurResultsIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-
-    // check for required fields of primitive type, which can't be checked in the validate method
-    validate();
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    if (this.queryStr != null) {
-      oprot.writeFieldBegin(QUERY_STR_FIELD_DESC);
-      oprot.writeString(this.queryStr);
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldBegin(MINIMUM_NUMBER_OF_BLUR_RESULTS_FIELD_DESC);
-    oprot.writeI64(this.minimumNumberOfBlurResults);
-    oprot.writeFieldEnd();
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("Facet(");
-    boolean first = true;
-
-    sb.append("queryStr:");
-    if (this.queryStr == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.queryStr);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("minimumNumberOfBlurResults:");
-    sb.append(this.minimumNumberOfBlurResults);
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bit_vector = new BitSet(1);
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-}
-


Mime
View raw message