incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [7/8] git commit: Adding User object to query status.
Date Sun, 29 Jun 2014 18:25:29 GMT
Adding User object to query status.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/ac360e7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/ac360e7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/ac360e7a

Branch: refs/heads/apache-blur-0.2
Commit: ac360e7a4f9928f4231d5a63981204218f4a5ecd
Parents: 8596c9d
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Sun Jun 29 14:24:41 2014 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Sun Jun 29 14:24:41 2014 -0400

----------------------------------------------------------------------
 .../org/apache/blur/manager/IndexManager.java   |    7 +-
 .../apache/blur/manager/status/QueryStatus.java |    6 +-
 .../blur/manager/status/QueryStatusManager.java |    5 +-
 .../org/apache/blur/thrift/BlurClusterTest.java |   47 +
 .../apache/blur/thrift/generated/BlurQuery.java |   76 +-
 .../blur/thrift/generated/BlurQueryStatus.java  |  173 ++-
 .../blur/thrift/generated/BlurResult.java       |   36 +-
 .../blur/thrift/generated/BlurResults.java      |  148 +--
 .../blur/thrift/generated/ColumnDefinition.java |   44 +-
 .../apache/blur/thrift/generated/Metric.java    |  132 +--
 .../apache/blur/thrift/generated/Record.java    |   36 +-
 .../org/apache/blur/thrift/generated/Row.java   |   36 +-
 .../blur/thrift/generated/RowMutation.java      |   36 +-
 .../apache/blur/thrift/generated/Schema.java    |   88 +-
 .../apache/blur/thrift/generated/Selector.java  |  136 +--
 .../blur/thrift/generated/TableDescriptor.java  |  152 +--
 .../org/apache/blur/thrift/generated/User.java  |   44 +-
 .../src/main/scripts/interface/Blur.thrift      |   31 +-
 .../main/scripts/interface/gen-html/Blur.html   |   19 +-
 .../apache/blur/thrift/generated/BlurQuery.java |   76 +-
 .../blur/thrift/generated/BlurQueryStatus.java  |  173 ++-
 .../blur/thrift/generated/BlurResult.java       |   36 +-
 .../blur/thrift/generated/BlurResults.java      |  148 +--
 .../blur/thrift/generated/ColumnDefinition.java |   44 +-
 .../apache/blur/thrift/generated/Metric.java    |  132 +--
 .../apache/blur/thrift/generated/Record.java    |   36 +-
 .../org/apache/blur/thrift/generated/Row.java   |   36 +-
 .../blur/thrift/generated/RowMutation.java      |   36 +-
 .../apache/blur/thrift/generated/Schema.java    |   88 +-
 .../apache/blur/thrift/generated/Selector.java  |  136 +--
 .../blur/thrift/generated/TableDescriptor.java  |  152 +--
 .../org/apache/blur/thrift/generated/User.java  |   44 +-
 .../main/scripts/interface/gen-js/Blur_types.js | 1063 +++++++++---------
 .../scripts/interface/gen-perl/Blur/Types.pm    |  782 ++++++-------
 .../main/scripts/interface/gen-rb/blur_types.rb |   50 +-
 docs/Blur.html                                  |   21 +-
 36 files changed, 2326 insertions(+), 1979 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac360e7a/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java b/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
index 6891884..1b266f4 100644
--- a/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
+++ b/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
@@ -69,6 +69,7 @@ import org.apache.blur.server.ShardServerContext;
 import org.apache.blur.server.TableContext;
 import org.apache.blur.thrift.BException;
 import org.apache.blur.thrift.MutationHelper;
+import org.apache.blur.thrift.UserConverter;
 import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.BlurQuery;
 import org.apache.blur.thrift.generated.BlurQueryStatus;
@@ -85,6 +86,8 @@ import org.apache.blur.thrift.generated.ScoreType;
 import org.apache.blur.thrift.generated.Selector;
 import org.apache.blur.trace.Trace;
 import org.apache.blur.trace.Tracer;
+import org.apache.blur.user.User;
+import org.apache.blur.user.UserContext;
 import org.apache.blur.utils.BlurConstants;
 import org.apache.blur.utils.BlurExecutorCompletionService;
 import org.apache.blur.utils.BlurExecutorCompletionService.Cancel;
