incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [19/28] Made some small API changes to the Row (removed recordCount because it did not work as documented). Added totalRecords to FetchRowResult that will take the place of recordCount in Row. Also removed the WAL and wait for visibility on the row mut
Date Wed, 15 Jan 2014 22:03:42 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/da6c233c/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 53fb329..be715ae 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 _map112 = iprot.readMapBegin();
-                struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map112.size);
-                for (int _i113 = 0; _i113 < _map112.size; ++_i113)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map120 = iprot.readMapBegin();
+                struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map120.size);
+                for (int _i121 = 0; _i121 < _map120.size; ++_i121)
                 {
-                  String _key114; // optional
-                  Map<String,ColumnDefinition> _val115; // required
-                  _key114 = iprot.readString();
+                  String _key122; // optional
+                  Map<String,ColumnDefinition> _val123; // required
+                  _key122 = iprot.readString();
                   {
-                    org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map116 = iprot.readMapBegin();
-                    _val115 = new HashMap<String,ColumnDefinition>(2*_map116.size);
-                    for (int _i117 = 0; _i117 < _map116.size; ++_i117)
+                    org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map124 = iprot.readMapBegin();
+                    _val123 = new HashMap<String,ColumnDefinition>(2*_map124.size);
+                    for (int _i125 = 0; _i125 < _map124.size; ++_i125)
                     {
-                      String _key118; // optional
-                      ColumnDefinition _val119; // required
-                      _key118 = iprot.readString();
-                      _val119 = new ColumnDefinition();
-                      _val119.read(iprot);
-                      _val115.put(_key118, _val119);
+                      String _key126; // optional
+                      ColumnDefinition _val127; // required
+                      _key126 = iprot.readString();
+                      _val127 = new ColumnDefinition();
+                      _val127.read(iprot);
+                      _val123.put(_key126, _val127);
                     }
                     iprot.readMapEnd();
                   }
-                  struct.families.put(_key114, _val115);
+                  struct.families.put(_key122, _val123);
                 }
                 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>> _iter120 : struct.families.entrySet())
+          for (Map.Entry<String, Map<String,ColumnDefinition>> _iter128 : struct.families.entrySet())
           {
-            oprot.writeString(_iter120.getKey());
+            oprot.writeString(_iter128.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, _iter120.getValue().size()));
-              for (Map.Entry<String, ColumnDefinition> _iter121 : _iter120.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, _iter128.getValue().size()));
+              for (Map.Entry<String, ColumnDefinition> _iter129 : _iter128.getValue().entrySet())
               {
-                oprot.writeString(_iter121.getKey());
-                _iter121.getValue().write(oprot);
+                oprot.writeString(_iter129.getKey());
+                _iter129.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>> _iter122 : struct.families.entrySet())
+          for (Map.Entry<String, Map<String,ColumnDefinition>> _iter130 : struct.families.entrySet())
           {
-            oprot.writeString(_iter122.getKey());
+            oprot.writeString(_iter130.getKey());
             {
-              oprot.writeI32(_iter122.getValue().size());
-              for (Map.Entry<String, ColumnDefinition> _iter123 : _iter122.getValue().entrySet())
+              oprot.writeI32(_iter130.getValue().size());
+              for (Map.Entry<String, ColumnDefinition> _iter131 : _iter130.getValue().entrySet())
               {
-                oprot.writeString(_iter123.getKey());
-                _iter123.getValue().write(oprot);
+                oprot.writeString(_iter131.getKey());
+                _iter131.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 _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.MAP, iprot.readI32());
-          struct.families = new HashMap<String,Map<String,ColumnDefinition>>(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.MAP, iprot.readI32());
+          struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map132.size);
+          for (int _i133 = 0; _i133 < _map132.size; ++_i133)
           {
-            String _key126; // optional
-            Map<String,ColumnDefinition> _val127; // required
-            _key126 = iprot.readString();
+            String _key134; // optional
+            Map<String,ColumnDefinition> _val135; // required
+            _key134 = iprot.readString();
             {
-              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map128 = 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());
-              _val127 = new HashMap<String,ColumnDefinition>(2*_map128.size);
-              for (int _i129 = 0; _i129 < _map128.size; ++_i129)
+              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map136 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
+              _val135 = new HashMap<String,ColumnDefinition>(2*_map136.size);
+              for (int _i137 = 0; _i137 < _map136.size; ++_i137)
               {
-                String _key130; // optional
-                ColumnDefinition _val131; // required
-                _key130 = iprot.readString();
-                _val131 = new ColumnDefinition();
-                _val131.read(iprot);
-                _val127.put(_key130, _val131);
+                String _key138; // optional
+                ColumnDefinition _val139; // required
+                _key138 = iprot.readString();
+                _val139 = new ColumnDefinition();
+                _val139.read(iprot);
+                _val135.put(_key138, _val139);
               }
             }
-            struct.families.put(_key126, _val127);
+            struct.families.put(_key134, _val135);
           }
         }
         struct.setFamiliesIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/da6c233c/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java
