incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [4/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:02 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/BlurQuery.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQuery.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQuery.java
index a2e7850..9c6d71d 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQuery.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQuery.java
@@ -68,6 +68,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField USER_CONTEXT_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("userContext", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)12);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField CACHE_RESULT_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("cacheResult", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)13);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField START_TIME_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("startTime", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, (short)14);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField SORT_FIELDS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("sortFields", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, (short)15);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -125,6 +126,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
    * Sets the start time, if 0 the controller sets the time.
    */
   public long startTime; // required
+  public List<SortField> sortFields; // 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 {
@@ -177,7 +179,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     /**
      * Sets the start time, if 0 the controller sets the time.
      */
-    START_TIME((short)14, "startTime");
+    START_TIME((short)14, "startTime"),
+    SORT_FIELDS((short)15, "sortFields");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -216,6 +219,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
           return CACHE_RESULT;
         case 14: // START_TIME
           return START_TIME;
+        case 15: // SORT_FIELDS
+          return SORT_FIELDS;
         default:
           return null;
       }
@@ -292,6 +297,9 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
         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.START_TIME, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("startTime", 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.SORT_FIELDS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("sortFields", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
+        new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.ListMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, 
+            new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, SortField.class))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(BlurQuery.class, metaDataMap);
   }
@@ -325,7 +333,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     String uuid,
     String userContext,
     boolean cacheResult,
-    long startTime)
+    long startTime,
+    List<SortField> sortFields)
   {
     this();
     this.query = query;
@@ -347,6 +356,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     setCacheResultIsSet(true);
     this.startTime = startTime;
     setStartTimeIsSet(true);
+    this.sortFields = sortFields;
   }
 
   /**
@@ -380,6 +390,13 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     }
     this.cacheResult = other.cacheResult;
     this.startTime = other.startTime;
+    if (other.isSetSortFields()) {
+      List<SortField> __this__sortFields = new ArrayList<SortField>();
+      for (SortField other_element : other.sortFields) {
+        __this__sortFields.add(new SortField(other_element));
+      }
+      this.sortFields = __this__sortFields;
+    }
   }
 
   public BlurQuery deepCopy() {
@@ -407,6 +424,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
 
     this.startTime = 0L;
 
+    this.sortFields = null;
   }
 
   /**
@@ -781,6 +799,45 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
   }
 
+  public int getSortFieldsSize() {
+    return (this.sortFields == null) ? 0 : this.sortFields.size();
+  }
+
+  public java.util.Iterator<SortField> getSortFieldsIterator() {
+    return (this.sortFields == null) ? null : this.sortFields.iterator();
+  }
+
+  public void addToSortFields(SortField elem) {
+    if (this.sortFields == null) {
+      this.sortFields = new ArrayList<SortField>();
+    }
+    this.sortFields.add(elem);
+  }
+
+  public List<SortField> getSortFields() {
+    return this.sortFields;
+  }
+
+  public BlurQuery setSortFields(List<SortField> sortFields) {
+    this.sortFields = sortFields;
+    return this;
+  }
+
+  public void unsetSortFields() {
+    this.sortFields = null;
+  }
+
+  /** Returns true if field sortFields is set (has been assigned a value) and false otherwise */
+  public boolean isSetSortFields() {
+    return this.sortFields != null;
+  }
+
+  public void setSortFieldsIsSet(boolean value) {
+    if (!value) {
+      this.sortFields = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case QUERY:
@@ -879,6 +936,14 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       }
       break;
 
+    case SORT_FIELDS:
+      if (value == null) {
+        unsetSortFields();
+      } else {
+        setSortFields((List<SortField>)value);
+      }
+      break;
+
     }
   }
 
@@ -920,6 +985,9 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     case START_TIME:
       return Long.valueOf(getStartTime());
 
+    case SORT_FIELDS:
+      return getSortFields();
+
     }
     throw new IllegalStateException();
   }
@@ -955,6 +1023,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       return isSetCacheResult();
     case START_TIME:
       return isSetStartTime();
+    case SORT_FIELDS:
+      return isSetSortFields();
     }
     throw new IllegalStateException();
   }
@@ -1080,6 +1150,15 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
         return false;
     }
 
+    boolean this_present_sortFields = true && this.isSetSortFields();
+    boolean that_present_sortFields = true && that.isSetSortFields();
+    if (this_present_sortFields || that_present_sortFields) {
+      if (!(this_present_sortFields && that_present_sortFields))
+        return false;
+      if (!this.sortFields.equals(that.sortFields))
+        return false;
+    }
+
     return true;
   }
 
@@ -1216,6 +1295,16 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetSortFields()).compareTo(typedOther.isSetSortFields());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetSortFields()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.sortFields, typedOther.sortFields);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -1303,6 +1392,14 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     sb.append("startTime:");
     sb.append(this.startTime);
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("sortFields:");
+    if (this.sortFields == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.sortFields);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -1463,6 +1560,25 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 15: // SORT_FIELDS
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
+              {
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list53 = iprot.readListBegin();
+                struct.sortFields = new ArrayList<SortField>(_list53.size);
+                for (int _i54 = 0; _i54 < _list53.size; ++_i54)
+                {
+                  SortField _elem55; // required
+                  _elem55 = new SortField();
+                  _elem55.read(iprot);
+                  struct.sortFields.add(_elem55);
+                }
+                iprot.readListEnd();
+              }
+              struct.setSortFieldsIsSet(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);
         }
@@ -1487,9 +1603,9 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
         oprot.writeFieldBegin(FACETS_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.STRUCT, struct.facets.size()));
