incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [31/50] [abbrv] More removing of old API.
Date Wed, 07 Nov 2012 02:26:55 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/test/java/org/apache/blur/manager/IndexManagerTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/manager/IndexManagerTest.java b/src/blur-core/src/test/java/org/apache/blur/manager/IndexManagerTest.java
index e6f1b69..68f0db2 100644
--- a/src/blur-core/src/test/java/org/apache/blur/manager/IndexManagerTest.java
+++ b/src/blur-core/src/test/java/org/apache/blur/manager/IndexManagerTest.java
@@ -34,23 +34,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.concurrent.atomic.AtomicLongArray;
 
 import org.apache.blur.manager.indexserver.LocalIndexServer;
-import org.apache.blur.manager.results.BlurResultIterable;
 import org.apache.blur.metrics.BlurMetrics;
 import org.apache.blur.thrift.generated.BlurException;
-import org.apache.blur.thrift.generated.BlurQuery;
-import org.apache.blur.thrift.generated.BlurResult;
-import org.apache.blur.thrift.generated.Facet;
 import org.apache.blur.thrift.generated.FetchRecordResult;
 import org.apache.blur.thrift.generated.FetchResult;
 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.ScoreType;
 import org.apache.blur.thrift.generated.Selector;
-import org.apache.blur.thrift.generated.SimpleQuery;
 import org.apache.blur.utils.BlurConstants;
 import org.apache.blur.utils.BlurUtil;
 import org.apache.hadoop.conf.Configuration;
@@ -108,106 +101,8 @@ public class IndexManagerTest {
 
   }
 
-  @Test
-  public void testQueryWithJoinAll() throws Exception {
-    BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.queryStr = "+test-family.testcol12:value101 +test-family.testcol13:value102 +test-family2.testcol18:value501";
-    blurQuery.simpleQuery.superQueryOn = true;
-    blurQuery.simpleQuery.type = ScoreType.SUPER;
-    blurQuery.fetch = 10;
-    blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
-    blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
-
-    BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, null);
-    assertEquals(iterable.getTotalResults(), 2);
-    for (BlurResult result : iterable) {
-      Selector selector = new Selector().setLocationId(result.getLocationId());
-      FetchResult fetchResult = new FetchResult();
-      indexManager.fetchRow(TABLE, selector, fetchResult);
-      assertNotNull(fetchResult.rowResult);
-      assertNull(fetchResult.recordResult);
-    }
-  }
 
-  @Test
-  public void testQueryWithJoin() throws Exception {
-    BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.queryStr = "+(+test-family.testcol12:value101 +test-family.testcol13:value102) +test-family2.testcol18:value501";
-    blurQuery.simpleQuery.superQueryOn = true;
-    blurQuery.simpleQuery.type = ScoreType.SUPER;
-    blurQuery.fetch = 10;
-    blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
-    blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
-
-    BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, null);
-    assertEquals(iterable.getTotalResults(), 1);
-    for (BlurResult result : iterable) {
-      Selector selector = new Selector().setLocationId(result.getLocationId());
-      FetchResult fetchResult = new FetchResult();
-      indexManager.fetchRow(TABLE, selector, fetchResult);
-      assertNotNull(fetchResult.rowResult);
-      assertNull(fetchResult.recordResult);
-    }
-  }
 