index 81f5b69..f719097 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java
@@ -59,11 +59,12 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
   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)2);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField ROW_ID_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("rowId", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)3);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField RECORD_ID_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("recordId", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)4);
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COLUMN_FAMILIES_TO_FETCH_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("columnFamiliesToFetch", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, (short)5);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COLUMN_FAMILIES_TO_FETCH_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("columnFamiliesToFetch", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET, (short)5);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COLUMNS_TO_FETCH_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("columnsToFetch", 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 START_RECORD_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("startRecord", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)8);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField MAX_RECORDS_TO_FETCH_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("maxRecordsToFetch", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)9);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField HIGHLIGHT_OPTIONS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("highlightOptions", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)10);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField ORDER_OF_FAMILIES_TO_FETCH_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("orderOfFamiliesToFetch", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, (short)11);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -89,11 +90,11 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
    */
   public String recordId; // required
   /**
-   * The column families to fetch.  If null, fetch all.  If empty, fetch none.
+   * The column families to fetch. If null, fetch all. If empty, fetch none.
    */
-  public List<String> columnFamiliesToFetch; // required
+  public Set<String> columnFamiliesToFetch; // required
   /**
-   * The columns in the families to fetch.  If null, fetch all.  If empty, fetch none.
+   * The columns in the families to fetch. If null, fetch all. If empty, fetch none.
    */
   public Map<String,Set<String>> columnsToFetch; // required
   /**
@@ -114,6 +115,10 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
    * The HighlightOptions object controls how the data is highlighted.  If null no highlighting will occur.
    */
   public HighlightOptions highlightOptions; // required
+  /**
+   * Can be null, if provided the provided family order will be the order in which the families are returned.
+   */
+  public List<String> orderOfFamiliesToFetch; // 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 {
@@ -135,11 +140,11 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
      */
     RECORD_ID((short)4, "recordId"),
     /**
-     * The column families to fetch.  If null, fetch all.  If empty, fetch none.
+     * The column families to fetch. If null, fetch all. If empty, fetch none.
      */
     COLUMN_FAMILIES_TO_FETCH((short)5, "columnFamiliesToFetch"),
     /**
-     * The columns in the families to fetch.  If null, fetch all.  If empty, fetch none.
+     * The columns in the families to fetch. If null, fetch all. If empty, fetch none.
      */
     COLUMNS_TO_FETCH((short)6, "columnsToFetch"),
     /**
@@ -159,7 +164,11 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
     /**
      * The HighlightOptions object controls how the data is highlighted.  If null no highlighting will occur.
      */
-    HIGHLIGHT_OPTIONS((short)10, "highlightOptions");
+    HIGHLIGHT_OPTIONS((short)10, "highlightOptions"),
+    /**
+     * Can be null, if provided the provided family order will be the order in which the families are returned.
+     */
+    ORDER_OF_FAMILIES_TO_FETCH((short)11, "orderOfFamiliesToFetch");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -192,6 +201,8 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
           return MAX_RECORDS_TO_FETCH;
         case 10: // HIGHLIGHT_OPTIONS
           return HIGHLIGHT_OPTIONS;
+        case 11: // ORDER_OF_FAMILIES_TO_FETCH
+          return ORDER_OF_FAMILIES_TO_FETCH;
         default:
           return null;
       }