-          for (Facet _iter53 : struct.facets)
+          for (Facet _iter56 : struct.facets)
           {
-            _iter53.write(oprot);
+            _iter56.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -1531,6 +1647,18 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       oprot.writeFieldBegin(START_TIME_FIELD_DESC);
       oprot.writeI64(struct.startTime);
       oprot.writeFieldEnd();
+      if (struct.sortFields != null) {
+        oprot.writeFieldBegin(SORT_FIELDS_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.STRUCT, struct.sortFields.size()));
+          for (SortField _iter57 : struct.sortFields)
+          {
+            _iter57.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -1585,16 +1713,19 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       if (struct.isSetStartTime()) {
         optionals.set(11);
       }
-      oprot.writeBitSet(optionals, 12);
+      if (struct.isSetSortFields()) {
+        optionals.set(12);
+      }
+      oprot.writeBitSet(optionals, 13);
       if (struct.isSetQuery()) {
         struct.query.write(oprot);
       }
       if (struct.isSetFacets()) {
         {
           oprot.writeI32(struct.facets.size());
-          for (Facet _iter54 : struct.facets)
+          for (Facet _iter58 : struct.facets)
           {
-            _iter54.write(oprot);
+            _iter58.write(oprot);
           }
         }
       }
@@ -1628,12 +1759,21 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       if (struct.isSetStartTime()) {
         oprot.writeI64(struct.startTime);
       }
+      if (struct.isSetSortFields()) {
+        {
+          oprot.writeI32(struct.sortFields.size());
+          for (SortField _iter59 : struct.sortFields)
+          {
+            _iter59.write(oprot);
+          }
+        }
+      }
     }
 
     @Override
     public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, BlurQuery struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(12);
+      BitSet incoming = iprot.readBitSet(13);
       if (incoming.get(0)) {
         struct.query = new Query();
         struct.query.read(iprot);
@@ -1641,14 +1781,14 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       }
       if (incoming.get(1)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list55 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
-          struct.facets = new ArrayList<Facet>(_list55.size);
-          for (int _i56 = 0; _i56 < _list55.size; ++_i56)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list60 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
+          struct.facets = new ArrayList<Facet>(_list60.size);
+          for (int _i61 = 0; _i61 < _list60.size; ++_i61)
           {
-            Facet _elem57; // required
-            _elem57 = new Facet();
-            _elem57.read(iprot);
-            struct.facets.add(_elem57);
+            Facet _elem62; // required
+            _elem62 = new Facet();
+            _elem62.read(iprot);
+            struct.facets.add(_elem62);
           }
         }
         struct.setFacetsIsSet(true);
@@ -1694,6 +1834,20 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
         struct.startTime = iprot.readI64();
         struct.setStartTimeIsSet(true);
       }
+      if (incoming.get(12)) {
+        {
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list63 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
+          struct.sortFields = new ArrayList<SortField>(_list63.size);
+          for (int _i64 = 0; _i64 < _list63.size; ++_i64)
+          {
+            SortField _elem65; // required
+            _elem65 = new SortField();
+            _elem65.read(iprot);
+            struct.sortFields.add(_elem65);
+          }
+        }
+        struct.setSortFieldsIsSet(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/BlurQueryStatus.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java
index a5fa7e7..0183ded 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java
@@ -954,16 +954,16 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
           case 2: // CPU_TIMES
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map108 = iprot.readMapBegin();
-                struct.cpuTimes = new HashMap<String,CpuTime>(2*_map108.size);
-                for (int _i109 = 0; _i109 < _map108.size; ++_i109)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map116 = iprot.readMapBegin();
+                struct.cpuTimes = new HashMap<String,CpuTime>(2*_map116.size);
+                for (int _i117 = 0; _i117 < _map116.size; ++_i117)
                 {
-                  String _key110; // optional
-                  CpuTime _val111; // required
-                  _key110 = iprot.readString();
-                  _val111 = new CpuTime();
-                  _val111.read(iprot);
-                  struct.cpuTimes.put(_key110, _val111);
+                  String _key118; // optional
+                  CpuTime _val119; // required
+                  _key118 = iprot.readString();
+                  _val119 = new CpuTime();
+                  _val119.read(iprot);
+                  struct.cpuTimes.put(_key118, _val119);
                 }
                 iprot.readMapEnd();
               }
@@ -1036,10 +1036,10 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
         oprot.writeFieldBegin(CPU_TIMES_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, struct.cpuTimes.size()));
-          for (Map.Entry<String, CpuTime> _iter112 : struct.cpuTimes.entrySet())
+          for (Map.Entry<String, CpuTime> _iter120 : struct.cpuTimes.entrySet())
           {
-            oprot.writeString(_iter112.getKey());
-            _iter112.getValue().write(oprot);
+            oprot.writeString(_iter120.getKey());
+            _iter120.getValue().write(oprot);
           }
           oprot.writeMapEnd();
         }
@@ -1112,10 +1112,10 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
       if (struct.isSetCpuTimes()) {
         {
           oprot.writeI32(struct.cpuTimes.size());
-          for (Map.Entry<String, CpuTime> _iter113 : struct.cpuTimes.entrySet())
+          for (Map.Entry<String, CpuTime> _iter121 : struct.cpuTimes.entrySet())
           {
-            oprot.writeString(_iter113.getKey());
-            _iter113.getValue().write(oprot);
+            oprot.writeString(_iter121.getKey());
+            _iter121.getValue().write(oprot);
           }
         }
       }
@@ -1147,16 +1147,16 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
       }
       if (incoming.get(1)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map114 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
-          struct.cpuTimes = new HashMap<String,CpuTime>(2*_map114.size);
-          for (int _i115 = 0; _i115 < _map114.size; ++_i115)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map122 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
+          struct.cpuTimes = new HashMap<String,CpuTime>(2*_map122.size);
+          for (int _i123 = 0; _i123 < _map122.size; ++_i123)
           {
-            String _key116; // optional
-            CpuTime _val117; // required
-            _key116 = iprot.readString();
-            _val117 = new CpuTime();
-            _val117.read(iprot);
-            struct.cpuTimes.put(_key116, _val117);
+            String _key124; // optional
+            CpuTime _val125; // required
+            _key124 = iprot.readString();
+            _val125 = new CpuTime();
+            _val125.read(iprot);
+            struct.cpuTimes.put(_key124, _val125);
           }
         }
         struct.setCpuTimesIsSet(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/BlurResult.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResult.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResult.java
index 635ac7f..56b2559 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResult.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResult.java
@@ -58,7 +58,7 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField LOCATION_ID_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("locationId", 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 SCORE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("score", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.DOUBLE, (short)2);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField FETCH_RESULT_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("fetchResult", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)3);
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField SORT_FIELDS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("sortFields", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, (short)4);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField SORT_FIELD_RESULTS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("sortFieldResults", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, (short)4);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -81,7 +81,7 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
   /**
    * The fields used for sorting.
    */
-  public List<SortField> sortFields; // required
+  public List<SortFieldResult> sortFieldResults; // 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 {
@@ -100,7 +100,7 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
     /**
      * The fields used for sorting.
      */
-    SORT_FIELDS((short)4, "sortFields");
+    SORT_FIELD_RESULTS((short)4, "sortFieldResults");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -121,8 +121,8 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
           return SCORE;
         case 3: // FETCH_RESULT
           return FETCH_RESULT;
-        case 4: // SORT_FIELDS
-          return SORT_FIELDS;
+        case 4: // SORT_FIELD_RESULTS
+          return SORT_FIELD_RESULTS;
         default:
           return null;
       }