-  @Test
-  public void testQueryWithJoinForcingSuperQuery() throws Exception {
-    BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.queryStr = "+(+test-family.testcol1:value1 nojoin) +(+test-family.testcol3:value234123)";
-    blurQuery.simpleQuery.superQueryOn = true;
-    blurQuery.simpleQuery.type = ScoreType.SUPER;
-    blurQuery.fetch = 10;
-    blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
-    blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
-
-    BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, null);
-    assertEquals(iterable.getTotalResults(), 1);
-    for (BlurResult result : iterable) {
-      Selector selector = new Selector().setLocationId(result.getLocationId());
-      FetchResult fetchResult = new FetchResult();
-      indexManager.fetchRow(TABLE, selector, fetchResult);
-      assertNotNull(fetchResult.rowResult);
-      assertNull(fetchResult.recordResult);
-    }
-  }
-
-  @Test
-  public void testQueryWithFacetsWithWildCard() throws Exception {
-    BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.queryStr = "test-family.testcol1:value1";
-    blurQuery.simpleQuery.superQueryOn = true;
-    blurQuery.simpleQuery.type = ScoreType.SUPER;
-    blurQuery.fetch = 10;
-    blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
-    blurQuery.maxQueryTime = Long.MAX_VALUE;
-    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));
-
-    AtomicLongArray facetedCounts = new AtomicLongArray(2);
-    BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, facetedCounts);
-    assertEquals(iterable.getTotalResults(), 2);
-    for (BlurResult result : iterable) {
-      Selector selector = new Selector().setLocationId(result.getLocationId());
-      FetchResult fetchResult = new FetchResult();
-      indexManager.fetchRow(TABLE, selector, fetchResult);
-      assertNotNull(fetchResult.rowResult);
-      assertNull(fetchResult.recordResult);
-    }
-
-    assertEquals(2, facetedCounts.get(0));
-    assertEquals(0, facetedCounts.get(1));
-
-    assertFalse(indexManager.currentQueries(TABLE).isEmpty());
-    Thread.sleep(2000);// wait for cleanup to fire
-    assertTrue(indexManager.currentQueries(TABLE).isEmpty());
-  }
 
   @Test
   public void testFetchRowByLocationId() throws Exception {
@@ -325,174 +220,6 @@ public class IndexManagerTest {
   }
 
   @Test
-  public void testQuerySuperQueryTrue() throws Exception {
-    BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.queryStr = "test-family.testcol1:value1";
-    blurQuery.simpleQuery.superQueryOn = true;
-    blurQuery.simpleQuery.type = ScoreType.SUPER;
-    blurQuery.fetch = 10;
-    blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
-    blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
-
-    BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, null);
-    assertEquals(2, iterable.getTotalResults());
-    for (BlurResult result : iterable) {
-      Selector selector = new Selector().setLocationId(result.getLocationId());
-      FetchResult fetchResult = new FetchResult();
-      indexManager.fetchRow(TABLE, selector, fetchResult);
-      assertNotNull(fetchResult.rowResult);
-      assertNull(fetchResult.recordResult);
-    }
-
-    assertFalse(indexManager.currentQueries(TABLE).isEmpty());
-    Thread.sleep(2000);// wait for cleanup to fire
-    assertTrue(indexManager.currentQueries(TABLE).isEmpty());
-  }
-
-  @Test
-  public void testQuerySuperQueryTrueWithSelector() throws Exception {
-    BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.queryStr = "test-family.testcol1:value1";
-    blurQuery.simpleQuery.superQueryOn = true;
-    blurQuery.simpleQuery.type = ScoreType.SUPER;
-    blurQuery.fetch = 10;
-    blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
-    blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
-    blurQuery.selector = new Selector();
-
-    BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, null);
-    assertEquals(iterable.getTotalResults(), 2);
-    for (BlurResult result : iterable) {
-      assertNotNull(result.fetchResult.rowResult);
-      assertNull(result.fetchResult.recordResult);
-    }
-
-    assertFalse(indexManager.currentQueries(TABLE).isEmpty());
-    Thread.sleep(2000);// wait for cleanup to fire
-    assertTrue(indexManager.currentQueries(TABLE).isEmpty());
-  }
-
-  @Test
-  public void testQuerySuperQueryFalse() throws Exception {
-    BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.queryStr = "test-family.testcol1:value1";
-    blurQuery.simpleQuery.superQueryOn = false;
-    blurQuery.fetch = 10;
-    blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
-    blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
-
-    BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, null);
-    assertEquals(iterable.getTotalResults(), 2);
-    for (BlurResult result : iterable) {
-      Selector selector = new Selector().setLocationId(result.getLocationId()).setRecordOnly(true);
-      FetchResult fetchResult = new FetchResult();
-      indexManager.fetchRow(TABLE, selector, fetchResult);
-      assertNull(fetchResult.rowResult);
-      assertNotNull(fetchResult.recordResult);
-    }
-
-    assertFalse(indexManager.currentQueries(TABLE).isEmpty());
-    Thread.sleep(2000);// wait for cleanup to fire
-    assertTrue(indexManager.currentQueries(TABLE).isEmpty());
-  }
-
-  @Test
-  public void testQuerySuperQueryFalseWithSelector() throws Exception {
-    BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.queryStr = "test-family.testcol1:value1";
-    blurQuery.simpleQuery.superQueryOn = false;
-    blurQuery.fetch = 10;
-    blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
-    blurQuery.maxQueryTime = Long.MAX_VALUE;
-    blurQuery.uuid = 1;
-    blurQuery.selector = new Selector();
-    blurQuery.selector.setRecordOnly(true);
-
-    BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, null);
-    assertEquals(iterable.getTotalResults(), 2);
-    for (BlurResult result : iterable) {
-      assertNull(result.fetchResult.rowResult);
-      assertNotNull(result.fetchResult.recordResult);
-    }
-
-    assertFalse(indexManager.currentQueries(TABLE).isEmpty());
-    Thread.sleep(2000);// wait for cleanup to fire
-    assertTrue(indexManager.currentQueries(TABLE).isEmpty());
-  }
-
-  @Test
-  public void testQueryRecordOnly() throws Exception {
-    BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.queryStr = "test-family.testcol1:value1";
-    blurQuery.selector = new Selector();
-    blurQuery.selector.setRecordOnly(true);
-
-    BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, null);
-    assertEquals(iterable.getTotalResults(), 2);
-
-    int matchRecord1 = 0;
-    int matchRecord4 = 0;
-
-    for (BlurResult result : iterable) {
-      assertNull(result.fetchResult.rowResult);
-      assertNotNull(result.fetchResult.recordResult);
-
-      Record r = result.fetchResult.recordResult.record;
-
-      if (r.getRecordId().equals("record-1")) {
-        matchRecord1 += 1;
-      } else if (r.getRecordId().equals("record-4")) {
-        matchRecord4 += 1;
-      } else {
-        fail("Unexpected record ID [" + r.getRecordId() + "]");
-      }
-    }
-
-    assertEquals("Unexpected number of record-1 results", 1, matchRecord1);
-    assertEquals("Unexpected number of record-4 results", 1, matchRecord4);
-  }
-
-  @Test
-  public void testQueryWithFacets() throws Exception {
-    BlurQuery blurQuery = new BlurQuery();
-    blurQuery.simpleQuery = new SimpleQuery();
-    blurQuery.simpleQuery.queryStr = "test-family.testcol1:value1";
-    blurQuery.simpleQuery.superQueryOn = true;
-    blurQuery.simpleQuery.type = ScoreType.SUPER;
-    blurQuery.fetch = 10;
-    blurQuery.minimumNumberOfResults = Long.MAX_VALUE;
-    blurQuery.maxQueryTime = Long.MAX_VALUE;
-    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));
-
-    AtomicLongArray facetedCounts = new AtomicLongArray(2);
-    BlurResultIterable iterable = indexManager.query(TABLE, blurQuery, facetedCounts);
-    assertEquals(iterable.getTotalResults(), 2);
-    for (BlurResult result : iterable) {
-      Selector selector = new Selector().setLocationId(result.getLocationId());
-      FetchResult fetchResult = new FetchResult();
-      indexManager.fetchRow(TABLE, selector, fetchResult);
-      assertNotNull(fetchResult.rowResult);
-      assertNull(fetchResult.recordResult);
-    }
-
-    assertEquals(2, facetedCounts.get(0));
-    assertEquals(0, facetedCounts.get(1));
-
-    assertFalse(indexManager.currentQueries(TABLE).isEmpty());
-    Thread.sleep(2000);// wait for cleanup to fire
-    assertTrue(indexManager.currentQueries(TABLE).isEmpty());
-  }
-
-  @Test
   public void testTerms() throws Exception {
     List<String> terms = indexManager.terms(TABLE, FAMILY, "testcol1", "", (short) 100);
     assertEquals(Arrays.asList("value1", "value13", "value16", "value4", "value7"), terms);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/test/java/org/apache/blur/manager/results/BlurResultPeekableIteratorComparatorTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/manager/results/BlurResultPeekableIteratorComparatorTest.java b/src/blur-core/src/test/java/org/apache/blur/manager/results/BlurResultPeekableIteratorComparatorTest.java
deleted file mode 100644
index c80ecf7..0000000
--- a/src/blur-core/src/test/java/org/apache/blur/manager/results/BlurResultPeekableIteratorComparatorTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.apache.blur.manager.results;
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.blur.thrift.generated.BlurResult;
-import org.apache.blur.utils.BlurConstants;
-import org.apache.blur.utils.PeekableIterator;
-import org.junit.Test;
-
-
-public class BlurResultPeekableIteratorComparatorTest {
-
-  @Test
-  public void testResultPeekableIteratorComparator() {
-    List<PeekableIterator<BlurResult>> results = new ArrayList<PeekableIterator<BlurResult>>();
-    results.add(new PeekableIterator<BlurResult>(new ArrayList<BlurResult>(Arrays.asList(newResult("5", 5))).iterator()));
-    results.add(new PeekableIterator<BlurResult>(new ArrayList<BlurResult>().iterator()));
-    results.add(new PeekableIterator<BlurResult>(new ArrayList<BlurResult>().iterator()));
-    results.add(new PeekableIterator<BlurResult>(new ArrayList<BlurResult>(Arrays.asList(newResult("2", 2))).iterator()));
-    results.add(new PeekableIterator<BlurResult>(new ArrayList<BlurResult>(Arrays.asList(newResult("1", 1))).iterator()));
-    results.add(new PeekableIterator<BlurResult>(new ArrayList<BlurResult>(Arrays.asList(newResult("9", 1))).iterator()));
-    results.add(new PeekableIterator<BlurResult>(new ArrayList<BlurResult>().iterator()));
-
-    Collections.sort(results, BlurConstants.HITS_PEEKABLE_ITERATOR_COMPARATOR);
-
-    for (PeekableIterator<BlurResult> iterator : results) {
-      System.out.println(iterator.peek());
-    }
-  }
-
-  private BlurResult newResult(String id, double score) {
-    return new BlurResult(id, score, null);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/test/java/org/apache/blur/manager/results/MultipleBlurResultIterableTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/manager/results/MultipleBlurResultIterableTest.java b/src/blur-core/src/test/java/org/apache/blur/manager/results/MultipleBlurResultIterableTest.java
deleted file mode 100644
index 7207eea..0000000
--- a/src/blur-core/src/test/java/org/apache/blur/manager/results/MultipleBlurResultIterableTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.apache.blur.manager.results;
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.apache.blur.manager.results.BlurResultIterable;
-import org.apache.blur.manager.results.BlurResultIterableMultiple;
-import org.apache.blur.manager.results.BlurResultIterableSimple;
-import org.apache.blur.thrift.generated.BlurResult;
-import org.junit.Test;
-
-
-public class MultipleBlurResultIterableTest {
-
-  @Test
-  public void testMultipleHitsIterable() {
-    BlurResultIterableMultiple iterable = new BlurResultIterableMultiple();
-    iterable.addBlurResultIterable(newBlurResultIterable(0, 0.1, 3, 2, 9, 10, 2));
-    iterable.addBlurResultIterable(newBlurResultIterable(7, 2, 9, 1, 34, 53, 12));
-    iterable.addBlurResultIterable(newBlurResultIterable(4, 3));
-    iterable.addBlurResultIterable(newBlurResultIterable(7, 2, 34, 132));
-    iterable.addBlurResultIterable(newBlurResultIterable());
-
-    for (BlurResult hit : iterable) {
-      System.out.println(hit);
-    }
-  }
-
-  private BlurResultIterable newBlurResultIterable(double... ds) {
-    List<BlurResult> results = new ArrayList<BlurResult>();
-    for (double d : ds) {
-      results.add(new BlurResult(UUID.randomUUID().toString() + "-" + Double.toString(d), d, null));
-    }
-    return new BlurResultIterableSimple(UUID.randomUUID().toString(), results);
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-core/src/test/java/org/apache/blur/manager/results/PeekableIteratorTest.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/test/java/org/apache/blur/manager/results/PeekableIteratorTest.java b/src/blur-core/src/test/java/org/apache/blur/manager/results/PeekableIteratorTest.java
deleted file mode 100644
index 2527b99..0000000
--- a/src/blur-core/src/test/java/org/apache/blur/manager/results/PeekableIteratorTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.apache.blur.manager.results;
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.apache.blur.utils.PeekableIterator;
-import org.junit.Test;
-
-
-public class PeekableIteratorTest {
-
-  @Test
-  public void testPeekableIterator1() {
-    PeekableIterator<Integer> iterator = new PeekableIterator<Integer>(Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9).iterator());
-    while (iterator.hasNext()) {
-      for (int i = 0; i < 3; i++) {
-        System.out.println(iterator.peek());
-      }
-      System.out.println(iterator.next());
-    }
-  }
-
-  @Test
-  public void testPeekableIteratorEmpty() {
-    PeekableIterator<Integer> iterator = new PeekableIterator<Integer>(new ArrayList<Integer>().iterator());
-    for (int i = 0; i < 3; i++) {
-      System.out.println(iterator.peek());
-    }
-    while (iterator.hasNext()) {
-      for (int i = 0; i < 3; i++) {
-        System.out.println(iterator.peek());
-      }
-      System.out.println(iterator.next());
-    }
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/AnalyzerDefinition.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/AnalyzerDefinition.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/AnalyzerDefinition.java
index 17efabb..99ec5ad 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/AnalyzerDefinition.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/AnalyzerDefinition.java
@@ -579,16 +579,16 @@ public class AnalyzerDefinition implements org.apache.thrift.TBase<AnalyzerDefin
           case 3: // COLUMN_FAMILY_DEFINITIONS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map132 = iprot.readMapBegin();
-                struct.columnFamilyDefinitions = new HashMap<String,ColumnFamilyDefinition>(2*_map132.size);
-                for (int _i133 = 0; _i133 < _map132.size; ++_i133)
+                org.apache.thrift.protocol.TMap _map98 = iprot.readMapBegin();
+                struct.columnFamilyDefinitions = new HashMap<String,ColumnFamilyDefinition>(2*_map98.size);
+                for (int _i99 = 0; _i99 < _map98.size; ++_i99)
                 {
-                  String _key134; // required
-                  ColumnFamilyDefinition _val135; // optional
-                  _key134 = iprot.readString();
-                  _val135 = new ColumnFamilyDefinition();
-                  _val135.read(iprot);
-                  struct.columnFamilyDefinitions.put(_key134, _val135);
+                  String _key100; // required
+                  ColumnFamilyDefinition _val101; // optional
+                  _key100 = iprot.readString();
+                  _val101 = new ColumnFamilyDefinition();
+                  _val101.read(iprot);
+                  struct.columnFamilyDefinitions.put(_key100, _val101);
                 }
                 iprot.readMapEnd();
               }
@@ -626,10 +626,10 @@ public class AnalyzerDefinition implements org.apache.thrift.TBase<AnalyzerDefin
         oprot.writeFieldBegin(COLUMN_FAMILY_DEFINITIONS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.columnFamilyDefinitions.size()));
-          for (Map.Entry<String, ColumnFamilyDefinition> _iter136 : struct.columnFamilyDefinitions.entrySet())
+          for (Map.Entry<String, ColumnFamilyDefinition> _iter102 : struct.columnFamilyDefinitions.entrySet())
           {
-            oprot.writeString(_iter136.getKey());
-            _iter136.getValue().write(oprot);
+            oprot.writeString(_iter102.getKey());
+            _iter102.getValue().write(oprot);
           }
           oprot.writeMapEnd();
         }
@@ -672,10 +672,10 @@ public class AnalyzerDefinition implements org.apache.thrift.TBase<AnalyzerDefin
       if (struct.isSetColumnFamilyDefinitions()) {
         {
           oprot.writeI32(struct.columnFamilyDefinitions.size());
-          for (Map.Entry<String, ColumnFamilyDefinition> _iter137 : struct.columnFamilyDefinitions.entrySet())
+          for (Map.Entry<String, ColumnFamilyDefinition> _iter103 : struct.columnFamilyDefinitions.entrySet())
           {
-            oprot.writeString(_iter137.getKey());
-            _iter137.getValue().write(oprot);
+            oprot.writeString(_iter103.getKey());
+            _iter103.getValue().write(oprot);
           }
         }
       }
@@ -696,16 +696,16 @@ public class AnalyzerDefinition implements org.apache.thrift.TBase<AnalyzerDefin
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TMap _map138 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.columnFamilyDefinitions = new HashMap<String,ColumnFamilyDefinition>(2*_map138.size);
-          for (int _i139 = 0; _i139 < _map138.size; ++_i139)
+          org.apache.thrift.protocol.TMap _map104 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.columnFamilyDefinitions = new HashMap<String,ColumnFamilyDefinition>(2*_map104.size);
+          for (int _i105 = 0; _i105 < _map104.size; ++_i105)
           {
-            String _key140; // required
-            ColumnFamilyDefinition _val141; // optional
-            _key140 = iprot.readString();
-            _val141 = new ColumnFamilyDefinition();
-            _val141.read(iprot);
-            struct.columnFamilyDefinitions.put(_key140, _val141);
+            String _key106; // required
+            ColumnFamilyDefinition _val107; // optional
+            _key106 = iprot.readString();
+            _val107 = new ColumnFamilyDefinition();
+            _val107.read(iprot);
+            struct.columnFamilyDefinitions.put(_key106, _val107);
           }
         }
         struct.setColumnFamilyDefinitionsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
index e6335ff..7a3f278 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
@@ -2621,13 +2621,13 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list224 = iprot.readListBegin();
-                  struct.success = new ArrayList<String>(_list224.size);
-                  for (int _i225 = 0; _i225 < _list224.size; ++_i225)
+                  org.apache.thrift.protocol.TList _list190 = iprot.readListBegin();
+                  struct.success = new ArrayList<String>(_list190.size);
+                  for (int _i191 = 0; _i191 < _list190.size; ++_i191)
                   {
-                    String _elem226; // required
-                    _elem226 = iprot.readString();
-                    struct.success.add(_elem226);
+                    String _elem192; // required
+                    _elem192 = iprot.readString();
+                    struct.success.add(_elem192);
                   }
                   iprot.readListEnd();
                 }
@@ -2664,9 +2664,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size()));
-            for (String _iter227 : struct.success)
+            for (String _iter193 : struct.success)
             {
-              oprot.writeString(_iter227);
+              oprot.writeString(_iter193);
             }
             oprot.writeListEnd();
           }