@@ -447,7 +450,9 @@ public class IndexManager {
       throws Exception {
     boolean runSlow = DEBUG_RUN_SLOW.get();
     final AtomicBoolean running = new AtomicBoolean(true);
-    final QueryStatus status = _statusManager.newQueryStatus(table, blurQuery, _threadCount, running);
+    User user = UserContext.getUser();
+    final QueryStatus status = _statusManager.newQueryStatus(table, blurQuery, _threadCount, running,
+        UserConverter.toThriftUser(user));
     _queriesExternalMeter.mark();
     try {
       Map<String, BlurIndex> blurIndexes;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac360e7a/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatus.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatus.java b/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatus.java
index 47cff47..a1edca1 100644
--- a/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatus.java
+++ b/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatus.java
@@ -28,6 +28,7 @@ import org.apache.blur.thrift.generated.BlurQuery;
 import org.apache.blur.thrift.generated.BlurQueryStatus;
 import org.apache.blur.thrift.generated.CpuTime;
 import org.apache.blur.thrift.generated.QueryState;
+import org.apache.blur.thrift.generated.User;
 
 /**
  * This class is accessed by multiple threads (one for each shard) executing the
@@ -40,6 +41,7 @@ public class QueryStatus implements Comparable<QueryStatus> {
       .isCurrentThreadCpuTimeSupported();
 
   private final BlurQuery _blurQuery;
+  private final User _user;
   private final String _table;
   private final long _startingTime;
   private boolean _finished = false;
@@ -52,13 +54,14 @@ public class QueryStatus implements Comparable<QueryStatus> {
   private final AtomicBoolean _running;
   private final Map<String, CpuTime> _cpuTimes = new ConcurrentHashMap<String, CpuTime>();
 
-  public QueryStatus(long ttl, String table, BlurQuery blurQuery, AtomicBoolean running) {
+  public QueryStatus(long ttl, String table, BlurQuery blurQuery, AtomicBoolean running, User user) {
     _ttl = ttl;
     _table = table;
     _blurQuery = blurQuery;
     _startingTime = blurQuery.getStartTime();
     _running = running;
     _state.set(QueryState.RUNNING);
+    _user = user;
   }
 
   public QueryStatus attachThread(String shardName) {
@@ -108,6 +111,7 @@ public class QueryStatus implements Comparable<QueryStatus> {
       queryStatus.uuid = queryStatus.query.uuid;
     }
     queryStatus.cpuTimes = _cpuTimes;
+    queryStatus.user = _user;
     return queryStatus;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac360e7a/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatusManager.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatusManager.java b/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatusManager.java
index 1cb0765..bb419b2 100644
--- a/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatusManager.java
+++ b/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatusManager.java
@@ -32,6 +32,7 @@ import org.apache.blur.log.LogFactory;
 import org.apache.blur.thrift.generated.BlurQuery;
 import org.apache.blur.thrift.generated.BlurQueryStatus;
 import org.apache.blur.thrift.generated.QueryState;
+import org.apache.blur.thrift.generated.User;
 import org.apache.blur.utils.GCAction;
 import org.apache.blur.utils.GCWatcher;
 
@@ -69,8 +70,8 @@ public class QueryStatusManager {
     statusCleanupTimer.purge();
   }
 
-  public QueryStatus newQueryStatus(String table, BlurQuery blurQuery, int maxNumberOfThreads, AtomicBoolean running) {
-    QueryStatus queryStatus = new QueryStatus(statusCleanupTimerDelay, table, blurQuery, running);
+  public QueryStatus newQueryStatus(String table, BlurQuery blurQuery, int maxNumberOfThreads, AtomicBoolean running, User user) {
+    QueryStatus queryStatus = new QueryStatus(statusCleanupTimerDelay, table, blurQuery, running, user);
     currentQueryStatusCollection.put(queryStatus, CONSTANT_VALUE);
     return queryStatus;
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac360e7a/blur-core/src/test/java/org/apache/blur/thrift/BlurClusterTest.java
----------------------------------------------------------------------
diff --git a/blur-core/src/test/java/org/apache/blur/thrift/BlurClusterTest.java b/blur-core/src/test/java/org/apache/blur/thrift/BlurClusterTest.java
index 72858b6..01ec58b 100644
--- a/blur-core/src/test/java/org/apache/blur/thrift/BlurClusterTest.java
+++ b/blur-core/src/test/java/org/apache/blur/thrift/BlurClusterTest.java
@@ -30,6 +30,7 @@ import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
 import java.lang.management.MemoryUsage;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -48,6 +49,7 @@ import org.apache.blur.thrift.generated.Blur;
 import org.apache.blur.thrift.generated.Blur.Iface;
 import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.BlurQuery;
+import org.apache.blur.thrift.generated.BlurQueryStatus;
 import org.apache.blur.thrift.generated.BlurResult;
 import org.apache.blur.thrift.generated.BlurResults;
 import org.apache.blur.thrift.generated.Column;
@@ -56,6 +58,7 @@ import org.apache.blur.thrift.generated.ErrorType;
 import org.apache.blur.thrift.generated.Facet;
 import org.apache.blur.thrift.generated.FetchResult;
 import org.apache.blur.thrift.generated.Query;
+import org.apache.blur.thrift.generated.QueryState;
 import org.apache.blur.thrift.generated.Record;
 import org.apache.blur.thrift.generated.RecordMutation;
 import org.apache.blur.thrift.generated.RowMutation;
@@ -66,6 +69,8 @@ import org.apache.blur.thrift.generated.SortField;
 import org.apache.blur.thrift.generated.TableDescriptor;
 import org.apache.blur.thrift.generated.TableStats;
 import org.apache.blur.thrift.util.BlurThriftHelper;
+import org.apache.blur.user.User;
+import org.apache.blur.user.UserContext;
 import org.apache.blur.utils.BlurConstants;
 import org.apache.blur.utils.GCWatcher;
 import org.apache.hadoop.conf.Configuration;
@@ -519,6 +524,48 @@ public class BlurClusterTest {
   }
 
   @Test
+  public void testQueryStatus() throws BlurException, TException, InterruptedException, IOException {
+    final String tableName = "testQueryStatus";
+    createTable(tableName);
+    loadTable(tableName);
+    final Iface client = getClient();
+    final BlurQuery blurQueryRow = new BlurQuery();
+    Query queryRow = new Query();
+    queryRow.setQuery("test.test:value");
+    blurQueryRow.setQuery(queryRow);
+    blurQueryRow.setUseCacheIfPresent(false);
+    blurQueryRow.setCacheResult(false);
+    String uuid = "5678";
+    blurQueryRow.setUuid(uuid);
+    final User user = new User("testuser", new HashMap<String, String>());
+    
+    try {
+      IndexManager.DEBUG_RUN_SLOW.set(true);
+      new Thread(new Runnable() {
+        @Override
+        public void run() {
+          try {
+            UserContext.setUser(user);
+            // This call will take several seconds to execute.
+            client.query(tableName, blurQueryRow);
+          } catch (BlurException e) {
+//            e.printStackTrace();
+          } catch (TException e) {
+            e.printStackTrace();
+          }
+        }
+      }).start();
+      Thread.sleep(500);
+      BlurQueryStatus queryStatusById = client.queryStatusById(tableName, uuid);
+      assertEquals(user.getUsername(), queryStatusById.getUser().getUsername());
+      assertEquals(queryStatusById.getState(), QueryState.RUNNING);
+      client.cancelQuery(tableName, uuid);
+    } finally {
+      IndexManager.DEBUG_RUN_SLOW.set(false);
+    }
+  }
+
+  @Test
   public void testQueryCancel() throws BlurException, TException, InterruptedException, IOException {
     final String tableName = "testQueryCancel";
     createTable(tableName);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac360e7a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQuery.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQuery.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQuery.java
index 4bba3b8..90d9237 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQuery.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQuery.java
@@ -117,6 +117,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
   public String uuid; // required
   /**
    * Sets a user context, only used for logging at this point.
+   * @Deprecated use setUser method on Blur service.
    */
   public String userContext; // required
   /**
@@ -178,6 +179,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     UUID((short)11, "uuid"),
     /**
      * Sets a user context, only used for logging at this point.
+     * @Deprecated use setUser method on Blur service.
      */
     USER_CONTEXT((short)12, "userContext"),
     /**
@@ -738,6 +740,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
 
   /**
    * Sets a user context, only used for logging at this point.
+   * @Deprecated use setUser method on Blur service.
    */
   public String getUserContext() {
     return this.userContext;
@@ -745,6 +748,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
 
   /**
    * Sets a user context, only used for logging at this point.
+   * @Deprecated use setUser method on Blur service.
    */
   public BlurQuery setUserContext(String userContext) {
     this.userContext = userContext;
@@ -1564,14 +1568,14 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
           case 3: // FACETS
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list50 = iprot.readListBegin();
-                struct.facets = new ArrayList<Facet>(_list50.size);
-                for (int _i51 = 0; _i51 < _list50.size; ++_i51)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list60 = iprot.readListBegin();
+                struct.facets = new ArrayList<Facet>(_list60.size);
+                for (int _i61 = 0; _i61 < _list60.size; ++_i61)
                 {
-                  Facet _elem52; // required
-                  _elem52 = new Facet();
-                  _elem52.read(iprot);
-                  struct.facets.add(_elem52);
+                  Facet _elem62; // required
+                  _elem62 = new Facet();
+                  _elem62.read(iprot);
+                  struct.facets.add(_elem62);
                 }
                 iprot.readListEnd();
               }
@@ -1664,14 +1668,14 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
           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)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list63 = iprot.readListBegin();
+                struct.sortFields = new ArrayList<SortField>(_list63.size);
+                for (int _i64 = 0; _i64 < _list63.size; ++_i64)
                 {
-                  SortField _elem55; // required
-                  _elem55 = new SortField();
-                  _elem55.read(iprot);
-                  struct.sortFields.add(_elem55);
+                  SortField _elem65; // required
+                  _elem65 = new SortField();
+                  _elem65.read(iprot);
+                  struct.sortFields.add(_elem65);
                 }
                 iprot.readListEnd();
               }
@@ -1712,9 +1716,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 _iter56 : struct.facets)
+          for (Facet _iter66 : struct.facets)
           {
-            _iter56.write(oprot);
+            _iter66.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -1760,9 +1764,9 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
         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)
+          for (SortField _iter67 : struct.sortFields)
           {
-            _iter57.write(oprot);
+            _iter67.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -1840,9 +1844,9 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       if (struct.isSetFacets()) {
         {
           oprot.writeI32(struct.facets.size());
-          for (Facet _iter58 : struct.facets)
+          for (Facet _iter68 : struct.facets)
           {
-            _iter58.write(oprot);
+            _iter68.write(oprot);
           }
         }
       }
@@ -1879,9 +1883,9 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       if (struct.isSetSortFields()) {
         {
           oprot.writeI32(struct.sortFields.size());
-          for (SortField _iter59 : struct.sortFields)
+          for (SortField _iter69 : struct.sortFields)
           {
-            _iter59.write(oprot);
+            _iter69.write(oprot);
           }
         }
       }
@@ -1901,14 +1905,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 _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)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list70 = 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>(_list70.size);
+          for (int _i71 = 0; _i71 < _list70.size; ++_i71)
           {
-            Facet _elem62; // required
-            _elem62 = new Facet();
-            _elem62.read(iprot);
-            struct.facets.add(_elem62);
+            Facet _elem72; // required
+            _elem72 = new Facet();
+            _elem72.read(iprot);
+            struct.facets.add(_elem72);
           }
         }
         struct.setFacetsIsSet(true);
