Updated Branches: refs/heads/0.2-dev cf5a06edc -> 590073485
Merge branch '0.2-dev-removing-old-thrift' into 0.2-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/59007348 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/59007348 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/59007348 Branch: refs/heads/0.2-dev Commit: 5900734854c9975f379587b16f166258c0c8d98a Parents: cf5a06e 8e6a0bf Author: Aaron McCurry <[email protected]> Authored: Mon Dec 10 21:20:22 2012 -0500 Committer: Aaron McCurry <[email protected]> Committed: Mon Dec 10 21:20:22 2012 -0500 ---------------------------------------------------------------------- bin/controllers.sh | 34 - bin/servers.sh | 34 + bin/shards.sh | 34 - bin/start-all.sh | 5 +- bin/start-controller-server.sh | 41 - bin/start-controllers.sh | 24 - bin/start-server.sh | 43 + bin/start-shard-server.sh | 43 - bin/start-shards.sh | 25 - bin/stop-all.sh | 4 +- bin/stop-controller-server.sh | 38 - bin/stop-controllers.sh | 24 - bin/stop-server.sh | 38 + bin/stop-shard-server.sh | 38 - bin/stop-shards.sh | 24 - interface/Blur.thrift | 934 +- interface/gen-html/Blur.html | 719 +- interface/gen-html/index.html | 74 +- .../generated/AlternateColumnDefinition.java | 420 - .../org/apache/blur/thrift/generated/Analyzer.java | 477 + .../blur/thrift/generated/AnalyzerDefinition.java | 717 - .../blur/thrift/generated/AnalyzerSubType.java | 538 + .../apache/blur/thrift/generated/AnalyzerType.java | 715 + .../apache/blur/thrift/generated/Attribute.java | 632 - .../org/apache/blur/thrift/generated/Blur.java |14948 ++++++--------- .../apache/blur/thrift/generated/BlurQuery.java | 2019 -- .../blur/thrift/generated/BlurQueryStatus.java | 1044 - .../apache/blur/thrift/generated/BlurResult.java | 647 - .../apache/blur/thrift/generated/BlurResults.java | 1208 -- .../blur/thrift/generated/ClassDefinition.java | 569 + .../org/apache/blur/thrift/generated/Column.java | 532 - .../blur/thrift/generated/ColumnDefinition.java | 674 - .../thrift/generated/ColumnFamilyDefinition.java | 602 - .../blur/thrift/generated/ColumnPreCache.java | 472 - .../apache/blur/thrift/generated/DocLocation.java | 497 - .../org/apache/blur/thrift/generated/Document.java | 44 +- .../apache/blur/thrift/generated/ExpertQuery.java | 554 - .../org/apache/blur/thrift/generated/Facet.java | 508 - .../blur/thrift/generated/FetchRecordResult.java | 537 - .../apache/blur/thrift/generated/FetchResult.java | 870 - .../blur/thrift/generated/FetchRowResult.java | 425 - .../org/apache/blur/thrift/generated/Field.java | 3 + .../apache/blur/thrift/generated/Generation.java | 637 + .../apache/blur/thrift/generated/LiveSchema.java | 631 + .../blur/thrift/generated/MutateOptions.java | 42 +- .../apache/blur/thrift/generated/QueryArgs.java | 246 +- .../apache/blur/thrift/generated/QuerySession.java | 510 - .../apache/blur/thrift/generated/QueryStatus.java | 821 + .../org/apache/blur/thrift/generated/Record.java | 698 - .../blur/thrift/generated/RecordMutation.java | 545 - .../blur/thrift/generated/RecordMutationType.java | 77 - .../org/apache/blur/thrift/generated/Row.java | 704 - .../apache/blur/thrift/generated/RowMutation.java | 1022 - .../blur/thrift/generated/RowMutationType.java | 73 - .../org/apache/blur/thrift/generated/Schema.java | 631 - .../org/apache/blur/thrift/generated/ScoreDoc.java | 99 +- .../apache/blur/thrift/generated/ScoreType.java | 77 - .../org/apache/blur/thrift/generated/Selector.java | 1235 -- .../org/apache/blur/thrift/generated/Session.java | 169 +- .../apache/blur/thrift/generated/ShardServer.java | 8047 -------- .../apache/blur/thrift/generated/SimpleQuery.java | 879 - .../org/apache/blur/thrift/generated/Sort.java | 36 +- .../org/apache/blur/thrift/generated/SortType.java | 33 +- .../org/apache/blur/thrift/generated/TYPE.java | 53 +- .../blur/thrift/generated/TableDescriptor.java | 1402 +- .../apache/blur/thrift/generated/TableStats.java | 352 +- .../org/apache/blur/thrift/generated/Term.java | 16 +- .../apache/blur/thrift/generated/TopFieldDocs.java | 72 +- .../blur/thrift/generated/UpdatePackage.java | 55 +- interface/gen-perl/Blur/Blur.pm | 3805 ++--- interface/gen-perl/Blur/ShardServer.pm | 2065 -- interface/gen-perl/Blur/Types.pm | 3645 +--- interface/gen-rb/blur.rb | 1130 +- interface/gen-rb/blur_types.rb | 831 +- interface/gen-rb/shard_server.rb | 514 - .../org/apache/blur/analysis/BlurAnalyzer.java | 357 +- .../org/apache/blur/analysis/DoubleAnalyzer.java | 83 - .../org/apache/blur/analysis/FloatAnalyzer.java | 86 - .../blur/analysis/IndexableFieldFactory.java | 22 + .../org/apache/blur/analysis/IntegerAnalyzer.java | 101 - .../org/apache/blur/analysis/LongAnalyzer.java | 101 - .../apache/blur/lucene/search/FairSimilarity.java | 60 - .../apache/blur/lucene/search/IterablePaging.java | 234 - .../apache/blur/lucene/search/PagingCollector.java | 120 - .../org/apache/blur/lucene/search/ScoreType.java | 6 + .../org/apache/blur/lucene/search/SuperParser.java | 245 - .../org/apache/blur/lucene/search/SuperQuery.java | 1 - .../org/apache/blur/manager/BlurQueryChecker.java | 66 - .../java/org/apache/blur/manager/IndexManager.java | 988 - .../java/org/apache/blur/manager/IndexServer.java | 29 - .../org/apache/blur/manager/QueryParserUtil.java | 64 - .../blur/manager/clusterstatus/ClusterStatus.java | 52 +- .../clusterstatus/ZookeeperClusterStatus.java | 365 +- .../indexserver/DistributedIndexServer.java | 126 +- .../blur/manager/indexserver/LocalIndexServer.java | 22 - .../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 - .../blur/manager/stats/MergerTableStats.java | 6 +- .../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 | 7 - .../org/apache/blur/manager/writer/BlurIndex.java | 18 +- .../blur/manager/writer/BlurIndexReader.java | 24 +- .../apache/blur/manager/writer/BlurNRTIndex.java | 31 +- .../blur/manager/writer/TransactionRecorder.java | 2 +- .../apache/blur/thrift/BlurControllerServer.java | 811 - .../java/org/apache/blur/thrift/BlurServer.java | 627 + .../org/apache/blur/thrift/BlurShardServer.java | 625 - .../org/apache/blur/thrift/MutationHelper.java | 69 - .../java/org/apache/blur/thrift/SessionInfo.java | 10 + .../java/org/apache/blur/thrift/TableAdmin.java | 203 +- .../java/org/apache/blur/thrift/TableLayout.java | 11 + .../blur/thrift/ThriftBlurControllerServer.java | 164 - .../org/apache/blur/thrift/ThriftBlurServer.java | 280 + .../apache/blur/thrift/ThriftBlurShardServer.java | 263 - .../org/apache/blur/thrift/lucene/Convert.java | 428 - .../java/org/apache/blur/utils/BlurConstants.java | 7 - .../org/apache/blur/utils/BlurThriftRecord.java | 46 - .../main/java/org/apache/blur/utils/BlurUtil.java | 224 +- .../org/apache/blur/utils/PeekableIterator.java | 66 + .../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/RowDocumentUtil.java | 41 - .../java/org/apache/blur/utils/RowIndexWriter.java | 141 - .../apache/blur/utils/ThriftLuceneConversion.java | 484 + .../src/test/java/org/apache/blur/MiniCluster.java | 141 +- .../org/apache/blur/analysis/BlurAnalyzerTest.java | 104 +- .../apache/blur/analysis/DoubleAnalyzerTest.java | 94 - .../apache/blur/analysis/FloatAnalyzerTest.java | 94 - .../apache/blur/analysis/IntegerAnalyzerTest.java | 105 - .../org/apache/blur/analysis/LongAnalyzerTest.java | 107 - .../apache/blur/lucene/search/SuperParserTest.java | 236 - .../org/apache/blur/manager/IndexManagerTest.java | 892 - .../clusterstatus/ZookeeperClusterStatusTest.java | 87 +- .../BlurResultPeekableIteratorComparatorTest.java | 55 - .../results/MultipleBlurResultIterableTest.java | 55 - .../blur/manager/results/PeekableIteratorTest.java | 54 - .../blur/manager/writer/BlurNRTIndexTest.java | 43 +- .../manager/writer/TransactionRecorderTest.java | 39 +- .../apache/blur/search/RandomSuperQueryTest.java | 70 +- .../org/apache/blur/search/SuperQueryTest.java | 81 +- .../apache/blur/search/TestingPagingCollector.java | 84 - .../org/apache/blur/thrift/BlurClusterTest.java | 119 - .../blur/thrift/BlurControllerServerTest.java | 334 - .../apache/blur/thrift/BlurShardServerTest.java | 151 - .../org/apache/blur/thrift/DoNothingServer.java | 174 - .../org/apache/blur/thrift/ITBlurClusterTest.java | 253 + .../java/org/apache/blur/utils/BlurUtilsTest.java | 42 - .../java/org/apache/blur/gui/HttpJettyServer.java | 13 +- .../apache/blur/example/BlurExampleIndexer.java | 53 + .../blur/example/BlurExampleIndexerRebuild.java | 79 + .../org/apache/blur/example/BlurExampleMapper.java | 49 + .../blur/hadoop/io/AddDocumentsWritable.java | 63 + .../apache/blur/hadoop/io/DeleteTermsWritable.java | 59 + .../apache/blur/hadoop/io/DocumentWritable.java | 52 + .../org/apache/blur/hadoop/io/HadoopTransport.java | 94 + .../org/apache/blur/hadoop/io/MutateWritable.java | 7 + .../apache/blur/hadoop/io/ScoreDocWritable.java | 54 + .../org/apache/blur/hadoop/io/TermWritable.java | 47 + .../blur/hadoop/io/UpdatePackageWritable.java | 47 + .../blur/hadoop/io/UpdatePackagesWritable.java | 59 + .../org/apache/blur/mapred/BlurInputFormat.java | 64 +- .../java/org/apache/blur/mapred/BlurReader.java | 166 + .../org/apache/blur/mapred/BlurRecordReader.java | 108 - .../example/BlurExampleIndexerRebuild.java | 79 - .../example/BlurExampleIndexerUpdate.java | 62 - .../blur/mapreduce/example/BlurExampleMapper.java | 51 - .../apache/blur/mapreduce/lib/BlurInputFormat.java | 95 +- .../apache/blur/mapreduce/lib/BlurInputSplit.java | 131 +- .../blur/mapreduce/lib/BlurMapReduceUtil.java | 46 + .../org/apache/blur/mapreduce/lib/BlurMapper.java | 9 + .../blur/mapreduce/lib/BlurOutputFormat.java | 62 +- .../org/apache/blur/mapreduce/lib/BlurReader.java | 154 + .../blur/mapreduce/lib/BlurRecordReader.java | 91 - .../blur/mapreduce/lib/BlurRecordWriter.java | 115 - .../org/apache/blur/mapreduce/lib/BlurWriter.java | 117 + .../java/org/apache/blur/mapreduce/lib/Utils.java | 74 - .../serializer/MatchAllDocsQueryWritable.java | 36 + .../apache/blur/lucene/serializer/QUERY_TYPE.java | 8 +- .../blur/lucene/serializer/QueryWritableTest.java | 38 + .../blur/testsuite/AddDocumentsLuceneApiTable.java | 4 +- .../org/apache/blur/testsuite/CreateTable.java | 19 +- .../blur/testsuite/SearchLuceneApiTable.java | 8 +- .../java/org/apache/blur/thrift/BlurClient.java | 30 +- .../org/apache/blur/thrift/BlurClientManager.java | 6 +- .../java/org/apache/blur/thrift/Connection.java | 11 +- .../generated/AlternateColumnDefinition.java | 420 - .../org/apache/blur/thrift/generated/Analyzer.java | 477 + .../blur/thrift/generated/AnalyzerDefinition.java | 717 - .../blur/thrift/generated/AnalyzerSubType.java | 538 + .../apache/blur/thrift/generated/AnalyzerType.java | 715 + .../apache/blur/thrift/generated/Attribute.java | 632 - .../org/apache/blur/thrift/generated/Blur.java |14948 ++++++--------- .../apache/blur/thrift/generated/BlurQuery.java | 2019 -- .../blur/thrift/generated/BlurQueryStatus.java | 1044 - .../apache/blur/thrift/generated/BlurResult.java | 647 - .../apache/blur/thrift/generated/BlurResults.java | 1208 -- .../blur/thrift/generated/ClassDefinition.java | 569 + .../org/apache/blur/thrift/generated/Column.java | 532 - .../blur/thrift/generated/ColumnDefinition.java | 674 - .../thrift/generated/ColumnFamilyDefinition.java | 602 - .../blur/thrift/generated/ColumnPreCache.java | 472 - .../apache/blur/thrift/generated/DocLocation.java | 497 - .../org/apache/blur/thrift/generated/Document.java | 44 +- .../apache/blur/thrift/generated/ExpertQuery.java | 554 - .../org/apache/blur/thrift/generated/Facet.java | 508 - .../blur/thrift/generated/FetchRecordResult.java | 537 - .../apache/blur/thrift/generated/FetchResult.java | 870 - .../blur/thrift/generated/FetchRowResult.java | 425 - .../org/apache/blur/thrift/generated/Field.java | 3 + .../apache/blur/thrift/generated/Generation.java | 637 + .../apache/blur/thrift/generated/LiveSchema.java | 631 + .../blur/thrift/generated/MutateOptions.java | 42 +- .../apache/blur/thrift/generated/QueryArgs.java | 246 +- .../apache/blur/thrift/generated/QuerySession.java | 510 - .../apache/blur/thrift/generated/QueryStatus.java | 821 + .../org/apache/blur/thrift/generated/Record.java | 698 - .../blur/thrift/generated/RecordMutation.java | 545 - .../blur/thrift/generated/RecordMutationType.java | 77 - .../java/org/apache/blur/thrift/generated/Row.java | 704 - .../apache/blur/thrift/generated/RowMutation.java | 1022 - .../blur/thrift/generated/RowMutationType.java | 73 - .../org/apache/blur/thrift/generated/Schema.java | 631 - .../org/apache/blur/thrift/generated/ScoreDoc.java | 99 +- .../apache/blur/thrift/generated/ScoreType.java | 77 - .../org/apache/blur/thrift/generated/Selector.java | 1235 -- .../org/apache/blur/thrift/generated/Session.java | 169 +- .../apache/blur/thrift/generated/ShardServer.java | 8047 -------- .../apache/blur/thrift/generated/SimpleQuery.java | 879 - .../org/apache/blur/thrift/generated/Sort.java | 36 +- .../org/apache/blur/thrift/generated/SortType.java | 33 +- .../org/apache/blur/thrift/generated/TYPE.java | 53 +- .../blur/thrift/generated/TableDescriptor.java | 1402 +- .../apache/blur/thrift/generated/TableStats.java | 352 +- .../org/apache/blur/thrift/generated/Term.java | 16 +- .../apache/blur/thrift/generated/TopFieldDocs.java | 72 +- .../blur/thrift/generated/UpdatePackage.java | 55 +- src/pom.xml | 8 +- 248 files changed, 29472 insertions(+), 97074 deletions(-) ----------------------------------------------------------------------