@@ -2705,9 +2705,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (String _iter228 : struct.success)
+            for (String _iter194 : struct.success)
             {
-              oprot.writeString(_iter228);
+              oprot.writeString(_iter194);
             }
           }
         }
@@ -2722,13 +2722,13 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list229 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.success = new ArrayList<String>(_list229.size);
-            for (int _i230 = 0; _i230 < _list229.size; ++_i230)
+            org.apache.thrift.protocol.TList _list195 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.success = new ArrayList<String>(_list195.size);
+            for (int _i196 = 0; _i196 < _list195.size; ++_i196)
             {
-              String _elem231; // required
-              _elem231 = iprot.readString();
-              struct.success.add(_elem231);
+              String _elem197; // required
+              _elem197 = iprot.readString();
+              struct.success.add(_elem197);
             }
           }
           struct.setSuccessIsSet(true);
@@ -3483,13 +3483,13 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list232 = iprot.readListBegin();
-                  struct.success = new ArrayList<String>(_list232.size);
-                  for (int _i233 = 0; _i233 < _list232.size; ++_i233)
+                  org.apache.thrift.protocol.TList _list198 = iprot.readListBegin();
+                  struct.success = new ArrayList<String>(_list198.size);
+                  for (int _i199 = 0; _i199 < _list198.size; ++_i199)
                   {
-                    String _elem234; // required
-                    _elem234 = iprot.readString();
-                    struct.success.add(_elem234);
+                    String _elem200; // required
+                    _elem200 = iprot.readString();
+                    struct.success.add(_elem200);
                   }
                   iprot.readListEnd();
                 }