@@ -1956,14 +1960,14 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       }
       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)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list73 = 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>(_list73.size);
+          for (int _i74 = 0; _i74 < _list73.size; ++_i74)
           {
-            SortField _elem65; // required
-            _elem65 = new SortField();
-            _elem65.read(iprot);
-            struct.sortFields.add(_elem65);
+            SortField _elem75; // required
+            _elem75 = new SortField();
+            _elem75.read(iprot);
+            struct.sortFields.add(_elem75);
           }
         }
         struct.setSortFieldsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac360e7a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
index 0183ded..6cac5a1 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
@@ -64,6 +64,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField STATE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("state", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)5);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField UUID_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("uuid", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)6);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField STATUS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("status", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)7);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField USER_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("user", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)8);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -107,6 +108,10 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
    * @see Status
    */
   public Status status; // required
+  /**
+   * The user executing the given query.
+   */
+  public User user; // 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 {
@@ -145,7 +150,11 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
      * 
      * @see Status
      */
-    STATUS((short)7, "status");
+    STATUS((short)7, "status"),
+    /**
+     * The user executing the given query.
+     */
+    USER((short)8, "user");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -174,6 +183,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
           return UUID;
         case 7: // STATUS
           return STATUS;
+        case 8: // USER
+          return USER;
         default:
           return null;
       }
@@ -236,6 +247,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
         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.STATUS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("status", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.EnumMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.ENUM, Status.class)));
+    tmpMap.put(_Fields.USER, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("user", 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, User.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(BlurQueryStatus.class, metaDataMap);
   }
@@ -250,7 +263,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
     int totalShards,
     QueryState state,
     String uuid,
-    Status status)
+    Status status,
+    User user)
   {
     this();
     this.query = query;
@@ -262,6 +276,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
     this.state = state;
     this.uuid = uuid;
     this.status = status;
+    this.user = user;
   }
 
   /**
@@ -298,6 +313,9 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
     if (other.isSetStatus()) {
       this.status = other.status;
     }
+    if (other.isSetUser()) {
+      this.user = new User(other.user);
+    }
   }
 
   public BlurQueryStatus deepCopy() {
@@ -315,6 +333,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
     this.state = null;
     this.uuid = null;
     this.status = null;
+    this.user = null;
   }
 
   /**
@@ -552,6 +571,36 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
     }
   }
 
+  /**
+   * The user executing the given query.
+   */
+  public User getUser() {
+    return this.user;
+  }
+
+  /**
+   * The user executing the given query.
+   */
+  public BlurQueryStatus setUser(User user) {
+    this.user = user;
+    return this;
+  }
+
+  public void unsetUser() {
+    this.user = null;
+  }
+
+  /** Returns true if field user is set (has been assigned a value) and false otherwise */
+  public boolean isSetUser() {
+    return this.user != null;
+  }
+
+  public void setUserIsSet(boolean value) {
+    if (!value) {
+      this.user = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case QUERY:
@@ -610,6 +659,14 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
       }
       break;
 
+    case USER:
+      if (value == null) {
+        unsetUser();
+      } else {
+        setUser((User)value);
+      }
+      break;
+
     }
   }
 