@@ -248,7 +259,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
     tmpMap.put(_Fields.RECORD_ID, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("recordId", 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_FAMILIES_TO_FETCH, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("columnFamiliesToFetch", 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.SetMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET, 
             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.COLUMNS_TO_FETCH, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("columnsToFetch", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.MapMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, 
@@ -261,6 +272,9 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
         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.HIGHLIGHT_OPTIONS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("highlightOptions", 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, HighlightOptions.class)));
+    tmpMap.put(_Fields.ORDER_OF_FAMILIES_TO_FETCH, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("orderOfFamiliesToFetch", 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.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(Selector.class, metaDataMap);
   }
@@ -277,11 +291,12 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
     String locationId,
     String rowId,
     String recordId,
-    List<String> columnFamiliesToFetch,
+    Set<String> columnFamiliesToFetch,
     Map<String,Set<String>> columnsToFetch,
     int startRecord,
     int maxRecordsToFetch,
-    HighlightOptions highlightOptions)
+    HighlightOptions highlightOptions,
+    List<String> orderOfFamiliesToFetch)
   {
     this();
     this.recordOnly = recordOnly;
@@ -296,6 +311,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
     this.maxRecordsToFetch = maxRecordsToFetch;
     setMaxRecordsToFetchIsSet(true);
     this.highlightOptions = highlightOptions;
+    this.orderOfFamiliesToFetch = orderOfFamiliesToFetch;
   }
 
   /**
@@ -314,7 +330,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       this.recordId = other.recordId;
     }
     if (other.isSetColumnFamiliesToFetch()) {
-      List<String> __this__columnFamiliesToFetch = new ArrayList<String>();
+      Set<String> __this__columnFamiliesToFetch = new HashSet<String>();
       for (String other_element : other.columnFamiliesToFetch) {
         __this__columnFamiliesToFetch.add(other_element);
       }
@@ -343,6 +359,13 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
     if (other.isSetHighlightOptions()) {
       this.highlightOptions = new HighlightOptions(other.highlightOptions);
     }
+    if (other.isSetOrderOfFamiliesToFetch()) {
+      List<String> __this__orderOfFamiliesToFetch = new ArrayList<String>();
+      for (String other_element : other.orderOfFamiliesToFetch) {
+        __this__orderOfFamiliesToFetch.add(other_element);
+      }
+      this.orderOfFamiliesToFetch = __this__orderOfFamiliesToFetch;
+    }
   }
 
   public Selector deepCopy() {
@@ -363,6 +386,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
     this.maxRecordsToFetch = 1000;
 
     this.highlightOptions = null;
+    this.orderOfFamiliesToFetch = null;
   }
 
   /**
@@ -496,22 +520,22 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
 
   public void addToColumnFamiliesToFetch(String elem) {
     if (this.columnFamiliesToFetch == null) {
-      this.columnFamiliesToFetch = new ArrayList<String>();
+      this.columnFamiliesToFetch = new HashSet<String>();
     }
     this.columnFamiliesToFetch.add(elem);
   }
 
   /**
-   * The column families to fetch.  If null, fetch all.  If empty, fetch none.
+   * The column families to fetch. If null, fetch all. If empty, fetch none.
    */
-  public List<String> getColumnFamiliesToFetch() {
+  public Set<String> getColumnFamiliesToFetch() {
     return this.columnFamiliesToFetch;
   }
 
   /**
-   * The column families to fetch.  If null, fetch all.  If empty, fetch none.
+   * The column families to fetch. If null, fetch all. If empty, fetch none.
    */
-  public Selector setColumnFamiliesToFetch(List<String> columnFamiliesToFetch) {
+  public Selector setColumnFamiliesToFetch(Set<String> columnFamiliesToFetch) {
     this.columnFamiliesToFetch = columnFamiliesToFetch;
     return this;
   }
@@ -543,14 +567,14 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
   }
 
   /**
-   * The columns in the families to fetch.  If null, fetch all.  If empty, fetch none.
+   * The columns in the families to fetch. If null, fetch all. If empty, fetch none.
    */
   public Map<String,Set<String>> getColumnsToFetch() {
     return this.columnsToFetch;
   }
 
   /**
-   * The columns in the families to fetch.  If null, fetch all.  If empty, fetch none.
+   * The columns in the families to fetch. If null, fetch all. If empty, fetch none.
    */
   public Selector setColumnsToFetch(Map<String,Set<String>> columnsToFetch) {
     this.columnsToFetch = columnsToFetch;
@@ -672,6 +696,51 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
     }
   }
 
+  public int getOrderOfFamiliesToFetchSize() {
+    return (this.orderOfFamiliesToFetch == null) ? 0 : this.orderOfFamiliesToFetch.size();
+  }
+
+  public java.util.Iterator<String> getOrderOfFamiliesToFetchIterator() {
+    return (this.orderOfFamiliesToFetch == null) ? null : this.orderOfFamiliesToFetch.iterator();
+  }
+
+  public void addToOrderOfFamiliesToFetch(String elem) {
+    if (this.orderOfFamiliesToFetch == null) {
+      this.orderOfFamiliesToFetch = new ArrayList<String>();
+    }
+    this.orderOfFamiliesToFetch.add(elem);
+  }
+
+  /**
+   * Can be null, if provided the provided family order will be the order in which the families are returned.
+   */
+  public List<String> getOrderOfFamiliesToFetch() {
+    return this.orderOfFamiliesToFetch;
+  }
+
+  /**
+   * Can be null, if provided the provided family order will be the order in which the families are returned.
+   */
+  public Selector setOrderOfFamiliesToFetch(List<String> orderOfFamiliesToFetch) {
+    this.orderOfFamiliesToFetch = orderOfFamiliesToFetch;
+    return this;
+  }
+
+  public void unsetOrderOfFamiliesToFetch() {
+    this.orderOfFamiliesToFetch = null;
+  }
+
+  /** Returns true if field orderOfFamiliesToFetch is set (has been assigned a value) and false otherwise */
+  public boolean isSetOrderOfFamiliesToFetch() {
+    return this.orderOfFamiliesToFetch != null;
+  }
+
+  public void setOrderOfFamiliesToFetchIsSet(boolean value) {
+    if (!value) {
+      this.orderOfFamiliesToFetch = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case RECORD_ONLY:
@@ -710,7 +779,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       if (value == null) {
         unsetColumnFamiliesToFetch();
       } else {
-        setColumnFamiliesToFetch((List<String>)value);
+        setColumnFamiliesToFetch((Set<String>)value);
       }
       break;
 
@@ -746,6 +815,14 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       }
       break;
 
+    case ORDER_OF_FAMILIES_TO_FETCH:
+      if (value == null) {
+        unsetOrderOfFamiliesToFetch();
+      } else {
+        setOrderOfFamiliesToFetch((List<String>)value);
+      }
+      break;
+
     }
   }
 
