Merge branch 'apache-blur-0.2' into console-v2
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/904be3b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/904be3b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/904be3b2 Branch: refs/heads/apache-blur-0.2 Commit: 904be3b2512da3ce2cfbb100da7fa21e2f3698df Parents: 1ffef61 3967e15 Author: Chris Rohr <[email protected]> Authored: Thu May 15 11:38:52 2014 -0400 Committer: Chris Rohr <[email protected]> Committed: Thu May 15 11:38:52 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 41 + blur-core/pom.xml | 44 +- .../apache/blur/manager/BlurHighlighter.java | 100 + .../apache/blur/manager/BlurQueryChecker.java | 24 +- .../org/apache/blur/manager/IndexManager.java | 757 +- .../apache/blur/manager/ReadInterceptor.java | 30 + .../manager/clusterstatus/ClusterStatus.java | 6 + .../clusterstatus/ZookeeperClusterStatus.java | 351 +- .../clusterstatus/ZookeeperPathConstants.java | 52 +- .../manager/indexserver/BlurIndexWarmup.java | 34 + .../indexserver/DefaultBlurIndexWarmup.java | 25 +- .../indexserver/DistributedIndexServer.java | 368 +- .../indexserver/DistributedLayoutFactory.java | 7 +- .../DistributedLayoutFactoryImpl.java | 4 +- .../manager/indexserver/LocalIndexServer.java | 13 +- .../MasterBasedDistributedLayoutFactory.java | 128 +- .../blur/manager/indexserver/SafeMode.java | 49 +- .../results/BlurResultIterableClient.java | 8 +- .../results/BlurResultIterableSearcher.java | 79 +- .../results/BlurResultIterableSimple.java | 1 - .../BlurResultPeekableIteratorComparator.java | 38 +- .../apache/blur/manager/status/QueryStatus.java | 2 +- .../apache/blur/manager/writer/BlurIndex.java | 76 +- .../blur/manager/writer/BlurIndexCloser.java | 5 +- .../blur/manager/writer/BlurIndexReadOnly.java | 23 +- .../blur/manager/writer/BlurIndexReader.java | 151 - .../manager/writer/BlurIndexReaderWarmer.java | 60 + .../manager/writer/BlurIndexSimpleWriter.java | 385 + .../blur/manager/writer/BlurNRTIndex.java | 441 - .../blur/manager/writer/FieldBasedWarmer.java | 77 - .../apache/blur/manager/writer/IndexAction.java | 49 + .../blur/manager/writer/IndexImporter.java | 290 +- .../blur/manager/writer/MutatableAction.java | 541 + .../blur/manager/writer/MutationQueue.java | 39 + .../manager/writer/MutationQueueProcessor.java | 190 + .../manager/writer/SharedMergeScheduler.java | 57 +- .../writer/SnapshotIndexDeletionPolicy.java | 187 + .../manager/writer/TransactionRecorder.java | 433 - .../apache/blur/server/FilteredBlurServer.java | 26 + .../blur/server/IndexSearcherClosable.java | 38 + .../blur/server/IndexSearcherClosableNRT.java | 49 - .../apache/blur/server/ShardServerContext.java | 17 +- .../org/apache/blur/server/TableContext.java | 212 +- .../blur/thrift/BlurControllerServer.java | 738 +- .../org/apache/blur/thrift/BlurShardServer.java | 211 +- .../java/org/apache/blur/thrift/Shutdown.java | 67 + .../java/org/apache/blur/thrift/TableAdmin.java | 104 +- .../blur/thrift/ThriftBlurControllerServer.java | 27 +- .../blur/thrift/ThriftBlurShardServer.java | 93 +- .../org/apache/blur/thrift/ThriftServer.java | 5 +- .../java/org/apache/blur/utils/BlurUtil.java | 348 +- .../org/apache/blur/utils/HighlightHelper.java | 51 - .../org/apache/blur/utils/RowDocumentUtil.java | 53 +- .../blur/utils/TableShardCountCollapser.java | 5 +- .../test/java/org/apache/blur/MiniCluster.java | 34 +- .../blur/manager/AliasBlurFilterCacheTest.java | 2 +- .../apache/blur/manager/IndexManagerTest.java | 361 +- .../IndexManagerTestReadInterceptor.java | 38 + .../ZookeeperClusterStatusTest.java | 202 +- .../indexserver/DefaultBlurIndexWarmupTest.java | 162 + ...MasterBasedDistributedLayoutFactoryTest.java | 22 +- .../blur/manager/indexserver/SafeModeTest.java | 76 +- ...lurResultPeekableIteratorComparatorTest.java | 7 +- .../results/MultipleBlurResultIterableTest.java | 125 +- .../manager/writer/BlurIndexReaderTest.java | 143 - .../writer/BlurIndexSimpleWriterTest.java | 347 + .../blur/manager/writer/BlurNRTIndexTest.java | 242 - .../writer/DirectoryReferenceCounterTest.java | 340 - .../blur/manager/writer/IndexImporterTest.java | 247 +- .../manager/writer/MutatableActionTest.java | 304 + .../manager/writer/TransactionRecorderTest.java | 185 - .../apache/blur/server/TableContextTest.java | 11 +- .../org/apache/blur/thrift/BlurClusterTest.java | 437 +- .../org/apache/blur/utils/BlurUtilsTest.java | 55 +- blur-gui/pom.xml | 33 +- blur-gui/src/main/webapp/traces.html | 24 +- blur-jdbc/jar.sh | 18 - blur-jdbc/pom.xml | 86 - blur-jdbc/src/assemble/bin.xml | 26 - .../org/apache/blur/jdbc/BlurConnection.java | 111 - .../apache/blur/jdbc/BlurDatabaseMetaData.java | 418 - .../java/org/apache/blur/jdbc/BlurJdbc.java | 84 - .../apache/blur/jdbc/BlurPreparedStatement.java | 45 - .../apache/blur/jdbc/BlurResultSetMetaData.java | 229 - .../apache/blur/jdbc/BlurResultSetRecords.java | 250 - .../org/apache/blur/jdbc/BlurResultSetRows.java | 234 - .../org/apache/blur/jdbc/BlurResultSetTest.java | 56 - .../org/apache/blur/jdbc/BlurStatement.java | 143 - .../java/org/apache/blur/jdbc/BlurWarnings.java | 25 - .../java/org/apache/blur/jdbc/QueryData.java | 76 - .../abstractimpl/AbstractBlurConnection.java | 280 - .../AbstractBlurDatabaseMetaData.java | 771 - .../AbstractBlurPreparedStatement.java | 465 - .../abstractimpl/AbstractBlurResultSet.java | 834 - .../AbstractBlurResultSetMetaData.java | 138 - .../abstractimpl/AbstractBlurStatement.java | 227 - .../org/apache/blur/jdbc/parser/Parser.java | 223 - .../apache/blur/jdbc/util/EmptyResultSet.java | 42 - .../blur/jdbc/util/EmptyResultSetMetaData.java | 32 - .../apache/blur/jdbc/util/NotImplemented.java | 41 - .../blur/jdbc/util/SimpleStringResultSet.java | 101 - .../java/org/apache/blur/jdbc/BlurJdbcTest.java | 41 - .../org/apache/blur/jdbc/parser/ParserTest.java | 60 - blur-mapred-hadoop1/pom.xml | 171 + .../blur/mapred/AbstractOutputCommitter.java | 148 + .../blur/mapreduce/lib/BaseBlurMapper.java | 49 + .../apache/blur/mapreduce/lib/BlurColumn.java | 109 + .../apache/blur/mapreduce/lib/BlurCounters.java | 26 + .../blur/mapreduce/lib/BlurMapReduceUtil.java | 226 + .../apache/blur/mapreduce/lib/BlurMutate.java | 178 + .../blur/mapreduce/lib/BlurOutputCommitter.java | 96 + .../blur/mapreduce/lib/BlurOutputFormat.java | 338 + .../apache/blur/mapreduce/lib/BlurRecord.java | 178 + .../blur/mapreduce/lib/BlurRecordReader.java | 90 + .../blur/mapreduce/lib/CheckOutputSpecs.java | 52 + .../blur/mapreduce/lib/CopyRateDirectory.java | 128 + .../blur/mapreduce/lib/CsvBlurDriver.java | 409 + .../blur/mapreduce/lib/CsvBlurMapper.java | 487 + .../blur/mapreduce/lib/DefaultBlurReducer.java | 89 + .../mapreduce/lib/GenericBlurRecordWriter.java | 346 + .../apache/blur/mapreduce/lib/GetCounter.java | 29 + .../org/apache/blur/mapreduce/lib/IOUtil.java | 58 + .../mapreduce/lib/ProgressableDirectory.java | 289 + .../apache/blur/mapreduce/lib/RateCounter.java | 64 + .../lib/BlurOutputFormatMiniClusterTest.java | 229 + .../mapreduce/lib/BlurOutputFormatTest.java | 427 + .../blur/mapreduce/lib/CsvBlurDriverTest.java | 140 + .../blur/mapreduce/lib/CsvBlurMapperTest.java | 108 + blur-mapred-hadoop2/pom.xml | 176 + .../blur/mapreduce/lib/BaseBlurMapper.java | 49 + .../apache/blur/mapreduce/lib/BlurColumn.java | 109 + .../apache/blur/mapreduce/lib/BlurCounters.java | 26 + .../blur/mapreduce/lib/BlurMapReduceUtil.java | 226 + .../apache/blur/mapreduce/lib/BlurMutate.java | 178 + .../blur/mapreduce/lib/BlurOutputCommitter.java | 221 + .../blur/mapreduce/lib/BlurOutputFormat.java | 338 + .../apache/blur/mapreduce/lib/BlurRecord.java | 178 + .../blur/mapreduce/lib/BlurRecordReader.java | 90 + .../blur/mapreduce/lib/CheckOutputSpecs.java | 52 + .../blur/mapreduce/lib/CopyRateDirectory.java | 128 + .../blur/mapreduce/lib/CsvBlurDriver.java | 427 + .../blur/mapreduce/lib/CsvBlurMapper.java | 490 + .../blur/mapreduce/lib/DefaultBlurReducer.java | 89 + .../mapreduce/lib/GenericBlurRecordWriter.java | 346 + .../apache/blur/mapreduce/lib/GetCounter.java | 29 + .../org/apache/blur/mapreduce/lib/IOUtil.java | 58 + .../mapreduce/lib/ProgressableDirectory.java | 289 + .../apache/blur/mapreduce/lib/RateCounter.java | 64 + .../lib/BlurOutputFormatMiniClusterTest.java | 236 + .../mapreduce/lib/BlurOutputFormatTest.java | 444 + .../blur/mapreduce/lib/CsvBlurDriverTest.java | 140 + .../blur/mapreduce/lib/CsvBlurMapperTest.java | 108 + blur-mapred/pom.xml | 173 - .../blur/mapred/AbstractOutputCommitter.java | 132 - .../org/apache/blur/mapreduce/BlurMapper.java | 62 - .../org/apache/blur/mapreduce/BlurReducer.java | 530 - .../org/apache/blur/mapreduce/BlurTask.java | 289 - .../blur/mapreduce/BufferedDirectory.java | 145 - .../blur/mapreduce/lib/BaseBlurMapper.java | 49 - .../apache/blur/mapreduce/lib/BlurColumn.java | 109 - .../apache/blur/mapreduce/lib/BlurCounters.java | 26 - .../blur/mapreduce/lib/BlurMapReduceUtil.java | 226 - .../apache/blur/mapreduce/lib/BlurMutate.java | 178 - .../blur/mapreduce/lib/BlurOutputCommitter.java | 96 - .../blur/mapreduce/lib/BlurOutputFormat.java | 654 - .../apache/blur/mapreduce/lib/BlurRecord.java | 178 - .../blur/mapreduce/lib/BlurRecordReader.java | 90 - .../blur/mapreduce/lib/CopyRateDirectory.java | 128 - .../blur/mapreduce/lib/CsvBlurDriver.java | 409 - .../blur/mapreduce/lib/CsvBlurMapper.java | 476 - .../blur/mapreduce/lib/DefaultBlurReducer.java | 89 - .../apache/blur/mapreduce/lib/GetCounter.java | 29 - .../org/apache/blur/mapreduce/lib/IOUtil.java | 58 - .../mapreduce/lib/ProgressableDirectory.java | 289 - .../apache/blur/mapreduce/lib/RateCounter.java | 64 - .../org/apache/blur/mapreduce/BlurTaskTest.java | 63 - .../mapreduce/lib/BlurOutputFormatTest.java | 426 - .../blur/mapreduce/lib/CsvBlurDriverTest.java | 140 - .../blur/mapreduce/lib/CsvBlurMapperTest.java | 108 - blur-query/pom.xml | 41 +- .../apache/blur/analysis/BaseFieldManager.java | 123 +- .../org/apache/blur/analysis/FieldManager.java | 17 +- .../blur/analysis/FieldTypeDefinition.java | 27 +- .../apache/blur/analysis/HdfsFieldManager.java | 60 +- .../type/CustomFieldTypeDefinition.java | 15 +- .../analysis/type/DateFieldTypeDefinition.java | 20 +- .../type/DoubleFieldTypeDefinition.java | 25 +- .../apache/blur/analysis/type/ExampleType.java | 6 + .../type/FieldLessFieldTypeDefinition.java | 11 + .../analysis/type/FloatFieldTypeDefinition.java | 23 +- .../analysis/type/IntFieldTypeDefinition.java | 25 +- .../analysis/type/LongFieldTypeDefinition.java | 23 +- .../type/NumericFieldTypeDefinition.java | 17 + .../type/StoredFieldTypeDefinition.java | 14 +- .../type/StringFieldTypeDefinition.java | 35 +- .../analysis/type/TextFieldTypeDefinition.java | 11 + ...lPointVectorStrategyFieldTypeDefinition.java | 10 + .../blur/lucene/search/BlurQueryParser.java | 11 +- .../blur/lucene/search/DeepPagingCache.java | 279 + .../blur/lucene/search/FacetExecutor.java | 352 + .../apache/blur/lucene/search/FacetQuery.java | 126 +- .../blur/lucene/search/IterablePaging.java | 131 +- .../blur/lucene/search/PrimeDocCache.java | 70 +- .../apache/blur/lucene/search/SuperParser.java | 4 +- .../apache/blur/lucene/search/SuperQuery.java | 7 + .../blur/analysis/BaseFieldManagerTest.java | 98 +- .../blur/analysis/HdfsFieldManagerTest.java | 69 +- ...ntVectorStrategyFieldTypeDefinitionTest.java | 103 + .../blur/lucene/search/FacetQueryTest.java | 225 +- .../blur/lucene/search/SuperParserTest.java | 2 +- .../blur/lucene/search/SuperQueryTest.java | 6 +- .../lucene/search/TestingPagingCollector.java | 122 +- blur-shell/generate_docs.sh | 2 +- blur-shell/pom.xml | 91 +- .../blur/shell/AddColumnDefinitionCommand.java | 9 +- .../blur/shell/ColumnBasedPrintWriter.java | 75 + .../java/org/apache/blur/shell/Command.java | 6 +- .../org/apache/blur/shell/GetRowCommand.java | 15 +- .../apache/blur/shell/ListTablesCommand.java | 13 +- .../apache/blur/shell/LoadTestDataCommand.java | 6 +- .../java/org/apache/blur/shell/LogCommand.java | 69 + .../org/apache/blur/shell/LogResetCommand.java | 64 + .../main/java/org/apache/blur/shell/Main.java | 49 +- .../apache/blur/shell/OptimizeTableCommand.java | 53 + .../apache/blur/shell/PagingPrintWriter.java | 5 + .../org/apache/blur/shell/QueryCommand.java | 8 +- .../blur/shell/RemoveShardServerCommand.java | 119 + .../apache/blur/shell/SchemaTableCommand.java | 51 +- .../org/apache/blur/shell/SelectorCommand.java | 7 +- .../blur/shell/ShardServerLayoutCommand.java | 2 +- .../org/apache/blur/shell/TableDisplay.java | 401 + .../org/apache/blur/shell/TermsDataCommand.java | 43 +- .../java/org/apache/blur/shell/TopCommand.java | 15 +- .../org/apache/blur/shell/top.properties | 6 +- blur-shell/src/test/resources/log4j.xml | 48 + blur-store/pom.xml | 67 +- .../java/org/apache/blur/index/ExitObject.java | 42 + .../org/apache/blur/index/ExitableReader.java | 68 +- .../blur/index/IndexDeletionPolicyReader.java | 87 + .../apache/blur/lucene/codec/Blur022Codec.java | 2 +- .../lucene/codec/Blur022StoredFieldsFormat.java | 5 +- .../blur/lucene/codec/CachedDecompressor.java | 61 +- .../org/apache/blur/lucene/codec/CachedKey.java | 67 + .../org/apache/blur/lucene/fst/ByteArray.java | 42 + .../blur/lucene/fst/ByteArrayFactory.java | 70 + .../blur/lucene/fst/ByteArrayPrimitive.java | 72 + .../lucene/fst/ByteArrayPrimitiveFactory.java | 32 + .../refcounter/DirectoryReferenceCounter.java | 274 - .../refcounter/DirectoryReferenceFileGC.java | 119 - .../store/refcounter/IndexInputReference.java | 79 - .../apache/blur/lucene/warmup/IndexWarmup.java | 202 +- .../blur/lucene/warmup/ThrottledIndexInput.java | 19 +- .../blur/store/blockcache_v2/BaseCache.java | 30 +- .../apache/blur/store/blockcache_v2/Cache.java | 13 + .../store/blockcache_v2/CacheIndexInput.java | 64 +- .../store/blockcache_v2/CacheIndexOutput.java | 21 +- .../blur/store/blockcache_v2/CacheValue.java | 4 + .../blockcache_v2/CacheValueBufferPool.java | 3 + .../cachevalue/BaseCacheValue.java | 11 + .../cachevalue/DetachableCacheValue.java | 46 +- .../cachevalue/UnsafeCacheValue.java | 5 +- .../apache/blur/store/buffer/BufferStore.java | 3 + .../apache/blur/store/hdfs/BlurLockFactory.java | 8 + .../apache/blur/store/hdfs/HdfsDirectory.java | 231 +- .../apache/blur/store/hdfs/HdfsIndexInput.java | 60 +- .../org/apache/blur/store/hdfs/HdfsSymlink.java | 23 + .../blur/store/hdfs/SoftlinkHdfsDirectory.java | 201 - .../hdfs_v2/FastHdfsKeyValueDirectory.java | 214 + .../hdfs_v2/FastHdfsKeyValueIndexInput.java | 131 + .../hdfs_v2/FastHdfsKeyValueIndexOutput.java | 112 + .../blur/store/hdfs_v2/HdfsKeyValueStore.java | 573 + .../blur/store/hdfs_v2/JoinDirectory.java | 166 + .../org/apache/blur/store/hdfs_v2/Store.java | 39 + .../org/apache/lucene/util/fst/BytesStore.java | 561 + .../org/apache/blur/HdfsMiniClusterUtil.java | 132 + .../blur/lucene/warmup/IndexWarmupTest.java | 183 + .../blur/lucene/warmup/SlowAccessDirectory.java | 149 + .../blur/store/BaseDirectoryTestSuite.java | 12 + .../FastHdfsKeyValueDirectoryTestSuite.java | 48 + .../blur/store/JoinDirectoryTestSuite.java | 51 + .../store/SoftlinkHdfsDirectoryTestSuite.java | 49 - .../blockcache_v2/CacheIndexInputTest.java | 5 + .../store/hdfs/HdfsDirectorySymlinkTest.java | 124 + .../hdfs_v2/FastHdfsKeyValueDirectoryTest.java | 97 + .../store/hdfs_v2/HdfsKeyValueStoreTest.java | 214 + blur-store/src/test/resources/log4j.xml | 48 + blur-thrift/pom.xml | 61 +- .../java/org/apache/blur/thrift/BlurClient.java | 64 +- .../apache/blur/thrift/BlurClientManager.java | 31 +- .../java/org/apache/blur/thrift/ClientLock.java | 54 + .../java/org/apache/blur/thrift/ClientPool.java | 190 +- .../apache/blur/thrift/SortFieldComparator.java | 71 + .../org/apache/blur/thrift/UserConverter.java | 37 + .../org/apache/blur/thrift/generated/Blur.java | 13485 +++++++++++------ .../apache/blur/thrift/generated/BlurQuery.java | 322 +- .../blur/thrift/generated/BlurQueryStatus.java | 48 +- .../blur/thrift/generated/BlurResult.java | 174 +- .../blur/thrift/generated/BlurResults.java | 148 +- .../blur/thrift/generated/ColumnDefinition.java | 158 +- .../blur/thrift/generated/FetchRowResult.java | 442 +- .../org/apache/blur/thrift/generated/Level.java | 85 + .../apache/blur/thrift/generated/Metric.java | 132 +- .../org/apache/blur/thrift/generated/Row.java | 122 +- .../blur/thrift/generated/RowMutation.java | 270 +- .../blur/thrift/generated/SafeClientGen.java | 974 ++ .../apache/blur/thrift/generated/Schema.java | 88 +- .../apache/blur/thrift/generated/Selector.java | 294 +- .../apache/blur/thrift/generated/SortField.java | 603 + .../blur/thrift/generated/SortFieldResult.java | 677 + .../blur/thrift/generated/TableDescriptor.java | 152 +- .../org/apache/blur/thrift/generated/User.java | 44 +- .../blur/thrift/util/BlurThriftHelper.java | 13 + .../thrift/util/CreateInsertQueryRepeating.java | 2 - .../apache/blur/thrift/util/CreateTable.java | 8 + .../blur/thrift/util/EnqueueDataAsync.java | 146 + .../blur/thrift/util/GenerateSafeClient.java | 153 + .../org/apache/blur/thrift/util/LoadData.java | 29 +- .../apache/blur/thrift/util/LoadDataAsync.java | 10 +- .../thrift/util/LoadDataAsyncContinuously.java | 1 - .../blur/thrift/util/LoadDataContinuously.java | 1 - .../util/RapidlyCreateAndDeleteTables.java | 1 - .../blur/thrift/util/SimpleQueryExample.java | 5 +- blur-util/pom.xml | 53 +- .../java/org/apache/blur/BlurConfiguration.java | 15 +- .../blur/concurrent/BlurThreadPoolExecutor.java | 137 + .../org/apache/blur/concurrent/Executors.java | 18 +- .../concurrent/ThreadBoundaryProcessor.java | 27 + .../main/java/org/apache/blur/log/LogImpl.java | 24 +- .../org/apache/blur/metrics/HDFSReporter.java | 329 - .../org/apache/blur/metrics/MetricInfo.java | 2 +- .../apache/blur/metrics/MetricsConstants.java | 2 + .../main/java/org/apache/blur/trace/Trace.java | 40 +- .../org/apache/blur/trace/TraceCollector.java | 8 +- .../java/org/apache/blur/trace/TracerImpl.java | 12 +- .../blur/trace/ZooKeeperTraceStorage.java | 234 - .../main/java/org/apache/blur/user/User.java | 44 + .../java/org/apache/blur/user/UserContext.java | 36 + .../blur/user/UserThreadBoundaryProcessor.java | 43 + .../org/apache/blur/utils/BlurConstants.java | 39 +- .../src/main/resources/blur-default.properties | 48 +- .../blur/trace/ZooKeeperTraceStorageTest.java | 122 - .../apache/blur/zookeeper/ZkMiniCluster.java | 19 +- contrib/blur-console-v1/blur-agent/pom.xml | 12 +- contrib/blur-jdbc/jar.sh | 18 + contrib/blur-jdbc/pom.xml | 86 + contrib/blur-jdbc/src/assemble/bin.xml | 26 + .../org/apache/blur/jdbc/BlurConnection.java | 111 + .../apache/blur/jdbc/BlurDatabaseMetaData.java | 418 + .../java/org/apache/blur/jdbc/BlurJdbc.java | 84 + .../apache/blur/jdbc/BlurPreparedStatement.java | 45 + .../apache/blur/jdbc/BlurResultSetMetaData.java | 229 + .../apache/blur/jdbc/BlurResultSetRecords.java | 250 + .../org/apache/blur/jdbc/BlurResultSetRows.java | 234 + .../org/apache/blur/jdbc/BlurResultSetTest.java | 56 + .../org/apache/blur/jdbc/BlurStatement.java | 143 + .../java/org/apache/blur/jdbc/BlurWarnings.java | 25 + .../java/org/apache/blur/jdbc/QueryData.java | 76 + .../abstractimpl/AbstractBlurConnection.java | 280 + .../AbstractBlurDatabaseMetaData.java | 771 + .../AbstractBlurPreparedStatement.java | 465 + .../abstractimpl/AbstractBlurResultSet.java | 834 + .../AbstractBlurResultSetMetaData.java | 138 + .../abstractimpl/AbstractBlurStatement.java | 227 + .../org/apache/blur/jdbc/parser/Parser.java | 223 + .../apache/blur/jdbc/util/EmptyResultSet.java | 42 + .../blur/jdbc/util/EmptyResultSetMetaData.java | 32 + .../apache/blur/jdbc/util/NotImplemented.java | 41 + .../blur/jdbc/util/SimpleStringResultSet.java | 101 + .../java/org/apache/blur/jdbc/BlurJdbcTest.java | 41 + .../org/apache/blur/jdbc/parser/ParserTest.java | 60 + contrib/blur-titan/pom.xml | 2 +- distribution/pom.xml | 107 +- distribution/src/assemble/bin-hadoop1.xml | 140 + distribution/src/assemble/bin-hadoop2.xml | 140 + distribution/src/assemble/bin.xml | 140 - distribution/src/assemble/src.xml | 2 +- .../src/main/resources-hadoop1/LICENSE-bin.txt | 790 + .../main/resources-hadoop1/NOTICE-bin.base.txt | 8 + .../src/main/resources-hadoop1/NOTICE-bin.txt | 132 + .../main/resources-hadoop1/license-notes.txt | 17 + .../notices/commons-el-1.0.jar.NOTICE | 0 .../notices/commons-httpclient-3.0.1.jar.NOTICE | 0 ...concurrentlinkedhashmap-lru-1.3.2.jar.NOTICE | 7 + .../notices/generate-notice.sh | 27 + .../notices/guava-14.0.jar.NOTICE | 0 .../jackson-annotations-2.1.1.jar.NOTICE | 0 .../notices/jackson-core-2.1.1.jar.NOTICE | 0 .../notices/jackson-databind-2.1.1.jar.NOTICE | 0 .../notices/jakarta-regexp-1.4.jar.NOTICE | 0 .../notices/jasper-compiler-5.5.12.jar.NOTICE | 18 + .../notices/jasper-runtime-5.5.12.jar.NOTICE | 18 + .../notices/jets3t-0.6.1.jar.NOTICE | 18 + .../notices/jetty-6.1.26.jar.NOTICE | 36 + .../notices/jetty-util-6.1.26.jar.NOTICE | 36 + .../notices/metrics-core-2.2.0.jar.NOTICE | 11 + .../notices/metrics-ganglia-2.2.0.jar.NOTICE | 11 + .../notices/metrics-graphite-2.2.0.jar.NOTICE | 11 + .../notices/metrics-servlet-2.2.0.jar.NOTICE | 11 + .../notices/oro-2.0.8.jar.NOTICE | 0 .../notices/spatial4j-0.3.jar.NOTICE | 0 .../notices/zookeeper-3.4.5.jar.NOTICE | 5 + .../src/main/resources-hadoop2/LICENSE-bin.txt | 646 + .../main/resources-hadoop2/NOTICE-bin.base.txt | 8 + .../src/main/resources-hadoop2/NOTICE-bin.txt | 224 + .../main/resources-hadoop2/license-notes.txt | 17 + .../notices/commons-el-1.0.jar.NOTICE | 0 .../notices/commons-httpclient-3.0.1.jar.NOTICE | 0 ...concurrentlinkedhashmap-lru-1.3.2.jar.NOTICE | 7 + .../notices/generate-notice.sh | 27 + .../notices/guava-14.0.jar.NOTICE | 0 .../jackson-annotations-2.1.1.jar.NOTICE | 0 .../notices/jackson-core-2.1.1.jar.NOTICE | 0 .../notices/jackson-databind-2.1.1.jar.NOTICE | 0 .../notices/jakarta-regexp-1.4.jar.NOTICE | 0 .../notices/jasper-compiler-5.5.12.jar.NOTICE | 18 + .../notices/jasper-runtime-5.5.12.jar.NOTICE | 18 + .../notices/jets3t-0.6.1.jar.NOTICE | 18 + .../notices/jetty-6.1.26.jar.NOTICE | 36 + .../notices/jetty-util-6.1.26.jar.NOTICE | 36 + .../notices/metrics-core-2.2.0.jar.NOTICE | 11 + .../notices/metrics-ganglia-2.2.0.jar.NOTICE | 11 + .../notices/metrics-graphite-2.2.0.jar.NOTICE | 11 + .../notices/metrics-servlet-2.2.0.jar.NOTICE | 11 + .../notices/oro-2.0.8.jar.NOTICE | 0 .../notices/snappy-java-1.0.4.1.jar.NOTICE | 16 + .../notices/spatial4j-0.3.jar.NOTICE | 0 .../notices/zookeeper-3.4.5.jar.NOTICE | 5 + distribution/src/main/resources/LICENSE-bin.txt | 790 - .../src/main/resources/NOTICE-bin.base.txt | 8 - distribution/src/main/resources/NOTICE-bin.txt | 132 - .../src/main/resources/license-notes.txt | 17 - .../resources/notices/commons-el-1.0.jar.NOTICE | 0 .../notices/commons-httpclient-3.0.1.jar.NOTICE | 0 ...concurrentlinkedhashmap-lru-1.3.2.jar.NOTICE | 7 - .../main/resources/notices/generate-notice.sh | 27 - .../resources/notices/guava-14.0.jar.NOTICE | 0 .../jackson-annotations-2.1.1.jar.NOTICE | 0 .../notices/jackson-core-2.1.1.jar.NOTICE | 0 .../notices/jackson-databind-2.1.1.jar.NOTICE | 0 .../notices/jakarta-regexp-1.4.jar.NOTICE | 0 .../notices/jasper-compiler-5.5.12.jar.NOTICE | 18 - .../notices/jasper-runtime-5.5.12.jar.NOTICE | 18 - .../resources/notices/jets3t-0.6.1.jar.NOTICE | 18 - .../resources/notices/jetty-6.1.26.jar.NOTICE | 36 - .../notices/jetty-util-6.1.26.jar.NOTICE | 36 - .../notices/metrics-core-2.2.0.jar.NOTICE | 11 - .../notices/metrics-ganglia-2.2.0.jar.NOTICE | 11 - .../notices/metrics-graphite-2.2.0.jar.NOTICE | 11 - .../notices/metrics-servlet-2.2.0.jar.NOTICE | 11 - .../main/resources/notices/oro-2.0.8.jar.NOTICE | 0 .../resources/notices/spatial4j-0.3.jar.NOTICE | 0 .../notices/zookeeper-3.4.5.jar.NOTICE | 5 - .../src/main/scripts/bin/stop-shards.sh | 5 +- distribution/src/main/scripts/conf/log4j.xml | 4 +- .../src/main/scripts/interface/Blur.thrift | 151 +- .../main/scripts/interface/gen-html/Blur.html | 106 +- .../main/scripts/interface/gen-html/index.html | 8 + .../org/apache/blur/thrift/generated/Blur.java | 13485 +++++++++++------ .../apache/blur/thrift/generated/BlurQuery.java | 322 +- .../blur/thrift/generated/BlurQueryStatus.java | 48 +- .../blur/thrift/generated/BlurResult.java | 174 +- .../blur/thrift/generated/BlurResults.java | 148 +- .../blur/thrift/generated/ColumnDefinition.java | 158 +- .../blur/thrift/generated/FetchRowResult.java | 442 +- .../org/apache/blur/thrift/generated/Level.java | 85 + .../apache/blur/thrift/generated/Metric.java | 132 +- .../org/apache/blur/thrift/generated/Row.java | 122 +- .../blur/thrift/generated/RowMutation.java | 270 +- .../apache/blur/thrift/generated/Schema.java | 88 +- .../apache/blur/thrift/generated/Selector.java | 294 +- .../apache/blur/thrift/generated/SortField.java | 603 + .../blur/thrift/generated/SortFieldResult.java | 677 + .../blur/thrift/generated/TableDescriptor.java | 152 +- .../org/apache/blur/thrift/generated/User.java | 44 +- .../src/main/scripts/interface/gen-js/Blur.js | 2700 ++-- .../main/scripts/interface/gen-js/Blur_types.js | 1169 +- .../scripts/interface/gen-perl/Blur/Blur.pm | 2678 ++-- .../scripts/interface/gen-perl/Blur/Types.pm | 955 +- .../src/main/scripts/interface/gen-rb/blur.rb | 291 + .../main/scripts/interface/gen-rb/blur_types.rb | 152 +- .../src/main/scripts/interface/genAndReplace.sh | 3 + docs/Blur.html | 106 +- docs/cluster-setup.html | 6 +- docs/getting-started.html | 39 +- docs/release-notes.html | 98 +- docs/using-blur.base.html | 33 + docs/using-blur.html | 43 +- pom.xml | 64 +- whiteboard/README.txt | 7 + whiteboard/slur/README.txt | 79 + whiteboard/slur/pom.xml | 83 + .../org/apache/blur/slur/BlurQueryHelper.java | 74 + .../org/apache/blur/slur/BlurResultHelper.java | 73 + .../org/apache/blur/slur/RowMutationHelper.java | 127 + .../apache/blur/slur/SolrLookingBlurServer.java | 276 + .../apache/blur/slur/BlurQueryHelperTest.java | 75 + .../apache/blur/slur/RowMutationHelperTest.java | 153 + .../blur/slur/SolrLookingBlurServerTest.java | 392 + 498 files changed, 62737 insertions(+), 31872 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/904be3b2/contrib/blur-console-v1/blur-agent/pom.xml ---------------------------------------------------------------------- diff --cc contrib/blur-console-v1/blur-agent/pom.xml index e566bec,0000000..d7487ca mode 100644,000000..100644 --- a/contrib/blur-console-v1/blur-agent/pom.xml +++ b/contrib/blur-console-v1/blur-agent/pom.xml @@@ -1,223 -1,0 +1,223 @@@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- +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. +--> +<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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.blur</groupId> + <artifactId>blur</artifactId> - <version>0.2.2-incubating-SNAPSHOT</version> ++ <version>0.2.2-incubating</version> + <relativePath>../pom.xml</relativePath> + </parent> + <groupId>org.apache.blur</groupId> + <artifactId>blur-agent</artifactId> + <packaging>jar</packaging> + <name>Blur Agent</name> + + <dependencies> + <!-- RUNTIME DEPENDENCIES --> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + <version>3.0.5.RELEASE</version> + <exclusions> + <exclusion> + <artifactId>aopalliance</artifactId> + <groupId>aopalliance</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.16</version> + </dependency> + <dependency> + <groupId>org.apache.blur</groupId> + <artifactId>blur-thrift</artifactId> - <version>0.2.2-incubating-SNAPSHOT</version> ++ <version>0.2.2-incubating</version> + </dependency> + <dependency> + <groupId>org.apache.blur</groupId> + <artifactId>blur-util</artifactId> - <version>0.2.2-incubating-SNAPSHOT</version> ++ <version>0.2.2-incubating</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-simple</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4</version> + </dependency> + + <!-- COMPILE DEPENDENCIES --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.6.1</version> + <scope>compile</scope> + </dependency> + + <!-- TEST DEPENDENCIES --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.9</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.blur</groupId> + <artifactId>blur-core</artifactId> - <version>0.2.2-incubating-SNAPSHOT</version> ++ <version>0.2.2-incubating</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.blur</groupId> + <artifactId>blur-core</artifactId> - <version>0.2.2-incubating-SNAPSHOT</version> ++ <version>0.2.2-incubating</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-test</artifactId> + <version>1.2.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.blur</groupId> + <artifactId>blur-store</artifactId> - <version>0.2.2-incubating-SNAPSHOT</version> ++ <version>0.2.2-incubating</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.subethamail</groupId> + <artifactId>subethasmtp</artifactId> + <version>3.1.7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.vysper</groupId> + <artifactId>vysper-core</artifactId> + <version>0.7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + <version>1.14</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <repositories> + <repository> + <id>libdir</id> + <url>file://${basedir}/lib</url> + </repository> + </repositories> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.9</version> + <configuration> + <downloadSources>true</downloadSources> + <downloadJavadocs>true</downloadJavadocs> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.3</version> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/904be3b2/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 147e4d7,6df1889..ee44b62 --- a/pom.xml +++ b/pom.xml @@@ -243,27 -232,28 +232,28 @@@ under the License <exclude>**/.project</exclude> <exclude>**/.settings/**</exclude> <exclude>**/target/**</exclude> + <exclude>**/build/**</exclude> - <!-- These javascript libs are accounted for in the - LICENSE-src file in distribution/src/main/resources --> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/d3/**</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/backbone/**</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/flot/**</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/jquery.*.js</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/modernizr.js</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/sorttable.js</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/underscore.js</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/javascripts/datatables.fnReloadAjax.js</exclude> - - <!-- These css libs are accounted for in the LICENSE file --> - <exclude>contrib/blur-console/blur-admin/vendor/assets/stylesheets/jquery*.css</exclude> - <exclude>contrib/blur-console/blur-admin/vendor/assets/stylesheets/ui.dynatree.css</exclude> - - <!-- Ruby gems --> - <exclude>contrib/blur-console/blur-admin/vendor/gems/cancan/**</exclude> + <!-- These javascript libs are added at build time but are not included in the src --> + <exclude>contrib/blur-console/ui/app/bower_components/**</exclude> - <!-- Generated during the rail build process in the blur-admin project --> - <exclude>contrib/blur-console/blur-admin/Gemfile.lock</exclude> + <!-- These files are used for UI testing and are added at development but not included in the src --> + <exclude>contrib/blur-console/ui/test/bower_components/**</exclude> + + <!-- JS Libraries that could not be included through bower --> + <exclude>contrib/blur-console/ui/app/lib/**</exclude> + + <!-- Files used for building the UI --> + <exclude>contrib/blur-console/ui/node_modules/**</exclude> + <exclude>contrib/blur-console/ui/.sass-cache/**</exclude> + <exclude>contrib/blur-console/**/.bowerrc</exclude> + <exclude>contrib/blur-console/ui/.editorconfig</exclude> + <exclude>contrib/blur-console/ui/.jshintrc</exclude> + <exclude>contrib/blur-console/ui/package.json</exclude> + <exclude>contrib/blur-console/ui/**/bower.json</exclude> + + <!-- Legacy blur console --> + <exclude>contrib/blur-console-v1/**</exclude> <!-- Contains a list of english words that are used for load testing, adding a header would make the simple parsers more complex -->