@@ -636,6 +693,9 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
     case STATUS:
       return getStatus();
 
+    case USER:
+      return getUser();
+
     }
     throw new IllegalStateException();
   }
@@ -661,6 +721,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
       return isSetUuid();
     case STATUS:
       return isSetStatus();
+    case USER:
+      return isSetUser();
     }
     throw new IllegalStateException();
   }
@@ -741,6 +803,15 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
         return false;
     }
 
+    boolean this_present_user = true && this.isSetUser();
+    boolean that_present_user = true && that.isSetUser();
+    if (this_present_user || that_present_user) {
+      if (!(this_present_user && that_present_user))
+        return false;
+      if (!this.user.equals(that.user))
+        return false;
+    }
+
     return true;
   }
 
@@ -827,6 +898,16 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetUser()).compareTo(typedOther.isSetUser());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetUser()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.user, typedOther.user);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -894,6 +975,14 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
       sb.append(this.status);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("user:");
+    if (this.user == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.user);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -904,6 +993,9 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
     if (query != null) {
       query.validate();
     }
+    if (user != null) {
+      user.validate();
+    }
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -954,16 +1046,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 _map116 = iprot.readMapBegin();
-                struct.cpuTimes = new HashMap<String,CpuTime>(2*_map116.size);
-                for (int _i117 = 0; _i117 < _map116.size; ++_i117)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map126 = iprot.readMapBegin();
+                struct.cpuTimes = new HashMap<String,CpuTime>(2*_map126.size);
+                for (int _i127 = 0; _i127 < _map126.size; ++_i127)
                 {
-                  String _key118; // optional
-                  CpuTime _val119; // required
-                  _key118 = iprot.readString();
-                  _val119 = new CpuTime();
-                  _val119.read(iprot);
-                  struct.cpuTimes.put(_key118, _val119);
+                  String _key128; // optional
+                  CpuTime _val129; // required
+                  _key128 = iprot.readString();
+                  _val129 = new CpuTime();
+                  _val129.read(iprot);
+                  struct.cpuTimes.put(_key128, _val129);
                 }
                 iprot.readMapEnd();
               }
@@ -1012,6 +1104,15 @@ public class BlurQueryStatus 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 8: // USER
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT) {
+              struct.user = new User();
+              struct.user.read(iprot);
+              struct.setUserIsSet(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);
         }
@@ -1036,10 +1137,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> _iter120 : struct.cpuTimes.entrySet())
+          for (Map.Entry<String, CpuTime> _iter130 : struct.cpuTimes.entrySet())
           {
-            oprot.writeString(_iter120.getKey());
-            _iter120.getValue().write(oprot);
+            oprot.writeString(_iter130.getKey());
+            _iter130.getValue().write(oprot);
           }
           oprot.writeMapEnd();
         }
@@ -1066,6 +1167,11 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
         oprot.writeI32(struct.status.getValue());
         oprot.writeFieldEnd();
       }
+      if (struct.user != null) {
+        oprot.writeFieldBegin(USER_FIELD_DESC);
+        struct.user.write(oprot);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -1105,17 +1211,20 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
       if (struct.isSetStatus()) {
         optionals.set(6);
       }
-      oprot.writeBitSet(optionals, 7);
+      if (struct.isSetUser()) {
+        optionals.set(7);
+      }
+      oprot.writeBitSet(optionals, 8);
       if (struct.isSetQuery()) {
         struct.query.write(oprot);
       }
       if (struct.isSetCpuTimes()) {
         {
           oprot.writeI32(struct.cpuTimes.size());
-          for (Map.Entry<String, CpuTime> _iter121 : struct.cpuTimes.entrySet())
+          for (Map.Entry<String, CpuTime> _iter131 : struct.cpuTimes.entrySet())
           {
-            oprot.writeString(_iter121.getKey());
-            _iter121.getValue().write(oprot);
+            oprot.writeString(_iter131.getKey());
+            _iter131.getValue().write(oprot);
           }
         }
       }
@@ -1134,12 +1243,15 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
       if (struct.isSetStatus()) {
         oprot.writeI32(struct.status.getValue());
       }
+      if (struct.isSetUser()) {
+        struct.user.write(oprot);
+      }
     }
 
     @Override
     public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, BlurQueryStatus struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(7);
+      BitSet incoming = iprot.readBitSet(8);
       if (incoming.get(0)) {
         struct.query = new BlurQuery();
         struct.query.read(iprot);
@@ -1147,16 +1259,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 _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)
+          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.STRUCT, iprot.readI32());
+          struct.cpuTimes = new HashMap<String,CpuTime>(2*_map132.size);
+          for (int _i133 = 0; _i133 < _map132.size; ++_i133)
           {
-            String _key124; // optional
-            CpuTime _val125; // required
-            _key124 = iprot.readString();
-            _val125 = new CpuTime();
-            _val125.read(iprot);
-            struct.cpuTimes.put(_key124, _val125);
+            String _key134; // optional
+            CpuTime _val135; // required
+            _key134 = iprot.readString();
+            _val135 = new CpuTime();
+            _val135.read(iprot);
+            struct.cpuTimes.put(_key134, _val135);
           }
         }
         struct.setCpuTimesIsSet(true);
@@ -1181,6 +1293,11 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
         struct.status = Status.findByValue(iprot.readI32());
         struct.setStatusIsSet(true);
       }
+      if (incoming.get(7)) {
+        struct.user = new User();
+        struct.user.read(iprot);
+        struct.setUserIsSet(true);
+      }
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac360e7a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResult.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResult.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResult.java
index 56b2559..ec970c9 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResult.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResult.java
@@ -668,14 +668,14 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
           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 _list66 = iprot.readListBegin();