@@ -778,6 +855,9 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
     case HIGHLIGHT_OPTIONS:
       return getHighlightOptions();
 
+    case ORDER_OF_FAMILIES_TO_FETCH:
+      return getOrderOfFamiliesToFetch();
+
     }
     throw new IllegalStateException();
   }
@@ -807,6 +887,8 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       return isSetMaxRecordsToFetch();
     case HIGHLIGHT_OPTIONS:
       return isSetHighlightOptions();
+    case ORDER_OF_FAMILIES_TO_FETCH:
+      return isSetOrderOfFamiliesToFetch();
     }
     throw new IllegalStateException();
   }
@@ -905,6 +987,15 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
         return false;
     }
 
+    boolean this_present_orderOfFamiliesToFetch = true && this.isSetOrderOfFamiliesToFetch();
+    boolean that_present_orderOfFamiliesToFetch = true && that.isSetOrderOfFamiliesToFetch();
+    if (this_present_orderOfFamiliesToFetch || that_present_orderOfFamiliesToFetch) {
+      if (!(this_present_orderOfFamiliesToFetch && that_present_orderOfFamiliesToFetch))
+        return false;
+      if (!this.orderOfFamiliesToFetch.equals(that.orderOfFamiliesToFetch))
+        return false;
+    }
+
     return true;
   }
 
@@ -1011,6 +1102,16 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetOrderOfFamiliesToFetch()).compareTo(typedOther.isSetOrderOfFamiliesToFetch());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetOrderOfFamiliesToFetch()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.orderOfFamiliesToFetch, typedOther.orderOfFamiliesToFetch);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -1090,6 +1191,14 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       sb.append(this.highlightOptions);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("orderOfFamiliesToFetch:");
+    if (this.orderOfFamiliesToFetch == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.orderOfFamiliesToFetch);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -1171,17 +1280,17 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
             }
             break;
           case 5: // COLUMN_FAMILIES_TO_FETCH
-            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list16 = iprot.readListBegin();
-                struct.columnFamiliesToFetch = new ArrayList<String>(_list16.size);
-                for (int _i17 = 0; _i17 < _list16.size; ++_i17)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set16 = iprot.readSetBegin();
+                struct.columnFamiliesToFetch = new HashSet<String>(2*_set16.size);
+                for (int _i17 = 0; _i17 < _set16.size; ++_i17)
                 {
                   String _elem18; // required
                   _elem18 = iprot.readString();
                   struct.columnFamiliesToFetch.add(_elem18);
                 }
-                iprot.readListEnd();
+                iprot.readSetEnd();
               }
               struct.setColumnFamiliesToFetchIsSet(true);
             } else { 
@@ -1243,6 +1352,24 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 11: // ORDER_OF_FAMILIES_TO_FETCH
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
+              {
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list26 = iprot.readListBegin();
+                struct.orderOfFamiliesToFetch = new ArrayList<String>(_list26.size);
+                for (int _i27 = 0; _i27 < _list26.size; ++_i27)
+                {
+                  String _elem28; // required
+                  _elem28 = iprot.readString();
+                  struct.orderOfFamiliesToFetch.add(_elem28);
+                }
+                iprot.readListEnd();
+              }
+              struct.setOrderOfFamiliesToFetchIsSet(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);
         }
