incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [2/3] git commit: More updates.
Date Wed, 03 Jul 2013 19:19:18 GMT
More updates.


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

Branch: refs/heads/0.2.0-newtypesystem
Commit: 193c0e6b7245b33b99e11ea5396c230e22d20830
Parents: 4ebe74e
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Wed Jul 3 15:15:17 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Wed Jul 3 15:15:17 2013 -0400

----------------------------------------------------------------------
 .../clusterstatus/ZookeeperClusterStatus.java   |  10 +-
 .../org/apache/blur/server/TableContext.java    |  17 +-
 .../org/apache/blur/utils/HighlightHelper.java  |  31 ++--
 .../test/java/org/apache/blur/MiniCluster.java  |   2 -
 .../apache/blur/manager/IndexManagerTest.java   |   2 -
 .../ZookeeperClusterStatusTest.java             |   2 -
 .../manager/writer/BlurIndexReaderTest.java     |   2 -
 .../blur/manager/writer/BlurNRTIndexTest.java   |   2 -
 .../blur/manager/writer/IndexImporterTest.java  |  19 ++-
 .../manager/writer/TransactionRecorderTest.java |  10 +-
 .../apache/blur/analysis/BaseFieldManager.java  |  62 +++++--
 .../org/apache/blur/analysis/FieldManager.java  |   2 +
 .../blur/analysis/FieldTypeDefinition.java      |   2 +-
 .../apache/blur/analysis/HdfsFieldManager.java  |  82 +++++++++
 .../blur/analysis/BaseFiledManagerTest.java     |  30 ++--
 .../blur/lucene/search/SuperParserTest.java     |  39 +++--
 .../apache/blur/shell/CreateTableCommand.java   |   5 -
 .../apache/blur/shell/DescribeTableCommand.java |   2 +-
 .../blur/thrift/generated/TableDescriptor.java  | 167 +++----------------
 .../thrift/util/CreateInsertQueryRepeating.java |  10 +-
 .../apache/blur/thrift/util/CreateTable.java    |   4 +-
 .../util/RapidlyCreateAndDeleteTables.java      |   2 -
 .../src/main/scripts/interface/Blur.thrift      |   4 -
 .../main/scripts/interface/gen-html/Blur.html   |   2 -
 .../blur/thrift/generated/TableDescriptor.java  | 167 +++----------------
 .../main/scripts/interface/gen-js/Blur_types.js |  17 --
 .../scripts/interface/gen-perl/Blur/Types.pm    |  18 +-
 .../main/scripts/interface/gen-rb/blur_types.rb |   3 -
 28 files changed, 271 insertions(+), 444 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java b/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
index 1fc6a43..200ed91 100644
--- a/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
+++ b/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
@@ -39,7 +39,6 @@ import org.apache.blur.thirdparty.thrift_0_9_0.TBase;
 import org.apache.blur.thirdparty.thrift_0_9_0.TException;
 import org.apache.blur.thirdparty.thrift_0_9_0.protocol.TJSONProtocol;
 import org.apache.blur.thirdparty.thrift_0_9_0.transport.TMemoryInputTransport;
-import org.apache.blur.thrift.generated.AnalyzerDefinition;
 import org.apache.blur.thrift.generated.ColumnPreCache;
 import org.apache.blur.thrift.generated.TableDescriptor;
 import org.apache.blur.utils.BlurUtil;
@@ -409,8 +408,6 @@ public class ZookeeperClusterStatus extends ClusterStatus {
               cluster, table)));
           tableDescriptor.compressionBlockSize = Integer.parseInt(new String(getData(ZookeeperPathConstants
               .getTableCompressionBlockSizePath(cluster, table))));
-          tableDescriptor.analyzerDefinition = fromBytes(getData(ZookeeperPathConstants.getTablePath(cluster, table)),
-              AnalyzerDefinition.class);
           tableDescriptor.blockCaching = isBlockCacheEnabled(cluster, table);
           tableDescriptor.blockCachingFileTypes = getBlockCacheFileTypes(cluster, table);
           tableDescriptor.name = table;