@@ -3526,9 +3526,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size()));
-            for (String _iter235 : struct.success)
+            for (String _iter201 : struct.success)
             {
-              oprot.writeString(_iter235);
+              oprot.writeString(_iter201);
             }
             oprot.writeListEnd();
           }
@@ -3567,9 +3567,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (String _iter236 : struct.success)
+            for (String _iter202 : struct.success)
             {
-              oprot.writeString(_iter236);
+              oprot.writeString(_iter202);
             }
           }
         }
@@ -3584,13 +3584,13 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list237 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.success = new ArrayList<String>(_list237.size);
-            for (int _i238 = 0; _i238 < _list237.size; ++_i238)
+            org.apache.thrift.protocol.TList _list203 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.success = new ArrayList<String>(_list203.size);
+            for (int _i204 = 0; _i204 < _list203.size; ++_i204)
             {
-              String _elem239; // required
-              _elem239 = iprot.readString();
-              struct.success.add(_elem239);
+              String _elem205; // required
+              _elem205 = iprot.readString();
+              struct.success.add(_elem205);
             }
           }
           struct.setSuccessIsSet(true);
@@ -4237,13 +4237,13 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list240 = iprot.readListBegin();
-                  struct.success = new ArrayList<String>(_list240.size);
-                  for (int _i241 = 0; _i241 < _list240.size; ++_i241)
+                  org.apache.thrift.protocol.TList _list206 = iprot.readListBegin();
+                  struct.success = new ArrayList<String>(_list206.size);
+                  for (int _i207 = 0; _i207 < _list206.size; ++_i207)
                   {
-                    String _elem242; // required
-                    _elem242 = iprot.readString();
-                    struct.success.add(_elem242);
+                    String _elem208; // required
+                    _elem208 = iprot.readString();
+                    struct.success.add(_elem208);
                   }
                   iprot.readListEnd();
                 }
@@ -4280,9 +4280,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size()));
-            for (String _iter243 : struct.success)
+            for (String _iter209 : struct.success)
             {
-              oprot.writeString(_iter243);
+              oprot.writeString(_iter209);
             }
             oprot.writeListEnd();
           }
