incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [1/51] [partial] git commit: Initial repackage to org.apache.
Date Mon, 03 Sep 2012 03:17:09 GMT
Updated Branches:
  refs/heads/master 99218cd23 -> 33df93106


Initial repackage to org.apache.


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

Branch: refs/heads/master
Commit: 33df931061cba68482e6393bfca37ab0e4a39873
Parents: 99218cd
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Sun Sep 2 23:08:48 2012 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Sun Sep 2 23:08:48 2012 -0400

----------------------------------------------------------------------
 bin/start-controller-server.sh                     |    2 +-
 bin/start-shard-server.sh                          |    2 +-
 interface/Blur.thrift                              |    2 +-
 interface/genAndReplace.sh                         |    2 +-
 src/blur-core/pom.xml                              |   14 +-
 .../nearinfinity/blur/analysis/BlurAnalyzer.java   |  309 -
 .../nearinfinity/blur/analysis/FieldConverter.java |   24 -
 .../blur/analysis/FieldConverterUtil.java          |   81 -
 .../nearinfinity/blur/analysis/LongAnalyzer.java   |   62 -
 .../blur/lucene/search/AbstractWrapperQuery.java   |   82 -
 .../blur/lucene/search/FacetQuery.java             |  201 -
 .../blur/lucene/search/FairSimilarity.java         |   56 -
 .../blur/lucene/search/IterablePaging.java         |  232 -
 .../blur/lucene/search/PagingCollector.java        |  119 -
 .../blur/lucene/search/StopExecutionCollector.java |   67 -
 .../blur/lucene/search/SuperParser.java            |  215 -
 .../blur/lucene/search/SuperQuery.java             |  267 -
 .../nearinfinity/blur/manager/BlurFilterCache.java |   37 -
 .../nearinfinity/blur/manager/BlurPartitioner.java |   27 -
 .../blur/manager/BlurQueryChecker.java             |   64 -
 .../blur/manager/DefaultBlurFilterCache.java       |   54 -
 .../nearinfinity/blur/manager/IndexManager.java    |  972 -
 .../com/nearinfinity/blur/manager/IndexServer.java |  177 -
 .../nearinfinity/blur/manager/QueryParserUtil.java |   65 -
 .../blur/manager/clusterstatus/ClusterStatus.java  |   79 -
 .../clusterstatus/ZookeeperClusterStatus.java      |  823 -
 .../clusterstatus/ZookeeperPathConstants.java      |  114 -
 .../manager/indexserver/AbstractIndexServer.java   |  136 -
 .../blur/manager/indexserver/BlurIndexWarmup.java  |   71 -
 .../manager/indexserver/BlurServerShutDown.java    |   72 -
 .../indexserver/DefaultBlurIndexWarmup.java        |   89 -
 .../indexserver/DistributedIndexServer.java        |  843 -
 .../indexserver/DistributedLayoutManager.java      |  245 -
 .../blur/manager/indexserver/LocalIndexServer.java |  229 -
 .../blur/manager/results/BlurResultComparator.java |   34 -
 .../blur/manager/results/BlurResultIterable.java   |   34 -
 .../manager/results/BlurResultIterableClient.java  |  148 -
 .../results/BlurResultIterableMultiple.java        |  113 -
 .../results/BlurResultIterableSearcher.java        |  135 -
 .../manager/results/BlurResultIterableSimple.java  |   73 -
 .../BlurResultPeekableIteratorComparator.java      |   43 -
 .../manager/results/MergerBlurResultIterable.java  |   64 -
 .../blur/manager/results/PeekableIterator.java     |   66 -
 .../blur/manager/stats/LoadFactor.java             |  138 -
 .../blur/manager/stats/LoadFactorProcessor.java    |   70 -
 .../blur/manager/stats/MergerTableStats.java       |   55 -
 .../nearinfinity/blur/manager/stats/Sampler.java   |   23 -
 .../blur/manager/stats/WeightedAvg.java            |   73 -
 .../blur/manager/status/MergerQueryStatus.java     |   84 -
 .../manager/status/MergerQueryStatusSingle.java    |   49 -
 .../blur/manager/status/QueryStatus.java           |  142 -
 .../blur/manager/status/QueryStatusManager.java    |  128 -
 .../blur/manager/writer/AbstractBlurIndex.java     |  165 -
 .../blur/manager/writer/BlurIndex.java             |   42 -
 .../blur/manager/writer/BlurIndexCloser.java       |  108 -
 .../blur/manager/writer/BlurIndexReader.java       |   72 -
 .../blur/manager/writer/BlurIndexRefresher.java    |   84 -
 .../blur/manager/writer/BlurNRTIndex.java          |  294 -
 .../manager/writer/DirectoryReferenceCounter.java  |  279 -
 .../manager/writer/DirectoryReferenceFileGC.java   |   98 -
 .../blur/manager/writer/TransactionRecorder.java   |  344 -
 .../manager/writer/lucene/SnapshotIndexReader.java |  170 -
 .../writer/lucene/SoftDeleteIndexReader.java       |  213 -
 .../blur/thrift/BlurControllerServer.java          |  809 -
 .../nearinfinity/blur/thrift/BlurShardServer.java  |  322 -
 .../ExecutorServicePerMethodCallThriftServer.java  |  163 -
 .../nearinfinity/blur/thrift/MutationHelper.java   |   69 -
 .../com/nearinfinity/blur/thrift/TableAdmin.java   |  315 -
 .../blur/thrift/ThriftBlurControllerServer.java    |  160 -
 .../blur/thrift/ThriftBlurShardServer.java         |  264 -
 .../com/nearinfinity/blur/thrift/ThriftServer.java |  160 -
 .../blur/thrift/ZookeeperSystemTime.java           |   51 -
 .../com/nearinfinity/blur/utils/BlurConstants.java |  119 -
 .../blur/utils/BlurExecutorCompletionService.java  |  134 -
 .../nearinfinity/blur/utils/BlurThriftRecord.java  |   46 -
 .../java/com/nearinfinity/blur/utils/BlurUtil.java |  762 -
 .../com/nearinfinity/blur/utils/Converter.java     |   21 -
 .../java/com/nearinfinity/blur/utils/ForkJoin.java |   91 -
 .../nearinfinity/blur/utils/IterableConverter.java |   36 -
 .../nearinfinity/blur/utils/IteratorConverter.java |   50 -
 .../com/nearinfinity/blur/utils/ObjectSize.java    |   37 -
 .../com/nearinfinity/blur/utils/PrimeDocCache.java |   68 -
 .../com/nearinfinity/blur/utils/QueryCache.java    |  106 -
 .../nearinfinity/blur/utils/QueryCacheEntry.java   |   45 -
 .../com/nearinfinity/blur/utils/QueryCacheKey.java |   77 -
 .../nearinfinity/blur/utils/ReaderBlurRecord.java  |   29 -
 .../nearinfinity/blur/utils/ReferenceIterable.java |   55 -
 .../nearinfinity/blur/utils/RowDocumentUtil.java   |   94 -
 .../nearinfinity/blur/utils/RowIndexWriter.java    |  143 -
 .../nearinfinity/blur/utils/TermDocIterable.java   |   91 -
 .../org/apache/blur/analysis/BlurAnalyzer.java     |  309 +
 .../org/apache/blur/analysis/FieldConverter.java   |   24 +
 .../apache/blur/analysis/FieldConverterUtil.java   |   81 +
 .../org/apache/blur/analysis/LongAnalyzer.java     |   62 +
 .../org/apache/blur/analysis/LongAnalyzerReal.java |   77 +
 .../blur/lucene/search/AbstractWrapperQuery.java   |   82 +
 .../org/apache/blur/lucene/search/FacetQuery.java  |  201 +
 .../apache/blur/lucene/search/FairSimilarity.java  |   56 +
 .../apache/blur/lucene/search/IterablePaging.java  |  232 +
 .../apache/blur/lucene/search/PagingCollector.java |  119 +
 .../blur/lucene/search/StopExecutionCollector.java |   67 +
 .../org/apache/blur/lucene/search/SuperParser.java |  215 +
 .../org/apache/blur/lucene/search/SuperQuery.java  |  267 +
 .../org/apache/blur/manager/BlurFilterCache.java   |   37 +
 .../org/apache/blur/manager/BlurPartitioner.java   |   27 +
 .../org/apache/blur/manager/BlurQueryChecker.java  |   66 +
 .../blur/manager/DefaultBlurFilterCache.java       |   54 +
 .../java/org/apache/blur/manager/IndexManager.java |  972 +
 .../java/org/apache/blur/manager/IndexServer.java  |  177 +
 .../org/apache/blur/manager/QueryParserUtil.java   |   65 +
 .../blur/manager/clusterstatus/ClusterStatus.java  |   80 +
 .../clusterstatus/ZookeeperClusterStatus.java      |  823 +
 .../clusterstatus/ZookeeperPathConstants.java      |  114 +
 .../manager/indexserver/AbstractIndexServer.java   |  136 +
 .../blur/manager/indexserver/BlurIndexWarmup.java  |   71 +
 .../manager/indexserver/BlurServerShutDown.java    |   72 +
 .../indexserver/DefaultBlurIndexWarmup.java        |   89 +
 .../indexserver/DistributedIndexServer.java        |  843 +
 .../indexserver/DistributedLayoutManager.java      |  245 +
 .../blur/manager/indexserver/LocalIndexServer.java |  229 +
 .../blur/manager/results/BlurResultComparator.java |   35 +
 .../blur/manager/results/BlurResultIterable.java   |   35 +
 .../manager/results/BlurResultIterableClient.java  |  149 +
 .../results/BlurResultIterableMultiple.java        |  114 +
 .../results/BlurResultIterableSearcher.java        |  135 +
 .../manager/results/BlurResultIterableSimple.java  |   74 +
 .../BlurResultPeekableIteratorComparator.java      |   44 +
 .../manager/results/MergerBlurResultIterable.java  |   65 +
 .../blur/manager/results/PeekableIterator.java     |   66 +
 .../org/apache/blur/manager/stats/LoadFactor.java  |  139 +
 .../blur/manager/stats/LoadFactorProcessor.java    |   70 +
 .../blur/manager/stats/MergerTableStats.java       |   56 +
 .../org/apache/blur/manager/stats/Sampler.java     |   23 +
 .../org/apache/blur/manager/stats/WeightedAvg.java |   73 +
 .../blur/manager/status/MergerQueryStatus.java     |   85 +
 .../manager/status/MergerQueryStatusSingle.java    |   50 +
 .../apache/blur/manager/status/QueryStatus.java    |  143 +
 .../blur/manager/status/QueryStatusManager.java    |  129 +
 .../blur/manager/writer/AbstractBlurIndex.java     |  164 +
 .../org/apache/blur/manager/writer/BlurIndex.java  |   42 +
 .../blur/manager/writer/BlurIndexCloser.java       |  108 +
 .../blur/manager/writer/BlurIndexReader.java       |   72 +
 .../blur/manager/writer/BlurIndexRefresher.java    |   85 +
 .../apache/blur/manager/writer/BlurNRTIndex.java   |  294 +
 .../manager/writer/DirectoryReferenceCounter.java  |  279 +
 .../manager/writer/DirectoryReferenceFileGC.java   |   98 +
 .../blur/manager/writer/TransactionRecorder.java   |  344 +
 .../manager/writer/lucene/SnapshotIndexReader.java |  170 +
 .../writer/lucene/SoftDeleteIndexReader.java       |  213 +
 .../apache/blur/thrift/BlurControllerServer.java   |  811 +
 .../org/apache/blur/thrift/BlurShardServer.java    |  323 +
 .../ExecutorServicePerMethodCallThriftServer.java  |  163 +
 .../org/apache/blur/thrift/MutationHelper.java     |   69 +
 .../java/org/apache/blur/thrift/TableAdmin.java    |  316 +
 .../blur/thrift/ThriftBlurControllerServer.java    |  160 +
 .../apache/blur/thrift/ThriftBlurShardServer.java  |  264 +
 .../java/org/apache/blur/thrift/ThriftServer.java  |  160 +
 .../apache/blur/thrift/ZookeeperSystemTime.java    |   51 +
 .../java/org/apache/blur/utils/BlurConstants.java  |  119 +
 .../blur/utils/BlurExecutorCompletionService.java  |  135 +
 .../org/apache/blur/utils/BlurThriftRecord.java    |   46 +
 .../main/java/org/apache/blur/utils/BlurUtil.java  |  762 +
 .../main/java/org/apache/blur/utils/Converter.java |   21 +
 .../main/java/org/apache/blur/utils/ForkJoin.java  |   92 +
 .../org/apache/blur/utils/IterableConverter.java   |   36 +
 .../org/apache/blur/utils/IteratorConverter.java   |   50 +
 .../java/org/apache/blur/utils/ObjectSize.java     |   37 +
 .../java/org/apache/blur/utils/PrimeDocCache.java  |   68 +
 .../java/org/apache/blur/utils/QueryCache.java     |  107 +
 .../org/apache/blur/utils/QueryCacheEntry.java     |   46 +
 .../java/org/apache/blur/utils/QueryCacheKey.java  |   77 +
 .../org/apache/blur/utils/ReaderBlurRecord.java    |   29 +
 .../org/apache/blur/utils/ReferenceIterable.java   |   55 +
 .../org/apache/blur/utils/RowDocumentUtil.java     |   94 +
 .../java/org/apache/blur/utils/RowIndexWriter.java |  143 +
 .../org/apache/blur/utils/TermDocIterable.java     |   91 +
 .../java/com/nearinfinity/blur/MiniCluster.java    |  465 -
 .../blur/analysis/BlurAnalyzerTest.java            |  102 -
 .../blur/analysis/LongAnalyzerTest.java            |   79 -
 .../blur/lucene/search/FacetQueryTest.java         |   99 -
 .../blur/manager/IndexManagerTest.java             |  889 -
 .../clusterstatus/ZookeeperClusterStatusTest.java  |  253 -
 .../indexserver/DistributedLayoutManagerTest.java  |  114 -
 .../BlurResultPeekableIteratorComparatorTest.java  |   55 -
 .../results/MultipleBlurResultIterableTest.java    |   55 -
 .../blur/manager/results/PeekableIteratorTest.java |   54 -
 .../blur/manager/stats/WeightedAvgTest.java        |   38 -
 .../blur/manager/writer/BlurNRTIndexTest.java      |  154 -
 .../writer/DirectoryReferenceCounterTest.java      |  342 -
 .../manager/writer/TransactionRecorderTest.java    |  104 -
 .../blur/search/RandomSuperQueryTest.java          |  156 -
 .../nearinfinity/blur/search/SuperQueryTest.java   |  215 -
 .../blur/search/TestingPagingCollector.java        |   84 -
 .../nearinfinity/blur/thrift/BlurClusterTest.java  |   93 -
 .../blur/thrift/BlurControllerServerTest.java      |  334 -
 .../blur/thrift/BlurShardServerTest.java           |  149 -
 .../nearinfinity/blur/thrift/DoNothingServer.java  |  174 -
 .../com/nearinfinity/blur/utils/BlurUtilsTest.java |  145 -
 .../blur/utils/TermDocIterableTest.java            |  115 -
 .../src/test/java/org/apache/blur/MiniCluster.java |  464 +
 .../org/apache/blur/analysis/BlurAnalyzerTest.java |  102 +
 .../org/apache/blur/analysis/LongAnalyzerTest.java |   79 +
 .../apache/blur/lucene/search/FacetQueryTest.java  |  101 +
 .../org/apache/blur/manager/IndexManagerTest.java  |  890 +
 .../clusterstatus/ZookeeperClusterStatusTest.java  |  255 +
 .../indexserver/DistributedLayoutManagerTest.java  |  116 +
 .../BlurResultPeekableIteratorComparatorTest.java  |   55 +
 .../results/MultipleBlurResultIterableTest.java    |   55 +
 .../blur/manager/results/PeekableIteratorTest.java |   54 +
 .../apache/blur/manager/stats/WeightedAvgTest.java |   40 +
 .../blur/manager/writer/BlurNRTIndexTest.java      |  154 +
 .../writer/DirectoryReferenceCounterTest.java      |  345 +
 .../manager/writer/TransactionRecorderTest.java    |  105 +
 .../apache/blur/search/RandomSuperQueryTest.java   |  156 +
 .../org/apache/blur/search/SuperQueryTest.java     |  215 +
 .../apache/blur/search/TestingPagingCollector.java |   84 +
 .../org/apache/blur/thrift/BlurClusterTest.java    |   94 +
 .../blur/thrift/BlurControllerServerTest.java      |  334 +
 .../apache/blur/thrift/BlurShardServerTest.java    |  148 +
 .../org/apache/blur/thrift/DoNothingServer.java    |  174 +
 .../java/org/apache/blur/utils/BlurUtilsTest.java  |  146 +
 .../org/apache/blur/utils/TermDocIterableTest.java |  117 +
 src/blur-demo/pom.xml                              |   19 +-
 .../com/nearinfinity/blur/demo/SampleProgram.java  |  174 -
 .../java/org/apache/blur/demo/SampleProgram.java   |  174 +
 src/blur-gui/pom.xml                               |   10 +-
 .../com/nearinfinity/blur/gui/HttpJettyServer.java |  139 -
 .../java/com/nearinfinity/blur/gui/LogServlet.java |   95 -
 .../com/nearinfinity/blur/gui/MetricsServlet.java  |   51 -
 .../java/org/apache/blur/gui/HttpJettyServer.java  |  139 +
 .../main/java/org/apache/blur/gui/LogServlet.java  |   95 +
 .../java/org/apache/blur/gui/MetricsServlet.java   |   51 +
 src/blur-jdbc/pom.xml                              |    8 +-
 .../com/nearinfinity/blur/jdbc/BlurConnection.java |  117 -
 .../blur/jdbc/BlurDatabaseMetaData.java            |  424 -
 .../java/com/nearinfinity/blur/jdbc/BlurJdbc.java  |   88 -
 .../blur/jdbc/BlurPreparedStatement.java           |   44 -
 .../blur/jdbc/BlurResultSetMetaData.java           |  227 -
 .../blur/jdbc/BlurResultSetRecords.java            |  247 -
 .../nearinfinity/blur/jdbc/BlurResultSetRows.java  |  234 -
 .../nearinfinity/blur/jdbc/BlurResultSetTest.java  |   55 -
 .../com/nearinfinity/blur/jdbc/BlurStatement.java  |  139 -
 .../com/nearinfinity/blur/jdbc/BlurWarnings.java   |   25 -
 .../java/com/nearinfinity/blur/jdbc/QueryData.java |   72 -
 .../jdbc/abstractimpl/AbstractBlurConnection.java  |  251 -
 .../abstractimpl/AbstractBlurDatabaseMetaData.java |  744 -
 .../AbstractBlurPreparedStatement.java             |  448 -
 .../jdbc/abstractimpl/AbstractBlurResultSet.java   |  819 -
 .../AbstractBlurResultSetMetaData.java             |  132 -
 .../jdbc/abstractimpl/AbstractBlurStatement.java   |  211 -
 .../com/nearinfinity/blur/jdbc/parser/Parser.java  |  205 -
 .../blur/jdbc/util/EmptyResultSet.java             |   41 -
 .../blur/jdbc/util/EmptyResultSetMetaData.java     |   31 -
 .../blur/jdbc/util/NotImplemented.java             |   37 -
 .../blur/jdbc/util/SimpleStringResultSet.java      |  100 -
 .../java/org/apache/blur/jdbc/BlurConnection.java  |  118 +
 .../org/apache/blur/jdbc/BlurDatabaseMetaData.java |  424 +
 .../main/java/org/apache/blur/jdbc/BlurJdbc.java   |   88 +
 .../apache/blur/jdbc/BlurPreparedStatement.java    |   45 +
 .../apache/blur/jdbc/BlurResultSetMetaData.java    |  228 +
 .../org/apache/blur/jdbc/BlurResultSetRecords.java |  247 +
 .../org/apache/blur/jdbc/BlurResultSetRows.java    |  234 +
 .../org/apache/blur/jdbc/BlurResultSetTest.java    |   56 +
 .../java/org/apache/blur/jdbc/BlurStatement.java   |  139 +
 .../java/org/apache/blur/jdbc/BlurWarnings.java    |   25 +
 .../main/java/org/apache/blur/jdbc/QueryData.java  |   72 +
 .../jdbc/abstractimpl/AbstractBlurConnection.java  |  252 +
 .../abstractimpl/AbstractBlurDatabaseMetaData.java |  745 +
 .../AbstractBlurPreparedStatement.java             |  449 +
 .../jdbc/abstractimpl/AbstractBlurResultSet.java   |  820 +
 .../AbstractBlurResultSetMetaData.java             |  133 +
 .../jdbc/abstractimpl/AbstractBlurStatement.java   |  212 +
 .../java/org/apache/blur/jdbc/parser/Parser.java   |  205 +
 .../org/apache/blur/jdbc/util/EmptyResultSet.java  |   42 +
 .../blur/jdbc/util/EmptyResultSetMetaData.java     |   32 +
 .../org/apache/blur/jdbc/util/NotImplemented.java  |   37 +
 .../blur/jdbc/util/SimpleStringResultSet.java      |  101 +
 src/blur-mapred/pom.xml                            |   10 +-
 .../nearinfinity/blur/mapred/BlurInputFormat.java  |   53 -
 .../nearinfinity/blur/mapred/BlurRecordReader.java |  108 -
 .../nearinfinity/blur/mapreduce/BlurColumn.java    |   77 -
 .../nearinfinity/blur/mapreduce/BlurMapper.java    |   58 -
 .../nearinfinity/blur/mapreduce/BlurMutate.java    |   84 -
 .../nearinfinity/blur/mapreduce/BlurRecord.java    |  136 -
 .../nearinfinity/blur/mapreduce/BlurReducer.java   |  520 -
 .../com/nearinfinity/blur/mapreduce/BlurTask.java  |  282 -
 .../blur/mapreduce/BufferedDirectory.java          |  150 -
 .../com/nearinfinity/blur/mapreduce/IOUtil.java    |   58 -
 .../blur/mapreduce/ProgressableDirectory.java      |  273 -
 .../com/nearinfinity/blur/mapreduce/SpinLock.java  |  112 -
 .../example/BlurExampleIndexerRebuild.java         |   79 -
 .../example/BlurExampleIndexerUpdate.java          |   68 -
 .../blur/mapreduce/example/BlurExampleMapper.java  |   51 -
 .../blur/mapreduce/lib/BlurInputFormat.java        |   87 -
 .../blur/mapreduce/lib/BlurInputSplit.java         |  157 -
 .../blur/mapreduce/lib/BlurOutputCommitter.java    |   56 -
 .../blur/mapreduce/lib/BlurOutputFormat.java       |   47 -
 .../blur/mapreduce/lib/BlurRecordReader.java       |  103 -
 .../blur/mapreduce/lib/BlurRecordWriter.java       |  116 -
 .../com/nearinfinity/blur/mapreduce/lib/Utils.java |   72 -
 .../org/apache/blur/mapred/BlurInputFormat.java    |   53 +
 .../org/apache/blur/mapred/BlurRecordReader.java   |  108 +
 .../java/org/apache/blur/mapreduce/BlurColumn.java |   77 +
 .../java/org/apache/blur/mapreduce/BlurMapper.java |   58 +
 .../java/org/apache/blur/mapreduce/BlurMutate.java |   84 +
 .../java/org/apache/blur/mapreduce/BlurRecord.java |  136 +
 .../org/apache/blur/mapreduce/BlurReducer.java     |  520 +
 .../java/org/apache/blur/mapreduce/BlurTask.java   |  282 +
 .../apache/blur/mapreduce/BufferedDirectory.java   |  150 +
 .../java/org/apache/blur/mapreduce/IOUtil.java     |   58 +
 .../blur/mapreduce/ProgressableDirectory.java      |  273 +
 .../java/org/apache/blur/mapreduce/SpinLock.java   |  112 +
 .../example/BlurExampleIndexerRebuild.java         |   79 +
 .../example/BlurExampleIndexerUpdate.java          |   68 +
 .../blur/mapreduce/example/BlurExampleMapper.java  |   51 +
 .../apache/blur/mapreduce/lib/BlurInputFormat.java |   87 +
 .../apache/blur/mapreduce/lib/BlurInputSplit.java  |  157 +
 .../blur/mapreduce/lib/BlurOutputCommitter.java    |   56 +
 .../blur/mapreduce/lib/BlurOutputFormat.java       |   47 +
 .../blur/mapreduce/lib/BlurRecordReader.java       |  103 +
 .../blur/mapreduce/lib/BlurRecordWriter.java       |  116 +
 .../java/org/apache/blur/mapreduce/lib/Utils.java  |   72 +
 .../blur/mapred/BlurInputFormatTest.java           |   81 -
 .../nearinfinity/blur/mapreduce/BlurTaskTest.java  |   61 -
 .../blur/mapreduce/lib/BlurInputFormatTest.java    |  145 -
 .../blur/mapreduce/lib/BlurRecordWriterTest.java   |   86 -
 .../apache/blur/mapred/BlurInputFormatTest.java    |   82 +
 .../org/apache/blur/mapreduce/BlurTaskTest.java    |   62 +
 .../blur/mapreduce/lib/BlurInputFormatTest.java    |  145 +
 .../blur/mapreduce/lib/BlurRecordWriterTest.java   |   87 +
 src/blur-store/pom.xml                             |    6 +-
 .../com/nearinfinity/blur/index/IndexWriter.java   |   63 -
 .../nearinfinity/blur/lucene/EscapeRewrite.java    |  334 -
 .../nearinfinity/blur/lucene/LuceneConstant.java   |   25 -
 .../com/nearinfinity/blur/store/BufferStore.java   |  112 -
 .../blur/store/CustomBufferedIndexInput.java       |  277 -
 .../blur/store/blockcache/BlockCache.java          |  189 -
 .../blur/store/blockcache/BlockCacheKey.java       |   73 -
 .../blur/store/blockcache/BlockCacheLocation.java  |   66 -
 .../blur/store/blockcache/BlockDirectory.java      |  282 -
 .../blur/store/blockcache/BlockDirectoryCache.java |   76 -
 .../blur/store/blockcache/BlockLocks.java          |   96 -
 .../nearinfinity/blur/store/blockcache/Cache.java  |   29 -
 .../compressed/CompressedFieldDataDirectory.java   |  813 -
 .../blur/store/hdfs/ChangeFileExt.java             |   38 -
 .../blur/store/hdfs/ConvertDirectory.java          |   62 -
 .../blur/store/hdfs/CopyFromHdfsLocal.java         |   48 -
 .../blur/store/hdfs/HdfsDirectory.java             |  377 -
 .../blur/store/hdfs/HdfsFileReader.java            |  188 -
 .../blur/store/hdfs/HdfsFileWriter.java            |   99 -
 .../blur/store/hdfs/HdfsMetaBlock.java             |   61 -
 .../blur/store/hdfs/NullIndexOutput.java           |   70 -
 .../blur/store/lock/BlurLockFactory.java           |  102 -
 .../java/org/apache/blur/index/IndexWriter.java    |   63 +
 .../java/org/apache/blur/lucene/EscapeRewrite.java |  334 +
 .../org/apache/blur/lucene/LuceneConstant.java     |   25 +
 .../java/org/apache/blur/store/BufferStore.java    |  113 +
 .../blur/store/CustomBufferedIndexInput.java       |  277 +
 .../apache/blur/store/blockcache/BlockCache.java   |  190 +
 .../blur/store/blockcache/BlockCacheKey.java       |   73 +
 .../blur/store/blockcache/BlockCacheLocation.java  |   66 +
 .../blur/store/blockcache/BlockDirectory.java      |  282 +
 .../blur/store/blockcache/BlockDirectoryCache.java |   77 +
 .../apache/blur/store/blockcache/BlockLocks.java   |   96 +
 .../org/apache/blur/store/blockcache/Cache.java    |   29 +
 .../compressed/CompressedFieldDataDirectory.java   |  813 +
 .../org/apache/blur/store/hdfs/ChangeFileExt.java  |   38 +
 .../apache/blur/store/hdfs/ConvertDirectory.java   |   62 +
 .../apache/blur/store/hdfs/CopyFromHdfsLocal.java  |   48 +
 .../org/apache/blur/store/hdfs/HdfsDirectory.java  |  377 +
 .../org/apache/blur/store/hdfs/HdfsFileReader.java |  188 +
 .../org/apache/blur/store/hdfs/HdfsFileWriter.java |   99 +
 .../org/apache/blur/store/hdfs/HdfsMetaBlock.java  |   61 +
 .../apache/blur/store/hdfs/NullIndexOutput.java    |   70 +
 .../apache/blur/store/lock/BlurLockFactory.java    |  102 +
 .../apache/lucene/index/WarmUpByFieldBounds.java   |    6 +-
 .../blur/store/BenchmarkDirectory.java             |  148 -
 .../blur/store/BenchmarkDirectoryNrt.java          |  160 -
 .../nearinfinity/blur/store/HdfsDirectoryTest.java |  203 -
 .../com/nearinfinity/blur/store/UsingHdfsDir.java  |  112 -
 .../blur/store/blockcache/BlockCacheTest.java      |   85 -
 .../blur/store/blockcache/BlockDirectoryTest.java  |  198 -
 .../CompressedFieldDataDirectoryTest.java          |  141 -
 .../org/apache/blur/store/BenchmarkDirectory.java  |  148 +
 .../apache/blur/store/BenchmarkDirectoryNrt.java   |  160 +
 .../org/apache/blur/store/HdfsDirectoryTest.java   |  203 +
 .../java/org/apache/blur/store/UsingHdfsDir.java   |  112 +
 .../blur/store/blockcache/BlockCacheTest.java      |   87 +
 .../blur/store/blockcache/BlockDirectoryTest.java  |  200 +
 .../CompressedFieldDataDirectoryTest.java          |  143 +
 src/blur-testsuite/pom.xml                         |   10 +-
 .../blur/testsuite/CreateInsertQueryRepeating.java |  241 -
 .../nearinfinity/blur/testsuite/CreateTable.java   |   50 -
 .../nearinfinity/blur/testsuite/DisableTable.java  |   36 -
 .../nearinfinity/blur/testsuite/EnableTable.java   |   36 -
 .../nearinfinity/blur/testsuite/ListTables.java    |   35 -
 .../com/nearinfinity/blur/testsuite/LoadData.java  |  129 -
 .../nearinfinity/blur/testsuite/LoadDataAsync.java |  146 -
 .../blur/testsuite/LoadDataAsyncContinuously.java  |  154 -
 .../blur/testsuite/LoadDataContinuously.java       |  174 -
 .../nearinfinity/blur/testsuite/OptimizeTable.java |   35 -
 .../blur/testsuite/RandomSearchTable.java          |  120 -
 .../testsuite/RandomSearchTableContinuously.java   |  161 -
 .../testsuite/RapidlyCreateAndDeleteTables.java    |   93 -
 .../nearinfinity/blur/testsuite/RemoveTable.java   |   36 -
 .../blur/testsuite/CreateInsertQueryRepeating.java |  241 +
 .../org/apache/blur/testsuite/CreateTable.java     |   50 +
 .../org/apache/blur/testsuite/DisableTable.java    |   36 +
 .../org/apache/blur/testsuite/EnableTable.java     |   36 +
 .../java/org/apache/blur/testsuite/ListTables.java |   35 +
 .../java/org/apache/blur/testsuite/LoadData.java   |  129 +
 .../org/apache/blur/testsuite/LoadDataAsync.java   |  146 +
 .../blur/testsuite/LoadDataAsyncContinuously.java  |  154 +
 .../blur/testsuite/LoadDataContinuously.java       |  174 +
 .../org/apache/blur/testsuite/OptimizeTable.java   |   35 +
 .../apache/blur/testsuite/RandomSearchTable.java   |  120 +
 .../testsuite/RandomSearchTableContinuously.java   |  161 +
 .../testsuite/RapidlyCreateAndDeleteTables.java    |   93 +
 .../org/apache/blur/testsuite/RemoveTable.java     |   36 +
 .../com/nearinfinity/blur/testsuite/words.txt      | 7851 ------
 .../resources/org/apache/blur/testsuite/words.txt  | 7851 ++++++
 src/blur-thrift/pom.xml                            |    6 +-
 .../nearinfinity/blur/thrift/AbstractCommand.java  |   30 -
 .../nearinfinity/blur/thrift/AsyncClientPool.java  |  275 -
 .../com/nearinfinity/blur/thrift/BException.java   |   51 -
 .../com/nearinfinity/blur/thrift/BlurClient.java   |   83 -
 .../blur/thrift/BlurClientManager.java             |  339 -
 .../com/nearinfinity/blur/thrift/Connection.java   |  123 -
 .../blur/thrift/commands/BlurCommand.java          |   24 -
 .../generated/AlternateColumnDefinition.java       |  334 -
 .../blur/thrift/generated/AnalyzerDefinition.java  |  586 -
 .../nearinfinity/blur/thrift/generated/Blur.java   |21343 ---------------
 .../blur/thrift/generated/BlurException.java       |  436 -
 .../blur/thrift/generated/BlurQuery.java           | 1762 --
 .../blur/thrift/generated/BlurQueryStatus.java     |  884 -
 .../blur/thrift/generated/BlurResult.java          |  537 -
 .../blur/thrift/generated/BlurResults.java         | 1000 -
 .../nearinfinity/blur/thrift/generated/Column.java |  435 -
 .../blur/thrift/generated/ColumnDefinition.java    |  549 -
 .../thrift/generated/ColumnFamilyDefinition.java   |  482 -
 .../blur/thrift/generated/ColumnPreCache.java      |  371 -
 .../blur/thrift/generated/CpuTime.java             |  430 -
 .../blur/thrift/generated/ExpertQuery.java         |  457 -
 .../nearinfinity/blur/thrift/generated/Facet.java  |  413 -
 .../blur/thrift/generated/FetchRecordResult.java   |  436 -
 .../blur/thrift/generated/FetchResult.java         |  735 -
 .../blur/thrift/generated/FetchRowResult.java      |  335 -
 .../blur/thrift/generated/QueryState.java          |   53 -
 .../nearinfinity/blur/thrift/generated/Record.java |  574 -
 .../blur/thrift/generated/RecordMutation.java      |  444 -
 .../blur/thrift/generated/RecordMutationType.java  |   57 -
 .../nearinfinity/blur/thrift/generated/Row.java    |  582 -
 .../blur/thrift/generated/RowMutation.java         |  868 -
 .../blur/thrift/generated/RowMutationType.java     |   53 -
 .../nearinfinity/blur/thrift/generated/Schema.java |  501 -
 .../blur/thrift/generated/ScoreType.java           |   57 -
 .../blur/thrift/generated/Selector.java            | 1038 -
 .../blur/thrift/generated/SimpleQuery.java         |  751 -
 .../blur/thrift/generated/TableDescriptor.java     | 1581 --
 .../blur/thrift/generated/TableStats.java          |  723 -
 .../org/apache/blur/thrift/AbstractCommand.java    |   30 +
 .../org/apache/blur/thrift/AsyncClientPool.java    |  275 +
 .../java/org/apache/blur/thrift/BException.java    |   52 +
 .../java/org/apache/blur/thrift/BlurClient.java    |   83 +
 .../org/apache/blur/thrift/BlurClientManager.java  |  339 +
 .../java/org/apache/blur/thrift/Connection.java    |  123 +
 .../apache/blur/thrift/commands/BlurCommand.java   |   25 +
 .../generated/AlternateColumnDefinition.java       |  334 +
 .../blur/thrift/generated/AnalyzerDefinition.java  |  586 +
 .../org/apache/blur/thrift/generated/Blur.java     |21343 +++++++++++++++
 .../blur/thrift/generated/BlurException.java       |  436 +
 .../apache/blur/thrift/generated/BlurQuery.java    | 1762 ++
 .../blur/thrift/generated/BlurQueryStatus.java     |  884 +
 .../apache/blur/thrift/generated/BlurResult.java   |  537 +
 .../apache/blur/thrift/generated/BlurResults.java  | 1000 +
 .../org/apache/blur/thrift/generated/Column.java   |  435 +
 .../blur/thrift/generated/ColumnDefinition.java    |  549 +
 .../thrift/generated/ColumnFamilyDefinition.java   |  482 +
 .../blur/thrift/generated/ColumnPreCache.java      |  371 +
 .../org/apache/blur/thrift/generated/CpuTime.java  |  430 +
 .../apache/blur/thrift/generated/ExpertQuery.java  |  457 +
 .../org/apache/blur/thrift/generated/Facet.java    |  413 +
 .../blur/thrift/generated/FetchRecordResult.java   |  436 +
 .../apache/blur/thrift/generated/FetchResult.java  |  735 +
 .../blur/thrift/generated/FetchRowResult.java      |  335 +
 .../apache/blur/thrift/generated/QueryState.java   |   53 +
 .../org/apache/blur/thrift/generated/Record.java   |  574 +
 .../blur/thrift/generated/RecordMutation.java      |  444 +
 .../blur/thrift/generated/RecordMutationType.java  |   57 +
 .../java/org/apache/blur/thrift/generated/Row.java |  582 +
 .../apache/blur/thrift/generated/RowMutation.java  |  868 +
 .../blur/thrift/generated/RowMutationType.java     |   53 +
 .../org/apache/blur/thrift/generated/Schema.java   |  501 +
 .../apache/blur/thrift/generated/ScoreType.java    |   57 +
 .../org/apache/blur/thrift/generated/Selector.java | 1038 +
 .../apache/blur/thrift/generated/SimpleQuery.java  |  751 +
 .../blur/thrift/generated/TableDescriptor.java     | 1581 ++
 .../apache/blur/thrift/generated/TableStats.java   |  723 +
 src/blur-util/pom.xml                              |    4 +-
 .../com/nearinfinity/blur/BlurConfiguration.java   |  113 -
 .../blur/concurrent/ExecutionContext.java          |   61 -
 .../nearinfinity/blur/concurrent/Executors.java    |   59 -
 .../concurrent/SimpleUncaughtExceptionHandler.java |   30 -
 .../blur/concurrent/ThreadWatcher.java             |  218 -
 .../main/java/com/nearinfinity/blur/log/Log.java   |   45 -
 .../java/com/nearinfinity/blur/log/LogFactory.java |   29 -
 .../java/com/nearinfinity/blur/log/LogImpl.java    |  173 -
 .../com/nearinfinity/blur/metrics/BlurMetrics.java |  125 -
 .../nearinfinity/blur/zookeeper/WatchChildren.java |  186 -
 .../nearinfinity/blur/zookeeper/WatchNodeData.java |  175 -
 .../blur/zookeeper/WatchNodeExistance.java         |  157 -
 .../com/nearinfinity/blur/zookeeper/ZkUtils.java   |  188 -
 .../java/org/apache/blur/BlurConfiguration.java    |  113 +
 .../apache/blur/concurrent/ExecutionContext.java   |   61 +
 .../java/org/apache/blur/concurrent/Executors.java |   59 +
 .../concurrent/SimpleUncaughtExceptionHandler.java |   30 +
 .../org/apache/blur/concurrent/ThreadWatcher.java  |  219 +
 .../src/main/java/org/apache/blur/log/Log.java     |   45 +
 .../main/java/org/apache/blur/log/LogFactory.java  |   29 +
 .../src/main/java/org/apache/blur/log/LogImpl.java |  173 +
 .../java/org/apache/blur/metrics/BlurMetrics.java  |  125 +
 .../org/apache/blur/zookeeper/WatchChildren.java   |  186 +
 .../org/apache/blur/zookeeper/WatchNodeData.java   |  175 +
 .../apache/blur/zookeeper/WatchNodeExistance.java  |  157 +
 .../java/org/apache/blur/zookeeper/ZkUtils.java    |  188 +
 .../src/main/resources/blur-default.properties     |    4 +-
 .../nearinfinity/blur/zookeeper/ZkUtilsTest.java   |  131 -
 .../org/apache/blur/zookeeper/ZkUtilsTest.java     |  133 +
 src/pom.xml                                        |   21 +-
 529 files changed, 81466 insertions(+), 81314 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/33df9310/bin/start-controller-server.sh