@@ -174,9 +174,9 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
         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.FETCH_RESULT, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("fetchResult", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, FetchResult.class)));
-    tmpMap.put(_Fields.SORT_FIELDS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("sortFields", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.SORT_FIELD_RESULTS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("sortFieldResults", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.ListMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, 
-            new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, SortField.class))));
+            new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, SortFieldResult.class))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(BlurResult.class, metaDataMap);
   }
@@ -188,14 +188,14 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
     String locationId,
     double score,
     FetchResult fetchResult,
-    List<SortField> sortFields)
+    List<SortFieldResult> sortFieldResults)
   {
     this();
     this.locationId = locationId;
     this.score = score;
     setScoreIsSet(true);
     this.fetchResult = fetchResult;
-    this.sortFields = sortFields;
+    this.sortFieldResults = sortFieldResults;
   }
 
   /**
@@ -210,12 +210,12 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
     if (other.isSetFetchResult()) {
       this.fetchResult = new FetchResult(other.fetchResult);
     }
-    if (other.isSetSortFields()) {
-      List<SortField> __this__sortFields = new ArrayList<SortField>();
-      for (SortField other_element : other.sortFields) {
-        __this__sortFields.add(new SortField(other_element));
+    if (other.isSetSortFieldResults()) {
+      List<SortFieldResult> __this__sortFieldResults = new ArrayList<SortFieldResult>();
+      for (SortFieldResult other_element : other.sortFieldResults) {
+        __this__sortFieldResults.add(new SortFieldResult(other_element));
       }
-      this.sortFields = __this__sortFields;
+      this.sortFieldResults = __this__sortFieldResults;
     }
   }
 
@@ -229,7 +229,7 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
     setScoreIsSet(false);
     this.score = 0.0;
     this.fetchResult = null;
-    this.sortFields = null;
+    this.sortFieldResults = null;
   }
 
   /**
@@ -321,48 +321,48 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
     }
   }
 
-  public int getSortFieldsSize() {
-    return (this.sortFields == null) ? 0 : this.sortFields.size();
+  public int getSortFieldResultsSize() {
+    return (this.sortFieldResults == null) ? 0 : this.sortFieldResults.size();
   }
 
-  public java.util.Iterator<SortField> getSortFieldsIterator() {
-    return (this.sortFields == null) ? null : this.sortFields.iterator();
+  public java.util.Iterator<SortFieldResult> getSortFieldResultsIterator() {
+    return (this.sortFieldResults == null) ? null : this.sortFieldResults.iterator();
   }
 
-  public void addToSortFields(SortField elem) {
-    if (this.sortFields == null) {
-      this.sortFields = new ArrayList<SortField>();
+  public void addToSortFieldResults(SortFieldResult elem) {
+    if (this.sortFieldResults == null) {
+      this.sortFieldResults = new ArrayList<SortFieldResult>();
     }
-    this.sortFields.add(elem);
+    this.sortFieldResults.add(elem);
   }
 
   /**
    * The fields used for sorting.
    */
-  public List<SortField> getSortFields() {
-    return this.sortFields;
+  public List<SortFieldResult> getSortFieldResults() {
+    return this.sortFieldResults;
   }
 
   /**
    * The fields used for sorting.
    */
-  public BlurResult setSortFields(List<SortField> sortFields) {
-    this.sortFields = sortFields;
+  public BlurResult setSortFieldResults(List<SortFieldResult> sortFieldResults) {
+    this.sortFieldResults = sortFieldResults;
     return this;
   }
 
-  public void unsetSortFields() {
-    this.sortFields = null;
+  public void unsetSortFieldResults() {
+    this.sortFieldResults = null;
   }
 
-  /** Returns true if field sortFields is set (has been assigned a value) and false otherwise */
-  public boolean isSetSortFields() {
-    return this.sortFields != null;
+  /** Returns true if field sortFieldResults is set (has been assigned a value) and false otherwise */
+  public boolean isSetSortFieldResults() {
+    return this.sortFieldResults != null;
   }
 
-  public void setSortFieldsIsSet(boolean value) {
+  public void setSortFieldResultsIsSet(boolean value) {
     if (!value) {
-      this.sortFields = null;
+      this.sortFieldResults = null;
     }
   }
 
@@ -392,11 +392,11 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
       }
       break;
 
-    case SORT_FIELDS:
+    case SORT_FIELD_RESULTS:
       if (value == null) {
-        unsetSortFields();
+        unsetSortFieldResults();
       } else {
-        setSortFields((List<SortField>)value);
+        setSortFieldResults((List<SortFieldResult>)value);
       }
       break;
 
@@ -414,8 +414,8 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
     case FETCH_RESULT:
       return getFetchResult();
 
-    case SORT_FIELDS:
-      return getSortFields();
+    case SORT_FIELD_RESULTS:
+      return getSortFieldResults();
 
     }
     throw new IllegalStateException();
@@ -434,8 +434,8 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
       return isSetScore();
     case FETCH_RESULT:
       return isSetFetchResult();
-    case SORT_FIELDS:
-      return isSetSortFields();
+    case SORT_FIELD_RESULTS:
+      return isSetSortFieldResults();
     }
     throw new IllegalStateException();
   }
@@ -480,12 +480,12 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
         return false;
     }
 
-    boolean this_present_sortFields = true && this.isSetSortFields();
-    boolean that_present_sortFields = true && that.isSetSortFields();
-    if (this_present_sortFields || that_present_sortFields) {
-      if (!(this_present_sortFields && that_present_sortFields))
+    boolean this_present_sortFieldResults = true && this.isSetSortFieldResults();
+    boolean that_present_sortFieldResults = true && that.isSetSortFieldResults();
+    if (this_present_sortFieldResults || that_present_sortFieldResults) {
+      if (!(this_present_sortFieldResults && that_present_sortFieldResults))
         return false;
-      if (!this.sortFields.equals(that.sortFields))
+      if (!this.sortFieldResults.equals(that.sortFieldResults))
         return false;
     }
 
@@ -535,12 +535,12 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSortFields()).compareTo(typedOther.isSetSortFields());
+    lastComparison = Boolean.valueOf(isSetSortFieldResults()).compareTo(typedOther.isSetSortFieldResults());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetSortFields()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.sortFields, typedOther.sortFields);
+    if (isSetSortFieldResults()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.sortFieldResults, typedOther.sortFieldResults);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -585,11 +585,11 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("sortFields:");
-    if (this.sortFields == null) {
+    sb.append("sortFieldResults:");
+    if (this.sortFieldResults == null) {
       sb.append("null");
     } else {
-      sb.append(this.sortFields);
+      sb.append(this.sortFieldResults);
     }
     first = false;
     sb.append(")");
@@ -665,21 +665,21 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 4: // SORT_FIELDS
+          case 4: // SORT_FIELD_RESULTS
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list58 = iprot.readListBegin();
-                struct.sortFields = new ArrayList<SortField>(_list58.size);
-                for (int _i59 = 0; _i59 < _list58.size; ++_i59)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list66 = iprot.readListBegin();
+                struct.sortFieldResults = new ArrayList<SortFieldResult>(_list66.size);
+                for (int _i67 = 0; _i67 < _list66.size; ++_i67)
                 {
-                  SortField _elem60; // required
-                  _elem60 = new SortField();
-                  _elem60.read(iprot);
-                  struct.sortFields.add(_elem60);
+                  SortFieldResult _elem68; // required
+                  _elem68 = new SortFieldResult();
+                  _elem68.read(iprot);
+                  struct.sortFieldResults.add(_elem68);
                 }
                 iprot.readListEnd();
               }