@@ -4321,9 +4321,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (String _iter244 : struct.success)
+            for (String _iter210 : struct.success)
             {
-              oprot.writeString(_iter244);
+              oprot.writeString(_iter210);
             }
           }
         }
@@ -4338,13 +4338,13 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list245 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.success = new ArrayList<String>(_list245.size);
-            for (int _i246 = 0; _i246 < _list245.size; ++_i246)
+            org.apache.thrift.protocol.TList _list211 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.success = new ArrayList<String>(_list211.size);
+            for (int _i212 = 0; _i212 < _list211.size; ++_i212)
             {
-              String _elem247; // required
-              _elem247 = iprot.readString();
-              struct.success.add(_elem247);
+              String _elem213; // required
+              _elem213 = iprot.readString();
+              struct.success.add(_elem213);
             }
           }
           struct.setSuccessIsSet(true);
@@ -5104,15 +5104,15 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map248 = iprot.readMapBegin();
-                  struct.success = new HashMap<String,String>(2*_map248.size);
-                  for (int _i249 = 0; _i249 < _map248.size; ++_i249)
+                  org.apache.thrift.protocol.TMap _map214 = iprot.readMapBegin();
+                  struct.success = new HashMap<String,String>(2*_map214.size);
+                  for (int _i215 = 0; _i215 < _map214.size; ++_i215)
                   {
-                    String _key250; // required
-                    String _val251; // optional
-                    _key250 = iprot.readString();
-                    _val251 = iprot.readString();
-                    struct.success.put(_key250, _val251);
+                    String _key216; // required
+                    String _val217; // optional
+                    _key216 = iprot.readString();
+                    _val217 = iprot.readString();
+                    struct.success.put(_key216, _val217);
                   }
                   iprot.readMapEnd();
                 }
@@ -5149,10 +5149,10 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.success.size()));
-            for (Map.Entry<String, String> _iter252 : struct.success.entrySet())
+            for (Map.Entry<String, String> _iter218 : struct.success.entrySet())
             {
-              oprot.writeString(_iter252.getKey());
-              oprot.writeString(_iter252.getValue());
+              oprot.writeString(_iter218.getKey());
+              oprot.writeString(_iter218.getValue());
             }
             oprot.writeMapEnd();
           }
@@ -5191,10 +5191,10 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Map.Entry<String, String> _iter253 : struct.success.entrySet())
+            for (Map.Entry<String, String> _iter219 : struct.success.entrySet())
             {
-              oprot.writeString(_iter253.getKey());
-              oprot.writeString(_iter253.getValue());
+              oprot.writeString(_iter219.getKey());
+              oprot.writeString(_iter219.getValue());
             }
           }
         }
@@ -5209,15 +5209,15 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TMap _map254 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.success = new HashMap<String,String>(2*_map254.size);
-            for (int _i255 = 0; _i255 < _map254.size; ++_i255)
+            org.apache.thrift.protocol.TMap _map220 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.success = new HashMap<String,String>(2*_map220.size);
+            for (int _i221 = 0; _i221 < _map220.size; ++_i221)
             {
-              String _key256; // required
-              String _val257; // optional
-              _key256 = iprot.readString();
-              _val257 = iprot.readString();
-              struct.success.put(_key256, _val257);
+              String _key222; // required
+              String _val223; // optional
+              _key222 = iprot.readString();
+              _val223 = iprot.readString();
+              struct.success.put(_key222, _val223);
             }
           }
           struct.setSuccessIsSet(true);
@@ -5864,13 +5864,13 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list258 = iprot.readListBegin();
-                  struct.success = new ArrayList<String>(_list258.size);
-                  for (int _i259 = 0; _i259 < _list258.size; ++_i259)
+                  org.apache.thrift.protocol.TList _list224 = iprot.readListBegin();
+                  struct.success = new ArrayList<String>(_list224.size);
+                  for (int _i225 = 0; _i225 < _list224.size; ++_i225)
                   {
-                    String _elem260; // required
-                    _elem260 = iprot.readString();
-                    struct.success.add(_elem260);
+                    String _elem226; // required
+                    _elem226 = iprot.readString();
+                    struct.success.add(_elem226);
                   }
                   iprot.readListEnd();
                 }
@@ -5907,9 +5907,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size()));
-            for (String _iter261 : struct.success)
+            for (String _iter227 : struct.success)
             {
-              oprot.writeString(_iter261);
+              oprot.writeString(_iter227);
             }
             oprot.writeListEnd();
           }
@@ -5948,9 +5948,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (String _iter262 : struct.success)
+            for (String _iter228 : struct.success)
             {
-              oprot.writeString(_iter262);
+              oprot.writeString(_iter228);
             }
           }
         }
@@ -5965,13 +5965,13 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list263 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.success = new ArrayList<String>(_list263.size);
-            for (int _i264 = 0; _i264 < _list263.size; ++_i264)
+            org.apache.thrift.protocol.TList _list229 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.success = new ArrayList<String>(_list229.size);
+            for (int _i230 = 0; _i230 < _list229.size; ++_i230)
             {
-              String _elem265; // required
-              _elem265 = iprot.readString();
-              struct.success.add(_elem265);
+              String _elem231; // required
+              _elem231 = iprot.readString();
+              struct.success.add(_elem231);
             }
           }
           struct.setSuccessIsSet(true);
@@ -6726,13 +6726,13 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list266 = iprot.readListBegin();
-                  struct.success = new ArrayList<String>(_list266.size);
-                  for (int _i267 = 0; _i267 < _list266.size; ++_i267)
+                  org.apache.thrift.protocol.TList _list232 = iprot.readListBegin();
+                  struct.success = new ArrayList<String>(_list232.size);
+                  for (int _i233 = 0; _i233 < _list232.size; ++_i233)
                   {
-                    String _elem268; // required
-                    _elem268 = iprot.readString();
-                    struct.success.add(_elem268);
+                    String _elem234; // required
+                    _elem234 = iprot.readString();
+                    struct.success.add(_elem234);
                   }
                   iprot.readListEnd();
                 }
@@ -6769,9 +6769,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size()));
-            for (String _iter269 : struct.success)
+            for (String _iter235 : struct.success)
             {
-              oprot.writeString(_iter269);
+              oprot.writeString(_iter235);
             }
             oprot.writeListEnd();
           }
@@ -6810,9 +6810,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (String _iter270 : struct.success)
+            for (String _iter236 : struct.success)
             {
-              oprot.writeString(_iter270);
+              oprot.writeString(_iter236);
             }
           }
         }