@@ -1279,12 +1406,12 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       if (struct.columnFamiliesToFetch != null) {
         oprot.writeFieldBegin(COLUMN_FAMILIES_TO_FETCH_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.columnFamiliesToFetch.size()));
-          for (String _iter26 : struct.columnFamiliesToFetch)
+          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.columnFamiliesToFetch.size()));
+          for (String _iter29 : struct.columnFamiliesToFetch)
           {
-            oprot.writeString(_iter26);
+            oprot.writeString(_iter29);
           }
-          oprot.writeListEnd();
+          oprot.writeSetEnd();
         }
         oprot.writeFieldEnd();
       }
@@ -1292,14 +1419,14 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
         oprot.writeFieldBegin(COLUMNS_TO_FETCH_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.SET, struct.columnsToFetch.size()));
-          for (Map.Entry<String, Set<String>> _iter27 : struct.columnsToFetch.entrySet())
+          for (Map.Entry<String, Set<String>> _iter30 : struct.columnsToFetch.entrySet())
           {
-            oprot.writeString(_iter27.getKey());
+            oprot.writeString(_iter30.getKey());
             {
-              oprot.writeSetBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, _iter27.getValue().size()));
-              for (String _iter28 : _iter27.getValue())
+              oprot.writeSetBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, _iter30.getValue().size()));
+              for (String _iter31 : _iter30.getValue())
               {
-                oprot.writeString(_iter28);
+                oprot.writeString(_iter31);
               }
               oprot.writeSetEnd();
             }
@@ -1319,6 +1446,18 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
         struct.highlightOptions.write(oprot);
         oprot.writeFieldEnd();
       }
+      if (struct.orderOfFamiliesToFetch != null) {
+        oprot.writeFieldBegin(ORDER_OF_FAMILIES_TO_FETCH_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.orderOfFamiliesToFetch.size()));
+          for (String _iter32 : struct.orderOfFamiliesToFetch)
+          {
+            oprot.writeString(_iter32);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -1364,7 +1503,10 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       if (struct.isSetHighlightOptions()) {
         optionals.set(8);
       }
-      oprot.writeBitSet(optionals, 9);
+      if (struct.isSetOrderOfFamiliesToFetch()) {
+        optionals.set(9);
+      }
+      oprot.writeBitSet(optionals, 10);
       if (struct.isSetRecordOnly()) {
         oprot.writeBool(struct.recordOnly);
       }
@@ -1380,23 +1522,23 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       if (struct.isSetColumnFamiliesToFetch()) {
         {
           oprot.writeI32(struct.columnFamiliesToFetch.size());
-          for (String _iter29 : struct.columnFamiliesToFetch)
+          for (String _iter33 : struct.columnFamiliesToFetch)
           {
-            oprot.writeString(_iter29);
+            oprot.writeString(_iter33);
           }
         }
       }
       if (struct.isSetColumnsToFetch()) {
         {
           oprot.writeI32(struct.columnsToFetch.size());
-          for (Map.Entry<String, Set<String>> _iter30 : struct.columnsToFetch.entrySet())
+          for (Map.Entry<String, Set<String>> _iter34 : struct.columnsToFetch.entrySet())
           {
-            oprot.writeString(_iter30.getKey());
+            oprot.writeString(_iter34.getKey());
             {
-              oprot.writeI32(_iter30.getValue().size());
-              for (String _iter31 : _iter30.getValue())
+              oprot.writeI32(_iter34.getValue().size());
+              for (String _iter35 : _iter34.getValue())
               {
-                oprot.writeString(_iter31);
+                oprot.writeString(_iter35);
               }
             }
           }
@@ -1411,12 +1553,21 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       if (struct.isSetHighlightOptions()) {
         struct.highlightOptions.write(oprot);
       }
+      if (struct.isSetOrderOfFamiliesToFetch()) {
+        {
+          oprot.writeI32(struct.orderOfFamiliesToFetch.size());
+          for (String _iter36 : struct.orderOfFamiliesToFetch)
+          {
+            oprot.writeString(_iter36);
+          }
+        }
+      }
     }
 
     @Override
     public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, Selector struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(9);
+      BitSet incoming = iprot.readBitSet(10);
       if (incoming.get(0)) {
         struct.recordOnly = iprot.readBool();
         struct.setRecordOnlyIsSet(true);
@@ -1435,37 +1586,37 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       }
       if (incoming.get(4)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list32 = 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.columnFamiliesToFetch = new ArrayList<String>(_list32.size);
-          for (int _i33 = 0; _i33 < _list32.size; ++_i33)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set37 = 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.columnFamiliesToFetch = new HashSet<String>(2*_set37.size);
+          for (int _i38 = 0; _i38 < _set37.size; ++_i38)
           {
-            String _elem34; // required
-            _elem34 = iprot.readString();
-            struct.columnFamiliesToFetch.add(_elem34);
+            String _elem39; // required
+            _elem39 = iprot.readString();
+            struct.columnFamiliesToFetch.add(_elem39);
           }
         }
         struct.setColumnFamiliesToFetchIsSet(true);
       }
       if (incoming.get(5)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map35 = 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.SET, iprot.readI32());
-          struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map35.size);
-          for (int _i36 = 0; _i36 < _map35.size; ++_i36)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map40 = 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.SET, iprot.readI32());
+          struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map40.size);
+          for (int _i41 = 0; _i41 < _map40.size; ++_i41)
           {
-            String _key37; // optional
-            Set<String> _val38; // required
-            _key37 = iprot.readString();
+            String _key42; // optional
+            Set<String> _val43; // required
+            _key42 = iprot.readString();
             {
-              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set39 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
-              _val38 = new HashSet<String>(2*_set39.size);
-              for (int _i40 = 0; _i40 < _set39.size; ++_i40)
+              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set44 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
+              _val43 = new HashSet<String>(2*_set44.size);
+              for (int _i45 = 0; _i45 < _set44.size; ++_i45)
               {
-                String _elem41; // required
-                _elem41 = iprot.readString();
-                _val38.add(_elem41);
+                String _elem46; // required
+                _elem46 = iprot.readString();
+                _val43.add(_elem46);
               }
             }
-            struct.columnsToFetch.put(_key37, _val38);
+            struct.columnsToFetch.put(_key42, _val43);
           }
         }
         struct.setColumnsToFetchIsSet(true);