----------------------------------------------------------------------
diff --git a/bin/start-controller-server.sh b/bin/start-controller-server.sh
index 2a43ecf..750152b 100755
--- a/bin/start-controller-server.sh
+++ b/bin/start-controller-server.sh
@@ -33,7 +33,7 @@ while [  $INSTANCE -lt $BLUR_NUMBER_OF_CONTROLLER_SERVER_INSTANCES_PER_MACHINE ]
   fi
 
   PROC_NAME=blur-controller-server-$HOSTNAME-$INSTANCE
-  nohup "$JAVA_HOME"/bin/java -Dblur.name=$PROC_NAME -Djava.library.path=$JAVA_LIBRARY_PATH -Dblur-controller-$INSTANCE $BLUR_CONTROLLER_JVM_OPTIONS -Dblur.logs.dir=$BLUR_LOGS -Dblur.log.file=$PROC_NAME.log -cp $BLUR_CLASSPATH com.nearinfinity.blur.thrift.ThriftBlurControllerServer -s $INSTANCE > "$BLUR_LOGS/$PROC_NAME.out" 2>&1 < /dev/null &
+  nohup "$JAVA_HOME"/bin/java -Dblur.name=$PROC_NAME -Djava.library.path=$JAVA_LIBRARY_PATH -Dblur-controller-$INSTANCE $BLUR_CONTROLLER_JVM_OPTIONS -Dblur.logs.dir=$BLUR_LOGS -Dblur.log.file=$PROC_NAME.log -cp $BLUR_CLASSPATH org.apache.blur.thrift.ThriftBlurControllerServer -s $INSTANCE > "$BLUR_LOGS/$PROC_NAME.out" 2>&1 < /dev/null &
   echo $! > $PID_FILE
   echo Controller [$INSTANCE] starting as process `cat $PID_FILE`.
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/33df9310/bin/start-shard-server.sh
----------------------------------------------------------------------
diff --git a/bin/start-shard-server.sh b/bin/start-shard-server.sh
index 22cfe28..99a4611 100755
--- a/bin/start-shard-server.sh
+++ b/bin/start-shard-server.sh
@@ -33,7 +33,7 @@ while [  $INSTANCE -lt $BLUR_NUMBER_OF_SHARD_SERVER_INSTANCES_PER_MACHINE ]; do
   fi
 
   PROC_NAME=blur-shard-server-$HOSTNAME-$INSTANCE