@@ -6827,13 +6827,13 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list271 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.success = new ArrayList<String>(_list271.size);
-            for (int _i272 = 0; _i272 < _list271.size; ++_i272)
+            org.apache.thrift.protocol.TList _list237 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.success = new ArrayList<String>(_list237.size);
+            for (int _i238 = 0; _i238 < _list237.size; ++_i238)
             {
-              String _elem273; // required
-              _elem273 = iprot.readString();
-              struct.success.add(_elem273);
+              String _elem239; // required
+              _elem239 = iprot.readString();
+              struct.success.add(_elem239);
             }
           }
           struct.setSuccessIsSet(true);
@@ -9211,14 +9211,14 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list274 = iprot.readListBegin();
-                  struct.success = new ArrayList<BlurQueryStatus>(_list274.size);
-                  for (int _i275 = 0; _i275 < _list274.size; ++_i275)
+                  org.apache.thrift.protocol.TList _list240 = iprot.readListBegin();
+                  struct.success = new ArrayList<BlurQueryStatus>(_list240.size);
+                  for (int _i241 = 0; _i241 < _list240.size; ++_i241)
                   {
-                    BlurQueryStatus _elem276; // required
-                    _elem276 = new BlurQueryStatus();
-                    _elem276.read(iprot);
-                    struct.success.add(_elem276);
+                    BlurQueryStatus _elem242; // required
+                    _elem242 = new BlurQueryStatus();
+                    _elem242.read(iprot);
+                    struct.success.add(_elem242);
                   }
                   iprot.readListEnd();
                 }
@@ -9255,9 +9255,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (BlurQueryStatus _iter277 : struct.success)
+            for (BlurQueryStatus _iter243 : struct.success)
             {
-              _iter277.write(oprot);
+              _iter243.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -9296,9 +9296,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (BlurQueryStatus _iter278 : struct.success)
+            for (BlurQueryStatus _iter244 : struct.success)
             {
-              _iter278.write(oprot);
+              _iter244.write(oprot);
             }
           }
         }
@@ -9313,14 +9313,14 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list279 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<BlurQueryStatus>(_list279.size);
-            for (int _i280 = 0; _i280 < _list279.size; ++_i280)
+            org.apache.thrift.protocol.TList _list245 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<BlurQueryStatus>(_list245.size);
+            for (int _i246 = 0; _i246 < _list245.size; ++_i246)
             {
-              BlurQueryStatus _elem281; // required
-              _elem281 = new BlurQueryStatus();
-              _elem281.read(iprot);
-              struct.success.add(_elem281);
+              BlurQueryStatus _elem247; // required
+              _elem247 = new BlurQueryStatus();
+              _elem247.read(iprot);
+              struct.success.add(_elem247);
             }
           }
           struct.setSuccessIsSet(true);
@@ -10075,13 +10075,13 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list282 = iprot.readListBegin();
-                  struct.success = new ArrayList<Long>(_list282.size);
-                  for (int _i283 = 0; _i283 < _list282.size; ++_i283)
+                  org.apache.thrift.protocol.TList _list248 = iprot.readListBegin();
+                  struct.success = new ArrayList<Long>(_list248.size);
+                  for (int _i249 = 0; _i249 < _list248.size; ++_i249)
                   {
-                    long _elem284; // required
-                    _elem284 = iprot.readI64();
-                    struct.success.add(_elem284);
+                    long _elem250; // required
+                    _elem250 = iprot.readI64();
+                    struct.success.add(_elem250);
                   }
                   iprot.readListEnd();
                 }
@@ -10118,9 +10118,9 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.success.size()));
-            for (long _iter285 : struct.success)
+            for (long _iter251 : struct.success)
             {
-              oprot.writeI64(_iter285);
+              oprot.writeI64(_iter251);
             }
             oprot.writeListEnd();
           }
@@ -10159,9 +10159,9 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (long _iter286 : struct.success)
+            for (long _iter252 : struct.success)
             {
-              oprot.writeI64(_iter286);
+              oprot.writeI64(_iter252);
             }
           }
         }
@@ -10176,13 +10176,13 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list287 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
-            struct.success = new ArrayList<Long>(_list287.size);
-            for (int _i288 = 0; _i288 < _list287.size; ++_i288)
+            org.apache.thrift.protocol.TList _list253 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+            struct.success = new ArrayList<Long>(_list253.size);
+            for (int _i254 = 0; _i254 < _list253.size; ++_i254)
             {
-              long _elem289; // required
-              _elem289 = iprot.readI64();
-              struct.success.add(_elem289);
+              long _elem255; // required
+              _elem255 = iprot.readI64();
+              struct.success.add(_elem255);
             }
           }
           struct.setSuccessIsSet(true);
@@ -18753,15 +18753,15 @@ public class Blur {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map290 = iprot.readMapBegin();
-                  struct.success = new HashMap<String,String>(2*_map290.size);
-                  for (int _i291 = 0; _i291 < _map290.size; ++_i291)
+                  org.apache.thrift.protocol.TMap _map256 = iprot.readMapBegin();
+                  struct.success = new HashMap<String,String>(2*_map256.size);
+                  for (int _i257 = 0; _i257 < _map256.size; ++_i257)
                   {
-                    String _key292; // required
-                    String _val293; // optional
-                    _key292 = iprot.readString();
-                    _val293 = iprot.readString();
-                    struct.success.put(_key292, _val293);
+                    String _key258; // required
+                    String _val259; // optional
+                    _key258 = iprot.readString();
+                    _val259 = iprot.readString();
+                    struct.success.put(_key258, _val259);
                   }
                   iprot.readMapEnd();
                 }
@@ -18798,10 +18798,10 @@ public class Blur {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.success.size()));
-            for (Map.Entry<String, String> _iter294 : struct.success.entrySet())
+            for (Map.Entry<String, String> _iter260 : struct.success.entrySet())
             {
-              oprot.writeString(_iter294.getKey());
-              oprot.writeString(_iter294.getValue());
+              oprot.writeString(_iter260.getKey());
+              oprot.writeString(_iter260.getValue());
             }
             oprot.writeMapEnd();
           }
@@ -18840,10 +18840,10 @@ public class Blur {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Map.Entry<String, String> _iter295 : struct.success.entrySet())
+            for (Map.Entry<String, String> _iter261 : struct.success.entrySet())
             {
-              oprot.writeString(_iter295.getKey());
-              oprot.writeString(_iter295.getValue());
+              oprot.writeString(_iter261.getKey());
+              oprot.writeString(_iter261.getValue());
             }
           }
         }
@@ -18858,15 +18858,15 @@ public class Blur {
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TMap _map296 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.success = new HashMap<String,String>(2*_map296.size);
-            for (int _i297 = 0; _i297 < _map296.size; ++_i297)
+            org.apache.thrift.protocol.TMap _map262 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.success = new HashMap<String,String>(2*_map262.size);
+            for (int _i263 = 0; _i263 < _map262.size; ++_i263)
             {
-              String _key298; // required
-              String _val299; // optional
-              _key298 = iprot.readString();
-              _val299 = iprot.readString();
-              struct.success.put(_key298, _val299);
+              String _key264; // required
+              String _val265; // optional
+              _key264 = iprot.readString();
+              _val265 = iprot.readString();
+              struct.success.put(_key264, _val265);
             }
           }
           struct.setSuccessIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