@@ -1483,6 +1634,19 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
         struct.highlightOptions.read(iprot);
         struct.setHighlightOptionsIsSet(true);
       }
+      if (incoming.get(9)) {
+        {
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list47 = 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.orderOfFamiliesToFetch = new ArrayList<String>(_list47.size);
+          for (int _i48 = 0; _i48 < _list47.size; ++_i48)
+          {
+            String _elem49; // required
+            _elem49 = iprot.readString();
+            struct.orderOfFamiliesToFetch.add(_elem49);
+          }
+        }
+        struct.setOrderOfFamiliesToFetchIsSet(true);
+      }
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/da6c233c/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 1bd2d22..766c263 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 _set132 = iprot.readSetBegin();
-                struct.blockCachingFileTypes = new HashSet<String>(2*_set132.size);
-                for (int _i133 = 0; _i133 < _set132.size; ++_i133)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set140 = iprot.readSetBegin();
+                struct.blockCachingFileTypes = new HashSet<String>(2*_set140.size);
+                for (int _i141 = 0; _i141 < _set140.size; ++_i141)
                 {
-                  String _elem134; // required
-                  _elem134 = iprot.readString();
-                  struct.blockCachingFileTypes.add(_elem134);
+                  String _elem142; // required
+                  _elem142 = iprot.readString();
+                  struct.blockCachingFileTypes.add(_elem142);
                 }
                 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 _list135 = iprot.readListBegin();
-                struct.preCacheCols = new ArrayList<String>(_list135.size);
-                for (int _i136 = 0; _i136 < _list135.size; ++_i136)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list143 = iprot.readListBegin();
+                struct.preCacheCols = new ArrayList<String>(_list143.size);
+                for (int _i144 = 0; _i144 < _list143.size; ++_i144)
                 {
-                  String _elem137; // required
-                  _elem137 = iprot.readString();
-                  struct.preCacheCols.add(_elem137);
+                  String _elem145; // required
+                  _elem145 = iprot.readString();
+                  struct.preCacheCols.add(_elem145);
                 }
                 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 _map138 = iprot.readMapBegin();