-              struct.setSortFieldsIsSet(true);
+              struct.setSortFieldResultsIsSet(true);
             } else { 
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -712,13 +712,13 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
         struct.fetchResult.write(oprot);
         oprot.writeFieldEnd();
       }
-      if (struct.sortFields != null) {
-        oprot.writeFieldBegin(SORT_FIELDS_FIELD_DESC);
+      if (struct.sortFieldResults != null) {
+        oprot.writeFieldBegin(SORT_FIELD_RESULTS_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.STRUCT, struct.sortFields.size()));
-          for (SortField _iter61 : struct.sortFields)
+          oprot.writeListBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, struct.sortFieldResults.size()));
+          for (SortFieldResult _iter69 : struct.sortFieldResults)
           {
-            _iter61.write(oprot);
+            _iter69.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -751,7 +751,7 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
       if (struct.isSetFetchResult()) {
         optionals.set(2);
       }
-      if (struct.isSetSortFields()) {
+      if (struct.isSetSortFieldResults()) {
         optionals.set(3);
       }
       oprot.writeBitSet(optionals, 4);
@@ -764,12 +764,12 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
       if (struct.isSetFetchResult()) {
         struct.fetchResult.write(oprot);
       }
-      if (struct.isSetSortFields()) {
+      if (struct.isSetSortFieldResults()) {
         {
-          oprot.writeI32(struct.sortFields.size());
-          for (SortField _iter62 : struct.sortFields)
+          oprot.writeI32(struct.sortFieldResults.size());
+          for (SortFieldResult _iter70 : struct.sortFieldResults)
           {
-            _iter62.write(oprot);
+            _iter70.write(oprot);
           }
         }
       }
@@ -794,17 +794,17 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
       }
       if (incoming.get(3)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list63 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
-          struct.sortFields = new ArrayList<SortField>(_list63.size);
-          for (int _i64 = 0; _i64 < _list63.size; ++_i64)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list71 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
+          struct.sortFieldResults = new ArrayList<SortFieldResult>(_list71.size);
+          for (int _i72 = 0; _i72 < _list71.size; ++_i72)
           {
-            SortField _elem65; // required
-            _elem65 = new SortField();
-            _elem65.read(iprot);
-            struct.sortFields.add(_elem65);
+            SortFieldResult _elem73; // required
+            _elem73 = new SortFieldResult();
+            _elem73.read(iprot);
+            struct.sortFieldResults.add(_elem73);
           }
         }
-        struct.setSortFieldsIsSet(true);
+        struct.setSortFieldResultsIsSet(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/BlurResults.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResults.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResults.java
index 15f85e4..2d15c3b 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResults.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResults.java
@@ -896,15 +896,15 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
           case 2: // SHARD_INFO
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map66 = iprot.readMapBegin();
-                struct.shardInfo = new HashMap<String,Long>(2*_map66.size);
-                for (int _i67 = 0; _i67 < _map66.size; ++_i67)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map74 = iprot.readMapBegin();
+                struct.shardInfo = new HashMap<String,Long>(2*_map74.size);
+                for (int _i75 = 0; _i75 < _map74.size; ++_i75)
                 {
-                  String _key68; // optional
-                  long _val69; // required
-                  _key68 = iprot.readString();
-                  _val69 = iprot.readI64();
-                  struct.shardInfo.put(_key68, _val69);
+                  String _key76; // optional
+                  long _val77; // required
+                  _key76 = iprot.readString();
+                  _val77 = iprot.readI64();
+                  struct.shardInfo.put(_key76, _val77);
                 }
                 iprot.readMapEnd();
               }
@@ -916,14 +916,14 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
           case 3: // RESULTS
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list70 = iprot.readListBegin();
-                struct.results = new ArrayList<BlurResult>(_list70.size);
-                for (int _i71 = 0; _i71 < _list70.size; ++_i71)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list78 = iprot.readListBegin();
+                struct.results = new ArrayList<BlurResult>(_list78.size);
+                for (int _i79 = 0; _i79 < _list78.size; ++_i79)
                 {
-                  BlurResult _elem72; // required
-                  _elem72 = new BlurResult();
-                  _elem72.read(iprot);
-                  struct.results.add(_elem72);
+                  BlurResult _elem80; // required
+                  _elem80 = new BlurResult();
+                  _elem80.read(iprot);
+                  struct.results.add(_elem80);
                 }
                 iprot.readListEnd();
               }
@@ -935,13 +935,13 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
           case 4: // FACET_COUNTS
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list73 = iprot.readListBegin();
-                struct.facetCounts = new ArrayList<Long>(_list73.size);
-                for (int _i74 = 0; _i74 < _list73.size; ++_i74)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list81 = iprot.readListBegin();
+                struct.facetCounts = new ArrayList<Long>(_list81.size);
+                for (int _i82 = 0; _i82 < _list81.size; ++_i82)
                 {
-                  long _elem75; // required
-                  _elem75 = iprot.readI64();
-                  struct.facetCounts.add(_elem75);
+                  long _elem83; // required
+                  _elem83 = iprot.readI64();
+                  struct.facetCounts.add(_elem83);
                 }
                 iprot.readListEnd();
               }
@@ -953,14 +953,14 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
           case 5: // EXCEPTIONS
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list76 = iprot.readListBegin();
-                struct.exceptions = new ArrayList<BlurException>(_list76.size);
-                for (int _i77 = 0; _i77 < _list76.size; ++_i77)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list84 = iprot.readListBegin();
+                struct.exceptions = new ArrayList<BlurException>(_list84.size);
+                for (int _i85 = 0; _i85 < _list84.size; ++_i85)
                 {
-                  BlurException _elem78; // required
-                  _elem78 = new BlurException();
-                  _elem78.read(iprot);
-                  struct.exceptions.add(_elem78);
+                  BlurException _elem86; // required
+                  _elem86 = new BlurException();
+                  _elem86.read(iprot);
+                  struct.exceptions.add(_elem86);
                 }
                 iprot.readListEnd();
               }
