incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [3/9] Sorting feature is now implemented for String type, no integration tests yet. Still need to implement sorting on other types.
Date Wed, 29 Jan 2014 04:09:01 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5e495671/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Schema.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Schema.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Schema.java
index e54f746..a46f418 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Schema.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Schema.java
@@ -488,28 +488,28 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
           case 2: // FAMILIES
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map128 = iprot.readMapBegin();
-                struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map128.size);
-                for (int _i129 = 0; _i129 < _map128.size; ++_i129)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map136 = iprot.readMapBegin();
+                struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map136.size);
+                for (int _i137 = 0; _i137 < _map136.size; ++_i137)
                 {
-                  String _key130; // optional
-                  Map<String,ColumnDefinition> _val131; // required
-                  _key130 = iprot.readString();
+                  String _key138; // optional
+                  Map<String,ColumnDefinition> _val139; // required
+                  _key138 = iprot.readString();
                   {
-                    org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map132 = iprot.readMapBegin();
-                    _val131 = new HashMap<String,ColumnDefinition>(2*_map132.size);
-                    for (int _i133 = 0; _i133 < _map132.size; ++_i133)
+                    org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map140 = iprot.readMapBegin();
+                    _val139 = new HashMap<String,ColumnDefinition>(2*_map140.size);
+                    for (int _i141 = 0; _i141 < _map140.size; ++_i141)
                     {
-                      String _key134; // optional
-                      ColumnDefinition _val135; // required
-                      _key134 = iprot.readString();
-                      _val135 = new ColumnDefinition();
-                      _val135.read(iprot);
-                      _val131.put(_key134, _val135);
+                      String _key142; // optional
+                      ColumnDefinition _val143; // required
+                      _key142 = iprot.readString();
+                      _val143 = new ColumnDefinition();
+                      _val143.read(iprot);
+                      _val139.put(_key142, _val143);
                     }
                     iprot.readMapEnd();
                   }
-                  struct.families.put(_key130, _val131);
+                  struct.families.put(_key138, _val139);
                 }
                 iprot.readMapEnd();
               }
@@ -542,15 +542,15 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
         oprot.writeFieldBegin(FAMILIES_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.MAP, struct.families.size()));
-          for (Map.Entry<String, Map<String,ColumnDefinition>> _iter136 : struct.families.entrySet())
+          for (Map.Entry<String, Map<String,ColumnDefinition>> _iter144 : struct.families.entrySet())
           {
-            oprot.writeString(_iter136.getKey());
+            oprot.writeString(_iter144.getKey());
             {
-              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, _iter136.getValue().size()));
-              for (Map.Entry<String, ColumnDefinition> _iter137 : _iter136.getValue().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.STRUCT, _iter144.getValue().size()));
+              for (Map.Entry<String, ColumnDefinition> _iter145 : _iter144.getValue().entrySet())
               {
-                oprot.writeString(_iter137.getKey());
-                _iter137.getValue().write(oprot);
+                oprot.writeString(_iter145.getKey());
+                _iter145.getValue().write(oprot);
               }
               oprot.writeMapEnd();
             }
@@ -590,15 +590,15 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
       if (struct.isSetFamilies()) {
         {
           oprot.writeI32(struct.families.size());
-          for (Map.Entry<String, Map<String,ColumnDefinition>> _iter138 : struct.families.entrySet())
+          for (Map.Entry<String, Map<String,ColumnDefinition>> _iter146 : struct.families.entrySet())
           {
-            oprot.writeString(_iter138.getKey());
+            oprot.writeString(_iter146.getKey());
             {
-              oprot.writeI32(_iter138.getValue().size());
-              for (Map.Entry<String, ColumnDefinition> _iter139 : _iter138.getValue().entrySet())
+              oprot.writeI32(_iter146.getValue().size());
+              for (Map.Entry<String, ColumnDefinition> _iter147 : _iter146.getValue().entrySet())
               {
-                oprot.writeString(_iter139.getKey());
-                _iter139.getValue().write(oprot);
+                oprot.writeString(_iter147.getKey());
+                _iter147.getValue().write(oprot);
               }
             }
           }
@@ -616,27 +616,27 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
       }
       if (incoming.get(1)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map140 = 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.MAP, iprot.readI32());
-          struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map140.size);
-          for (int _i141 = 0; _i141 < _map140.size; ++_i141)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map148 = 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.MAP, iprot.readI32());
+          struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map148.size);
+          for (int _i149 = 0; _i149 < _map148.size; ++_i149)
           {
-            String _key142; // optional
-            Map<String,ColumnDefinition> _val143; // required
-            _key142 = iprot.readString();
+            String _key150; // optional
+            Map<String,ColumnDefinition> _val151; // required
+            _key150 = iprot.readString();
             {
-              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map144 = 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());
-              _val143 = new HashMap<String,ColumnDefinition>(2*_map144.size);
-              for (int _i145 = 0; _i145 < _map144.size; ++_i145)
+              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map152 = 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());
+              _val151 = new HashMap<String,ColumnDefinition>(2*_map152.size);
+              for (int _i153 = 0; _i153 < _map152.size; ++_i153)
               {
-                String _key146; // optional
-                ColumnDefinition _val147; // required
-                _key146 = iprot.readString();
-                _val147 = new ColumnDefinition();
-                _val147.read(iprot);
-                _val143.put(_key146, _val147);
+                String _key154; // optional
+                ColumnDefinition _val155; // required
+                _key154 = iprot.readString();
+                _val155 = new ColumnDefinition();
+                _val155.read(iprot);
+                _val151.put(_key154, _val155);
               }
             }
-            struct.families.put(_key142, _val143);
+            struct.families.put(_key150, _val151);
           }
         }
         struct.setFamiliesIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5e495671/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/SortField.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/SortField.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/SortField.java
index 86123f3..6ca0ea3 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/SortField.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/SortField.java
@@ -49,23 +49,28 @@ import java.util.Arrays;
 //import org.slf4j.Logger;
 //import org.slf4j.LoggerFactory;
 