-                struct.tableProperties = new HashMap<String,String>(2*_map138.size);
-                for (int _i139 = 0; _i139 < _map138.size; ++_i139)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map146 = iprot.readMapBegin();
+                struct.tableProperties = new HashMap<String,String>(2*_map146.size);
+                for (int _i147 = 0; _i147 < _map146.size; ++_i147)
                 {
-                  String _key140; // optional
-                  String _val141; // required
-                  _key140 = iprot.readString();
-                  _val141 = iprot.readString();
-                  struct.tableProperties.put(_key140, _val141);
+                  String _key148; // optional
+                  String _val149; // required
+                  _key148 = iprot.readString();
+                  _val149 = iprot.readString();
+                  struct.tableProperties.put(_key148, _val149);
                 }
                 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 _map142 = iprot.readMapBegin();
-                struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map142.size);
-                for (int _i143 = 0; _i143 < _map142.size; ++_i143)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map150 = iprot.readMapBegin();
+                struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map150.size);
+                for (int _i151 = 0; _i151 < _map150.size; ++_i151)
                 {
-                  String _key144; // optional
-                  String _val145; // required
-                  _key144 = iprot.readString();
-                  _val145 = iprot.readString();
-                  struct.defaultMissingFieldProps.put(_key144, _val145);
+                  String _key152; // optional
+                  String _val153; // required
+                  _key152 = iprot.readString();
+                  _val153 = iprot.readString();
+                  struct.defaultMissingFieldProps.put(_key152, _val153);
                 }
                 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 _iter146 : struct.blockCachingFileTypes)
+          for (String _iter154 : struct.blockCachingFileTypes)
           {
-            oprot.writeString(_iter146);
+            oprot.writeString(_iter154);
           }
           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 _iter147 : struct.preCacheCols)
+          for (String _iter155 : struct.preCacheCols)
           {
-            oprot.writeString(_iter147);
+            oprot.writeString(_iter155);
           }
           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> _iter148 : struct.tableProperties.entrySet())
+          for (Map.Entry<String, String> _iter156 : struct.tableProperties.entrySet())
           {
-            oprot.writeString(_iter148.getKey());
-            oprot.writeString(_iter148.getValue());
+            oprot.writeString(_iter156.getKey());
+            oprot.writeString(_iter156.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> _iter149 : struct.defaultMissingFieldProps.entrySet())
+          for (Map.Entry<String, String> _iter157 : struct.defaultMissingFieldProps.entrySet())
           {
-            oprot.writeString(_iter149.getKey());
-            oprot.writeString(_iter149.getValue());
+            oprot.writeString(_iter157.getKey());
+            oprot.writeString(_iter157.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 _iter150 : struct.blockCachingFileTypes)
+          for (String _iter158 : struct.blockCachingFileTypes)
           {
-            oprot.writeString(_iter150);
+            oprot.writeString(_iter158);
           }
         }
       }
@@ -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 _iter151 : struct.preCacheCols)
+          for (String _iter159 : struct.preCacheCols)
           {
-            oprot.writeString(_iter151);
+            oprot.writeString(_iter159);
           }
         }
       }
       if (struct.isSetTableProperties()) {
         {
           oprot.writeI32(struct.tableProperties.size());
-          for (Map.Entry<String, String> _iter152 : struct.tableProperties.entrySet())
+          for (Map.Entry<String, String> _iter160 : struct.tableProperties.entrySet())
           {
-            oprot.writeString(_iter152.getKey());
-            oprot.writeString(_iter152.getValue());
+            oprot.writeString(_iter160.getKey());
+            oprot.writeString(_iter160.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> _iter153 : struct.defaultMissingFieldProps.entrySet())
+          for (Map.Entry<String, String> _iter161 : struct.defaultMissingFieldProps.entrySet())
           {
-            oprot.writeString(_iter153.getKey());
-            oprot.writeString(_iter153.getValue());
+            oprot.writeString(_iter161.getKey());
+            oprot.writeString(_iter161.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 _set154 = 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*_set154.size);
-          for (int _i155 = 0; _i155 < _set154.size; ++_i155)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set162 = 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*_set162.size);
+          for (int _i163 = 0; _i163 < _set162.size; ++_i163)
           {
-            String _elem156; // required
-            _elem156 = iprot.readString();
-            struct.blockCachingFileTypes.add(_elem156);
+            String _elem164; // required
+            _elem164 = iprot.readString();
+            struct.blockCachingFileTypes.add(_elem164);
           }
         }
         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 _list157 = 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>(_list157.size);
-          for (int _i158 = 0; _i158 < _list157.size; ++_i158)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list165 = 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>(_list165.size);
+          for (int _i166 = 0; _i166 < _list165.size; ++_i166)
           {
-            String _elem159; // required
-            _elem159 = iprot.readString();
-            struct.preCacheCols.add(_elem159);
+            String _elem167; // required
+            _elem167 = iprot.readString();
+            struct.preCacheCols.add(_elem167);
           }
         }
         struct.setPreCacheColsIsSet(true);
       }
       if (incoming.get(10)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map160 = 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*_map160.size);