@@ -1000,10 +1000,10 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
         oprot.writeFieldBegin(SHARD_INFO_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, struct.shardInfo.size()));
-          for (Map.Entry<String, Long> _iter79 : struct.shardInfo.entrySet())
+          for (Map.Entry<String, Long> _iter87 : struct.shardInfo.entrySet())
           {
-            oprot.writeString(_iter79.getKey());
-            oprot.writeI64(_iter79.getValue());
+            oprot.writeString(_iter87.getKey());
+            oprot.writeI64(_iter87.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -1013,9 +1013,9 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
         oprot.writeFieldBegin(RESULTS_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.STRUCT, struct.results.size()));
-          for (BlurResult _iter80 : struct.results)
+          for (BlurResult _iter88 : struct.results)
           {
-            _iter80.write(oprot);
+            _iter88.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -1025,9 +1025,9 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
         oprot.writeFieldBegin(FACET_COUNTS_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.I64, struct.facetCounts.size()));
-          for (long _iter81 : struct.facetCounts)
+          for (long _iter89 : struct.facetCounts)
           {
-            oprot.writeI64(_iter81);
+            oprot.writeI64(_iter89);
           }
           oprot.writeListEnd();
         }
@@ -1037,9 +1037,9 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
         oprot.writeFieldBegin(EXCEPTIONS_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.STRUCT, struct.exceptions.size()));
-          for (BlurException _iter82 : struct.exceptions)
+          for (BlurException _iter90 : struct.exceptions)
           {
-            _iter82.write(oprot);
+            _iter90.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -1093,37 +1093,37 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
       if (struct.isSetShardInfo()) {
         {
           oprot.writeI32(struct.shardInfo.size());
-          for (Map.Entry<String, Long> _iter83 : struct.shardInfo.entrySet())
+          for (Map.Entry<String, Long> _iter91 : struct.shardInfo.entrySet())
           {
-            oprot.writeString(_iter83.getKey());
-            oprot.writeI64(_iter83.getValue());
+            oprot.writeString(_iter91.getKey());
+            oprot.writeI64(_iter91.getValue());
           }
         }
       }
       if (struct.isSetResults()) {
         {
           oprot.writeI32(struct.results.size());
-          for (BlurResult _iter84 : struct.results)
+          for (BlurResult _iter92 : struct.results)
           {
-            _iter84.write(oprot);
+            _iter92.write(oprot);
           }
         }
       }
       if (struct.isSetFacetCounts()) {
         {
           oprot.writeI32(struct.facetCounts.size());
-          for (long _iter85 : struct.facetCounts)
+          for (long _iter93 : struct.facetCounts)
           {
-            oprot.writeI64(_iter85);
+            oprot.writeI64(_iter93);
           }
         }
       }
       if (struct.isSetExceptions()) {
         {
           oprot.writeI32(struct.exceptions.size());
-          for (BlurException _iter86 : struct.exceptions)
+          for (BlurException _iter94 : struct.exceptions)
           {
-            _iter86.write(oprot);
+            _iter94.write(oprot);
           }
         }
       }
@@ -1142,56 +1142,56 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
       }
       if (incoming.get(1)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map87 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, iprot.readI32());
-          struct.shardInfo = new HashMap<String,Long>(2*_map87.size);
-          for (int _i88 = 0; _i88 < _map87.size; ++_i88)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map95 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, iprot.readI32());
+          struct.shardInfo = new HashMap<String,Long>(2*_map95.size);
+          for (int _i96 = 0; _i96 < _map95.size; ++_i96)
           {
-            String _key89; // optional
-            long _val90; // required
-            _key89 = iprot.readString();
-            _val90 = iprot.readI64();
-            struct.shardInfo.put(_key89, _val90);
+            String _key97; // optional
+            long _val98; // required
+            _key97 = iprot.readString();
+            _val98 = iprot.readI64();
+            struct.shardInfo.put(_key97, _val98);
           }
         }
         struct.setShardInfoIsSet(true);
       }
       if (incoming.get(2)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list91 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
-          struct.results = new ArrayList<BlurResult>(_list91.size);
-          for (int _i92 = 0; _i92 < _list91.size; ++_i92)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list99 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
+          struct.results = new ArrayList<BlurResult>(_list99.size);
+          for (int _i100 = 0; _i100 < _list99.size; ++_i100)
           {
-            BlurResult _elem93; // required
-            _elem93 = new BlurResult();
-            _elem93.read(iprot);
-            struct.results.add(_elem93);
+            BlurResult _elem101; // required
+            _elem101 = new BlurResult();
+            _elem101.read(iprot);
+            struct.results.add(_elem101);
           }
         }
         struct.setResultsIsSet(true);
       }
       if (incoming.get(3)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list94 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, iprot.readI32());
-          struct.facetCounts = new ArrayList<Long>(_list94.size);
-          for (int _i95 = 0; _i95 < _list94.size; ++_i95)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list102 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, iprot.readI32());
+          struct.facetCounts = new ArrayList<Long>(_list102.size);
+          for (int _i103 = 0; _i103 < _list102.size; ++_i103)
           {
-            long _elem96; // required
-            _elem96 = iprot.readI64();
-            struct.facetCounts.add(_elem96);
+            long _elem104; // required
+            _elem104 = iprot.readI64();
+            struct.facetCounts.add(_elem104);
           }
         }
         struct.setFacetCountsIsSet(true);
       }
       if (incoming.get(4)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list97 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
-          struct.exceptions = new ArrayList<BlurException>(_list97.size);
-          for (int _i98 = 0; _i98 < _list97.size; ++_i98)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list105 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
+          struct.exceptions = new ArrayList<BlurException>(_list105.size);
+          for (int _i106 = 0; _i106 < _list105.size; ++_i106)
           {
-            BlurException _elem99; // required
-            _elem99 = new BlurException();
-            _elem99.read(iprot);
-            struct.exceptions.add(_elem99);
+            BlurException _elem107; // required
+            _elem107 = new BlurException();
+            _elem107.read(iprot);
+            struct.exceptions.add(_elem107);
           }
         }
         struct.setExceptionsIsSet(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/ColumnDefinition.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java
index d39d208..2fb5811 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java
@@ -61,6 +61,7 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField FIELD_LESS_INDEXED_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("fieldLessIndexed", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)4);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField FIELD_TYPE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("fieldType", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)5);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField PROPERTIES_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("properties", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, (short)6);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField SORTABLE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("sortable", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)7);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -102,6 +103,10 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
    * For any custom field types, you can pass in configuration properties.
    */
   public Map<String,String> properties; // required