index e879499..d7dcb4e 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
@@ -835,16 +835,16 @@ public class BlurQueryStatus implements org.apache.thrift.TBase<BlurQueryStatus,
           case 2: // CPU_TIMES
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map84 = iprot.readMapBegin();
-                struct.cpuTimes = new HashMap<String,CpuTime>(2*_map84.size);
-                for (int _i85 = 0; _i85 < _map84.size; ++_i85)
+                org.apache.thrift.protocol.TMap _map50 = iprot.readMapBegin();
+                struct.cpuTimes = new HashMap<String,CpuTime>(2*_map50.size);
+                for (int _i51 = 0; _i51 < _map50.size; ++_i51)
                 {
-                  String _key86; // required
-                  CpuTime _val87; // optional
-                  _key86 = iprot.readString();
-                  _val87 = new CpuTime();
-                  _val87.read(iprot);
-                  struct.cpuTimes.put(_key86, _val87);
+                  String _key52; // required
+                  CpuTime _val53; // optional
+                  _key52 = iprot.readString();
+                  _val53 = new CpuTime();
+                  _val53.read(iprot);
+                  struct.cpuTimes.put(_key52, _val53);
                 }
                 iprot.readMapEnd();
               }
@@ -909,10 +909,10 @@ public class BlurQueryStatus implements org.apache.thrift.TBase<BlurQueryStatus,
         oprot.writeFieldBegin(CPU_TIMES_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.cpuTimes.size()));
-          for (Map.Entry<String, CpuTime> _iter88 : struct.cpuTimes.entrySet())
+          for (Map.Entry<String, CpuTime> _iter54 : struct.cpuTimes.entrySet())
           {
-            oprot.writeString(_iter88.getKey());
-            _iter88.getValue().write(oprot);
+            oprot.writeString(_iter54.getKey());
+            _iter54.getValue().write(oprot);
           }
           oprot.writeMapEnd();
         }
@@ -975,10 +975,10 @@ public class BlurQueryStatus implements org.apache.thrift.TBase<BlurQueryStatus,
       if (struct.isSetCpuTimes()) {
         {
           oprot.writeI32(struct.cpuTimes.size());
-          for (Map.Entry<String, CpuTime> _iter89 : struct.cpuTimes.entrySet())
+          for (Map.Entry<String, CpuTime> _iter55 : struct.cpuTimes.entrySet())
           {
-            oprot.writeString(_iter89.getKey());
-            _iter89.getValue().write(oprot);
+            oprot.writeString(_iter55.getKey());
+            _iter55.getValue().write(oprot);
           }
         }
       }
@@ -1007,16 +1007,16 @@ public class BlurQueryStatus implements org.apache.thrift.TBase<BlurQueryStatus,
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TMap _map90 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.cpuTimes = new HashMap<String,CpuTime>(2*_map90.size);
-          for (int _i91 = 0; _i91 < _map90.size; ++_i91)
+          org.apache.thrift.protocol.TMap _map56 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.cpuTimes = new HashMap<String,CpuTime>(2*_map56.size);
+          for (int _i57 = 0; _i57 < _map56.size; ++_i57)
           {
-            String _key92; // required
-            CpuTime _val93; // optional
-            _key92 = iprot.readString();
-            _val93 = new CpuTime();
-            _val93.read(iprot);
-            struct.cpuTimes.put(_key92, _val93);
+            String _key58; // required
+            CpuTime _val59; // optional
+            _key58 = iprot.readString();
+            _val59 = new CpuTime();
+            _val59.read(iprot);
+            struct.cpuTimes.put(_key58, _val59);
           }
         }
         struct.setCpuTimesIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/93ff5d9d/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResult.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResult.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResult.java