-                struct.sortFieldResults = new ArrayList<SortFieldResult>(_list66.size);
-                for (int _i67 = 0; _i67 < _list66.size; ++_i67)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list76 = iprot.readListBegin();
+                struct.sortFieldResults = new ArrayList<SortFieldResult>(_list76.size);
+                for (int _i77 = 0; _i77 < _list76.size; ++_i77)
                 {
-                  SortFieldResult _elem68; // required
-                  _elem68 = new SortFieldResult();
-                  _elem68.read(iprot);
-                  struct.sortFieldResults.add(_elem68);
+                  SortFieldResult _elem78; // required
+                  _elem78 = new SortFieldResult();
+                  _elem78.read(iprot);
+                  struct.sortFieldResults.add(_elem78);
                 }
                 iprot.readListEnd();
               }
@@ -716,9 +716,9 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
         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.sortFieldResults.size()));
-          for (SortFieldResult _iter69 : struct.sortFieldResults)
+          for (SortFieldResult _iter79 : struct.sortFieldResults)
           {
-            _iter69.write(oprot);
+            _iter79.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -767,9 +767,9 @@ public class BlurResult implements org.apache.blur.thirdparty.thrift_0_9_0.TBase
       if (struct.isSetSortFieldResults()) {
         {
           oprot.writeI32(struct.sortFieldResults.size());
-          for (SortFieldResult _iter70 : struct.sortFieldResults)
+          for (SortFieldResult _iter80 : struct.sortFieldResults)
           {
-            _iter70.write(oprot);
+            _iter80.write(oprot);
           }
         }
       }
@@ -794,14 +794,14 @@ 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 _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)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list81 = 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>(_list81.size);
+          for (int _i82 = 0; _i82 < _list81.size; ++_i82)
           {
-            SortFieldResult _elem73; // required
-            _elem73 = new SortFieldResult();
-            _elem73.read(iprot);
-            struct.sortFieldResults.add(_elem73);
+            SortFieldResult _elem83; // required
+            _elem83 = new SortFieldResult();
+            _elem83.read(iprot);
+            struct.sortFieldResults.add(_elem83);
           }
         }
         struct.setSortFieldResultsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac360e7a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java
index 2d15c3b..aa923cc 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java
+++ b/blur-thrift/src/main/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 _map74 = iprot.readMapBegin();
-                struct.shardInfo = new HashMap<String,Long>(2*_map74.size);
-                for (int _i75 = 0; _i75 < _map74.size; ++_i75)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map84 = iprot.readMapBegin();
+                struct.shardInfo = new HashMap<String,Long>(2*_map84.size);
+                for (int _i85 = 0; _i85 < _map84.size; ++_i85)
                 {
-                  String _key76; // optional
-                  long _val77; // required
-                  _key76 = iprot.readString();
-                  _val77 = iprot.readI64();
-                  struct.shardInfo.put(_key76, _val77);
+                  String _key86; // optional
+                  long _val87; // required
+                  _key86 = iprot.readString();
+                  _val87 = iprot.readI64();
+                  struct.shardInfo.put(_key86, _val87);
                 }
                 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 _list78 = iprot.readListBegin();
-                struct.results = new ArrayList<BlurResult>(_list78.size);
-                for (int _i79 = 0; _i79 < _list78.size; ++_i79)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list88 = iprot.readListBegin();
+                struct.results = new ArrayList<BlurResult>(_list88.size);
+                for (int _i89 = 0; _i89 < _list88.size; ++_i89)
                 {
-                  BlurResult _elem80; // required
-                  _elem80 = new BlurResult();
-                  _elem80.read(iprot);
-                  struct.results.add(_elem80);
+                  BlurResult _elem90; // required
+                  _elem90 = new BlurResult();
+                  _elem90.read(iprot);
+                  struct.results.add(_elem90);
                 }
                 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 _list81 = iprot.readListBegin();
-                struct.facetCounts = new ArrayList<Long>(_list81.size);
-                for (int _i82 = 0; _i82 < _list81.size; ++_i82)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list91 = iprot.readListBegin();
+                struct.facetCounts = new ArrayList<Long>(_list91.size);
+                for (int _i92 = 0; _i92 < _list91.size; ++_i92)
                 {
-                  long _elem83; // required
-                  _elem83 = iprot.readI64();
-                  struct.facetCounts.add(_elem83);
+                  long _elem93; // required
+                  _elem93 = iprot.readI64();
+                  struct.facetCounts.add(_elem93);
                 }
                 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 _list84 = iprot.readListBegin();
-                struct.exceptions = new ArrayList<BlurException>(_list84.size);
-                for (int _i85 = 0; _i85 < _list84.size; ++_i85)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list94 = iprot.readListBegin();
+                struct.exceptions = new ArrayList<BlurException>(_list94.size);
+                for (int _i95 = 0; _i95 < _list94.size; ++_i95)
                 {
-                  BlurException _elem86; // required
-                  _elem86 = new BlurException();
-                  _elem86.read(iprot);
-                  struct.exceptions.add(_elem86);
+                  BlurException _elem96; // required
+                  _elem96 = new BlurException();
+                  _elem96.read(iprot);
+                  struct.exceptions.add(_elem96);
                 }
                 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> _iter87 : struct.shardInfo.entrySet())
+          for (Map.Entry<String, Long> _iter97 : struct.shardInfo.entrySet())
           {
-            oprot.writeString(_iter87.getKey());
-            oprot.writeI64(_iter87.getValue());
+            oprot.writeString(_iter97.getKey());
+            oprot.writeI64(_iter97.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 _iter88 : struct.results)
+          for (BlurResult _iter98 : struct.results)
           {
-            _iter88.write(oprot);
+            _iter98.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 _iter89 : struct.facetCounts)
+          for (long _iter99 : struct.facetCounts)
           {
-            oprot.writeI64(_iter89);
+            oprot.writeI64(_iter99);
           }
           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 _iter90 : struct.exceptions)