+  /**
+   * This will attempt to enable sorting for this column, if the type does not support sorting then an exception will be thrown.
+   */
+  public boolean sortable; // 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 {
@@ -138,7 +143,11 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
     /**
      * For any custom field types, you can pass in configuration properties.
      */
-    PROPERTIES((short)6, "properties");
+    PROPERTIES((short)6, "properties"),
+    /**
+     * This will attempt to enable sorting for this column, if the type does not support sorting then an exception will be thrown.
+     */
+    SORTABLE((short)7, "sortable");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -165,6 +174,8 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
           return FIELD_TYPE;
         case 6: // PROPERTIES
           return PROPERTIES;
+        case 7: // SORTABLE
+          return SORTABLE;
         default:
           return null;
       }
@@ -206,6 +217,7 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
 
   // isset id assignments
   private static final int __FIELDLESSINDEXED_ISSET_ID = 0;
+  private static final int __SORTABLE_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   public static final Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> metaDataMap;
   static {
@@ -224,6 +236,8 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.MapMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, 
             new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING), 
             new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING))));
+    tmpMap.put(_Fields.SORTABLE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("sortable", 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(ColumnDefinition.class, metaDataMap);
   }
@@ -237,7 +251,8 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
     String subColumnName,
     boolean fieldLessIndexed,
     String fieldType,
-    Map<String,String> properties)
+    Map<String,String> properties,
+    boolean sortable)
   {
     this();
     this.family = family;
@@ -247,6 +262,8 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
     setFieldLessIndexedIsSet(true);
     this.fieldType = fieldType;
     this.properties = properties;
+    this.sortable = sortable;
+    setSortableIsSet(true);
   }
 
   /**
@@ -282,6 +299,7 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
       }
       this.properties = __this__properties;
     }
+    this.sortable = other.sortable;
   }
 
   public ColumnDefinition deepCopy() {
@@ -297,6 +315,8 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
     this.fieldLessIndexed = false;
     this.fieldType = null;
     this.properties = null;
+    setSortableIsSet(false);
+    this.sortable = false;
   }
 
   /**
@@ -509,6 +529,35 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
     }
   }
 
+  /**
+   * This will attempt to enable sorting for this column, if the type does not support sorting then an exception will be thrown.
+   */
+  public boolean isSortable() {
+    return this.sortable;
+  }
+
+  /**
+   * This will attempt to enable sorting for this column, if the type does not support sorting then an exception will be thrown.
+   */
+  public ColumnDefinition setSortable(boolean sortable) {
+    this.sortable = sortable;
+    setSortableIsSet(true);
+    return this;
+  }
+
+  public void unsetSortable() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SORTABLE_ISSET_ID);
+  }
+
+  /** Returns true if field sortable is set (has been assigned a value) and false otherwise */
+  public boolean isSetSortable() {
+    return EncodingUtils.testBit(__isset_bitfield, __SORTABLE_ISSET_ID);
+  }
+
+  public void setSortableIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SORTABLE_ISSET_ID, value);
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case FAMILY:
@@ -559,6 +608,14 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
       }
       break;
 
+    case SORTABLE:
+      if (value == null) {
+        unsetSortable();
+      } else {
+        setSortable((Boolean)value);
+      }
+      break;
+
     }
   }
 
@@ -582,6 +639,9 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
     case PROPERTIES:
       return getProperties();
 
+    case SORTABLE:
+      return Boolean.valueOf(isSortable());
+
     }
     throw new IllegalStateException();
   }
@@ -605,6 +665,8 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
       return isSetFieldType();
     case PROPERTIES:
       return isSetProperties();
+    case SORTABLE:
+      return isSetSortable();
     }
     throw new IllegalStateException();
   }
@@ -676,6 +738,15 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
         return false;
     }
 
+    boolean this_present_sortable = true;
+    boolean that_present_sortable = true;
+    if (this_present_sortable || that_present_sortable) {
+      if (!(this_present_sortable && that_present_sortable))
+        return false;
+      if (this.sortable != that.sortable)
+        return false;
+    }
+
     return true;
   }
 
@@ -752,6 +823,16 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetSortable()).compareTo(typedOther.isSetSortable());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetSortable()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.sortable, typedOther.sortable);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -815,6 +896,10 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
       sb.append(this.properties);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("sortable:");
+    sb.append(this.sortable);
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -903,15 +988,15 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
           case 6: // PROPERTIES
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map118 = iprot.readMapBegin();
-                struct.properties = new HashMap<String,String>(2*_map118.size);
-                for (int _i119 = 0; _i119 < _map118.size; ++_i119)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map126 = iprot.readMapBegin();
+                struct.properties = new HashMap<String,String>(2*_map126.size);
+                for (int _i127 = 0; _i127 < _map126.size; ++_i127)
                 {
-                  String _key120; // optional
-                  String _val121; // required
-                  _key120 = iprot.readString();
-                  _val121 = iprot.readString();
-                  struct.properties.put(_key120, _val121);
+                  String _key128; // optional
+                  String _val129; // required
+                  _key128 = iprot.readString();
+                  _val129 = iprot.readString();
+                  struct.properties.put(_key128, _val129);
                 }
                 iprot.readMapEnd();
               }
@@ -920,6 +1005,14 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 7: // SORTABLE
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL) {
+              struct.sortable = iprot.readBool();
+              struct.setSortableIsSet(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);
         }
@@ -962,15 +1055,18 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
         oprot.writeFieldBegin(PROPERTIES_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, struct.properties.size()));
-          for (Map.Entry<String, String> _iter122 : struct.properties.entrySet())
+          for (Map.Entry<String, String> _iter130 : struct.properties.entrySet())
           {
-            oprot.writeString(_iter122.getKey());
-            oprot.writeString(_iter122.getValue());
+            oprot.writeString(_iter130.getKey());
+            oprot.writeString(_iter130.getValue());
           }
           oprot.writeMapEnd();
         }
         oprot.writeFieldEnd();
       }
+      oprot.writeFieldBegin(SORTABLE_FIELD_DESC);
+      oprot.writeBool(struct.sortable);
+      oprot.writeFieldEnd();
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -1007,7 +1103,10 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
       if (struct.isSetProperties()) {
         optionals.set(5);
       }
