incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [6/6] git commit: Some more renaming in the thrift api and more documentation.
Date Mon, 19 Aug 2013 01:59:23 GMT
Some more renaming in the thrift api and more documentation.


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

Branch: refs/heads/master
Commit: 795468e3ab54c8abc09c6bd4a3e656d59a9b8823
Parents: b2ad099
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Sun Aug 18 21:58:46 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Sun Aug 18 21:58:46 2013 -0400

----------------------------------------------------------------------
 .../org/apache/blur/manager/IndexManager.java   |  19 +-
 .../results/BlurResultIterableClient.java       |   2 +-
 .../blur/thrift/BlurControllerServer.java       |  10 +-
 .../org/apache/blur/thrift/BlurShardServer.java |  13 +-
 .../apache/blur/manager/IndexManagerTest.java   | 100 +--
 .../org/apache/blur/thrift/BlurClusterTest.java |  34 +-
 .../apache/blur/jdbc/BlurResultSetRecords.java  |  10 +-
 .../org/apache/blur/jdbc/BlurResultSetRows.java |  10 +-
 .../org/apache/blur/shell/ParseCommand.java     |   4 +-
 .../org/apache/blur/shell/QueryCommand.java     |  12 +-
 .../org/apache/blur/thrift/generated/Blur.java  | 140 +--
 .../apache/blur/thrift/generated/BlurQuery.java | 112 +--
 .../blur/thrift/generated/HighlightOptions.java | 128 +--
 .../blur/thrift/generated/SimpleQuery.java      | 892 ------------------
 .../blur/thrift/util/BlurThriftHelper.java      |  10 +-
 .../thrift/util/CreateInsertQueryRepeating.java |  10 +-
 .../blur/thrift/util/RandomSearchTable.java     |   6 +-
 .../util/RandomSearchTableContinuously.java     |  12 +-
 .../thrift/util/SimpleAsyncQueryExample.java    |  10 +-
 .../blur/thrift/util/SimpleQueryExample.java    |  10 +-
 .../src/main/scripts/interface/Blur.thrift      |  17 +-
 .../main/scripts/interface/gen-html/Blur.html   |  21 +-
 .../main/scripts/interface/gen-html/index.html  |   2 +-
 .../org/apache/blur/thrift/generated/Blur.java  | 140 +--
 .../apache/blur/thrift/generated/BlurQuery.java | 112 +--
 .../blur/thrift/generated/HighlightOptions.java | 128 +--
 .../org/apache/blur/thrift/generated/Query.java | 896 +++++++++++++++++++
 .../blur/thrift/generated/SimpleQuery.java      | 892 ------------------
 .../src/main/scripts/interface/gen-js/Blur.js   |  24 +-
 .../main/scripts/interface/gen-js/Blur_types.js |  42 +-
 .../scripts/interface/gen-perl/Blur/Blur.pm     |  34 +-
 .../scripts/interface/gen-perl/Blur/Types.pm    |  44 +-
 .../src/main/scripts/interface/gen-rb/blur.rb   |  14 +-
 .../main/scripts/interface/gen-rb/blur_types.rb |  19 +-
 docs/Blur.html                                  |  21 +-
 docs/data-model.html                            |  95 +-
 36 files changed, 1617 insertions(+), 2428 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/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 e193f04..eba9b29 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
@@ -84,7 +84,6 @@ import org.apache.blur.thrift.generated.RowMutationType;
 import org.apache.blur.thrift.generated.Schema;
 import org.apache.blur.thrift.generated.ScoreType;
 import org.apache.blur.thrift.generated.Selector;
-import org.apache.blur.thrift.generated.SimpleQuery;
 import org.apache.blur.utils.BlurExecutorCompletionService;
 import org.apache.blur.utils.BlurExecutorCompletionService.Cancel;
 import org.apache.blur.utils.BlurUtil;