+          for (BlurException _iter100 : struct.exceptions)
           {
-            _iter90.write(oprot);
+            _iter100.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> _iter91 : struct.shardInfo.entrySet())
+          for (Map.Entry<String, Long> _iter101 : struct.shardInfo.entrySet())
           {
-            oprot.writeString(_iter91.getKey());
-            oprot.writeI64(_iter91.getValue());
+            oprot.writeString(_iter101.getKey());
+            oprot.writeI64(_iter101.getValue());
           }
         }
       }
       if (struct.isSetResults()) {
         {
           oprot.writeI32(struct.results.size());
-          for (BlurResult _iter92 : struct.results)
+          for (BlurResult _iter102 : struct.results)
           {
-            _iter92.write(oprot);
+            _iter102.write(oprot);
           }
         }
       }
       if (struct.isSetFacetCounts()) {
         {
           oprot.writeI32(struct.facetCounts.size());
-          for (long _iter93 : struct.facetCounts)
+          for (long _iter103 : struct.facetCounts)
           {
-            oprot.writeI64(_iter93);
+            oprot.writeI64(_iter103);
           }
         }
       }
       if (struct.isSetExceptions()) {
         {
           oprot.writeI32(struct.exceptions.size());
-          for (BlurException _iter94 : struct.exceptions)
+          for (BlurException _iter104 : struct.exceptions)
           {
-            _iter94.write(oprot);
+            _iter104.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 _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)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map105 = 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*_map105.size);
+          for (int _i106 = 0; _i106 < _map105.size; ++_i106)
           {
-            String _key97; // optional
-            long _val98; // required
-            _key97 = iprot.readString();
-            _val98 = iprot.readI64();
-            struct.shardInfo.put(_key97, _val98);
+            String _key107; // optional
+            long _val108; // required
+            _key107 = iprot.readString();
+            _val108 = iprot.readI64();
+            struct.shardInfo.put(_key107, _val108);
           }
         }
         struct.setShardInfoIsSet(true);
       }
       if (incoming.get(2)) {
         {
-          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)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list109 = 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>(_list109.size);
+          for (int _i110 = 0; _i110 < _list109.size; ++_i110)
           {
-            BlurResult _elem101; // required
-            _elem101 = new BlurResult();
-            _elem101.read(iprot);
-            struct.results.add(_elem101);
+            BlurResult _elem111; // required
+            _elem111 = new BlurResult();
+            _elem111.read(iprot);
+            struct.results.add(_elem111);
           }
         }
         struct.setResultsIsSet(true);
       }
       if (incoming.get(3)) {
         {
-          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)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list112 = 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>(_list112.size);
+          for (int _i113 = 0; _i113 < _list112.size; ++_i113)
           {
-            long _elem104; // required
-            _elem104 = iprot.readI64();
-            struct.facetCounts.add(_elem104);
+            long _elem114; // required
+            _elem114 = iprot.readI64();
+            struct.facetCounts.add(_elem114);
           }
         }
         struct.setFacetCountsIsSet(true);
       }
       if (incoming.get(4)) {
         {
-          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)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list115 = 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>(_list115.size);
+          for (int _i116 = 0; _i116 < _list115.size; ++_i116)
           {
-            BlurException _elem107; // required
-            _elem107 = new BlurException();
-            _elem107.read(iprot);
-            struct.exceptions.add(_elem107);
+            BlurException _elem117; // required
+            _elem117 = new BlurException();
+            _elem117.read(iprot);
+            struct.exceptions.add(_elem117);
           }
         }
         struct.setExceptionsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac360e7a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
index 2fb5811..55d1744 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
@@ -988,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 _map126 = iprot.readMapBegin();
-                struct.properties = new HashMap<String,String>(2*_map126.size);
-                for (int _i127 = 0; _i127 < _map126.size; ++_i127)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map136 = iprot.readMapBegin();
+                struct.properties = new HashMap<String,String>(2*_map136.size);
+                for (int _i137 = 0; _i137 < _map136.size; ++_i137)
                 {
-                  String _key128; // optional
-                  String _val129; // required
-                  _key128 = iprot.readString();
-                  _val129 = iprot.readString();
-                  struct.properties.put(_key128, _val129);
+                  String _key138; // optional
+                  String _val139; // required
+                  _key138 = iprot.readString();
+                  _val139 = iprot.readString();
+                  struct.properties.put(_key138, _val139);
                 }
                 iprot.readMapEnd();
               }
@@ -1055,10 +1055,10 @@ 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> _iter130 : struct.properties.entrySet())
+          for (Map.Entry<String, String> _iter140 : struct.properties.entrySet())
           {
-            oprot.writeString(_iter130.getKey());
-            oprot.writeString(_iter130.getValue());
+            oprot.writeString(_iter140.getKey());
+            oprot.writeString(_iter140.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -1125,10 +1125,10 @@ 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> _iter131 : struct.properties.entrySet())
+          for (Map.Entry<String, String> _iter141 : struct.properties.entrySet())
           {
-            oprot.writeString(_iter131.getKey());
-            oprot.writeString(_iter131.getValue());
+            oprot.writeString(_iter141.getKey());
+            oprot.writeString(_iter141.getValue());
           }
         }
       }
@@ -1163,15 +1163,15 @@ 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 _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)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map142 = 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*_map142.size);
+          for (int _i143 = 0; _i143 < _map142.size; ++_i143)
           {
-            String _key134; // optional
-            String _val135; // required
-            _key134 = iprot.readString();
-            _val135 = iprot.readString();
-            struct.properties.put(_key134, _val135);
+            String _key144; // optional
+            String _val145; // required
+            _key144 = iprot.readString();
+            _val145 = iprot.readString();
+            struct.properties.put(_key144, _val145);
           }
         }
         struct.setPropertiesIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac360e7a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java
index 7f551d3..8e2be42 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java
+++ b/blur-thrift/src/main/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 _map192 = iprot.readMapBegin();
-                struct.strMap = new HashMap<String,String>(2*_map192.size);
-                for (int _i193 = 0; _i193 < _map192.size; ++_i193)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map202 = iprot.readMapBegin();
+                struct.strMap = new HashMap<String,String>(2*_map202.size);
+                for (int _i203 = 0; _i203 < _map202.size; ++_i203)
                 {
-                  String _key194; // optional
-                  String _val195; // required
-                  _key194 = iprot.readString();
-                  _val195 = iprot.readString();
-                  struct.strMap.put(_key194, _val195);
+                  String _key204; // optional
+                  String _val205; // required
+                  _key204 = iprot.readString();
+                  _val205 = iprot.readString();
+                  struct.strMap.put(_key204, _val205);
                 }
                 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 _map196 = iprot.readMapBegin();