-      oprot.writeBitSet(optionals, 6);
+      if (struct.isSetSortable()) {
+        optionals.set(6);
+      }
+      oprot.writeBitSet(optionals, 7);
       if (struct.isSetFamily()) {
         oprot.writeString(struct.family);
       }
@@ -1026,19 +1125,22 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
       if (struct.isSetProperties()) {
         {
           oprot.writeI32(struct.properties.size());
-          for (Map.Entry<String, String> _iter123 : struct.properties.entrySet())
+          for (Map.Entry<String, String> _iter131 : struct.properties.entrySet())
           {
-            oprot.writeString(_iter123.getKey());
-            oprot.writeString(_iter123.getValue());
+            oprot.writeString(_iter131.getKey());
+            oprot.writeString(_iter131.getValue());
           }
         }
       }
+      if (struct.isSetSortable()) {
+        oprot.writeBool(struct.sortable);
+      }
     }
 
     @Override
     public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, ColumnDefinition struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(6);
+      BitSet incoming = iprot.readBitSet(7);
       if (incoming.get(0)) {
         struct.family = iprot.readString();
         struct.setFamilyIsSet(true);
@@ -1061,19 +1163,23 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
       }
       if (incoming.get(5)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map124 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
-          struct.properties = new HashMap<String,String>(2*_map124.size);
-          for (int _i125 = 0; _i125 < _map124.size; ++_i125)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map132 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
+          struct.properties = new HashMap<String,String>(2*_map132.size);
+          for (int _i133 = 0; _i133 < _map132.size; ++_i133)
           {
-            String _key126; // optional
-            String _val127; // required
-            _key126 = iprot.readString();
-            _val127 = iprot.readString();
-            struct.properties.put(_key126, _val127);
+            String _key134; // optional
+            String _val135; // required
+            _key134 = iprot.readString();
+            _val135 = iprot.readString();
+            struct.properties.put(_key134, _val135);
           }
         }
         struct.setPropertiesIsSet(true);
       }
+      if (incoming.get(6)) {
+        struct.sortable = iprot.readBool();
+        struct.setSortableIsSet(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/Metric.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java
index 8dfb8af..7f551d3 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java
@@ -703,15 +703,15 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
           case 2: // STR_MAP
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map184 = iprot.readMapBegin();
-                struct.strMap = new HashMap<String,String>(2*_map184.size);
-                for (int _i185 = 0; _i185 < _map184.size; ++_i185)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map192 = iprot.readMapBegin();
+                struct.strMap = new HashMap<String,String>(2*_map192.size);
+                for (int _i193 = 0; _i193 < _map192.size; ++_i193)
                 {
-                  String _key186; // optional
-                  String _val187; // required
-                  _key186 = iprot.readString();
-                  _val187 = iprot.readString();
-                  struct.strMap.put(_key186, _val187);
+                  String _key194; // optional
+                  String _val195; // required
+                  _key194 = iprot.readString();
+                  _val195 = iprot.readString();
+                  struct.strMap.put(_key194, _val195);
                 }
                 iprot.readMapEnd();
               }
@@ -723,15 +723,15 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
           case 3: // LONG_MAP
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map188 = iprot.readMapBegin();
-                struct.longMap = new HashMap<String,Long>(2*_map188.size);
-                for (int _i189 = 0; _i189 < _map188.size; ++_i189)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map196 = iprot.readMapBegin();
+                struct.longMap = new HashMap<String,Long>(2*_map196.size);
+                for (int _i197 = 0; _i197 < _map196.size; ++_i197)
                 {
-                  String _key190; // optional
-                  long _val191; // required
-                  _key190 = iprot.readString();
-                  _val191 = iprot.readI64();
-                  struct.longMap.put(_key190, _val191);
+                  String _key198; // optional
+                  long _val199; // required
+                  _key198 = iprot.readString();
+                  _val199 = iprot.readI64();
+                  struct.longMap.put(_key198, _val199);
                 }
                 iprot.readMapEnd();
               }
@@ -743,15 +743,15 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
           case 4: // DOUBLE_MAP
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map192 = iprot.readMapBegin();
-                struct.doubleMap = new HashMap<String,Double>(2*_map192.size);
-                for (int _i193 = 0; _i193 < _map192.size; ++_i193)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map200 = iprot.readMapBegin();
+                struct.doubleMap = new HashMap<String,Double>(2*_map200.size);
+                for (int _i201 = 0; _i201 < _map200.size; ++_i201)
                 {
-                  String _key194; // optional
-                  double _val195; // required
-                  _key194 = iprot.readString();
-                  _val195 = iprot.readDouble();
-                  struct.doubleMap.put(_key194, _val195);
+                  String _key202; // optional
+                  double _val203; // required
+                  _key202 = iprot.readString();
+                  _val203 = iprot.readDouble();
+                  struct.doubleMap.put(_key202, _val203);
                 }
                 iprot.readMapEnd();
               }
@@ -784,10 +784,10 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
         oprot.writeFieldBegin(STR_MAP_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, struct.strMap.size()));