-public class SortField extends org.apache.blur.thirdparty.thrift_0_9_0.TUnion<SortField, SortField._Fields> {
+public class SortField implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<SortField, SortField._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("SortField");
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField NULL_VALUE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("nullValue", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)1);
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField STRING_VALUE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("stringValue", 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 INT_VALUE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("intValue", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)3);
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField LONG_VALUE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("longValue", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, (short)4);
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField DOUBLE_VALUE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("doubleValue", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.DOUBLE, (short)5);
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField BINARY_VALUE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("binaryValue", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)6);
+
+  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_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("column", 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 REVERSE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("reverse", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)3);
+
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new SortFieldStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new SortFieldTupleSchemeFactory());
+  }
+
+  public String family; // required
+  public String column; // required
+  public boolean reverse; // 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 {
-    NULL_VALUE((short)1, "nullValue"),
-    STRING_VALUE((short)2, "stringValue"),
-    INT_VALUE((short)3, "intValue"),
-    LONG_VALUE((short)4, "longValue"),
-    DOUBLE_VALUE((short)5, "doubleValue"),
-    BINARY_VALUE((short)6, "binaryValue");
+    FAMILY((short)1, "family"),
+    COLUMN((short)2, "column"),
+    REVERSE((short)3, "reverse");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -80,18 +85,12 @@ public class SortField extends org.apache.blur.thirdparty.thrift_0_9_0.TUnion<So
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 1: // NULL_VALUE
-          return NULL_VALUE;
-        case 2: // STRING_VALUE
-          return STRING_VALUE;
-        case 3: // INT_VALUE
-          return INT_VALUE;
-        case 4: // LONG_VALUE
-          return LONG_VALUE;
-        case 5: // DOUBLE_VALUE
-          return DOUBLE_VALUE;
-        case 6: // BINARY_VALUE
-          return BINARY_VALUE;
+        case 1: // FAMILY
+          return FAMILY;
+        case 2: // COLUMN
+          return COLUMN;
+        case 3: // REVERSE
+          return REVERSE;
         default:
           return null;
       }
@@ -131,472 +130,327 @@ public class SortField extends org.apache.blur.thirdparty.thrift_0_9_0.TUnion<So
     }
   }
 
+  // isset id assignments
+  private static final int __REVERSE_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.NULL_VALUE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("nullValue", 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.STRING_VALUE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("stringValue", 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, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("column", 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.INT_VALUE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("intValue", 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.I32)));
-    tmpMap.put(_Fields.LONG_VALUE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("longValue", 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.I64)));
-    tmpMap.put(_Fields.DOUBLE_VALUE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("doubleValue", 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.DOUBLE)));
-    tmpMap.put(_Fields.BINARY_VALUE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("binaryValue", 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        , true)));
+    tmpMap.put(_Fields.REVERSE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("reverse", 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)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(SortField.class, metaDataMap);
   }
 
   public SortField() {
-    super();
   }
 
