incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [2/2] git commit: Fixed BLUR-215.
Date Tue, 27 Aug 2013 00:17:49 GMT
Fixed BLUR-215.


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

Branch: refs/heads/master
Commit: 10886b7ccd84107177e3414b683c507aa9d537ae
Parents: d591930
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Mon Aug 26 20:17:20 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Mon Aug 26 20:17:20 2013 -0400

----------------------------------------------------------------------
 .../org/apache/blur/manager/IndexManager.java   |   6 +-
 .../blur/manager/status/MergerQueryStatus.java  |   4 +-
 .../apache/blur/manager/status/QueryStatus.java |   2 +-
 .../blur/manager/status/QueryStatusManager.java |  17 +-
 .../blur/thrift/BlurControllerServer.java       |  22 +-
 .../org/apache/blur/thrift/BlurShardServer.java |   6 +-
 .../java/org/apache/blur/utils/QueryCache.java  |   2 +-
 .../apache/blur/manager/IndexManagerTest.java   |  18 +-
 .../org/apache/blur/thrift/BlurClusterTest.java |   4 +-
 .../apache/blur/jdbc/BlurResultSetRecords.java  |   6 +-
 .../org/apache/blur/jdbc/BlurResultSetRows.java |   6 +-
 .../org/apache/blur/thrift/generated/Blur.java  | 214 ++++++++++---------
 .../apache/blur/thrift/generated/BlurQuery.java |  66 +++---
 .../blur/thrift/generated/BlurQueryStatus.java  |  62 +++---
 .../src/main/scripts/interface/Blur.thrift      |  10 +-
 .../main/scripts/interface/gen-html/Blur.html   |  10 +-
 .../org/apache/blur/thrift/generated/Blur.java  | 214 ++++++++++---------
 .../apache/blur/thrift/generated/BlurQuery.java |  66 +++---
 .../blur/thrift/generated/BlurQueryStatus.java  |  62 +++---
 .../src/main/scripts/interface/gen-js/Blur.js   |  22 +-
 .../main/scripts/interface/gen-js/Blur_types.js |  16 +-
 .../scripts/interface/gen-perl/Blur/Blur.pm     |  22 +-
 .../scripts/interface/gen-perl/Blur/Types.pm    |  16 +-
 .../src/main/scripts/interface/gen-rb/blur.rb   |   6 +-
 .../main/scripts/interface/gen-rb/blur_types.rb |   4 +-
 docs/Blur.html                                  |  10 +-
 26 files changed, 463 insertions(+), 430 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/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 adda3ac..dc3073d 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
@@ -471,7 +471,7 @@ public class IndexManager {
     return type;
   }
 