-                struct.longMap = new HashMap<String,Long>(2*_map196.size);
-                for (int _i197 = 0; _i197 < _map196.size; ++_i197)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map206 = iprot.readMapBegin();
+                struct.longMap = new HashMap<String,Long>(2*_map206.size);
+                for (int _i207 = 0; _i207 < _map206.size; ++_i207)
                 {
-                  String _key198; // optional
-                  long _val199; // required
-                  _key198 = iprot.readString();
-                  _val199 = iprot.readI64();
-                  struct.longMap.put(_key198, _val199);
+                  String _key208; // optional
+                  long _val209; // required
+                  _key208 = iprot.readString();
+                  _val209 = iprot.readI64();
+                  struct.longMap.put(_key208, _val209);
                 }
                 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 _map200 = iprot.readMapBegin();
-                struct.doubleMap = new HashMap<String,Double>(2*_map200.size);
-                for (int _i201 = 0; _i201 < _map200.size; ++_i201)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map210 = iprot.readMapBegin();
+                struct.doubleMap = new HashMap<String,Double>(2*_map210.size);
+                for (int _i211 = 0; _i211 < _map210.size; ++_i211)
                 {
-                  String _key202; // optional
-                  double _val203; // required
-                  _key202 = iprot.readString();
-                  _val203 = iprot.readDouble();
-                  struct.doubleMap.put(_key202, _val203);
+                  String _key212; // optional
+                  double _val213; // required
+                  _key212 = iprot.readString();
+                  _val213 = iprot.readDouble();
+                  struct.doubleMap.put(_key212, _val213);
                 }
                 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> _iter204 : struct.strMap.entrySet())
+          for (Map.Entry<String, String> _iter214 : struct.strMap.entrySet())
           {
-            oprot.writeString(_iter204.getKey());
-            oprot.writeString(_iter204.getValue());
+            oprot.writeString(_iter214.getKey());
+            oprot.writeString(_iter214.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> _iter205 : struct.longMap.entrySet())
+          for (Map.Entry<String, Long> _iter215 : struct.longMap.entrySet())
           {
-            oprot.writeString(_iter205.getKey());
-            oprot.writeI64(_iter205.getValue());
+            oprot.writeString(_iter215.getKey());
+            oprot.writeI64(_iter215.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> _iter206 : struct.doubleMap.entrySet())
+          for (Map.Entry<String, Double> _iter216 : struct.doubleMap.entrySet())
           {
-            oprot.writeString(_iter206.getKey());
-            oprot.writeDouble(_iter206.getValue());
+            oprot.writeString(_iter216.getKey());
+            oprot.writeDouble(_iter216.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> _iter207 : struct.strMap.entrySet())
+          for (Map.Entry<String, String> _iter217 : struct.strMap.entrySet())
           {
-            oprot.writeString(_iter207.getKey());
-            oprot.writeString(_iter207.getValue());
+            oprot.writeString(_iter217.getKey());
+            oprot.writeString(_iter217.getValue());
           }
         }
       }
       if (struct.isSetLongMap()) {
         {
           oprot.writeI32(struct.longMap.size());
-          for (Map.Entry<String, Long> _iter208 : struct.longMap.entrySet())
+          for (Map.Entry<String, Long> _iter218 : struct.longMap.entrySet())
           {
-            oprot.writeString(_iter208.getKey());
-            oprot.writeI64(_iter208.getValue());
+            oprot.writeString(_iter218.getKey());
+            oprot.writeI64(_iter218.getValue());
           }
         }
       }
       if (struct.isSetDoubleMap()) {
         {
           oprot.writeI32(struct.doubleMap.size());
-          for (Map.Entry<String, Double> _iter209 : struct.doubleMap.entrySet())
+          for (Map.Entry<String, Double> _iter219 : struct.doubleMap.entrySet())
           {
-            oprot.writeString(_iter209.getKey());
-            oprot.writeDouble(_iter209.getValue());
+            oprot.writeString(_iter219.getKey());
+            oprot.writeDouble(_iter219.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 _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)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map220 = 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*_map220.size);
+          for (int _i221 = 0; _i221 < _map220.size; ++_i221)
           {
-            String _key212; // optional
-            String _val213; // required
-            _key212 = iprot.readString();
-            _val213 = iprot.readString();
-            struct.strMap.put(_key212, _val213);
+            String _key222; // optional
+            String _val223; // required
+            _key222 = iprot.readString();
+            _val223 = iprot.readString();
+            struct.strMap.put(_key222, _val223);
           }
         }
         struct.setStrMapIsSet(true);
       }
       if (incoming.get(2)) {
         {
-          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)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map224 = 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*_map224.size);
+          for (int _i225 = 0; _i225 < _map224.size; ++_i225)
           {
-            String _key216; // optional
-            long _val217; // required
-            _key216 = iprot.readString();
-            _val217 = iprot.readI64();
-            struct.longMap.put(_key216, _val217);
+            String _key226; // optional
+            long _val227; // required
+            _key226 = iprot.readString();
+            _val227 = iprot.readI64();
+            struct.longMap.put(_key226, _val227);
           }
         }
         struct.setLongMapIsSet(true);
       }
       if (incoming.get(3)) {
         {
-          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)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map228 = 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*_map228.size);
+          for (int _i229 = 0; _i229 < _map228.size; ++_i229)
           {
-            String _key220; // optional
-            double _val221; // required
-            _key220 = iprot.readString();
-            _val221 = iprot.readDouble();
-            struct.doubleMap.put(_key220, _val221);
+            String _key230; // optional
+            double _val231; // required
+            _key230 = iprot.readString();
+            _val231 = iprot.readDouble();
+            struct.doubleMap.put(_key230, _val231);
           }
         }
         struct.setDoubleMapIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac360e7a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Record.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Record.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Record.java