-  public SortField(_Fields setField, Object value) {
-    super(setField, value);
+  public SortField(
+    String family,
+    String column,
+    boolean reverse)
+  {
+    this();
+    this.family = family;
+    this.column = column;
+    this.reverse = reverse;
+    setReverseIsSet(true);
   }
 
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
   public SortField(SortField other) {
-    super(other);
+    __isset_bitfield = other.__isset_bitfield;
+    if (other.isSetFamily()) {
+      this.family = other.family;
+    }
+    if (other.isSetColumn()) {
+      this.column = other.column;
+    }
+    this.reverse = other.reverse;
   }
+
   public SortField deepCopy() {
     return new SortField(this);
   }
 
-  public static SortField nullValue(boolean value) {
-    SortField x = new SortField();
-    x.setNullValue(value);
-    return x;
+  @Override
+  public void clear() {
+    this.family = null;
+    this.column = null;
+    setReverseIsSet(false);
+    this.reverse = false;
   }
 
-  public static SortField stringValue(String value) {
-    SortField x = new SortField();
-    x.setStringValue(value);
-    return x;
+  public String getFamily() {
+    return this.family;
   }
 
-  public static SortField intValue(int value) {
-    SortField x = new SortField();
-    x.setIntValue(value);
-    return x;
+  public SortField setFamily(String family) {
+    this.family = family;
+    return this;
   }
 
-  public static SortField longValue(long value) {
-    SortField x = new SortField();
-    x.setLongValue(value);
-    return x;
+  public void unsetFamily() {
+    this.family = null;
   }
 
-  public static SortField doubleValue(double value) {
-    SortField x = new SortField();
-    x.setDoubleValue(value);
-    return x;
+  /** Returns true if field family is set (has been assigned a value) and false otherwise */
+  public boolean isSetFamily() {
+    return this.family != null;
   }
 
-  public static SortField binaryValue(ByteBuffer value) {
-    SortField x = new SortField();
-    x.setBinaryValue(value);
-    return x;
+  public void setFamilyIsSet(boolean value) {
+    if (!value) {
+      this.family = null;
+    }
   }
 
-  public static SortField binaryValue(byte[] value) {
-    SortField x = new SortField();
-    x.setBinaryValue(ByteBuffer.wrap(value));
-    return x;
+  public String getColumn() {
+    return this.column;
   }
 
-
-  @Override
-  protected void checkType(_Fields setField, Object value) throws ClassCastException {
-    switch (setField) {
-      case NULL_VALUE:
-        if (value instanceof Boolean) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type Boolean for field 'nullValue', but got " + value.getClass().getSimpleName());
-      case STRING_VALUE:
-        if (value instanceof String) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type String for field 'stringValue', but got " + value.getClass().getSimpleName());
-      case INT_VALUE:
-        if (value instanceof Integer) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type Integer for field 'intValue', but got " + value.getClass().getSimpleName());
-      case LONG_VALUE:
-        if (value instanceof Long) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type Long for field 'longValue', but got " + value.getClass().getSimpleName());
-      case DOUBLE_VALUE:
-        if (value instanceof Double) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type Double for field 'doubleValue', but got " + value.getClass().getSimpleName());
-      case BINARY_VALUE:
-        if (value instanceof ByteBuffer) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type ByteBuffer for field 'binaryValue', but got " + value.getClass().getSimpleName());
-      default:
-        throw new IllegalArgumentException("Unknown field id " + setField);
-    }
+  public SortField setColumn(String column) {
+    this.column = column;
+    return this;
   }
 
-  @Override
-  protected Object standardSchemeReadValue(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol iprot, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField field) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-    _Fields setField = _Fields.findByThriftId(field.id);
-    if (setField != null) {
-      switch (setField) {
-        case NULL_VALUE:
-          if (field.type == NULL_VALUE_FIELD_DESC.type) {
-            Boolean nullValue;
-            nullValue = iprot.readBool();
-            return nullValue;
-          } else {
-            org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, field.type);
-            return null;
-          }
-        case STRING_VALUE:
-          if (field.type == STRING_VALUE_FIELD_DESC.type) {
-            String stringValue;
-            stringValue = iprot.readString();
-            return stringValue;
-          } else {
-            org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, field.type);
-            return null;
-          }
-        case INT_VALUE:
-          if (field.type == INT_VALUE_FIELD_DESC.type) {
-            Integer intValue;
-            intValue = iprot.readI32();
-            return intValue;
-          } else {
-            org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, field.type);
-            return null;
-          }
-        case LONG_VALUE:
-          if (field.type == LONG_VALUE_FIELD_DESC.type) {
-            Long longValue;
-            longValue = iprot.readI64();
-            return longValue;
-          } else {
-            org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, field.type);
-            return null;
-          }
-        case DOUBLE_VALUE:
-          if (field.type == DOUBLE_VALUE_FIELD_DESC.type) {
-            Double doubleValue;
-            doubleValue = iprot.readDouble();
-            return doubleValue;
-          } else {
-            org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, field.type);
-            return null;
-          }
-        case BINARY_VALUE:
-          if (field.type == BINARY_VALUE_FIELD_DESC.type) {
-            ByteBuffer binaryValue;
-            binaryValue = iprot.readBinary();
-            return binaryValue;
-          } else {
-            org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, field.type);
-            return null;
-          }
-        default:
-          throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
-      }
-    } else {
-      return null;
-    }
+  public void unsetColumn() {
+    this.column = null;
   }
 
-  @Override
-  protected void standardSchemeWriteValue(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol oprot) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-    switch (setField_) {
-      case NULL_VALUE:
-        Boolean nullValue = (Boolean)value_;
-        oprot.writeBool(nullValue);
-        return;
-      case STRING_VALUE:
-        String stringValue = (String)value_;
-        oprot.writeString(stringValue);
-        return;
-      case INT_VALUE:
-        Integer intValue = (Integer)value_;
-        oprot.writeI32(intValue);
-        return;
-      case LONG_VALUE:
-        Long longValue = (Long)value_;
-        oprot.writeI64(longValue);
-        return;
-      case DOUBLE_VALUE:
-        Double doubleValue = (Double)value_;
-        oprot.writeDouble(doubleValue);
-        return;
-      case BINARY_VALUE:
-        ByteBuffer binaryValue = (ByteBuffer)value_;
-        oprot.writeBinary(binaryValue);
-        return;
-      default:
-        throw new IllegalStateException("Cannot write union with unknown field " + setField_);
-    }
+  /** Returns true if field column is set (has been assigned a value) and false otherwise */
+  public boolean isSetColumn() {
+    return this.column != null;
   }
 
-  @Override
-  protected Object tupleSchemeReadValue(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol iprot, short fieldID) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-    _Fields setField = _Fields.findByThriftId(fieldID);
-    if (setField != null) {
-      switch (setField) {
-        case NULL_VALUE:
-          Boolean nullValue;
-          nullValue = iprot.readBool();
-          return nullValue;
-        case STRING_VALUE:
-          String stringValue;
-          stringValue = iprot.readString();
-          return stringValue;
-        case INT_VALUE:
-          Integer intValue;
-          intValue = iprot.readI32();
-          return intValue;
-        case LONG_VALUE:
-          Long longValue;
-          longValue = iprot.readI64();
-          return longValue;
-        case DOUBLE_VALUE:
-          Double doubleValue;
-          doubleValue = iprot.readDouble();
-          return doubleValue;
-        case BINARY_VALUE:
-          ByteBuffer binaryValue;
-          binaryValue = iprot.readBinary();
-          return binaryValue;
-        default:
-          throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
-      }
-    } else {
-      throw new TProtocolException("Couldn't find a field with field id " + fieldID);
+  public void setColumnIsSet(boolean value) {
+    if (!value) {
+      this.column = null;
     }
   }
 
-  @Override
-  protected void tupleSchemeWriteValue(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol oprot) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-    switch (setField_) {
-      case NULL_VALUE:
-        Boolean nullValue = (Boolean)value_;
-        oprot.writeBool(nullValue);
-        return;
-      case STRING_VALUE:
-        String stringValue = (String)value_;
-        oprot.writeString(stringValue);
-        return;
-      case INT_VALUE:
-        Integer intValue = (Integer)value_;
-        oprot.writeI32(intValue);
-        return;
-      case LONG_VALUE:
-        Long longValue = (Long)value_;
-        oprot.writeI64(longValue);
-        return;
-      case DOUBLE_VALUE:
-        Double doubleValue = (Double)value_;
-        oprot.writeDouble(doubleValue);
-        return;
-      case BINARY_VALUE:
-        ByteBuffer binaryValue = (ByteBuffer)value_;
-        oprot.writeBinary(binaryValue);
-        return;
-      default:
-        throw new IllegalStateException("Cannot write union with unknown field " + setField_);
-    }
+  public boolean isReverse() {
+    return this.reverse;
   }
 
-  @Override
-  protected org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField getFieldDesc(_Fields setField) {
-    switch (setField) {
-      case NULL_VALUE:
-        return NULL_VALUE_FIELD_DESC;
-      case STRING_VALUE:
-        return STRING_VALUE_FIELD_DESC;
-      case INT_VALUE:
-        return INT_VALUE_FIELD_DESC;
-      case LONG_VALUE:
-        return LONG_VALUE_FIELD_DESC;
-      case DOUBLE_VALUE:
-        return DOUBLE_VALUE_FIELD_DESC;
-      case BINARY_VALUE:
-        return BINARY_VALUE_FIELD_DESC;
-      default:
-        throw new IllegalArgumentException("Unknown field id " + setField);
-    }
+  public SortField setReverse(boolean reverse) {
+    this.reverse = reverse;
+    setReverseIsSet(true);
+    return this;
   }
 
-  @Override
-  protected org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct getStructDesc() {
-    return STRUCT_DESC;
+  public void unsetReverse() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REVERSE_ISSET_ID);
   }
 
-  @Override
-  protected _Fields enumForId(short id) {
-    return _Fields.findByThriftIdOrThrow(id);
+  /** Returns true if field reverse is set (has been assigned a value) and false otherwise */
+  public boolean isSetReverse() {
+    return EncodingUtils.testBit(__isset_bitfield, __REVERSE_ISSET_ID);
   }
 
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
+  public void setReverseIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REVERSE_ISSET_ID, value);
   }
 
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case FAMILY:
+      if (value == null) {
+        unsetFamily();
+      } else {
+        setFamily((String)value);
+      }
+      break;
 
-  public boolean getNullValue() {
-    if (getSetField() == _Fields.NULL_VALUE) {
-      return (Boolean)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'nullValue' because union is currently set to " + getFieldDesc(getSetField()).name);
-    }
-  }
+    case COLUMN:
+      if (value == null) {
+        unsetColumn();
+      } else {
+        setColumn((String)value);
+      }
+      break;
 
-  public void setNullValue(boolean value) {
-    setField_ = _Fields.NULL_VALUE;
-    value_ = value;
-  }
+    case REVERSE:
+      if (value == null) {
+        unsetReverse();
+      } else {
+        setReverse((Boolean)value);
+      }
+      break;
 
-  public String getStringValue() {
-    if (getSetField() == _Fields.STRING_VALUE) {
-      return (String)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'stringValue' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
   }
 
-  public void setStringValue(String value) {
-    if (value == null) throw new NullPointerException();
-    setField_ = _Fields.STRING_VALUE;
-    value_ = value;
-  }
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case FAMILY:
+      return getFamily();
 
-  public int getIntValue() {
-    if (getSetField() == _Fields.INT_VALUE) {
-      return (Integer)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'intValue' because union is currently set to " + getFieldDesc(getSetField()).name);
-    }
-  }
+    case COLUMN:
+      return getColumn();
 
-  public void setIntValue(int value) {
-    setField_ = _Fields.INT_VALUE;
-    value_ = value;
-  }
+    case REVERSE:
+      return Boolean.valueOf(isReverse());
 
-  public long getLongValue() {
-    if (getSetField() == _Fields.LONG_VALUE) {
-      return (Long)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'longValue' because union is currently set to " + getFieldDesc(getSetField()).name);
     }
+    throw new IllegalStateException();
   }
 
-  public void setLongValue(long value) {
-    setField_ = _Fields.LONG_VALUE;
-    value_ = value;
-  }
+  /** 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();
+    }
 
-  public double getDoubleValue() {
-    if (getSetField() == _Fields.DOUBLE_VALUE) {
-      return (Double)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'doubleValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+    switch (field) {
+    case FAMILY:
+      return isSetFamily();
+    case COLUMN:
+      return isSetColumn();
+    case REVERSE:
+      return isSetReverse();
     }
+    throw new IllegalStateException();
   }
 
-  public void setDoubleValue(double value) {
-    setField_ = _Fields.DOUBLE_VALUE;
-    value_ = value;
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof SortField)
+      return this.equals((SortField)that);
+    return false;
   }
 
-  public byte[] getBinaryValue() {
-    setBinaryValue(org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.rightSize(bufferForBinaryValue()));
-    ByteBuffer b = bufferForBinaryValue();
-    return b == null ? null : b.array();
-  }
+  public boolean equals(SortField that) {
+    if (that == null)
+      return false;
 
-  public ByteBuffer bufferForBinaryValue() {
-    if (getSetField() == _Fields.BINARY_VALUE) {
-      return (ByteBuffer)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'binaryValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+    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;
     }
-  }
 
-  public void setBinaryValue(byte[] value) {
-    setBinaryValue(ByteBuffer.wrap(value));
-  }
+    boolean this_present_column = true && this.isSetColumn();
+    boolean that_present_column = true && that.isSetColumn();
+    if (this_present_column || that_present_column) {
+      if (!(this_present_column && that_present_column))
+        return false;
+      if (!this.column.equals(that.column))
+        return false;
+    }
 
-  public void setBinaryValue(ByteBuffer value) {
-    if (value == null) throw new NullPointerException();
-    setField_ = _Fields.BINARY_VALUE;
-    value_ = value;
-  }
+    boolean this_present_reverse = true;
+    boolean that_present_reverse = true;
+    if (this_present_reverse || that_present_reverse) {
+      if (!(this_present_reverse && that_present_reverse))
+        return false;
+      if (this.reverse != that.reverse)
+        return false;
+    }
 
-  public boolean isSetNullValue() {
-    return setField_ == _Fields.NULL_VALUE;
+    return true;
   }
 
-
-  public boolean isSetStringValue() {
-    return setField_ == _Fields.STRING_VALUE;
+  @Override
+  public int hashCode() {
+    return 0;
   }
 
+  public int compareTo(SortField other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
 
-  public boolean isSetIntValue() {
-    return setField_ == _Fields.INT_VALUE;
-  }
-
+    int lastComparison = 0;
+    SortField typedOther = (SortField)other;
 
-  public boolean isSetLongValue() {
-    return setField_ == _Fields.LONG_VALUE;
+    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(isSetColumn()).compareTo(typedOther.isSetColumn());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetColumn()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.column, typedOther.column);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetReverse()).compareTo(typedOther.isSetReverse());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetReverse()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.reverse, typedOther.reverse);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
   }
 
-
-  public boolean isSetDoubleValue() {
-    return setField_ == _Fields.DOUBLE_VALUE;
+  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 boolean isSetBinaryValue() {
-    return setField_ == _Fields.BINARY_VALUE;
+  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("SortField(");
+    boolean first = true;
 
-  public boolean equals(Object other) {
-    if (other instanceof SortField) {
-      return equals((SortField)other);
+    sb.append("family:");
+    if (this.family == null) {
+      sb.append("null");
     } else {
-      return false;
+      sb.append(this.family);
     }
-  }
-
-  public boolean equals(SortField other) {
-    return other != null && getSetField() == other.getSetField() && getFieldValue().equals(other.getFieldValue());
-  }
-
-  @Override
-  public int compareTo(SortField other) {
-    int lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(getSetField(), other.getSetField());
-    if (lastComparison == 0) {
-      return org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("column:");
+    if (this.column == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.column);
     }
-    return lastComparison;
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("reverse:");
+    sb.append(this.reverse);
+    first = false;
+    sb.append(")");
+    return sb.toString();
   }
 
-
-  /**
-   * If you'd like this to perform more respectably, use the hashcode generator option.
-   */
-  @Override
-  public int hashCode() {
-    return 0;
+  public void validate() throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+    // check for required fields
+    // check for sub-struct validity
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -607,14 +461,143 @@ public class SortField extends org.apache.blur.thirdparty.thrift_0_9_0.TUnion<So
     }
   }
 
-
   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_bitfield = 0;
       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 SortFieldStandardSchemeFactory implements SchemeFactory {
+    public SortFieldStandardScheme getScheme() {
+      return new SortFieldStandardScheme();
+    }
+  }
+
+  private static class SortFieldStandardScheme extends StandardScheme<SortField> {
+
+    public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol iprot, SortField 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: // 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
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) {
+              struct.column = iprot.readString();
+              struct.setColumnIsSet(true);
+            } else { 
+              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // REVERSE
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL) {
+              struct.reverse = iprot.readBool();
+              struct.setReverseIsSet(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, SortField struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.family != null) {
+        oprot.writeFieldBegin(FAMILY_FIELD_DESC);
+        oprot.writeString(struct.family);
+        oprot.writeFieldEnd();
+      }
+      if (struct.column != null) {
+        oprot.writeFieldBegin(COLUMN_FIELD_DESC);
+        oprot.writeString(struct.column);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(REVERSE_FIELD_DESC);
+      oprot.writeBool(struct.reverse);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class SortFieldTupleSchemeFactory implements SchemeFactory {
+    public SortFieldTupleScheme getScheme() {
+      return new SortFieldTupleScheme();
+    }
+  }
+
+  private static class SortFieldTupleScheme extends TupleScheme<SortField> {
+
+    @Override
+    public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, SortField struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetFamily()) {
+        optionals.set(0);
+      }
+      if (struct.isSetColumn()) {
+        optionals.set(1);
+      }
+      if (struct.isSetReverse()) {
+        optionals.set(2);
+      }
+      oprot.writeBitSet(optionals, 3);
+      if (struct.isSetFamily()) {
+        oprot.writeString(struct.family);
+      }
+      if (struct.isSetColumn()) {
+        oprot.writeString(struct.column);
+      }
+      if (struct.isSetReverse()) {
+        oprot.writeBool(struct.reverse);
+      }
+    }
+
+    @Override
+    public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, SortField struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(3);
+      if (incoming.get(0)) {
+        struct.family = iprot.readString();
+        struct.setFamilyIsSet(true);
+      }
+      if (incoming.get(1)) {
+        struct.column = iprot.readString();
+        struct.setColumnIsSet(true);
+      }
+      if (incoming.get(2)) {
+        struct.reverse = iprot.readBool();
+        struct.setReverseIsSet(true);
+      }
+    }
+  }
 
 }
+

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5e495671/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/SortFieldResult.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/SortFieldResult.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/SortFieldResult.java
new file mode 100644
index 0000000..13d49cf
--- /dev/null
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/SortFieldResult.java
@@ -0,0 +1,677 @@
+/**
+ * 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;
+
+/**
+ * Carries the one value from the sort that allows the merging of results.
+ */
+public class SortFieldResult extends org.apache.blur.thirdparty.thrift_0_9_0.TUnion<SortFieldResult, SortFieldResult._Fields> {
+  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("SortFieldResult");
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField NULL_VALUE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("nullValue", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)1);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField STRING_VALUE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("stringValue", 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 INT_VALUE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("intValue", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)3);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField LONG_VALUE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("longValue", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, (short)4);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField DOUBLE_VALUE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("doubleValue", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.DOUBLE, (short)5);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField BINARY_VALUE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("binaryValue", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)6);
+
+  /** 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 {
+    /**
+     * Carries the null boolean incase the field is null.
+     */
+    NULL_VALUE((short)1, "nullValue"),
+    /**
+     * The string value.
+     */
+    STRING_VALUE((short)2, "stringValue"),
+    /**
+     * The integer value.
+     */
+    INT_VALUE((short)3, "intValue"),
+    /**
+     * The long value.
+     */
+    LONG_VALUE((short)4, "longValue"),
+    /**
+     * The double value.
+     */
+    DOUBLE_VALUE((short)5, "doubleValue"),
+    /**
+     * The binary value.
+     */
+    BINARY_VALUE((short)6, "binaryValue");
+
+    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: // NULL_VALUE
+          return NULL_VALUE;
+        case 2: // STRING_VALUE
+          return STRING_VALUE;
+        case 3: // INT_VALUE
+          return INT_VALUE;
+        case 4: // LONG_VALUE
+          return LONG_VALUE;
+        case 5: // DOUBLE_VALUE
+          return DOUBLE_VALUE;
+        case 6: // BINARY_VALUE
+          return BINARY_VALUE;
+        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;
+    }
+  }
+
+  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.NULL_VALUE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("nullValue", 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.STRING_VALUE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("stringValue", 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.INT_VALUE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("intValue", 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.I32)));
+    tmpMap.put(_Fields.LONG_VALUE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("longValue", 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.I64)));
+    tmpMap.put(_Fields.DOUBLE_VALUE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("doubleValue", 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.DOUBLE)));
+    tmpMap.put(_Fields.BINARY_VALUE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("binaryValue", 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        , true)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(SortFieldResult.class, metaDataMap);
+  }
+
+  public SortFieldResult() {
+    super();
+  }
+
+  public SortFieldResult(_Fields setField, Object value) {
+    super(setField, value);
+  }
+
+  public SortFieldResult(SortFieldResult other) {
+    super(other);
+  }
+  public SortFieldResult deepCopy() {
+    return new SortFieldResult(this);
+  }
+
+  public static SortFieldResult nullValue(boolean value) {
+    SortFieldResult x = new SortFieldResult();
+    x.setNullValue(value);
+    return x;
+  }
+
+  public static SortFieldResult stringValue(String value) {
+    SortFieldResult x = new SortFieldResult();
+    x.setStringValue(value);
+    return x;
+  }
+
+  public static SortFieldResult intValue(int value) {
+    SortFieldResult x = new SortFieldResult();
+    x.setIntValue(value);
+    return x;
+  }
+
+  public static SortFieldResult longValue(long value) {
+    SortFieldResult x = new SortFieldResult();
+    x.setLongValue(value);
+    return x;
+  }
+
+  public static SortFieldResult doubleValue(double value) {
+    SortFieldResult x = new SortFieldResult();
+    x.setDoubleValue(value);
+    return x;
+  }
+
+  public static SortFieldResult binaryValue(ByteBuffer value) {
+    SortFieldResult x = new SortFieldResult();
+    x.setBinaryValue(value);
+    return x;
+  }
+
+  public static SortFieldResult binaryValue(byte[] value) {
+    SortFieldResult x = new SortFieldResult();
+    x.setBinaryValue(ByteBuffer.wrap(value));
+    return x;
+  }
+
+
+  @Override
+  protected void checkType(_Fields setField, Object value) throws ClassCastException {
+    switch (setField) {
+      case NULL_VALUE:
+        if (value instanceof Boolean) {
+          break;
+        }
+        throw new ClassCastException("Was expecting value of type Boolean for field 'nullValue', but got " + value.getClass().getSimpleName());
+      case STRING_VALUE:
+        if (value instanceof String) {
+          break;
+        }
+        throw new ClassCastException("Was expecting value of type String for field 'stringValue', but got " + value.getClass().getSimpleName());
+      case INT_VALUE:
+        if (value instanceof Integer) {
+          break;
+        }
+        throw new ClassCastException("Was expecting value of type Integer for field 'intValue', but got " + value.getClass().getSimpleName());
+      case LONG_VALUE:
+        if (value instanceof Long) {
+          break;
+        }
+        throw new ClassCastException("Was expecting value of type Long for field 'longValue', but got " + value.getClass().getSimpleName());
+      case DOUBLE_VALUE:
+        if (value instanceof Double) {
+          break;
+        }
+        throw new ClassCastException("Was expecting value of type Double for field 'doubleValue', but got " + value.getClass().getSimpleName());
+      case BINARY_VALUE:
+        if (value instanceof ByteBuffer) {
+          break;
+        }
+        throw new ClassCastException("Was expecting value of type ByteBuffer for field 'binaryValue', but got " + value.getClass().getSimpleName());
+      default:
+        throw new IllegalArgumentException("Unknown field id " + setField);
+    }
+  }
+
+  @Override
+  protected Object standardSchemeReadValue(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol iprot, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField field) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+    _Fields setField = _Fields.findByThriftId(field.id);
+    if (setField != null) {
+      switch (setField) {
+        case NULL_VALUE:
+          if (field.type == NULL_VALUE_FIELD_DESC.type) {
+            Boolean nullValue;
+            nullValue = iprot.readBool();
+            return nullValue;
+          } else {
+            org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, field.type);
+            return null;
+          }
+        case STRING_VALUE:
+          if (field.type == STRING_VALUE_FIELD_DESC.type) {
+            String stringValue;
+            stringValue = iprot.readString();
+            return stringValue;
+          } else {
+            org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, field.type);
+            return null;
+          }
+        case INT_VALUE:
+          if (field.type == INT_VALUE_FIELD_DESC.type) {
+            Integer intValue;
+            intValue = iprot.readI32();
+            return intValue;
+          } else {
+            org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, field.type);
+            return null;
+          }
+        case LONG_VALUE:
+          if (field.type == LONG_VALUE_FIELD_DESC.type) {
+            Long longValue;
+            longValue = iprot.readI64();
+            return longValue;
+          } else {
+            org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, field.type);
+            return null;
+          }
+        case DOUBLE_VALUE:
+          if (field.type == DOUBLE_VALUE_FIELD_DESC.type) {
+            Double doubleValue;
+            doubleValue = iprot.readDouble();
+            return doubleValue;
+          } else {
+            org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, field.type);
+            return null;
+          }
+        case BINARY_VALUE:
+          if (field.type == BINARY_VALUE_FIELD_DESC.type) {
+            ByteBuffer binaryValue;
+            binaryValue = iprot.readBinary();
+            return binaryValue;
+          } else {
+            org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, field.type);
+            return null;
+          }
+        default:
+          throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
+      }
+    } else {
+      return null;
+    }
+  }
+
+  @Override
+  protected void standardSchemeWriteValue(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol oprot) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+    switch (setField_) {
+      case NULL_VALUE:
+        Boolean nullValue = (Boolean)value_;
+        oprot.writeBool(nullValue);
+        return;
+      case STRING_VALUE:
+        String stringValue = (String)value_;
+        oprot.writeString(stringValue);
+        return;
+      case INT_VALUE:
+        Integer intValue = (Integer)value_;
+        oprot.writeI32(intValue);
+        return;
+      case LONG_VALUE:
+        Long longValue = (Long)value_;
+        oprot.writeI64(longValue);
+        return;
+      case DOUBLE_VALUE:
+        Double doubleValue = (Double)value_;
+        oprot.writeDouble(doubleValue);
+        return;
+      case BINARY_VALUE:
+        ByteBuffer binaryValue = (ByteBuffer)value_;
+        oprot.writeBinary(binaryValue);
+        return;
+      default:
+        throw new IllegalStateException("Cannot write union with unknown field " + setField_);
+    }
+  }
+
+  @Override
+  protected Object tupleSchemeReadValue(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol iprot, short fieldID) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+    _Fields setField = _Fields.findByThriftId(fieldID);
+    if (setField != null) {
+      switch (setField) {
+        case NULL_VALUE:
+          Boolean nullValue;
+          nullValue = iprot.readBool();
+          return nullValue;
+        case STRING_VALUE:
+          String stringValue;
+          stringValue = iprot.readString();
+          return stringValue;
+        case INT_VALUE:
+          Integer intValue;
+          intValue = iprot.readI32();
+          return intValue;
+        case LONG_VALUE:
+          Long longValue;
+          longValue = iprot.readI64();
+          return longValue;
+        case DOUBLE_VALUE:
+          Double doubleValue;
+          doubleValue = iprot.readDouble();
+          return doubleValue;
+        case BINARY_VALUE:
+          ByteBuffer binaryValue;
+          binaryValue = iprot.readBinary();
+          return binaryValue;
+        default:
+          throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
+      }
+    } else {
+      throw new TProtocolException("Couldn't find a field with field id " + fieldID);
+    }
+  }
+
+  @Override
+  protected void tupleSchemeWriteValue(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol oprot) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+    switch (setField_) {
+      case NULL_VALUE:
+        Boolean nullValue = (Boolean)value_;
+        oprot.writeBool(nullValue);
+        return;
+      case STRING_VALUE:
+        String stringValue = (String)value_;
+        oprot.writeString(stringValue);
+        return;
+      case INT_VALUE:
+        Integer intValue = (Integer)value_;
+        oprot.writeI32(intValue);
+        return;
+      case LONG_VALUE:
+        Long longValue = (Long)value_;
+        oprot.writeI64(longValue);
+        return;
+      case DOUBLE_VALUE:
+        Double doubleValue = (Double)value_;
+        oprot.writeDouble(doubleValue);
+        return;
+      case BINARY_VALUE:
+        ByteBuffer binaryValue = (ByteBuffer)value_;
+        oprot.writeBinary(binaryValue);
+        return;
+      default:
+        throw new IllegalStateException("Cannot write union with unknown field " + setField_);
+    }
+  }
+
+  @Override
+  protected org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField getFieldDesc(_Fields setField) {
+    switch (setField) {
+      case NULL_VALUE:
+        return NULL_VALUE_FIELD_DESC;
+      case STRING_VALUE:
+        return STRING_VALUE_FIELD_DESC;
+      case INT_VALUE:
+        return INT_VALUE_FIELD_DESC;
+      case LONG_VALUE:
+        return LONG_VALUE_FIELD_DESC;
+      case DOUBLE_VALUE:
+        return DOUBLE_VALUE_FIELD_DESC;
+      case BINARY_VALUE:
+        return BINARY_VALUE_FIELD_DESC;
+      default:
+        throw new IllegalArgumentException("Unknown field id " + setField);
+    }
+  }
+
+  @Override
+  protected org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct getStructDesc() {
+    return STRUCT_DESC;
+  }
+
+  @Override
+  protected _Fields enumForId(short id) {
+    return _Fields.findByThriftIdOrThrow(id);
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+
+  /**
+   * Carries the null boolean incase the field is null.
+   */
+  public boolean getNullValue() {
+    if (getSetField() == _Fields.NULL_VALUE) {
+      return (Boolean)getFieldValue();
+    } else {
+      throw new RuntimeException("Cannot get field 'nullValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+    }
+  }
+
+  /**
+   * Carries the null boolean incase the field is null.
+   */
+  public void setNullValue(boolean value) {
+    setField_ = _Fields.NULL_VALUE;
+    value_ = value;
+  }
+
+  /**
+   * The string value.
+   */
+  public String getStringValue() {
+    if (getSetField() == _Fields.STRING_VALUE) {
+      return (String)getFieldValue();
+    } else {
+      throw new RuntimeException("Cannot get field 'stringValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+    }
+  }
+
+  /**
+   * The string value.
+   */
+  public void setStringValue(String value) {
+    if (value == null) throw new NullPointerException();
+    setField_ = _Fields.STRING_VALUE;
+    value_ = value;
+  }
+
+  /**
+   * The integer value.
+   */
+  public int getIntValue() {
+    if (getSetField() == _Fields.INT_VALUE) {
+      return (Integer)getFieldValue();
+    } else {
+      throw new RuntimeException("Cannot get field 'intValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+    }
+  }
+
+  /**
+   * The integer value.
+   */
+  public void setIntValue(int value) {
+    setField_ = _Fields.INT_VALUE;
+    value_ = value;
+  }
+
+  /**
+   * The long value.
+   */
+  public long getLongValue() {
+    if (getSetField() == _Fields.LONG_VALUE) {
+      return (Long)getFieldValue();
+    } else {
+      throw new RuntimeException("Cannot get field 'longValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+    }
+  }
+
+  /**
+   * The long value.
+   */
+  public void setLongValue(long value) {
+    setField_ = _Fields.LONG_VALUE;
+    value_ = value;
+  }
+
+  /**
+   * The double value.
+   */
+  public double getDoubleValue() {
+    if (getSetField() == _Fields.DOUBLE_VALUE) {
+      return (Double)getFieldValue();
+    } else {
+      throw new RuntimeException("Cannot get field 'doubleValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+    }
+  }
+
+  /**
+   * The double value.
+   */
+  public void setDoubleValue(double value) {
+    setField_ = _Fields.DOUBLE_VALUE;
+    value_ = value;
+  }
+
+  /**
+   * The binary value.
+   */
+  public byte[] getBinaryValue() {
+    setBinaryValue(org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.rightSize(bufferForBinaryValue()));
+    ByteBuffer b = bufferForBinaryValue();
+    return b == null ? null : b.array();
+  }
+
+  public ByteBuffer bufferForBinaryValue() {
+    if (getSetField() == _Fields.BINARY_VALUE) {
+      return (ByteBuffer)getFieldValue();
+    } else {
+      throw new RuntimeException("Cannot get field 'binaryValue' because union is currently set to " + getFieldDesc(getSetField()).name);
+    }
+  }
+
+  /**
+   * The binary value.
+   */
+  public void setBinaryValue(byte[] value) {
+    setBinaryValue(ByteBuffer.wrap(value));
+  }
+
+  public void setBinaryValue(ByteBuffer value) {
+    if (value == null) throw new NullPointerException();
+    setField_ = _Fields.BINARY_VALUE;
+    value_ = value;
+  }
+
+  public boolean isSetNullValue() {
+    return setField_ == _Fields.NULL_VALUE;
+  }
+
+
+  public boolean isSetStringValue() {
+    return setField_ == _Fields.STRING_VALUE;
+  }
+
+
+  public boolean isSetIntValue() {
+    return setField_ == _Fields.INT_VALUE;
+  }
+
+
+  public boolean isSetLongValue() {
+    return setField_ == _Fields.LONG_VALUE;
+  }
+
+
+  public boolean isSetDoubleValue() {
+    return setField_ == _Fields.DOUBLE_VALUE;
+  }
+
+
+  public boolean isSetBinaryValue() {
+    return setField_ == _Fields.BINARY_VALUE;
+  }
+
+
+  public boolean equals(Object other) {
+    if (other instanceof SortFieldResult) {
+      return equals((SortFieldResult)other);
+    } else {
+      return false;
+    }
+  }
+
+  public boolean equals(SortFieldResult other) {
+    return other != null && getSetField() == other.getSetField() && getFieldValue().equals(other.getFieldValue());
+  }
+
+  @Override
+  public int compareTo(SortFieldResult other) {
+    int lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(getSetField(), other.getSetField());
+    if (lastComparison == 0) {
+      return org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
+    }
+    return lastComparison;
+  }
+
+
+  /**
+   * If you'd like this to perform more respectably, use the hashcode generator option.
+   */
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  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);
+    }
+  }
+
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5e495671/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
index 9b7075f..894f5a8 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
@@ -1751,13 +1751,13 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           case 11: // BLOCK_CACHING_FILE_TYPES
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set148 = iprot.readSetBegin();
-                struct.blockCachingFileTypes = new HashSet<String>(2*_set148.size);
-                for (int _i149 = 0; _i149 < _set148.size; ++_i149)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set156 = iprot.readSetBegin();
+                struct.blockCachingFileTypes = new HashSet<String>(2*_set156.size);
+                for (int _i157 = 0; _i157 < _set156.size; ++_i157)
                 {
-                  String _elem150; // required
-                  _elem150 = iprot.readString();
-                  struct.blockCachingFileTypes.add(_elem150);
+                  String _elem158; // required
+                  _elem158 = iprot.readString();
+                  struct.blockCachingFileTypes.add(_elem158);
                 }
                 iprot.readSetEnd();
               }
@@ -1777,13 +1777,13 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           case 13: // 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 _list151 = iprot.readListBegin();
-                struct.preCacheCols = new ArrayList<String>(_list151.size);
-                for (int _i152 = 0; _i152 < _list151.size; ++_i152)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list159 = iprot.readListBegin();
+                struct.preCacheCols = new ArrayList<String>(_list159.size);
+                for (int _i160 = 0; _i160 < _list159.size; ++_i160)
                 {
-                  String _elem153; // required
-                  _elem153 = iprot.readString();
-                  struct.preCacheCols.add(_elem153);
+                  String _elem161; // required
+                  _elem161 = iprot.readString();
+                  struct.preCacheCols.add(_elem161);
                 }
                 iprot.readListEnd();
               }
@@ -1795,15 +1795,15 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           case 14: // TABLE_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 _map154 = iprot.readMapBegin();
-                struct.tableProperties = new HashMap<String,String>(2*_map154.size);
-                for (int _i155 = 0; _i155 < _map154.size; ++_i155)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map162 = iprot.readMapBegin();
+                struct.tableProperties = new HashMap<String,String>(2*_map162.size);
+                for (int _i163 = 0; _i163 < _map162.size; ++_i163)
                 {
-                  String _key156; // optional
-                  String _val157; // required
-                  _key156 = iprot.readString();
-                  _val157 = iprot.readString();
-                  struct.tableProperties.put(_key156, _val157);
+                  String _key164; // optional
+                  String _val165; // required
+                  _key164 = iprot.readString();
+                  _val165 = iprot.readString();
+                  struct.tableProperties.put(_key164, _val165);
                 }
                 iprot.readMapEnd();
               }
@@ -1839,15 +1839,15 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           case 18: // DEFAULT_MISSING_FIELD_PROPS
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map158 = iprot.readMapBegin();
-                struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map158.size);
-                for (int _i159 = 0; _i159 < _map158.size; ++_i159)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map166 = iprot.readMapBegin();
+                struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map166.size);
+                for (int _i167 = 0; _i167 < _map166.size; ++_i167)
                 {
-                  String _key160; // optional
-                  String _val161; // required
-                  _key160 = iprot.readString();
-                  _val161 = iprot.readString();
-                  struct.defaultMissingFieldProps.put(_key160, _val161);
+                  String _key168; // optional
+                  String _val169; // required
+                  _key168 = iprot.readString();
+                  _val169 = iprot.readString();
+                  struct.defaultMissingFieldProps.put(_key168, _val169);
                 }
                 iprot.readMapEnd();
               }
@@ -1904,9 +1904,9 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         oprot.writeFieldBegin(BLOCK_CACHING_FILE_TYPES_FIELD_DESC);
         {
           oprot.writeSetBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, struct.blockCachingFileTypes.size()));
-          for (String _iter162 : struct.blockCachingFileTypes)
+          for (String _iter170 : struct.blockCachingFileTypes)
           {
-            oprot.writeString(_iter162);
+            oprot.writeString(_iter170);
           }
           oprot.writeSetEnd();
         }