-  public void cancelQuery(String table, long uuid) {
+  public void cancelQuery(String table, String uuid) {
     _statusManager.cancelQuery(table, uuid);
   }
 
@@ -479,11 +479,11 @@ public class IndexManager {
     return _statusManager.currentQueries(table);
   }
 
-  public BlurQueryStatus queryStatus(String table, long uuid) {
+  public BlurQueryStatus queryStatus(String table, String uuid) {
     return _statusManager.queryStatus(table, uuid);
   }
 
-  public List<Long> queryStatusIdList(String table) {
+  public List<String> queryStatusIdList(String table) {
     return _statusManager.queryStatusIdList(table);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/blur-core/src/main/java/org/apache/blur/manager/status/MergerQueryStatus.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/manager/status/MergerQueryStatus.java b/blur-core/src/main/java/org/apache/blur/manager/status/MergerQueryStatus.java
index e5c98da..fec595a 100644
--- a/blur-core/src/main/java/org/apache/blur/manager/status/MergerQueryStatus.java
+++ b/blur-core/src/main/java/org/apache/blur/manager/status/MergerQueryStatus.java
@@ -42,7 +42,7 @@ public class MergerQueryStatus implements Merger<List<BlurQueryStatus>> {
 
   @Override
   public List<BlurQueryStatus> merge(BlurExecutorCompletionService<List<BlurQueryStatus>> service) throws BlurException {
-    Map<Long, BlurQueryStatus> statusMap = new HashMap<Long, BlurQueryStatus>();
+    Map<String, BlurQueryStatus> statusMap = new HashMap<String, BlurQueryStatus>();
     while (service.getRemainingCount() > 0) {
       Future<List<BlurQueryStatus>> future = service.poll(_timeout, TimeUnit.MILLISECONDS, true);
       List<BlurQueryStatus> status = service.getResultThrowException(future);
@@ -51,7 +51,7 @@ public class MergerQueryStatus implements Merger<List<BlurQueryStatus>> {
     return new ArrayList<BlurQueryStatus>(statusMap.values());
   }
 
-  private void addToMap(Map<Long, BlurQueryStatus> statusMap, List<BlurQueryStatus> list) {
+  private void addToMap(Map<String, BlurQueryStatus> statusMap, List<BlurQueryStatus> list) {
     for (BlurQueryStatus status : list) {
       BlurQueryStatus searchQueryStatus = statusMap.get(status.uuid);
       if (searchQueryStatus == null) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/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 00df885..cad6290 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
@@ -84,7 +84,7 @@ public class QueryStatus implements Comparable<QueryStatus> {
     return this;
   }
 
-  public long getUserUuid() {
+  public String getUserUuid() {
     return _blurQuery.uuid;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/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 4ae4206..d9262ef 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,7 +32,6 @@ 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.Status;
 import org.apache.blur.utils.GCWatcher;
 import org.apache.blur.utils.GCWatcher.Action;
 
@@ -100,9 +99,10 @@ public class QueryStatusManager {
     this.statusCleanupTimerDelay = statusCleanupTimerDelay;
   }
 
-  public void cancelQuery(String table, long uuid) {
+  public void cancelQuery(String table, String uuid) {
     for (QueryStatus status : currentQueryStatusCollection.keySet()) {
-      if (status.getUserUuid() == uuid && status.getTable().equals(table)) {
+      String userUuid = status.getUserUuid();
+      if (userUuid != null && userUuid.equals(uuid) && status.getTable().equals(table)) {
         status.cancelQuery();
       }
     }
@@ -118,23 +118,24 @@ public class QueryStatusManager {
     return result;
   }
 
-  public BlurQueryStatus queryStatus(String table, long uuid) {
+  public BlurQueryStatus queryStatus(String table, String uuid) {
     for (QueryStatus status : currentQueryStatusCollection.keySet()) {
-      if (status.getUserUuid() == uuid && status.getTable().equals(table)) {
+      String userUuid = status.getUserUuid();
+      if (userUuid != null && userUuid.equals(uuid) && status.getTable().equals(table)) {
         return status.getQueryStatus();
       }
     }
     return null;
   }
 
-  public List<Long> queryStatusIdList(String table) {
-    Set<Long> ids = new HashSet<Long>();
+  public List<String> queryStatusIdList(String table) {
+    Set<String> ids = new HashSet<String>();
     for (QueryStatus status : currentQueryStatusCollection.keySet()) {
       if (status.getTable().equals(table)) {
         ids.add(status.getUserUuid());
       }
     }
-    return new ArrayList<Long>(ids);
+    return new ArrayList<String>(ids);
   }
 
   public void stopAllQueriesForBackPressure() {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java b/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
index 85c712e..e674a6c 100644
--- a/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
+++ b/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
@@ -449,7 +449,7 @@ public class BlurControllerServer extends TableAdmin implements Iface {
   }
 
   @Override
-  public void cancelQuery(final String table, final long uuid) throws BlurException, TException {
+  public void cancelQuery(final String table, final String uuid) throws BlurException, TException {
     checkTable(table);
     try {
       scatter(getCluster(table), new BlurCommand<Void>() {
@@ -466,24 +466,24 @@ public class BlurControllerServer extends TableAdmin implements Iface {
   }
 
   @Override
-  public List<Long> queryStatusIdList(final String table) throws BlurException, TException {
+  public List<String> queryStatusIdList(final String table) throws BlurException, TException {
     checkTable(table);
     try {
-      return scatterGather(getCluster(table), new BlurCommand<List<Long>>() {
+      return scatterGather(getCluster(table), new BlurCommand<List<String>>() {
         @Override
-        public List<Long> call(Client client) throws BlurException, TException {
+        public List<String> call(Client client) throws BlurException, TException {
           return client.queryStatusIdList(table);
         }
-      }, new Merger<List<Long>>() {
+      }, new Merger<List<String>>() {
         @Override
-        public List<Long> merge(BlurExecutorCompletionService<List<Long>> service) throws BlurException {
-          Set<Long> result = new HashSet<Long>();
+        public List<String> merge(BlurExecutorCompletionService<List<String>> service) throws BlurException {
+          Set<String> result = new HashSet<String>();
           while (service.getRemainingCount() > 0) {
-            Future<List<Long>> future = service.poll(_defaultParallelCallTimeout, TimeUnit.MILLISECONDS, true);
-            List<Long> ids = service.getResultThrowException(future);
+            Future<List<String>> future = service.poll(_defaultParallelCallTimeout, TimeUnit.MILLISECONDS, true);
+            List<String> ids = service.getResultThrowException(future);
             result.addAll(ids);
           }
-          return new ArrayList<Long>(result);
+          return new ArrayList<String>(result);
         }
       });
     } catch (Exception e) {
@@ -493,7 +493,7 @@ public class BlurControllerServer extends TableAdmin implements Iface {
   }
 
   @Override
-  public BlurQueryStatus queryStatusById(final String table, final long uuid) throws BlurException, TException {
+  public BlurQueryStatus queryStatusById(final String table, final String uuid) throws BlurException, TException {
     checkTable(table);
     try {
       return scatterGather(getCluster(table), new BlurCommand<BlurQueryStatus>() {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java b/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
index f4ee6c0..347d5e4 100644
--- a/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
+++ b/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
@@ -164,7 +164,7 @@ public class BlurShardServer extends TableAdmin implements Iface {
   }
 
   @Override
-  public void cancelQuery(String table, long uuid) throws BlurException, TException {
+  public void cancelQuery(String table, String uuid) throws BlurException, TException {
     checkTable(_cluster, table);
     resetSearchers();
     try {
@@ -355,7 +355,7 @@ public class BlurShardServer extends TableAdmin implements Iface {
   }
 
   @Override
-  public BlurQueryStatus queryStatusById(String table, long uuid) throws BlurException, TException {
+  public BlurQueryStatus queryStatusById(String table, String uuid) throws BlurException, TException {
     checkTable(_cluster, table);
     resetSearchers();
     BlurQueryStatus blurQueryStatus;
@@ -375,7 +375,7 @@ public class BlurShardServer extends TableAdmin implements Iface {
   }
 
   @Override
-  public List<Long> queryStatusIdList(String table) throws BlurException, TException {
+  public List<String> queryStatusIdList(String table) throws BlurException, TException {
     checkTable(_cluster, table);
     resetSearchers();
     try {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/blur-core/src/main/java/org/apache/blur/utils/QueryCache.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/utils/QueryCache.java b/blur-core/src/main/java/org/apache/blur/utils/QueryCache.java
index 6a7321c..96db513 100644
--- a/blur-core/src/main/java/org/apache/blur/utils/QueryCache.java
+++ b/blur-core/src/main/java/org/apache/blur/utils/QueryCache.java
@@ -52,7 +52,7 @@ public class QueryCache implements EvictionListener<QueryCacheKey, QueryCacheEnt
     newBlurQuery.useCacheIfPresent = false;
     newBlurQuery.userContext = null;
     newBlurQuery.maxQueryTime = 0;
-    newBlurQuery.uuid = 0;
+    newBlurQuery.uuid = null;
     newBlurQuery.startTime = 0;
     return new QueryCacheKey(table, newBlurQuery);
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/blur-core/src/test/java/org/apache/blur/manager/IndexManagerTest.java
----------------------------------------------------------------------
diff --git a/blur-core/src/test/java/org/apache/blur/manager/IndexManagerTest.java b/blur-core/src/test/java/org/apache/blur/manager/IndexManagerTest.java
index 0e3e626..d50a4f2 100644
--- a/blur-core/src/test/java/org/apache/blur/manager/IndexManagerTest.java
+++ b/blur-core/src/test/java/org/apache/blur/manager/IndexManagerTest.java
@@ -357,7 +357,7 @@ public class IndexManagerTest {
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
+    blurQuery.uuid = "1";
 
     BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, null);
     assertEquals(iterable.getTotalResults(), 1);
@@ -382,7 +382,7 @@ public class IndexManagerTest {
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
+    blurQuery.uuid = "1";
 
     BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, null);
     assertEquals(iterable.getTotalResults(), 1);
@@ -407,7 +407,7 @@ public class IndexManagerTest {
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
+    blurQuery.uuid = "1";
 
     BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, null);
     assertEquals(iterable.getTotalResults(), 1);
@@ -432,7 +432,7 @@ public class IndexManagerTest {
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
+    blurQuery.uuid = "1";
     blurQuery.facets = Arrays.asList(new Facet("test-family.testcol1:value*", Long.MAX_VALUE), new Facet(
         "test-family.testcol1:value-nohit", Long.MAX_VALUE));
 
@@ -628,7 +628,7 @@ public class IndexManagerTest {
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
+    blurQuery.uuid = "1";
 
     BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, null);
     assertEquals(2, iterable.getTotalResults());
@@ -657,7 +657,7 @@ public class IndexManagerTest {
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
+    blurQuery.uuid = "1";
     blurQuery.selector = new Selector();
 
     BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, null);
@@ -683,7 +683,7 @@ public class IndexManagerTest {
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
+    blurQuery.uuid = "1";
 
     BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, null);
     assertEquals(iterable.getTotalResults(), 2);
@@ -711,7 +711,7 @@ public class IndexManagerTest {
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
+    blurQuery.uuid = "1";
     blurQuery.selector = new Selector();
     blurQuery.selector.setRecordOnly(true);
 
@@ -774,7 +774,7 @@ public class IndexManagerTest {
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
+    blurQuery.uuid = "1";
     blurQuery.facets = Arrays.asList(new Facet("test-family.testcol1:value1", Long.MAX_VALUE), new Facet(
         "test-family.testcol1:value-nohit", Long.MAX_VALUE));
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/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 65060bb..a766fa3 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
@@ -164,7 +164,7 @@ public class BlurClusterTest {
     blurQueryRow.setQuery(queryRow);
     blurQueryRow.setUseCacheIfPresent(false);
     blurQueryRow.setCacheResult(false);
-    blurQueryRow.setUuid(1234l);
+    blurQueryRow.setUuid("1234");
 
     final AtomicReference<BlurException> error = new AtomicReference<BlurException>();
     final AtomicBoolean fail = new AtomicBoolean();
@@ -213,7 +213,7 @@ public class BlurClusterTest {
     blurQueryRow.setQuery(queryRow);
     blurQueryRow.setUseCacheIfPresent(false);
     blurQueryRow.setCacheResult(false);
-    blurQueryRow.setUuid(1234l);
+    blurQueryRow.setUuid("1234");
 
     final AtomicReference<BlurException> error = new AtomicReference<BlurException>();
     final AtomicBoolean fail = new AtomicBoolean();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRecords.java
----------------------------------------------------------------------
diff --git a/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRecords.java b/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRecords.java
index fede15b..407a263 100644
--- a/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRecords.java
+++ b/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRecords.java
@@ -28,7 +28,7 @@ import java.sql.SQLWarning;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
+import java.util.UUID;
 
 import org.apache.blur.jdbc.abstractimpl.AbstractBlurResultSet;
 import org.apache.blur.jdbc.parser.Parser;
@@ -42,10 +42,10 @@ import org.apache.blur.thrift.generated.Column;
 import org.apache.blur.thrift.generated.ColumnDefinition;
 import org.apache.blur.thrift.generated.FetchRecordResult;
 import org.apache.blur.thrift.generated.FetchResult;
+import org.apache.blur.thrift.generated.Query;
 import org.apache.blur.thrift.generated.Record;
 import org.apache.blur.thrift.generated.Schema;
 import org.apache.blur.thrift.generated.Selector;
-import org.apache.blur.thrift.generated.Query;
 
 
 public class BlurResultSetRecords extends AbstractBlurResultSet {
@@ -87,7 +87,7 @@ public class BlurResultSetRecords extends AbstractBlurResultSet {
     BlurQuery blurQuery = new BlurQuery();
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = new Random().nextLong();
+    blurQuery.uuid = UUID.randomUUID().toString();
     blurQuery.fetch = fetch;
     blurQuery.start = start;
     blurQuery.query = new Query();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRows.java
----------------------------------------------------------------------
diff --git a/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRows.java b/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRows.java
index 3a0714a..a3960d9 100644
--- a/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRows.java
+++ b/blur-jdbc/src/main/java/org/apache/blur/jdbc/BlurResultSetRows.java
@@ -27,7 +27,7 @@ import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
+import java.util.UUID;
 
 import org.apache.blur.jdbc.abstractimpl.AbstractBlurResultSet;
 import org.apache.blur.jdbc.parser.Parser;
@@ -39,11 +39,11 @@ import org.apache.blur.thrift.generated.BlurResult;
 import org.apache.blur.thrift.generated.BlurResults;
 import org.apache.blur.thrift.generated.Column;
 import org.apache.blur.thrift.generated.FetchResult;
+import org.apache.blur.thrift.generated.Query;
 import org.apache.blur.thrift.generated.Record;
 import org.apache.blur.thrift.generated.Row;
 import org.apache.blur.thrift.generated.Schema;
 import org.apache.blur.thrift.generated.Selector;
-import org.apache.blur.thrift.generated.Query;
 
 
 public class BlurResultSetRows extends AbstractBlurResultSet {
@@ -82,7 +82,7 @@ public class BlurResultSetRows extends AbstractBlurResultSet {
     BlurQuery blurQuery = new BlurQuery();
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = new Random().nextLong();
+    blurQuery.uuid = UUID.randomUUID().toString();
     blurQuery.fetch = fetch;
     blurQuery.start = start;
     blurQuery.query = new Query();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
index ba3a3d8..aacb956 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
@@ -223,7 +223,7 @@ public class Blur {
      * 
      * @param uuid the uuid of the query.
      */
-    public void cancelQuery(String table, long uuid) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
+    public void cancelQuery(String table, String uuid) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     /**
      * Returns a list of the query ids of queries that have recently been executed for the given table.
@@ -231,7 +231,7 @@ public class Blur {
      * 
      * @param table the table name.
      */
-    public List<Long> queryStatusIdList(String table) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
+    public List<String> queryStatusIdList(String table) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     /**
      * Returns the query status for the given table and query uuid.
@@ -241,7 +241,7 @@ public class Blur {
      * 
      * @param uuid the uuid of the query.
      */
-    public BlurQueryStatus queryStatusById(String table, long uuid) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
+    public BlurQueryStatus queryStatusById(String table, String uuid) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     /**
      * Gets the terms list from the index for the given table, family, column using the
@@ -391,11 +391,11 @@ public class Blur {
 
     public void mutateBatch(List<RowMutation> mutations, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.mutateBatch_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
-    public void cancelQuery(String table, long uuid, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.cancelQuery_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
+    public void cancelQuery(String table, String uuid, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.cancelQuery_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     public void queryStatusIdList(String table, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.queryStatusIdList_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
-    public void queryStatusById(String table, long uuid, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.queryStatusById_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
+    public void queryStatusById(String table, String uuid, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.queryStatusById_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     public void terms(String table, String columnFamily, String columnName, String startWith, short size, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.terms_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
@@ -913,13 +913,13 @@ public class Blur {
       return;
     }
 
-    public void cancelQuery(String table, long uuid) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public void cancelQuery(String table, String uuid) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
       send_cancelQuery(table, uuid);
       recv_cancelQuery();
     }
 
-    public void send_cancelQuery(String table, long uuid) throws org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public void send_cancelQuery(String table, String uuid) throws org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
       cancelQuery_args args = new cancelQuery_args();
       args.setTable(table);
@@ -937,7 +937,7 @@ public class Blur {
       return;
     }
 
-    public List<Long> queryStatusIdList(String table) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public List<String> queryStatusIdList(String table) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
       send_queryStatusIdList(table);
       return recv_queryStatusIdList();
@@ -950,7 +950,7 @@ public class Blur {
       sendBase("queryStatusIdList", args);
     }
 
-    public List<Long> recv_queryStatusIdList() throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public List<String> recv_queryStatusIdList() throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
       queryStatusIdList_result result = new queryStatusIdList_result();
       receiveBase(result, "queryStatusIdList");
@@ -963,13 +963,13 @@ public class Blur {
       throw new org.apache.blur.thirdparty.thrift_0_9_0.TApplicationException(org.apache.blur.thirdparty.thrift_0_9_0.TApplicationException.MISSING_RESULT, "queryStatusIdList failed: unknown result");
     }
 
-    public BlurQueryStatus queryStatusById(String table, long uuid) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public BlurQueryStatus queryStatusById(String table, String uuid) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
       send_queryStatusById(table, uuid);
       return recv_queryStatusById();
     }
 
-    public void send_queryStatusById(String table, long uuid) throws org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public void send_queryStatusById(String table, String uuid) throws org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
       queryStatusById_args args = new queryStatusById_args();
       args.setTable(table);
@@ -1901,7 +1901,7 @@ public class Blur {
       }
     }
 
-    public void cancelQuery(String table, long uuid, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<cancelQuery_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+    public void cancelQuery(String table, String uuid, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<cancelQuery_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       checkReady();
       cancelQuery_call method_call = new cancelQuery_call(table, uuid, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -1910,8 +1910,8 @@ public class Blur {
 
     public static class cancelQuery_call extends org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncMethodCall {
       private String table;
-      private long uuid;
-      public cancelQuery_call(String table, long uuid, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<cancelQuery_call> resultHandler, org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncClient client, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolFactory protocolFactory, org.apache.blur.thirdparty.thrift_0_9_0.transport.TNonblockingTransport transport) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+      private String uuid;
+      public cancelQuery_call(String table, String uuid, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<cancelQuery_call> resultHandler, org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncClient client, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolFactory protocolFactory, org.apache.blur.thirdparty.thrift_0_9_0.transport.TNonblockingTransport transport) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
         this.uuid = uuid;
@@ -1958,7 +1958,7 @@ public class Blur {
         prot.writeMessageEnd();
       }
 
-      public List<Long> getResult() throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException {
+      public List<String> getResult() throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException {
         if (getState() != org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -1968,7 +1968,7 @@ public class Blur {
       }
     }
 
-    public void queryStatusById(String table, long uuid, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<queryStatusById_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+    public void queryStatusById(String table, String uuid, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<queryStatusById_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       checkReady();
       queryStatusById_call method_call = new queryStatusById_call(table, uuid, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -1977,8 +1977,8 @@ public class Blur {
 
     public static class queryStatusById_call extends org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncMethodCall {
       private String table;
-      private long uuid;
-      public queryStatusById_call(String table, long uuid, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<queryStatusById_call> resultHandler, org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncClient client, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolFactory protocolFactory, org.apache.blur.thirdparty.thrift_0_9_0.transport.TNonblockingTransport transport) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+      private String uuid;
+      public queryStatusById_call(String table, String uuid, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<queryStatusById_call> resultHandler, org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncClient client, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolFactory protocolFactory, org.apache.blur.thirdparty.thrift_0_9_0.transport.TNonblockingTransport transport) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
         this.uuid = uuid;
@@ -18902,7 +18902,7 @@ public class Blur {
     private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct STRUCT_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct("cancelQuery_args");
 
     private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField TABLE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("table", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)1);
-    private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField 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.I64, (short)2);
+    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)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -18917,7 +18917,7 @@ public class Blur {
     /**
      * the uuid of the query.
      */
-    public long uuid; // required
+    public String uuid; // 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 {
@@ -18987,15 +18987,13 @@ public class Blur {
     }
 
     // isset id assignments
-    private static final int __UUID_ISSET_ID = 0;
-    private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.TABLE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("table", 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.UUID, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("uuid", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
-          new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64)));
+          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(cancelQuery_args.class, metaDataMap);
     }
@@ -19005,23 +19003,23 @@ public class Blur {
 
     public cancelQuery_args(
       String table,
-      long uuid)
+      String uuid)
     {
       this();
       this.table = table;
       this.uuid = uuid;
-      setUuidIsSet(true);
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
     public cancelQuery_args(cancelQuery_args other) {
-      __isset_bitfield = other.__isset_bitfield;
       if (other.isSetTable()) {
         this.table = other.table;
       }
-      this.uuid = other.uuid;
+      if (other.isSetUuid()) {
+        this.uuid = other.uuid;
+      }
     }
 
     public cancelQuery_args deepCopy() {
@@ -19031,8 +19029,7 @@ public class Blur {
     @Override
     public void clear() {
       this.table = null;
-      setUuidIsSet(false);
-      this.uuid = 0;
+      this.uuid = null;
     }
 
     /**
@@ -19068,30 +19065,31 @@ public class Blur {
     /**
      * the uuid of the query.
      */
-    public long getUuid() {
+    public String getUuid() {
       return this.uuid;
     }
 
     /**
      * the uuid of the query.
      */
-    public cancelQuery_args setUuid(long uuid) {
+    public cancelQuery_args setUuid(String uuid) {
       this.uuid = uuid;
-      setUuidIsSet(true);
       return this;
     }
 
     public void unsetUuid() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UUID_ISSET_ID);
+      this.uuid = null;
     }
 
     /** Returns true if field uuid is set (has been assigned a value) and false otherwise */
     public boolean isSetUuid() {
-      return EncodingUtils.testBit(__isset_bitfield, __UUID_ISSET_ID);
+      return this.uuid != null;
     }
 
     public void setUuidIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UUID_ISSET_ID, value);
+      if (!value) {
+        this.uuid = null;
+      }
     }
 
     public void setFieldValue(_Fields field, Object value) {
@@ -19108,7 +19106,7 @@ public class Blur {
         if (value == null) {
           unsetUuid();
         } else {
-          setUuid((Long)value);
+          setUuid((String)value);
         }
         break;
 
@@ -19121,7 +19119,7 @@ public class Blur {
         return getTable();
 
       case UUID:
-        return Long.valueOf(getUuid());
+        return getUuid();
 
       }
       throw new IllegalStateException();
@@ -19164,12 +19162,12 @@ public class Blur {
           return false;
       }
 
-      boolean this_present_uuid = true;
-      boolean that_present_uuid = true;
+      boolean this_present_uuid = true && this.isSetUuid();
+      boolean that_present_uuid = true && that.isSetUuid();
       if (this_present_uuid || that_present_uuid) {
         if (!(this_present_uuid && that_present_uuid))
           return false;
-        if (this.uuid != that.uuid)
+        if (!this.uuid.equals(that.uuid))
           return false;
       }
 
@@ -19238,7 +19236,11 @@ public class Blur {
       first = false;
       if (!first) sb.append(", ");
       sb.append("uuid:");
-      sb.append(this.uuid);
+      if (this.uuid == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.uuid);
+      }
       first = false;
       sb.append(")");
       return sb.toString();
@@ -19259,8 +19261,6 @@ public class Blur {
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
       try {
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-        __isset_bitfield = 0;
         read(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TCompactProtocol(new org.apache.blur.thirdparty.thrift_0_9_0.transport.TIOStreamTransport(in)));
       } catch (org.apache.blur.thirdparty.thrift_0_9_0.TException te) {
         throw new java.io.IOException(te);
@@ -19294,8 +19294,8 @@ public class Blur {
               }
               break;
             case 2: // UUID
-              if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64) {
-                struct.uuid = iprot.readI64();
+              if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) {
+                struct.uuid = iprot.readString();
                 struct.setUuidIsSet(true);
               } else { 
                 org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -19321,9 +19321,11 @@ public class Blur {
           oprot.writeString(struct.table);
           oprot.writeFieldEnd();
         }
-        oprot.writeFieldBegin(UUID_FIELD_DESC);
-        oprot.writeI64(struct.uuid);
-        oprot.writeFieldEnd();
+        if (struct.uuid != null) {
+          oprot.writeFieldBegin(UUID_FIELD_DESC);
+          oprot.writeString(struct.uuid);
+          oprot.writeFieldEnd();
+        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
@@ -19353,7 +19355,7 @@ public class Blur {
           oprot.writeString(struct.table);
         }
         if (struct.isSetUuid()) {
-          oprot.writeI64(struct.uuid);
+          oprot.writeString(struct.uuid);
         }
       }
 
@@ -19366,7 +19368,7 @@ public class Blur {
           struct.setTableIsSet(true);
         }
         if (incoming.get(1)) {
-          struct.uuid = iprot.readI64();
+          struct.uuid = iprot.readString();
           struct.setUuidIsSet(true);
         }
       }
@@ -20108,7 +20110,7 @@ public class Blur {
       schemes.put(TupleScheme.class, new queryStatusIdList_resultTupleSchemeFactory());
     }
 
-    public List<Long> success; // required
+    public List<String> success; // required
     public BlurException ex; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -20178,7 +20180,7 @@ public class Blur {
       Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("success", 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.I64))));
+              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.EX, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("ex", 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.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -20189,7 +20191,7 @@ public class Blur {
     }
 
     public queryStatusIdList_result(
-      List<Long> success,
+      List<String> success,
       BlurException ex)
     {
       this();
@@ -20202,8 +20204,8 @@ public class Blur {
      */
     public queryStatusIdList_result(queryStatusIdList_result other) {
       if (other.isSetSuccess()) {
-        List<Long> __this__success = new ArrayList<Long>();
-        for (Long other_element : other.success) {
+        List<String> __this__success = new ArrayList<String>();
+        for (String other_element : other.success) {
           __this__success.add(other_element);
         }
         this.success = __this__success;
@@ -20227,22 +20229,22 @@ public class Blur {
       return (this.success == null) ? 0 : this.success.size();
     }
 
-    public java.util.Iterator<Long> getSuccessIterator() {
+    public java.util.Iterator<String> getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
-    public void addToSuccess(long elem) {
+    public void addToSuccess(String elem) {
       if (this.success == null) {
-        this.success = new ArrayList<Long>();
+        this.success = new ArrayList<String>();
       }
       this.success.add(elem);
     }
 
-    public List<Long> getSuccess() {
+    public List<String> getSuccess() {
       return this.success;
     }
 
-    public queryStatusIdList_result setSuccess(List<Long> success) {
+    public queryStatusIdList_result setSuccess(List<String> success) {
       this.success = success;
       return this;
     }
@@ -20292,7 +20294,7 @@ public class Blur {
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<Long>)value);
+          setSuccess((List<String>)value);
         }
         break;
 
@@ -20483,11 +20485,11 @@ public class Blur {
               if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
                 {
                   org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list240 = iprot.readListBegin();
-                  struct.success = new ArrayList<Long>(_list240.size);
+                  struct.success = new ArrayList<String>(_list240.size);
                   for (int _i241 = 0; _i241 < _list240.size; ++_i241)
                   {
-                    long _elem242; // required
-                    _elem242 = iprot.readI64();
+                    String _elem242; // required
+                    _elem242 = iprot.readString();
                     struct.success.add(_elem242);
                   }
                   iprot.readListEnd();
@@ -20524,10 +20526,10 @@ public class Blur {
         if (struct.success != null) {
           oprot.writeFieldBegin(SUCCESS_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.success.size()));
-            for (long _iter243 : struct.success)
+            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.success.size()));
+            for (String _iter243 : struct.success)
             {
-              oprot.writeI64(_iter243);
+              oprot.writeString(_iter243);
             }
             oprot.writeListEnd();
           }
@@ -20566,9 +20568,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (long _iter244 : struct.success)
+            for (String _iter244 : struct.success)
             {
-              oprot.writeI64(_iter244);
+              oprot.writeString(_iter244);
             }
           }
         }
@@ -20583,12 +20585,12 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list245 = 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.success = new ArrayList<Long>(_list245.size);
+            org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list245 = 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.success = new ArrayList<String>(_list245.size);
             for (int _i246 = 0; _i246 < _list245.size; ++_i246)
             {
-              long _elem247; // required
-              _elem247 = iprot.readI64();
+              String _elem247; // required
+              _elem247 = iprot.readString();
               struct.success.add(_elem247);
             }
           }
@@ -20608,7 +20610,7 @@ public class Blur {
     private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct STRUCT_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct("queryStatusById_args");
 
     private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField TABLE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("table", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)1);
-    private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField 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.I64, (short)2);
+    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)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -20623,7 +20625,7 @@ public class Blur {
     /**
      * the uuid of the query.
      */
-    public long uuid; // required
+    public String uuid; // 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 {
@@ -20693,15 +20695,13 @@ public class Blur {
     }
 
     // isset id assignments
-    private static final int __UUID_ISSET_ID = 0;
-    private byte __isset_bitfield = 0;
     public static final Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.TABLE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("table", 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.UUID, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("uuid", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
-          new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64)));
+          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(queryStatusById_args.class, metaDataMap);
     }
@@ -20711,23 +20711,23 @@ public class Blur {
 
     public queryStatusById_args(
       String table,
-      long uuid)
+      String uuid)
     {
       this();
       this.table = table;
       this.uuid = uuid;
-      setUuidIsSet(true);
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
     public queryStatusById_args(queryStatusById_args other) {
-      __isset_bitfield = other.__isset_bitfield;
       if (other.isSetTable()) {
         this.table = other.table;
       }
-      this.uuid = other.uuid;
+      if (other.isSetUuid()) {
+        this.uuid = other.uuid;
+      }
     }
 
     public queryStatusById_args deepCopy() {
@@ -20737,8 +20737,7 @@ public class Blur {
     @Override
     public void clear() {
       this.table = null;
-      setUuidIsSet(false);
-      this.uuid = 0;
+      this.uuid = null;
     }
 
     /**
@@ -20774,30 +20773,31 @@ public class Blur {
     /**
      * the uuid of the query.
      */
-    public long getUuid() {
+    public String getUuid() {
       return this.uuid;
     }
 
     /**
      * the uuid of the query.
      */
-    public queryStatusById_args setUuid(long uuid) {
+    public queryStatusById_args setUuid(String uuid) {
       this.uuid = uuid;
-      setUuidIsSet(true);
       return this;
     }
 
     public void unsetUuid() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UUID_ISSET_ID);
+      this.uuid = null;
     }
 
     /** Returns true if field uuid is set (has been assigned a value) and false otherwise */
     public boolean isSetUuid() {
-      return EncodingUtils.testBit(__isset_bitfield, __UUID_ISSET_ID);
+      return this.uuid != null;
     }
 
     public void setUuidIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UUID_ISSET_ID, value);
+      if (!value) {
+        this.uuid = null;
+      }
     }
 
     public void setFieldValue(_Fields field, Object value) {
@@ -20814,7 +20814,7 @@ public class Blur {
         if (value == null) {
           unsetUuid();
         } else {
-          setUuid((Long)value);
+          setUuid((String)value);
         }
         break;
 
@@ -20827,7 +20827,7 @@ public class Blur {
         return getTable();
 
       case UUID:
-        return Long.valueOf(getUuid());
+        return getUuid();
 
       }
       throw new IllegalStateException();
@@ -20870,12 +20870,12 @@ public class Blur {
           return false;
       }
 
-      boolean this_present_uuid = true;
-      boolean that_present_uuid = true;
+      boolean this_present_uuid = true && this.isSetUuid();
+      boolean that_present_uuid = true && that.isSetUuid();
       if (this_present_uuid || that_present_uuid) {
         if (!(this_present_uuid && that_present_uuid))
           return false;
-        if (this.uuid != that.uuid)
+        if (!this.uuid.equals(that.uuid))
           return false;
       }
 
@@ -20944,7 +20944,11 @@ public class Blur {
       first = false;
       if (!first) sb.append(", ");
       sb.append("uuid:");
-      sb.append(this.uuid);
+      if (this.uuid == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.uuid);
+      }
       first = false;
       sb.append(")");
       return sb.toString();
@@ -20965,8 +20969,6 @@ public class Blur {
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
       try {
-        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-        __isset_bitfield = 0;
         read(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TCompactProtocol(new org.apache.blur.thirdparty.thrift_0_9_0.transport.TIOStreamTransport(in)));
       } catch (org.apache.blur.thirdparty.thrift_0_9_0.TException te) {
         throw new java.io.IOException(te);
@@ -21000,8 +21002,8 @@ public class Blur {
               }
               break;
             case 2: // UUID
-              if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64) {
-                struct.uuid = iprot.readI64();
+              if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) {
+                struct.uuid = iprot.readString();
                 struct.setUuidIsSet(true);
               } else { 
                 org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -21027,9 +21029,11 @@ public class Blur {
           oprot.writeString(struct.table);
           oprot.writeFieldEnd();
         }
-        oprot.writeFieldBegin(UUID_FIELD_DESC);
-        oprot.writeI64(struct.uuid);
-        oprot.writeFieldEnd();
+        if (struct.uuid != null) {
+          oprot.writeFieldBegin(UUID_FIELD_DESC);
+          oprot.writeString(struct.uuid);
+          oprot.writeFieldEnd();
+        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
@@ -21059,7 +21063,7 @@ public class Blur {
           oprot.writeString(struct.table);
         }
         if (struct.isSetUuid()) {
-          oprot.writeI64(struct.uuid);
+          oprot.writeString(struct.uuid);
         }
       }
 
@@ -21072,7 +21076,7 @@ public class Blur {
           struct.setTableIsSet(true);
         }
         if (incoming.get(1)) {
-          struct.uuid = iprot.readI64();
+          struct.uuid = iprot.readString();
           struct.setUuidIsSet(true);
         }
       }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/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 ca6a790..ef2643e 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
@@ -64,7 +64,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField FETCH_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("fetch", 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 MINIMUM_NUMBER_OF_RESULTS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("minimumNumberOfResults", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, (short)9);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField MAX_QUERY_TIME_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("maxQueryTime", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, (short)10);
-  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.I64, (short)11);
+  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)11);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField USER_CONTEXT_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("userContext", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)12);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField CACHE_RESULT_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("cacheResult", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)13);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField START_TIME_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("startTime", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, (short)14);
@@ -112,7 +112,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
    * Sets the uuid of this query, this is normal set by the client so that the status
    * of a running query can be found or the query can be canceled.
    */
-  public long uuid; // required
+  public String uuid; // required
   /**
    * Sets a user context, only used for logging at this point.
    */
@@ -261,9 +261,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
   private static final int __FETCH_ISSET_ID = 2;
   private static final int __MINIMUMNUMBEROFRESULTS_ISSET_ID = 3;
   private static final int __MAXQUERYTIME_ISSET_ID = 4;
-  private static final int __UUID_ISSET_ID = 5;
-  private static final int __CACHERESULT_ISSET_ID = 6;
-  private static final int __STARTTIME_ISSET_ID = 7;
+  private static final int __CACHERESULT_ISSET_ID = 5;
+  private static final int __STARTTIME_ISSET_ID = 6;
   private byte __isset_bitfield = 0;
   public static final Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> metaDataMap;
   static {
@@ -286,7 +285,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     tmpMap.put(_Fields.MAX_QUERY_TIME, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("maxQueryTime", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64)));
     tmpMap.put(_Fields.UUID, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("uuid", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
-        new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64)));
+        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.USER_CONTEXT, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("userContext", 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.CACHE_RESULT, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("cacheResult", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
@@ -323,7 +322,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     int fetch,
     long minimumNumberOfResults,
     long maxQueryTime,
-    long uuid,
+    String uuid,
     String userContext,
     boolean cacheResult,
     long startTime)
@@ -343,7 +342,6 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     this.maxQueryTime = maxQueryTime;
     setMaxQueryTimeIsSet(true);
     this.uuid = uuid;
-    setUuidIsSet(true);
     this.userContext = userContext;
     this.cacheResult = cacheResult;
     setCacheResultIsSet(true);
@@ -374,7 +372,9 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     this.fetch = other.fetch;
     this.minimumNumberOfResults = other.minimumNumberOfResults;
     this.maxQueryTime = other.maxQueryTime;
-    this.uuid = other.uuid;
+    if (other.isSetUuid()) {
+      this.uuid = other.uuid;
+    }
     if (other.isSetUserContext()) {
       this.userContext = other.userContext;
     }
@@ -401,8 +401,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
 
     this.maxQueryTime = 9223372036854775807L;
 
-    setUuidIsSet(false);
-    this.uuid = 0;
+    this.uuid = null;
     this.userContext = null;
     this.cacheResult = true;
 
@@ -666,7 +665,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
    * Sets the uuid of this query, this is normal set by the client so that the status
    * of a running query can be found or the query can be canceled.
    */
-  public long getUuid() {
+  public String getUuid() {
     return this.uuid;
   }
 
@@ -674,23 +673,24 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
    * Sets the uuid of this query, this is normal set by the client so that the status
    * of a running query can be found or the query can be canceled.
    */
-  public BlurQuery setUuid(long uuid) {
+  public BlurQuery setUuid(String uuid) {
     this.uuid = uuid;
-    setUuidIsSet(true);
     return this;
   }
 
   public void unsetUuid() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UUID_ISSET_ID);
+    this.uuid = null;
   }
 
   /** Returns true if field uuid is set (has been assigned a value) and false otherwise */
   public boolean isSetUuid() {
-    return EncodingUtils.testBit(__isset_bitfield, __UUID_ISSET_ID);
+    return this.uuid != null;
   }
 
   public void setUuidIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UUID_ISSET_ID, value);
+    if (!value) {
+      this.uuid = null;
+    }
   }
 
   /**
@@ -851,7 +851,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       if (value == null) {
         unsetUuid();
       } else {
-        setUuid((Long)value);
+        setUuid((String)value);
       }
       break;
 
@@ -909,7 +909,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       return Long.valueOf(getMaxQueryTime());
 
     case UUID:
-      return Long.valueOf(getUuid());
+      return getUuid();
 
     case USER_CONTEXT:
       return getUserContext();
@@ -1044,12 +1044,12 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
         return false;
     }
 
-    boolean this_present_uuid = true;
-    boolean that_present_uuid = true;
+    boolean this_present_uuid = true && this.isSetUuid();
+    boolean that_present_uuid = true && that.isSetUuid();
     if (this_present_uuid || that_present_uuid) {
       if (!(this_present_uuid && that_present_uuid))
         return false;
-      if (this.uuid != that.uuid)
+      if (!this.uuid.equals(that.uuid))
         return false;
     }
 
@@ -1281,7 +1281,11 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     first = false;
     if (!first) sb.append(", ");
     sb.append("uuid:");
-    sb.append(this.uuid);
+    if (this.uuid == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.uuid);
+    }
     first = false;
     if (!first) sb.append(", ");
     sb.append("userContext:");
@@ -1428,8 +1432,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
             }
             break;
           case 11: // UUID
-            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64) {
-              struct.uuid = iprot.readI64();
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) {
+              struct.uuid = iprot.readString();
               struct.setUuidIsSet(true);
             } else { 
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1511,9 +1515,11 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       oprot.writeFieldBegin(MAX_QUERY_TIME_FIELD_DESC);
       oprot.writeI64(struct.maxQueryTime);
       oprot.writeFieldEnd();
-      oprot.writeFieldBegin(UUID_FIELD_DESC);
-      oprot.writeI64(struct.uuid);
-      oprot.writeFieldEnd();
+      if (struct.uuid != null) {
+        oprot.writeFieldBegin(UUID_FIELD_DESC);
+        oprot.writeString(struct.uuid);
+        oprot.writeFieldEnd();
+      }
       if (struct.userContext != null) {
         oprot.writeFieldBegin(USER_CONTEXT_FIELD_DESC);
         oprot.writeString(struct.userContext);
@@ -1611,7 +1617,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
         oprot.writeI64(struct.maxQueryTime);
       }
       if (struct.isSetUuid()) {
-        oprot.writeI64(struct.uuid);
+        oprot.writeString(struct.uuid);
       }
       if (struct.isSetUserContext()) {
         oprot.writeString(struct.userContext);
@@ -1673,7 +1679,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
         struct.setMaxQueryTimeIsSet(true);
       }
       if (incoming.get(8)) {
-        struct.uuid = iprot.readI64();
+        struct.uuid = iprot.readString();
         struct.setUuidIsSet(true);
       }
       if (incoming.get(9)) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/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 aa44d35..fe104ab 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
@@ -62,7 +62,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 COMPLETE_SHARDS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("completeShards", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)3);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField TOTAL_SHARDS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("totalShards", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)4);
   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.I64, (short)6);
+  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 Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
@@ -100,7 +100,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
   /**
    * The uuid of the query.
    */
-  public long uuid; // required
+  public String uuid; // required
   /**
    * The status of the query NOT_FOUND if uuid is not found else FOUND
    * 
@@ -216,7 +216,6 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
   // isset id assignments
   private static final int __COMPLETESHARDS_ISSET_ID = 0;
   private static final int __TOTALSHARDS_ISSET_ID = 1;
-  private static final int __UUID_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
   public static final Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> metaDataMap;
   static {
@@ -234,7 +233,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
     tmpMap.put(_Fields.STATE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("state", 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, QueryState.class)));
     tmpMap.put(_Fields.UUID, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("uuid", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
-        new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64)));
+        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)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -250,7 +249,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
     int completeShards,
     int totalShards,
     QueryState state,
-    long uuid,
+    String uuid,
     Status status)
   {
     this();
@@ -262,7 +261,6 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
     setTotalShardsIsSet(true);
     this.state = state;
     this.uuid = uuid;
-    setUuidIsSet(true);
     this.status = status;
   }
 
@@ -294,7 +292,9 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
     if (other.isSetState()) {
       this.state = other.state;
     }
-    this.uuid = other.uuid;
+    if (other.isSetUuid()) {
+      this.uuid = other.uuid;
+    }
     if (other.isSetStatus()) {
       this.status = other.status;
     }
@@ -313,8 +313,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
     setTotalShardsIsSet(false);
     this.totalShards = 0;
     this.state = null;
-    setUuidIsSet(false);
-    this.uuid = 0;
+    this.uuid = null;
     this.status = null;
   }
 
@@ -492,30 +491,31 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
   /**
    * The uuid of the query.
    */
-  public long getUuid() {
+  public String getUuid() {
     return this.uuid;
   }
 
   /**
    * The uuid of the query.
    */
-  public BlurQueryStatus setUuid(long uuid) {
+  public BlurQueryStatus setUuid(String uuid) {
     this.uuid = uuid;
-    setUuidIsSet(true);
     return this;
   }
 
   public void unsetUuid() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UUID_ISSET_ID);
+    this.uuid = null;
   }
 
   /** Returns true if field uuid is set (has been assigned a value) and false otherwise */
   public boolean isSetUuid() {
-    return EncodingUtils.testBit(__isset_bitfield, __UUID_ISSET_ID);
+    return this.uuid != null;
   }
 
   public void setUuidIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UUID_ISSET_ID, value);
+    if (!value) {
+      this.uuid = null;
+    }
   }
 
   /**
@@ -598,7 +598,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
       if (value == null) {
         unsetUuid();
       } else {
-        setUuid((Long)value);
+        setUuid((String)value);
       }
       break;
 
@@ -631,7 +631,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
       return getState();
 
     case UUID:
-      return Long.valueOf(getUuid());
+      return getUuid();
 
     case STATUS:
       return getStatus();
@@ -723,12 +723,12 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
         return false;
     }
 
-    boolean this_present_uuid = true;
-    boolean that_present_uuid = true;
+    boolean this_present_uuid = true && this.isSetUuid();
+    boolean that_present_uuid = true && that.isSetUuid();
     if (this_present_uuid || that_present_uuid) {
       if (!(this_present_uuid && that_present_uuid))
         return false;
-      if (this.uuid != that.uuid)
+      if (!this.uuid.equals(that.uuid))
         return false;
     }
 
@@ -880,7 +880,11 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
     first = false;
     if (!first) sb.append(", ");
     sb.append("uuid:");
-    sb.append(this.uuid);
+    if (this.uuid == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.uuid);
+    }
     first = false;
     if (!first) sb.append(", ");
     sb.append("status:");
@@ -993,8 +997,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
             }
             break;
           case 6: // UUID
-            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64) {
-              struct.uuid = iprot.readI64();
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) {
+              struct.uuid = iprot.readString();
               struct.setUuidIsSet(true);
             } else { 
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1052,9 +1056,11 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
         oprot.writeI32(struct.state.getValue());
         oprot.writeFieldEnd();
       }
-      oprot.writeFieldBegin(UUID_FIELD_DESC);
-      oprot.writeI64(struct.uuid);
-      oprot.writeFieldEnd();
+      if (struct.uuid != null) {
+        oprot.writeFieldBegin(UUID_FIELD_DESC);
+        oprot.writeString(struct.uuid);
+        oprot.writeFieldEnd();
+      }
       if (struct.status != null) {
         oprot.writeFieldBegin(STATUS_FIELD_DESC);
         oprot.writeI32(struct.status.getValue());
@@ -1123,7 +1129,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
         oprot.writeI32(struct.state.getValue());
       }
       if (struct.isSetUuid()) {
-        oprot.writeI64(struct.uuid);
+        oprot.writeString(struct.uuid);
       }
       if (struct.isSetStatus()) {
         oprot.writeI32(struct.status.getValue());
@@ -1168,7 +1174,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
         struct.setStateIsSet(true);
       }
       if (incoming.get(5)) {
-        struct.uuid = iprot.readI64();
+        struct.uuid = iprot.readString();
         struct.setUuidIsSet(true);
       }
       if (incoming.get(6)) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/distribution/src/main/scripts/interface/Blur.thrift
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/Blur.thrift b/distribution/src/main/scripts/interface/Blur.thrift
index d9f401a..ff9afee 100644
--- a/distribution/src/main/scripts/interface/Blur.thrift
+++ b/distribution/src/main/scripts/interface/Blur.thrift
@@ -417,7 +417,7 @@ struct BlurQuery {
    * Sets the uuid of this query, this is normal set by the client so that the status 
    * of a running query can be found or the query can be canceled.
    */
-  11:i64 uuid,
+  11:string uuid,
   /**
    * Sets a user context, only used for logging at this point.
    */
@@ -571,7 +571,7 @@ struct BlurQueryStatus {
   /**
    * The uuid of the query.
    */
-  6:i64 uuid
+  6:string uuid
   /**
    * The status of the query NOT_FOUND if uuid is not found else FOUND
    */
@@ -918,14 +918,14 @@ service Blur {
     /** the table name. */
     1:string table, 
     /** the uuid of the query. */
-    2:i64 uuid
+    2:string uuid
   ) throws (1:BlurException ex)
 
   /**
    * Returns a list of the query ids of queries that have recently been executed for the given table.
    * @return list of all the uuids of the queries uuids.
    */
-  list<i64> queryStatusIdList(
+  list<string> queryStatusIdList(
     /** the table name. */
     1:string table
   ) throws (1:BlurException ex)
@@ -938,7 +938,7 @@ service Blur {
     /** the table name. */
     1:string table, 
     /** the uuid of the query. */
-    2:i64 uuid
+    2:string uuid
   ) throws (1:BlurException ex)
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/10886b7c/distribution/src/main/scripts/interface/gen-html/Blur.html
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-html/Blur.html b/distribution/src/main/scripts/interface/gen-html/Blur.html
index bd3edfe..648f052 100644
--- a/distribution/src/main/scripts/interface/gen-html/Blur.html
+++ b/distribution/src/main/scripts/interface/gen-html/Blur.html
@@ -328,7 +328,7 @@ configured amount of time.
 </td><td>default</td><td>9223372036854775807</td></tr>
 <tr><td>10</td><td>maxQueryTime</td><td><code>i64</code></td><td>The maximum amount of time the query should execute before timing out.
 </td><td>default</td><td>9223372036854775807</td></tr>
-<tr><td>11</td><td>uuid</td><td><code>i64</code></td><td>Sets the uuid of this query, this is normal set by the client so that the status
+<tr><td>11</td><td>uuid</td><td><code>string</code></td><td>Sets the uuid of this query, this is normal set by the client so that the status
 of a running query can be found or the query can be canceled.
 </td><td>default</td><td></td></tr>
 <tr><td>12</td><td>userContext</td><td><code>string</code></td><td>Sets a user context, only used for logging at this point.
@@ -408,7 +408,7 @@ the controller will aggregate all the shard server totals together.
 </td><td>default</td><td></td></tr>
 <tr><td>5</td><td>state</td><td><code><a href="Blur.html#Enum_QueryState">QueryState</a></code></td><td>The state of the query.  e.g. RUNNING, INTERRUPTED, COMPLETE
 </td><td>default</td><td></td></tr>
-<tr><td>6</td><td>uuid</td><td><code>i64</code></td><td>The uuid of the query.
+<tr><td>6</td><td>uuid</td><td><code>string</code></td><td>The uuid of the query.
 </td><td>default</td><td></td></tr>
 <tr><td>7</td><td>status</td><td><code><a href="Blur.html#Enum_Status">Status</a></code></td><td>The status of the query NOT_FOUND if uuid is not found else FOUND
 </td><td>default</td><td></td></tr>
@@ -663,7 +663,7 @@ the shard server, if any.
 </td></tr>
 </table></div><div class="definition"><h4 id="Fn_Blur_cancelQuery">Function: Blur.cancelQuery</h4>
 <pre><code>void</code> cancelQuery(<code>string</code> table,
-                 <code>i64</code> uuid)
+                 <code>string</code> uuid)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Cancels a query that is executing against the given table with the given uuid.  Note, the
 cancel call maybe take some time for the query actually stops executing.
@@ -673,7 +673,7 @@ cancel call maybe take some time for the query actually stops executing.
 <tr><td>uuid</td><td>the uuid of the query.
 </td></tr>
 </table></div><div class="definition"><h4 id="Fn_Blur_queryStatusIdList">Function: Blur.queryStatusIdList</h4>
-<pre><code>list&lt;<code>i64</code>&gt;</code> queryStatusIdList(<code>string</code> table)
+<pre><code>list&lt;<code>string</code>&gt;</code> queryStatusIdList(<code>string</code> table)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Returns a list of the query ids of queries that have recently been executed for the given table.
 @return list of all the uuids of the queries uuids.
@@ -682,7 +682,7 @@ cancel call maybe take some time for the query actually stops executing.
 </td></tr>
 </table></div><div class="definition"><h4 id="Fn_Blur_queryStatusById">Function: Blur.queryStatusById</h4>
 <pre><code><a href="Blur.html#Struct_BlurQueryStatus">BlurQueryStatus</a></code> queryStatusById(<code>string</code> table,
-                                <code>i64</code> uuid)
+                                <code>string</code> uuid)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Returns the query status for the given table and query uuid.
 @return fetches the BlurQueryStatus for the given table and uuid.


Mime
View raw message