index 4ba25ac..2f4e7c0 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Record.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Record.java
@@ -567,14 +567,14 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
           case 3: // COLUMNS
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list0 = iprot.readListBegin();
-                struct.columns = new ArrayList<Column>(_list0.size);
-                for (int _i1 = 0; _i1 < _list0.size; ++_i1)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list10 = iprot.readListBegin();
+                struct.columns = new ArrayList<Column>(_list10.size);
+                for (int _i11 = 0; _i11 < _list10.size; ++_i11)
                 {
-                  Column _elem2; // required
-                  _elem2 = new Column();
-                  _elem2.read(iprot);
-                  struct.columns.add(_elem2);
+                  Column _elem12; // required
+                  _elem12 = new Column();
+                  _elem12.read(iprot);
+                  struct.columns.add(_elem12);
                 }
                 iprot.readListEnd();
               }
@@ -612,9 +612,9 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
         oprot.writeFieldBegin(COLUMNS_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.columns.size()));
-          for (Column _iter3 : struct.columns)
+          for (Column _iter13 : struct.columns)
           {
-            _iter3.write(oprot);
+            _iter13.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -657,9 +657,9 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
       if (struct.isSetColumns()) {
         {
           oprot.writeI32(struct.columns.size());
-          for (Column _iter4 : struct.columns)
+          for (Column _iter14 : struct.columns)
           {
-            _iter4.write(oprot);
+            _iter14.write(oprot);
           }
         }
       }
@@ -679,14 +679,14 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
       }
       if (incoming.get(2)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list5 = 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.columns = new ArrayList<Column>(_list5.size);
-          for (int _i6 = 0; _i6 < _list5.size; ++_i6)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list15 = 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.columns = new ArrayList<Column>(_list15.size);
+          for (int _i16 = 0; _i16 < _list15.size; ++_i16)
           {
-            Column _elem7; // required
-            _elem7 = new Column();
-            _elem7.read(iprot);
-            struct.columns.add(_elem7);
+            Column _elem17; // required
+            _elem17 = new Column();
+            _elem17.read(iprot);
+            struct.columns.add(_elem17);
           }
         }
         struct.setColumnsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac360e7a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Row.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Row.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Row.java
index 413d57e..e450f9e 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Row.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Row.java
@@ -474,14 +474,14 @@ public class Row implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Row, R
           case 2: // RECORDS
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list8 = iprot.readListBegin();
-                struct.records = new ArrayList<Record>(_list8.size);
-                for (int _i9 = 0; _i9 < _list8.size; ++_i9)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list18 = iprot.readListBegin();
+                struct.records = new ArrayList<Record>(_list18.size);
+                for (int _i19 = 0; _i19 < _list18.size; ++_i19)
                 {
-                  Record _elem10; // required
-                  _elem10 = new Record();
-                  _elem10.read(iprot);
-                  struct.records.add(_elem10);
+                  Record _elem20; // required
+                  _elem20 = new Record();
+                  _elem20.read(iprot);
+                  struct.records.add(_elem20);
                 }
                 iprot.readListEnd();
               }
@@ -514,9 +514,9 @@ public class Row implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Row, R
         oprot.writeFieldBegin(RECORDS_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.records.size()));
-          for (Record _iter11 : struct.records)
+          for (Record _iter21 : struct.records)
           {
-            _iter11.write(oprot);
+            _iter21.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -553,9 +553,9 @@ public class Row implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Row, R
       if (struct.isSetRecords()) {
         {
           oprot.writeI32(struct.records.size());
-          for (Record _iter12 : struct.records)
+          for (Record _iter22 : struct.records)
           {
-            _iter12.write(oprot);
+            _iter22.write(oprot);
           }
         }
       }
@@ -571,14 +571,14 @@ public class Row implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Row, R
       }
       if (incoming.get(1)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list13 = 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.records = new ArrayList<Record>(_list13.size);
-          for (int _i14 = 0; _i14 < _list13.size; ++_i14)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list23 = 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.records = new ArrayList<Record>(_list23.size);
+          for (int _i24 = 0; _i24 < _list23.size; ++_i24)
           {
-            Record _elem15; // required
-            _elem15 = new Record();
-            _elem15.read(iprot);
-            struct.records.add(_elem15);
+            Record _elem25; // required
+            _elem25 = new Record();
+            _elem25.read(iprot);
+            struct.records.add(_elem25);
           }
         }
         struct.setRecordsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/ac360e7a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/RowMutation.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/RowMutation.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/RowMutation.java
index 8daec33..f1d1d85 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/RowMutation.java
+++ b/blur-thrift/src/main/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 _list108 = iprot.readListBegin();
-                struct.recordMutations = new ArrayList<RecordMutation>(_list108.size);
-                for (int _i109 = 0; _i109 < _list108.size; ++_i109)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list118 = iprot.readListBegin();
+                struct.recordMutations = new ArrayList<RecordMutation>(_list118.size);
+                for (int _i119 = 0; _i119 < _list118.size; ++_i119)
                 {
-                  RecordMutation _elem110; // required
-                  _elem110 = new RecordMutation();
-                  _elem110.read(iprot);
-                  struct.recordMutations.add(_elem110);
+                  RecordMutation _elem120; // required
+                  _elem120 = new RecordMutation();
+                  _elem120.read(iprot);
+                  struct.recordMutations.add(_elem120);
                 }
                 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 _iter111 : struct.recordMutations)
+          for (RecordMutation _iter121 : struct.recordMutations)
           {
-            _iter111.write(oprot);
+            _iter121.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 _iter112 : struct.recordMutations)
+          for (RecordMutation _iter122 : struct.recordMutations)
           {
-            _iter112.write(oprot);
+            _iter122.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 _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)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list123 = 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>(_list123.size);
+          for (int _i124 = 0; _i124 < _list123.size; ++_i124)
           {
-            RecordMutation _elem115; // required
-            _elem115 = new RecordMutation();
-            _elem115.read(iprot);
-            struct.recordMutations.add(_elem115);
+            RecordMutation _elem125; // required
+            _elem125 = new RecordMutation();
+            _elem125.read(iprot);
+            struct.recordMutations.add(_elem125);
           }
         }
         struct.setRecordMutationsIsSet(true);


Mime
View raw message