deleted file mode 100644
index bf7cacd..0000000
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResult.java
+++ /dev/null
@@ -1,647 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.blur.thrift.generated;
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 
- */
-public class BlurResult implements org.apache.thrift.TBase<BlurResult, BlurResult._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BlurResult");
-
-  private static final org.apache.thrift.protocol.TField LOCATION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("locationId", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField SCORE_FIELD_DESC = new org.apache.thrift.protocol.TField("score", org.apache.thrift.protocol.TType.DOUBLE, (short)2);
-  private static final org.apache.thrift.protocol.TField FETCH_RESULT_FIELD_DESC = new org.apache.thrift.protocol.TField("fetchResult", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new BlurResultStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new BlurResultTupleSchemeFactory());
-  }
-
-  /**
-   * 
-   */
-  public String locationId; // required
-  /**
-   * 
-   */
-  public double score; // required
-  /**
-   * 
-   */
-  public FetchResult fetchResult; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    /**
-     * 
-     */
-    LOCATION_ID((short)1, "locationId"),
-    /**
-     * 
-     */
-    SCORE((short)2, "score"),
-    /**
-     * 
-     */
-    FETCH_RESULT((short)3, "fetchResult");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // LOCATION_ID
-          return LOCATION_ID;
-        case 2: // SCORE
-          return SCORE;
-        case 3: // FETCH_RESULT
-          return FETCH_RESULT;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __SCORE_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.LOCATION_ID, new org.apache.thrift.meta_data.FieldMetaData("locationId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.SCORE, new org.apache.thrift.meta_data.FieldMetaData("score", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.FETCH_RESULT, new org.apache.thrift.meta_data.FieldMetaData("fetchResult", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, FetchResult.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BlurResult.class, metaDataMap);
-  }
-
-  public BlurResult() {
-  }
-
-  public BlurResult(
-    String locationId,
-    double score,
-    FetchResult fetchResult)
-  {
-    this();
-    this.locationId = locationId;
-    this.score = score;
-    setScoreIsSet(true);
-    this.fetchResult = fetchResult;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public BlurResult(BlurResult other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetLocationId()) {
-      this.locationId = other.locationId;
-    }
-    this.score = other.score;
-    if (other.isSetFetchResult()) {
-      this.fetchResult = new FetchResult(other.fetchResult);
-    }
-  }
-
-  public BlurResult deepCopy() {
-    return new BlurResult(this);
-  }
-
-  @Override
-  public void clear() {
-    this.locationId = null;
-    setScoreIsSet(false);
-    this.score = 0.0;
-    this.fetchResult = null;
-  }
-
-  /**
-   * 
-   */
-  public String getLocationId() {
-    return this.locationId;
-  }
-
-  /**
-   * 
-   */
-  public BlurResult setLocationId(String locationId) {
-    this.locationId = locationId;
-    return this;
-  }
-
-  public void unsetLocationId() {
-    this.locationId = null;
-  }
-
-  /** Returns true if field locationId is set (has been assigned a value) and false otherwise */
-  public boolean isSetLocationId() {
-    return this.locationId != null;
-  }
-
-  public void setLocationIdIsSet(boolean value) {
-    if (!value) {
-      this.locationId = null;
-    }
-  }
-
-  /**
-   * 
-   */
-  public double getScore() {
-    return this.score;
-  }
-
-  /**
-   * 
-   */
-  public BlurResult setScore(double score) {
-    this.score = score;
-    setScoreIsSet(true);
-    return this;
-  }
-
-  public void unsetScore() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SCORE_ISSET_ID);
-  }
-
-  /** Returns true if field score is set (has been assigned a value) and false otherwise */
-  public boolean isSetScore() {
-    return EncodingUtils.testBit(__isset_bitfield, __SCORE_ISSET_ID);
-  }
-
-  public void setScoreIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCORE_ISSET_ID, value);
-  }
-
-  /**
-   * 
-   */
-  public FetchResult getFetchResult() {
-    return this.fetchResult;
-  }
-
-  /**
-   * 
-   */
-  public BlurResult setFetchResult(FetchResult fetchResult) {
-    this.fetchResult = fetchResult;
-    return this;
-  }
-
-  public void unsetFetchResult() {
-    this.fetchResult = null;
-  }
-
-  /** Returns true if field fetchResult is set (has been assigned a value) and false otherwise */
-  public boolean isSetFetchResult() {
-    return this.fetchResult != null;
-  }
-
-  public void setFetchResultIsSet(boolean value) {
-    if (!value) {
-      this.fetchResult = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case LOCATION_ID:
-      if (value == null) {
-        unsetLocationId();
-      } else {
-        setLocationId((String)value);
-      }
-      break;
-
-    case SCORE:
-      if (value == null) {
-        unsetScore();
-      } else {
-        setScore((Double)value);
-      }
-      break;
-
-    case FETCH_RESULT:
-      if (value == null) {
-        unsetFetchResult();
-      } else {
-        setFetchResult((FetchResult)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case LOCATION_ID:
-      return getLocationId();
-
-    case SCORE:
-      return Double.valueOf(getScore());
-
-    case FETCH_RESULT:
-      return getFetchResult();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case LOCATION_ID:
-      return isSetLocationId();
-    case SCORE:
-      return isSetScore();
-    case FETCH_RESULT:
-      return isSetFetchResult();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof BlurResult)
-      return this.equals((BlurResult)that);
-    return false;
-  }
-
-  public boolean equals(BlurResult that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_locationId = true && this.isSetLocationId();
-    boolean that_present_locationId = true && that.isSetLocationId();
-    if (this_present_locationId || that_present_locationId) {
-      if (!(this_present_locationId && that_present_locationId))
-        return false;
-      if (!this.locationId.equals(that.locationId))
-        return false;
-    }
-
-    boolean this_present_score = true;
-    boolean that_present_score = true;
-    if (this_present_score || that_present_score) {
-      if (!(this_present_score && that_present_score))
-        return false;
-      if (this.score != that.score)
-        return false;
-    }
-
-    boolean this_present_fetchResult = true && this.isSetFetchResult();
-    boolean that_present_fetchResult = true && that.isSetFetchResult();
-    if (this_present_fetchResult || that_present_fetchResult) {
-      if (!(this_present_fetchResult && that_present_fetchResult))
-        return false;
-      if (!this.fetchResult.equals(that.fetchResult))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(BlurResult other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    BlurResult typedOther = (BlurResult)other;
-
-    lastComparison = Boolean.valueOf(isSetLocationId()).compareTo(typedOther.isSetLocationId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetLocationId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.locationId, typedOther.locationId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetScore()).compareTo(typedOther.isSetScore());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetScore()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.score, typedOther.score);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetFetchResult()).compareTo(typedOther.isSetFetchResult());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetFetchResult()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fetchResult, typedOther.fetchResult);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("BlurResult(");
-    boolean first = true;
-
-    sb.append("locationId:");
-    if (this.locationId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.locationId);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("score:");
-    sb.append(this.score);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("fetchResult:");
-    if (this.fetchResult == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.fetchResult);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-    if (fetchResult != null) {
-      fetchResult.validate();
-    }
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  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.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class BlurResultStandardSchemeFactory implements SchemeFactory {
-    public BlurResultStandardScheme getScheme() {
-      return new BlurResultStandardScheme();
-    }
-  }
-
-  private static class BlurResultStandardScheme extends StandardScheme<BlurResult> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, BlurResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // LOCATION_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.locationId = iprot.readString();
-              struct.setLocationIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // SCORE
-            if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
-              struct.score = iprot.readDouble();
-              struct.setScoreIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // FETCH_RESULT
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.fetchResult = new FetchResult();
-              struct.fetchResult.read(iprot);
-              struct.setFetchResultIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, BlurResult struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.locationId != null) {
-        oprot.writeFieldBegin(LOCATION_ID_FIELD_DESC);
-        oprot.writeString(struct.locationId);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(SCORE_FIELD_DESC);
-      oprot.writeDouble(struct.score);
-      oprot.writeFieldEnd();
-      if (struct.fetchResult != null) {
-        oprot.writeFieldBegin(FETCH_RESULT_FIELD_DESC);
-        struct.fetchResult.write(oprot);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class BlurResultTupleSchemeFactory implements SchemeFactory {
-    public BlurResultTupleScheme getScheme() {
-      return new BlurResultTupleScheme();
-    }
-  }
-
-  private static class BlurResultTupleScheme extends TupleScheme<BlurResult> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, BlurResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetLocationId()) {
-        optionals.set(0);
-      }
-      if (struct.isSetScore()) {
-        optionals.set(1);
-      }
-      if (struct.isSetFetchResult()) {
-        optionals.set(2);
-      }
-      oprot.writeBitSet(optionals, 3);
-      if (struct.isSetLocationId()) {
-        oprot.writeString(struct.locationId);
-      }
-      if (struct.isSetScore()) {
-        oprot.writeDouble(struct.score);
-      }
-      if (struct.isSetFetchResult()) {
-        struct.fetchResult.write(oprot);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, BlurResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.locationId = iprot.readString();
-        struct.setLocationIdIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.score = iprot.readDouble();
-        struct.setScoreIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.fetchResult = new FetchResult();
-        struct.fetchResult.read(iprot);
-        struct.setFetchResultIsSet(true);
-      }
-    }
-  }
-
-}
-


Mime
View raw message