@@ -692,13 +689,8 @@ public class ZookeeperClusterStatus extends ClusterStatus {
       if (tableDescriptor.getSimilarityClass() == null) {
         tableDescriptor.setSimilarityClass(FairSimilarity.class.getName());
       }
-      if (tableDescriptor.getAnalyzerDefinition() == null) {
-        tableDescriptor.setAnalyzerDefinition(new AnalyzerDefinition());
-      }
       String table = BlurUtil.nullCheck(tableDescriptor.name, "tableDescriptor.name cannot be null.");
       String cluster = BlurUtil.nullCheck(tableDescriptor.cluster, "tableDescriptor.cluster cannot be null.");
-      BlurAnalyzer analyzer = new BlurAnalyzer(BlurUtil.nullCheck(tableDescriptor.analyzerDefinition,
-          "tableDescriptor.analyzerDefinition cannot be null."));
       String uri = BlurUtil.nullCheck(tableDescriptor.tableUri, "tableDescriptor.tableUri cannot be null.");
       int shardCount = BlurUtil.zeroCheck(tableDescriptor.shardCount,
           "tableDescriptor.shardCount cannot be less than 1");
@@ -716,7 +708,7 @@ public class ZookeeperClusterStatus extends ClusterStatus {
         throw new IOException("Table [" + table + "] already exists.");
       }
       BlurUtil.setupFileSystem(uri, shardCount);
-      BlurUtil.createPath(_zk, blurTablePath, analyzer.toJSON().getBytes());
+      BlurUtil.createPath(_zk, blurTablePath, null);
       BlurUtil.createPath(_zk, ZookeeperPathConstants.getTableColumnsToPreCache(cluster, table),
           BlurUtil.read(columnPreCache));
       BlurUtil.createPath(_zk, ZookeeperPathConstants.getTableUriPath(cluster, table), uri.getBytes());

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-core/src/main/java/org/apache/blur/server/TableContext.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/server/TableContext.java b/blur-core/src/main/java/org/apache/blur/server/TableContext.java
index e9bcb0a..c3eec1d 100644
--- a/blur-core/src/main/java/org/apache/blur/server/TableContext.java
+++ b/blur-core/src/main/java/org/apache/blur/server/TableContext.java
@@ -27,7 +27,9 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.blur.analysis.BaseFieldManager;
 import org.apache.blur.analysis.FieldManager;
+import org.apache.blur.analysis.NoStopWordStandardAnalyzer;
 import org.apache.blur.log.Log;
 import org.apache.blur.log.LogFactory;
 import org.apache.blur.thrift.generated.ScoreType;
@@ -43,7 +45,6 @@ import org.apache.lucene.search.similarities.Similarity;
 
 public class TableContext {
 
-
   private static final Log LOG = LogFactory.getLog(TableContext.class);
 
   private static final String LOGS = "logs";
@@ -67,7 +68,7 @@ public class TableContext {
   protected TableContext() {
 
   }
-  
+
   public static void clear() {
     cache.clear();
   }
@@ -90,7 +91,7 @@ public class TableContext {
     tableContext.configuration = configuration;
     tableContext.tablePath = new Path(tableDescriptor.getTableUri());
     tableContext.walTablePath = new Path(tableContext.tablePath, LOGS);
-    tableContext.fieldManager = null;
+
     tableContext.defaultFieldName = SUPER;
     tableContext.table = tableDescriptor.getName();
     tableContext.descriptor = tableDescriptor;
@@ -99,11 +100,15 @@ public class TableContext {
     tableContext.defaultPrimeDocTerm = new Term("_prime_", "true");
     tableContext.defaultScoreType = ScoreType.SUPER;
 
-    Class<?> c1 = configuration.getClass(BLUR_SHARD_INDEX_DELETION_POLICY_MAXAGE, KeepOnlyLastCommitDeletionPolicy.class);
-    tableContext.indexDeletionPolicy = (IndexDeletionPolicy) configure(ReflectionUtils.newInstance(c1, configuration), tableContext);
+    tableContext.fieldManager = null;
+
+    Class<?> c1 = configuration.getClass(BLUR_SHARD_INDEX_DELETION_POLICY_MAXAGE,
+        KeepOnlyLastCommitDeletionPolicy.class);
+    tableContext.indexDeletionPolicy = (IndexDeletionPolicy) configure(ReflectionUtils.newInstance(c1, configuration),
+        tableContext);
     Class<?> c2 = configuration.getClass(BLUR_SAHRD_INDEX_SIMILARITY, DefaultSimilarity.class);
     tableContext.similarity = (Similarity) configure(ReflectionUtils.newInstance(c2, configuration), tableContext);
-    
+
     cache.put(tableDescriptor.getName(), tableContext);
     return tableContext;
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-core/src/main/java/org/apache/blur/utils/HighlightHelper.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/utils/HighlightHelper.java b/blur-core/src/main/java/org/apache/blur/utils/HighlightHelper.java
index fac107c..2f63aca 100644
--- a/blur-core/src/main/java/org/apache/blur/utils/HighlightHelper.java
+++ b/blur-core/src/main/java/org/apache/blur/utils/HighlightHelper.java
@@ -62,7 +62,6 @@ public class HighlightHelper {
   private static final Collection<String> FIELDS_NOT_TO_HIGHLIGHT = new HashSet<String>() {
     private static final long serialVersionUID = 1L;
     {
-      add(BlurConstants.SUPER);
       add(BlurConstants.ROW_ID);
       add(BlurConstants.RECORD_ID);
       add(BlurConstants.PRIME_DOC);
@@ -121,25 +120,27 @@ public class HighlightHelper {
    */
   public static Document highlight(int docId, Document document, Query query, FieldManager fieldManager,
       IndexReader reader, String preTag, String postTag) throws IOException, InvalidTokenOffsetsException {
-    
-    Query fixedQuery = fixSuperQuery(query, null);
-    
+
+    String fieldLessFieldName = fieldManager.getFieldLessFieldName();
+
+    Query fixedQuery = fixSuperQuery(query, null, fieldLessFieldName);
+
     Analyzer analyzer = fieldManager.getAnalyzerForQuery();
 
     SimpleHTMLFormatter htmlFormatter = new SimpleHTMLFormatter(preTag, postTag);
     Document result = new Document();
     for (IndexableField f : document) {
       String name = f.name();
-      if (FIELDS_NOT_TO_HIGHLIGHT.contains(name)) {
+      if (fieldLessFieldName.equals(name) || FIELDS_NOT_TO_HIGHLIGHT.contains(name)) {
         result.add(f);
         continue;
       }
       String text = f.stringValue();
       Number numericValue = f.numericValue();
-      
+
       Query fieldFixedQuery;
       if (fieldManager.isFieldLessIndexed(name)) {
-        fieldFixedQuery = fixSuperQuery(query, name);  
+        fieldFixedQuery = fixSuperQuery(query, name, fieldLessFieldName);
       } else {
         fieldFixedQuery = fixedQuery;
       }
@@ -163,43 +164,43 @@ public class HighlightHelper {
     return result;
   }
 
-  private static Query fixSuperQuery(Query query, String name) {
+  private static Query fixSuperQuery(Query query, String name, String fieldLessFieldName) {
     if (query instanceof BooleanQuery) {
       BooleanQuery bq = (BooleanQuery) query;
       BooleanQuery newBq = new BooleanQuery();
       for (BooleanClause booleanClause : bq) {
-        newBq.add(fixSuperQuery(booleanClause.getQuery(), name), booleanClause.getOccur());
+        newBq.add(fixSuperQuery(booleanClause.getQuery(), name, fieldLessFieldName), booleanClause.getOccur());
       }
       return newBq;
     } else if (query instanceof SuperQuery) {
       SuperQuery sq = (SuperQuery) query;
-      return setFieldIfNeeded(sq.getQuery(), name);
+      return setFieldIfNeeded(sq.getQuery(), name, fieldLessFieldName);
     } else {
-      return setFieldIfNeeded(query, name);
+      return setFieldIfNeeded(query, name, fieldLessFieldName);
     }
   }
 
-  private static Query setFieldIfNeeded(Query query, String name) {
+  private static Query setFieldIfNeeded(Query query, String name, String fieldLessFieldName) {
     if (name == null) {
       return query;
     }
     if (query instanceof TermQuery) {
       TermQuery tq = (TermQuery) query;
       Term term = tq.getTerm();
-      if (term.field().equals(BlurConstants.SUPER)) {
+      if (term.field().equals(fieldLessFieldName)) {
         return new TermQuery(new Term(name, term.bytes()));
       }
     } else if (query instanceof WildcardQuery) {
       WildcardQuery wq = (WildcardQuery) query;
       Term term = wq.getTerm();
-      if (term.field().equals(BlurConstants.SUPER)) {
+      if (term.field().equals(fieldLessFieldName)) {
         return new WildcardQuery(new Term(name, term.bytes()));
       }
     } else if (query instanceof MultiPhraseQuery) {
       MultiPhraseQuery mpq = (MultiPhraseQuery) query;
       int[] positions = mpq.getPositions();
       List<Term[]> termArrays = mpq.getTermArrays();
-      if (isTermField(termArrays, BlurConstants.SUPER)) {
+      if (isTermField(termArrays, fieldLessFieldName)) {
         MultiPhraseQuery multiPhraseQuery = new MultiPhraseQuery();
         multiPhraseQuery.setSlop(mpq.getSlop());
         for (int i = 0; i < termArrays.size(); i++) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-core/src/test/java/org/apache/blur/MiniCluster.java
----------------------------------------------------------------------
diff --git a/blur-core/src/test/java/org/apache/blur/MiniCluster.java b/blur-core/src/test/java/org/apache/blur/MiniCluster.java
index 275b261..c341ad7 100644
--- a/blur-core/src/test/java/org/apache/blur/MiniCluster.java
+++ b/blur-core/src/test/java/org/apache/blur/MiniCluster.java
@@ -53,7 +53,6 @@ import org.apache.blur.thrift.Connection;
 import org.apache.blur.thrift.ThriftBlurControllerServer;
 import org.apache.blur.thrift.ThriftBlurShardServer;
 import org.apache.blur.thrift.ThriftServer;
-import org.apache.blur.thrift.generated.AnalyzerDefinition;
 import org.apache.blur.thrift.generated.Blur.Client;
 import org.apache.blur.thrift.generated.Blur.Iface;
 import org.apache.blur.thrift.generated.BlurException;
@@ -155,7 +154,6 @@ public abstract class MiniCluster {
     final TableDescriptor descriptor = new TableDescriptor();
     descriptor.setName(test);
     descriptor.setShardCount(7);
-    descriptor.setAnalyzerDefinition(new AnalyzerDefinition());
     descriptor.setTableUri(getFileSystemUri() + "/blur/" + test);
     client.createTable(descriptor);
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/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 56db377..2d3f01f 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
@@ -49,7 +49,6 @@ import org.apache.blur.manager.clusterstatus.ClusterStatus;
 import org.apache.blur.manager.indexserver.LocalIndexServer;
 import org.apache.blur.manager.results.BlurResultIterable;
 import org.apache.blur.server.TableContext;
-import org.apache.blur.thrift.generated.AnalyzerDefinition;
 import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.BlurQuery;
 import org.apache.blur.thrift.generated.BlurResult;
@@ -99,7 +98,6 @@ public class IndexManagerTest {
     final TableDescriptor tableDescriptor = new TableDescriptor();
     tableDescriptor.setName(TABLE);
     tableDescriptor.setTableUri(file.toURI().toString());
-    tableDescriptor.setAnalyzerDefinition(new AnalyzerDefinition());
     tableDescriptor.putToTableProperties("blur.shard.time.between.refreshs", Long.toString(100));
     tableDescriptor.setShardCount(1);
     server = new LocalIndexServer(tableDescriptor);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-core/src/test/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatusTest.java
----------------------------------------------------------------------
diff --git a/blur-core/src/test/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatusTest.java b/blur-core/src/test/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatusTest.java
index 37fb143..d867941 100644
--- a/blur-core/src/test/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatusTest.java
+++ b/blur-core/src/test/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatusTest.java
@@ -31,7 +31,6 @@ import java.util.concurrent.TimeUnit;
 import org.apache.blur.MiniCluster;
 import org.apache.blur.log.Log;
 import org.apache.blur.log.LogFactory;
-import org.apache.blur.thrift.generated.AnalyzerDefinition;
 import org.apache.blur.thrift.generated.TableDescriptor;
 import org.apache.blur.utils.BlurUtil;
 import org.apache.blur.zookeeper.ZooKeeperClient;
@@ -198,7 +197,6 @@ public class ZookeeperClusterStatusTest {
   private void createTable(String name, boolean enabled) throws KeeperException, InterruptedException {
     TableDescriptor tableDescriptor = new TableDescriptor();
     tableDescriptor.setName(name);
-    tableDescriptor.setAnalyzerDefinition(new AnalyzerDefinition());
     tableDescriptor.setTableUri("./target/tmp/zk_test_hdfs");
     tableDescriptor.setIsEnabled(enabled);
     clusterStatus.createTable(tableDescriptor);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-core/src/test/java/org/apache/blur/manager/writer/BlurIndexReaderTest.java
----------------------------------------------------------------------
diff --git a/blur-core/src/test/java/org/apache/blur/manager/writer/BlurIndexReaderTest.java b/blur-core/src/test/java/org/apache/blur/manager/writer/BlurIndexReaderTest.java
index 42ffb99..97d872b 100644
--- a/blur-core/src/test/java/org/apache/blur/manager/writer/BlurIndexReaderTest.java
+++ b/blur-core/src/test/java/org/apache/blur/manager/writer/BlurIndexReaderTest.java
@@ -30,7 +30,6 @@ import org.apache.blur.lucene.store.refcounter.IndexInputCloser;
 import org.apache.blur.server.IndexSearcherClosable;
 import org.apache.blur.server.ShardContext;
 import org.apache.blur.server.TableContext;
-import org.apache.blur.thrift.generated.AnalyzerDefinition;
 import org.apache.blur.thrift.generated.TableDescriptor;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.lucene.analysis.core.KeywordAnalyzer;
@@ -84,7 +83,6 @@ public class BlurIndexReaderTest {
     TableDescriptor tableDescriptor = new TableDescriptor();
     tableDescriptor.setName("test-table");
     tableDescriptor.setTableUri(new File(base, "table-store-" + UUID.randomUUID().toString()).toURI().toString());
-    tableDescriptor.setAnalyzerDefinition(new AnalyzerDefinition());
     tableDescriptor.putToTableProperties("blur.shard.time.between.refreshs", Long.toString(refresh));
     tableDescriptor.putToTableProperties("blur.shard.time.between.commits", Long.toString(1000));
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-core/src/test/java/org/apache/blur/manager/writer/BlurNRTIndexTest.java
----------------------------------------------------------------------
diff --git a/blur-core/src/test/java/org/apache/blur/manager/writer/BlurNRTIndexTest.java b/blur-core/src/test/java/org/apache/blur/manager/writer/BlurNRTIndexTest.java
index c207937..8c6367a 100644
--- a/blur-core/src/test/java/org/apache/blur/manager/writer/BlurNRTIndexTest.java
+++ b/blur-core/src/test/java/org/apache/blur/manager/writer/BlurNRTIndexTest.java
@@ -31,7 +31,6 @@ import org.apache.blur.lucene.store.refcounter.IndexInputCloser;
 import org.apache.blur.server.IndexSearcherClosable;
 import org.apache.blur.server.ShardContext;
 import org.apache.blur.server.TableContext;
-import org.apache.blur.thrift.generated.AnalyzerDefinition;
 import org.apache.blur.thrift.generated.Column;
 import org.apache.blur.thrift.generated.Record;
 import org.apache.blur.thrift.generated.Row;
@@ -82,7 +81,6 @@ public class BlurNRTIndexTest {
     tableDescriptor.setName("test-table");
     String uuid = UUID.randomUUID().toString();
     tableDescriptor.setTableUri(new File(base, "table-store-" + uuid).toURI().toString());
-    tableDescriptor.setAnalyzerDefinition(new AnalyzerDefinition());
     tableDescriptor.putToTableProperties("blur.shard.time.between.refreshs", Long.toString(refresh));
 
     TableContext tableContext = TableContext.create(tableDescriptor);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-core/src/test/java/org/apache/blur/manager/writer/IndexImporterTest.java
----------------------------------------------------------------------
diff --git a/blur-core/src/test/java/org/apache/blur/manager/writer/IndexImporterTest.java b/blur-core/src/test/java/org/apache/blur/manager/writer/IndexImporterTest.java
index a3e1ad9..e7724a5 100644
--- a/blur-core/src/test/java/org/apache/blur/manager/writer/IndexImporterTest.java
+++ b/blur-core/src/test/java/org/apache/blur/manager/writer/IndexImporterTest.java
@@ -22,24 +22,25 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.blur.analysis.BlurAnalyzer;
+import org.apache.blur.analysis.FieldManager;
 import org.apache.blur.server.ShardContext;
 import org.apache.blur.server.TableContext;
 import org.apache.blur.store.buffer.BufferStore;
 import org.apache.blur.store.hdfs.HdfsDirectory;
-import org.apache.blur.thrift.generated.AnalyzerDefinition;
 import org.apache.blur.thrift.generated.Column;
 import org.apache.blur.thrift.generated.Record;
 import org.apache.blur.thrift.generated.TableDescriptor;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.lucene.document.Document;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.document.Field;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.search.NRTManager.TrackingIndexWriter;
@@ -62,6 +63,8 @@ public class IndexImporterTest {
   private IndexWriter mainWriter;
   private FileSystem fileSystem;
 
+  private FieldManager _fieldManager;
+
   @Before
   public void setup() throws IOException {
     TableContext.clear();
@@ -79,7 +82,6 @@ public class IndexImporterTest {
     String uuid = UUID.randomUUID().toString();
     
     tableDescriptor.setTableUri(new Path(base, "table-table").toUri().toString());
-    tableDescriptor.setAnalyzerDefinition(new AnalyzerDefinition());
     tableDescriptor.setShardCount(2);
     
     TableContext tableContext = TableContext.create(tableDescriptor);
@@ -92,7 +94,9 @@ public class IndexImporterTest {
     badRowIdsPath = new Path(shardPath, indexDirName + ".bad_rowids");
     Directory commitDirectory = new HdfsDirectory(configuration, path);
     Directory mainDirectory = new HdfsDirectory(configuration, shardPath);
-    IndexWriterConfig conf = new IndexWriterConfig(LUCENE_VERSION, tableContext.getAnalyzer());
+    _fieldManager = tableContext.getFieldManager();
+    Analyzer analyzerForIndex = _fieldManager.getAnalyzerForIndex();
+    IndexWriterConfig conf = new IndexWriterConfig(LUCENE_VERSION, analyzerForIndex);
     commitWriter = new IndexWriter(commitDirectory, conf);
     
     mainWriter = new IndexWriter(mainDirectory, conf);
@@ -112,8 +116,7 @@ public class IndexImporterTest {
 
   @Test
   public void testIndexImporterWithCorrectRowIdShardCombination() throws IOException {
-    
-    Document document = TransactionRecorder.convert("1", genRecord("1"), new BlurAnalyzer());
+    List<Field> document = _fieldManager.getFields("1", genRecord("1"));
     commitWriter.addDocument(document);
     commitWriter.commit();
     commitWriter.close();
@@ -138,7 +141,7 @@ public class IndexImporterTest {
   @Test
   public void testIndexImporterWithWrongRowIdShardCombination() throws IOException {
     setupWriter(configuration);
-    Document document = TransactionRecorder.convert("2", genRecord("1"), new BlurAnalyzer());
+    List<Field> document = _fieldManager.getFields("2", genRecord("1"));
     commitWriter.addDocument(document);
     commitWriter.commit();
     commitWriter.close();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-core/src/test/java/org/apache/blur/manager/writer/TransactionRecorderTest.java
----------------------------------------------------------------------
diff --git a/blur-core/src/test/java/org/apache/blur/manager/writer/TransactionRecorderTest.java b/blur-core/src/test/java/org/apache/blur/manager/writer/TransactionRecorderTest.java
index 3c152da..c7ad83d 100644
--- a/blur-core/src/test/java/org/apache/blur/manager/writer/TransactionRecorderTest.java
+++ b/blur-core/src/test/java/org/apache/blur/manager/writer/TransactionRecorderTest.java
@@ -30,16 +30,15 @@ import java.util.HashSet;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.blur.MiniCluster;
-import org.apache.blur.analysis.BlurAnalyzer;
 import org.apache.blur.log.Log;
 import org.apache.blur.log.LogFactory;
 import org.apache.blur.server.ShardContext;
 import org.apache.blur.server.TableContext;
-import org.apache.blur.thrift.generated.AnalyzerDefinition;
 import org.apache.blur.thrift.generated.Column;
 import org.apache.blur.thrift.generated.Record;
 import org.apache.blur.thrift.generated.Row;
 import org.apache.blur.thrift.generated.TableDescriptor;
+import org.apache.blur.utils.BlurUtil;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -95,7 +94,6 @@ public class TransactionRecorderTest {
 
     System.out.println("tableUri=" + tableUri);
     tableDescriptor.setTableUri(tableUri);
-    tableDescriptor.setAnalyzerDefinition(new AnalyzerDefinition());
 
     TableContext tableContext = TableContext.create(tableDescriptor);
     ShardContext shardContext = ShardContext.create(tableContext, "shard-1");
@@ -136,7 +134,7 @@ public class TransactionRecorderTest {
     column.setName("columnName_123-1");
     record.setColumns(Arrays.asList(column));
     
-    TransactionRecorder.convert(rowId, record, new BlurAnalyzer());
+    BlurUtil.validateRowIdAndRecord(rowId, record);
     assert(true);
   }
   
@@ -151,7 +149,7 @@ public class TransactionRecorderTest {
     column.setName("columnName_123-1");
     record.setColumns(Arrays.asList(column));
     
-    TransactionRecorder.convert(rowId, record, new BlurAnalyzer());
+    BlurUtil.validateRowIdAndRecord(rowId, record);
     fail();
   }
   
@@ -166,7 +164,7 @@ public class TransactionRecorderTest {
     column.setName("columnName_123.1");
     record.setColumns(Arrays.asList(column));
     
-    TransactionRecorder.convert(rowId, record, new BlurAnalyzer());
+    BlurUtil.validateRowIdAndRecord(rowId, record);
     fail();
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-query/src/main/java/org/apache/blur/analysis/BaseFieldManager.java
----------------------------------------------------------------------
diff --git a/blur-query/src/main/java/org/apache/blur/analysis/BaseFieldManager.java b/blur-query/src/main/java/org/apache/blur/analysis/BaseFieldManager.java
index 7ddae37..0bf4b3b 100644
--- a/blur-query/src/main/java/org/apache/blur/analysis/BaseFieldManager.java
+++ b/blur-query/src/main/java/org/apache/blur/analysis/BaseFieldManager.java
@@ -50,10 +50,14 @@ public abstract class BaseFieldManager extends FieldManager {
   private static final Log LOG = LogFactory.getLog(BaseFieldManager.class);
   private static final Map<String, String> EMPTY_MAP = new HashMap<String, String>();;
 
-  private Map<String, FieldTypeDefinition> _fieldNameToDefMap = new ConcurrentHashMap<String, FieldTypeDefinition>();
-  private Map<String, Class<? extends FieldTypeDefinition>> _typeMap = new ConcurrentHashMap<String, Class<? extends FieldTypeDefinition>>();
-  private Map<String, Set<String>> _columnToSubColumn = new ConcurrentHashMap<String, Set<String>>();
-  private Analyzer _baseAnalyzerForQuery;
+  private final Map<String, Set<String>> _columnToSubColumn = new ConcurrentHashMap<String, Set<String>>();
+  private final Map<String, FieldTypeDefinition> _fieldNameToDefMap = new ConcurrentHashMap<String, FieldTypeDefinition>();
+  
+  // This is loaded at object creation and never changed again.
+  private final Map<String, Class<? extends FieldTypeDefinition>> _typeMap = new ConcurrentHashMap<String, Class<? extends FieldTypeDefinition>>();
+  private final Analyzer _baseAnalyzerForQuery;
+  private final Analyzer _baseAnalyzerForIndex;
+  private final String _fieldLessField;
 
   public static FieldType ID_TYPE;
   static {
@@ -70,7 +74,7 @@ public abstract class BaseFieldManager extends FieldManager {
     SUPER_FIELD_TYPE.setOmitNorms(true);
   }
 
-  public BaseFieldManager(final Analyzer defaultAnalyzerForQuerying) {
+  public BaseFieldManager(String fieldLessField, final Analyzer defaultAnalyzerForQuerying) {
     _typeMap.put(TextFieldTypeDefinition.NAME, TextFieldTypeDefinition.class);
     _typeMap.put(StringFieldTypeDefinition.NAME, StringFieldTypeDefinition.class);
     _typeMap.put(StoredFieldTypeDefinition.NAME, StoredFieldTypeDefinition.class);
@@ -78,6 +82,7 @@ public abstract class BaseFieldManager extends FieldManager {
     _typeMap.put(LongFieldTypeDefinition.NAME, LongFieldTypeDefinition.class);
     _typeMap.put(DoubleFieldTypeDefinition.NAME, DoubleFieldTypeDefinition.class);
     _typeMap.put(FloatFieldTypeDefinition.NAME, FloatFieldTypeDefinition.class);
+    _fieldLessField = fieldLessField;
 
     _baseAnalyzerForQuery = new AnalyzerWrapper() {
       @Override
@@ -94,6 +99,22 @@ public abstract class BaseFieldManager extends FieldManager {
         return components;
       }
     };
+
+    _baseAnalyzerForIndex = new AnalyzerWrapper() {
+      @Override
+      protected Analyzer getWrappedAnalyzer(String fieldName) {
+        FieldTypeDefinition fieldTypeDefinition = getFieldTypeDefinition(fieldName);
+        if (fieldTypeDefinition == null) {
+          throw new RuntimeException("Field [" + fieldName + "] not found.");
+        }
+        return fieldTypeDefinition.getAnalyzerForQuery();
+      }
+
+      @Override
+      protected TokenStreamComponents wrapComponents(String fieldName, TokenStreamComponents components) {
+        return components;
+      }
+    };
   }
 
   @Override
@@ -150,13 +171,13 @@ public abstract class BaseFieldManager extends FieldManager {
     for (Field field : fieldTypeDefinition.getFieldsForColumn(family, column)) {
       fields.add(field);
     }
-    if (fieldTypeDefinition.isFieldLessIndexing()) {
+    if (fieldTypeDefinition.isFieldLessIndexed()) {
       addFieldLessIndex(fields, column.getValue());
     }
   }
 
   private void addFieldLessIndex(List<Field> fields, String value) {
-    fields.add(new Field(BlurConstants.SUPER, value, SUPER_FIELD_TYPE));
+    fields.add(new Field(_fieldLessField, value, SUPER_FIELD_TYPE));
   }
 
   private FieldTypeDefinition getFieldTypeDefinition(String family, Column column, String subName) {
@@ -201,7 +222,9 @@ public abstract class BaseFieldManager extends FieldManager {
     } else {
       fieldName = baseFieldName;
     }
-    tryToStore(fieldName, fieldLessIndexing, fieldType, props);
+    if (!tryToStore(fieldName, fieldLessIndexing, fieldType, props)) {
+      
+    }
     Class<? extends FieldTypeDefinition> clazz = _typeMap.get(fieldType);
     if (clazz == null) {
       throw new IllegalArgumentException("FieldType of [" + fieldType + "] was not found.");
@@ -229,7 +252,7 @@ public abstract class BaseFieldManager extends FieldManager {
     }
   }
 
-  protected abstract void tryToStore(String fieldName, boolean fieldLessIndexing, String fieldType,
+  protected abstract boolean tryToStore(String fieldName, boolean fieldLessIndexing, String fieldType,
       Map<String, String> props);
 
   private Set<String> getConcurrentSet() {
@@ -294,6 +317,17 @@ public abstract class BaseFieldManager extends FieldManager {
   }
 
   @Override
+  public Analyzer getAnalyzerForIndex() {
+    return _baseAnalyzerForIndex;
+  }
+
+  @Override
+  public boolean isFieldLessIndexed(String field) {
+    FieldTypeDefinition fieldTypeDefinition = getFieldTypeDefinition(field);
+    return fieldTypeDefinition.isFieldLessIndexed();
+  }
+
+  @Override
   public boolean checkSupportForFuzzyQuery(String field) {
     FieldTypeDefinition fieldTypeDefinition = getFieldTypeDefinition(field);
     return fieldTypeDefinition.checkSupportForFuzzyQuery();
@@ -335,15 +369,9 @@ public abstract class BaseFieldManager extends FieldManager {
   public FieldTypeDefinition getFieldTypeDefinition(String field) {
     return _fieldNameToDefMap.get(field);
   }
-  
-  @Override
-  public boolean isFieldLessIndexed(String name) {
-    return false;
-  }
 
-  @Override
-  public Analyzer getAnalyzerForIndex() {
-    return null;
+  public String getFieldLessFieldName() {
+    return _fieldLessField;
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-query/src/main/java/org/apache/blur/analysis/FieldManager.java
----------------------------------------------------------------------
diff --git a/blur-query/src/main/java/org/apache/blur/analysis/FieldManager.java b/blur-query/src/main/java/org/apache/blur/analysis/FieldManager.java
index 9629da9..3981759 100644
--- a/blur-query/src/main/java/org/apache/blur/analysis/FieldManager.java
+++ b/blur-query/src/main/java/org/apache/blur/analysis/FieldManager.java
@@ -163,5 +163,7 @@ public abstract class FieldManager {
   public abstract boolean isFieldLessIndexed(String name);
 
   public abstract Analyzer getAnalyzerForIndex();
+  
+  public abstract String getFieldLessFieldName();
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-query/src/main/java/org/apache/blur/analysis/FieldTypeDefinition.java
----------------------------------------------------------------------
diff --git a/blur-query/src/main/java/org/apache/blur/analysis/FieldTypeDefinition.java b/blur-query/src/main/java/org/apache/blur/analysis/FieldTypeDefinition.java
index 1f24386..b6c511a 100644
--- a/blur-query/src/main/java/org/apache/blur/analysis/FieldTypeDefinition.java
+++ b/blur-query/src/main/java/org/apache/blur/analysis/FieldTypeDefinition.java
@@ -131,7 +131,7 @@ public abstract class FieldTypeDefinition {
     return family + "." + name + "." + subName;
   }
 
-  public boolean isFieldLessIndexing() {
+  public boolean isFieldLessIndexed() {
     return _fieldLessIndexing;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-query/src/main/java/org/apache/blur/analysis/HdfsFieldManager.java
----------------------------------------------------------------------
diff --git a/blur-query/src/main/java/org/apache/blur/analysis/HdfsFieldManager.java b/blur-query/src/main/java/org/apache/blur/analysis/HdfsFieldManager.java
new file mode 100644
index 0000000..ed07209
--- /dev/null
+++ b/blur-query/src/main/java/org/apache/blur/analysis/HdfsFieldManager.java
@@ -0,0 +1,82 @@
+package org.apache.blur.analysis;
+
+/**
+ * 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.io.IOException;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+
+import org.apache.blur.log.Log;
+import org.apache.blur.log.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.lucene.analysis.Analyzer;
+
+public class HdfsFieldManager extends BaseFieldManager {
+
+  private static final Log LOG = LogFactory.getLog(HdfsFieldManager.class);
+
+  private final Configuration _configuration;
+  private final Path _storagePath;
+  private final FileSystem _fileSystem;
+
+  public HdfsFieldManager(String fieldLessField, Analyzer defaultAnalyzerForQuerying, Path storagePath,
+      Configuration configuration) throws IOException {
+    super(fieldLessField, defaultAnalyzerForQuerying);
+    _storagePath = storagePath;
+    _configuration = configuration;
+    _fileSystem = _storagePath.getFileSystem(_configuration);
+  }
+
+  @Override
+  protected boolean tryToStore(String fieldName, boolean fieldLessIndexing, String fieldType, Map<String, String> props) {
+    Properties properties = new Properties();
+    properties.put("fieldLessIndexing", fieldLessIndexing);
+    properties.put("fieldType", fieldType);
+    if (props != null) {
+      for (Entry<String, String> e : props.entrySet()) {
+        properties.put(e.getKey(), e.getValue());
+      }
+    }
+    Path path = new Path(_storagePath, fieldName);
+    try {
+      if (_fileSystem.exists(path)) {
+        return false;
+      }
+    } catch (IOException e) {
+      LOG.error("Could not check filesystem for existence of path [{0}]", e, path);
+      return false;
+    }
+    try {
+      FSDataOutputStream outputStream = _fileSystem.create(path, false);
+      properties.store(outputStream, getComments());
+      outputStream.close();
+    } catch (IOException e) {
+      LOG.error("Could not create field [" + fieldName + "]", e);
+      return false;
+    }
+    return true;
+  }
+
+  private String getComments() {
+    return null;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-query/src/test/java/org/apache/blur/analysis/BaseFiledManagerTest.java
----------------------------------------------------------------------
diff --git a/blur-query/src/test/java/org/apache/blur/analysis/BaseFiledManagerTest.java b/blur-query/src/test/java/org/apache/blur/analysis/BaseFiledManagerTest.java
index 95193aa..19a7586 100644
--- a/blur-query/src/test/java/org/apache/blur/analysis/BaseFiledManagerTest.java
+++ b/blur-query/src/test/java/org/apache/blur/analysis/BaseFiledManagerTest.java
@@ -29,12 +29,12 @@ import org.apache.blur.thrift.generated.Record;
 import org.apache.blur.utils.BlurConstants;
 import org.apache.lucene.analysis.core.KeywordAnalyzer;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.StringField;
 import org.junit.Test;
 
 public class BaseFiledManagerTest {
 
+  private static final String _fieldLessField = BlurConstants.SUPER;
+
   @Test
   public void testFiledManager() {
     BaseFieldManager memoryFieldManager = newBaseFieldManager();
@@ -46,7 +46,7 @@ public class BaseFiledManagerTest {
     record.addToColumns(new Column("col1", "value1"));
 
     List<Field> fields = getFields("fam1", "1", "1213", newTextField("fam1.col1", "value1"),
-        newTextFieldNoStore(BlurConstants.SUPER, "value1"));
+        newTextFieldNoStore(_fieldLessField, "value1"));
 
     int c = 0;
     for (Field field : memoryFieldManager.getFields("1", record)) {
@@ -88,7 +88,7 @@ public class BaseFiledManagerTest {
     record.addToColumns(new Column("col2", "value2"));
 
     List<Field> fields = getFields("fam1", "1", "1213", newTextField("fam1.col1", "value1"),
-        newTextField("fam1.col2", "value2"), newTextFieldNoStore(BlurConstants.SUPER, "value2"));
+        newTextField("fam1.col2", "value2"), newTextFieldNoStore(_fieldLessField, "value2"));
 
     int c = 0;
     for (Field field : memoryFieldManager.getFields("1", record)) {
@@ -148,9 +148,9 @@ public class BaseFiledManagerTest {
 
   private List<Field> getFields(String family, String rowId, String recordId, Field... fields) {
     List<Field> fieldLst = new ArrayList<Field>();
-    fieldLst.add(new StringField("family", family, Store.YES));
-    fieldLst.add(new StringField("rowid", rowId, Store.YES));
-    fieldLst.add(new StringField("recordid", recordId, Store.YES));
+    fieldLst.add(new Field("family", family, BaseFieldManager.ID_TYPE));
+    fieldLst.add(new Field("rowid", rowId, BaseFieldManager.ID_TYPE));
+    fieldLst.add(new Field("recordid", recordId, BaseFieldManager.ID_TYPE));
     for (Field field : fields) {
       fieldLst.add(field);
     }
@@ -166,16 +166,20 @@ public class BaseFiledManagerTest {
   }
 
   private void assertFieldEquals(Field expected, Field actual) {
-    assertEquals(expected.name(), actual.name());
-    assertEquals(expected.stringValue(), actual.stringValue());
-    assertEquals(expected.fieldType().toString(), actual.fieldType().toString());
+    assertEquals("Names did not match Expected [" + expected + "] Actual [" + actual + "]", expected.name(),
+        actual.name());
+    assertEquals("Values did not match Expected [" + expected + "] Actual [" + actual + "]", expected.stringValue(),
+        actual.stringValue());
+    assertEquals("FileTypes did not match Expected [" + expected + "] Actual [" + actual + "]", expected.fieldType()
+        .toString(), actual.fieldType().toString());
   }
 
   private BaseFieldManager newBaseFieldManager() {
-    return new BaseFieldManager(new KeywordAnalyzer()) {
+    return new BaseFieldManager(_fieldLessField, new KeywordAnalyzer()) {
       @Override
-      protected void tryToStore(String fieldName, boolean fieldLessIndexing, String fieldType, Map<String, String> props) {
-
+      protected boolean tryToStore(String fieldName, boolean fieldLessIndexing, String fieldType,
+          Map<String, String> props) {
+        return true;
       }
     };
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-query/src/test/java/org/apache/blur/lucene/search/SuperParserTest.java
----------------------------------------------------------------------
diff --git a/blur-query/src/test/java/org/apache/blur/lucene/search/SuperParserTest.java b/blur-query/src/test/java/org/apache/blur/lucene/search/SuperParserTest.java
index fab4851..89224f0 100644
--- a/blur-query/src/test/java/org/apache/blur/lucene/search/SuperParserTest.java
+++ b/blur-query/src/test/java/org/apache/blur/lucene/search/SuperParserTest.java
@@ -10,6 +10,7 @@ import java.util.Map;
 import org.apache.blur.analysis.BaseFieldManager;
 import org.apache.blur.analysis.NoStopWordStandardAnalyzer;
 import org.apache.blur.thrift.generated.ScoreType;
+import org.apache.blur.utils.BlurConstants;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
 import org.apache.lucene.index.Term;
@@ -32,27 +33,34 @@ public class SuperParserTest {
 
   @Before
   public void setup() {
-//    AnalyzerDefinition ad = new AnalyzerDefinition();
-//    ad.setDefaultDefinition(new ColumnDefinition(NoStopWordStandardAnalyzer.class.getName(), true, null));
-//    ColumnFamilyDefinition cfDef = new ColumnFamilyDefinition();
-//    cfDef.putToColumnDefinitions("id_l", new ColumnDefinition("long", false, null));
-//    cfDef.putToColumnDefinitions("id_d", new ColumnDefinition("double", false, null));
-//    cfDef.putToColumnDefinitions("id_f", new ColumnDefinition("float", false, null));
-//    cfDef.putToColumnDefinitions("id_i", new ColumnDefinition("integer", false, null));
-//    ad.putToColumnFamilyDefinitions("a", cfDef);
+    // AnalyzerDefinition ad = new AnalyzerDefinition();
+    // ad.setDefaultDefinition(new
+    // ColumnDefinition(NoStopWordStandardAnalyzer.class.getName(), true,
+    // null));
+    // ColumnFamilyDefinition cfDef = new ColumnFamilyDefinition();
+    // cfDef.putToColumnDefinitions("id_l", new ColumnDefinition("long", false,
+    // null));
+    // cfDef.putToColumnDefinitions("id_d", new ColumnDefinition("double",
+    // false, null));
+    // cfDef.putToColumnDefinitions("id_f", new ColumnDefinition("float", false,
+    // null));
+    // cfDef.putToColumnDefinitions("id_i", new ColumnDefinition("integer",
+    // false, null));
+    // ad.putToColumnFamilyDefinitions("a", cfDef);
 
     _fieldManager = getFieldManager(new NoStopWordStandardAnalyzer());
     parser = new SuperParser(LUCENE_VERSION, _fieldManager, true, null, ScoreType.SUPER, new Term("_primedoc_"));
   }
 
   private BaseFieldManager getFieldManager(Analyzer a) {
-    BaseFieldManager fieldManager = new BaseFieldManager(a) {
+    BaseFieldManager fieldManager = new BaseFieldManager(BlurConstants.SUPER, a) {
       @Override
-      protected void tryToStore(String fieldName, boolean fieldLessIndexing, String fieldType, Map<String, String> props) {
-        
+      protected boolean tryToStore(String fieldName, boolean fieldLessIndexing, String fieldType,
+          Map<String, String> props) {
+        return true;
       }
     };
-    
+
     fieldManager.addColumnDefinitionInt("a", "id_i");
     fieldManager.addColumnDefinitionDouble("a", "id_d");
     fieldManager.addColumnDefinitionFloat("a", "id_f");
@@ -150,8 +158,9 @@ public class SuperParserTest {
 
   @Test
   public void test6() throws ParseException {
-    //analyzer
-    SuperParser parser = new SuperParser(LUCENE_VERSION, _fieldManager, true, null, ScoreType.SUPER, new Term("_primedoc_"));
+    // analyzer
+    SuperParser parser = new SuperParser(LUCENE_VERSION, _fieldManager, true, null, ScoreType.SUPER, new Term(
+        "_primedoc_"));
     try {
       parser.parse("super : <a:a d:{e TO d} b:b super:<test:hello\\<>> super:<c:c d:d>");
       fail();
@@ -292,7 +301,7 @@ public class SuperParserTest {
         bc(sq(tq("super", "word3"))), bc(sq(tq("super", "word2"))));
     assertQuery(q1, q);
   }
-  
+
   @Test
   public void test27() throws ParseException {
     Query q = parseSq("rowid:1");

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-shell/src/main/java/org/apache/blur/shell/CreateTableCommand.java
----------------------------------------------------------------------
diff --git a/blur-shell/src/main/java/org/apache/blur/shell/CreateTableCommand.java b/blur-shell/src/main/java/org/apache/blur/shell/CreateTableCommand.java
index a133532..07228ad 100644
--- a/blur-shell/src/main/java/org/apache/blur/shell/CreateTableCommand.java
+++ b/blur-shell/src/main/java/org/apache/blur/shell/CreateTableCommand.java
@@ -21,7 +21,6 @@ package org.apache.blur.shell;
 import java.io.PrintWriter;
 
 import org.apache.blur.thirdparty.thrift_0_9_0.TException;
-import org.apache.blur.thrift.generated.AnalyzerDefinition;
 import org.apache.blur.thrift.generated.Blur;
 import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.TableDescriptor;
@@ -38,14 +37,10 @@ public class CreateTableCommand extends Command {
     String tableuri = args[2];
     int shardCount = Integer.parseInt(args[3]);
 
-    AnalyzerDefinition ad = new AnalyzerDefinition();
-
     TableDescriptor td = new TableDescriptor(); 
     td.setTableUri(tableuri);
     td.setCluster(Main.getCluster(client));
-    td.setAnalyzerDefinition(ad);
     td.setName(tablename);
-
     td.setShardCount(shardCount);
 
     if (Main.debug) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-shell/src/main/java/org/apache/blur/shell/DescribeTableCommand.java
----------------------------------------------------------------------
diff --git a/blur-shell/src/main/java/org/apache/blur/shell/DescribeTableCommand.java b/blur-shell/src/main/java/org/apache/blur/shell/DescribeTableCommand.java
index 22437ee..1501375 100644
--- a/blur-shell/src/main/java/org/apache/blur/shell/DescribeTableCommand.java
+++ b/blur-shell/src/main/java/org/apache/blur/shell/DescribeTableCommand.java
@@ -55,7 +55,7 @@ public class DescribeTableCommand extends Command {
     out.println("tableProperties       : " + describe.tableProperties);
 
     out.println(" - Analyzer Definition -");
-    print(0, out, describe.getAnalyzerDefinition());
+//    print(0, out, describe.getAnalyzerDefinition());
   }
 
   private void print(int indent, PrintWriter out, AnalyzerDefinition analyzerDefinition) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
index 6d9b0e4..9814d0c 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
@@ -56,7 +56,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
   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("TableDescriptor");
 
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField IS_ENABLED_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("isEnabled", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)1);
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField ANALYZER_DEFINITION_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("analyzerDefinition", 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 SHARD_COUNT_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("shardCount", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)3);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField TABLE_URI_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("tableUri", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)4);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COMPRESSION_CLASS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("compressionClass", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)5);
@@ -83,10 +82,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
   /**
    * 
    */
-  public AnalyzerDefinition analyzerDefinition; // required
-  /**
-   * 
-   */
   public int shardCount; // required
   /**
    * 
@@ -140,10 +135,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
     /**
      * 
      */
-    ANALYZER_DEFINITION((short)2, "analyzerDefinition"),
-    /**
-     * 
-     */
     SHARD_COUNT((short)3, "shardCount"),
     /**
      * 
@@ -203,8 +194,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       switch(fieldId) {
         case 1: // IS_ENABLED
           return IS_ENABLED;
-        case 2: // ANALYZER_DEFINITION
-          return ANALYZER_DEFINITION;
         case 3: // SHARD_COUNT
           return SHARD_COUNT;
         case 4: // TABLE_URI
@@ -280,8 +269,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
     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.IS_ENABLED, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("isEnabled", 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.BOOL)));
-    tmpMap.put(_Fields.ANALYZER_DEFINITION, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("analyzerDefinition", 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, AnalyzerDefinition.class)));
     tmpMap.put(_Fields.SHARD_COUNT, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("shardCount", 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.I32)));
     tmpMap.put(_Fields.TABLE_URI, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("tableUri", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
@@ -332,7 +319,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
 
   public TableDescriptor(
     boolean isEnabled,
-    AnalyzerDefinition analyzerDefinition,
     int shardCount,
     String tableUri,
     String compressionClass,
@@ -349,7 +335,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
     this();
     this.isEnabled = isEnabled;
     setIsEnabledIsSet(true);
-    this.analyzerDefinition = analyzerDefinition;
     this.shardCount = shardCount;
     setShardCountIsSet(true);
     this.tableUri = tableUri;
@@ -374,9 +359,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
   public TableDescriptor(TableDescriptor other) {
     __isset_bitfield = other.__isset_bitfield;
     this.isEnabled = other.isEnabled;
-    if (other.isSetAnalyzerDefinition()) {
-      this.analyzerDefinition = new AnalyzerDefinition(other.analyzerDefinition);
-    }
     this.shardCount = other.shardCount;
     if (other.isSetTableUri()) {
       this.tableUri = other.tableUri;
@@ -431,7 +413,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
   public void clear() {
     this.isEnabled = true;
 
-    this.analyzerDefinition = null;
     this.shardCount = 1;
 
     this.tableUri = null;
@@ -484,36 +465,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
   /**
    * 
    */
-  public AnalyzerDefinition getAnalyzerDefinition() {
-    return this.analyzerDefinition;
-  }
-
-  /**
-   * 
-   */
-  public TableDescriptor setAnalyzerDefinition(AnalyzerDefinition analyzerDefinition) {
-    this.analyzerDefinition = analyzerDefinition;
-    return this;
-  }
-
-  public void unsetAnalyzerDefinition() {
-    this.analyzerDefinition = null;
-  }
-
-  /** Returns true if field analyzerDefinition is set (has been assigned a value) and false otherwise */
-  public boolean isSetAnalyzerDefinition() {
-    return this.analyzerDefinition != null;
-  }
-
-  public void setAnalyzerDefinitionIsSet(boolean value) {
-    if (!value) {
-      this.analyzerDefinition = null;
-    }
-  }
-
-  /**
-   * 
-   */
   public int getShardCount() {
     return this.shardCount;
   }
@@ -899,14 +850,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       }
       break;
 
-    case ANALYZER_DEFINITION:
-      if (value == null) {
-        unsetAnalyzerDefinition();
-      } else {
-        setAnalyzerDefinition((AnalyzerDefinition)value);
-      }
-      break;
-
     case SHARD_COUNT:
       if (value == null) {
         unsetShardCount();
@@ -1011,9 +954,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
     case IS_ENABLED:
       return Boolean.valueOf(isIsEnabled());
 
-    case ANALYZER_DEFINITION:
-      return getAnalyzerDefinition();
-
     case SHARD_COUNT:
       return Integer.valueOf(getShardCount());
 
@@ -1063,8 +1003,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
     switch (field) {
     case IS_ENABLED:
       return isSetIsEnabled();
-    case ANALYZER_DEFINITION:
-      return isSetAnalyzerDefinition();
     case SHARD_COUNT:
       return isSetShardCount();
     case TABLE_URI:
@@ -1115,15 +1053,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         return false;
     }
 
-    boolean this_present_analyzerDefinition = true && this.isSetAnalyzerDefinition();
-    boolean that_present_analyzerDefinition = true && that.isSetAnalyzerDefinition();
-    if (this_present_analyzerDefinition || that_present_analyzerDefinition) {
-      if (!(this_present_analyzerDefinition && that_present_analyzerDefinition))
-        return false;
-      if (!this.analyzerDefinition.equals(that.analyzerDefinition))
-        return false;
-    }
-
     boolean this_present_shardCount = true;
     boolean that_present_shardCount = true;
     if (this_present_shardCount || that_present_shardCount) {
@@ -1258,16 +1187,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAnalyzerDefinition()).compareTo(typedOther.isSetAnalyzerDefinition());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetAnalyzerDefinition()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.analyzerDefinition, typedOther.analyzerDefinition);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetShardCount()).compareTo(typedOther.isSetShardCount());
     if (lastComparison != 0) {
       return lastComparison;
@@ -1412,14 +1331,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
     sb.append(this.isEnabled);
     first = false;
     if (!first) sb.append(", ");
-    sb.append("analyzerDefinition:");
-    if (this.analyzerDefinition == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.analyzerDefinition);
-    }
-    first = false;
-    if (!first) sb.append(", ");
     sb.append("shardCount:");
     sb.append(this.shardCount);
     first = false;
@@ -1506,9 +1417,6 @@ public class TableDescriptor 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 (analyzerDefinition != null) {
-      analyzerDefinition.validate();
-    }
     if (columnPreCache != null) {
       columnPreCache.validate();
     }
@@ -1558,15 +1466,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 2: // ANALYZER_DEFINITION
-            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT) {
-              struct.analyzerDefinition = new AnalyzerDefinition();
-              struct.analyzerDefinition.read(iprot);
-              struct.setAnalyzerDefinitionIsSet(true);
-            } else { 
-              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
           case 3: // SHARD_COUNT
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32) {
               struct.shardCount = iprot.readI32();
@@ -1704,11 +1603,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       oprot.writeFieldBegin(IS_ENABLED_FIELD_DESC);
       oprot.writeBool(struct.isEnabled);
       oprot.writeFieldEnd();
-      if (struct.analyzerDefinition != null) {
-        oprot.writeFieldBegin(ANALYZER_DEFINITION_FIELD_DESC);
-        struct.analyzerDefinition.write(oprot);
-        oprot.writeFieldEnd();
-      }
       oprot.writeFieldBegin(SHARD_COUNT_FIELD_DESC);
       oprot.writeI32(struct.shardCount);
       oprot.writeFieldEnd();
@@ -1797,52 +1691,46 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       if (struct.isSetIsEnabled()) {
         optionals.set(0);
       }
-      if (struct.isSetAnalyzerDefinition()) {
-        optionals.set(1);
-      }
       if (struct.isSetShardCount()) {
-        optionals.set(2);
+        optionals.set(1);
       }
       if (struct.isSetTableUri()) {
-        optionals.set(3);
+        optionals.set(2);
       }
       if (struct.isSetCompressionClass()) {
-        optionals.set(4);
+        optionals.set(3);
       }
       if (struct.isSetCompressionBlockSize()) {
-        optionals.set(5);
+        optionals.set(4);
       }
       if (struct.isSetCluster()) {
-        optionals.set(6);
+        optionals.set(5);
       }
       if (struct.isSetName()) {
-        optionals.set(7);
+        optionals.set(6);
       }
       if (struct.isSetSimilarityClass()) {
-        optionals.set(8);
+        optionals.set(7);
       }
       if (struct.isSetBlockCaching()) {
-        optionals.set(9);
+        optionals.set(8);
       }
       if (struct.isSetBlockCachingFileTypes()) {
-        optionals.set(10);
+        optionals.set(9);
       }
       if (struct.isSetReadOnly()) {
-        optionals.set(11);
+        optionals.set(10);
       }
       if (struct.isSetColumnPreCache()) {
-        optionals.set(12);
+        optionals.set(11);
       }
       if (struct.isSetTableProperties()) {
-        optionals.set(13);
+        optionals.set(12);
       }
-      oprot.writeBitSet(optionals, 14);
+      oprot.writeBitSet(optionals, 13);
       if (struct.isSetIsEnabled()) {
         oprot.writeBool(struct.isEnabled);
       }
-      if (struct.isSetAnalyzerDefinition()) {
-        struct.analyzerDefinition.write(oprot);
-      }
       if (struct.isSetShardCount()) {
         oprot.writeI32(struct.shardCount);
       }
@@ -1897,49 +1785,44 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
     @Override
     public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, TableDescriptor struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(14);
+      BitSet incoming = iprot.readBitSet(13);
       if (incoming.get(0)) {
         struct.isEnabled = iprot.readBool();
         struct.setIsEnabledIsSet(true);
       }
       if (incoming.get(1)) {
-        struct.analyzerDefinition = new AnalyzerDefinition();
-        struct.analyzerDefinition.read(iprot);
-        struct.setAnalyzerDefinitionIsSet(true);
-      }
-      if (incoming.get(2)) {
         struct.shardCount = iprot.readI32();
         struct.setShardCountIsSet(true);
       }
-      if (incoming.get(3)) {
+      if (incoming.get(2)) {
         struct.tableUri = iprot.readString();
         struct.setTableUriIsSet(true);
       }
-      if (incoming.get(4)) {
+      if (incoming.get(3)) {
         struct.compressionClass = iprot.readString();
         struct.setCompressionClassIsSet(true);
       }
-      if (incoming.get(5)) {
+      if (incoming.get(4)) {
         struct.compressionBlockSize = iprot.readI32();
         struct.setCompressionBlockSizeIsSet(true);
       }
-      if (incoming.get(6)) {
+      if (incoming.get(5)) {
         struct.cluster = iprot.readString();
         struct.setClusterIsSet(true);
       }
-      if (incoming.get(7)) {
+      if (incoming.get(6)) {
         struct.name = iprot.readString();
         struct.setNameIsSet(true);
       }
-      if (incoming.get(8)) {
+      if (incoming.get(7)) {
         struct.similarityClass = iprot.readString();
         struct.setSimilarityClassIsSet(true);
       }
-      if (incoming.get(9)) {
+      if (incoming.get(8)) {
         struct.blockCaching = iprot.readBool();
         struct.setBlockCachingIsSet(true);
       }
-      if (incoming.get(10)) {
+      if (incoming.get(9)) {
         {
           org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set169 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
           struct.blockCachingFileTypes = new HashSet<String>(2*_set169.size);
@@ -1952,16 +1835,16 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         }
         struct.setBlockCachingFileTypesIsSet(true);
       }
-      if (incoming.get(11)) {
+      if (incoming.get(10)) {
         struct.readOnly = iprot.readBool();
         struct.setReadOnlyIsSet(true);
       }
-      if (incoming.get(12)) {
+      if (incoming.get(11)) {
         struct.columnPreCache = new ColumnPreCache();
         struct.columnPreCache.read(iprot);
         struct.setColumnPreCacheIsSet(true);
       }
-      if (incoming.get(13)) {
+      if (incoming.get(12)) {
         {
           org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map172 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
           struct.tableProperties = new HashMap<String,String>(2*_map172.size);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-thrift/src/main/java/org/apache/blur/thrift/util/CreateInsertQueryRepeating.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/util/CreateInsertQueryRepeating.java b/blur-thrift/src/main/java/org/apache/blur/thrift/util/CreateInsertQueryRepeating.java
index ae89b6f..0741eef 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/util/CreateInsertQueryRepeating.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/util/CreateInsertQueryRepeating.java
@@ -16,6 +16,9 @@ package org.apache.blur.thrift.util;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import static org.apache.blur.thrift.util.BlurThriftHelper.newColumn;
+import static org.apache.blur.thrift.util.BlurThriftHelper.newRecordMutation;
+
 import java.io.IOException;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -25,7 +28,7 @@ import java.util.UUID;
 
 import org.apache.blur.thirdparty.thrift_0_9_0.TException;
 import org.apache.blur.thrift.BlurClient;
-import org.apache.blur.thrift.generated.AnalyzerDefinition;
+import org.apache.blur.thrift.generated.Blur.Iface;
 import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.BlurQuery;
 import org.apache.blur.thrift.generated.BlurResults;
@@ -33,10 +36,6 @@ import org.apache.blur.thrift.generated.RowMutation;
 import org.apache.blur.thrift.generated.RowMutationType;
 import org.apache.blur.thrift.generated.SimpleQuery;
 import org.apache.blur.thrift.generated.TableDescriptor;
-import org.apache.blur.thrift.generated.Blur.Iface;
-
-
-import static org.apache.blur.thrift.util.BlurThriftHelper.*;
 
 /**
  * Tests a lot of things, mainly connecting to a blur cluster and slamming a
@@ -107,7 +106,6 @@ public class CreateInsertQueryRepeating {
 
   public void createTable(Iface client, String tableName, String cluster) throws BlurException, TException {
     TableDescriptor td = new TableDescriptor();
-    td.analyzerDefinition = new AnalyzerDefinition();
 
     td.name = tableName;
     // TODO: doc doesnt say required, yet it barfs without it?

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-thrift/src/main/java/org/apache/blur/thrift/util/CreateTable.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/util/CreateTable.java b/blur-thrift/src/main/java/org/apache/blur/thrift/util/CreateTable.java
index 1e76063..76a3986 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/util/CreateTable.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/util/CreateTable.java
@@ -20,10 +20,9 @@ import java.io.IOException;
 
 import org.apache.blur.thirdparty.thrift_0_9_0.TException;
 import org.apache.blur.thrift.BlurClient;
-import org.apache.blur.thrift.generated.AnalyzerDefinition;
+import org.apache.blur.thrift.generated.Blur.Iface;
 import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.TableDescriptor;
-import org.apache.blur.thrift.generated.Blur.Iface;
 
 
 public class CreateTable {
@@ -36,7 +35,6 @@ public class CreateTable {
     String uri = args[4];
 
     final TableDescriptor tableDescriptor = new TableDescriptor();
-    tableDescriptor.analyzerDefinition = new AnalyzerDefinition();
     tableDescriptor.cluster = cluster;
     tableDescriptor.name = tableName;
     tableDescriptor.readOnly = false;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/blur-thrift/src/main/java/org/apache/blur/thrift/util/RapidlyCreateAndDeleteTables.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/util/RapidlyCreateAndDeleteTables.java b/blur-thrift/src/main/java/org/apache/blur/thrift/util/RapidlyCreateAndDeleteTables.java
index 01de46d..8cc3373 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/util/RapidlyCreateAndDeleteTables.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/util/RapidlyCreateAndDeleteTables.java
@@ -24,7 +24,6 @@ import java.util.UUID;
 
 import org.apache.blur.thirdparty.thrift_0_9_0.TException;
 import org.apache.blur.thrift.BlurClient;
-import org.apache.blur.thrift.generated.AnalyzerDefinition;
 import org.apache.blur.thrift.generated.Blur.Iface;
 import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.RowMutation;
@@ -74,7 +73,6 @@ public class RapidlyCreateAndDeleteTables {
   private static boolean createTable(Iface client, final String cluster, String uri, int shardCount, String tableName) throws BlurException, TException {
     Random random = new Random();
     final TableDescriptor tableDescriptor = new TableDescriptor();
-    tableDescriptor.analyzerDefinition = new AnalyzerDefinition();
     tableDescriptor.cluster = cluster;
 
     tableDescriptor.name = tableName;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/distribution/src/main/scripts/interface/Blur.thrift
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/Blur.thrift b/distribution/src/main/scripts/interface/Blur.thrift
index 0fced24..e0eec71 100644
--- a/distribution/src/main/scripts/interface/Blur.thrift
+++ b/distribution/src/main/scripts/interface/Blur.thrift
@@ -655,10 +655,6 @@ struct TableDescriptor {
   /**
    *
    */
-  2:AnalyzerDefinition analyzerDefinition,
-  /**
-   *
-   */
   3:i32 shardCount = 1,
   /**
    *

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/193c0e6b/distribution/src/main/scripts/interface/gen-html/Blur.html
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-html/Blur.html b/distribution/src/main/scripts/interface/gen-html/Blur.html
index e9cf79e..55e96f8 100644
--- a/distribution/src/main/scripts/interface/gen-html/Blur.html
+++ b/distribution/src/main/scripts/interface/gen-html/Blur.html
@@ -434,8 +434,6 @@ shards that are complete, etc.
 <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead>
 <tr><td>1</td><td>isEnabled</td><td><code>bool</code></td><td>
 </td><td>default</td><td>1</td></tr>
-<tr><td>2</td><td>analyzerDefinition</td><td><code><a href="Blur.html#Struct_AnalyzerDefinition">AnalyzerDefinition</a></code></td><td>
-</td><td>default</td><td></td></tr>
 <tr><td>3</td><td>shardCount</td><td><code>i32</code></td><td>
 </td><td>default</td><td>1</td></tr>
 <tr><td>4</td><td>tableUri</td><td><code>string</code></td><td>


Mime
View raw message