@@ -1919,9 +1919,9 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         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 _iter163 : struct.preCacheCols)
+          for (String _iter171 : struct.preCacheCols)
           {
-            oprot.writeString(_iter163);
+            oprot.writeString(_iter171);
           }
           oprot.writeListEnd();
         }
@@ -1931,10 +1931,10 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         oprot.writeFieldBegin(TABLE_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.STRING, struct.tableProperties.size()));
-          for (Map.Entry<String, String> _iter164 : struct.tableProperties.entrySet())
+          for (Map.Entry<String, String> _iter172 : struct.tableProperties.entrySet())
           {
-            oprot.writeString(_iter164.getKey());
-            oprot.writeString(_iter164.getValue());
+            oprot.writeString(_iter172.getKey());
+            oprot.writeString(_iter172.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -1955,10 +1955,10 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         oprot.writeFieldBegin(DEFAULT_MISSING_FIELD_PROPS_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.defaultMissingFieldProps.size()));
-          for (Map.Entry<String, String> _iter165 : struct.defaultMissingFieldProps.entrySet())
+          for (Map.Entry<String, String> _iter173 : struct.defaultMissingFieldProps.entrySet())
           {
-            oprot.writeString(_iter165.getKey());
-            oprot.writeString(_iter165.getValue());
+            oprot.writeString(_iter173.getKey());
+            oprot.writeString(_iter173.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -2052,9 +2052,9 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       if (struct.isSetBlockCachingFileTypes()) {
         {
           oprot.writeI32(struct.blockCachingFileTypes.size());
-          for (String _iter166 : struct.blockCachingFileTypes)
+          for (String _iter174 : struct.blockCachingFileTypes)
           {
-            oprot.writeString(_iter166);
+            oprot.writeString(_iter174);
           }
         }
       }
@@ -2064,19 +2064,19 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       if (struct.isSetPreCacheCols()) {
         {
           oprot.writeI32(struct.preCacheCols.size());
-          for (String _iter167 : struct.preCacheCols)
+          for (String _iter175 : struct.preCacheCols)
           {
-            oprot.writeString(_iter167);
+            oprot.writeString(_iter175);
           }
         }
       }
       if (struct.isSetTableProperties()) {
         {
           oprot.writeI32(struct.tableProperties.size());
-          for (Map.Entry<String, String> _iter168 : struct.tableProperties.entrySet())
+          for (Map.Entry<String, String> _iter176 : struct.tableProperties.entrySet())
           {
-            oprot.writeString(_iter168.getKey());
-            oprot.writeString(_iter168.getValue());
+            oprot.writeString(_iter176.getKey());
+            oprot.writeString(_iter176.getValue());
           }
         }
       }
@@ -2092,10 +2092,10 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       if (struct.isSetDefaultMissingFieldProps()) {
         {
           oprot.writeI32(struct.defaultMissingFieldProps.size());
-          for (Map.Entry<String, String> _iter169 : struct.defaultMissingFieldProps.entrySet())
+          for (Map.Entry<String, String> _iter177 : struct.defaultMissingFieldProps.entrySet())
           {
-            oprot.writeString(_iter169.getKey());
-            oprot.writeString(_iter169.getValue());
+            oprot.writeString(_iter177.getKey());
+            oprot.writeString(_iter177.getValue());
           }
         }
       }
@@ -2135,13 +2135,13 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       }
       if (incoming.get(7)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set170 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
-          struct.blockCachingFileTypes = new HashSet<String>(2*_set170.size);
-          for (int _i171 = 0; _i171 < _set170.size; ++_i171)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set178 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
+          struct.blockCachingFileTypes = new HashSet<String>(2*_set178.size);
+          for (int _i179 = 0; _i179 < _set178.size; ++_i179)
           {
-            String _elem172; // required
-            _elem172 = iprot.readString();
-            struct.blockCachingFileTypes.add(_elem172);
+            String _elem180; // required
+            _elem180 = iprot.readString();
+            struct.blockCachingFileTypes.add(_elem180);
           }
         }
         struct.setBlockCachingFileTypesIsSet(true);
@@ -2152,28 +2152,28 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       }
       if (incoming.get(9)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list173 = 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>(_list173.size);
-          for (int _i174 = 0; _i174 < _list173.size; ++_i174)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list181 = 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>(_list181.size);
+          for (int _i182 = 0; _i182 < _list181.size; ++_i182)
           {
-            String _elem175; // required
-            _elem175 = iprot.readString();
-            struct.preCacheCols.add(_elem175);
+            String _elem183; // required
+            _elem183 = iprot.readString();
+            struct.preCacheCols.add(_elem183);
           }
         }
         struct.setPreCacheColsIsSet(true);
       }
       if (incoming.get(10)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map176 = 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.tableProperties = new HashMap<String,String>(2*_map176.size);
-          for (int _i177 = 0; _i177 < _map176.size; ++_i177)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map184 = 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.tableProperties = new HashMap<String,String>(2*_map184.size);
+          for (int _i185 = 0; _i185 < _map184.size; ++_i185)
           {
-            String _key178; // optional
-            String _val179; // required
-            _key178 = iprot.readString();
-            _val179 = iprot.readString();
-            struct.tableProperties.put(_key178, _val179);
+            String _key186; // optional
+            String _val187; // required
+            _key186 = iprot.readString();
+            _val187 = iprot.readString();
+            struct.tableProperties.put(_key186, _val187);
           }
         }
         struct.setTablePropertiesIsSet(true);
@@ -2192,15 +2192,15 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       }
       if (incoming.get(14)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map180 = 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.defaultMissingFieldProps = new HashMap<String,String>(2*_map180.size);
-          for (int _i181 = 0; _i181 < _map180.size; ++_i181)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map188 = 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.defaultMissingFieldProps = new HashMap<String,String>(2*_map188.size);
+          for (int _i189 = 0; _i189 < _map188.size; ++_i189)
           {
-            String _key182; // optional
-            String _val183; // required
-            _key182 = iprot.readString();
-            _val183 = iprot.readString();
-            struct.defaultMissingFieldProps.put(_key182, _val183);
+            String _key190; // optional
+            String _val191; // required
+            _key190 = iprot.readString();
+            _val191 = iprot.readString();
+            struct.defaultMissingFieldProps.put(_key190, _val191);
           }
         }
         struct.setDefaultMissingFieldPropsIsSet(true);


Mime
View raw message