-  nohup "$JAVA_HOME"/bin/java -Dblur.name=$PROC_NAME -Djava.library.path=$JAVA_LIBRARY_PATH -Dblur-shard-$INSTANCE $BLUR_SHARD_JVM_OPTIONS -Dblur.logs.dir=$BLUR_LOGS -Dblur.log.file=$PROC_NAME.log -cp $BLUR_CLASSPATH com.nearinfinity.blur.thrift.ThriftBlurShardServer -s $INSTANCE > "$BLUR_LOGS/$PROC_NAME.out" 2>&1 < /dev/null &
+  nohup "$JAVA_HOME"/bin/java -Dblur.name=$PROC_NAME -Djava.library.path=$JAVA_LIBRARY_PATH -Dblur-shard-$INSTANCE $BLUR_SHARD_JVM_OPTIONS -Dblur.logs.dir=$BLUR_LOGS -Dblur.log.file=$PROC_NAME.log -cp $BLUR_CLASSPATH org.apache.blur.thrift.ThriftBlurShardServer -s $INSTANCE > "$BLUR_LOGS/$PROC_NAME.out" 2>&1 < /dev/null &
   echo $! > $PID_FILE
   echo Shard [$INSTANCE] starting as process `cat $PID_FILE`.
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/33df9310/interface/Blur.thrift
----------------------------------------------------------------------
diff --git a/interface/Blur.thrift b/interface/Blur.thrift
index 82145c8..26785a4 100644
--- a/interface/Blur.thrift
+++ b/interface/Blur.thrift
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-namespace java com.nearinfinity.blur.thrift.generated
+namespace java org.apache.blur.thrift.generated
 namespace rb blur
 namespace perl Blur
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/33df9310/interface/genAndReplace.sh
----------------------------------------------------------------------
diff --git a/interface/genAndReplace.sh b/interface/genAndReplace.sh
index 1ca1f82..5bc0b0d 100755
--- a/interface/genAndReplace.sh
+++ b/interface/genAndReplace.sh
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-rm ../src/blur-thrift/src/main/java/com/nearinfinity/blur/thrift/generated/*
+rm ../src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/*
 rm -r gen-java/ gen-perl/ gen-rb/ gen-html/
 thrift --gen html --gen perl --gen java --gen rb Blur.thrift
 cp -r gen-java/* ../src/blur-thrift/src/main/java/

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/33df9310/src/blur-core/pom.xml
----------------------------------------------------------------------
diff --git a/src/blur-core/pom.xml b/src/blur-core/pom.xml
index d401a68..0294a79 100644
--- a/src/blur-core/pom.xml
+++ b/src/blur-core/pom.xml
@@ -20,12 +20,12 @@ under the License.
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
-		<groupId>com.nearinfinity.blur</groupId>
+		<groupId>org.apache.blur</groupId>
 		<artifactId>blur</artifactId>
 		<version>0.1.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.nearinfinity.blur</groupId>
+	<groupId>org.apache.blur</groupId>
 	<artifactId>blur-core</artifactId>
 	<packaging>jar</packaging>
 	<name>Blur Core</name>
@@ -36,28 +36,28 @@ under the License.
 
 	<dependencies>
 		<dependency>
-			<groupId>com.nearinfinity.blur</groupId>
+			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-thrift</artifactId>
 			<version>0.1.3</version>
 		</dependency>
 		<dependency>
-			<groupId>com.nearinfinity.blur</groupId>
+			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-store</artifactId>
 			<version>0.1.3</version>
 		</dependency>
 		<dependency>
-			<groupId>com.nearinfinity.blur</groupId>
+			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-util</artifactId>
 			<version>0.1.3</version>
 		</dependency>
 		<dependency>
-			<groupId>com.nearinfinity.blur</groupId>
+			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-gui</artifactId>
 			<version>0.1.3</version>
 			<type>jar</type>
 		</dependency>
 		<dependency>
-			<groupId>com.nearinfinity.blur</groupId>
+			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-gui</artifactId>
 			<version>0.1.3</version>
 			<type>war</type>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/33df9310/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/BlurAnalyzer.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/BlurAnalyzer.java b/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/BlurAnalyzer.java
deleted file mode 100644
index 5373304..0000000
--- a/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/BlurAnalyzer.java
+++ /dev/null
@@ -1,309 +0,0 @@
-package com.nearinfinity.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 static com.nearinfinity.blur.lucene.LuceneConstant.LUCENE_VERSION;
-import static com.nearinfinity.blur.utils.BlurConstants.PRIME_DOC;
-import static com.nearinfinity.blur.utils.BlurConstants.RECORD_ID;
-import static com.nearinfinity.blur.utils.BlurConstants.ROW_ID;
-import static com.nearinfinity.blur.utils.BlurConstants.SUPER;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.KeywordAnalyzer;
-import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
-import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.Fieldable;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.util.Version;
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TJSONProtocol;
-import org.apache.thrift.transport.TMemoryBuffer;
-import org.apache.thrift.transport.TMemoryInputTransport;
-
-import com.nearinfinity.blur.thrift.generated.AlternateColumnDefinition;
-import com.nearinfinity.blur.thrift.generated.AnalyzerDefinition;
-import com.nearinfinity.blur.thrift.generated.ColumnDefinition;
-import com.nearinfinity.blur.thrift.generated.ColumnFamilyDefinition;
-
-public class BlurAnalyzer extends Analyzer {
-
-  private static final String STANDARD = "org.apache.lucene.analysis.standard.StandardAnalyzer";
-
-  public static final BlurAnalyzer BLANK_ANALYZER = new BlurAnalyzer(new KeywordAnalyzer());
-
-  private static Map<String, Class<? extends Analyzer>> aliases = new HashMap<String, Class<? extends Analyzer>>();
-
-  private Map<String, Store> _storeMap = new HashMap<String, Store>();
-  private Map<String, Set<String>> _subIndexNameLookups = new HashMap<String, Set<String>>();
-  private Set<String> _fullTextFields = new HashSet<String>();
-  private AnalyzerDefinition _analyzerDefinition;
-  private PerFieldAnalyzerWrapper _wrapper;
-  private Analyzer _fullTextAnalyzer = new StandardAnalyzer(LUCENE_VERSION);
-
-  private HashMap<String, Analyzer> _analyzers;
-
-  public void addSubField(String name) {
-    int lastIndexOf = name.lastIndexOf('.');
-    String mainFieldName = name.substring(0, lastIndexOf);
-    Set<String> set = _subIndexNameLookups.get(mainFieldName);
-    if (set == null) {
-      set = new TreeSet<String>();
-      _subIndexNameLookups.put(mainFieldName, set);
-    }
-    set.add(name);
-  }
-
-  public Set<String> getSubIndexNames(String indexName) {
-    return _subIndexNameLookups.get(indexName);
-  }
-
-  public BlurAnalyzer(Analyzer analyzer) {
-    _analyzerDefinition = new AnalyzerDefinition();
-    _wrapper = new PerFieldAnalyzerWrapper(analyzer);
-  }
-
-  public BlurAnalyzer(AnalyzerDefinition analyzerDefinition) {
-    _analyzerDefinition = analyzerDefinition;
-    ColumnDefinition defaultDefinition = analyzerDefinition.getDefaultDefinition();
-    String fullTextAnalyzerClassName = analyzerDefinition.fullTextAnalyzerClassName;
-    if (fullTextAnalyzerClassName != null) {
-      _fullTextAnalyzer = getAnalyzerByClassName(fullTextAnalyzerClassName, aliases);
-    }
-    if (defaultDefinition == null) {
-      defaultDefinition = new ColumnDefinition(STANDARD, true, null);
-      analyzerDefinition.setDefaultDefinition(defaultDefinition);
-    }
-    Analyzer defaultAnalyzer = getAnalyzerByClassName(defaultDefinition.getAnalyzerClassName(), aliases);
-    KeywordAnalyzer keywordAnalyzer = new KeywordAnalyzer();
-    _analyzers = new HashMap<String, Analyzer>();
-    _analyzers.put(ROW_ID, keywordAnalyzer);
-    _analyzers.put(RECORD_ID, keywordAnalyzer);
-    _analyzers.put(PRIME_DOC, keywordAnalyzer);
-    _analyzers.put(SUPER, _fullTextAnalyzer);
-    load(_analyzers);
-    _wrapper = new PerFieldAnalyzerWrapper(defaultAnalyzer, _analyzers);
-  }
-
-  public FieldConverter getFieldConverter(String name) {
-    if (_analyzers == null) {
-      return null;
-    }
-    Analyzer analyzer = _analyzers.get(name);
-    if (analyzer != null && analyzer instanceof FieldConverter) {
-      return (FieldConverter) analyzer;
-    }
-    return null;
-  }
-
-  private void load(Map<String, Analyzer> analyzers) {
-    Map<String, ColumnFamilyDefinition> familyDefinitions = _analyzerDefinition.columnFamilyDefinitions;
-    if (familyDefinitions != null) {
-      for (String family : familyDefinitions.keySet()) {
-        ColumnFamilyDefinition familyDefinition = familyDefinitions.get(family);
-        load(family, familyDefinition, analyzers);
-      }
-    }
-  }
-
-  private void load(String family, ColumnFamilyDefinition familyDefinition, Map<String, Analyzer> analyzers) {
-    Map<String, ColumnDefinition> columnDefinitions = familyDefinition.columnDefinitions;
-    for (String column : columnDefinitions.keySet()) {
-      ColumnDefinition columnDefinition = columnDefinitions.get(column);
-      load(family, familyDefinition, column, columnDefinition, analyzers);
-    }
-  }
-
-  private void load(String family, ColumnFamilyDefinition familyDefinition, String column, ColumnDefinition columnDefinition, Map<String, Analyzer> analyzers) {
-    Map<String, AlternateColumnDefinition> alternateColumnDefinitions = columnDefinition.alternateColumnDefinitions;
-    if (alternateColumnDefinitions != null) {
-      for (String subColumn : alternateColumnDefinitions.keySet()) {
-        AlternateColumnDefinition alternateColumnDefinition = alternateColumnDefinitions.get(subColumn);
-        load(family, familyDefinition, column, columnDefinition, subColumn, alternateColumnDefinition, analyzers);
-      }
-    }
-    String fieldName = family + "." + column;
-    Analyzer analyzer = getAnalyzerByClassName(columnDefinition.getAnalyzerClassName(), aliases);
-    analyzers.put(fieldName, analyzer);
-    if (columnDefinition.isFullTextIndex()) {
-      _fullTextFields.add(fieldName);
-    }
-  }
-
-  private void load(String family, ColumnFamilyDefinition familyDefinition, String column, ColumnDefinition columnDefinition, String subColumn,
-      AlternateColumnDefinition alternateColumnDefinition, Map<String, Analyzer> analyzers) {
-    String fieldName = family + "." + column + "." + subColumn;
-    Analyzer analyzer = getAnalyzerByClassName(alternateColumnDefinition.getAnalyzerClassName(), aliases);
-    analyzers.put(fieldName, analyzer);
-    putStore(fieldName, Store.NO);
-    addSubField(fieldName);
-  }
-
-  public void putStore(String name, Store store) {
-    _storeMap.put(name, store);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static Analyzer getAnalyzerByClassName(String className, Map<String, Class<? extends Analyzer>> aliases) {
-    if (FieldConverterUtil.isType(className)) {
-      return FieldConverterUtil.getAnalyzer(className);
-    }
-    try {
-      Class<? extends Analyzer> clazz = aliases.get(className);
-      if (clazz == null) {
-        clazz = (Class<? extends Analyzer>) Class.forName(className);
-      }
-      try {
-        return (Analyzer) clazz.newInstance();
-      } catch (Exception e) {
-        Constructor<?> constructor = clazz.getConstructor(new Class[] { Version.class });
-        return (Analyzer) constructor.newInstance(LUCENE_VERSION);
-      }
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  public Store getStore(String indexName) {
-    Store store = _storeMap.get(indexName);
-    if (store == null) {
-      return Store.YES;
-    }
-    return store;
-  }
-
-  public Index getIndex(String indexName) {
-    return Index.ANALYZED_NO_NORMS;
-  }
-
-  public String toJSON() {
-    TMemoryBuffer trans = new TMemoryBuffer(1024);
-    TJSONProtocol protocol = new TJSONProtocol(trans);
-    try {
-      _analyzerDefinition.write(protocol);
-    } catch (TException e) {
-      throw new RuntimeException(e);
-    }
-    trans.close();
-    byte[] array = trans.getArray();
-    return new String(array, 0, trans.length());
-  }
-
-  public boolean isFullTextField(String fieldName) {
-    ColumnDefinition defaultDefinition = _analyzerDefinition.getDefaultDefinition();
-    if (defaultDefinition != null && defaultDefinition.fullTextIndex) {
-      return true;
-    }
-    return _fullTextFields.contains(fieldName);
-  }
-
-  public AnalyzerDefinition getAnalyzerDefinition() {
-    return _analyzerDefinition;
-  }
-
-  public void close() {
-    _wrapper.close();
-  }
-
-  public int getOffsetGap(Fieldable field) {
-    return _wrapper.getOffsetGap(field);
-  }
-
-  public int getPositionIncrementGap(String fieldName) {
-    return _wrapper.getPositionIncrementGap(fieldName);
-  }
-
-  public final TokenStream reusableTokenStream(String fieldName, Reader reader) throws IOException {
-    return _wrapper.reusableTokenStream(fieldName, reader);
-  }
-
-  public final TokenStream tokenStream(String fieldName, Reader reader) {
-    return _wrapper.tokenStream(fieldName, reader);
-  }
-
-  public static BlurAnalyzer create(File file) throws IOException {
-    FileInputStream inputStream = new FileInputStream(file);
-    try {
-      return create(inputStream);
-    } finally {
-      inputStream.close();
-    }
-  }
-
-  public static BlurAnalyzer create(InputStream inputStream) throws IOException {
-    TMemoryInputTransport trans = new TMemoryInputTransport(getBytes(inputStream));
-    TJSONProtocol protocol = new TJSONProtocol(trans);
-    AnalyzerDefinition analyzerDefinition = new AnalyzerDefinition();
-    try {
-      analyzerDefinition.read(protocol);
-    } catch (TException e) {
-      throw new RuntimeException(e);
-    }
-    trans.close();
-    return new BlurAnalyzer(analyzerDefinition);
-  }
-
-  private static byte[] getBytes(InputStream inputStream) throws IOException {
-    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-    byte[] buffer = new byte[1024];
-    int num;
-    while ((num = inputStream.read(buffer)) != -1) {
-      outputStream.write(buffer, 0, num);
-    }
-    inputStream.close();
-    outputStream.close();
-    return outputStream.toByteArray();
-  }
-
-  public static BlurAnalyzer create(String jsonStr) throws IOException {
-    InputStream inputStream = new ByteArrayInputStream(jsonStr.getBytes());
-    try {
-      return create(inputStream);
-    } finally {
-      inputStream.close();
-    }
-  }
-
-  public static BlurAnalyzer create(Path path) throws IOException {
-    FileSystem fileSystem = FileSystem.get(path.toUri(), new Configuration());
-    FSDataInputStream inputStream = fileSystem.open(path);
-    try {
-      return create(inputStream);
-    } finally {
-      inputStream.close();
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/33df9310/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/FieldConverter.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/FieldConverter.java b/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/FieldConverter.java
deleted file mode 100644
index a5c3607..0000000
--- a/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/FieldConverter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.nearinfinity.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 org.apache.lucene.document.Fieldable;
-
-public interface FieldConverter {
-
-  Fieldable convert(Fieldable orig);
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/33df9310/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/FieldConverterUtil.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/FieldConverterUtil.java b/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/FieldConverterUtil.java
deleted file mode 100644
index f0cb942..0000000
--- a/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/FieldConverterUtil.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.nearinfinity.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.util.List;
-
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Fieldable;
-
-public class FieldConverterUtil {
-
-  private static final String LONG = "long";
-
-  /**
-   * This method runs the converter on each of the fields in the document and
-   * returns the a new document.
-   * 
-   * @param document
-   *          the original document.
-   * @param converter
-   *          the converter.
-   * @return the original document.
-   */
-  public static Document convert(Document document, FieldConverter converter) {
-    List<Fieldable> fields = document.getFields();
-    int size = fields.size();
-    for (int i = 0; i < size; i++) {
-      Fieldable origField = fields.get(i);
-      Fieldable newField = converter.convert(origField);
-      if (newField != null) {
-        fields.set(i, newField);
-      }
-    }
-    return document;
-  }
-
-  public static Document convert(Document document, BlurAnalyzer analyzer) {
-    List<Fieldable> fields = document.getFields();
-    int size = fields.size();
-    for (int i = 0; i < size; i++) {
-      Fieldable origField = fields.get(i);
-      FieldConverter converter = analyzer.getFieldConverter(origField.name());
-      if (converter != null) {
-        Fieldable newField = converter.convert(origField);
-        if (newField != null) {
-          fields.set(i, newField);
-        }
-      }
-    }
-    return document;
-  }
-
-  public static boolean isType(String type) {
-    if (type.startsWith(LONG)) {
-      return true;
-    }
-    return false;
-  }
-
-  public static Analyzer getAnalyzer(String type) {
-    if (type.startsWith(LONG)) {
-      return new LongAnalyzer(type);
-    }
-    throw new RuntimeException("Type [" + type + "] not found.");
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/33df9310/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/LongAnalyzer.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/LongAnalyzer.java b/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/LongAnalyzer.java
deleted file mode 100644
index 88dbabd..0000000
--- a/src/blur-core/src/main/java/com/nearinfinity/blur/analysis/LongAnalyzer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.nearinfinity.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.Reader;
-
-import org.apache.lucene.analysis.KeywordTokenizer;
-import org.apache.lucene.analysis.ReusableAnalyzerBase;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.Fieldable;
-import org.apache.lucene.document.NumericField;
-import org.apache.lucene.util.NumericUtils;
-
-public class LongAnalyzer extends ReusableAnalyzerBase implements FieldConverter {
-
-  private static final String TYPE = "long";
-
-  private int precisionStepDefault = NumericUtils.PRECISION_STEP_DEFAULT;
-
-  public LongAnalyzer(String typeStr) {
-    if (typeStr.startsWith(TYPE)) {
-      int index = typeStr.indexOf(',');
-      if (index > 0) {
-        String s = typeStr.substring(index + 1);
-        try {
-          precisionStepDefault = Integer.parseInt(s);
-        } catch (NumberFormatException e) {
-          throw new RuntimeException("Can not parser [" + s + "] into an integer for the precisionStepDefault.");
-        }
-      }
-    } else {
-      throw new RuntimeException("Long type can not parser [" + typeStr + "]");
-    }
-  }
-
-  @Override
-  protected TokenStreamComponents createComponents(final String fieldName, final Reader reader) {
-    return new TokenStreamComponents(new KeywordTokenizer(reader));
-  }
-
-  @Override
-  public Fieldable convert(Fieldable fieldable) {
-    long value = Long.parseLong(fieldable.stringValue().trim());
-    NumericField field = new NumericField(fieldable.name(), precisionStepDefault, fieldable.isStored() ? Store.YES : Store.NO, true);
-    field.setLongValue(value);
-    return field;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/33df9310/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/AbstractWrapperQuery.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/AbstractWrapperQuery.java b/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/AbstractWrapperQuery.java
deleted file mode 100644
index 523b71f..0000000
--- a/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/AbstractWrapperQuery.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.nearinfinity.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.io.IOException;
-import java.util.Set;
-
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Searcher;
-import org.apache.lucene.search.Similarity;
-import org.apache.lucene.search.Weight;
-
-@SuppressWarnings("deprecation")
-public abstract class AbstractWrapperQuery extends Query {
-  private static final long serialVersionUID = -4512813621542220044L;
-  protected Query _query;
-  protected boolean _rewritten;
-
-  public AbstractWrapperQuery(Query query) {
-    this(query, false);
-  }
-
-  public AbstractWrapperQuery(Query query, boolean rewritten) {
-    this._query = query;
-    this._rewritten = rewritten;
-  }
-
-  public abstract Object clone();
-
-  public Query combine(Query[] queries) {
-    return _query.combine(queries);
-  }
-
-  public abstract Weight createWeight(Searcher searcher) throws IOException;
-
-  public boolean equals(Object obj) {
-    return _query.equals(obj);
-  }
-
-  public void extractTerms(Set<Term> terms) {
-    _query.extractTerms(terms);
-  }
-
-  public float getBoost() {
-    return _query.getBoost();
-  }
-
-  public Similarity getSimilarity(Searcher searcher) {
-    return _query.getSimilarity(searcher);
-  }
-
-  public int hashCode() {
-    return _query.hashCode();
-  }
-
-  public abstract Query rewrite(IndexReader reader) throws IOException;
-
-  public void setBoost(float b) {
-    _query.setBoost(b);
-  }
-
-  public abstract String toString();
-
-  public abstract String toString(String field);
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/33df9310/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/FacetQuery.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/FacetQuery.java b/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/FacetQuery.java
deleted file mode 100644
index 5c9e72f..0000000
--- a/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/FacetQuery.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package com.nearinfinity.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.io.IOException;
-import java.util.concurrent.atomic.AtomicLongArray;
-
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.Explanation;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.Searcher;
-import org.apache.lucene.search.Weight;
-
-@SuppressWarnings("deprecation")
-public class FacetQuery extends AbstractWrapperQuery {
-
-  private static final long serialVersionUID = -9131606859383383004L;
-  private Query[] facets;
-  private AtomicLongArray counts;
-
-  public FacetQuery(Query query, Query[] facets, AtomicLongArray counts) {
-    super(query, false);
-    this.facets = facets;
-    this.counts = counts;
-  }
-
-  public FacetQuery(Query query, Query[] facets, AtomicLongArray counts, boolean rewritten) {
-    super(query, rewritten);
-    this.facets = facets;
-    this.counts = counts;
-  }
-
-  public String toString() {
-    return "facet:{" + _query.toString() + "}";
-  }
-
-  public String toString(String field) {
-    return "facet:{" + _query.toString(field) + "}";
-  }
-
-  @Override
-  public Object clone() {
-    return new FacetQuery((Query) _query.clone(), facets, counts, _rewritten);
-  }
-
-  @Override
-  public Query rewrite(IndexReader reader) throws IOException {
-    if (_rewritten) {
-      return this;
-    }
-    for (int i = 0; i < facets.length; i++) {
-      facets[i] = facets[i].rewrite(reader);
-    }
-    return new FacetQuery(_query.rewrite(reader), facets, counts, true);
-  }
-
-  @Override
-  public Weight createWeight(Searcher searcher) throws IOException {
-    Weight weight = _query.createWeight(searcher);
-    return new FacetWeight(weight, getWeights(searcher), counts);
-  }
-
-  private Weight[] getWeights(Searcher searcher) throws IOException {
-    Weight[] weights = new Weight[facets.length];
-    for (int i = 0; i < weights.length; i++) {
-      weights[i] = facets[i].createWeight(searcher);
-    }
-    return weights;
-  }
-
-  public static class FacetWeight extends Weight {
-
-    private static final long serialVersionUID = -5649908738708119094L;
-    private Weight weight;
-    private Weight[] facets;
-    private AtomicLongArray counts;
-
-    public FacetWeight(Weight weight, Weight[] facets, AtomicLongArray counts) {
-      this.weight = weight;
-      this.facets = facets;
-      this.counts = counts;
-    }
-
-    @Override
-    public Explanation explain(IndexReader reader, int doc) throws IOException {
-      return weight.explain(reader, doc);
-    }
-
-    @Override
-    public Query getQuery() {
-      return weight.getQuery();
-    }
-
-    @Override
-    public float getValue() {
-      return weight.getValue();
-    }
-
-    @Override
-    public void normalize(float norm) {
-      weight.normalize(norm);
-    }
-
-    @Override
-    public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) throws IOException {
-      Scorer scorer = weight.scorer(reader, true, topScorer);
-      if (scorer == null) {
-        return null;
-      }
-      return new FacetScorer(scorer, getScorers(reader, true, topScorer), counts);
-    }
-
-    private Scorer[] getScorers(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) throws IOException {
-      Scorer[] scorers = new Scorer[facets.length];
-      for (int i = 0; i < scorers.length; i++) {
-        scorers[i] = facets[i].scorer(reader, scoreDocsInOrder, topScorer);
-      }
-      return scorers;
-    }
-
-    @Override
-    public float sumOfSquaredWeights() throws IOException {
-      return weight.sumOfSquaredWeights();
-    }
-  }
-
-  public static class FacetScorer extends Scorer {
-
-    private Scorer baseScorer;
-    private Scorer[] facets;
-    private AtomicLongArray counts;
-    private int facetLength;
-
-    public FacetScorer(Scorer scorer, Scorer[] facets, AtomicLongArray counts) {
-      super(scorer.getSimilarity());
-      this.baseScorer = scorer;
-      this.facets = facets;
-      this.counts = counts;
-      this.facetLength = facets.length;
-    }
-
-    private int processFacets(int doc) throws IOException {
-      if (doc == NO_MORE_DOCS) {
-        return doc;
-      }
-      for (int i = 0; i < facetLength; i++) {
-        Scorer facet = facets[i];
-        if (facet == null) {
-          continue;
-        }
-        int docID = facet.docID();
-        if (docID == NO_MORE_DOCS) {
-          continue;
-        }
-        if (docID == doc) {
-          counts.incrementAndGet(i);
-        } else if (docID < doc) {
-          if (facet.advance(doc) == doc) {
-            counts.incrementAndGet(i);
-          }
-        }
-      }
-      return doc;
-    }
-
-    @Override
-    public float score() throws IOException {
-      return baseScorer.score();
-    }
-
-    @Override
-    public int advance(int target) throws IOException {
-      return processFacets(baseScorer.advance(target));
-    }
-
-    @Override
-    public int docID() {
-      return baseScorer.docID();
-    }
-
-    @Override
-    public int nextDoc() throws IOException {
-      return processFacets(baseScorer.nextDoc());
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/33df9310/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/FairSimilarity.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/FairSimilarity.java b/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/FairSimilarity.java
deleted file mode 100644
index 536e7d1..0000000
--- a/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/FairSimilarity.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.nearinfinity.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 org.apache.lucene.index.FieldInvertState;
-import org.apache.lucene.search.Similarity;
-
-public class FairSimilarity extends Similarity {
-
-  private static final long serialVersionUID = 8819964136561756067L;
-
-  @Override
-  public float coord(int overlap, int maxOverlap) {
-    return 1;
-  }
-
-  @Override
-  public float idf(int docFreq, int numDocs) {
-    return 1;
-  }
-
-  @Override
-  public float queryNorm(float sumOfSquaredWeights) {
-    return 1;
-  }
-
-  @Override
-  public float sloppyFreq(int distance) {
-    return 1;
-  }
-
-  @Override
-  public float tf(float freq) {
-    return 1;
-  }
-
-  @Override
-  public float computeNorm(String field, FieldInvertState state) {
-    return 1;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/33df9310/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/IterablePaging.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/IterablePaging.java b/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/IterablePaging.java
deleted file mode 100644
index e8e478c..0000000
--- a/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/IterablePaging.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package com.nearinfinity.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.io.IOException;
-import java.util.Iterator;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.ScoreDoc;
-
-/**
- * The {@link IterablePaging} class allows for easy paging through lucene hits.
- */
-public class IterablePaging implements Iterable<ScoreDoc> {
-
-  private static int DEFAULT_NUMBER_OF_HITS_TO_COLLECT = 1000;
-  private IndexSearcher searcher;
-  private Query query;
-  private TotalHitsRef totalHitsRef = new TotalHitsRef();
-  private ProgressRef progressRef = new ProgressRef();
-  private int skipTo;
-  private int numHitsToCollect = DEFAULT_NUMBER_OF_HITS_TO_COLLECT;
-  private int gather = -1;
-  private AtomicBoolean running;
-
-  public IterablePaging(AtomicBoolean running, IndexSearcher searcher, Query query) throws IOException {
-    this(running, searcher, query, DEFAULT_NUMBER_OF_HITS_TO_COLLECT, null, null);
-  }
-
-  public IterablePaging(AtomicBoolean running, IndexSearcher searcher, Query query, int numHitsToCollect) throws IOException {
-    this(running, searcher, query, numHitsToCollect, null, null);
-  }
-
-  public IterablePaging(AtomicBoolean running, IndexSearcher searcher, Query query, int numHitsToCollect, TotalHitsRef totalHitsRef, ProgressRef progressRef) throws IOException {
-    this.running = running;
-    this.query = searcher.rewrite(query);
-    this.searcher = searcher;
-    this.numHitsToCollect = numHitsToCollect;
-    this.totalHitsRef = totalHitsRef == null ? this.totalHitsRef : totalHitsRef;
-    this.progressRef = progressRef == null ? this.progressRef : progressRef;
-  }
-
-  public static class TotalHitsRef {
-    // This is an atomic integer because more than likely if there is
-    // any status sent to the user, it will be done in another thread.
-    protected AtomicInteger totalHits = new AtomicInteger(0);
-
-    public int totalHits() {
-      return totalHits.get();
-    }
-  }
-
-  public static class ProgressRef {
-    // These are atomic integers because more than likely if there is
-    // any status sent to the user, it will be done in another thread.
-    protected AtomicInteger skipTo = new AtomicInteger(0);
-    protected AtomicInteger currentHitPosition = new AtomicInteger(0);
-    protected AtomicInteger searchesPerformed = new AtomicInteger(0);
-    protected AtomicLong queryTime = new AtomicLong(0);
-
-    public int skipTo() {
-      return skipTo.get();
-    }
-
-    public int currentHitPosition() {
-      return currentHitPosition.get();
-    }
-
-    public int searchesPerformed() {
-      return searchesPerformed.get();
-    }
-
-    public long queryTime() {
-      return queryTime.get();
-    }
-  }
-
-  /**
-   * Gets the total hits of the search.
-   * 
-   * @return the total hits.
-   */
-  public int getTotalHits() {
-    return totalHitsRef.totalHits();
-  }
-
-  /**
-   * Allows for gathering of the total hits of this search.
-   * 
-   * @param ref
-   *          {@link TotalHitsRef}.
-   * @return this.
-   */
-  public IterablePaging totalHits(TotalHitsRef ref) {
-    totalHitsRef = ref;
-    return this;
-  }
-
-  /**
-   * Skips the first x number of hits.
-   * 
-   * @param skipTo
-   *          the number hits to skip.
-   * @return this.
-   */
-  public IterablePaging skipTo(int skipTo) {
-    this.skipTo = skipTo;
-    return this;
-  }
-
-  /**
-   * Only gather up to x number of hits.
-   * 
-   * @param gather
-   *          the number of hits to gather.
-   * @return this.
-   */
-  public IterablePaging gather(int gather) {
-    this.gather = gather;
-    return this;
-  }
-
-  /**
-   * Allows for gathering the progress of the paging.
-   * 
-   * @param ref
-   *          the {@link ProgressRef}.
-   * @return this.
-   */
-  public IterablePaging progress(ProgressRef ref) {
-    this.progressRef = ref;
-    return this;
-  }
-
-  /**
-   * The {@link ScoreDoc} iterator.
-   */
-  @Override
-  public Iterator<ScoreDoc> iterator() {
-    return skipHits(new PagingIterator());
-  }
-
-  class PagingIterator implements Iterator<ScoreDoc> {
-    private PagingCollector collector;
-    private ScoreDoc[] scoreDocs;
-    private int counter = 0;
-    private int offset = 0;
-    private int endPosition = gather == -1 ? Integer.MAX_VALUE : skipTo + gather;
-
-    PagingIterator() {
-      search();
-    }
-
-    void search() {
-      long s = System.currentTimeMillis();
-      progressRef.searchesPerformed.incrementAndGet();
-      if (collector == null) {
-        collector = new PagingCollector(numHitsToCollect);
-      } else {
-        collector = new PagingCollector(numHitsToCollect, scoreDocs[scoreDocs.length - 1]);
-      }
-      try {
-        StopExecutionCollector stopExecutionCollector = new StopExecutionCollector(collector, running);
-        searcher.search(query, stopExecutionCollector);
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-
-      totalHitsRef.totalHits.set(collector.getTotalHits());
-      scoreDocs = collector.topDocs().scoreDocs;
-      long e = System.currentTimeMillis();
-      progressRef.queryTime.addAndGet(e - s);
-    }
-
-    @Override
-    public boolean hasNext() {
-      return counter < totalHitsRef.totalHits() && counter < endPosition ? true : false;
-    }
-
-    @Override
-    public ScoreDoc next() {
-      if (isCurrentCollectorExhausted()) {
-        search();
-        offset = 0;
-      }
-      progressRef.currentHitPosition.set(counter);
-      counter++;
-      return scoreDocs[offset++];
-    }
-
-    private boolean isCurrentCollectorExhausted() {
-      return offset < scoreDocs.length ? false : true;
-    }
-
-    @Override
-    public void remove() {
-      throw new RuntimeException("read only");
-    }
-  }
-
-  private Iterator<ScoreDoc> skipHits(Iterator<ScoreDoc> iterator) {
-    progressRef.skipTo.set(skipTo);
-    for (int i = 0; i < skipTo && iterator.hasNext(); i++) {
-      // eats the hits, and moves the iterator to the desired skip to position.
-      progressRef.currentHitPosition.set(i);
-      iterator.next();
-    }
-    return iterator;
-  }
-
-  public static void setDefaultNumberOfHitsToCollect(int num) {
-    DEFAULT_NUMBER_OF_HITS_TO_COLLECT = num;
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/33df9310/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/PagingCollector.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/PagingCollector.java b/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/PagingCollector.java
deleted file mode 100644
index 17ce60b..0000000
--- a/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/PagingCollector.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.nearinfinity.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.io.IOException;
-
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.TopDocsCollector;
-import org.apache.lucene.util.PriorityQueue;
-
-/**
- * The {@link PagingCollector} allows for paging through lucene hits.
- */
-public class PagingCollector extends TopDocsCollector<ScoreDoc> {
-
-  private ScoreDoc pqTop;
-  private int docBase;
-  private Scorer scorer;
-  private ScoreDoc previousPassLowest;
-  private int numHits;
-
-  public PagingCollector(int numHits) {
-    // creates an empty score doc so that i don't have to check for null
-    // each time.
-    this(numHits, new ScoreDoc(-1, Float.MAX_VALUE));
-  }
-
-  public PagingCollector(int numHits, ScoreDoc previousPassLowest) {
-    super(new HitQueue(numHits, true));
-    this.pqTop = pq.top();
-    this.numHits = numHits;
-    this.previousPassLowest = previousPassLowest;
-  }
-
-  @Override
-  public boolean acceptsDocsOutOfOrder() {
-    return true;
-  }
-
-  @Override
-  public void collect(int doc) throws IOException {
-    float score = scorer.score();
-    totalHits++;
-    doc += docBase;
-    if (score > previousPassLowest.score) {
-      // this hit was gathered on a previous page.
-      return;
-    } else if (score == previousPassLowest.score && doc <= previousPassLowest.doc) {
-      // if the scores are the same and the doc is less than or equal to the
-      // previous pass lowest hit doc then skip because this collector favors
-      // lower number documents.
-      return;
-    } else if (score < pqTop.score || (score == pqTop.score && doc > pqTop.doc)) {
-      return;
-    }
-    pqTop.doc = doc;
-    pqTop.score = score;
-    pqTop = pq.updateTop();
-  }
-
-  @Override
-  public void setNextReader(IndexReader reader, int docBase) throws IOException {
-    this.docBase = docBase;
-  }
-
-  @Override
-  public void setScorer(Scorer scorer) throws IOException {
-    this.scorer = scorer;
-  }
-
-  public ScoreDoc getLastScoreDoc(TopDocs topDocs) {
-    return topDocs.scoreDocs[(totalHits < numHits ? totalHits : numHits) - 1];
-  }
-
-  public ScoreDoc getLastScoreDoc(ScoreDoc[] scoreDocs) {
-    return scoreDocs[(totalHits < numHits ? totalHits : numHits) - 1];
-  }
-
-  public static class HitQueue extends PriorityQueue<ScoreDoc> {
-
-    private boolean prePopulate;
-
-    HitQueue(int size, boolean prePopulate) {
-      this.prePopulate = prePopulate;
-      initialize(size);
-    }
-
-    @Override
-    protected ScoreDoc getSentinelObject() {
-      return !prePopulate ? null : new ScoreDoc(Integer.MAX_VALUE, Float.NEGATIVE_INFINITY);
-    }
-
-    @Override
-    protected final boolean lessThan(ScoreDoc hitA, ScoreDoc hitB) {
-      if (hitA.score == hitB.score) {
-        return hitA.doc > hitB.doc;
-      } else {
-        return hitA.score < hitB.score;
-      }
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/33df9310/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/StopExecutionCollector.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/StopExecutionCollector.java b/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/StopExecutionCollector.java
deleted file mode 100644
index 41d5a73..0000000
--- a/src/blur-core/src/main/java/com/nearinfinity/blur/lucene/search/StopExecutionCollector.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.nearinfinity.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.io.IOException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.Collector;
-import org.apache.lucene.search.Scorer;
-
-public class StopExecutionCollector extends Collector {
-
-  private static final long _5MS = TimeUnit.MILLISECONDS.toNanos(5);
-
-  private Collector _collector;
-  private AtomicBoolean _running;
-  private long last;
-
-  public StopExecutionCollector(Collector collector, AtomicBoolean running) {
-    _collector = collector;
-    _running = running;
-  }
-
-  public static class StopExecutionCollectorException extends RuntimeException {
-    private static final long serialVersionUID = 5753875017543945163L;
-  }
-
-  public boolean acceptsDocsOutOfOrder() {
-    return _collector.acceptsDocsOutOfOrder();
-  }
-
-  public void collect(int doc) throws IOException {
-    long now = System.nanoTime();
-    if (last + _5MS < now) {
-      if (!_running.get()) {
-        throw new StopExecutionCollectorException();
-      }
-      last = now;
-    }
-    _collector.collect(doc);
-  }
-
-  public void setNextReader(IndexReader reader, int docBase) throws IOException {
-    _collector.setNextReader(reader, docBase);
-  }
-
-  public void setScorer(Scorer scorer) throws IOException {
-    _collector.setScorer(scorer);
-  }
-
-}


Mime
View raw message