Merge branch 'master' into 0.2.0-newtypesystem
Conflicts:
blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
blur-query/src/main/java/org/apache/blur/analysis/BlurAnalyzer.java
blur-query/src/main/java/org/apache/blur/lucene/search/SuperParser.java
blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
distribution/src/main/scripts/interface/Blur.thrift
distribution/src/main/scripts/interface/gen-html/Blur.html
distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm
distribution/src/main/scripts/interface/gen-rb/blur_types.rb
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/fb0ece57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/fb0ece57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/fb0ece57
Branch: refs/heads/master
Commit: fb0ece57bb156fa338d21e8c76067e1a8bd1ed26
Parents: ae516a4 d017026
Author: Aaron McCurry <[email protected]>
Authored: Mon Jul 29 08:55:55 2013 -0400
Committer: Aaron McCurry <[email protected]>
Committed: Mon Jul 29 08:55:55 2013 -0400
----------------------------------------------------------------------
blur-core/pom.xml | 12 +-
.../org/apache/blur/manager/IndexManager.java | 39 +-
.../clusterstatus/ZookeeperClusterStatus.java | 72 ++-
.../clusterstatus/ZookeeperPathConstants.java | 8 -
.../indexserver/AbstractIndexServer.java | 31 +-
.../results/BlurResultIterableSearcher.java | 12 +-
.../apache/blur/manager/writer/BlurIndex.java | 30 ++
.../blur/manager/writer/BlurIndexReader.java | 1 -
.../blur/server/ControllerServerContext.java | 71 +++
.../server/ControllerServerEventHandler.java | 92 ++++
.../apache/blur/server/ShardServerContext.java | 21 +
.../blur/server/ShardServerEventHandler.java | 18 +-
.../blur/thrift/BlurControllerServer.java | 2 +
.../org/apache/blur/thrift/BlurShardServer.java | 2 +
.../java/org/apache/blur/thrift/TableAdmin.java | 28 +-
.../blur/thrift/ThriftBlurControllerServer.java | 8 +-
.../blur/thrift/ThriftBlurShardServer.java | 8 +-
.../java/org/apache/blur/utils/BlurUtil.java | 154 +++++-
.../org/apache/blur/utils/CreateGarbage.java | 37 ++
.../java/org/apache/blur/utils/GCWatcher.java | 2 +-
.../ResetableDocumentStoredFieldVisitor.java | 72 ++-
.../apache/blur/manager/IndexManagerTest.java | 6 +-
.../org/apache/blur/thrift/BlurClusterTest.java | 31 +-
.../org/apache/blur/utils/BlurUtilsTest.java | 4 +-
blur-core/src/test/resources/log4j.xml | 11 +
blur-mapred/pom.xml | 36 +-
.../org/apache/blur/mapreduce/BlurReducer.java | 2 +-
.../org/apache/blur/analysis/BlurAnalyzer.java | 530 +++++++++++++++++++
.../blur/lucene/search/IterablePaging.java | 3 +
.../apache/blur/lucene/search/SuperParser.java | 280 +++++-----
.../apache/blur/lucene/search/SuperQuery.java | 4 +-
.../blur/lucene/search/SuperParserTest.java | 43 +-
.../main/java/org/apache/blur/shell/Main.java | 28 +-
.../java/org/apache/blur/shell/TopCommand.java | 25 +-
.../org/apache/blur/shell/top.properties | 16 -
.../apache/blur/lucene/warmup/IndexWarmup.java | 6 +-
.../apache/blur/store/hdfs/HdfsDirectory.java | 55 +-
.../server/TServerEventHandler.java | 3 +-
.../thrift_0_9_0/server/TSimpleServer.java | 2 +-
.../thrift_0_9_0/server/TThreadPoolServer.java | 2 +-
.../blur/thrift/BadConnectionException.java | 40 ++
.../apache/blur/thrift/BlurClientManager.java | 2 +-
.../apache/blur/thrift/generated/Selector.java | 20 +-
.../blur/thrift/generated/TableDescriptor.java | 325 ++----------
.../server/AbstractNonblockingServer.java | 2 +-
.../org/apache/blur/thrift/util/LoadData.java | 9 +-
.../util/ResetableTByteArrayOutputStream.java | 50 ++
.../thrift/util/ResetableTMemoryBuffer.java | 109 ++++
.../thrift/util/SimpleAsyncQueryExample.java | 73 +++
.../org/apache/blur/utils/BlurConstants.java | 3 +
.../apache/blur/zookeeper/ZooKeeperClient.java | 11 +
.../src/main/resources/blur-default.properties | 5 +-
.../src/main/scripts/conf/default_zoo.cfg | 2 +
distribution/src/main/scripts/conf/log4j.xml | 43 +-
.../src/main/scripts/interface/Blur.thrift | 30 +-
.../main/scripts/interface/gen-html/Blur.html | 26 +-
.../apache/blur/thrift/generated/Selector.java | 20 +-
.../blur/thrift/generated/TableDescriptor.java | 325 ++----------
.../main/scripts/interface/gen-js/Blur_types.js | 34 +-
.../scripts/interface/gen-perl/Blur/Types.pm | 34 +-
.../main/scripts/interface/gen-rb/blur_types.rb | 28 +-
pom.xml | 2 +-
62 files changed, 1936 insertions(+), 1064 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/fb0ece57/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
----------------------------------------------------------------------
diff --cc blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
index 5996cc8,3ad2502..b56d2bb
--- a/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
+++ b/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
@@@ -223,13 -227,11 +227,13 @@@ public class IndexManager
searcher = index.getIndexReader();
usedCache = false;
}
- BlurAnalyzer analyzer = _indexServer.getAnalyzer(table);
+
+ TableContext tableContext = getTableContext(table);
+ FieldManager fieldManager = tableContext.getFieldManager();
+
+ Query highlightQuery = getHighlightQuery(selector, table, fieldManager);
- fetchRow(searcher.getIndexReader(), table, selector, fetchResult,
highlightQuery, fieldManager);
- Query highlightQuery = getHighlightQuery(selector, table, analyzer);
-
- fetchRow(searcher.getIndexReader(), table, shard, selector,
fetchResult, highlightQuery, analyzer, _maxHeapPerRowFetch);
++ fetchRow(searcher.getIndexReader(), table, shard, selector,
fetchResult, highlightQuery, fieldManager, _maxHeapPerRowFetch);
if (fetchResult.rowResult != null) {
if (fetchResult.rowResult.row != null &&
fetchResult.rowResult.row.records != null) {
_recordsMeter.mark(fetchResult.rowResult.row.records.size());
@@@ -374,21 -376,21 +378,21 @@@
throw new BException(e.getMessage(), e);
}
ShardServerContext shardServerContext =
ShardServerContext.getShardServerContext();
- BlurAnalyzer analyzer = _indexServer.getAnalyzer(table);
ParallelCall<Entry<String, BlurIndex>, BlurResultIterable> call;
TableContext context = getTableContext(table);
+ FieldManager fieldManager = context.getFieldManager();
if (isSimpleQuery(blurQuery)) {
SimpleQuery simpleQuery = blurQuery.simpleQuery;
- Filter preFilter = QueryParserUtil.parseFilter(table,
simpleQuery.preSuperFilter, false, analyzer,
+ Filter preFilter = QueryParserUtil.parseFilter(table,
simpleQuery.preSuperFilter, false, fieldManager,
_filterCache, context);
- Filter postFilter = QueryParserUtil.parseFilter(table,
simpleQuery.postSuperFilter, true, analyzer,
+ Filter postFilter = QueryParserUtil.parseFilter(table,
simpleQuery.postSuperFilter, true, fieldManager,
_filterCache, context);
- Query userQuery = QueryParserUtil.parseQuery(simpleQuery.queryStr,
simpleQuery.superQueryOn, analyzer,
+ Query userQuery = QueryParserUtil.parseQuery(simpleQuery.queryStr,
simpleQuery.superQueryOn, fieldManager,
postFilter, preFilter, getScoreType(simpleQuery.type), context);
- Query facetedQuery = getFacetedQuery(blurQuery, userQuery,
facetedCounts, analyzer, context, postFilter,
+ Query facetedQuery = getFacetedQuery(blurQuery, userQuery,
facetedCounts, fieldManager, context, postFilter,
preFilter);
call = new SimpleQueryParallelCall(running, table, status,
_indexServer, facetedQuery, blurQuery.selector,
- _queriesInternalMeter, shardServerContext, runSlow);
+ _queriesInternalMeter, shardServerContext, runSlow, _fetchCount,
_maxHeapPerRowFetch);
} else {
Query query = getQuery(blurQuery.expertQuery);
Filter filter = getFilter(blurQuery.expertQuery);
@@@ -398,9 -400,9 +402,9 @@@
} else {
userQuery = query;
}
- Query facetedQuery = getFacetedQuery(blurQuery, userQuery,
facetedCounts, analyzer, context, null, null);
+ Query facetedQuery = getFacetedQuery(blurQuery, userQuery,
facetedCounts, fieldManager, context, null, null);
call = new SimpleQueryParallelCall(running, table, status,
_indexServer, facetedQuery, blurQuery.selector,
- _queriesInternalMeter, shardServerContext, runSlow);
+ _queriesInternalMeter, shardServerContext, runSlow, _fetchCount,
_maxHeapPerRowFetch);
}
MergerBlurResultIterable merger = new
MergerBlurResultIterable(blurQuery);
return ForkJoin.execute(_executor, blurIndexes.entrySet(), call, new
Cancel() {
@@@ -505,13 -507,13 +509,13 @@@
return _statusManager.queryStatusIdList(table);
}
- public static void fetchRow(IndexReader reader, String table, Selector
selector, FetchResult fetchResult,
- Query highlightQuery) throws CorruptIndexException, IOException {
- fetchRow(reader, table, selector, fetchResult, highlightQuery, null);
+ public static void fetchRow(IndexReader reader, String table, String shard,
Selector selector, FetchResult fetchResult,
+ Query highlightQuery, int maxHeap) throws CorruptIndexException,
IOException {
+ fetchRow(reader, table, shard, selector, fetchResult, highlightQuery,
null, maxHeap);
}
- public static void fetchRow(IndexReader reader, String table, Selector
selector, FetchResult fetchResult,
- Query highlightQuery, FieldManager fieldManager) throws
CorruptIndexException, IOException {
+ public static void fetchRow(IndexReader reader, String table, String shard,
Selector selector, FetchResult fetchResult,
- Query highlightQuery, BlurAnalyzer analyzer, int maxHeap) throws
CorruptIndexException, IOException {
++ Query highlightQuery, FieldManager fieldManager, int maxHeap) throws
CorruptIndexException, IOException {
fetchResult.table = table;
String locationId = selector.locationId;
int lastSlash = locationId.lastIndexOf('/');
@@@ -574,10 -576,10 +578,10 @@@
HighlightOptions highlightOptions =
selector.getHighlightOptions();
String preTag = highlightOptions.getPreTag();
String postTag = highlightOptions.getPostTag();
- docs = HighlightHelper.highlightDocuments(reader, term,
fieldVisitor, selector, highlightQuery, analyzer,
+ docs = HighlightHelper.highlightDocuments(reader, term,
fieldVisitor, selector, highlightQuery, fieldManager,
preTag, postTag);
} else {
- docs = BlurUtil.fetchDocuments(reader, term, fieldVisitor,
selector);
+ docs = BlurUtil.fetchDocuments(reader, term, fieldVisitor,
selector, maxHeap, table + "/" + shard);
}
fetchResult.rowResult = new FetchRowResult(getRow(docs));
}
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/fb0ece57/blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
----------------------------------------------------------------------
diff --cc
blur-core/src/main/java/org/apache/blur/manager/clusterstatus/ZookeeperClusterStatus.java
index 200ed91,5870787..6df4d81
---
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
@@@ -404,10 -408,8 +406,6 @@@ public class ZookeeperClusterStatus ext
tableDescriptor.shardCount = Integer.parseInt(new
String(getData(ZookeeperPathConstants
.getTableShardCountPath(cluster, table))));
tableDescriptor.tableUri = new
String(getData(ZookeeperPathConstants.getTableUriPath(cluster, table)));
- tableDescriptor.compressionClass = new
String(getData(ZookeeperPathConstants.getTableCompressionCodecPath(
- 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;
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/fb0ece57/blur-core/src/main/java/org/apache/blur/manager/writer/BlurIndexReader.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/fb0ece57/blur-core/src/test/java/org/apache/blur/manager/IndexManagerTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/fb0ece57/blur-query/src/main/java/org/apache/blur/lucene/search/SuperParser.java
----------------------------------------------------------------------
diff --cc
blur-query/src/main/java/org/apache/blur/lucene/search/SuperParser.java
index 2c5c742,93c7738..5aa034a
--- a/blur-query/src/main/java/org/apache/blur/lucene/search/SuperParser.java
+++ b/blur-query/src/main/java/org/apache/blur/lucene/search/SuperParser.java
@@@ -1,27 -1,11 +1,11 @@@
package org.apache.blur.lucene.search;
- /**
- * 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.List;
- import java.util.regex.Matcher;
- import java.util.regex.Pattern;
+ import java.util.HashMap;
+ import java.util.Map;
-import org.apache.blur.analysis.BlurAnalyzer;
+import org.apache.blur.analysis.FieldManager;
+ import org.apache.blur.log.Log;
+ import org.apache.blur.log.LogFactory;
import org.apache.blur.thrift.generated.ScoreType;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryparser.classic.ParseException;
@@@ -46,10 -37,13 +37,13 @@@ public class SuperParser extends BlurQu
private final ScoreType _scoreType;
private final Version _matchVersion;
private final Term _defaultPrimeDocTerm;
+ private final String _prefixToSub = "______SUPERBASEFIELD_";
+ private int _lastStart = 0;
+ private int _lastEnd = 0;
- public SuperParser(Version matchVersion, BlurAnalyzer a, boolean
superSearch, Filter queryFilter,
+ public SuperParser(Version matchVersion, FieldManager fieldManager, boolean
superSearch, Filter queryFilter,
ScoreType scoreType, Term defaultPrimeDocTerm) {
- super(matchVersion, SUPER, a, null);
+ super(matchVersion, SUPER, null, fieldManager);
_matchVersion = matchVersion;
_superSearch = superSearch;
_queryFilter = queryFilter;
@@@ -155,28 -169,53 +169,53 @@@
}
private QueryParser getNewParser() {
- return new BlurQueryParser(_matchVersion, _defaultField, _blurAnalyzer,
_fieldNames);
+ return new BlurQueryParser(_matchVersion, SUPER,
_fieldNames,_fieldManager);
}
- private Occur getOccur(String occurString) {
- if (occurString.equals(MUST_STRING)) {
- return Occur.MUST;
+ private Query reprocess(Query query) {
+ if (query == null || !_superSearch) {
+ return wrapFilter(query);
}
- if (occurString.equals(MUST_NOT_STRING)) {
- return Occur.MUST_NOT;
+ if (query instanceof BooleanQuery) {
+ BooleanQuery booleanQuery = (BooleanQuery) query;
+ if (containsSuperQueries(booleanQuery)) {
+ for (BooleanClause bc : booleanQuery) {
+ bc.setQuery(reprocess(bc.getQuery()));
+ }
+ } else {
+ for (BooleanClause bc : booleanQuery) {
+ bc.setQuery(newSuperQuery(bc.getQuery()));
+ }
+ }
+ return booleanQuery;
+ } else if (query instanceof SuperQuery) {
+ return query;
+ } else {
+ return newSuperQuery(query);
}
- return Occur.SHOULD;
}
- private SuperQuery newSuperQuery(Query query) {
- return new SuperQuery(wrapFilter(query), _scoreType,
_defaultPrimeDocTerm);
+ private boolean containsSuperQueries(Query query) {
+ if (query instanceof BooleanQuery) {
+ BooleanQuery booleanQuery = (BooleanQuery) query;
+ for (BooleanClause bc : booleanQuery) {
+ if (containsSuperQueries(bc.getQuery())) {
+ return true;
+ }
+ }
+ return false;
+ } else if (query instanceof SuperQuery) {
+ return true;
+ } else {
+ return false;
+ }
}
- private Query wrapFilter(Query query) {
- if (_queryFilter == null) {
- return query;
+ private boolean isSameGroupName(Query query) {
+ if (query instanceof BooleanQuery) {
+ return isSameGroupName((BooleanQuery) query);
}
- return new FilteredQuery(query, _queryFilter);
+ return true;
}
private boolean isSameGroupName(BooleanQuery booleanQuery) {
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/fb0ece57/blur-query/src/test/java/org/apache/blur/lucene/search/SuperParserTest.java
----------------------------------------------------------------------
diff --cc
blur-query/src/test/java/org/apache/blur/lucene/search/SuperParserTest.java
index d183231,c1814dc..f2c8b94
---
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
@@@ -136,10 -104,10 +133,10 @@@ public class SuperParserTest
}
@Test
- public void test5() throws ParseException {
- parser = new SuperParser(LUCENE_VERSION, new BlurAnalyzer(new
WhitespaceAnalyzer(LUCENE_VERSION)), true, null,
+ public void test5() throws ParseException, IOException {
+ parser = new SuperParser(LUCENE_VERSION, getFieldManager(new
WhitespaceAnalyzer(LUCENE_VERSION)), true, null,
ScoreType.SUPER, new Term("_primedoc_"));
- Query query = parser.parse("super:<a.a:a a.d:{e TO f} a.b:b
a.test:hello\\<> - super:<g.c:c g.d:d>");
+ Query query = parser.parse("<a.a:a a.d:{e TO f} a.b:b a.test:hello\\<>
-<g.c:c g.d:d>");
BooleanQuery booleanQuery1 = new BooleanQuery();
booleanQuery1.add(new TermQuery(new Term("a.a", "a")), Occur.SHOULD);
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/fb0ece57/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
----------------------------------------------------------------------
diff --cc
blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
index 9814d0c,a106358..161122e
---
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,10 -56,9 +56,8 @@@ public class TableDescriptor implement
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);
- private static final
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField
COMPRESSION_BLOCK_SIZE_FIELD_DESC = new
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("compressionBlockSize",
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)6);
private static final
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField CLUSTER_FIELD_DESC =
new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("cluster",
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)7);
private static final
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField NAME_FIELD_DESC = new
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("name",
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)8);
private static final
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField
SIMILARITY_CLASS_FIELD_DESC = new
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("similarityClass",
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)9);
@@@ -80,7 -79,11 +78,7 @@@
*/
public boolean isEnabled; // required
/**
- *
- * Defines the field and their types (as well as the Analyzers to use).
- */
- public AnalyzerDefinition analyzerDefinition; // required
- /**
+ * The number of shards within the given table.
*/
public int shardCount; // required
/**
@@@ -133,7 -128,11 +123,7 @@@
*/
IS_ENABLED((short)1, "isEnabled"),
/**
- *
- * Defines the field and their types (as well as the Analyzers to use).
- */
- ANALYZER_DEFINITION((short)2, "analyzerDefinition"),
- /**
+ * The number of shards within the given table.
*/
SHARD_COUNT((short)3, "shardCount"),
/**
@@@ -319,10 -301,9 +288,8 @@@
public TableDescriptor(
boolean isEnabled,
- AnalyzerDefinition analyzerDefinition,
int shardCount,
String tableUri,
- String compressionClass,
- int compressionBlockSize,
String cluster,
String name,
String similarityClass,
@@@ -463,7 -438,37 +419,7 @@@
}
/**
- *
- * Defines the field and their types (as well as the Analyzers to use).
- */
- public AnalyzerDefinition getAnalyzerDefinition() {
- return this.analyzerDefinition;
- }
-
- /**
- * Defines the field and their types (as well as the Analyzers to use).
- */
- 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;
- }
- }
-
- /**
+ * The number of shards within the given table.
*/
public int getShardCount() {
return this.shardCount;
@@@ -1691,43 -1594,40 +1488,37 @@@
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(3);
- }
- if (struct.isSetCompressionBlockSize()) {
- optionals.set(4);
- }
if (struct.isSetCluster()) {
- optionals.set(5);
- optionals.set(4);
++ optionals.set(3);
}
if (struct.isSetName()) {
- optionals.set(6);
- optionals.set(5);
++ optionals.set(4);
}
if (struct.isSetSimilarityClass()) {
- optionals.set(7);
- optionals.set(6);
++ optionals.set(5);
}
if (struct.isSetBlockCaching()) {
- optionals.set(8);
- optionals.set(7);
++ optionals.set(6);
}
if (struct.isSetBlockCachingFileTypes()) {
- optionals.set(9);
- optionals.set(8);
++ optionals.set(7);
}
if (struct.isSetReadOnly()) {
- optionals.set(10);
- optionals.set(9);
++ optionals.set(8);
}
if (struct.isSetColumnPreCache()) {
- optionals.set(11);
- optionals.set(10);
++ optionals.set(9);
}
if (struct.isSetTableProperties()) {
- optionals.set(12);
- optionals.set(11);
++ optionals.set(10);
}
- oprot.writeBitSet(optionals, 13);
- oprot.writeBitSet(optionals, 12);
++ oprot.writeBitSet(optionals, 11);
if (struct.isSetIsEnabled()) {
oprot.writeBool(struct.isEnabled);
}
@@@ -1785,7 -1682,7 +1570,7 @@@
@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(13);
- BitSet incoming = iprot.readBitSet(12);
++ BitSet incoming = iprot.readBitSet(11);
if (incoming.get(0)) {
struct.isEnabled = iprot.readBool();
struct.setIsEnabledIsSet(true);
@@@ -1798,31 -1700,23 +1583,23 @@@
struct.tableUri = iprot.readString();
struct.setTableUriIsSet(true);
}
- if (incoming.get(4)) {
+ if (incoming.get(3)) {
struct.cluster = iprot.readString();
struct.setClusterIsSet(true);
}
- if (incoming.get(6)) {
- if (incoming.get(5)) {
++ if (incoming.get(4)) {
struct.name = iprot.readString();
struct.setNameIsSet(true);
}
- if (incoming.get(7)) {
- if (incoming.get(6)) {
++ if (incoming.get(5)) {
struct.similarityClass = iprot.readString();
struct.setSimilarityClassIsSet(true);
}
- if (incoming.get(8)) {
- if (incoming.get(7)) {
++ if (incoming.get(6)) {
struct.blockCaching = iprot.readBool();
struct.setBlockCachingIsSet(true);
}
- if (incoming.get(9)) {
- if (incoming.get(8)) {
++ if (incoming.get(7)) {
{
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);
@@@ -1835,16 -1729,16 +1612,16 @@@
}
struct.setBlockCachingFileTypesIsSet(true);
}
- if (incoming.get(10)) {
- if (incoming.get(9)) {
++ if (incoming.get(8)) {
struct.readOnly = iprot.readBool();
struct.setReadOnlyIsSet(true);
}
- if (incoming.get(11)) {
- if (incoming.get(10)) {
++ if (incoming.get(9)) {
struct.columnPreCache = new ColumnPreCache();
struct.columnPreCache.read(iprot);
struct.setColumnPreCacheIsSet(true);
}
- if (incoming.get(12)) {
- if (incoming.get(11)) {
++ if (incoming.get(10)) {
{
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/fb0ece57/distribution/src/main/scripts/interface/Blur.thrift
----------------------------------------------------------------------
diff --cc distribution/src/main/scripts/interface/Blur.thrift
index e0eec71,8c4d2c2..bf166dd
--- a/distribution/src/main/scripts/interface/Blur.thrift
+++ b/distribution/src/main/scripts/interface/Blur.thrift
@@@ -653,7 -653,11 +653,7 @@@ struct TableDescriptor
*/
1:bool isEnabled = 1,
/**
- *
- * Defines the field and their types (as well as the Analyzers to use).
- */
- 2:AnalyzerDefinition analyzerDefinition,
- /**
+ * The number of shards within the given table.
*/
3:i32 shardCount = 1,
/**
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/fb0ece57/distribution/src/main/scripts/interface/gen-html/Blur.html
----------------------------------------------------------------------
diff --cc distribution/src/main/scripts/interface/gen-html/Blur.html
index 55e96f8,a1b31d8..22340e3
--- a/distribution/src/main/scripts/interface/gen-html/Blur.html
+++ b/distribution/src/main/scripts/interface/gen-html/Blur.html
@@@ -432,25 -432,23 +432,21 @@@ shards that are complete, etc
</table><br/><p/>
<br/></div><div class="definition"><h3 id="Struct_TableDescriptor">Struct:
TableDescriptor</h3>
<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>
+ <tr><td>1</td><td>isEnabled</td><td><code>bool</code></td><td>Is the table
enabled or not, enabled by default.
</td><td>default</td><td>1</td></tr>
- <tr><td>3</td><td>shardCount</td><td><code>i32</code></td><td>
-<tr><td>2</td><td>analyzerDefinition</td><td><code><a
href="Blur.html#Struct_AnalyzerDefinition">AnalyzerDefinition</a></code></td><td>Defines
the field and their types (as well as the Analyzers to use).
-</td><td>default</td><td></td></tr>
+ <tr><td>3</td><td>shardCount</td><td><code>i32</code></td><td>The number of
shards within the given table.
</td><td>default</td><td>1</td></tr>
- <tr><td>4</td><td>tableUri</td><td><code>string</code></td><td>
+ <tr><td>4</td><td>tableUri</td><td><code>string</code></td><td>The location
where the table should be stored this can be "file:///" for a local instance of
Blur or "hdfs://" for a distributed installation of Blur.
</td><td>default</td><td></td></tr>
- <tr><td>5</td><td>compressionClass</td><td><code>string</code></td><td>
-
</td><td>default</td><td>"org.apache.hadoop.io.compress.DefaultCodec"</td></tr>
- <tr><td>6</td><td>compressionBlockSize</td><td><code>i32</code></td><td>
- </td><td>default</td><td>32768</td></tr>
- <tr><td>7</td><td>cluster</td><td><code>string</code></td><td>
+ <tr><td>7</td><td>cluster</td><td><code>string</code></td><td>The cluster
where this table should be created.
</td><td>default</td><td>"default"</td></tr>
- <tr><td>8</td><td>name</td><td><code>string</code></td><td>
+ <tr><td>8</td><td>name</td><td><code>string</code></td><td>The table name.
</td><td>default</td><td></td></tr>
- <tr><td>9</td><td>similarityClass</td><td><code>string</code></td><td>
+ <tr><td>9</td><td>similarityClass</td><td><code>string</code></td><td>Sets
the similarity class in Lucene.
</td><td>default</td><td></td></tr>
- <tr><td>10</td><td>blockCaching</td><td><code>bool</code></td><td>
+ <tr><td>10</td><td>blockCaching</td><td><code>bool</code></td><td>Should
block cache be enable or disabled for this table.
</td><td>default</td><td>1</td></tr>
-
<tr><td>11</td><td>blockCachingFileTypes</td><td><code>set<<code>string</code>></code></td><td>
+
<tr><td>11</td><td>blockCachingFileTypes</td><td><code>set<<code>string</code>></code></td><td>The
files extensions that you would like to allow block cache to to cache. If
null (default) everything is cached.
</td><td>default</td><td></td></tr>
<tr><td>12</td><td>readOnly</td><td><code>bool</code></td><td>If a table is
set to be readonly, that means that mutates through Thrift are NOT allowed.
However
updates through MapReduce are allowed and in fact they are only allowed if
the table is in readOnly mode.
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/fb0ece57/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
----------------------------------------------------------------------
diff --cc
distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
index 9814d0c,a106358..161122e
---
a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
+++
b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
@@@ -56,10 -56,9 +56,8 @@@ public class TableDescriptor implement
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);
- private static final
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField
COMPRESSION_BLOCK_SIZE_FIELD_DESC = new
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("compressionBlockSize",
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)6);
private static final
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField CLUSTER_FIELD_DESC =
new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("cluster",
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)7);
private static final
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField NAME_FIELD_DESC = new
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("name",
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)8);
private static final
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField
SIMILARITY_CLASS_FIELD_DESC = new
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("similarityClass",
org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)9);
@@@ -80,7 -79,11 +78,7 @@@
*/
public boolean isEnabled; // required
/**
- *
- * Defines the field and their types (as well as the Analyzers to use).
- */
- public AnalyzerDefinition analyzerDefinition; // required
- /**
+ * The number of shards within the given table.
*/
public int shardCount; // required
/**
@@@ -133,7 -128,11 +123,7 @@@
*/
IS_ENABLED((short)1, "isEnabled"),
/**
- *
- * Defines the field and their types (as well as the Analyzers to use).
- */
- ANALYZER_DEFINITION((short)2, "analyzerDefinition"),
- /**
+ * The number of shards within the given table.
*/
SHARD_COUNT((short)3, "shardCount"),
/**
@@@ -319,10 -301,9 +288,8 @@@
public TableDescriptor(
boolean isEnabled,
- AnalyzerDefinition analyzerDefinition,
int shardCount,
String tableUri,
- String compressionClass,
- int compressionBlockSize,
String cluster,
String name,
String similarityClass,
@@@ -463,7 -438,37 +419,7 @@@
}
/**
- *
- * Defines the field and their types (as well as the Analyzers to use).
- */
- public AnalyzerDefinition getAnalyzerDefinition() {
- return this.analyzerDefinition;
- }
-
- /**
- * Defines the field and their types (as well as the Analyzers to use).
- */
- 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;
- }
- }
-
- /**
+ * The number of shards within the given table.
*/
public int getShardCount() {
return this.shardCount;
@@@ -1691,43 -1594,40 +1488,37 @@@
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(3);
- }
- if (struct.isSetCompressionBlockSize()) {
- optionals.set(4);
- }
if (struct.isSetCluster()) {
- optionals.set(5);
- optionals.set(4);
++ optionals.set(3);
}
if (struct.isSetName()) {
- optionals.set(6);
- optionals.set(5);
++ optionals.set(4);
}
if (struct.isSetSimilarityClass()) {
- optionals.set(7);
- optionals.set(6);
++ optionals.set(5);
}
if (struct.isSetBlockCaching()) {
- optionals.set(8);
- optionals.set(7);
++ optionals.set(6);
}
if (struct.isSetBlockCachingFileTypes()) {
- optionals.set(9);
- optionals.set(8);
++ optionals.set(7);
}
if (struct.isSetReadOnly()) {
- optionals.set(10);
- optionals.set(9);
++ optionals.set(8);
}
if (struct.isSetColumnPreCache()) {
- optionals.set(11);
- optionals.set(10);
++ optionals.set(9);
}
if (struct.isSetTableProperties()) {
- optionals.set(12);
- optionals.set(11);
++ optionals.set(10);
}
- oprot.writeBitSet(optionals, 13);
- oprot.writeBitSet(optionals, 12);
++ oprot.writeBitSet(optionals, 11);
if (struct.isSetIsEnabled()) {
oprot.writeBool(struct.isEnabled);
}
@@@ -1785,7 -1682,7 +1570,7 @@@
@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(13);
- BitSet incoming = iprot.readBitSet(12);
++ BitSet incoming = iprot.readBitSet(11);
if (incoming.get(0)) {
struct.isEnabled = iprot.readBool();
struct.setIsEnabledIsSet(true);
@@@ -1798,31 -1700,23 +1583,23 @@@
struct.tableUri = iprot.readString();
struct.setTableUriIsSet(true);
}
- if (incoming.get(4)) {
+ if (incoming.get(3)) {
struct.cluster = iprot.readString();
struct.setClusterIsSet(true);
}
- if (incoming.get(6)) {
- if (incoming.get(5)) {
++ if (incoming.get(4)) {
struct.name = iprot.readString();
struct.setNameIsSet(true);
}
- if (incoming.get(7)) {
- if (incoming.get(6)) {
++ if (incoming.get(5)) {
struct.similarityClass = iprot.readString();
struct.setSimilarityClassIsSet(true);
}
- if (incoming.get(8)) {
- if (incoming.get(7)) {
++ if (incoming.get(6)) {
struct.blockCaching = iprot.readBool();
struct.setBlockCachingIsSet(true);
}
- if (incoming.get(9)) {
- if (incoming.get(8)) {
++ if (incoming.get(7)) {
{
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);
@@@ -1835,16 -1729,16 +1612,16 @@@
}
struct.setBlockCachingFileTypesIsSet(true);
}
- if (incoming.get(10)) {
- if (incoming.get(9)) {
++ if (incoming.get(8)) {
struct.readOnly = iprot.readBool();
struct.setReadOnlyIsSet(true);
}
- if (incoming.get(11)) {
- if (incoming.get(10)) {
++ if (incoming.get(9)) {
struct.columnPreCache = new ColumnPreCache();
struct.columnPreCache.read(iprot);
struct.setColumnPreCacheIsSet(true);
}
- if (incoming.get(12)) {
- if (incoming.get(11)) {
++ if (incoming.get(10)) {
{
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/fb0ece57/distribution/src/main/scripts/interface/gen-js/Blur_types.js
----------------------------------------------------------------------
diff --cc distribution/src/main/scripts/interface/gen-js/Blur_types.js
index 51b3699,e759354..2807c63
--- a/distribution/src/main/scripts/interface/gen-js/Blur_types.js
+++ b/distribution/src/main/scripts/interface/gen-js/Blur_types.js
@@@ -2996,10 -2996,9 +2996,8 @@@ ColumnPreCache.prototype.write = functi
TableDescriptor = function(args) {
this.isEnabled = true;
- this.analyzerDefinition = null;
this.shardCount = 1;
this.tableUri = null;
- this.compressionClass = 'org.apache.hadoop.io.compress.DefaultCodec';
- this.compressionBlockSize = 32768;
this.cluster = 'default';
this.name = null;
this.similarityClass = null;
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/fb0ece57/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm
----------------------------------------------------------------------
diff --cc distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm
index 06bafbe,66b61e0..bc29ad5
--- a/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm
+++ b/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm
@@@ -3217,17 -3217,16 +3217,15 @@@ sub write
package Blur::TableDescriptor;
use base qw(Class::Accessor);
- Blur::TableDescriptor->mk_accessors( qw( isEnabled shardCount tableUri
compressionClass compressionBlockSize cluster name similarityClass blockCaching
blockCachingFileTypes readOnly columnPreCache tableProperties ) );
-Blur::TableDescriptor->mk_accessors( qw( isEnabled analyzerDefinition
shardCount tableUri cluster name similarityClass blockCaching
blockCachingFileTypes readOnly columnPreCache tableProperties ) );
++Blur::TableDescriptor->mk_accessors( qw( isEnabled shardCount tableUri
cluster name similarityClass blockCaching blockCachingFileTypes readOnly
columnPreCache tableProperties ) );
sub new {
my $classname = shift;
my $self = {};
my $vals = shift || {};
$self->{isEnabled} = 1;
- $self->{analyzerDefinition} = undef;
$self->{shardCount} = 1;
$self->{tableUri} = undef;
- $self->{compressionClass} = "org.apache.hadoop.io.compress.DefaultCodec";
- $self->{compressionBlockSize} = 32768;
$self->{cluster} = "default";
$self->{name} = undef;
$self->{similarityClass} = undef;
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/fb0ece57/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
----------------------------------------------------------------------
diff --cc distribution/src/main/scripts/interface/gen-rb/blur_types.rb
index b49610e,f1f37e1..d1468a6
--- a/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
+++ b/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
@@@ -777,10 -777,9 +777,8 @@@ module Blu
class TableDescriptor
include ::Thrift::Struct, ::Thrift::Struct_Union
ISENABLED = 1
- ANALYZERDEFINITION = 2
SHARDCOUNT = 3
TABLEURI = 4
- COMPRESSIONCLASS = 5
- COMPRESSIONBLOCKSIZE = 6
CLUSTER = 7
NAME = 8
SIMILARITYCLASS = 9
@@@ -791,25 -790,23 +789,21 @@@
TABLEPROPERTIES = 14
FIELDS = {
- #
+ # Is the table enabled or not, enabled by default.
ISENABLED => {:type => ::Thrift::Types::BOOL, :name => 'isEnabled',
:default => true},
- #
- # Defines the field and their types (as well as the Analyzers to use).
- ANALYZERDEFINITION => {:type => ::Thrift::Types::STRUCT, :name =>
'analyzerDefinition', :class => ::Blur::AnalyzerDefinition},
+ # The number of shards within the given table.
SHARDCOUNT => {:type => ::Thrift::Types::I32, :name => 'shardCount',
:default => 1},
- #
+ # The location where the table should be stored this can be "file:///"
for a local instance of Blur or "hdfs://" for a distributed installation of
Blur.
TABLEURI => {:type => ::Thrift::Types::STRING, :name => 'tableUri'},
- #
- COMPRESSIONCLASS => {:type => ::Thrift::Types::STRING, :name =>
'compressionClass', :default => %q"org.apache.hadoop.io.compress.DefaultCodec"},
- #
- COMPRESSIONBLOCKSIZE => {:type => ::Thrift::Types::I32, :name =>
'compressionBlockSize', :default => 32768},
- #
+ # The cluster where this table should be created.
CLUSTER => {:type => ::Thrift::Types::STRING, :name => 'cluster',
:default => %q"default"},
- #
+ # The table name.
NAME => {:type => ::Thrift::Types::STRING, :name => 'name'},
- #
+ # Sets the similarity class in Lucene.
SIMILARITYCLASS => {:type => ::Thrift::Types::STRING, :name =>
'similarityClass'},
- #
+ # Should block cache be enable or disabled for this table.
BLOCKCACHING => {:type => ::Thrift::Types::BOOL, :name =>
'blockCaching', :default => true},
- #
+ # The files extensions that you would like to allow block cache to to
cache. If null (default) everything is cached.
BLOCKCACHINGFILETYPES => {:type => ::Thrift::Types::SET, :name =>
'blockCachingFileTypes', :element => {:type => ::Thrift::Types::STRING}},
# If a table is set to be readonly, that means that mutates through
Thrift are NOT allowed. However
# updates through MapReduce are allowed and in fact they are only allowed if
the table is in readOnly mode.