-          for (int _i161 = 0; _i161 < _map160.size; ++_i161)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map168 = 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*_map168.size);
+          for (int _i169 = 0; _i169 < _map168.size; ++_i169)
           {
-            String _key162; // optional
-            String _val163; // required
-            _key162 = iprot.readString();
-            _val163 = iprot.readString();
-            struct.tableProperties.put(_key162, _val163);
+            String _key170; // optional
+            String _val171; // required
+            _key170 = iprot.readString();
+            _val171 = iprot.readString();
+            struct.tableProperties.put(_key170, _val171);
           }
         }
         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 _map164 = 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*_map164.size);
-          for (int _i165 = 0; _i165 < _map164.size; ++_i165)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map172 = 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*_map172.size);
+          for (int _i173 = 0; _i173 < _map172.size; ++_i173)
           {
-            String _key166; // optional
-            String _val167; // required
-            _key166 = iprot.readString();
-            _val167 = iprot.readString();
-            struct.defaultMissingFieldProps.put(_key166, _val167);
+            String _key174; // optional
+            String _val175; // required
+            _key174 = iprot.readString();
+            _val175 = iprot.readString();
+            struct.defaultMissingFieldProps.put(_key174, _val175);
           }
         }
         struct.setDefaultMissingFieldPropsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/da6c233c/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/User.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/User.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/User.java
index e4cd4b5..8dedd8d 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/User.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/User.java
@@ -476,15 +476,15 @@ public class User implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<User,
           case 2: // ATTRIBUTES
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map198 = iprot.readMapBegin();
-                struct.attributes = new HashMap<String,String>(2*_map198.size);
-                for (int _i199 = 0; _i199 < _map198.size; ++_i199)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map206 = iprot.readMapBegin();
+                struct.attributes = new HashMap<String,String>(2*_map206.size);
+                for (int _i207 = 0; _i207 < _map206.size; ++_i207)
                 {
-                  String _key200; // optional
-                  String _val201; // required
-                  _key200 = iprot.readString();
-                  _val201 = iprot.readString();
-                  struct.attributes.put(_key200, _val201);
+                  String _key208; // optional
+                  String _val209; // required
+                  _key208 = iprot.readString();
+                  _val209 = iprot.readString();
+                  struct.attributes.put(_key208, _val209);
                 }
                 iprot.readMapEnd();
               }
@@ -517,10 +517,10 @@ public class User implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<User,
         oprot.writeFieldBegin(ATTRIBUTES_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.attributes.size()));
-          for (Map.Entry<String, String> _iter202 : struct.attributes.entrySet())
+          for (Map.Entry<String, String> _iter210 : struct.attributes.entrySet())
           {
-            oprot.writeString(_iter202.getKey());
-            oprot.writeString(_iter202.getValue());
+            oprot.writeString(_iter210.getKey());
+            oprot.writeString(_iter210.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -557,10 +557,10 @@ public class User implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<User,
       if (struct.isSetAttributes()) {
         {
           oprot.writeI32(struct.attributes.size());
-          for (Map.Entry<String, String> _iter203 : struct.attributes.entrySet())
+          for (Map.Entry<String, String> _iter211 : struct.attributes.entrySet())
           {
-            oprot.writeString(_iter203.getKey());
-            oprot.writeString(_iter203.getValue());
+            oprot.writeString(_iter211.getKey());
+            oprot.writeString(_iter211.getValue());
           }
         }
       }
@@ -576,15 +576,15 @@ public class User implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<User,
       }
       if (incoming.get(1)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map204 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
-          struct.attributes = new HashMap<String,String>(2*_map204.size);
-          for (int _i205 = 0; _i205 < _map204.size; ++_i205)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map212 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
+          struct.attributes = new HashMap<String,String>(2*_map212.size);
+          for (int _i213 = 0; _i213 < _map212.size; ++_i213)
           {
-            String _key206; // optional
-            String _val207; // required
-            _key206 = iprot.readString();
-            _val207 = iprot.readString();
-            struct.attributes.put(_key206, _val207);
+            String _key214; // optional
+            String _val215; // required
+            _key214 = iprot.readString();
+            _val215 = iprot.readString();
+            struct.attributes.put(_key214, _val215);
           }
         }
         struct.setAttributesIsSet(true);


Mime
View raw message