-          for (Map.Entry<String, String> _iter196 : struct.strMap.entrySet())
+          for (Map.Entry<String, String> _iter204 : struct.strMap.entrySet())
           {
-            oprot.writeString(_iter196.getKey());
-            oprot.writeString(_iter196.getValue());
+            oprot.writeString(_iter204.getKey());
+            oprot.writeString(_iter204.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -797,10 +797,10 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
         oprot.writeFieldBegin(LONG_MAP_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, struct.longMap.size()));
-          for (Map.Entry<String, Long> _iter197 : struct.longMap.entrySet())
+          for (Map.Entry<String, Long> _iter205 : struct.longMap.entrySet())
           {
-            oprot.writeString(_iter197.getKey());
-            oprot.writeI64(_iter197.getValue());
+            oprot.writeString(_iter205.getKey());
+            oprot.writeI64(_iter205.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -810,10 +810,10 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
         oprot.writeFieldBegin(DOUBLE_MAP_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.DOUBLE, struct.doubleMap.size()));
-          for (Map.Entry<String, Double> _iter198 : struct.doubleMap.entrySet())
+          for (Map.Entry<String, Double> _iter206 : struct.doubleMap.entrySet())
           {
-            oprot.writeString(_iter198.getKey());
-            oprot.writeDouble(_iter198.getValue());
+            oprot.writeString(_iter206.getKey());
+            oprot.writeDouble(_iter206.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -856,30 +856,30 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
       if (struct.isSetStrMap()) {
         {
           oprot.writeI32(struct.strMap.size());
-          for (Map.Entry<String, String> _iter199 : struct.strMap.entrySet())
+          for (Map.Entry<String, String> _iter207 : struct.strMap.entrySet())
           {
-            oprot.writeString(_iter199.getKey());
-            oprot.writeString(_iter199.getValue());
+            oprot.writeString(_iter207.getKey());
+            oprot.writeString(_iter207.getValue());
           }
         }
       }
       if (struct.isSetLongMap()) {
         {
           oprot.writeI32(struct.longMap.size());
-          for (Map.Entry<String, Long> _iter200 : struct.longMap.entrySet())
+          for (Map.Entry<String, Long> _iter208 : struct.longMap.entrySet())
           {
-            oprot.writeString(_iter200.getKey());
-            oprot.writeI64(_iter200.getValue());
+            oprot.writeString(_iter208.getKey());
+            oprot.writeI64(_iter208.getValue());
           }
         }
       }
       if (struct.isSetDoubleMap()) {
         {
           oprot.writeI32(struct.doubleMap.size());
-          for (Map.Entry<String, Double> _iter201 : struct.doubleMap.entrySet())
+          for (Map.Entry<String, Double> _iter209 : struct.doubleMap.entrySet())
           {
-            oprot.writeString(_iter201.getKey());
-            oprot.writeDouble(_iter201.getValue());
+            oprot.writeString(_iter209.getKey());
+            oprot.writeDouble(_iter209.getValue());
           }
         }
       }
@@ -895,45 +895,45 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
       }
       if (incoming.get(1)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map202 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
-          struct.strMap = new HashMap<String,String>(2*_map202.size);
-          for (int _i203 = 0; _i203 < _map202.size; ++_i203)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map210 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
+          struct.strMap = new HashMap<String,String>(2*_map210.size);
+          for (int _i211 = 0; _i211 < _map210.size; ++_i211)
           {
-            String _key204; // optional
-            String _val205; // required
-            _key204 = iprot.readString();
-            _val205 = iprot.readString();
-            struct.strMap.put(_key204, _val205);
+            String _key212; // optional
+            String _val213; // required
+            _key212 = iprot.readString();
+            _val213 = iprot.readString();
+            struct.strMap.put(_key212, _val213);
           }
         }
         struct.setStrMapIsSet(true);
       }
       if (incoming.get(2)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map206 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, iprot.readI32());
-          struct.longMap = new HashMap<String,Long>(2*_map206.size);
-          for (int _i207 = 0; _i207 < _map206.size; ++_i207)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map214 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, iprot.readI32());
+          struct.longMap = new HashMap<String,Long>(2*_map214.size);
+          for (int _i215 = 0; _i215 < _map214.size; ++_i215)
           {
-            String _key208; // optional
-            long _val209; // required
-            _key208 = iprot.readString();
-            _val209 = iprot.readI64();
-            struct.longMap.put(_key208, _val209);
+            String _key216; // optional
+            long _val217; // required
+            _key216 = iprot.readString();
+            _val217 = iprot.readI64();
+            struct.longMap.put(_key216, _val217);
           }
         }
         struct.setLongMapIsSet(true);
       }
       if (incoming.get(3)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map210 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.DOUBLE, iprot.readI32());
-          struct.doubleMap = new HashMap<String,Double>(2*_map210.size);
-          for (int _i211 = 0; _i211 < _map210.size; ++_i211)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map218 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.DOUBLE, iprot.readI32());
+          struct.doubleMap = new HashMap<String,Double>(2*_map218.size);
+          for (int _i219 = 0; _i219 < _map218.size; ++_i219)
           {
-            String _key212; // optional
-            double _val213; // required
-            _key212 = iprot.readString();
-            _val213 = iprot.readDouble();
-            struct.doubleMap.put(_key212, _val213);
+            String _key220; // optional
+            double _val221; // required
+            _key220 = iprot.readString();
+            _val221 = iprot.readDouble();
+            struct.doubleMap.put(_key220, _val221);
           }
         }
         struct.setDoubleMapIsSet(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/RowMutation.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/RowMutation.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/RowMutation.java
index 9396b2b..8daec33 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/RowMutation.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/RowMutation.java
@@ -675,14 +675,14 @@ public class RowMutation implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
           case 5: // RECORD_MUTATIONS
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list100 = iprot.readListBegin();
-                struct.recordMutations = new ArrayList<RecordMutation>(_list100.size);
-                for (int _i101 = 0; _i101 < _list100.size; ++_i101)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list108 = iprot.readListBegin();
+                struct.recordMutations = new ArrayList<RecordMutation>(_list108.size);
+                for (int _i109 = 0; _i109 < _list108.size; ++_i109)
                 {
-                  RecordMutation _elem102; // required
-                  _elem102 = new RecordMutation();
-                  _elem102.read(iprot);
-                  struct.recordMutations.add(_elem102);
+                  RecordMutation _elem110; // required
+                  _elem110 = new RecordMutation();
+                  _elem110.read(iprot);
+                  struct.recordMutations.add(_elem110);
                 }
                 iprot.readListEnd();
               }
@@ -725,9 +725,9 @@ public class RowMutation implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
         oprot.writeFieldBegin(RECORD_MUTATIONS_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.STRUCT, struct.recordMutations.size()));
-          for (RecordMutation _iter103 : struct.recordMutations)
+          for (RecordMutation _iter111 : struct.recordMutations)
           {
-            _iter103.write(oprot);
+            _iter111.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -776,9 +776,9 @@ public class RowMutation implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
       if (struct.isSetRecordMutations()) {
         {
           oprot.writeI32(struct.recordMutations.size());
-          for (RecordMutation _iter104 : struct.recordMutations)
+          for (RecordMutation _iter112 : struct.recordMutations)
           {
-            _iter104.write(oprot);
+            _iter112.write(oprot);
           }
         }
       }
@@ -802,14 +802,14 @@ public class RowMutation implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
       }
       if (incoming.get(3)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list105 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
-          struct.recordMutations = new ArrayList<RecordMutation>(_list105.size);
-          for (int _i106 = 0; _i106 < _list105.size; ++_i106)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list113 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
+          struct.recordMutations = new ArrayList<RecordMutation>(_list113.size);
+          for (int _i114 = 0; _i114 < _list113.size; ++_i114)
           {
-            RecordMutation _elem107; // required
-            _elem107 = new RecordMutation();
-            _elem107.read(iprot);
-            struct.recordMutations.add(_elem107);
+            RecordMutation _elem115; // required
+            _elem115 = new RecordMutation();
+            _elem115.read(iprot);
+            struct.recordMutations.add(_elem115);
           }
         }
         struct.setRecordMutationsIsSet(true);


Mime
View raw message