@@ -274,18 +273,18 @@ public class IndexManager {
     if (highlightOptions == null) {
       return null;
     }
-    SimpleQuery simpleQuery = highlightOptions.getSimpleQuery();
-    if (simpleQuery == null) {
+    org.apache.blur.thrift.generated.Query query = highlightOptions.getQuery();
+    if (query == null) {
       return null;
     }
 
     TableContext context = getTableContext(table);
-    Filter preFilter = QueryParserUtil.parseFilter(table, simpleQuery.recordFilter, false, fieldManager,
+    Filter preFilter = QueryParserUtil.parseFilter(table, query.recordFilter, false, fieldManager,
         _filterCache, context);
-    Filter postFilter = QueryParserUtil.parseFilter(table, simpleQuery.rowFilter, true, fieldManager,
+    Filter postFilter = QueryParserUtil.parseFilter(table, query.rowFilter, true, fieldManager,
         _filterCache, context);
-    return QueryParserUtil.parseQuery(simpleQuery.query, simpleQuery.rowQuery, fieldManager, postFilter,
-        preFilter, getScoreType(simpleQuery.scoreType), context);
+    return QueryParserUtil.parseQuery(query.query, query.rowQuery, fieldManager, postFilter,
+        preFilter, getScoreType(query.scoreType), context);
   }
 
   private void populateSelector(String table, Selector selector) throws IOException, BlurException {
@@ -390,7 +389,7 @@ public class IndexManager {
       ParallelCall<Entry<String, BlurIndex>, BlurResultIterable> call;
       TableContext context = getTableContext(table);
       FieldManager fieldManager = context.getFieldManager();
-      SimpleQuery simpleQuery = blurQuery.simpleQuery;
+      org.apache.blur.thrift.generated.Query simpleQuery = blurQuery.query;
       Filter preFilter = QueryParserUtil.parseFilter(table, simpleQuery.recordFilter, false, fieldManager,
           _filterCache, context);
       Filter postFilter = QueryParserUtil.parseFilter(table, simpleQuery.rowFilter, true, fieldManager,
@@ -431,7 +430,7 @@ public class IndexManager {
     }
   }
 
-  public String parseQuery(String table, SimpleQuery simpleQuery) throws ParseException, BlurException {
+  public String parseQuery(String table, org.apache.blur.thrift.generated.Query simpleQuery) throws ParseException, BlurException {
     TableContext context = getTableContext(table);
     FieldManager fieldManager = context.getFieldManager();
     Filter preFilter = QueryParserUtil.parseFilter(table, simpleQuery.recordFilter, false, fieldManager,
@@ -460,7 +459,7 @@ public class IndexManager {
     int size = blurQuery.facets.size();
     Query[] queries = new Query[size];
     for (int i = 0; i < size; i++) {
-      queries[i] = QueryParserUtil.parseQuery(blurQuery.facets.get(i).queryStr, blurQuery.simpleQuery.rowQuery,
+      queries[i] = QueryParserUtil.parseQuery(blurQuery.facets.get(i).queryStr, blurQuery.query.rowQuery,
           fieldManager, postFilter, preFilter, ScoreType.CONSTANT, context);
     }
     return queries;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableClient.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableClient.java b/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableClient.java
index 015c903..6bdce13 100644
--- a/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableClient.java
+++ b/blur-core/src/main/java/org/apache/blur/manager/results/BlurResultIterableClient.java
@@ -70,7 +70,7 @@ public class BlurResultIterableClient implements BlurResultIterable {
   private void performSearch() throws BlurException {
     try {
       long cursor = _remoteFetchCount * _batch;
-      BlurQuery blurQuery = new BlurQuery(_originalQuery.simpleQuery, 
+      BlurQuery blurQuery = new BlurQuery(_originalQuery.query, 
           _originalQuery.facets, null, _originalQuery.useCacheIfPresent, cursor, _remoteFetchCount,
           _originalQuery.minimumNumberOfResults, _originalQuery.maxQueryTime, _originalQuery.uuid,
           _originalQuery.userContext, _originalQuery.cacheResult, _originalQuery.startTime);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/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 187e0f8..85c712e 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
@@ -64,11 +64,11 @@ import org.apache.blur.thrift.generated.BlurResults;
 import org.apache.blur.thrift.generated.ColumnDefinition;
 import org.apache.blur.thrift.generated.FetchResult;
 import org.apache.blur.thrift.generated.HighlightOptions;
+import org.apache.blur.thrift.generated.Query;
 import org.apache.blur.thrift.generated.RowMutation;
 import org.apache.blur.thrift.generated.Schema;
 import org.apache.blur.thrift.generated.Selector;
 import org.apache.blur.thrift.generated.ShardState;
-import org.apache.blur.thrift.generated.SimpleQuery;
 import org.apache.blur.thrift.generated.TableDescriptor;
 import org.apache.blur.thrift.generated.TableStats;
 import org.apache.blur.utils.BlurConstants;
@@ -318,13 +318,13 @@ public class BlurControllerServer extends TableAdmin implements Iface {
           selector = new Selector();
           selector.setColumnFamiliesToFetch(EMPTY_LIST);
           selector.setColumnsToFetch(EMPTY_MAP);
-          if (!blurQuery.simpleQuery.rowQuery) {
+          if (!blurQuery.query.rowQuery) {
             selector.setRecordOnly(true);
           }
         } else {
           HighlightOptions highlightOptions = selector.getHighlightOptions();
-          if (highlightOptions != null && highlightOptions.getSimpleQuery() == null) {
-            highlightOptions.setSimpleQuery(blurQuery.getSimpleQuery());
+          if (highlightOptions != null && highlightOptions.getQuery() == null) {
+            highlightOptions.setQuery(blurQuery.getQuery());
           }
         }
         blurQuery.setSelector(null);
@@ -983,7 +983,7 @@ public class BlurControllerServer extends TableAdmin implements Iface {
   }
 
   @Override
-  public String parseQuery(final String table, final SimpleQuery simpleQuery) throws BlurException, TException {
+  public String parseQuery(final String table, final Query simpleQuery) throws BlurException, TException {
     checkTable(table);
     String cluster = getCluster(table);
     List<String> onlineShardServers = _clusterStatus.getOnlineShardServers(true, cluster);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/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 61cf775..f4ee6c0 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
@@ -28,7 +28,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLongArray;
 
@@ -43,8 +42,6 @@ import org.apache.blur.manager.results.BlurResultIterable;
 import org.apache.blur.manager.writer.BlurIndex;
 import org.apache.blur.server.ShardServerContext;
 import org.apache.blur.thirdparty.thrift_0_9_0.TException;
-import org.apache.blur.thrift.commands.BlurCommand;
-import org.apache.blur.thrift.generated.Blur.Client;
 import org.apache.blur.thrift.generated.Blur.Iface;
 import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.BlurQuery;
@@ -52,20 +49,18 @@ import org.apache.blur.thrift.generated.BlurQueryStatus;
 import org.apache.blur.thrift.generated.BlurResults;
 import org.apache.blur.thrift.generated.FetchResult;
 import org.apache.blur.thrift.generated.HighlightOptions;
+import org.apache.blur.thrift.generated.Query;
 import org.apache.blur.thrift.generated.RowMutation;
 import org.apache.blur.thrift.generated.Schema;
 import org.apache.blur.thrift.generated.Selector;
 import org.apache.blur.thrift.generated.ShardState;
-import org.apache.blur.thrift.generated.SimpleQuery;
 import org.apache.blur.thrift.generated.Status;
 import org.apache.blur.thrift.generated.TableStats;
 import org.apache.blur.utils.BlurConstants;
-import org.apache.blur.utils.BlurExecutorCompletionService;
 import org.apache.blur.utils.BlurUtil;
 import org.apache.blur.utils.QueryCache;
 import org.apache.blur.utils.QueryCacheEntry;
 import org.apache.blur.utils.QueryCacheKey;
-import org.apache.blur.utils.ForkJoin.Merger;
 
 public class BlurShardServer extends TableAdmin implements Iface {
 
@@ -105,8 +100,8 @@ public class BlurShardServer extends TableAdmin implements Iface {
       Selector selector = original.getSelector();
       if (selector != null) {
         HighlightOptions highlightOptions = selector.getHighlightOptions();
-        if (highlightOptions != null && highlightOptions.getSimpleQuery() == null) {
-          highlightOptions.setSimpleQuery(blurQuery.getSimpleQuery());
+        if (highlightOptions != null && highlightOptions.getQuery() == null) {
+          highlightOptions.setQuery(blurQuery.getQuery());
         }
       }
 
@@ -145,7 +140,7 @@ public class BlurShardServer extends TableAdmin implements Iface {
   }
 
   @Override
-  public String parseQuery(String table, SimpleQuery simpleQuery) throws BlurException, TException {
+  public String parseQuery(String table, Query simpleQuery) throws BlurException, TException {
     try {
       return _indexManager.parseQuery(table, simpleQuery);
     } catch (Throwable e) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/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 c68d778..0e3e626 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
@@ -65,7 +65,7 @@ import org.apache.blur.thrift.generated.RowMutation;
 import org.apache.blur.thrift.generated.Schema;
 import org.apache.blur.thrift.generated.ScoreType;
 import org.apache.blur.thrift.generated.Selector;
-import org.apache.blur.thrift.generated.SimpleQuery;
+import org.apache.blur.thrift.generated.Query;
 import org.apache.blur.thrift.generated.TableDescriptor;
 import org.apache.blur.utils.BlurConstants;
 import org.apache.blur.utils.BlurIterator;
@@ -277,9 +277,9 @@ public class IndexManagerTest {
   public void testFetchRowByRowIdHighlighting() throws Exception {
     Selector selector = new Selector().setRowId("row-6");
     HighlightOptions highlightOptions = new HighlightOptions();
-    SimpleQuery simpleQuery = new SimpleQuery();
-    simpleQuery.setQuery(FAMILY2 + ".testcol13:value105 " + FAMILY + ".testcol12:value101");
-    highlightOptions.setSimpleQuery(simpleQuery);
+    Query query = new Query();
+    query.setQuery(FAMILY2 + ".testcol13:value105 " + FAMILY + ".testcol12:value101");
+    highlightOptions.setQuery(query);
     selector.setHighlightOptions(highlightOptions);
     FetchResult fetchResult = new FetchResult();
     indexManager.fetchRow(TABLE, selector, fetchResult);
@@ -294,9 +294,9 @@ public class IndexManagerTest {
   public void testFetchRowByRowIdHighlightingWithFullText() throws Exception {
     Selector selector = new Selector().setRowId("row-6");
     HighlightOptions highlightOptions = new HighlightOptions();
-    SimpleQuery simpleQuery = new SimpleQuery();
-    simpleQuery.setQuery("cool value101");
-    highlightOptions.setSimpleQuery(simpleQuery);
+    Query query = new Query();
+    query.setQuery("cool value101");
+    highlightOptions.setQuery(query);
     selector.setHighlightOptions(highlightOptions);
     FetchResult fetchResult = new FetchResult();
     indexManager.fetchRow(TABLE, selector, fetchResult);
@@ -311,9 +311,9 @@ public class IndexManagerTest {
   public void testFetchRowByRowIdHighlightingWithFullTextWildCard() throws Exception {
     Selector selector = new Selector().setRowId("row-6");
     HighlightOptions highlightOptions = new HighlightOptions();
-    SimpleQuery simpleQuery = new SimpleQuery();
-    simpleQuery.setQuery("cool ?alue101");
-    highlightOptions.setSimpleQuery(simpleQuery);
+    Query query = new Query();
+    query.setQuery("cool ?alue101");
+    highlightOptions.setQuery(query);
     selector.setHighlightOptions(highlightOptions);
     FetchResult fetchResult = new FetchResult();
     indexManager.fetchRow(TABLE, selector, fetchResult);
@@ -328,10 +328,10 @@ public class IndexManagerTest {
   public void testFetchRecordByLocationIdHighlighting() throws Exception {
     Selector selector = new Selector().setLocationId(SHARD_NAME + "/0").setRecordOnly(true);
     HighlightOptions highlightOptions = new HighlightOptions();
-    SimpleQuery simpleQuery = new SimpleQuery();
-    simpleQuery.setQuery(FAMILY + ".testcol1:value1");
-    simpleQuery.setRowQuery(false);
-    highlightOptions.setSimpleQuery(simpleQuery);
+    Query query = new Query();
+    query.setQuery(FAMILY + ".testcol1:value1");
+    query.setRowQuery(false);
+    highlightOptions.setQuery(query);
     selector.setHighlightOptions(highlightOptions);
     FetchResult fetchResult = new FetchResult();
     indexManager.fetchRow(TABLE, selector, fetchResult);
@@ -349,11 +349,11 @@ public class IndexManagerTest {
   @Test
   public void testQueryWithJoinAll() throws Exception {
     BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.query = "+<+test-family.testcol12:value101 +test-family.testcol13:value102> +<test-family2.testcol18:value501>";
+    blurQuery.query = new Query();
+    blurQuery.query.query = "+<+test-family.testcol12:value101 +test-family.testcol13:value102> +<test-family2.testcol18:value501>";
 
-    blurQuery.simpleQuery.rowQuery = true;
-    blurQuery.simpleQuery.scoreType = ScoreType.SUPER;
+    blurQuery.query.rowQuery = true;
+    blurQuery.query.scoreType = ScoreType.SUPER;
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
@@ -375,10 +375,10 @@ public class IndexManagerTest {
   @Test
   public void testQueryWithJoin() throws Exception {
     BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.query = "+<+test-family.testcol12:value101 +test-family.testcol13:value102> +<test-family2.testcol18:value501>";
-    blurQuery.simpleQuery.rowQuery = true;
-    blurQuery.simpleQuery.scoreType = ScoreType.SUPER;
+    blurQuery.query = new Query();
+    blurQuery.query.query = "+<+test-family.testcol12:value101 +test-family.testcol13:value102> +<test-family2.testcol18:value501>";
+    blurQuery.query.rowQuery = true;
+    blurQuery.query.scoreType = ScoreType.SUPER;
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
@@ -400,10 +400,10 @@ public class IndexManagerTest {
   @Test
   public void testQueryWithJoinForcingSuperQuery() throws Exception {
     BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.query = "+<test-family.testcol1:value1> +<test-family.testcol3:value234123>";
-    blurQuery.simpleQuery.rowQuery = true;
-    blurQuery.simpleQuery.scoreType = ScoreType.SUPER;
+    blurQuery.query = new Query();
+    blurQuery.query.query = "+<test-family.testcol1:value1> +<test-family.testcol3:value234123>";
+    blurQuery.query.rowQuery = true;
+    blurQuery.query.scoreType = ScoreType.SUPER;
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
@@ -425,10 +425,10 @@ public class IndexManagerTest {
   @Test
   public void testQueryWithFacetsWithWildCard() throws Exception {
     BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.query = "test-family.testcol1:value1";
-    blurQuery.simpleQuery.rowQuery = true;
-    blurQuery.simpleQuery.scoreType = ScoreType.SUPER;
+    blurQuery.query = new Query();
+    blurQuery.query.query = "test-family.testcol1:value1";
+    blurQuery.query.rowQuery = true;
+    blurQuery.query.scoreType = ScoreType.SUPER;
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
@@ -621,10 +621,10 @@ public class IndexManagerTest {
   @Test
   public void testQuerySuperQueryTrue() throws Exception {
     BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.query = "test-family.testcol1:value1";
-    blurQuery.simpleQuery.rowQuery = true;
-    blurQuery.simpleQuery.scoreType = ScoreType.SUPER;
+    blurQuery.query = new Query();
+    blurQuery.query.query = "test-family.testcol1:value1";
+    blurQuery.query.rowQuery = true;
+    blurQuery.query.scoreType = ScoreType.SUPER;
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
@@ -650,10 +650,10 @@ public class IndexManagerTest {
   @Test
   public void testQuerySuperQueryTrueWithSelector() throws Exception {
     BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.query = "test-family.testcol1:value1";
-    blurQuery.simpleQuery.rowQuery = true;
-    blurQuery.simpleQuery.scoreType = ScoreType.SUPER;
+    blurQuery.query = new Query();
+    blurQuery.query.query = "test-family.testcol1:value1";
+    blurQuery.query.rowQuery = true;
+    blurQuery.query.scoreType = ScoreType.SUPER;
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
@@ -677,9 +677,9 @@ public class IndexManagerTest {
   @Test
   public void testQuerySuperQueryFalse() throws Exception {
     BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.query = "test-family.testcol1:value1";
-    blurQuery.simpleQuery.rowQuery = false;
+    blurQuery.query = new Query();
+    blurQuery.query.query = "test-family.testcol1:value1";
+    blurQuery.query.rowQuery = false;
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
@@ -705,9 +705,9 @@ public class IndexManagerTest {
   @Test
   public void testQuerySuperQueryFalseWithSelector() throws Exception {
     BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.query = "test-family.testcol1:value1";
-    blurQuery.simpleQuery.rowQuery = false;
+    blurQuery.query = new Query();
+    blurQuery.query.query = "test-family.testcol1:value1";
+    blurQuery.query.rowQuery = false;
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;
@@ -732,8 +732,8 @@ public class IndexManagerTest {
   @Test
   public void testQueryRecordOnly() throws Exception {
     BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.query = "test-family.testcol1:value1";
+    blurQuery.query = new Query();
+    blurQuery.query.query = "test-family.testcol1:value1";
     blurQuery.selector = new Selector();
     blurQuery.selector.setRecordOnly(true);
 
@@ -767,10 +767,10 @@ public class IndexManagerTest {
   @Test
   public void testQueryWithFacets() throws Exception {
     BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.query = "test-family.testcol1:value1";
-    blurQuery.simpleQuery.rowQuery = true;
-    blurQuery.simpleQuery.scoreType = ScoreType.SUPER;
+    blurQuery.query = new Query();
+    blurQuery.query.query = "test-family.testcol1:value1";
+    blurQuery.query.rowQuery = true;
+    blurQuery.query.scoreType = ScoreType.SUPER;
     blurQuery.fetch = 10;
     blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
     blurQuery.maxQueryTime = Long.MAX_VALUE;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/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 3942fea..65060bb 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
@@ -46,9 +46,9 @@ import org.apache.blur.thrift.generated.BlurQuery;
 import org.apache.blur.thrift.generated.BlurResult;
 import org.apache.blur.thrift.generated.BlurResults;
 import org.apache.blur.thrift.generated.ErrorType;
+import org.apache.blur.thrift.generated.Query;
 import org.apache.blur.thrift.generated.RecordMutation;
 import org.apache.blur.thrift.generated.RowMutation;
-import org.apache.blur.thrift.generated.SimpleQuery;
 import org.apache.blur.thrift.generated.TableDescriptor;
 import org.apache.blur.thrift.util.BlurThriftHelper;
 import org.apache.blur.utils.GCWatcher;
@@ -132,9 +132,9 @@ public class BlurClusterTest {
     long e = System.nanoTime();
     System.out.println("mutateBatch took [" + (e - s) / 1000000.0 + "]");
     BlurQuery blurQueryRow = new BlurQuery();
-    SimpleQuery simpleQueryRow = new SimpleQuery();
-    simpleQueryRow.setQuery("test.test:value");
-    blurQueryRow.setSimpleQuery(simpleQueryRow);
+    Query queryRow = new Query();
+    queryRow.setQuery("test.test:value");
+    blurQueryRow.setQuery(queryRow);
     blurQueryRow.setUseCacheIfPresent(false);
     blurQueryRow.setCacheResult(false);
     BlurResults resultsRow = client.query("test", blurQueryRow);
@@ -142,10 +142,10 @@ public class BlurClusterTest {
     assertEquals(length, resultsRow.getTotalResults());
 
     BlurQuery blurQueryRecord = new BlurQuery();
-    SimpleQuery simpleQueryRecord = new SimpleQuery();
-    simpleQueryRecord.rowQuery = false;
-    simpleQueryRecord.setQuery("test.test:value");
-    blurQueryRecord.setSimpleQuery(simpleQueryRecord);
+    Query queryRecord = new Query();
+    queryRecord.rowQuery = false;
+    queryRecord.setQuery("test.test:value");
+    blurQueryRecord.setQuery(queryRecord);
     BlurResults resultsRecord = client.query("test", blurQueryRecord);
     assertRecordResults(resultsRecord);
     assertEquals(length, resultsRecord.getTotalResults());
@@ -159,9 +159,9 @@ public class BlurClusterTest {
 
     final Iface client = getClient();
     final BlurQuery blurQueryRow = new BlurQuery();
-    SimpleQuery simpleQueryRow = new SimpleQuery();
-    simpleQueryRow.setQuery("test.test:value");
-    blurQueryRow.setSimpleQuery(simpleQueryRow);
+    Query queryRow = new Query();
+    queryRow.setQuery("test.test:value");
+    blurQueryRow.setQuery(queryRow);
     blurQueryRow.setUseCacheIfPresent(false);
     blurQueryRow.setCacheResult(false);
     blurQueryRow.setUuid(1234l);
@@ -208,9 +208,9 @@ public class BlurClusterTest {
   private void runBackPressureViaQuery() throws InterruptedException {
     final Iface client = getClient();
     final BlurQuery blurQueryRow = new BlurQuery();
-    SimpleQuery simpleQueryRow = new SimpleQuery();
-    simpleQueryRow.setQuery("test.test:value");
-    blurQueryRow.setSimpleQuery(simpleQueryRow);
+    Query queryRow = new Query();
+    queryRow.setQuery("test.test:value");
+    blurQueryRow.setQuery(queryRow);
     blurQueryRow.setUseCacheIfPresent(false);
     blurQueryRow.setCacheResult(false);
     blurQueryRow.setUuid(1234l);
@@ -283,9 +283,9 @@ public class BlurClusterTest {
     int length = 100;
     BlurQuery blurQuery = new BlurQuery();
     blurQuery.setUseCacheIfPresent(false);
-    SimpleQuery simpleQuery = new SimpleQuery();
-    simpleQuery.setQuery("test.test:value");
-    blurQuery.setSimpleQuery(simpleQuery);
+    Query query = new Query();
+    query.setQuery("test.test:value");
+    blurQuery.setQuery(query);
     BlurResults results1 = client.query("test", blurQuery);
     assertEquals(length, results1.getTotalResults());
     assertRowResults(results1);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/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 f4a84e0..fede15b 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
@@ -45,7 +45,7 @@ import org.apache.blur.thrift.generated.FetchResult;
 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.SimpleQuery;
+import org.apache.blur.thrift.generated.Query;
 
 
 public class BlurResultSetRecords extends AbstractBlurResultSet {
@@ -90,9 +90,9 @@ public class BlurResultSetRecords extends AbstractBlurResultSet {
     blurQuery.uuid = new Random().nextLong();
     blurQuery.fetch = fetch;
     blurQuery.start = start;
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.query = parser.getWhere();
-    blurQuery.simpleQuery.rowQuery = false;
+    blurQuery.query = new Query();
+    blurQuery.query.query = parser.getWhere();
+    blurQuery.query.rowQuery = false;
 
     try {
       schema = client.schema(tableName);
@@ -106,7 +106,7 @@ public class BlurResultSetRecords extends AbstractBlurResultSet {
 
     selector = new Selector();
     setupSelector(selector, schema, columnNames);
-    selector.recordOnly = !blurQuery.simpleQuery.rowQuery;
+    selector.recordOnly = !blurQuery.query.rowQuery;
     Map<String, Map<String, ColumnDefinition>> columnFamilies = schema.getFamilies();
     Map<String, ColumnDefinition> cfSet = columnFamilies.get(columnFamily);
     columnFamilies.clear();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/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 2ca32a7..3a0714a 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
@@ -43,7 +43,7 @@ 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.SimpleQuery;
+import org.apache.blur.thrift.generated.Query;
 
 
 public class BlurResultSetRows extends AbstractBlurResultSet {
@@ -85,9 +85,9 @@ public class BlurResultSetRows extends AbstractBlurResultSet {
     blurQuery.uuid = new Random().nextLong();
     blurQuery.fetch = fetch;
     blurQuery.start = start;
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.query = parser.getWhere();
-    blurQuery.simpleQuery.rowQuery = true;
+    blurQuery.query = new Query();
+    blurQuery.query.query = parser.getWhere();
+    blurQuery.query.rowQuery = true;
 
     try {
       schema = client.schema(tableName);
@@ -101,7 +101,7 @@ public class BlurResultSetRows extends AbstractBlurResultSet {
 
     selector = new Selector();
     setupSelector(selector, schema, columnNames);
-    selector.recordOnly = !blurQuery.simpleQuery.rowQuery;
+    selector.recordOnly = !blurQuery.query.rowQuery;
     blurResultSetMetaData = new BlurResultSetMetaData(columnNames, schema.getFamilies());
     try {
       results = client.query(tableName, blurQuery);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/blur-shell/src/main/java/org/apache/blur/shell/ParseCommand.java
----------------------------------------------------------------------
diff --git a/blur-shell/src/main/java/org/apache/blur/shell/ParseCommand.java b/blur-shell/src/main/java/org/apache/blur/shell/ParseCommand.java
index e264e7b..379a6f0 100644
--- a/blur-shell/src/main/java/org/apache/blur/shell/ParseCommand.java
+++ b/blur-shell/src/main/java/org/apache/blur/shell/ParseCommand.java
@@ -23,7 +23,7 @@ import java.io.PrintWriter;
 import org.apache.blur.thirdparty.thrift_0_9_0.TException;
 import org.apache.blur.thrift.generated.Blur;
 import org.apache.blur.thrift.generated.BlurException;
-import org.apache.blur.thrift.generated.SimpleQuery;
+import org.apache.blur.thrift.generated.Query;
 
 public class ParseCommand extends Command {
   @Override
@@ -38,7 +38,7 @@ public class ParseCommand extends Command {
       queryStr += args[i] + " ";
     }
 
-    SimpleQuery simpleQuery = new SimpleQuery();
+    Query simpleQuery = new Query();
     simpleQuery.setQuery(queryStr);
     String query = client.parseQuery(tablename, simpleQuery);
     out.println(query);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/blur-shell/src/main/java/org/apache/blur/shell/QueryCommand.java
----------------------------------------------------------------------
diff --git a/blur-shell/src/main/java/org/apache/blur/shell/QueryCommand.java b/blur-shell/src/main/java/org/apache/blur/shell/QueryCommand.java
index 6ef821d..30b7679 100644
--- a/blur-shell/src/main/java/org/apache/blur/shell/QueryCommand.java
+++ b/blur-shell/src/main/java/org/apache/blur/shell/QueryCommand.java
@@ -34,7 +34,7 @@ import org.apache.blur.thrift.generated.FetchResult;
 import org.apache.blur.thrift.generated.FetchRowResult;
 import org.apache.blur.thrift.generated.HighlightOptions;
 import org.apache.blur.thrift.generated.Row;
-import org.apache.blur.thrift.generated.SimpleQuery;
+import org.apache.blur.thrift.generated.Query;
 
 public class QueryCommand extends Command {
   @Override
@@ -57,15 +57,15 @@ public class QueryCommand extends Command {
   private void doItInternal(Blur.Iface client, String[] args, PagingPrintWriter out) throws FinishedException,
       BlurException, TException {
     String tablename = args[1];
-    String query = "";
+    String queryStr = "";
     for (int i = 2; i < args.length; i++) {
-      query += args[i] + " ";
+      queryStr += args[i] + " ";
     }
 
     BlurQuery blurQuery = new BlurQuery();
-    SimpleQuery simpleQuery = new SimpleQuery();
-    simpleQuery.setQuery(query);
-    blurQuery.setSimpleQuery(simpleQuery);
+    Query query = new Query();
+    query.setQuery(queryStr);
+    blurQuery.setQuery(query);
     blurQuery.setSelector(Main.selector);
 
     if (Main.highlight) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/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 ac24fd2..3fc53fc 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
@@ -133,9 +133,9 @@ public class Blur {
      * 
      * @param table the table name.
      * 
-     * @param simpleQuery the query to parse.
+     * @param query the query to parse.
      */
-    public String parseQuery(String table, SimpleQuery simpleQuery) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
+    public String parseQuery(String table, Query query) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     /**
      * Gets the table stats for the given table.
@@ -371,7 +371,7 @@ public class Blur {
 
     public void schema(String table, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.schema_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
-    public void parseQuery(String table, SimpleQuery simpleQuery, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.parseQuery_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
+    public void parseQuery(String table, Query query, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.parseQuery_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     public void tableStats(String table, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.tableStats_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
@@ -662,17 +662,17 @@ 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, "schema failed: unknown result");
     }
 
-    public String parseQuery(String table, SimpleQuery simpleQuery) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public String parseQuery(String table, Query query) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
-      send_parseQuery(table, simpleQuery);
+      send_parseQuery(table, query);
       return recv_parseQuery();
     }
 
-    public void send_parseQuery(String table, SimpleQuery simpleQuery) throws org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public void send_parseQuery(String table, Query query) throws org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
       parseQuery_args args = new parseQuery_args();
       args.setTable(table);
-      args.setSimpleQuery(simpleQuery);
+      args.setQuery(query);
       sendBase("parseQuery", args);
     }
 
@@ -1563,27 +1563,27 @@ public class Blur {
       }
     }
 
-    public void parseQuery(String table, SimpleQuery simpleQuery, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<parseQuery_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+    public void parseQuery(String table, Query query, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<parseQuery_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       checkReady();
-      parseQuery_call method_call = new parseQuery_call(table, simpleQuery, resultHandler, this, ___protocolFactory, ___transport);
+      parseQuery_call method_call = new parseQuery_call(table, query, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class parseQuery_call extends org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncMethodCall {
       private String table;
-      private SimpleQuery simpleQuery;
-      public parseQuery_call(String table, SimpleQuery simpleQuery, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<parseQuery_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 Query query;
+      public parseQuery_call(String table, Query query, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<parseQuery_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.simpleQuery = simpleQuery;
+        this.query = query;
       }
 
       public void write_args(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
         prot.writeMessageBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMessage("parseQuery", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMessageType.CALL, 0));
         parseQuery_args args = new parseQuery_args();
         args.setTable(table);
-        args.setSimpleQuery(simpleQuery);
+        args.setQuery(query);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -2616,7 +2616,7 @@ public class Blur {
       public parseQuery_result getResult(I iface, parseQuery_args args) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
         parseQuery_result result = new parseQuery_result();
         try {
-          result.success = iface.parseQuery(args.table, args.simpleQuery);
+          result.success = iface.parseQuery(args.table, args.query);
         } catch (BlurException ex) {
           result.ex = ex;
         }
@@ -10384,7 +10384,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("parseQuery_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 SIMPLE_QUERY_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("simpleQuery", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField QUERY_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("query", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -10399,7 +10399,7 @@ public class Blur {
     /**
      * the query to parse.
      */
-    public SimpleQuery simpleQuery; // required
+    public Query query; // 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 {
@@ -10410,7 +10410,7 @@ public class Blur {
       /**
        * the query to parse.
        */
-      SIMPLE_QUERY((short)2, "simpleQuery");
+      QUERY((short)2, "query");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -10427,8 +10427,8 @@ public class Blur {
         switch(fieldId) {
           case 1: // TABLE
             return TABLE;
-          case 2: // SIMPLE_QUERY
-            return SIMPLE_QUERY;
+          case 2: // QUERY
+            return QUERY;
           default:
             return null;
         }
@@ -10474,8 +10474,8 @@ 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.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.SIMPLE_QUERY, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("simpleQuery", 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, SimpleQuery.class)));
+      tmpMap.put(_Fields.QUERY, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("query", 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, Query.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(parseQuery_args.class, metaDataMap);
     }
@@ -10485,11 +10485,11 @@ public class Blur {
 
     public parseQuery_args(
       String table,
-      SimpleQuery simpleQuery)
+      Query query)
     {
       this();
       this.table = table;
-      this.simpleQuery = simpleQuery;
+      this.query = query;
     }
 
     /**
@@ -10499,8 +10499,8 @@ public class Blur {
       if (other.isSetTable()) {
         this.table = other.table;
       }
-      if (other.isSetSimpleQuery()) {
-        this.simpleQuery = new SimpleQuery(other.simpleQuery);
+      if (other.isSetQuery()) {
+        this.query = new Query(other.query);
       }
     }
 
@@ -10511,7 +10511,7 @@ public class Blur {
     @Override
     public void clear() {
       this.table = null;
-      this.simpleQuery = null;
+      this.query = null;
     }
 
     /**
@@ -10547,30 +10547,30 @@ public class Blur {
     /**
      * the query to parse.
      */
-    public SimpleQuery getSimpleQuery() {
-      return this.simpleQuery;
+    public Query getQuery() {
+      return this.query;
     }
 
     /**
      * the query to parse.
      */
-    public parseQuery_args setSimpleQuery(SimpleQuery simpleQuery) {
-      this.simpleQuery = simpleQuery;
+    public parseQuery_args setQuery(Query query) {
+      this.query = query;
       return this;
     }
 
-    public void unsetSimpleQuery() {
-      this.simpleQuery = null;
+    public void unsetQuery() {
+      this.query = null;
     }
 
-    /** Returns true if field simpleQuery is set (has been assigned a value) and false otherwise */
-    public boolean isSetSimpleQuery() {
-      return this.simpleQuery != null;
+    /** Returns true if field query is set (has been assigned a value) and false otherwise */
+    public boolean isSetQuery() {
+      return this.query != null;
     }
 
-    public void setSimpleQueryIsSet(boolean value) {
+    public void setQueryIsSet(boolean value) {
       if (!value) {
-        this.simpleQuery = null;
+        this.query = null;
       }
     }
 
@@ -10584,11 +10584,11 @@ public class Blur {
         }
         break;
 
-      case SIMPLE_QUERY:
+      case QUERY:
         if (value == null) {
-          unsetSimpleQuery();
+          unsetQuery();
         } else {
-          setSimpleQuery((SimpleQuery)value);
+          setQuery((Query)value);
         }
         break;
 
@@ -10600,8 +10600,8 @@ public class Blur {
       case TABLE:
         return getTable();
 
-      case SIMPLE_QUERY:
-        return getSimpleQuery();
+      case QUERY:
+        return getQuery();
 
       }
       throw new IllegalStateException();
@@ -10616,8 +10616,8 @@ public class Blur {
       switch (field) {
       case TABLE:
         return isSetTable();
-      case SIMPLE_QUERY:
-        return isSetSimpleQuery();
+      case QUERY:
+        return isSetQuery();
       }
       throw new IllegalStateException();
     }
@@ -10644,12 +10644,12 @@ public class Blur {
           return false;
       }
 
-      boolean this_present_simpleQuery = true && this.isSetSimpleQuery();
-      boolean that_present_simpleQuery = true && that.isSetSimpleQuery();
-      if (this_present_simpleQuery || that_present_simpleQuery) {
-        if (!(this_present_simpleQuery && that_present_simpleQuery))
+      boolean this_present_query = true && this.isSetQuery();
+      boolean that_present_query = true && that.isSetQuery();
+      if (this_present_query || that_present_query) {
+        if (!(this_present_query && that_present_query))
           return false;
-        if (!this.simpleQuery.equals(that.simpleQuery))
+        if (!this.query.equals(that.query))
           return false;
       }
 
@@ -10679,12 +10679,12 @@ public class Blur {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetSimpleQuery()).compareTo(typedOther.isSetSimpleQuery());
+      lastComparison = Boolean.valueOf(isSetQuery()).compareTo(typedOther.isSetQuery());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetSimpleQuery()) {
-        lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.simpleQuery, typedOther.simpleQuery);
+      if (isSetQuery()) {
+        lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.query, typedOther.query);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -10717,11 +10717,11 @@ public class Blur {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("simpleQuery:");
-      if (this.simpleQuery == null) {
+      sb.append("query:");
+      if (this.query == null) {
         sb.append("null");
       } else {
-        sb.append(this.simpleQuery);
+        sb.append(this.query);
       }
       first = false;
       sb.append(")");
@@ -10731,8 +10731,8 @@ public class Blur {
     public void validate() throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       // check for required fields
       // check for sub-struct validity
-      if (simpleQuery != null) {
-        simpleQuery.validate();
+      if (query != null) {
+        query.validate();
       }
     }
 
@@ -10778,11 +10778,11 @@ public class Blur {
                 org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 2: // SIMPLE_QUERY
+            case 2: // QUERY
               if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT) {
-                struct.simpleQuery = new SimpleQuery();
-                struct.simpleQuery.read(iprot);
-                struct.setSimpleQueryIsSet(true);
+                struct.query = new Query();
+                struct.query.read(iprot);
+                struct.setQueryIsSet(true);
               } else { 
                 org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -10807,9 +10807,9 @@ public class Blur {
           oprot.writeString(struct.table);
           oprot.writeFieldEnd();
         }
-        if (struct.simpleQuery != null) {
-          oprot.writeFieldBegin(SIMPLE_QUERY_FIELD_DESC);
-          struct.simpleQuery.write(oprot);
+        if (struct.query != null) {
+          oprot.writeFieldBegin(QUERY_FIELD_DESC);
+          struct.query.write(oprot);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -10833,15 +10833,15 @@ public class Blur {
         if (struct.isSetTable()) {
           optionals.set(0);
         }
-        if (struct.isSetSimpleQuery()) {
+        if (struct.isSetQuery()) {
           optionals.set(1);
         }
         oprot.writeBitSet(optionals, 2);
         if (struct.isSetTable()) {
           oprot.writeString(struct.table);
         }
-        if (struct.isSetSimpleQuery()) {
-          struct.simpleQuery.write(oprot);
+        if (struct.isSetQuery()) {
+          struct.query.write(oprot);
         }
       }
 
@@ -10854,9 +10854,9 @@ public class Blur {
           struct.setTableIsSet(true);
         }
         if (incoming.get(1)) {
-          struct.simpleQuery = new SimpleQuery();
-          struct.simpleQuery.read(iprot);
-          struct.setSimpleQueryIsSet(true);
+          struct.query = new Query();
+          struct.query.read(iprot);
+          struct.setQueryIsSet(true);
         }
       }
     }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/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 d541ec8..ca6a790 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
@@ -56,7 +56,7 @@ import java.util.Arrays;
 public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<BlurQuery, BlurQuery._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct STRUCT_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct("BlurQuery");
 
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField SIMPLE_QUERY_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("simpleQuery", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)1);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField QUERY_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("query", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)1);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField FACETS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("facets", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, (short)3);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField SELECTOR_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("selector", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)4);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField USE_CACHE_IF_PRESENT_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("useCacheIfPresent", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)6);
@@ -78,7 +78,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
   /**
    * The query information.
    */
-  public SimpleQuery simpleQuery; // required
+  public Query query; // required
   /**
    * A list of Facets to execute with the given query.
    */
@@ -131,7 +131,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     /**
      * The query information.
      */
-    SIMPLE_QUERY((short)1, "simpleQuery"),
+    QUERY((short)1, "query"),
     /**
      * A list of Facets to execute with the given query.
      */
@@ -192,8 +192,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 1: // SIMPLE_QUERY
-          return SIMPLE_QUERY;
+        case 1: // QUERY
+          return QUERY;
         case 3: // FACETS
           return FACETS;
         case 4: // SELECTOR
@@ -268,8 +268,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
   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.SIMPLE_QUERY, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("simpleQuery", 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, SimpleQuery.class)));
+    tmpMap.put(_Fields.QUERY, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("query", 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, Query.class)));
     tmpMap.put(_Fields.FACETS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("facets", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.ListMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, 
             new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, Facet.class))));
@@ -315,7 +315,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
   }
 
   public BlurQuery(
-    SimpleQuery simpleQuery,
+    Query query,
     List<Facet> facets,
     Selector selector,
     boolean useCacheIfPresent,
@@ -329,7 +329,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     long startTime)
   {
     this();
-    this.simpleQuery = simpleQuery;
+    this.query = query;
     this.facets = facets;
     this.selector = selector;
     this.useCacheIfPresent = useCacheIfPresent;
@@ -356,8 +356,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
    */
   public BlurQuery(BlurQuery other) {
     __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetSimpleQuery()) {
-      this.simpleQuery = new SimpleQuery(other.simpleQuery);
+    if (other.isSetQuery()) {
+      this.query = new Query(other.query);
     }
     if (other.isSetFacets()) {
       List<Facet> __this__facets = new ArrayList<Facet>();
@@ -388,7 +388,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
 
   @Override
   public void clear() {
-    this.simpleQuery = null;
+    this.query = null;
     this.facets = null;
     this.selector = null;
     this.useCacheIfPresent = true;
@@ -413,30 +413,30 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
   /**
    * The query information.
    */
-  public SimpleQuery getSimpleQuery() {
-    return this.simpleQuery;
+  public Query getQuery() {
+    return this.query;
   }
 
   /**
    * The query information.
    */
-  public BlurQuery setSimpleQuery(SimpleQuery simpleQuery) {
-    this.simpleQuery = simpleQuery;
+  public BlurQuery setQuery(Query query) {
+    this.query = query;
     return this;
   }
 
-  public void unsetSimpleQuery() {
-    this.simpleQuery = null;
+  public void unsetQuery() {
+    this.query = null;
   }
 
-  /** Returns true if field simpleQuery is set (has been assigned a value) and false otherwise */
-  public boolean isSetSimpleQuery() {
-    return this.simpleQuery != null;
+  /** Returns true if field query is set (has been assigned a value) and false otherwise */
+  public boolean isSetQuery() {
+    return this.query != null;
   }
 
-  public void setSimpleQueryIsSet(boolean value) {
+  public void setQueryIsSet(boolean value) {
     if (!value) {
-      this.simpleQuery = null;
+      this.query = null;
     }
   }
 
@@ -783,11 +783,11 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
 
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
-    case SIMPLE_QUERY:
+    case QUERY:
       if (value == null) {
-        unsetSimpleQuery();
+        unsetQuery();
       } else {
-        setSimpleQuery((SimpleQuery)value);
+        setQuery((Query)value);
       }
       break;
 
@@ -884,8 +884,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
 
   public Object getFieldValue(_Fields field) {
     switch (field) {
-    case SIMPLE_QUERY:
-      return getSimpleQuery();
+    case QUERY:
+      return getQuery();
 
     case FACETS:
       return getFacets();
@@ -931,8 +931,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     }
 
     switch (field) {
-    case SIMPLE_QUERY:
-      return isSetSimpleQuery();
+    case QUERY:
+      return isSetQuery();
     case FACETS:
       return isSetFacets();
     case SELECTOR:
@@ -972,12 +972,12 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     if (that == null)
       return false;
 
-    boolean this_present_simpleQuery = true && this.isSetSimpleQuery();
-    boolean that_present_simpleQuery = true && that.isSetSimpleQuery();
-    if (this_present_simpleQuery || that_present_simpleQuery) {
-      if (!(this_present_simpleQuery && that_present_simpleQuery))
+    boolean this_present_query = true && this.isSetQuery();
+    boolean that_present_query = true && that.isSetQuery();
+    if (this_present_query || that_present_query) {
+      if (!(this_present_query && that_present_query))
         return false;
-      if (!this.simpleQuery.equals(that.simpleQuery))
+      if (!this.query.equals(that.query))
         return false;
     }
 
@@ -1096,12 +1096,12 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     int lastComparison = 0;
     BlurQuery typedOther = (BlurQuery)other;
 
-    lastComparison = Boolean.valueOf(isSetSimpleQuery()).compareTo(typedOther.isSetSimpleQuery());
+    lastComparison = Boolean.valueOf(isSetQuery()).compareTo(typedOther.isSetQuery());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetSimpleQuery()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.simpleQuery, typedOther.simpleQuery);
+    if (isSetQuery()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.query, typedOther.query);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1236,11 +1236,11 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     StringBuilder sb = new StringBuilder("BlurQuery(");
     boolean first = true;
 
-    sb.append("simpleQuery:");
-    if (this.simpleQuery == null) {
+    sb.append("query:");
+    if (this.query == null) {
       sb.append("null");
     } else {
-      sb.append(this.simpleQuery);
+      sb.append(this.query);
     }
     first = false;
     if (!first) sb.append(", ");
@@ -1306,8 +1306,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
   public void validate() throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
     // check for required fields
     // check for sub-struct validity
-    if (simpleQuery != null) {
-      simpleQuery.validate();
+    if (query != null) {
+      query.validate();
     }
     if (selector != null) {
       selector.validate();
@@ -1350,11 +1350,11 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
           break;
         }
         switch (schemeField.id) {
-          case 1: // SIMPLE_QUERY
+          case 1: // QUERY
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT) {
-              struct.simpleQuery = new SimpleQuery();
-              struct.simpleQuery.read(iprot);
-              struct.setSimpleQueryIsSet(true);
+              struct.query = new Query();
+              struct.query.read(iprot);
+              struct.setQueryIsSet(true);
             } else { 
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -1474,9 +1474,9 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.simpleQuery != null) {
-        oprot.writeFieldBegin(SIMPLE_QUERY_FIELD_DESC);
-        struct.simpleQuery.write(oprot);
+      if (struct.query != null) {
+        oprot.writeFieldBegin(QUERY_FIELD_DESC);
+        struct.query.write(oprot);
         oprot.writeFieldEnd();
       }
       if (struct.facets != null) {
@@ -1543,7 +1543,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, BlurQuery struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       TTupleProtocol oprot = (TTupleProtocol) prot;
       BitSet optionals = new BitSet();
-      if (struct.isSetSimpleQuery()) {
+      if (struct.isSetQuery()) {
         optionals.set(0);
       }
       if (struct.isSetFacets()) {
@@ -1580,8 +1580,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
         optionals.set(11);
       }
       oprot.writeBitSet(optionals, 12);
-      if (struct.isSetSimpleQuery()) {
-        struct.simpleQuery.write(oprot);
+      if (struct.isSetQuery()) {
+        struct.query.write(oprot);
       }
       if (struct.isSetFacets()) {
         {
@@ -1629,9 +1629,9 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(12);
       if (incoming.get(0)) {
-        struct.simpleQuery = new SimpleQuery();
-        struct.simpleQuery.read(iprot);
-        struct.setSimpleQueryIsSet(true);
+        struct.query = new Query();
+        struct.query.read(iprot);
+        struct.setQueryIsSet(true);
       }
       if (incoming.get(1)) {
         {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/blur-thrift/src/main/java/org/apache/blur/thrift/generated/HighlightOptions.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/HighlightOptions.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/HighlightOptions.java
index f59bf23..7253d1d 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/HighlightOptions.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/HighlightOptions.java
@@ -55,7 +55,7 @@ import java.util.Arrays;
 public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<HighlightOptions, HighlightOptions._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct STRUCT_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct("HighlightOptions");
 
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField SIMPLE_QUERY_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("simpleQuery", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)1);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField QUERY_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("query", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)1);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField PRE_TAG_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("preTag", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)2);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField POST_TAG_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("postTag", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)3);
 
@@ -67,12 +67,12 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
 
   /**
    * The original query is required if used in the Blur.fetchRow call.  If
-   * the highlightOptions is used in a call to Blur.query then the SimpleQuery
-   * passed into the call via the BlurQuery will be used if this simpleQuery is
+   * the highlightOptions is used in a call to Blur.query then the Query
+   * passed into the call via the BlurQuery will be used if this query is
    * null.  So that means if you use highlighting from the query call you can
    * leave this attribute null and it will default to the normal behavior.
    */
-  public SimpleQuery simpleQuery; // required
+  public Query query; // required
   /**
    * The pre tag is the tag that marks the beginning of the highlighting.
    */
@@ -86,12 +86,12 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
   public enum _Fields implements org.apache.blur.thirdparty.thrift_0_9_0.TFieldIdEnum {
     /**
      * The original query is required if used in the Blur.fetchRow call.  If
-     * the highlightOptions is used in a call to Blur.query then the SimpleQuery
-     * passed into the call via the BlurQuery will be used if this simpleQuery is
+     * the highlightOptions is used in a call to Blur.query then the Query
+     * passed into the call via the BlurQuery will be used if this query is
      * null.  So that means if you use highlighting from the query call you can
      * leave this attribute null and it will default to the normal behavior.
      */
-    SIMPLE_QUERY((short)1, "simpleQuery"),
+    QUERY((short)1, "query"),
     /**
      * The pre tag is the tag that marks the beginning of the highlighting.
      */
@@ -114,8 +114,8 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 1: // SIMPLE_QUERY
-          return SIMPLE_QUERY;
+        case 1: // QUERY
+          return QUERY;
         case 2: // PRE_TAG
           return PRE_TAG;
         case 3: // POST_TAG
@@ -163,8 +163,8 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_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.SIMPLE_QUERY, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("simpleQuery", 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, SimpleQuery.class)));
+    tmpMap.put(_Fields.QUERY, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("query", 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, Query.class)));
     tmpMap.put(_Fields.PRE_TAG, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("preTag", 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.POST_TAG, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("postTag", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
@@ -181,12 +181,12 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
   }
 
   public HighlightOptions(
-    SimpleQuery simpleQuery,
+    Query query,
     String preTag,
     String postTag)
   {
     this();
-    this.simpleQuery = simpleQuery;
+    this.query = query;
     this.preTag = preTag;
     this.postTag = postTag;
   }
@@ -195,8 +195,8 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
    * Performs a deep copy on <i>other</i>.
    */
   public HighlightOptions(HighlightOptions other) {
-    if (other.isSetSimpleQuery()) {
-      this.simpleQuery = new SimpleQuery(other.simpleQuery);
+    if (other.isSetQuery()) {
+      this.query = new Query(other.query);
     }
     if (other.isSetPreTag()) {
       this.preTag = other.preTag;
@@ -212,7 +212,7 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
 
   @Override
   public void clear() {
-    this.simpleQuery = null;
+    this.query = null;
     this.preTag = "<<<";
 
     this.postTag = ">>>";
@@ -221,39 +221,39 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
 
   /**
    * The original query is required if used in the Blur.fetchRow call.  If
-   * the highlightOptions is used in a call to Blur.query then the SimpleQuery
-   * passed into the call via the BlurQuery will be used if this simpleQuery is
+   * the highlightOptions is used in a call to Blur.query then the Query
+   * passed into the call via the BlurQuery will be used if this query is
    * null.  So that means if you use highlighting from the query call you can
    * leave this attribute null and it will default to the normal behavior.
    */
-  public SimpleQuery getSimpleQuery() {
-    return this.simpleQuery;
+  public Query getQuery() {
+    return this.query;
   }
 
   /**
    * The original query is required if used in the Blur.fetchRow call.  If
-   * the highlightOptions is used in a call to Blur.query then the SimpleQuery
-   * passed into the call via the BlurQuery will be used if this simpleQuery is
+   * the highlightOptions is used in a call to Blur.query then the Query
+   * passed into the call via the BlurQuery will be used if this query is
    * null.  So that means if you use highlighting from the query call you can
    * leave this attribute null and it will default to the normal behavior.
    */
-  public HighlightOptions setSimpleQuery(SimpleQuery simpleQuery) {
-    this.simpleQuery = simpleQuery;
+  public HighlightOptions setQuery(Query query) {
+    this.query = query;
     return this;
   }
 
-  public void unsetSimpleQuery() {
-    this.simpleQuery = null;
+  public void unsetQuery() {
+    this.query = null;
   }
 
-  /** Returns true if field simpleQuery is set (has been assigned a value) and false otherwise */
-  public boolean isSetSimpleQuery() {
-    return this.simpleQuery != null;
+  /** Returns true if field query is set (has been assigned a value) and false otherwise */
+  public boolean isSetQuery() {
+    return this.query != null;
   }
 
-  public void setSimpleQueryIsSet(boolean value) {
+  public void setQueryIsSet(boolean value) {
     if (!value) {
-      this.simpleQuery = null;
+      this.query = null;
     }
   }
 
@@ -319,11 +319,11 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
 
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
-    case SIMPLE_QUERY:
+    case QUERY:
       if (value == null) {
-        unsetSimpleQuery();
+        unsetQuery();
       } else {
-        setSimpleQuery((SimpleQuery)value);
+        setQuery((Query)value);
       }
       break;
 
@@ -348,8 +348,8 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
 
   public Object getFieldValue(_Fields field) {
     switch (field) {
-    case SIMPLE_QUERY:
-      return getSimpleQuery();
+    case QUERY:
+      return getQuery();
 
     case PRE_TAG:
       return getPreTag();
@@ -368,8 +368,8 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
     }
 
     switch (field) {
-    case SIMPLE_QUERY:
-      return isSetSimpleQuery();
+    case QUERY:
+      return isSetQuery();
     case PRE_TAG:
       return isSetPreTag();
     case POST_TAG:
@@ -391,12 +391,12 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
     if (that == null)
       return false;
 
-    boolean this_present_simpleQuery = true && this.isSetSimpleQuery();
-    boolean that_present_simpleQuery = true && that.isSetSimpleQuery();
-    if (this_present_simpleQuery || that_present_simpleQuery) {
-      if (!(this_present_simpleQuery && that_present_simpleQuery))
+    boolean this_present_query = true && this.isSetQuery();
+    boolean that_present_query = true && that.isSetQuery();
+    if (this_present_query || that_present_query) {
+      if (!(this_present_query && that_present_query))
         return false;
-      if (!this.simpleQuery.equals(that.simpleQuery))
+      if (!this.query.equals(that.query))
         return false;
     }
 
@@ -434,12 +434,12 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
     int lastComparison = 0;
     HighlightOptions typedOther = (HighlightOptions)other;
 
-    lastComparison = Boolean.valueOf(isSetSimpleQuery()).compareTo(typedOther.isSetSimpleQuery());
+    lastComparison = Boolean.valueOf(isSetQuery()).compareTo(typedOther.isSetQuery());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetSimpleQuery()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.simpleQuery, typedOther.simpleQuery);
+    if (isSetQuery()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.query, typedOther.query);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -484,11 +484,11 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
     StringBuilder sb = new StringBuilder("HighlightOptions(");
     boolean first = true;
 
-    sb.append("simpleQuery:");
-    if (this.simpleQuery == null) {
+    sb.append("query:");
+    if (this.query == null) {
       sb.append("null");
     } else {
-      sb.append(this.simpleQuery);
+      sb.append(this.query);
     }
     first = false;
     if (!first) sb.append(", ");
@@ -514,8 +514,8 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
   public void validate() throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
     // check for required fields
     // check for sub-struct validity
-    if (simpleQuery != null) {
-      simpleQuery.validate();
+    if (query != null) {
+      query.validate();
     }
   }
 
@@ -553,11 +553,11 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
           break;
         }
         switch (schemeField.id) {
-          case 1: // SIMPLE_QUERY
+          case 1: // QUERY
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT) {
-              struct.simpleQuery = new SimpleQuery();
-              struct.simpleQuery.read(iprot);
-              struct.setSimpleQueryIsSet(true);
+              struct.query = new Query();
+              struct.query.read(iprot);
+              struct.setQueryIsSet(true);
             } else { 
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -593,9 +593,9 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.simpleQuery != null) {
-        oprot.writeFieldBegin(SIMPLE_QUERY_FIELD_DESC);
-        struct.simpleQuery.write(oprot);
+      if (struct.query != null) {
+        oprot.writeFieldBegin(QUERY_FIELD_DESC);
+        struct.query.write(oprot);
         oprot.writeFieldEnd();
       }
       if (struct.preTag != null) {
@@ -626,7 +626,7 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
     public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, HighlightOptions struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       TTupleProtocol oprot = (TTupleProtocol) prot;
       BitSet optionals = new BitSet();
-      if (struct.isSetSimpleQuery()) {
+      if (struct.isSetQuery()) {
         optionals.set(0);
       }
       if (struct.isSetPreTag()) {
@@ -636,8 +636,8 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
         optionals.set(2);
       }
       oprot.writeBitSet(optionals, 3);
-      if (struct.isSetSimpleQuery()) {
-        struct.simpleQuery.write(oprot);
+      if (struct.isSetQuery()) {
+        struct.query.write(oprot);
       }
       if (struct.isSetPreTag()) {
         oprot.writeString(struct.preTag);
@@ -652,9 +652,9 @@ public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
-        struct.simpleQuery = new SimpleQuery();
-        struct.simpleQuery.read(iprot);
-        struct.setSimpleQueryIsSet(true);
+        struct.query = new Query();
+        struct.query.read(iprot);
+        struct.setQueryIsSet(true);
       }
       if (incoming.get(1)) {
         struct.preTag = iprot.readString();


Mime
View raw message