From bd8d5bddd85d0527be307b959fa0e28c19dbd379 Mon Sep 17 00:00:00 2001 From: Ian Brandt Date: Tue, 30 Oct 2012 22:21:55 -0700 Subject: [PATCH 1/7] Ignored all Eclipse .settings folders. --- .gitignore | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index aa14279d85ce..5c7901223737 100644 --- a/.gitignore +++ b/.gitignore @@ -9,10 +9,6 @@ target .classpath .idea .project -.settings/org.eclipse.jdt.core.prefs -.settings/org.maven.ide.eclipse.prefs -client/.settings/org.eclipse.jdt.core.prefs -common/.settings/org.eclipse.jdt.core.prefs -server/.settings/org.eclipse.jdt.core.prefs +.settings/ examples/rand/RealtimeNode.out examples/twitter/RealtimeNode.out From 0d24df76282cf6b105d0395f1b6c9146006c9f22 Mon Sep 17 00:00:00 2001 From: Ian Brandt Date: Tue, 30 Oct 2012 22:22:46 -0700 Subject: [PATCH 2/7] Removed unused imports. --- .../main/java/com/metamx/druid/BaseQuery.java | 13 +-- .../main/java/com/metamx/druid/Druids.java | 11 +-- .../src/main/java/com/metamx/druid/Query.java | 15 ++-- .../ResultGranularTimestampComparator.java | 4 +- .../java/com/metamx/druid/SearchBinaryFn.java | 5 +- .../druid/client/CachingClusteredClient.java | 25 +++--- .../druid/client/ClientInventoryManager.java | 8 +- .../druid/client/ClientSideServerView.java | 16 ++-- .../com/metamx/druid/client/DataSegment.java | 25 +++--- .../druid/client/DirectDruidClient.java | 39 ++++----- .../metamx/druid/client/DruidDataSource.java | 7 +- .../com/metamx/druid/client/DruidServer.java | 11 +-- .../client/InventoryManagementStrategy.java | 4 +- .../metamx/druid/client/InventoryManager.java | 12 +-- .../OnlyNewSegmentWatcherServerView.java | 10 +-- .../druid/client/SegmentInventoryManager.java | 4 +- .../druid/client/ServerInventoryManager.java | 6 +- .../com/metamx/druid/client/ServerView.java | 4 +- .../com/metamx/druid/client/ZKPhoneBook.java | 29 +++---- .../client/cache/ByteCountingLRUMap.java | 4 +- .../druid/client/cache/MapCacheBroker.java | 8 +- .../druid/client/selector/ServerSelector.java | 6 +- .../com/metamx/druid/http/BrokerMain.java | 21 ++--- .../metamx/druid/http/ClientInfoResource.java | 22 ++--- .../druid/http/ClientQuerySegmentWalker.java | 7 +- .../druid/http/ClientServletModule.java | 9 +- .../metamx/druid/http/FileRequestLogger.java | 19 +++-- .../com/metamx/druid/http/QueryServlet.java | 26 +++--- .../com/metamx/druid/http/RequestLogLine.java | 7 +- .../com/metamx/druid/http/StatusServlet.java | 9 +- .../druid/initialization/Initialization.java | 29 +++---- .../metamx/druid/merge/ClientAppendQuery.java | 5 +- .../druid/merge/ClientDefaultMergeQuery.java | 7 +- .../metamx/druid/merge/ClientMergeQuery.java | 5 +- .../druid/query/BySegmentQueryRunner.java | 7 +- .../query/ChainedExecutionQueryRunner.java | 16 ++-- .../query/FinalizeResultsQueryRunner.java | 4 +- .../query/IntervalChunkingQueryRunner.java | 16 ++-- .../query/MetricsEmittingQueryRunner.java | 4 +- .../metamx/druid/query/QueryCacheHelper.java | 6 +- .../metamx/druid/query/QueryToolChest.java | 3 +- .../druid/query/ReflectionLoaderThingy.java | 6 +- .../query/dimension/DefaultDimensionSpec.java | 5 +- .../druid/query/dimension/DimensionSpec.java | 3 +- .../dimension/ExtractionDimensionSpec.java | 5 +- .../query/dimension/LegacyDimensionSpec.java | 5 +- .../extraction/PartialDimExtractionFn.java | 6 +- .../extraction/RegexDimExtractionFn.java | 6 +- .../SearchQuerySpecDimExtractionFn.java | 5 +- .../query/extraction/TimeDimExtractionFn.java | 9 +- .../druid/query/filter/AndDimFilter.java | 5 +- .../query/filter/ExtractionDimFilter.java | 5 +- .../druid/query/filter/NotDimFilter.java | 4 +- .../druid/query/filter/OrDimFilter.java | 5 +- .../druid/query/filter/RegexDimFilter.java | 5 +- .../druid/query/filter/SelectorDimFilter.java | 4 +- .../druid/query/group/GroupByQuery.java | 11 +-- .../group/GroupByQueryQueryToolChest.java | 16 ++-- .../query/search/FragmentSearchQuerySpec.java | 9 +- .../InsensitiveContainsSearchQuerySpec.java | 4 +- .../search/LexicographicSearchSortSpec.java | 5 +- .../metamx/druid/query/search/SearchHit.java | 4 +- .../druid/query/search/SearchQuery.java | 14 ++-- .../search/SearchQueryQueryToolChest.java | 26 +++--- .../druid/query/search/SearchQuerySpec.java | 3 - .../druid/query/search/SearchSortSpec.java | 4 +- .../query/search/StrlenSearchSortSpec.java | 1 - .../query/segment/LegacySegmentSpec.java | 13 +-- .../segment/MultipleIntervalSegmentSpec.java | 11 +-- .../segment/MultipleSpecificSegmentSpec.java | 11 +-- .../druid/query/segment/QuerySegmentSpec.java | 7 +- .../query/segment/QuerySegmentWalker.java | 3 +- .../segment/SpecificSegmentQueryRunner.java | 6 +- .../query/segment/SpecificSegmentSpec.java | 9 +- .../query/timeboundary/TimeBoundaryQuery.java | 19 +++-- .../TimeBoundaryQueryQueryToolChest.java | 14 ++-- .../result/BySegmentResultValueClass.java | 4 +- .../result/BySegmentSearchResultValue.java | 5 +- .../java/com/metamx/druid/result/Result.java | 1 - .../druid/result/SearchResultValue.java | 7 +- .../druid/result/TimeBoundaryResultValue.java | 7 +- .../com/metamx/druid/shard/NoneShardSpec.java | 5 +- .../com/metamx/druid/shard/ShardSpec.java | 7 +- .../druid/shard/SingleDimensionShardSpec.java | 10 +-- .../metamx/druid/zk/StringZkSerializer.java | 5 +- .../com/metamx/phonebook/BasePhoneBook.java | 6 +- .../phonebook/ConsistentHashLookup.java | 4 +- .../metamx/phonebook/StoppedPhoneBook.java | 12 +-- .../metamx/druid/CombiningIterableTest.java | 13 +-- ...ResultGranularTimestampComparatorTest.java | 3 +- .../com/metamx/druid/SearchBinaryFnTest.java | 12 +-- .../java/com/metamx/druid/TestHelper.java | 7 +- .../metamx/druid/client/DataSegmentTest.java | 25 +++--- .../client/cache/ByteCountingLRUMapTest.java | 4 +- .../client/cache/MapCacheBrokerTest.java | 3 +- .../druid/query/QuerySegmentSpecTest.java | 13 +-- .../PartialDimExtractionFnTest.java | 9 +- .../extraction/RegexDimExtractionFnTest.java | 5 +- .../SearchQuerySpecDimExtractionFnTest.java | 13 +-- .../extraction/TimeDimExtractionFnTest.java | 5 +- .../shard/SingleDimensionShardSpecTest.java | 14 ++-- .../metamx/druid/BaseQueryGranularity.java | 6 +- .../com/metamx/druid/CombiningIterable.java | 6 +- .../com/metamx/druid/CombiningIterator.java | 8 +- .../com/metamx/druid/DurationGranularity.java | 5 +- .../com/metamx/druid/QueryGranularity.java | 3 +- .../metamx/druid/TimelineObjectHolder.java | 3 +- .../druid/VersionedIntervalTimeline.java | 19 +++-- .../metamx/druid/aggregation/Aggregator.java | 1 - .../druid/aggregation/AggregatorFactory.java | 7 +- .../aggregation/CountAggregatorFactory.java | 11 +-- .../aggregation/DoubleSumAggregator.java | 4 +- .../DoubleSumAggregatorFactory.java | 11 +-- .../DoubleSumBufferAggregator.java | 4 +- .../metamx/druid/aggregation/Histogram.java | 9 +- .../aggregation/HistogramAggregator.java | 4 +- .../HistogramAggregatorFactory.java | 17 ++-- .../HistogramBufferAggregator.java | 6 +- .../druid/aggregation/HistogramVisual.java | 5 +- .../aggregation/JavaScriptAggregator.java | 4 +- .../JavaScriptAggregatorFactory.java | 26 +++--- .../JavaScriptBufferAggregator.java | 6 +- .../druid/aggregation/LongSumAggregator.java | 4 +- .../aggregation/LongSumAggregatorFactory.java | 11 +-- .../aggregation/LongSumBufferAggregator.java | 4 +- .../druid/aggregation/MaxAggregator.java | 4 +- .../aggregation/MaxAggregatorFactory.java | 11 +-- .../aggregation/MaxBufferAggregator.java | 4 +- .../druid/aggregation/MinAggregator.java | 4 +- .../aggregation/MinAggregatorFactory.java | 11 +-- .../aggregation/MinBufferAggregator.java | 4 +- .../ToLowerCaseAggregatorFactory.java | 4 +- .../post/ArithmeticPostAggregator.java | 11 +-- .../post/ConstantPostAggregator.java | 6 +- .../post/FieldAccessPostAggregator.java | 6 +- .../aggregation/post/PostAggregator.java | 6 +- .../com/metamx/druid/collect/CountingMap.java | 6 +- .../druid/collect/OrderedMergeIterator.java | 13 +-- .../druid/collect/OrderedMergeSequence.java | 9 +- .../com/metamx/druid/collect/StupidPool.java | 6 +- .../java/com/metamx/druid/db/DbConnector.java | 10 ++- .../metamx/druid/guava/CombiningSequence.java | 6 +- .../druid/guava/FileOutputSupplier.java | 4 +- .../com/metamx/druid/guava/GuavaUtils.java | 15 ++-- .../metamx/druid/input/MapBasedInputRow.java | 4 +- .../com/metamx/druid/input/MapBasedRow.java | 18 ++-- .../main/java/com/metamx/druid/input/Row.java | 4 +- .../jackson/CommaListJoinDeserializer.java | 8 +- .../jackson/CommaListJoinSerializer.java | 7 +- .../druid/jackson/DefaultObjectMapper.java | 13 +-- .../com/metamx/druid/jackson/JodaStuff.java | 7 +- .../metamx/druid/log/LogLevelAdjuster.java | 11 +-- .../partition/IntegerPartitionChunk.java | 4 +- .../druid/partition/PartitionHolder.java | 8 +- .../druid/partition/StringPartitionChunk.java | 4 +- .../processing/MetricSelectorFactory.java | 1 - .../com/metamx/druid/utils/JodaUtils.java | 13 +-- .../com/metamx/druid/utils/PropUtils.java | 4 +- .../metamx/druid/utils/SerializerUtils.java | 10 +-- .../metamx/druid/QueryGranularityTest.java | 11 +-- .../druid/VersionedIntervalTimelineTest.java | 23 +++--- .../aggregation/CountAggregatorTest.java | 4 +- .../aggregation/DoubleSumAggregatorTest.java | 4 +- .../aggregation/HistogramAggregatorTest.java | 7 +- .../aggregation/JavaScriptAggregatorTest.java | 10 +-- .../aggregation/LongSumAggregatorTest.java | 4 +- .../post/ArithmeticPostAggregatorTest.java | 11 +-- .../post/ConstantPostAggregatorTest.java | 4 +- .../post/FieldAccessPostAggregatorTest.java | 7 +- .../collect/OrderedMergeIteratorTest.java | 12 +-- .../collect/OrderedMergeSequenceTest.java | 19 +++-- .../druid/guava/CombiningSequenceTest.java | 16 ++-- .../metamx/druid/histogram/HistogramTest.java | 11 +-- .../partition/IntegerPartitionChunkTest.java | 4 +- .../partition/StringPartitionChunkTest.java | 4 +- .../com/metamx/druid/utils/JodaUtilsTest.java | 8 +- .../examples/RealtimeStandaloneMain.java | 10 ++- .../TwitterSpritzerFirehoseFactory.java | 30 ++++--- .../com/metamx/druid/common/s3/S3Utils.java | 15 ++-- .../CompressedFloatBufferObjectStrategy.java | 6 +- .../v1/CompressedFloatsIndexedSupplier.java | 15 ++-- .../CompressedFloatsSupplierSerializer.java | 10 +-- .../CompressedLongBufferObjectStrategy.java | 6 +- .../v1/CompressedLongsIndexedSupplier.java | 15 ++-- .../v1/CompressedLongsSupplierSerializer.java | 10 +-- .../index/v1/CompressedObjectStrategy.java | 10 +-- .../druid/index/v1/CompressedPools.java | 8 +- .../index/v1/InMemoryCompressedFloats.java | 14 ++-- .../index/v1/InMemoryCompressedLongs.java | 14 ++-- .../druid/index/v1/IncrementalIndex.java | 28 ++++--- .../java/com/metamx/druid/index/v1/Index.java | 6 +- .../com/metamx/druid/index/v1/IndexIO.java | 24 +++--- .../metamx/druid/index/v1/MMappedIndex.java | 17 ++-- .../metamx/druid/index/v1/MetricHolder.java | 15 ++-- .../druid/index/v1/serde/ComplexMetrics.java | 4 +- .../druid/indexer/data/CSVDataSpec.java | 12 +-- .../metamx/druid/indexer/data/DataSpec.java | 5 +- .../druid/indexer/data/DelimitedDataSpec.java | 12 +-- .../druid/indexer/data/JSONDataSpec.java | 10 ++- .../indexer/data/StringInputRowParser.java | 15 ++-- .../druid/indexer/data/TimestampSpec.java | 7 +- .../kv/ConciseCompressedIndexedInts.java | 6 +- .../com/metamx/druid/kv/EmptyIndexedInts.java | 5 +- .../metamx/druid/kv/FlattenedArrayWriter.java | 12 +-- .../com/metamx/druid/kv/GenericIndexed.java | 12 +-- .../metamx/druid/kv/IntBufferIndexedInts.java | 8 +- .../com/metamx/druid/kv/TmpFileIOPeon.java | 4 +- .../com/metamx/druid/kv/VSizeIndexed.java | 8 +- .../com/metamx/druid/kv/VSizeIndexedInts.java | 6 +- .../metamx/druid/kv/VSizeIndexedWriter.java | 14 ++-- .../CompressedFloatsIndexedSupplierTest.java | 17 ++-- ...ompressedFloatsSupplierSerializerTest.java | 22 ++--- .../CompressedLongsIndexedSupplierTest.java | 17 ++-- ...CompressedLongsSupplierSerializerTest.java | 15 ++-- .../druid/index/v1/IOPeonForTesting.java | 6 +- .../v1/InMemoryCompressedFloatsTest.java | 5 +- .../index/v1/InMemoryCompressedLongsTest.java | 5 +- .../metamx/druid/kv/GenericIndexedTest.java | 9 +- .../com/metamx/druid/kv/IndexedIntsTest.java | 8 +- .../com/metamx/druid/kv/VSizeIndexedTest.java | 11 +-- .../java/com/metamx/druid/indexer/Bucket.java | 5 +- .../metamx/druid/indexer/DbUpdaterJob.java | 19 +++-- .../druid/indexer/DeterminePartitionsJob.java | 59 ++++++------- .../druid/indexer/HadoopDruidIndexer.java | 15 ++-- .../indexer/HadoopDruidIndexerAzkWrapper.java | 16 ++-- .../indexer/HadoopDruidIndexerConfig.java | 33 ++++---- .../druid/indexer/HadoopDruidIndexerJob.java | 21 ++--- .../metamx/druid/indexer/HadoopIOPeon.java | 9 +- .../druid/indexer/HadoopyShardSpec.java | 3 +- .../druid/indexer/IndexGeneratorJob.java | 82 +++++++++---------- .../metamx/druid/indexer/SortableBytes.java | 7 +- .../druid/indexer/StringIntervalFunction.java | 3 +- .../java/com/metamx/druid/indexer/Utils.java | 21 ++--- .../metamx/druid/indexer/ZkUpdaterJob.java | 11 +-- .../granularity/ArbitraryGranularitySpec.java | 17 ++-- .../indexer/granularity/GranularitySpec.java | 5 +- .../granularity/UniformGranularitySpec.java | 15 ++-- .../indexer/hadoop/FSSpideringIterator.java | 8 +- .../path/GranularUnprocessedPathSpec.java | 28 +++---- .../indexer/path/GranularityPathSpec.java | 19 +++-- .../metamx/druid/indexer/path/PathSpec.java | 5 +- .../druid/indexer/path/StaticPathSpec.java | 7 +- .../druid/indexer/rollup/DataRollupSpec.java | 8 +- .../indexer/updater/DbUpdaterJobSpec.java | 3 +- .../druid/indexer/updater/UpdaterJobSpec.java | 2 - .../druid/merger/common/TaskHolder.java | 5 +- .../druid/merger/common/TaskStatus.java | 11 +-- .../druid/merger/common/TaskToolbox.java | 11 +-- .../common/index/StaticS3FirehoseFactory.java | 37 +++++---- .../common/index/YeOldePlumberSchool.java | 19 +++-- .../merger/common/task/AbstractTask.java | 7 +- .../druid/merger/common/task/AppendTask.java | 18 ++-- .../merger/common/task/DefaultMergeTask.java | 16 ++-- .../druid/merger/common/task/DeleteTask.java | 17 ++-- .../task/IndexDeterminePartitionsTask.java | 17 ++-- .../common/task/IndexGeneratorTask.java | 22 ++--- .../druid/merger/common/task/IndexTask.java | 13 +-- .../druid/merger/common/task/MergeTask.java | 26 +++--- .../metamx/druid/merger/common/task/Task.java | 11 +-- .../merger/coordinator/DbTaskStorage.java | 17 ++-- .../merger/coordinator/LocalTaskRunner.java | 9 +- .../merger/coordinator/LocalTaskStorage.java | 9 +- .../coordinator/MergerDBCoordinator.java | 26 +++--- .../merger/coordinator/RemoteTaskRunner.java | 20 ++--- .../druid/merger/coordinator/RetryPolicy.java | 4 +- .../druid/merger/coordinator/TaskContext.java | 5 +- .../druid/merger/coordinator/TaskGroup.java | 9 +- .../coordinator/TaskInventoryManager.java | 4 +- .../druid/merger/coordinator/TaskMaster.java | 6 +- .../druid/merger/coordinator/TaskQueue.java | 27 +++--- .../druid/merger/coordinator/TaskStorage.java | 4 +- .../config/IndexerCoordinatorConfig.java | 11 +-- .../config/IndexerDbConnectorConfig.java | 3 +- .../merger/coordinator/exec/TaskConsumer.java | 3 - .../http/IndexerCoordinatorNode.java | 39 ++++----- .../http/IndexerCoordinatorResource.java | 16 ++-- .../http/IndexerCoordinatorServletModule.java | 9 +- .../druid/merger/worker/TaskMonitor.java | 11 +-- .../metamx/druid/merger/worker/Worker.java | 11 +-- .../worker/WorkerCuratorCoordinator.java | 11 +-- .../druid/merger/worker/http/WorkerNode.java | 35 ++++---- .../metamx/druid/realtime/FireDepartment.java | 4 +- .../druid/realtime/FireDepartmentConfig.java | 3 +- .../com/metamx/druid/realtime/Firehose.java | 4 +- .../druid/realtime/FirehoseFactory.java | 4 +- .../druid/realtime/KafkaFirehoseFactory.java | 30 +++---- .../druid/realtime/MetadataUpdater.java | 21 ++--- .../druid/realtime/RealtimeManager.java | 17 ++-- .../realtime/RealtimeMetricsMonitor.java | 6 +- .../metamx/druid/realtime/RealtimeNode.java | 47 +++++------ .../druid/realtime/RealtimePlumberSchool.java | 41 +++++----- .../druid/realtime/S3SegmentPusher.java | 29 +++---- .../com/metamx/druid/realtime/Schema.java | 10 +-- .../metamx/druid/realtime/SegmentPusher.java | 4 +- .../java/com/metamx/druid/realtime/Sink.java | 16 ++-- .../src/main/java/com/metamx/TsvToJson.java | 15 ++-- .../com/metamx/druid/BaseStorageAdapter.java | 9 +- .../com/metamx/druid/GroupByQueryEngine.java | 20 +++-- .../com/metamx/druid/SearchResultBuilder.java | 3 +- .../java/com/metamx/druid/StorageAdapter.java | 5 +- .../DataSegmentChangeRequest.java | 3 +- .../druid/coordination/DruidClusterInfo.java | 6 +- .../SegmentChangeRequestDrop.java | 3 +- .../SegmentChangeRequestLoad.java | 3 +- .../druid/coordination/ServerManager.java | 16 ++-- .../druid/coordination/ZkCoordinator.java | 19 +++-- .../coordination/ZkCoordinatorConfig.java | 4 +- .../coordination/legacy/S3SizeLookup.java | 6 +- .../coordination/legacy/TheSizeAdjuster.java | 11 +-- .../druid/db/DatabaseSegmentManager.java | 42 +++++----- .../com/metamx/druid/http/InfoResource.java | 35 ++++---- .../com/metamx/druid/http/MasterMain.java | 33 ++++---- .../com/metamx/druid/http/MasterResource.java | 10 +-- .../druid/http/MasterServletModule.java | 9 +- .../com/metamx/druid/http/RedirectFilter.java | 15 ++-- .../metamx/druid/http/RedirectServlet.java | 10 ++- .../com/metamx/druid/http/ServerMain.java | 33 ++++---- .../metamx/druid/index/brita/AndFilter.java | 3 +- .../index/brita/DimensionPredicateFilter.java | 7 +- .../druid/index/brita/ExtractionFilter.java | 7 +- .../com/metamx/druid/index/brita/Filters.java | 7 +- .../index/brita/InvertedIndexSelector.java | 3 +- .../metamx/druid/index/brita/OrFilter.java | 3 +- .../metamx/druid/index/brita/RegexFilter.java | 5 +- .../v1/ComplexMetricColumnSerializer.java | 8 +- .../metamx/druid/index/v1/ConciseOffset.java | 3 +- .../index/v1/FloatMetricColumnSerializer.java | 6 +- .../index/v1/IncrementalIndexAdapter.java | 19 +++-- .../v1/IncrementalIndexStorageAdapter.java | 22 ++--- .../druid/index/v1/IndexGranularity.java | 3 +- .../metamx/druid/index/v1/IndexMerger.java | 45 +++++----- .../druid/index/v1/IndexStorageAdapter.java | 18 ++-- .../druid/index/v1/IndexableAdapter.java | 3 +- .../druid/index/v1/MMappedIndexAdapter.java | 11 +-- .../index/v1/MMappedIndexStorageAdapter.java | 16 ++-- .../index/v1/MetricColumnSerializer.java | 2 - .../com/metamx/druid/index/v1/Rowboat.java | 11 +-- .../v1/RowboatFilteringIndexAdapter.java | 3 +- .../v1/SegmentIdAttachedStorageAdapter.java | 5 +- .../druid/index/v1/processing/Cursor.java | 3 +- .../index/v1/processing/CursorFactory.java | 3 +- .../druid/initialization/ServerInit.java | 13 +-- .../ConvertingBaseQueryableFactory.java | 9 +- .../DelegatingStorageAdapterLoader.java | 7 +- .../loading/MMappedStorageAdapterFactory.java | 6 +- .../druid/loading/RealtimeSegmentGetter.java | 6 +- .../metamx/druid/loading/S3SegmentGetter.java | 21 ++--- .../druid/loading/S3SegmentGetterConfig.java | 4 +- .../druid/loading/S3ZippedSegmentGetter.java | 25 +++--- .../loading/SingleStorageAdapterLoader.java | 4 +- .../druid/loading/StorageAdapterFactory.java | 4 +- .../druid/loading/StorageAdapterLoader.java | 4 +- .../metamx/druid/master/BalancerAnalyzer.java | 8 +- .../com/metamx/druid/master/DruidMaster.java | 25 +++--- .../druid/master/DruidMasterAssigner.java | 8 +- .../druid/master/DruidMasterBalancer.java | 10 +-- .../druid/master/DruidMasterDropper.java | 8 +- .../druid/master/DruidMasterLogger.java | 6 +- .../druid/master/DruidMasterReplicator.java | 14 ++-- .../master/DruidMasterRuntimeParams.java | 12 +-- .../master/DruidMasterSegmentInfoLoader.java | 4 +- .../master/DruidMasterSegmentMerger.java | 13 +-- .../metamx/druid/master/HttpMergerClient.java | 9 +- .../metamx/druid/master/LoadQueuePeon.java | 24 +++--- .../com/metamx/druid/master/MergerClient.java | 4 +- .../metamx/druid/metrics/ServerMonitor.java | 4 +- ...DefaultQueryRunnerFactoryConglomerate.java | 4 +- .../druid/query/QueryRunnerFactory.java | 4 +- .../group/GroupByQueryRunnerFactory.java | 10 +-- .../search/SearchQueryRunnerFactory.java | 6 +- .../TimeBoundaryQueryRunnerFactory.java | 8 +- .../druid/utils/ExposeS3DataSource.java | 31 +++---- .../java/com/metamx/druid/utils/ZkSetup.java | 5 +- .../SegmentChangeRequestDropTest.java | 13 +-- .../SegmentChangeRequestLoadTest.java | 13 +-- .../druid/coordination/ServerManagerTest.java | 27 +++--- .../druid/coordination/ZkCoordinatorTest.java | 25 +++--- .../druid/db/DatabaseSegmentManagerTest.java | 16 ++-- .../druid/index/v1/ConciseOffsetTest.java | 4 +- .../metamx/druid/index/v1/EmptyIndexTest.java | 13 +-- .../v1/processing/IntersectingOffsetTest.java | 5 +- .../v1/processing/UnioningOffsetTest.java | 5 +- .../loading/NoopStorageAdapterLoader.java | 9 +- .../druid/master/BalancerAnalyzerTest.java | 12 +-- .../druid/master/DruidMasterBalancerTest.java | 14 ++-- .../master/DruidMasterReplicatorTest.java | 15 ++-- .../master/DruidMasterSegmentMergerTest.java | 14 ++-- .../metamx/druid/master/DruidMasterTest.java | 15 ++-- 388 files changed, 2257 insertions(+), 2027 deletions(-) diff --git a/client/src/main/java/com/metamx/druid/BaseQuery.java b/client/src/main/java/com/metamx/druid/BaseQuery.java index 4538467c1673..8213d67a553d 100644 --- a/client/src/main/java/com/metamx/druid/BaseQuery.java +++ b/client/src/main/java/com/metamx/druid/BaseQuery.java @@ -19,17 +19,18 @@ package com.metamx.druid; +import java.util.List; +import java.util.Map; + +import org.codehaus.jackson.annotate.JsonProperty; +import org.joda.time.Duration; +import org.joda.time.Interval; + import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.metamx.common.guava.Sequence; import com.metamx.druid.query.segment.QuerySegmentSpec; import com.metamx.druid.query.segment.QuerySegmentWalker; -import org.codehaus.jackson.annotate.JsonProperty; -import org.joda.time.Duration; -import org.joda.time.Interval; - -import java.util.List; -import java.util.Map; /** */ diff --git a/client/src/main/java/com/metamx/druid/Druids.java b/client/src/main/java/com/metamx/druid/Druids.java index b9c2fbaca741..618d1adc15cb 100644 --- a/client/src/main/java/com/metamx/druid/Druids.java +++ b/client/src/main/java/com/metamx/druid/Druids.java @@ -19,6 +19,12 @@ package com.metamx.druid; +import java.util.List; +import java.util.Map; + +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.collect.Lists; import com.metamx.druid.query.filter.AndDimFilter; import com.metamx.druid.query.filter.DimFilter; @@ -35,11 +41,6 @@ import com.metamx.druid.result.Result; import com.metamx.druid.result.SearchResultValue; import com.metamx.druid.result.TimeBoundaryResultValue; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import java.util.List; -import java.util.Map; /** */ diff --git a/client/src/main/java/com/metamx/druid/Query.java b/client/src/main/java/com/metamx/druid/Query.java index f7450f86534c..cb77ca3ed4eb 100644 --- a/client/src/main/java/com/metamx/druid/Query.java +++ b/client/src/main/java/com/metamx/druid/Query.java @@ -19,19 +19,20 @@ package com.metamx.druid; +import java.util.List; +import java.util.Map; + +import org.codehaus.jackson.annotate.JsonSubTypes; +import org.codehaus.jackson.annotate.JsonTypeInfo; +import org.joda.time.Duration; +import org.joda.time.Interval; + import com.metamx.common.guava.Sequence; import com.metamx.druid.query.group.GroupByQuery; import com.metamx.druid.query.search.SearchQuery; import com.metamx.druid.query.segment.QuerySegmentSpec; import com.metamx.druid.query.segment.QuerySegmentWalker; import com.metamx.druid.query.timeboundary.TimeBoundaryQuery; -import org.codehaus.jackson.annotate.JsonSubTypes; -import org.codehaus.jackson.annotate.JsonTypeInfo; -import org.joda.time.Duration; -import org.joda.time.Interval; - -import java.util.List; -import java.util.Map; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "queryType") @JsonSubTypes(value = { diff --git a/client/src/main/java/com/metamx/druid/ResultGranularTimestampComparator.java b/client/src/main/java/com/metamx/druid/ResultGranularTimestampComparator.java index 972d98b32149..01568bc27b0f 100644 --- a/client/src/main/java/com/metamx/druid/ResultGranularTimestampComparator.java +++ b/client/src/main/java/com/metamx/druid/ResultGranularTimestampComparator.java @@ -19,11 +19,11 @@ package com.metamx.druid; +import java.util.Comparator; + import com.google.common.primitives.Longs; import com.metamx.druid.result.Result; -import java.util.Comparator; - /** */ public class ResultGranularTimestampComparator implements Comparator> diff --git a/client/src/main/java/com/metamx/druid/SearchBinaryFn.java b/client/src/main/java/com/metamx/druid/SearchBinaryFn.java index bf87f20bbb39..9403b55a9f20 100644 --- a/client/src/main/java/com/metamx/druid/SearchBinaryFn.java +++ b/client/src/main/java/com/metamx/druid/SearchBinaryFn.java @@ -19,6 +19,8 @@ package com.metamx.druid; +import java.util.TreeSet; + import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.metamx.common.guava.nary.BinaryFn; @@ -26,9 +28,6 @@ import com.metamx.druid.query.search.SearchSortSpec; import com.metamx.druid.result.Result; import com.metamx.druid.result.SearchResultValue; -import org.joda.time.DateTime; - -import java.util.TreeSet; /** */ diff --git a/client/src/main/java/com/metamx/druid/client/CachingClusteredClient.java b/client/src/main/java/com/metamx/druid/client/CachingClusteredClient.java index 6c7e588a6b7e..d933fe31ef2b 100644 --- a/client/src/main/java/com/metamx/druid/client/CachingClusteredClient.java +++ b/client/src/main/java/com/metamx/druid/client/CachingClusteredClient.java @@ -19,6 +19,19 @@ package com.metamx.druid.client; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Executors; + +import org.codehaus.jackson.map.ObjectMapper; +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.base.Supplier; import com.google.common.base.Throwables; @@ -52,18 +65,6 @@ import com.metamx.druid.query.segment.SegmentDescriptor; import com.metamx.druid.result.BySegmentResultValueClass; import com.metamx.druid.result.Result; -import org.codehaus.jackson.map.ObjectMapper; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Executors; /** */ diff --git a/client/src/main/java/com/metamx/druid/client/ClientInventoryManager.java b/client/src/main/java/com/metamx/druid/client/ClientInventoryManager.java index 5ec8cf47d361..9fdab41abe4a 100644 --- a/client/src/main/java/com/metamx/druid/client/ClientInventoryManager.java +++ b/client/src/main/java/com/metamx/druid/client/ClientInventoryManager.java @@ -19,16 +19,16 @@ package com.metamx.druid.client; +import java.util.Map; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; + import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.metamx.common.Pair; import com.metamx.common.logger.Logger; import com.metamx.phonebook.PhoneBook; import com.metamx.phonebook.PhoneBookPeon; -import java.util.Map; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; - /** */ public class ClientInventoryManager extends InventoryManager diff --git a/client/src/main/java/com/metamx/druid/client/ClientSideServerView.java b/client/src/main/java/com/metamx/druid/client/ClientSideServerView.java index 3b0de0d870fc..aa5aba6fc621 100644 --- a/client/src/main/java/com/metamx/druid/client/ClientSideServerView.java +++ b/client/src/main/java/com/metamx/druid/client/ClientSideServerView.java @@ -19,6 +19,15 @@ package com.metamx.druid.client; +import java.util.Iterator; +import java.util.Map; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.Executor; + +import javax.annotation.Nullable; + +import org.codehaus.jackson.map.ObjectMapper; + import com.google.common.base.Function; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; @@ -28,13 +37,6 @@ import com.metamx.druid.query.QueryRunner; import com.metamx.druid.query.QueryToolChestWarehouse; import com.metamx.http.client.HttpClient; -import org.codehaus.jackson.map.ObjectMapper; - -import javax.annotation.Nullable; -import java.util.Iterator; -import java.util.Map; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.Executor; /** */ diff --git a/client/src/main/java/com/metamx/druid/client/DataSegment.java b/client/src/main/java/com/metamx/druid/client/DataSegment.java index 1f7fcc42d19f..1e3feede7d3f 100644 --- a/client/src/main/java/com/metamx/druid/client/DataSegment.java +++ b/client/src/main/java/com/metamx/druid/client/DataSegment.java @@ -19,29 +19,30 @@ package com.metamx.druid.client; +import java.util.Comparator; +import java.util.List; +import java.util.Map; + +import javax.annotation.Nullable; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.codehaus.jackson.map.annotate.JsonDeserialize; +import org.codehaus.jackson.map.annotate.JsonSerialize; +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.metamx.common.Granularity; import com.metamx.druid.jackson.CommaListJoinDeserializer; import com.metamx.druid.jackson.CommaListJoinSerializer; import com.metamx.druid.query.segment.SegmentDescriptor; import com.metamx.druid.shard.NoneShardSpec; import com.metamx.druid.shard.ShardSpec; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonDeserialize; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import javax.annotation.Nullable; -import java.util.Comparator; -import java.util.List; -import java.util.Map; /** */ diff --git a/client/src/main/java/com/metamx/druid/client/DirectDruidClient.java b/client/src/main/java/com/metamx/druid/client/DirectDruidClient.java index 62782a41892e..1f4ae3720629 100644 --- a/client/src/main/java/com/metamx/druid/client/DirectDruidClient.java +++ b/client/src/main/java/com/metamx/druid/client/DirectDruidClient.java @@ -19,6 +19,26 @@ package com.metamx.druid.client; +import java.io.Closeable; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.Iterator; +import java.util.Map; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +import org.codehaus.jackson.JsonParser; +import org.codehaus.jackson.JsonToken; +import org.codehaus.jackson.ObjectCodec; +import org.codehaus.jackson.map.ObjectMapper; +import org.codehaus.jackson.map.type.TypeFactory; +import org.codehaus.jackson.smile.SmileFactory; +import org.codehaus.jackson.type.JavaType; +import org.jboss.netty.handler.codec.http.HttpChunk; +import org.jboss.netty.handler.codec.http.HttpHeaders; +import org.jboss.netty.handler.codec.http.HttpResponse; + import com.google.common.base.Throwables; import com.google.common.collect.Maps; import com.google.common.io.Closeables; @@ -40,25 +60,6 @@ import com.metamx.http.client.io.AppendableByteArrayInputStream; import com.metamx.http.client.response.ClientResponse; import com.metamx.http.client.response.InputStreamResponseHandler; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonToken; -import org.codehaus.jackson.ObjectCodec; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.type.TypeFactory; -import org.codehaus.jackson.smile.SmileFactory; -import org.codehaus.jackson.type.JavaType; -import org.jboss.netty.handler.codec.http.HttpChunk; -import org.jboss.netty.handler.codec.http.HttpHeaders; -import org.jboss.netty.handler.codec.http.HttpResponse; - -import java.io.Closeable; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.Iterator; -import java.util.Map; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; /** */ diff --git a/client/src/main/java/com/metamx/druid/client/DruidDataSource.java b/client/src/main/java/com/metamx/druid/client/DruidDataSource.java index 6f96e8e86725..611ad81f1a03 100644 --- a/client/src/main/java/com/metamx/druid/client/DruidDataSource.java +++ b/client/src/main/java/com/metamx/druid/client/DruidDataSource.java @@ -19,14 +19,15 @@ package com.metamx.druid.client; -import com.google.common.collect.Maps; -import org.codehaus.jackson.annotate.JsonProperty; - import java.util.Collections; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentSkipListSet; +import org.codehaus.jackson.annotate.JsonProperty; + +import com.google.common.collect.Maps; + /** */ public class DruidDataSource diff --git a/client/src/main/java/com/metamx/druid/client/DruidServer.java b/client/src/main/java/com/metamx/druid/client/DruidServer.java index d8f4cda8fa76..751e2d7e46c5 100644 --- a/client/src/main/java/com/metamx/druid/client/DruidServer.java +++ b/client/src/main/java/com/metamx/druid/client/DruidServer.java @@ -19,16 +19,17 @@ package com.metamx.druid.client; -import com.google.common.collect.ImmutableMap; -import com.metamx.common.logger.Logger; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + +import com.google.common.collect.ImmutableMap; +import com.metamx.common.logger.Logger; + /** */ public class DruidServer implements Comparable diff --git a/client/src/main/java/com/metamx/druid/client/InventoryManagementStrategy.java b/client/src/main/java/com/metamx/druid/client/InventoryManagementStrategy.java index a47f057fa435..9b14c56c6f08 100644 --- a/client/src/main/java/com/metamx/druid/client/InventoryManagementStrategy.java +++ b/client/src/main/java/com/metamx/druid/client/InventoryManagementStrategy.java @@ -19,11 +19,11 @@ package com.metamx.druid.client; +import java.util.Map; + import com.metamx.common.Pair; import com.metamx.phonebook.PhoneBookPeon; -import java.util.Map; - /** */ public interface InventoryManagementStrategy diff --git a/client/src/main/java/com/metamx/druid/client/InventoryManager.java b/client/src/main/java/com/metamx/druid/client/InventoryManager.java index 13f6b6aae5fc..8135df4042d0 100644 --- a/client/src/main/java/com/metamx/druid/client/InventoryManager.java +++ b/client/src/main/java/com/metamx/druid/client/InventoryManager.java @@ -19,6 +19,12 @@ package com.metamx.druid.client; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + import com.metamx.common.ISE; import com.metamx.common.Pair; import com.metamx.common.lifecycle.LifecycleStart; @@ -27,12 +33,6 @@ import com.metamx.phonebook.PhoneBook; import com.metamx.phonebook.PhoneBookPeon; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - /** */ public abstract class InventoryManager diff --git a/client/src/main/java/com/metamx/druid/client/OnlyNewSegmentWatcherServerView.java b/client/src/main/java/com/metamx/druid/client/OnlyNewSegmentWatcherServerView.java index 3448667f1063..dea8065a4478 100644 --- a/client/src/main/java/com/metamx/druid/client/OnlyNewSegmentWatcherServerView.java +++ b/client/src/main/java/com/metamx/druid/client/OnlyNewSegmentWatcherServerView.java @@ -19,17 +19,17 @@ package com.metamx.druid.client; +import java.util.Iterator; +import java.util.Map; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.Executor; + import com.google.common.collect.Maps; import com.metamx.common.logger.Logger; import com.metamx.druid.VersionedIntervalTimeline; import com.metamx.druid.client.selector.ServerSelector; import com.metamx.druid.query.QueryRunner; -import java.util.Iterator; -import java.util.Map; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.Executor; - /** */ public class OnlyNewSegmentWatcherServerView implements MutableServerView diff --git a/client/src/main/java/com/metamx/druid/client/SegmentInventoryManager.java b/client/src/main/java/com/metamx/druid/client/SegmentInventoryManager.java index 5bc8633dd9b9..0b3b075be789 100644 --- a/client/src/main/java/com/metamx/druid/client/SegmentInventoryManager.java +++ b/client/src/main/java/com/metamx/druid/client/SegmentInventoryManager.java @@ -19,13 +19,13 @@ package com.metamx.druid.client; +import java.util.Map; + import com.metamx.common.Pair; import com.metamx.common.logger.Logger; import com.metamx.phonebook.PhoneBook; import com.metamx.phonebook.PhoneBookPeon; -import java.util.Map; - /** */ public class SegmentInventoryManager extends InventoryManager diff --git a/client/src/main/java/com/metamx/druid/client/ServerInventoryManager.java b/client/src/main/java/com/metamx/druid/client/ServerInventoryManager.java index bd32a62791d7..27f2aca0e636 100644 --- a/client/src/main/java/com/metamx/druid/client/ServerInventoryManager.java +++ b/client/src/main/java/com/metamx/druid/client/ServerInventoryManager.java @@ -19,15 +19,15 @@ package com.metamx.druid.client; +import java.util.Iterator; +import java.util.Map; + import com.google.common.collect.Maps; import com.metamx.common.Pair; import com.metamx.common.logger.Logger; import com.metamx.phonebook.PhoneBook; import com.metamx.phonebook.PhoneBookPeon; -import java.util.Iterator; -import java.util.Map; - /** */ public class ServerInventoryManager extends InventoryManager diff --git a/client/src/main/java/com/metamx/druid/client/ServerView.java b/client/src/main/java/com/metamx/druid/client/ServerView.java index 4b707549387c..c5fcb30370d4 100644 --- a/client/src/main/java/com/metamx/druid/client/ServerView.java +++ b/client/src/main/java/com/metamx/druid/client/ServerView.java @@ -19,12 +19,12 @@ package com.metamx.druid.client; +import java.util.concurrent.Executor; + import com.metamx.druid.VersionedIntervalTimeline; import com.metamx.druid.client.selector.ServerSelector; import com.metamx.druid.query.QueryRunner; -import java.util.concurrent.Executor; - /** */ public interface ServerView diff --git a/client/src/main/java/com/metamx/druid/client/ZKPhoneBook.java b/client/src/main/java/com/metamx/druid/client/ZKPhoneBook.java index af9d552d0090..cecf7cf51187 100644 --- a/client/src/main/java/com/metamx/druid/client/ZKPhoneBook.java +++ b/client/src/main/java/com/metamx/druid/client/ZKPhoneBook.java @@ -19,6 +19,21 @@ package com.metamx.druid.client; +import java.io.IOException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Executor; + +import org.I0Itec.zkclient.DataUpdater; +import org.I0Itec.zkclient.IZkChildListener; +import org.I0Itec.zkclient.ZkClient; +import org.I0Itec.zkclient.exception.ZkNoNodeException; +import org.I0Itec.zkclient.exception.ZkNodeExistsException; +import org.codehaus.jackson.map.ObjectMapper; + import com.google.common.base.Joiner; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Maps; @@ -28,20 +43,6 @@ import com.metamx.phonebook.BasePhoneBook; import com.metamx.phonebook.PhoneBook; import com.metamx.phonebook.PhoneBookPeon; -import org.I0Itec.zkclient.DataUpdater; -import org.I0Itec.zkclient.IZkChildListener; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.exception.ZkNoNodeException; -import org.I0Itec.zkclient.exception.ZkNodeExistsException; -import org.codehaus.jackson.map.ObjectMapper; - -import java.io.IOException; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.Executor; /** */ diff --git a/client/src/main/java/com/metamx/druid/client/cache/ByteCountingLRUMap.java b/client/src/main/java/com/metamx/druid/client/cache/ByteCountingLRUMap.java index 59a60f060e55..395fba019097 100644 --- a/client/src/main/java/com/metamx/druid/client/cache/ByteCountingLRUMap.java +++ b/client/src/main/java/com/metamx/druid/client/cache/ByteCountingLRUMap.java @@ -19,12 +19,12 @@ package com.metamx.druid.client.cache; -import com.metamx.common.logger.Logger; - import java.nio.ByteBuffer; import java.util.LinkedHashMap; import java.util.Map; +import com.metamx.common.logger.Logger; + /** */ class ByteCountingLRUMap extends LinkedHashMap diff --git a/client/src/main/java/com/metamx/druid/client/cache/MapCacheBroker.java b/client/src/main/java/com/metamx/druid/client/cache/MapCacheBroker.java index 943c5aae1543..decc68464aff 100644 --- a/client/src/main/java/com/metamx/druid/client/cache/MapCacheBroker.java +++ b/client/src/main/java/com/metamx/druid/client/cache/MapCacheBroker.java @@ -19,10 +19,6 @@ package com.metamx.druid.client.cache; -import com.google.common.collect.Maps; -import com.google.common.primitives.Ints; -import com.metamx.common.ISE; - import java.nio.ByteBuffer; import java.util.Collections; import java.util.Iterator; @@ -30,6 +26,10 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; +import com.google.common.collect.Maps; +import com.google.common.primitives.Ints; +import com.metamx.common.ISE; + /** */ public class MapCacheBroker implements CacheBroker diff --git a/client/src/main/java/com/metamx/druid/client/selector/ServerSelector.java b/client/src/main/java/com/metamx/druid/client/selector/ServerSelector.java index 22d56e46f690..69f6f0813aff 100644 --- a/client/src/main/java/com/metamx/druid/client/selector/ServerSelector.java +++ b/client/src/main/java/com/metamx/druid/client/selector/ServerSelector.java @@ -19,14 +19,14 @@ package com.metamx.druid.client.selector; +import java.util.LinkedHashSet; +import java.util.Random; + import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.metamx.druid.client.DataSegment; import com.metamx.druid.client.DruidServer; -import java.util.LinkedHashSet; -import java.util.Random; - /** */ public class ServerSelector diff --git a/client/src/main/java/com/metamx/druid/http/BrokerMain.java b/client/src/main/java/com/metamx/druid/http/BrokerMain.java index 0386685c94ab..e583393891f7 100644 --- a/client/src/main/java/com/metamx/druid/http/BrokerMain.java +++ b/client/src/main/java/com/metamx/druid/http/BrokerMain.java @@ -19,6 +19,17 @@ package com.metamx.druid.http; +import java.util.Properties; +import java.util.concurrent.ScheduledExecutorService; + +import org.I0Itec.zkclient.ZkClient; +import org.codehaus.jackson.map.ObjectMapper; +import org.codehaus.jackson.smile.SmileFactory; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.servlet.Context; +import org.mortbay.jetty.servlet.ServletHolder; +import org.skife.config.ConfigurationObjectFactory; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.inject.Guice; @@ -58,16 +69,6 @@ import com.metamx.phonebook.PhoneBook; import com.netflix.curator.framework.CuratorFramework; import com.netflix.curator.x.discovery.ServiceDiscovery; -import org.I0Itec.zkclient.ZkClient; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.smile.SmileFactory; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.ServletHolder; -import org.skife.config.ConfigurationObjectFactory; - -import java.util.Properties; -import java.util.concurrent.ScheduledExecutorService; /** */ diff --git a/client/src/main/java/com/metamx/druid/http/ClientInfoResource.java b/client/src/main/java/com/metamx/druid/http/ClientInfoResource.java index 50a0475de4bf..99e788970a47 100644 --- a/client/src/main/java/com/metamx/druid/http/ClientInfoResource.java +++ b/client/src/main/java/com/metamx/druid/http/ClientInfoResource.java @@ -19,6 +19,18 @@ package com.metamx.druid.http; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; + +import org.joda.time.Interval; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -29,16 +41,6 @@ import com.metamx.druid.client.DataSegment; import com.metamx.druid.client.DruidDataSource; import com.metamx.druid.client.DruidServer; -import org.joda.time.Interval; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; /** */ diff --git a/client/src/main/java/com/metamx/druid/http/ClientQuerySegmentWalker.java b/client/src/main/java/com/metamx/druid/http/ClientQuerySegmentWalker.java index d316e8fcab55..3a5492d9490c 100644 --- a/client/src/main/java/com/metamx/druid/http/ClientQuerySegmentWalker.java +++ b/client/src/main/java/com/metamx/druid/http/ClientQuerySegmentWalker.java @@ -19,6 +19,10 @@ package com.metamx.druid.http; +import javax.annotation.Nullable; + +import org.joda.time.Interval; + import com.google.common.base.Function; import com.metamx.druid.Query; import com.metamx.druid.client.CachingClusteredClient; @@ -31,9 +35,6 @@ import com.metamx.druid.query.segment.SegmentDescriptor; import com.metamx.emitter.service.ServiceEmitter; import com.metamx.emitter.service.ServiceMetricEvent; -import org.joda.time.Interval; - -import javax.annotation.Nullable; /** */ diff --git a/client/src/main/java/com/metamx/druid/http/ClientServletModule.java b/client/src/main/java/com/metamx/druid/http/ClientServletModule.java index 7ecc5d7ad81c..52e1b4ff7aaf 100644 --- a/client/src/main/java/com/metamx/druid/http/ClientServletModule.java +++ b/client/src/main/java/com/metamx/druid/http/ClientServletModule.java @@ -19,15 +19,16 @@ package com.metamx.druid.http; +import javax.inject.Singleton; + +import org.codehaus.jackson.jaxrs.JacksonJsonProvider; +import org.codehaus.jackson.map.ObjectMapper; + import com.google.inject.Provides; import com.metamx.druid.client.ClientInventoryManager; import com.metamx.druid.query.segment.QuerySegmentWalker; import com.sun.jersey.guice.JerseyServletModule; import com.sun.jersey.guice.spi.container.servlet.GuiceContainer; -import org.codehaus.jackson.jaxrs.JacksonJsonProvider; -import org.codehaus.jackson.map.ObjectMapper; - -import javax.inject.Singleton; /** */ diff --git a/client/src/main/java/com/metamx/druid/http/FileRequestLogger.java b/client/src/main/java/com/metamx/druid/http/FileRequestLogger.java index 20425f9eb37f..8a3d2f3e1d48 100644 --- a/client/src/main/java/com/metamx/druid/http/FileRequestLogger.java +++ b/client/src/main/java/com/metamx/druid/http/FileRequestLogger.java @@ -19,21 +19,22 @@ package com.metamx.druid.http; -import com.google.common.base.Throwables; -import com.google.common.io.Closeables; -import com.metamx.common.concurrent.ScheduledExecutors; -import com.metamx.common.lifecycle.LifecycleStart; -import com.metamx.common.lifecycle.LifecycleStop; -import org.joda.time.DateTime; -import org.joda.time.Duration; -import org.joda.time.MutableDateTime; - import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.util.concurrent.Callable; import java.util.concurrent.ScheduledExecutorService; +import org.joda.time.DateTime; +import org.joda.time.Duration; +import org.joda.time.MutableDateTime; + +import com.google.common.base.Throwables; +import com.google.common.io.Closeables; +import com.metamx.common.concurrent.ScheduledExecutors; +import com.metamx.common.lifecycle.LifecycleStart; +import com.metamx.common.lifecycle.LifecycleStop; + /** */ public class FileRequestLogger implements RequestLogger diff --git a/client/src/main/java/com/metamx/druid/http/QueryServlet.java b/client/src/main/java/com/metamx/druid/http/QueryServlet.java index f68efbc1e89a..5bea2c6da4a8 100644 --- a/client/src/main/java/com/metamx/druid/http/QueryServlet.java +++ b/client/src/main/java/com/metamx/druid/http/QueryServlet.java @@ -19,6 +19,20 @@ package com.metamx.druid.http; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.charset.Charset; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.codehaus.jackson.map.ObjectMapper; +import org.codehaus.jackson.map.ObjectWriter; +import org.joda.time.DateTime; +import org.mortbay.jetty.Request; + import com.google.common.base.Charsets; import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteStreams; @@ -31,18 +45,6 @@ import com.metamx.emitter.service.AlertEvent; import com.metamx.emitter.service.ServiceEmitter; import com.metamx.emitter.service.ServiceMetricEvent; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.ObjectWriter; -import org.joda.time.DateTime; -import org.mortbay.jetty.Request; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.charset.Charset; /** */ diff --git a/client/src/main/java/com/metamx/druid/http/RequestLogLine.java b/client/src/main/java/com/metamx/druid/http/RequestLogLine.java index e42be46fff66..474de4ef92d7 100644 --- a/client/src/main/java/com/metamx/druid/http/RequestLogLine.java +++ b/client/src/main/java/com/metamx/druid/http/RequestLogLine.java @@ -19,11 +19,12 @@ package com.metamx.druid.http; -import com.google.common.base.Joiner; -import com.metamx.druid.Query; +import java.util.Arrays; + import org.joda.time.DateTime; -import java.util.Arrays; +import com.google.common.base.Joiner; +import com.metamx.druid.Query; public class RequestLogLine { diff --git a/client/src/main/java/com/metamx/druid/http/StatusServlet.java b/client/src/main/java/com/metamx/druid/http/StatusServlet.java index 95a40c543b8f..2d6ce4c9247b 100644 --- a/client/src/main/java/com/metamx/druid/http/StatusServlet.java +++ b/client/src/main/java/com/metamx/druid/http/StatusServlet.java @@ -19,15 +19,16 @@ package com.metamx.druid.http; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** */ public class StatusServlet extends HttpServlet diff --git a/client/src/main/java/com/metamx/druid/initialization/Initialization.java b/client/src/main/java/com/metamx/druid/initialization/Initialization.java index f14cfecebf8a..301070d90932 100644 --- a/client/src/main/java/com/metamx/druid/initialization/Initialization.java +++ b/client/src/main/java/com/metamx/druid/initialization/Initialization.java @@ -19,6 +19,21 @@ package com.metamx.druid.initialization; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; + +import org.I0Itec.zkclient.ZkClient; +import org.I0Itec.zkclient.ZkConnection; +import org.codehaus.jackson.map.ObjectMapper; +import org.mortbay.jetty.Connector; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.nio.SelectChannelConnector; +import org.mortbay.thread.QueuedThreadPool; + import com.google.common.base.Throwables; import com.google.common.io.Closeables; import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -36,20 +51,6 @@ import com.netflix.curator.x.discovery.ServiceDiscoveryBuilder; import com.netflix.curator.x.discovery.ServiceInstance; import com.netflix.curator.x.discovery.ServiceProvider; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.ZkConnection; -import org.codehaus.jackson.map.ObjectMapper; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.nio.SelectChannelConnector; -import org.mortbay.thread.QueuedThreadPool; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; /** */ diff --git a/client/src/main/java/com/metamx/druid/merge/ClientAppendQuery.java b/client/src/main/java/com/metamx/druid/merge/ClientAppendQuery.java index 441adcffc3b8..4d0a5cf8f99e 100644 --- a/client/src/main/java/com/metamx/druid/merge/ClientAppendQuery.java +++ b/client/src/main/java/com/metamx/druid/merge/ClientAppendQuery.java @@ -19,11 +19,12 @@ package com.metamx.druid.merge; -import com.metamx.druid.client.DataSegment; +import java.util.List; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.util.List; +import com.metamx.druid.client.DataSegment; /** */ diff --git a/client/src/main/java/com/metamx/druid/merge/ClientDefaultMergeQuery.java b/client/src/main/java/com/metamx/druid/merge/ClientDefaultMergeQuery.java index c5cc80454925..c94814bdbe90 100644 --- a/client/src/main/java/com/metamx/druid/merge/ClientDefaultMergeQuery.java +++ b/client/src/main/java/com/metamx/druid/merge/ClientDefaultMergeQuery.java @@ -19,12 +19,13 @@ package com.metamx.druid.merge; -import com.metamx.druid.aggregation.AggregatorFactory; -import com.metamx.druid.client.DataSegment; +import java.util.List; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.util.List; +import com.metamx.druid.aggregation.AggregatorFactory; +import com.metamx.druid.client.DataSegment; /** */ diff --git a/client/src/main/java/com/metamx/druid/merge/ClientMergeQuery.java b/client/src/main/java/com/metamx/druid/merge/ClientMergeQuery.java index 83f269d0db30..06f237f7219e 100644 --- a/client/src/main/java/com/metamx/druid/merge/ClientMergeQuery.java +++ b/client/src/main/java/com/metamx/druid/merge/ClientMergeQuery.java @@ -19,11 +19,12 @@ package com.metamx.druid.merge; -import com.metamx.druid.client.DataSegment; +import java.util.List; + import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; -import java.util.List; +import com.metamx.druid.client.DataSegment; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/BySegmentQueryRunner.java b/client/src/main/java/com/metamx/druid/query/BySegmentQueryRunner.java index 1ecea33117f4..5e0c5b5362c9 100644 --- a/client/src/main/java/com/metamx/druid/query/BySegmentQueryRunner.java +++ b/client/src/main/java/com/metamx/druid/query/BySegmentQueryRunner.java @@ -19,6 +19,10 @@ package com.metamx.druid.query; +import java.util.List; + +import org.joda.time.DateTime; + import com.google.common.collect.Lists; import com.metamx.common.guava.Accumulator; import com.metamx.common.guava.Sequence; @@ -29,9 +33,6 @@ import com.metamx.druid.Query; import com.metamx.druid.result.BySegmentResultValueClass; import com.metamx.druid.result.Result; -import org.joda.time.DateTime; - -import java.util.List; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/ChainedExecutionQueryRunner.java b/client/src/main/java/com/metamx/druid/query/ChainedExecutionQueryRunner.java index b86d3128d08a..1254dd96b539 100644 --- a/client/src/main/java/com/metamx/druid/query/ChainedExecutionQueryRunner.java +++ b/client/src/main/java/com/metamx/druid/query/ChainedExecutionQueryRunner.java @@ -19,6 +19,14 @@ package com.metamx.druid.query; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; + import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -29,14 +37,6 @@ import com.metamx.common.guava.Sequences; import com.metamx.druid.Query; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; - /** * A QueryRunner that combines a list of other QueryRunners and executes them in parallel on an executor. *

diff --git a/client/src/main/java/com/metamx/druid/query/FinalizeResultsQueryRunner.java b/client/src/main/java/com/metamx/druid/query/FinalizeResultsQueryRunner.java index 22f11bb07a83..f67a959b4dcd 100644 --- a/client/src/main/java/com/metamx/druid/query/FinalizeResultsQueryRunner.java +++ b/client/src/main/java/com/metamx/druid/query/FinalizeResultsQueryRunner.java @@ -19,6 +19,8 @@ package com.metamx.druid.query; +import javax.annotation.Nullable; + import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; @@ -29,8 +31,6 @@ import com.metamx.druid.result.BySegmentResultValueClass; import com.metamx.druid.result.Result; -import javax.annotation.Nullable; - /** */ public class FinalizeResultsQueryRunner implements QueryRunner diff --git a/client/src/main/java/com/metamx/druid/query/IntervalChunkingQueryRunner.java b/client/src/main/java/com/metamx/druid/query/IntervalChunkingQueryRunner.java index 9c0a32eac3ff..b05f6bdb4657 100644 --- a/client/src/main/java/com/metamx/druid/query/IntervalChunkingQueryRunner.java +++ b/client/src/main/java/com/metamx/druid/query/IntervalChunkingQueryRunner.java @@ -19,6 +19,15 @@ package com.metamx.druid.query; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + +import javax.annotation.Nullable; + +import org.joda.time.Interval; +import org.joda.time.Period; + import com.google.common.base.Function; import com.google.common.collect.Lists; import com.metamx.common.guava.FunctionalIterable; @@ -27,13 +36,6 @@ import com.metamx.druid.PeriodGranularity; import com.metamx.druid.Query; import com.metamx.druid.query.segment.MultipleIntervalSegmentSpec; -import org.joda.time.Interval; -import org.joda.time.Period; - -import javax.annotation.Nullable; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/MetricsEmittingQueryRunner.java b/client/src/main/java/com/metamx/druid/query/MetricsEmittingQueryRunner.java index 44db0ac38938..3a29192c70c1 100644 --- a/client/src/main/java/com/metamx/druid/query/MetricsEmittingQueryRunner.java +++ b/client/src/main/java/com/metamx/druid/query/MetricsEmittingQueryRunner.java @@ -19,6 +19,8 @@ package com.metamx.druid.query; +import java.io.IOException; + import com.google.common.base.Function; import com.metamx.common.guava.Accumulator; import com.metamx.common.guava.Sequence; @@ -28,8 +30,6 @@ import com.metamx.emitter.service.ServiceEmitter; import com.metamx.emitter.service.ServiceMetricEvent; -import java.io.IOException; - /** */ public class MetricsEmittingQueryRunner implements QueryRunner diff --git a/client/src/main/java/com/metamx/druid/query/QueryCacheHelper.java b/client/src/main/java/com/metamx/druid/query/QueryCacheHelper.java index dd293fbdf5ca..7a6e3e8d53b7 100644 --- a/client/src/main/java/com/metamx/druid/query/QueryCacheHelper.java +++ b/client/src/main/java/com/metamx/druid/query/QueryCacheHelper.java @@ -19,12 +19,12 @@ package com.metamx.druid.query; -import com.google.common.collect.Lists; -import com.metamx.druid.aggregation.AggregatorFactory; - import java.nio.ByteBuffer; import java.util.List; +import com.google.common.collect.Lists; +import com.metamx.druid.aggregation.AggregatorFactory; + /** */ public class QueryCacheHelper diff --git a/client/src/main/java/com/metamx/druid/query/QueryToolChest.java b/client/src/main/java/com/metamx/druid/query/QueryToolChest.java index ebf77f64af4c..4f97449e0e58 100644 --- a/client/src/main/java/com/metamx/druid/query/QueryToolChest.java +++ b/client/src/main/java/com/metamx/druid/query/QueryToolChest.java @@ -19,11 +19,12 @@ package com.metamx.druid.query; +import org.codehaus.jackson.type.TypeReference; + import com.google.common.base.Function; import com.metamx.common.guava.Sequence; import com.metamx.druid.Query; import com.metamx.emitter.service.ServiceMetricEvent; -import org.codehaus.jackson.type.TypeReference; /** * The broker-side (also used by server in some cases) API for a specific Query type. This API is still undergoing diff --git a/client/src/main/java/com/metamx/druid/query/ReflectionLoaderThingy.java b/client/src/main/java/com/metamx/druid/query/ReflectionLoaderThingy.java index cd9eba24f259..2be8346f5f0b 100644 --- a/client/src/main/java/com/metamx/druid/query/ReflectionLoaderThingy.java +++ b/client/src/main/java/com/metamx/druid/query/ReflectionLoaderThingy.java @@ -19,12 +19,12 @@ package com.metamx.druid.query; -import com.google.common.collect.Maps; -import com.metamx.common.logger.Logger; - import java.util.Map; import java.util.concurrent.atomic.AtomicReference; +import com.google.common.collect.Maps; +import com.metamx.common.logger.Logger; + /** */ public class ReflectionLoaderThingy diff --git a/client/src/main/java/com/metamx/druid/query/dimension/DefaultDimensionSpec.java b/client/src/main/java/com/metamx/druid/query/dimension/DefaultDimensionSpec.java index 4895378cc1be..99af7eb936d0 100644 --- a/client/src/main/java/com/metamx/druid/query/dimension/DefaultDimensionSpec.java +++ b/client/src/main/java/com/metamx/druid/query/dimension/DefaultDimensionSpec.java @@ -19,11 +19,12 @@ package com.metamx.druid.query.dimension; -import com.metamx.druid.query.extraction.DimExtractionFn; +import java.nio.ByteBuffer; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.nio.ByteBuffer; +import com.metamx.druid.query.extraction.DimExtractionFn; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/dimension/DimensionSpec.java b/client/src/main/java/com/metamx/druid/query/dimension/DimensionSpec.java index 34310ef4c098..48f53d8a8ce5 100644 --- a/client/src/main/java/com/metamx/druid/query/dimension/DimensionSpec.java +++ b/client/src/main/java/com/metamx/druid/query/dimension/DimensionSpec.java @@ -19,10 +19,11 @@ package com.metamx.druid.query.dimension; -import com.metamx.druid.query.extraction.DimExtractionFn; import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; +import com.metamx.druid.query.extraction.DimExtractionFn; + /** */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = LegacyDimensionSpec.class) diff --git a/client/src/main/java/com/metamx/druid/query/dimension/ExtractionDimensionSpec.java b/client/src/main/java/com/metamx/druid/query/dimension/ExtractionDimensionSpec.java index ed85b840d0d8..1ad755e7ce2c 100644 --- a/client/src/main/java/com/metamx/druid/query/dimension/ExtractionDimensionSpec.java +++ b/client/src/main/java/com/metamx/druid/query/dimension/ExtractionDimensionSpec.java @@ -19,11 +19,12 @@ package com.metamx.druid.query.dimension; -import com.metamx.druid.query.extraction.DimExtractionFn; +import java.nio.ByteBuffer; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.nio.ByteBuffer; +import com.metamx.druid.query.extraction.DimExtractionFn; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/dimension/LegacyDimensionSpec.java b/client/src/main/java/com/metamx/druid/query/dimension/LegacyDimensionSpec.java index 9a4e11a9a5f2..b3b3dfa65ca3 100644 --- a/client/src/main/java/com/metamx/druid/query/dimension/LegacyDimensionSpec.java +++ b/client/src/main/java/com/metamx/druid/query/dimension/LegacyDimensionSpec.java @@ -19,10 +19,11 @@ package com.metamx.druid.query.dimension; -import com.metamx.common.IAE; +import java.util.Map; + import org.codehaus.jackson.annotate.JsonCreator; -import java.util.Map; +import com.metamx.common.IAE; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/extraction/PartialDimExtractionFn.java b/client/src/main/java/com/metamx/druid/query/extraction/PartialDimExtractionFn.java index 28ea1ebc37b3..2dbbf85c9f69 100644 --- a/client/src/main/java/com/metamx/druid/query/extraction/PartialDimExtractionFn.java +++ b/client/src/main/java/com/metamx/druid/query/extraction/PartialDimExtractionFn.java @@ -19,13 +19,13 @@ package com.metamx.druid.query.extraction; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - import java.nio.ByteBuffer; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + /** */ public class PartialDimExtractionFn implements DimExtractionFn diff --git a/client/src/main/java/com/metamx/druid/query/extraction/RegexDimExtractionFn.java b/client/src/main/java/com/metamx/druid/query/extraction/RegexDimExtractionFn.java index da3a878aa2fd..02189bb37e3e 100644 --- a/client/src/main/java/com/metamx/druid/query/extraction/RegexDimExtractionFn.java +++ b/client/src/main/java/com/metamx/druid/query/extraction/RegexDimExtractionFn.java @@ -19,13 +19,13 @@ package com.metamx.druid.query.extraction; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - import java.nio.ByteBuffer; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + /** */ public class RegexDimExtractionFn implements DimExtractionFn diff --git a/client/src/main/java/com/metamx/druid/query/extraction/SearchQuerySpecDimExtractionFn.java b/client/src/main/java/com/metamx/druid/query/extraction/SearchQuerySpecDimExtractionFn.java index 57e3bfde16bd..f3d9c33bb35a 100644 --- a/client/src/main/java/com/metamx/druid/query/extraction/SearchQuerySpecDimExtractionFn.java +++ b/client/src/main/java/com/metamx/druid/query/extraction/SearchQuerySpecDimExtractionFn.java @@ -19,11 +19,12 @@ package com.metamx.druid.query.extraction; -import com.metamx.druid.query.search.SearchQuerySpec; +import java.nio.ByteBuffer; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.nio.ByteBuffer; +import com.metamx.druid.query.search.SearchQuerySpec; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/extraction/TimeDimExtractionFn.java b/client/src/main/java/com/metamx/druid/query/extraction/TimeDimExtractionFn.java index dc2c2eb36cfd..e9fb0179adc8 100644 --- a/client/src/main/java/com/metamx/druid/query/extraction/TimeDimExtractionFn.java +++ b/client/src/main/java/com/metamx/druid/query/extraction/TimeDimExtractionFn.java @@ -19,14 +19,15 @@ package com.metamx.druid.query.extraction; -import com.ibm.icu.text.SimpleDateFormat; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - import java.nio.ByteBuffer; import java.text.ParseException; import java.util.Date; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + +import com.ibm.icu.text.SimpleDateFormat; + /** */ public class TimeDimExtractionFn implements DimExtractionFn diff --git a/client/src/main/java/com/metamx/druid/query/filter/AndDimFilter.java b/client/src/main/java/com/metamx/druid/query/filter/AndDimFilter.java index b0bbb5810308..b6362928dac1 100644 --- a/client/src/main/java/com/metamx/druid/query/filter/AndDimFilter.java +++ b/client/src/main/java/com/metamx/druid/query/filter/AndDimFilter.java @@ -19,11 +19,12 @@ package com.metamx.druid.query.filter; -import com.google.common.base.Joiner; +import java.util.List; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.util.List; +import com.google.common.base.Joiner; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/filter/ExtractionDimFilter.java b/client/src/main/java/com/metamx/druid/query/filter/ExtractionDimFilter.java index dd5e7ad6ddd9..8ce682174bfa 100644 --- a/client/src/main/java/com/metamx/druid/query/filter/ExtractionDimFilter.java +++ b/client/src/main/java/com/metamx/druid/query/filter/ExtractionDimFilter.java @@ -19,11 +19,12 @@ package com.metamx.druid.query.filter; -import com.metamx.druid.query.extraction.DimExtractionFn; +import java.nio.ByteBuffer; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.nio.ByteBuffer; +import com.metamx.druid.query.extraction.DimExtractionFn; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/filter/NotDimFilter.java b/client/src/main/java/com/metamx/druid/query/filter/NotDimFilter.java index 391ac29bfdef..aae09b3fbc83 100644 --- a/client/src/main/java/com/metamx/druid/query/filter/NotDimFilter.java +++ b/client/src/main/java/com/metamx/druid/query/filter/NotDimFilter.java @@ -19,11 +19,11 @@ package com.metamx.druid.query.filter; +import java.nio.ByteBuffer; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.nio.ByteBuffer; - /** */ public class NotDimFilter implements DimFilter diff --git a/client/src/main/java/com/metamx/druid/query/filter/OrDimFilter.java b/client/src/main/java/com/metamx/druid/query/filter/OrDimFilter.java index 4ebdcb8471ea..4cddd3e59438 100644 --- a/client/src/main/java/com/metamx/druid/query/filter/OrDimFilter.java +++ b/client/src/main/java/com/metamx/druid/query/filter/OrDimFilter.java @@ -19,11 +19,12 @@ package com.metamx.druid.query.filter; -import com.google.common.base.Joiner; +import java.util.List; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.util.List; +import com.google.common.base.Joiner; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/filter/RegexDimFilter.java b/client/src/main/java/com/metamx/druid/query/filter/RegexDimFilter.java index 584916c9bf41..a582b3d2b4cd 100644 --- a/client/src/main/java/com/metamx/druid/query/filter/RegexDimFilter.java +++ b/client/src/main/java/com/metamx/druid/query/filter/RegexDimFilter.java @@ -19,11 +19,12 @@ package com.metamx.druid.query.filter; -import com.google.common.base.Charsets; +import java.nio.ByteBuffer; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.nio.ByteBuffer; +import com.google.common.base.Charsets; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/filter/SelectorDimFilter.java b/client/src/main/java/com/metamx/druid/query/filter/SelectorDimFilter.java index 73097ec0cd1f..2f6d53712321 100644 --- a/client/src/main/java/com/metamx/druid/query/filter/SelectorDimFilter.java +++ b/client/src/main/java/com/metamx/druid/query/filter/SelectorDimFilter.java @@ -19,11 +19,11 @@ package com.metamx.druid.query.filter; +import java.nio.ByteBuffer; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.nio.ByteBuffer; - /** */ public class SelectorDimFilter implements DimFilter diff --git a/client/src/main/java/com/metamx/druid/query/group/GroupByQuery.java b/client/src/main/java/com/metamx/druid/query/group/GroupByQuery.java index d30af3094731..9be360d2f7ea 100644 --- a/client/src/main/java/com/metamx/druid/query/group/GroupByQuery.java +++ b/client/src/main/java/com/metamx/druid/query/group/GroupByQuery.java @@ -19,6 +19,12 @@ package com.metamx.druid.query.group; +import java.util.List; +import java.util.Map; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -33,11 +39,6 @@ import com.metamx.druid.query.filter.DimFilter; import com.metamx.druid.query.segment.LegacySegmentSpec; import com.metamx.druid.query.segment.QuerySegmentSpec; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - -import java.util.List; -import java.util.Map; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/group/GroupByQueryQueryToolChest.java b/client/src/main/java/com/metamx/druid/query/group/GroupByQueryQueryToolChest.java index d66f27f4d367..4ab2e9973e30 100644 --- a/client/src/main/java/com/metamx/druid/query/group/GroupByQueryQueryToolChest.java +++ b/client/src/main/java/com/metamx/druid/query/group/GroupByQueryQueryToolChest.java @@ -19,6 +19,15 @@ package com.metamx.druid.query.group; +import java.util.List; +import java.util.Properties; + +import javax.annotation.Nullable; + +import org.codehaus.jackson.type.TypeReference; +import org.joda.time.Interval; +import org.joda.time.Minutes; + import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.base.Joiner; @@ -41,13 +50,6 @@ import com.metamx.druid.query.dimension.DimensionSpec; import com.metamx.druid.utils.PropUtils; import com.metamx.emitter.service.ServiceMetricEvent; -import org.codehaus.jackson.type.TypeReference; -import org.joda.time.Interval; -import org.joda.time.Minutes; - -import javax.annotation.Nullable; -import java.util.List; -import java.util.Properties; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/search/FragmentSearchQuerySpec.java b/client/src/main/java/com/metamx/druid/query/search/FragmentSearchQuerySpec.java index e0a73b4bc3cb..3c83a2290951 100644 --- a/client/src/main/java/com/metamx/druid/query/search/FragmentSearchQuerySpec.java +++ b/client/src/main/java/com/metamx/druid/query/search/FragmentSearchQuerySpec.java @@ -19,13 +19,14 @@ package com.metamx.druid.query.search; -import com.google.common.base.Function; -import com.google.common.collect.Lists; +import java.nio.ByteBuffer; +import java.util.List; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.nio.ByteBuffer; -import java.util.List; +import com.google.common.base.Function; +import com.google.common.collect.Lists; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/search/InsensitiveContainsSearchQuerySpec.java b/client/src/main/java/com/metamx/druid/query/search/InsensitiveContainsSearchQuerySpec.java index 87a6246a5b25..bad823c6e242 100644 --- a/client/src/main/java/com/metamx/druid/query/search/InsensitiveContainsSearchQuerySpec.java +++ b/client/src/main/java/com/metamx/druid/query/search/InsensitiveContainsSearchQuerySpec.java @@ -19,11 +19,11 @@ package com.metamx.druid.query.search; +import java.nio.ByteBuffer; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.nio.ByteBuffer; - /** */ public class InsensitiveContainsSearchQuerySpec implements SearchQuerySpec diff --git a/client/src/main/java/com/metamx/druid/query/search/LexicographicSearchSortSpec.java b/client/src/main/java/com/metamx/druid/query/search/LexicographicSearchSortSpec.java index b7dfddef413b..c5d0ca990dfa 100644 --- a/client/src/main/java/com/metamx/druid/query/search/LexicographicSearchSortSpec.java +++ b/client/src/main/java/com/metamx/druid/query/search/LexicographicSearchSortSpec.java @@ -19,10 +19,9 @@ package com.metamx.druid.query.search; -import org.codehaus.jackson.annotate.JsonCreator; - import java.util.Comparator; -import java.util.Map; + +import org.codehaus.jackson.annotate.JsonCreator; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/search/SearchHit.java b/client/src/main/java/com/metamx/druid/query/search/SearchHit.java index c1c0727067a5..3064ec1ccf4b 100644 --- a/client/src/main/java/com/metamx/druid/query/search/SearchHit.java +++ b/client/src/main/java/com/metamx/druid/query/search/SearchHit.java @@ -19,11 +19,11 @@ package com.metamx.druid.query.search; +import static com.google.common.base.Preconditions.checkNotNull; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import static com.google.common.base.Preconditions.checkNotNull; - /** */ public class SearchHit implements Comparable diff --git a/client/src/main/java/com/metamx/druid/query/search/SearchQuery.java b/client/src/main/java/com/metamx/druid/query/search/SearchQuery.java index 2a721431b89b..7ef40272d9a3 100644 --- a/client/src/main/java/com/metamx/druid/query/search/SearchQuery.java +++ b/client/src/main/java/com/metamx/druid/query/search/SearchQuery.java @@ -19,6 +19,14 @@ package com.metamx.druid.query.search; +import java.util.List; +import java.util.Map; + +import javax.annotation.Nullable; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -29,12 +37,6 @@ import com.metamx.druid.query.segment.QuerySegmentSpec; import com.metamx.druid.result.Result; import com.metamx.druid.result.SearchResultValue; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - -import javax.annotation.Nullable; -import java.util.List; -import java.util.Map; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/search/SearchQueryQueryToolChest.java b/client/src/main/java/com/metamx/druid/query/search/SearchQueryQueryToolChest.java index 1b6a5e1345e0..85b768f2b99e 100644 --- a/client/src/main/java/com/metamx/druid/query/search/SearchQueryQueryToolChest.java +++ b/client/src/main/java/com/metamx/druid/query/search/SearchQueryQueryToolChest.java @@ -19,6 +19,20 @@ package com.metamx.druid.query.search; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import javax.annotation.Nullable; + +import org.codehaus.jackson.type.TypeReference; +import org.joda.time.DateTime; +import org.joda.time.Interval; +import org.joda.time.Minutes; +import org.joda.time.Period; + import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.base.Joiner; @@ -49,18 +63,6 @@ import com.metamx.druid.result.SearchResultValue; import com.metamx.druid.utils.PropUtils; import com.metamx.emitter.service.ServiceMetricEvent; -import org.codehaus.jackson.type.TypeReference; -import org.joda.time.DateTime; -import org.joda.time.Interval; -import org.joda.time.Minutes; -import org.joda.time.Period; - -import javax.annotation.Nullable; -import java.nio.ByteBuffer; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/search/SearchQuerySpec.java b/client/src/main/java/com/metamx/druid/query/search/SearchQuerySpec.java index faa1cca17a77..6c19bd3b3bc0 100644 --- a/client/src/main/java/com/metamx/druid/query/search/SearchQuerySpec.java +++ b/client/src/main/java/com/metamx/druid/query/search/SearchQuerySpec.java @@ -19,12 +19,9 @@ package com.metamx.druid.query.search; -import com.google.common.base.Predicate; import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; -import java.util.List; - /** */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") diff --git a/client/src/main/java/com/metamx/druid/query/search/SearchSortSpec.java b/client/src/main/java/com/metamx/druid/query/search/SearchSortSpec.java index b68f074e2ce7..07c1b42416c2 100644 --- a/client/src/main/java/com/metamx/druid/query/search/SearchSortSpec.java +++ b/client/src/main/java/com/metamx/druid/query/search/SearchSortSpec.java @@ -19,11 +19,11 @@ package com.metamx.druid.query.search; +import java.util.Comparator; + import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; -import java.util.Comparator; - /** */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", defaultImpl = LexicographicSearchSortSpec.class) diff --git a/client/src/main/java/com/metamx/druid/query/search/StrlenSearchSortSpec.java b/client/src/main/java/com/metamx/druid/query/search/StrlenSearchSortSpec.java index bef5de857266..8fd79701c1df 100644 --- a/client/src/main/java/com/metamx/druid/query/search/StrlenSearchSortSpec.java +++ b/client/src/main/java/com/metamx/druid/query/search/StrlenSearchSortSpec.java @@ -20,7 +20,6 @@ package com.metamx.druid.query.search; import java.util.Comparator; -import java.util.Map; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java b/client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java index 6d25c152ab45..4bd18029e77c 100644 --- a/client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java +++ b/client/src/main/java/com/metamx/druid/query/segment/LegacySegmentSpec.java @@ -19,16 +19,17 @@ package com.metamx.druid.query.segment; -import com.google.common.base.Function; -import com.google.common.collect.Lists; -import com.metamx.common.IAE; -import org.codehaus.jackson.annotate.JsonCreator; -import org.joda.time.Interval; - import java.util.Arrays; import java.util.List; import java.util.Map; +import org.codehaus.jackson.annotate.JsonCreator; +import org.joda.time.Interval; + +import com.google.common.base.Function; +import com.google.common.collect.Lists; +import com.metamx.common.IAE; + /** */ public class LegacySegmentSpec extends MultipleIntervalSegmentSpec diff --git a/client/src/main/java/com/metamx/druid/query/segment/MultipleIntervalSegmentSpec.java b/client/src/main/java/com/metamx/druid/query/segment/MultipleIntervalSegmentSpec.java index f81126857bcf..823f2c3a6594 100644 --- a/client/src/main/java/com/metamx/druid/query/segment/MultipleIntervalSegmentSpec.java +++ b/client/src/main/java/com/metamx/druid/query/segment/MultipleIntervalSegmentSpec.java @@ -19,15 +19,16 @@ package com.metamx.druid.query.segment; -import com.metamx.druid.Query; -import com.metamx.druid.query.QueryRunner; -import com.metamx.druid.utils.JodaUtils; +import java.util.Collections; +import java.util.List; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; import org.joda.time.Interval; -import java.util.Collections; -import java.util.List; +import com.metamx.druid.Query; +import com.metamx.druid.query.QueryRunner; +import com.metamx.druid.utils.JodaUtils; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/segment/MultipleSpecificSegmentSpec.java b/client/src/main/java/com/metamx/druid/query/segment/MultipleSpecificSegmentSpec.java index 4193934fbc01..c28f8406ca51 100644 --- a/client/src/main/java/com/metamx/druid/query/segment/MultipleSpecificSegmentSpec.java +++ b/client/src/main/java/com/metamx/druid/query/segment/MultipleSpecificSegmentSpec.java @@ -19,16 +19,17 @@ package com.metamx.druid.query.segment; +import java.util.List; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.metamx.druid.Query; import com.metamx.druid.query.QueryRunner; import com.metamx.druid.utils.JodaUtils; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.joda.time.Interval; - -import java.util.List; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/segment/QuerySegmentSpec.java b/client/src/main/java/com/metamx/druid/query/segment/QuerySegmentSpec.java index ca42ce8bc8ae..ab0ce80b2c8b 100644 --- a/client/src/main/java/com/metamx/druid/query/segment/QuerySegmentSpec.java +++ b/client/src/main/java/com/metamx/druid/query/segment/QuerySegmentSpec.java @@ -19,13 +19,14 @@ package com.metamx.druid.query.segment; -import com.metamx.druid.Query; -import com.metamx.druid.query.QueryRunner; +import java.util.List; + import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; import org.joda.time.Interval; -import java.util.List; +import com.metamx.druid.Query; +import com.metamx.druid.query.QueryRunner; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/segment/QuerySegmentWalker.java b/client/src/main/java/com/metamx/druid/query/segment/QuerySegmentWalker.java index efb7667a3709..526bb448b202 100644 --- a/client/src/main/java/com/metamx/druid/query/segment/QuerySegmentWalker.java +++ b/client/src/main/java/com/metamx/druid/query/segment/QuerySegmentWalker.java @@ -19,9 +19,10 @@ package com.metamx.druid.query.segment; +import org.joda.time.Interval; + import com.metamx.druid.Query; import com.metamx.druid.query.QueryRunner; -import org.joda.time.Interval; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/segment/SpecificSegmentQueryRunner.java b/client/src/main/java/com/metamx/druid/query/segment/SpecificSegmentQueryRunner.java index f5289185646d..62f2f43cec7a 100644 --- a/client/src/main/java/com/metamx/druid/query/segment/SpecificSegmentQueryRunner.java +++ b/client/src/main/java/com/metamx/druid/query/segment/SpecificSegmentQueryRunner.java @@ -19,6 +19,9 @@ package com.metamx.druid.query.segment; +import java.io.IOException; +import java.util.concurrent.Callable; + import com.google.common.base.Throwables; import com.metamx.common.guava.Accumulator; import com.metamx.common.guava.Sequence; @@ -27,9 +30,6 @@ import com.metamx.druid.Query; import com.metamx.druid.query.QueryRunner; -import java.io.IOException; -import java.util.concurrent.Callable; - /** */ public class SpecificSegmentQueryRunner implements QueryRunner diff --git a/client/src/main/java/com/metamx/druid/query/segment/SpecificSegmentSpec.java b/client/src/main/java/com/metamx/druid/query/segment/SpecificSegmentSpec.java index c85ef86aa2ab..ca1953669d53 100644 --- a/client/src/main/java/com/metamx/druid/query/segment/SpecificSegmentSpec.java +++ b/client/src/main/java/com/metamx/druid/query/segment/SpecificSegmentSpec.java @@ -19,13 +19,14 @@ package com.metamx.druid.query.segment; -import com.metamx.druid.Query; -import com.metamx.druid.query.QueryRunner; -import org.joda.time.Interval; - import java.util.Arrays; import java.util.List; +import org.joda.time.Interval; + +import com.metamx.druid.Query; +import com.metamx.druid.query.QueryRunner; + /** */ public class SpecificSegmentSpec implements QuerySegmentSpec diff --git a/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQuery.java b/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQuery.java index b68d97813caa..be30df421f86 100644 --- a/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQuery.java +++ b/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQuery.java @@ -19,6 +19,16 @@ package com.metamx.druid.query.timeboundary; +import java.nio.ByteBuffer; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -28,15 +38,6 @@ import com.metamx.druid.query.segment.QuerySegmentSpec; import com.metamx.druid.result.Result; import com.metamx.druid.result.TimeBoundaryResultValue; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import java.nio.ByteBuffer; -import java.util.Arrays; -import java.util.List; -import java.util.Map; /** */ diff --git a/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java b/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java index 9d65ab9b47c3..73471f8fe63d 100644 --- a/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java +++ b/client/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java @@ -19,6 +19,14 @@ package com.metamx.druid.query.timeboundary; +import java.nio.ByteBuffer; +import java.util.List; + +import javax.annotation.Nullable; + +import org.codehaus.jackson.type.TypeReference; +import org.joda.time.DateTime; + import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.collect.Lists; @@ -36,12 +44,6 @@ import com.metamx.druid.result.Result; import com.metamx.druid.result.TimeBoundaryResultValue; import com.metamx.emitter.service.ServiceMetricEvent; -import org.codehaus.jackson.type.TypeReference; -import org.joda.time.DateTime; - -import javax.annotation.Nullable; -import java.nio.ByteBuffer; -import java.util.List; /** */ diff --git a/client/src/main/java/com/metamx/druid/result/BySegmentResultValueClass.java b/client/src/main/java/com/metamx/druid/result/BySegmentResultValueClass.java index 24d9637ae84b..eddd10ad6875 100644 --- a/client/src/main/java/com/metamx/druid/result/BySegmentResultValueClass.java +++ b/client/src/main/java/com/metamx/druid/result/BySegmentResultValueClass.java @@ -19,10 +19,10 @@ package com.metamx.druid.result; -import org.codehaus.jackson.annotate.JsonProperty; - import java.util.List; +import org.codehaus.jackson.annotate.JsonProperty; + /** */ public class BySegmentResultValueClass diff --git a/client/src/main/java/com/metamx/druid/result/BySegmentSearchResultValue.java b/client/src/main/java/com/metamx/druid/result/BySegmentSearchResultValue.java index b324ccbab37c..4517429039a4 100644 --- a/client/src/main/java/com/metamx/druid/result/BySegmentSearchResultValue.java +++ b/client/src/main/java/com/metamx/druid/result/BySegmentSearchResultValue.java @@ -19,11 +19,12 @@ package com.metamx.druid.result; -import com.metamx.druid.query.search.SearchHit; +import java.util.List; + import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonValue; -import java.util.List; +import com.metamx.druid.query.search.SearchHit; /** */ diff --git a/client/src/main/java/com/metamx/druid/result/Result.java b/client/src/main/java/com/metamx/druid/result/Result.java index 9fc5aebf3478..49cc332aa1ea 100644 --- a/client/src/main/java/com/metamx/druid/result/Result.java +++ b/client/src/main/java/com/metamx/druid/result/Result.java @@ -21,7 +21,6 @@ import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.annotate.JsonUnwrapped; import org.joda.time.DateTime; /** diff --git a/client/src/main/java/com/metamx/druid/result/SearchResultValue.java b/client/src/main/java/com/metamx/druid/result/SearchResultValue.java index 40f10ed85eca..3131b9eeeee6 100644 --- a/client/src/main/java/com/metamx/druid/result/SearchResultValue.java +++ b/client/src/main/java/com/metamx/druid/result/SearchResultValue.java @@ -19,12 +19,13 @@ package com.metamx.druid.result; -import com.metamx.druid.query.search.SearchHit; +import java.util.Iterator; +import java.util.List; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonValue; -import java.util.Iterator; -import java.util.List; +import com.metamx.druid.query.search.SearchHit; /** */ diff --git a/client/src/main/java/com/metamx/druid/result/TimeBoundaryResultValue.java b/client/src/main/java/com/metamx/druid/result/TimeBoundaryResultValue.java index 74daa14f3765..ce85ed692c7f 100644 --- a/client/src/main/java/com/metamx/druid/result/TimeBoundaryResultValue.java +++ b/client/src/main/java/com/metamx/druid/result/TimeBoundaryResultValue.java @@ -19,13 +19,14 @@ package com.metamx.druid.result; -import com.metamx.common.IAE; -import com.metamx.druid.query.timeboundary.TimeBoundaryQuery; +import java.util.Map; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonValue; import org.joda.time.DateTime; -import java.util.Map; +import com.metamx.common.IAE; +import com.metamx.druid.query.timeboundary.TimeBoundaryQuery; /** */ diff --git a/client/src/main/java/com/metamx/druid/shard/NoneShardSpec.java b/client/src/main/java/com/metamx/druid/shard/NoneShardSpec.java index 4ed756e1daf1..cf3dd9740945 100644 --- a/client/src/main/java/com/metamx/druid/shard/NoneShardSpec.java +++ b/client/src/main/java/com/metamx/druid/shard/NoneShardSpec.java @@ -19,12 +19,11 @@ package com.metamx.druid.shard; +import java.util.Map; + import com.metamx.druid.input.InputRow; import com.metamx.druid.partition.PartitionChunk; import com.metamx.druid.partition.SingleElementPartitionChunk; -import org.codehaus.jackson.annotate.JsonTypeName; - -import java.util.Map; /** */ diff --git a/client/src/main/java/com/metamx/druid/shard/ShardSpec.java b/client/src/main/java/com/metamx/druid/shard/ShardSpec.java index c0127b055e9c..03a11a4b47d8 100644 --- a/client/src/main/java/com/metamx/druid/shard/ShardSpec.java +++ b/client/src/main/java/com/metamx/druid/shard/ShardSpec.java @@ -19,12 +19,13 @@ package com.metamx.druid.shard; -import com.metamx.druid.input.InputRow; -import com.metamx.druid.partition.PartitionChunk; +import java.util.Map; + import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; -import java.util.Map; +import com.metamx.druid.input.InputRow; +import com.metamx.druid.partition.PartitionChunk; /** * A Marker interface that exists to combine ShardSpec objects together for Jackson diff --git a/client/src/main/java/com/metamx/druid/shard/SingleDimensionShardSpec.java b/client/src/main/java/com/metamx/druid/shard/SingleDimensionShardSpec.java index 7580673b0715..c4b67073b1ea 100644 --- a/client/src/main/java/com/metamx/druid/shard/SingleDimensionShardSpec.java +++ b/client/src/main/java/com/metamx/druid/shard/SingleDimensionShardSpec.java @@ -19,14 +19,14 @@ package com.metamx.druid.shard; +import java.util.List; +import java.util.Map; + +import org.codehaus.jackson.annotate.JsonProperty; + import com.metamx.druid.input.InputRow; import com.metamx.druid.partition.PartitionChunk; import com.metamx.druid.partition.StringPartitionChunk; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.annotate.JsonTypeName; - -import java.util.List; -import java.util.Map; /** * Class uses getters/setters to work around http://jira.codehaus.org/browse/MSHADE-92 diff --git a/client/src/main/java/com/metamx/druid/zk/StringZkSerializer.java b/client/src/main/java/com/metamx/druid/zk/StringZkSerializer.java index 40ccf68da17c..b6b08e78eaca 100644 --- a/client/src/main/java/com/metamx/druid/zk/StringZkSerializer.java +++ b/client/src/main/java/com/metamx/druid/zk/StringZkSerializer.java @@ -19,11 +19,12 @@ package com.metamx.druid.zk; -import com.metamx.common.IAE; +import java.nio.charset.Charset; + import org.I0Itec.zkclient.exception.ZkMarshallingError; import org.I0Itec.zkclient.serialize.ZkSerializer; -import java.nio.charset.Charset; +import com.metamx.common.IAE; /** */ diff --git a/client/src/main/java/com/metamx/phonebook/BasePhoneBook.java b/client/src/main/java/com/metamx/phonebook/BasePhoneBook.java index f604f3414122..dc2cad6a459f 100644 --- a/client/src/main/java/com/metamx/phonebook/BasePhoneBook.java +++ b/client/src/main/java/com/metamx/phonebook/BasePhoneBook.java @@ -19,13 +19,13 @@ package com.metamx.phonebook; +import java.util.List; +import java.util.Map; + import com.metamx.common.ISE; import com.metamx.common.lifecycle.LifecycleStart; import com.metamx.common.lifecycle.LifecycleStop; -import java.util.List; -import java.util.Map; - /** */ public class BasePhoneBook implements PhoneBook diff --git a/client/src/main/java/com/metamx/phonebook/ConsistentHashLookup.java b/client/src/main/java/com/metamx/phonebook/ConsistentHashLookup.java index ff2dd74a63b8..30dc22218fb4 100644 --- a/client/src/main/java/com/metamx/phonebook/ConsistentHashLookup.java +++ b/client/src/main/java/com/metamx/phonebook/ConsistentHashLookup.java @@ -19,12 +19,12 @@ package com.metamx.phonebook; -import org.apache.commons.codec.digest.DigestUtils; - import java.math.BigInteger; import java.util.Map; import java.util.TreeMap; +import org.apache.commons.codec.digest.DigestUtils; + /** */ public class ConsistentHashLookup implements ServiceLookup diff --git a/client/src/main/java/com/metamx/phonebook/StoppedPhoneBook.java b/client/src/main/java/com/metamx/phonebook/StoppedPhoneBook.java index 907ee186b068..ac00c1a97779 100644 --- a/client/src/main/java/com/metamx/phonebook/StoppedPhoneBook.java +++ b/client/src/main/java/com/metamx/phonebook/StoppedPhoneBook.java @@ -19,6 +19,12 @@ package com.metamx.phonebook; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import com.google.common.base.Supplier; import com.google.common.collect.Constraint; import com.google.common.collect.Constraints; @@ -29,12 +35,6 @@ import com.metamx.common.IAE; import com.metamx.common.logger.Logger; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * A class that collects announcements for you. Can be used to simplify start/stop logic * diff --git a/client/src/test/java/com/metamx/druid/CombiningIterableTest.java b/client/src/test/java/com/metamx/druid/CombiningIterableTest.java index 946504676562..845ff5accf01 100644 --- a/client/src/test/java/com/metamx/druid/CombiningIterableTest.java +++ b/client/src/test/java/com/metamx/druid/CombiningIterableTest.java @@ -19,17 +19,18 @@ package com.metamx.druid; -import com.metamx.common.guava.nary.BinaryFn; -import com.metamx.druid.result.Result; -import org.joda.time.DateTime; -import org.junit.Assert; -import org.junit.Test; - import java.util.Arrays; import java.util.Comparator; import java.util.Iterator; import java.util.List; +import org.joda.time.DateTime; +import org.junit.Assert; +import org.junit.Test; + +import com.metamx.common.guava.nary.BinaryFn; +import com.metamx.druid.result.Result; + /** */ public class CombiningIterableTest diff --git a/client/src/test/java/com/metamx/druid/ResultGranularTimestampComparatorTest.java b/client/src/test/java/com/metamx/druid/ResultGranularTimestampComparatorTest.java index 13f99f601ac5..f8e86563b3dd 100644 --- a/client/src/test/java/com/metamx/druid/ResultGranularTimestampComparatorTest.java +++ b/client/src/test/java/com/metamx/druid/ResultGranularTimestampComparatorTest.java @@ -19,11 +19,12 @@ package com.metamx.druid; -import com.metamx.druid.result.Result; import org.joda.time.DateTime; import org.junit.Assert; import org.junit.Test; +import com.metamx.druid.result.Result; + /** */ public class ResultGranularTimestampComparatorTest diff --git a/client/src/test/java/com/metamx/druid/SearchBinaryFnTest.java b/client/src/test/java/com/metamx/druid/SearchBinaryFnTest.java index 4b6b4181d26f..796bf5a25bc2 100644 --- a/client/src/test/java/com/metamx/druid/SearchBinaryFnTest.java +++ b/client/src/test/java/com/metamx/druid/SearchBinaryFnTest.java @@ -19,17 +19,19 @@ package com.metamx.druid; +import java.util.Iterator; + +import junit.framework.Assert; + +import org.joda.time.DateTime; +import org.junit.Test; + import com.google.common.collect.ImmutableList; import com.metamx.druid.query.search.LexicographicSearchSortSpec; import com.metamx.druid.query.search.SearchHit; import com.metamx.druid.query.search.StrlenSearchSortSpec; import com.metamx.druid.result.Result; import com.metamx.druid.result.SearchResultValue; -import junit.framework.Assert; -import org.joda.time.DateTime; -import org.junit.Test; - -import java.util.Iterator; /** */ diff --git a/client/src/test/java/com/metamx/druid/TestHelper.java b/client/src/test/java/com/metamx/druid/TestHelper.java index 342b3b4111cf..16dc90695a49 100644 --- a/client/src/test/java/com/metamx/druid/TestHelper.java +++ b/client/src/test/java/com/metamx/druid/TestHelper.java @@ -19,13 +19,14 @@ package com.metamx.druid; +import java.util.Iterator; + +import org.junit.Assert; + import com.google.common.collect.Lists; import com.metamx.common.guava.Sequence; import com.metamx.common.guava.Sequences; import com.metamx.druid.result.Result; -import org.junit.Assert; - -import java.util.Iterator; /** */ diff --git a/client/src/test/java/com/metamx/druid/client/DataSegmentTest.java b/client/src/test/java/com/metamx/druid/client/DataSegmentTest.java index c29d10781e23..25a767fe56b7 100644 --- a/client/src/test/java/com/metamx/druid/client/DataSegmentTest.java +++ b/client/src/test/java/com/metamx/druid/client/DataSegmentTest.java @@ -19,13 +19,12 @@ package com.metamx.druid.client; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import com.metamx.druid.jackson.DefaultObjectMapper; -import com.metamx.druid.shard.NoneShardSpec; -import com.metamx.druid.shard.SingleDimensionShardSpec; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.type.TypeReference; import org.joda.time.DateTime; @@ -33,11 +32,13 @@ import org.junit.Assert; import org.junit.Test; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import com.metamx.druid.jackson.DefaultObjectMapper; +import com.metamx.druid.shard.NoneShardSpec; +import com.metamx.druid.shard.SingleDimensionShardSpec; /** */ diff --git a/client/src/test/java/com/metamx/druid/client/cache/ByteCountingLRUMapTest.java b/client/src/test/java/com/metamx/druid/client/cache/ByteCountingLRUMapTest.java index fac858d21927..b3d273b2bf81 100644 --- a/client/src/test/java/com/metamx/druid/client/cache/ByteCountingLRUMapTest.java +++ b/client/src/test/java/com/metamx/druid/client/cache/ByteCountingLRUMapTest.java @@ -19,12 +19,12 @@ package com.metamx.druid.client.cache; +import java.nio.ByteBuffer; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.nio.ByteBuffer; - /** */ public class ByteCountingLRUMapTest diff --git a/client/src/test/java/com/metamx/druid/client/cache/MapCacheBrokerTest.java b/client/src/test/java/com/metamx/druid/client/cache/MapCacheBrokerTest.java index 4338a23a10d3..343fe1e6301d 100644 --- a/client/src/test/java/com/metamx/druid/client/cache/MapCacheBrokerTest.java +++ b/client/src/test/java/com/metamx/druid/client/cache/MapCacheBrokerTest.java @@ -19,11 +19,12 @@ package com.metamx.druid.client.cache; -import com.google.common.primitives.Ints; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import com.google.common.primitives.Ints; + /** */ public class MapCacheBrokerTest diff --git a/client/src/test/java/com/metamx/druid/query/QuerySegmentSpecTest.java b/client/src/test/java/com/metamx/druid/query/QuerySegmentSpecTest.java index a05973af7294..4c12fc7e443e 100644 --- a/client/src/test/java/com/metamx/druid/query/QuerySegmentSpecTest.java +++ b/client/src/test/java/com/metamx/druid/query/QuerySegmentSpecTest.java @@ -19,6 +19,13 @@ package com.metamx.druid.query; +import java.util.Map; + +import org.codehaus.jackson.map.ObjectMapper; +import org.joda.time.Interval; +import org.junit.Assert; +import org.junit.Test; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.metamx.druid.jackson.DefaultObjectMapper; @@ -27,12 +34,6 @@ import com.metamx.druid.query.segment.MultipleSpecificSegmentSpec; import com.metamx.druid.query.segment.QuerySegmentSpec; import com.metamx.druid.query.segment.SegmentDescriptor; -import org.codehaus.jackson.map.ObjectMapper; -import org.joda.time.Interval; -import org.junit.Assert; -import org.junit.Test; - -import java.util.Map; /** */ diff --git a/client/src/test/java/com/metamx/druid/query/extraction/PartialDimExtractionFnTest.java b/client/src/test/java/com/metamx/druid/query/extraction/PartialDimExtractionFnTest.java index 061f8122f2e4..ed0407ff8a19 100644 --- a/client/src/test/java/com/metamx/druid/query/extraction/PartialDimExtractionFnTest.java +++ b/client/src/test/java/com/metamx/druid/query/extraction/PartialDimExtractionFnTest.java @@ -19,14 +19,15 @@ package com.metamx.druid.query.extraction; -import com.google.common.collect.Sets; -import org.junit.Assert; -import org.junit.Test; - import java.util.Arrays; import java.util.List; import java.util.Set; +import org.junit.Assert; +import org.junit.Test; + +import com.google.common.collect.Sets; + /** */ public class PartialDimExtractionFnTest diff --git a/client/src/test/java/com/metamx/druid/query/extraction/RegexDimExtractionFnTest.java b/client/src/test/java/com/metamx/druid/query/extraction/RegexDimExtractionFnTest.java index 2ec3f3db2392..2e06a80125e5 100644 --- a/client/src/test/java/com/metamx/druid/query/extraction/RegexDimExtractionFnTest.java +++ b/client/src/test/java/com/metamx/druid/query/extraction/RegexDimExtractionFnTest.java @@ -19,11 +19,12 @@ package com.metamx.druid.query.extraction; -import com.google.common.collect.Sets; +import java.util.Set; + import org.junit.Assert; import org.junit.Test; -import java.util.Set; +import com.google.common.collect.Sets; /** */ diff --git a/client/src/test/java/com/metamx/druid/query/extraction/SearchQuerySpecDimExtractionFnTest.java b/client/src/test/java/com/metamx/druid/query/extraction/SearchQuerySpecDimExtractionFnTest.java index 808c3603b6b7..5fe1517fe8ed 100644 --- a/client/src/test/java/com/metamx/druid/query/extraction/SearchQuerySpecDimExtractionFnTest.java +++ b/client/src/test/java/com/metamx/druid/query/extraction/SearchQuerySpecDimExtractionFnTest.java @@ -19,16 +19,17 @@ package com.metamx.druid.query.extraction; +import java.util.Arrays; +import java.util.List; +import java.util.Set; + +import org.junit.Assert; +import org.junit.Test; + import com.google.common.collect.Sets; import com.metamx.druid.query.search.FragmentSearchQuerySpec; import com.metamx.druid.query.search.LexicographicSearchSortSpec; import com.metamx.druid.query.search.SearchQuerySpec; -import org.junit.Assert; -import org.junit.Test; - -import java.util.Arrays; -import java.util.List; -import java.util.Set; /** */ diff --git a/client/src/test/java/com/metamx/druid/query/extraction/TimeDimExtractionFnTest.java b/client/src/test/java/com/metamx/druid/query/extraction/TimeDimExtractionFnTest.java index 7f5b6eabe1ce..cfba9e650a6f 100644 --- a/client/src/test/java/com/metamx/druid/query/extraction/TimeDimExtractionFnTest.java +++ b/client/src/test/java/com/metamx/druid/query/extraction/TimeDimExtractionFnTest.java @@ -19,11 +19,12 @@ package com.metamx.druid.query.extraction; -import com.google.common.collect.Sets; +import java.util.Set; + import org.junit.Assert; import org.junit.Test; -import java.util.Set; +import com.google.common.collect.Sets; /** */ diff --git a/client/src/test/java/com/metamx/druid/shard/SingleDimensionShardSpecTest.java b/client/src/test/java/com/metamx/druid/shard/SingleDimensionShardSpecTest.java index d92f927767f4..8a11b0677429 100644 --- a/client/src/test/java/com/metamx/druid/shard/SingleDimensionShardSpecTest.java +++ b/client/src/test/java/com/metamx/druid/shard/SingleDimensionShardSpecTest.java @@ -19,6 +19,13 @@ package com.metamx.druid.shard; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.junit.Assert; +import org.junit.Test; + import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; @@ -28,13 +35,6 @@ import com.metamx.common.Pair; import com.metamx.druid.input.InputRow; import com.metamx.druid.input.MapBasedInputRow; -import org.junit.Assert; -import org.junit.Test; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; /** */ diff --git a/common/src/main/java/com/metamx/druid/BaseQueryGranularity.java b/common/src/main/java/com/metamx/druid/BaseQueryGranularity.java index bf9b8ce1f21b..7fcc77ea33e2 100644 --- a/common/src/main/java/com/metamx/druid/BaseQueryGranularity.java +++ b/common/src/main/java/com/metamx/druid/BaseQueryGranularity.java @@ -19,12 +19,12 @@ package com.metamx.druid; -import org.joda.time.DateTime; -import org.joda.time.DateTimeZone; - import java.util.Iterator; import java.util.NoSuchElementException; +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; + public abstract class BaseQueryGranularity extends QueryGranularity { public abstract long next(long offset); diff --git a/common/src/main/java/com/metamx/druid/CombiningIterable.java b/common/src/main/java/com/metamx/druid/CombiningIterable.java index 7100656207b9..6f00ff6d93f1 100644 --- a/common/src/main/java/com/metamx/druid/CombiningIterable.java +++ b/common/src/main/java/com/metamx/druid/CombiningIterable.java @@ -19,12 +19,12 @@ package com.metamx.druid; -import com.metamx.common.guava.MergeIterable; -import com.metamx.common.guava.nary.BinaryFn; - import java.util.Comparator; import java.util.Iterator; +import com.metamx.common.guava.MergeIterable; +import com.metamx.common.guava.nary.BinaryFn; + /** */ public class CombiningIterable implements Iterable diff --git a/common/src/main/java/com/metamx/druid/CombiningIterator.java b/common/src/main/java/com/metamx/druid/CombiningIterator.java index e8a27af08684..b31e49fc1afd 100644 --- a/common/src/main/java/com/metamx/druid/CombiningIterator.java +++ b/common/src/main/java/com/metamx/druid/CombiningIterator.java @@ -19,14 +19,14 @@ package com.metamx.druid; -import com.google.common.collect.Iterators; -import com.google.common.collect.PeekingIterator; -import com.metamx.common.guava.nary.BinaryFn; - import java.util.Comparator; import java.util.Iterator; import java.util.NoSuchElementException; +import com.google.common.collect.Iterators; +import com.google.common.collect.PeekingIterator; +import com.metamx.common.guava.nary.BinaryFn; + /** */ public class CombiningIterator implements Iterator diff --git a/common/src/main/java/com/metamx/druid/DurationGranularity.java b/common/src/main/java/com/metamx/druid/DurationGranularity.java index da485b62e975..9d20c3f4b170 100644 --- a/common/src/main/java/com/metamx/druid/DurationGranularity.java +++ b/common/src/main/java/com/metamx/druid/DurationGranularity.java @@ -19,12 +19,13 @@ package com.metamx.druid; -import com.google.common.primitives.Longs; +import java.nio.ByteBuffer; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; import org.joda.time.DateTime; -import java.nio.ByteBuffer; +import com.google.common.primitives.Longs; public class DurationGranularity extends BaseQueryGranularity { diff --git a/common/src/main/java/com/metamx/druid/QueryGranularity.java b/common/src/main/java/com/metamx/druid/QueryGranularity.java index 36a4dd01714e..d7ab0e486b32 100644 --- a/common/src/main/java/com/metamx/druid/QueryGranularity.java +++ b/common/src/main/java/com/metamx/druid/QueryGranularity.java @@ -19,13 +19,14 @@ package com.metamx.druid; -import com.metamx.common.IAE; import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; import org.joda.time.DateTime; import org.joda.time.ReadableDuration; +import com.metamx.common.IAE; + @JsonTypeInfo(use=JsonTypeInfo.Id.NAME, property = "type", defaultImpl = QueryGranularity.class) @JsonSubTypes(value = { @JsonSubTypes.Type(name = "period", value = PeriodGranularity.class), diff --git a/common/src/main/java/com/metamx/druid/TimelineObjectHolder.java b/common/src/main/java/com/metamx/druid/TimelineObjectHolder.java index 403fe8bb2cb0..c515066d089f 100644 --- a/common/src/main/java/com/metamx/druid/TimelineObjectHolder.java +++ b/common/src/main/java/com/metamx/druid/TimelineObjectHolder.java @@ -19,9 +19,10 @@ package com.metamx.druid; -import com.metamx.druid.partition.PartitionHolder; import org.joda.time.Interval; +import com.metamx.druid.partition.PartitionHolder; + /** */ public class TimelineObjectHolder diff --git a/common/src/main/java/com/metamx/druid/VersionedIntervalTimeline.java b/common/src/main/java/com/metamx/druid/VersionedIntervalTimeline.java index a45821c7dba8..4572787ba7ae 100644 --- a/common/src/main/java/com/metamx/druid/VersionedIntervalTimeline.java +++ b/common/src/main/java/com/metamx/druid/VersionedIntervalTimeline.java @@ -19,15 +19,6 @@ package com.metamx.druid; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.metamx.common.guava.Comparators; -import com.metamx.common.logger.Logger; -import com.metamx.druid.partition.ImmutablePartitionHolder; -import com.metamx.druid.partition.PartitionChunk; -import com.metamx.druid.partition.PartitionHolder; -import org.joda.time.Interval; - import java.util.ArrayList; import java.util.Comparator; import java.util.Iterator; @@ -37,6 +28,16 @@ import java.util.TreeMap; import java.util.concurrent.locks.ReentrantReadWriteLock; +import org.joda.time.Interval; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.metamx.common.guava.Comparators; +import com.metamx.common.logger.Logger; +import com.metamx.druid.partition.ImmutablePartitionHolder; +import com.metamx.druid.partition.PartitionChunk; +import com.metamx.druid.partition.PartitionHolder; + /** * VersionedIntervalTimeline is a data structure that manages objects on a specific timeline. *

diff --git a/common/src/main/java/com/metamx/druid/aggregation/Aggregator.java b/common/src/main/java/com/metamx/druid/aggregation/Aggregator.java index 4acbd162f5a3..f311b09c34de 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/Aggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/Aggregator.java @@ -19,7 +19,6 @@ package com.metamx.druid.aggregation; -import java.util.Comparator; /** * An Aggregator is an object that can aggregate metrics. Its aggregation-related methods (namely, aggregate() and get()) diff --git a/common/src/main/java/com/metamx/druid/aggregation/AggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/AggregatorFactory.java index 00722fcf5ebf..34c503f54597 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/AggregatorFactory.java +++ b/common/src/main/java/com/metamx/druid/aggregation/AggregatorFactory.java @@ -19,12 +19,13 @@ package com.metamx.druid.aggregation; -import com.metamx.druid.processing.MetricSelectorFactory; +import java.util.Comparator; +import java.util.List; + import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; -import java.util.Comparator; -import java.util.List; +import com.metamx.druid.processing.MetricSelectorFactory; /** * Processing related interface diff --git a/common/src/main/java/com/metamx/druid/aggregation/CountAggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/CountAggregatorFactory.java index 61dcde40449e..1c15ec67054f 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/CountAggregatorFactory.java +++ b/common/src/main/java/com/metamx/druid/aggregation/CountAggregatorFactory.java @@ -19,14 +19,15 @@ package com.metamx.druid.aggregation; -import com.google.common.collect.ImmutableList; -import com.google.common.primitives.Longs; -import com.metamx.druid.processing.MetricSelectorFactory; +import java.util.Comparator; +import java.util.List; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.util.Comparator; -import java.util.List; +import com.google.common.collect.ImmutableList; +import com.google.common.primitives.Longs; +import com.metamx.druid.processing.MetricSelectorFactory; /** */ diff --git a/common/src/main/java/com/metamx/druid/aggregation/DoubleSumAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/DoubleSumAggregator.java index 21cb46912274..507753fa1b1b 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/DoubleSumAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/DoubleSumAggregator.java @@ -19,10 +19,10 @@ package com.metamx.druid.aggregation; -import com.metamx.druid.processing.FloatMetricSelector; - import java.util.Comparator; +import com.metamx.druid.processing.FloatMetricSelector; + /** */ public class DoubleSumAggregator implements Aggregator diff --git a/common/src/main/java/com/metamx/druid/aggregation/DoubleSumAggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/DoubleSumAggregatorFactory.java index d8166f841e76..f18ae23a63f9 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/DoubleSumAggregatorFactory.java +++ b/common/src/main/java/com/metamx/druid/aggregation/DoubleSumAggregatorFactory.java @@ -19,16 +19,17 @@ package com.metamx.druid.aggregation; -import com.google.common.primitives.Doubles; -import com.metamx.druid.processing.MetricSelectorFactory; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Comparator; import java.util.List; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + +import com.google.common.primitives.Doubles; +import com.metamx.druid.processing.MetricSelectorFactory; + /** */ public class DoubleSumAggregatorFactory implements AggregatorFactory diff --git a/common/src/main/java/com/metamx/druid/aggregation/DoubleSumBufferAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/DoubleSumBufferAggregator.java index 3e85d489db2d..add78ac8ca0e 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/DoubleSumBufferAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/DoubleSumBufferAggregator.java @@ -19,10 +19,10 @@ package com.metamx.druid.aggregation; -import com.metamx.druid.processing.FloatMetricSelector; - import java.nio.ByteBuffer; +import com.metamx.druid.processing.FloatMetricSelector; + /** */ public class DoubleSumBufferAggregator implements BufferAggregator diff --git a/common/src/main/java/com/metamx/druid/aggregation/Histogram.java b/common/src/main/java/com/metamx/druid/aggregation/Histogram.java index 8f081ca7ade3..79f7ee3c211f 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/Histogram.java +++ b/common/src/main/java/com/metamx/druid/aggregation/Histogram.java @@ -19,14 +19,15 @@ package com.metamx.druid.aggregation; +import java.nio.ByteBuffer; +import java.util.Arrays; + +import org.codehaus.jackson.annotate.JsonValue; + import com.google.common.base.Preconditions; import com.google.common.primitives.Floats; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; -import org.codehaus.jackson.annotate.JsonValue; - -import java.nio.ByteBuffer; -import java.util.Arrays; public class Histogram { diff --git a/common/src/main/java/com/metamx/druid/aggregation/HistogramAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/HistogramAggregator.java index c2d9d6747325..d5a73e1ce287 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/HistogramAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/HistogramAggregator.java @@ -19,11 +19,11 @@ package com.metamx.druid.aggregation; +import java.util.Comparator; + import com.google.common.primitives.Longs; import com.metamx.druid.processing.FloatMetricSelector; -import java.util.Comparator; - public class HistogramAggregator implements Aggregator { static final Comparator COMPARATOR = new Comparator() diff --git a/common/src/main/java/com/metamx/druid/aggregation/HistogramAggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/HistogramAggregatorFactory.java index 8902ae56beff..f2b20840557c 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/HistogramAggregatorFactory.java +++ b/common/src/main/java/com/metamx/druid/aggregation/HistogramAggregatorFactory.java @@ -19,19 +19,20 @@ package com.metamx.druid.aggregation; -import com.google.common.base.Charsets; -import com.google.common.primitives.Floats; -import com.google.common.primitives.Longs; -import com.metamx.druid.processing.MetricSelectorFactory; -import org.apache.commons.codec.binary.Base64; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Comparator; import java.util.List; +import org.apache.commons.codec.binary.Base64; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + +import com.google.common.base.Charsets; +import com.google.common.primitives.Floats; +import com.google.common.primitives.Longs; +import com.metamx.druid.processing.MetricSelectorFactory; + public class HistogramAggregatorFactory implements AggregatorFactory { private static final byte CACHE_TYPE_ID = 0x7; diff --git a/common/src/main/java/com/metamx/druid/aggregation/HistogramBufferAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/HistogramBufferAggregator.java index fe4f366631c8..cd25549ec055 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/HistogramBufferAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/HistogramBufferAggregator.java @@ -20,13 +20,13 @@ package com.metamx.druid.aggregation; +import java.nio.ByteBuffer; +import java.util.Arrays; + import com.google.common.primitives.Floats; import com.google.common.primitives.Longs; import com.metamx.druid.processing.FloatMetricSelector; -import java.nio.ByteBuffer; -import java.util.Arrays; - public class HistogramBufferAggregator implements BufferAggregator { private final FloatMetricSelector selector; diff --git a/common/src/main/java/com/metamx/druid/aggregation/HistogramVisual.java b/common/src/main/java/com/metamx/druid/aggregation/HistogramVisual.java index 5ce5217e1b2d..a72c16122552 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/HistogramVisual.java +++ b/common/src/main/java/com/metamx/druid/aggregation/HistogramVisual.java @@ -19,11 +19,12 @@ package com.metamx.druid.aggregation; -import com.google.common.base.Preconditions; +import java.util.Arrays; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.util.Arrays; +import com.google.common.base.Preconditions; public class HistogramVisual { diff --git a/common/src/main/java/com/metamx/druid/aggregation/JavaScriptAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/JavaScriptAggregator.java index 80daa045d824..8a66cd2e5970 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/JavaScriptAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/JavaScriptAggregator.java @@ -19,11 +19,11 @@ package com.metamx.druid.aggregation; +import java.util.List; + import com.google.common.collect.Lists; import com.metamx.druid.processing.FloatMetricSelector; -import java.util.List; - public class JavaScriptAggregator implements Aggregator { static interface ScriptAggregator diff --git a/common/src/main/java/com/metamx/druid/aggregation/JavaScriptAggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/JavaScriptAggregatorFactory.java index f2dd1604af48..c8333ab34de5 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/JavaScriptAggregatorFactory.java +++ b/common/src/main/java/com/metamx/druid/aggregation/JavaScriptAggregatorFactory.java @@ -19,12 +19,14 @@ package com.metamx.druid.aggregation; -import com.google.common.base.Joiner; -import com.google.common.collect.Lists; -import com.google.common.primitives.Doubles; -import com.metamx.common.IAE; -import com.metamx.druid.processing.FloatMetricSelector; -import com.metamx.druid.processing.MetricSelectorFactory; +import java.nio.ByteBuffer; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Comparator; +import java.util.List; + +import javax.annotation.Nullable; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; import org.mozilla.javascript.Context; @@ -32,12 +34,12 @@ import org.mozilla.javascript.Script; import org.mozilla.javascript.ScriptableObject; -import javax.annotation.Nullable; -import java.nio.ByteBuffer; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Comparator; -import java.util.List; +import com.google.common.base.Joiner; +import com.google.common.collect.Lists; +import com.google.common.primitives.Doubles; +import com.metamx.common.IAE; +import com.metamx.druid.processing.FloatMetricSelector; +import com.metamx.druid.processing.MetricSelectorFactory; public class JavaScriptAggregatorFactory implements AggregatorFactory { diff --git a/common/src/main/java/com/metamx/druid/aggregation/JavaScriptBufferAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/JavaScriptBufferAggregator.java index 02fe27abda41..6713666e932d 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/JavaScriptBufferAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/JavaScriptBufferAggregator.java @@ -19,12 +19,12 @@ package com.metamx.druid.aggregation; -import com.google.common.collect.Lists; -import com.metamx.druid.processing.FloatMetricSelector; - import java.nio.ByteBuffer; import java.util.List; +import com.google.common.collect.Lists; +import com.metamx.druid.processing.FloatMetricSelector; + public class JavaScriptBufferAggregator implements BufferAggregator { private final FloatMetricSelector[] selectorList; diff --git a/common/src/main/java/com/metamx/druid/aggregation/LongSumAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/LongSumAggregator.java index 32a81ef719f0..8377e01253bd 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/LongSumAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/LongSumAggregator.java @@ -19,11 +19,11 @@ package com.metamx.druid.aggregation; +import java.util.Comparator; + import com.google.common.primitives.Longs; import com.metamx.druid.processing.FloatMetricSelector; -import java.util.Comparator; - /** */ public class LongSumAggregator implements Aggregator diff --git a/common/src/main/java/com/metamx/druid/aggregation/LongSumAggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/LongSumAggregatorFactory.java index a32887c2b684..952cf8f48495 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/LongSumAggregatorFactory.java +++ b/common/src/main/java/com/metamx/druid/aggregation/LongSumAggregatorFactory.java @@ -19,16 +19,17 @@ package com.metamx.druid.aggregation; -import com.google.common.primitives.Longs; -import com.metamx.druid.processing.MetricSelectorFactory; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Comparator; import java.util.List; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + +import com.google.common.primitives.Longs; +import com.metamx.druid.processing.MetricSelectorFactory; + /** */ public class LongSumAggregatorFactory implements AggregatorFactory diff --git a/common/src/main/java/com/metamx/druid/aggregation/LongSumBufferAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/LongSumBufferAggregator.java index 533f6782d5dc..d6c6f9bcc150 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/LongSumBufferAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/LongSumBufferAggregator.java @@ -19,10 +19,10 @@ package com.metamx.druid.aggregation; -import com.metamx.druid.processing.FloatMetricSelector; - import java.nio.ByteBuffer; +import com.metamx.druid.processing.FloatMetricSelector; + /** */ public class LongSumBufferAggregator implements BufferAggregator diff --git a/common/src/main/java/com/metamx/druid/aggregation/MaxAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/MaxAggregator.java index 0bd0ed6f29ac..1b435b70a188 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/MaxAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/MaxAggregator.java @@ -19,10 +19,10 @@ package com.metamx.druid.aggregation; -import com.metamx.druid.processing.FloatMetricSelector; - import java.util.Comparator; +import com.metamx.druid.processing.FloatMetricSelector; + /** */ public class MaxAggregator implements Aggregator diff --git a/common/src/main/java/com/metamx/druid/aggregation/MaxAggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/MaxAggregatorFactory.java index cd5aaf336dbb..111f0b55f2cb 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/MaxAggregatorFactory.java +++ b/common/src/main/java/com/metamx/druid/aggregation/MaxAggregatorFactory.java @@ -19,16 +19,17 @@ package com.metamx.druid.aggregation; -import com.google.common.primitives.Doubles; -import com.metamx.druid.processing.MetricSelectorFactory; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Comparator; import java.util.List; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + +import com.google.common.primitives.Doubles; +import com.metamx.druid.processing.MetricSelectorFactory; + /** */ public class MaxAggregatorFactory implements AggregatorFactory diff --git a/common/src/main/java/com/metamx/druid/aggregation/MaxBufferAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/MaxBufferAggregator.java index 8a497a1ddfbd..4c2469902e9b 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/MaxBufferAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/MaxBufferAggregator.java @@ -19,10 +19,10 @@ package com.metamx.druid.aggregation; -import com.metamx.druid.processing.FloatMetricSelector; - import java.nio.ByteBuffer; +import com.metamx.druid.processing.FloatMetricSelector; + /** */ public class MaxBufferAggregator implements BufferAggregator diff --git a/common/src/main/java/com/metamx/druid/aggregation/MinAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/MinAggregator.java index 1ff56fa837d5..aeb0081e24b0 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/MinAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/MinAggregator.java @@ -19,10 +19,10 @@ package com.metamx.druid.aggregation; -import com.metamx.druid.processing.FloatMetricSelector; - import java.util.Comparator; +import com.metamx.druid.processing.FloatMetricSelector; + /** */ public class MinAggregator implements Aggregator diff --git a/common/src/main/java/com/metamx/druid/aggregation/MinAggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/MinAggregatorFactory.java index ee6e4d25a01f..e62e4f156be6 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/MinAggregatorFactory.java +++ b/common/src/main/java/com/metamx/druid/aggregation/MinAggregatorFactory.java @@ -19,16 +19,17 @@ package com.metamx.druid.aggregation; -import com.google.common.primitives.Doubles; -import com.metamx.druid.processing.MetricSelectorFactory; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Comparator; import java.util.List; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + +import com.google.common.primitives.Doubles; +import com.metamx.druid.processing.MetricSelectorFactory; + /** */ public class MinAggregatorFactory implements AggregatorFactory diff --git a/common/src/main/java/com/metamx/druid/aggregation/MinBufferAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/MinBufferAggregator.java index 68e34675e36a..9dc8a7f6d105 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/MinBufferAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/MinBufferAggregator.java @@ -19,10 +19,10 @@ package com.metamx.druid.aggregation; -import com.metamx.druid.processing.FloatMetricSelector; - import java.nio.ByteBuffer; +import com.metamx.druid.processing.FloatMetricSelector; + /** */ public class MinBufferAggregator implements BufferAggregator diff --git a/common/src/main/java/com/metamx/druid/aggregation/ToLowerCaseAggregatorFactory.java b/common/src/main/java/com/metamx/druid/aggregation/ToLowerCaseAggregatorFactory.java index 6d16b10be065..b7cc2f717a8f 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/ToLowerCaseAggregatorFactory.java +++ b/common/src/main/java/com/metamx/druid/aggregation/ToLowerCaseAggregatorFactory.java @@ -19,11 +19,11 @@ package com.metamx.druid.aggregation; -import com.metamx.druid.processing.MetricSelectorFactory; - import java.util.Comparator; import java.util.List; +import com.metamx.druid.processing.MetricSelectorFactory; + /** */ public class ToLowerCaseAggregatorFactory implements AggregatorFactory diff --git a/common/src/main/java/com/metamx/druid/aggregation/post/ArithmeticPostAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/post/ArithmeticPostAggregator.java index 90a5e09afbdd..8fd3dd905d97 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/post/ArithmeticPostAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/post/ArithmeticPostAggregator.java @@ -19,17 +19,18 @@ package com.metamx.druid.aggregation.post; -import com.google.common.collect.Maps; -import com.metamx.common.IAE; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + +import com.google.common.collect.Maps; +import com.metamx.common.IAE; + /** */ public class ArithmeticPostAggregator implements PostAggregator diff --git a/common/src/main/java/com/metamx/druid/aggregation/post/ConstantPostAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/post/ConstantPostAggregator.java index eef818db49f0..e9ac3bedd6c1 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/post/ConstantPostAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/post/ConstantPostAggregator.java @@ -19,12 +19,12 @@ package com.metamx.druid.aggregation.post; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - import java.util.Comparator; import java.util.Map; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + /** */ public class ConstantPostAggregator implements PostAggregator diff --git a/common/src/main/java/com/metamx/druid/aggregation/post/FieldAccessPostAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/post/FieldAccessPostAggregator.java index 1c3f328fa87d..bf075fc4bd1a 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/post/FieldAccessPostAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/post/FieldAccessPostAggregator.java @@ -19,12 +19,12 @@ package com.metamx.druid.aggregation.post; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - import java.util.Comparator; import java.util.Map; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + /** */ public class FieldAccessPostAggregator implements PostAggregator diff --git a/common/src/main/java/com/metamx/druid/aggregation/post/PostAggregator.java b/common/src/main/java/com/metamx/druid/aggregation/post/PostAggregator.java index 5e679d64868b..dc2b0568a129 100644 --- a/common/src/main/java/com/metamx/druid/aggregation/post/PostAggregator.java +++ b/common/src/main/java/com/metamx/druid/aggregation/post/PostAggregator.java @@ -19,12 +19,12 @@ package com.metamx.druid.aggregation.post; -import org.codehaus.jackson.annotate.JsonSubTypes; -import org.codehaus.jackson.annotate.JsonTypeInfo; - import java.util.Comparator; import java.util.Map; +import org.codehaus.jackson.annotate.JsonSubTypes; +import org.codehaus.jackson.annotate.JsonTypeInfo; + /** * Functionally similar to an Aggregator. See the Aggregator interface for more comments. */ diff --git a/common/src/main/java/com/metamx/druid/collect/CountingMap.java b/common/src/main/java/com/metamx/druid/collect/CountingMap.java index 9f9c2eeef88a..56c06aadaa34 100644 --- a/common/src/main/java/com/metamx/druid/collect/CountingMap.java +++ b/common/src/main/java/com/metamx/druid/collect/CountingMap.java @@ -19,13 +19,13 @@ package com.metamx.druid.collect; +import java.util.Map; +import java.util.concurrent.atomic.AtomicLong; + import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; import com.metamx.common.guava.DefaultingHashMap; -import java.util.Map; -import java.util.concurrent.atomic.AtomicLong; - /** */ public class CountingMap extends DefaultingHashMap diff --git a/common/src/main/java/com/metamx/druid/collect/OrderedMergeIterator.java b/common/src/main/java/com/metamx/druid/collect/OrderedMergeIterator.java index f9268aa7e1a6..6f8adf78ab65 100644 --- a/common/src/main/java/com/metamx/druid/collect/OrderedMergeIterator.java +++ b/common/src/main/java/com/metamx/druid/collect/OrderedMergeIterator.java @@ -19,18 +19,19 @@ package com.metamx.druid.collect; +import java.util.Comparator; +import java.util.Iterator; +import java.util.NoSuchElementException; +import java.util.PriorityQueue; + +import javax.annotation.Nullable; + import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; import com.metamx.common.guava.FunctionalIterator; -import javax.annotation.Nullable; -import java.util.Comparator; -import java.util.Iterator; -import java.util.NoSuchElementException; -import java.util.PriorityQueue; - /** * An OrderedMergeIterator is an iterator that merges together multiple sorted iterators. It is written assuming * that the input Iterators are provided in order. That is, it places an extra restriction in the input iterators. diff --git a/common/src/main/java/com/metamx/druid/collect/OrderedMergeSequence.java b/common/src/main/java/com/metamx/druid/collect/OrderedMergeSequence.java index 60772e4f474d..5fc713acabcd 100644 --- a/common/src/main/java/com/metamx/druid/collect/OrderedMergeSequence.java +++ b/common/src/main/java/com/metamx/druid/collect/OrderedMergeSequence.java @@ -19,6 +19,11 @@ package com.metamx.druid.collect; +import java.io.IOException; +import java.util.PriorityQueue; + +import javax.annotation.Nullable; + import com.google.common.base.Function; import com.google.common.base.Throwables; import com.google.common.collect.Ordering; @@ -30,10 +35,6 @@ import com.metamx.common.guava.YieldingAccumulator; import com.metamx.common.guava.YieldingAccumulators; -import javax.annotation.Nullable; -import java.io.IOException; -import java.util.PriorityQueue; - /** * An OrderedMergeIterator is an iterator that merges together multiple sorted iterators. It is written assuming * that the input Iterators are provided in order. That is, it places an extra restriction in the input iterators. diff --git a/common/src/main/java/com/metamx/druid/collect/StupidPool.java b/common/src/main/java/com/metamx/druid/collect/StupidPool.java index 8d5c3f265903..15eefaf240b7 100644 --- a/common/src/main/java/com/metamx/druid/collect/StupidPool.java +++ b/common/src/main/java/com/metamx/druid/collect/StupidPool.java @@ -19,14 +19,14 @@ package com.metamx.druid.collect; +import java.io.IOException; +import java.util.LinkedList; + import com.google.common.base.Supplier; import com.google.common.collect.Lists; import com.metamx.common.ISE; import com.metamx.common.logger.Logger; -import java.io.IOException; -import java.util.LinkedList; - /** */ public class StupidPool diff --git a/common/src/main/java/com/metamx/druid/db/DbConnector.java b/common/src/main/java/com/metamx/druid/db/DbConnector.java index bda9fb1221d0..bbc16c4c4885 100644 --- a/common/src/main/java/com/metamx/druid/db/DbConnector.java +++ b/common/src/main/java/com/metamx/druid/db/DbConnector.java @@ -19,15 +19,17 @@ package com.metamx.druid.db; -import com.metamx.common.logger.Logger; +import java.util.List; +import java.util.Map; + +import javax.sql.DataSource; + import org.apache.commons.dbcp.BasicDataSource; import org.skife.jdbi.v2.DBI; import org.skife.jdbi.v2.Handle; import org.skife.jdbi.v2.tweak.HandleCallback; -import javax.sql.DataSource; -import java.util.List; -import java.util.Map; +import com.metamx.common.logger.Logger; /** */ diff --git a/common/src/main/java/com/metamx/druid/guava/CombiningSequence.java b/common/src/main/java/com/metamx/druid/guava/CombiningSequence.java index 8a1c9a660d5c..b4c184f0c8f5 100644 --- a/common/src/main/java/com/metamx/druid/guava/CombiningSequence.java +++ b/common/src/main/java/com/metamx/druid/guava/CombiningSequence.java @@ -19,6 +19,9 @@ package com.metamx.druid.guava; +import java.io.IOException; +import java.util.concurrent.atomic.AtomicReference; + import com.google.common.collect.Ordering; import com.metamx.common.guava.Accumulator; import com.metamx.common.guava.Sequence; @@ -27,9 +30,6 @@ import com.metamx.common.guava.YieldingAccumulator; import com.metamx.common.guava.nary.BinaryFn; -import java.io.IOException; -import java.util.concurrent.atomic.AtomicReference; - /** */ public class CombiningSequence implements Sequence diff --git a/common/src/main/java/com/metamx/druid/guava/FileOutputSupplier.java b/common/src/main/java/com/metamx/druid/guava/FileOutputSupplier.java index f9d713dd1b13..0c6b6103615e 100644 --- a/common/src/main/java/com/metamx/druid/guava/FileOutputSupplier.java +++ b/common/src/main/java/com/metamx/druid/guava/FileOutputSupplier.java @@ -19,13 +19,13 @@ package com.metamx.druid.guava; -import com.google.common.io.OutputSupplier; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import com.google.common.io.OutputSupplier; + /** */ public class FileOutputSupplier implements OutputSupplier diff --git a/common/src/main/java/com/metamx/druid/guava/GuavaUtils.java b/common/src/main/java/com/metamx/druid/guava/GuavaUtils.java index 784bd06192cd..7384d141c323 100644 --- a/common/src/main/java/com/metamx/druid/guava/GuavaUtils.java +++ b/common/src/main/java/com/metamx/druid/guava/GuavaUtils.java @@ -19,13 +19,6 @@ package com.metamx.druid.guava; -import com.google.common.base.Charsets; -import com.google.common.base.Function; -import com.google.common.collect.Iterables; -import com.google.common.io.CharStreams; -import com.google.common.io.InputSupplier; - -import javax.annotation.Nullable; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -36,6 +29,14 @@ import java.util.List; import java.util.zip.GZIPInputStream; +import javax.annotation.Nullable; + +import com.google.common.base.Charsets; +import com.google.common.base.Function; +import com.google.common.collect.Iterables; +import com.google.common.io.CharStreams; +import com.google.common.io.InputSupplier; + /** */ public class GuavaUtils diff --git a/common/src/main/java/com/metamx/druid/input/MapBasedInputRow.java b/common/src/main/java/com/metamx/druid/input/MapBasedInputRow.java index 2177bcde7762..f08394366615 100644 --- a/common/src/main/java/com/metamx/druid/input/MapBasedInputRow.java +++ b/common/src/main/java/com/metamx/druid/input/MapBasedInputRow.java @@ -19,11 +19,11 @@ package com.metamx.druid.input; -import org.joda.time.DateTime; - import java.util.List; import java.util.Map; +import org.joda.time.DateTime; + /** */ public class MapBasedInputRow extends MapBasedRow implements InputRow diff --git a/common/src/main/java/com/metamx/druid/input/MapBasedRow.java b/common/src/main/java/com/metamx/druid/input/MapBasedRow.java index 03c56e2f66dd..01d3c1b38d4b 100644 --- a/common/src/main/java/com/metamx/druid/input/MapBasedRow.java +++ b/common/src/main/java/com/metamx/druid/input/MapBasedRow.java @@ -19,19 +19,21 @@ package com.metamx.druid.input; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import javax.annotation.Nullable; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.joda.time.DateTime; + import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.metamx.common.IAE; import com.metamx.common.exception.FormattedException; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.joda.time.DateTime; - -import javax.annotation.Nullable; -import java.util.Arrays; -import java.util.List; -import java.util.Map; /** */ diff --git a/common/src/main/java/com/metamx/druid/input/Row.java b/common/src/main/java/com/metamx/druid/input/Row.java index 6f6f3f2c17cf..95012f251899 100644 --- a/common/src/main/java/com/metamx/druid/input/Row.java +++ b/common/src/main/java/com/metamx/druid/input/Row.java @@ -19,11 +19,11 @@ package com.metamx.druid.input; +import java.util.List; + import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; -import java.util.List; - /** */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "version") diff --git a/common/src/main/java/com/metamx/druid/jackson/CommaListJoinDeserializer.java b/common/src/main/java/com/metamx/druid/jackson/CommaListJoinDeserializer.java index 1932746b3d07..ca9191980503 100644 --- a/common/src/main/java/com/metamx/druid/jackson/CommaListJoinDeserializer.java +++ b/common/src/main/java/com/metamx/druid/jackson/CommaListJoinDeserializer.java @@ -19,15 +19,15 @@ package com.metamx.druid.jackson; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; + import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.JsonProcessingException; import org.codehaus.jackson.map.DeserializationContext; import org.codehaus.jackson.map.deser.std.StdScalarDeserializer; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; - /** */ public class CommaListJoinDeserializer extends StdScalarDeserializer> diff --git a/common/src/main/java/com/metamx/druid/jackson/CommaListJoinSerializer.java b/common/src/main/java/com/metamx/druid/jackson/CommaListJoinSerializer.java index 3b270ad4aa15..f0dd0f4056a5 100644 --- a/common/src/main/java/com/metamx/druid/jackson/CommaListJoinSerializer.java +++ b/common/src/main/java/com/metamx/druid/jackson/CommaListJoinSerializer.java @@ -19,14 +19,15 @@ package com.metamx.druid.jackson; -import com.google.common.base.Joiner; +import java.io.IOException; +import java.util.List; + import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.JsonGenerator; import org.codehaus.jackson.map.SerializerProvider; import org.codehaus.jackson.map.ser.std.ScalarSerializerBase; -import java.io.IOException; -import java.util.List; +import com.google.common.base.Joiner; /** */ diff --git a/common/src/main/java/com/metamx/druid/jackson/DefaultObjectMapper.java b/common/src/main/java/com/metamx/druid/jackson/DefaultObjectMapper.java index 7c96a8a3b2b6..61be638a666d 100644 --- a/common/src/main/java/com/metamx/druid/jackson/DefaultObjectMapper.java +++ b/common/src/main/java/com/metamx/druid/jackson/DefaultObjectMapper.java @@ -19,10 +19,9 @@ package com.metamx.druid.jackson; -import com.google.common.base.Throwables; -import com.metamx.common.Granularity; -import com.metamx.common.guava.Accumulator; -import com.metamx.common.guava.Sequence; +import java.io.IOException; +import java.util.TimeZone; + import org.codehaus.jackson.JsonFactory; import org.codehaus.jackson.JsonGenerator; import org.codehaus.jackson.JsonParser; @@ -38,8 +37,10 @@ import org.codehaus.jackson.map.module.SimpleModule; import org.joda.time.DateTimeZone; -import java.io.IOException; -import java.util.TimeZone; +import com.google.common.base.Throwables; +import com.metamx.common.Granularity; +import com.metamx.common.guava.Accumulator; +import com.metamx.common.guava.Sequence; /** */ diff --git a/common/src/main/java/com/metamx/druid/jackson/JodaStuff.java b/common/src/main/java/com/metamx/druid/jackson/JodaStuff.java index 69ff973d815e..3b907cdb5c9c 100644 --- a/common/src/main/java/com/metamx/druid/jackson/JodaStuff.java +++ b/common/src/main/java/com/metamx/druid/jackson/JodaStuff.java @@ -19,23 +19,20 @@ package com.metamx.druid.jackson; +import java.io.IOException; + import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.JsonProcessingException; import org.codehaus.jackson.JsonToken; import org.codehaus.jackson.map.DeserializationContext; import org.codehaus.jackson.map.KeyDeserializer; import org.codehaus.jackson.map.deser.std.StdDeserializer; -import org.codehaus.jackson.map.ext.JodaDeserializers; import org.codehaus.jackson.map.module.SimpleModule; import org.codehaus.jackson.map.ser.std.ToStringSerializer; import org.joda.time.DateTime; -import org.joda.time.DateTimeZone; import org.joda.time.Interval; -import org.joda.time.ReadableInstant; import org.joda.time.format.ISODateTimeFormat; -import java.io.IOException; - /** */ public class JodaStuff diff --git a/common/src/main/java/com/metamx/druid/log/LogLevelAdjuster.java b/common/src/main/java/com/metamx/druid/log/LogLevelAdjuster.java index e77f9f754418..691d11de143d 100644 --- a/common/src/main/java/com/metamx/druid/log/LogLevelAdjuster.java +++ b/common/src/main/java/com/metamx/druid/log/LogLevelAdjuster.java @@ -19,15 +19,12 @@ package com.metamx.druid.log; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import java.lang.management.ManagementFactory; -import javax.management.InstanceAlreadyExistsException; -import javax.management.MBeanRegistrationException; -import javax.management.MalformedObjectNameException; -import javax.management.NotCompliantMBeanException; import javax.management.ObjectName; -import java.lang.management.ManagementFactory; + +import org.apache.log4j.Level; +import org.apache.log4j.Logger; /** diff --git a/common/src/main/java/com/metamx/druid/partition/IntegerPartitionChunk.java b/common/src/main/java/com/metamx/druid/partition/IntegerPartitionChunk.java index a49313711ec8..70a20479dbe3 100644 --- a/common/src/main/java/com/metamx/druid/partition/IntegerPartitionChunk.java +++ b/common/src/main/java/com/metamx/druid/partition/IntegerPartitionChunk.java @@ -19,10 +19,10 @@ package com.metamx.druid.partition; -import com.google.common.collect.Ordering; - import java.util.Comparator; +import com.google.common.collect.Ordering; + /** */ public class IntegerPartitionChunk implements PartitionChunk diff --git a/common/src/main/java/com/metamx/druid/partition/PartitionHolder.java b/common/src/main/java/com/metamx/druid/partition/PartitionHolder.java index 00dc3e18a434..e41c6f6bbd05 100644 --- a/common/src/main/java/com/metamx/druid/partition/PartitionHolder.java +++ b/common/src/main/java/com/metamx/druid/partition/PartitionHolder.java @@ -19,16 +19,16 @@ package com.metamx.druid.partition; +import java.util.Iterator; +import java.util.List; +import java.util.TreeSet; + import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; import com.google.common.collect.Sets; -import java.util.Iterator; -import java.util.List; -import java.util.TreeSet; - /** * An object that clumps together multiple other objects which each represent a shard of some space. */ diff --git a/common/src/main/java/com/metamx/druid/partition/StringPartitionChunk.java b/common/src/main/java/com/metamx/druid/partition/StringPartitionChunk.java index 2b27b4d34510..7722099d10c7 100644 --- a/common/src/main/java/com/metamx/druid/partition/StringPartitionChunk.java +++ b/common/src/main/java/com/metamx/druid/partition/StringPartitionChunk.java @@ -19,10 +19,10 @@ package com.metamx.druid.partition; -import com.google.common.collect.Ordering; - import java.util.Comparator; +import com.google.common.collect.Ordering; + /** */ public class StringPartitionChunk implements PartitionChunk diff --git a/common/src/main/java/com/metamx/druid/processing/MetricSelectorFactory.java b/common/src/main/java/com/metamx/druid/processing/MetricSelectorFactory.java index 8c023c322f47..28fd5193652c 100644 --- a/common/src/main/java/com/metamx/druid/processing/MetricSelectorFactory.java +++ b/common/src/main/java/com/metamx/druid/processing/MetricSelectorFactory.java @@ -19,7 +19,6 @@ package com.metamx.druid.processing; -import java.io.Closeable; /** * Factory class for MetricSelectors diff --git a/common/src/main/java/com/metamx/druid/utils/JodaUtils.java b/common/src/main/java/com/metamx/druid/utils/JodaUtils.java index 53b146180012..08fa7f421bf0 100644 --- a/common/src/main/java/com/metamx/druid/utils/JodaUtils.java +++ b/common/src/main/java/com/metamx/druid/utils/JodaUtils.java @@ -19,16 +19,17 @@ package com.metamx.druid.utils; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import com.metamx.common.guava.Comparators; -import org.joda.time.DateTime; -import org.joda.time.Interval; - import java.util.ArrayList; import java.util.Iterator; import java.util.TreeSet; +import org.joda.time.DateTime; +import org.joda.time.Interval; + +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import com.metamx.common.guava.Comparators; + /** */ public class JodaUtils diff --git a/common/src/main/java/com/metamx/druid/utils/PropUtils.java b/common/src/main/java/com/metamx/druid/utils/PropUtils.java index 48909c02efe4..273bd653f97c 100644 --- a/common/src/main/java/com/metamx/druid/utils/PropUtils.java +++ b/common/src/main/java/com/metamx/druid/utils/PropUtils.java @@ -19,10 +19,10 @@ package com.metamx.druid.utils; -import com.metamx.common.ISE; - import java.util.Properties; +import com.metamx.common.ISE; + /** */ public class PropUtils diff --git a/common/src/main/java/com/metamx/druid/utils/SerializerUtils.java b/common/src/main/java/com/metamx/druid/utils/SerializerUtils.java index 0a1b58d03837..a3e7ad9cbb4d 100644 --- a/common/src/main/java/com/metamx/druid/utils/SerializerUtils.java +++ b/common/src/main/java/com/metamx/druid/utils/SerializerUtils.java @@ -19,11 +19,6 @@ package com.metamx.druid.utils; -import com.google.common.io.ByteStreams; -import com.google.common.io.Closeables; -import com.google.common.io.OutputSupplier; -import com.metamx.druid.IntList; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -33,6 +28,11 @@ import java.util.Arrays; import java.util.List; +import com.google.common.io.ByteStreams; +import com.google.common.io.Closeables; +import com.google.common.io.OutputSupplier; +import com.metamx.druid.IntList; + public class SerializerUtils { private static final Charset UTF8 = Charset.forName("UTF-8"); diff --git a/common/src/test/java/com/metamx/druid/QueryGranularityTest.java b/common/src/test/java/com/metamx/druid/QueryGranularityTest.java index 18f39ef3a1b0..b044cf339bbf 100644 --- a/common/src/test/java/com/metamx/druid/QueryGranularityTest.java +++ b/common/src/test/java/com/metamx/druid/QueryGranularityTest.java @@ -19,9 +19,9 @@ package com.metamx.druid; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.metamx.druid.jackson.DefaultObjectMapper; +import java.util.Iterator; +import java.util.List; + import org.codehaus.jackson.map.ObjectMapper; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -34,8 +34,9 @@ import org.junit.Assert; import org.junit.Test; -import java.util.Iterator; -import java.util.List; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.metamx.druid.jackson.DefaultObjectMapper; /** */ diff --git a/common/src/test/java/com/metamx/druid/VersionedIntervalTimelineTest.java b/common/src/test/java/com/metamx/druid/VersionedIntervalTimelineTest.java index 96d0fa01ce18..61d61d2f68e7 100644 --- a/common/src/test/java/com/metamx/druid/VersionedIntervalTimelineTest.java +++ b/common/src/test/java/com/metamx/druid/VersionedIntervalTimelineTest.java @@ -19,14 +19,10 @@ package com.metamx.druid; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Ordering; -import com.metamx.common.Pair; -import com.metamx.druid.partition.ImmutablePartitionHolder; -import com.metamx.druid.partition.IntegerPartitionChunk; -import com.metamx.druid.partition.PartitionChunk; -import com.metamx.druid.partition.PartitionHolder; -import com.metamx.druid.partition.SingleElementPartitionChunk; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + import org.joda.time.DateTime; import org.joda.time.Days; import org.joda.time.Hours; @@ -35,9 +31,14 @@ import org.junit.Before; import org.junit.Test; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Ordering; +import com.metamx.common.Pair; +import com.metamx.druid.partition.ImmutablePartitionHolder; +import com.metamx.druid.partition.IntegerPartitionChunk; +import com.metamx.druid.partition.PartitionChunk; +import com.metamx.druid.partition.PartitionHolder; +import com.metamx.druid.partition.SingleElementPartitionChunk; /** */ diff --git a/common/src/test/java/com/metamx/druid/aggregation/CountAggregatorTest.java b/common/src/test/java/com/metamx/druid/aggregation/CountAggregatorTest.java index 8a780146504d..f26e59659af2 100644 --- a/common/src/test/java/com/metamx/druid/aggregation/CountAggregatorTest.java +++ b/common/src/test/java/com/metamx/druid/aggregation/CountAggregatorTest.java @@ -19,11 +19,11 @@ package com.metamx.druid.aggregation; +import java.util.Comparator; + import org.junit.Assert; import org.junit.Test; -import java.util.Comparator; - /** */ public class CountAggregatorTest diff --git a/common/src/test/java/com/metamx/druid/aggregation/DoubleSumAggregatorTest.java b/common/src/test/java/com/metamx/druid/aggregation/DoubleSumAggregatorTest.java index d1a87ac9c2df..645a6a23a376 100644 --- a/common/src/test/java/com/metamx/druid/aggregation/DoubleSumAggregatorTest.java +++ b/common/src/test/java/com/metamx/druid/aggregation/DoubleSumAggregatorTest.java @@ -19,11 +19,11 @@ package com.metamx.druid.aggregation; +import java.util.Comparator; + import org.junit.Assert; import org.junit.Test; -import java.util.Comparator; - /** */ public class DoubleSumAggregatorTest diff --git a/common/src/test/java/com/metamx/druid/aggregation/HistogramAggregatorTest.java b/common/src/test/java/com/metamx/druid/aggregation/HistogramAggregatorTest.java index d72ca031efcc..e29108637739 100644 --- a/common/src/test/java/com/metamx/druid/aggregation/HistogramAggregatorTest.java +++ b/common/src/test/java/com/metamx/druid/aggregation/HistogramAggregatorTest.java @@ -19,12 +19,13 @@ package com.metamx.druid.aggregation; -import com.google.common.collect.Lists; +import java.nio.ByteBuffer; +import java.util.ArrayList; + import org.junit.Assert; import org.junit.Test; -import java.nio.ByteBuffer; -import java.util.ArrayList; +import com.google.common.collect.Lists; public class HistogramAggregatorTest { diff --git a/common/src/test/java/com/metamx/druid/aggregation/JavaScriptAggregatorTest.java b/common/src/test/java/com/metamx/druid/aggregation/JavaScriptAggregatorTest.java index 96c2606c2c2d..6629140c8ff1 100644 --- a/common/src/test/java/com/metamx/druid/aggregation/JavaScriptAggregatorTest.java +++ b/common/src/test/java/com/metamx/druid/aggregation/JavaScriptAggregatorTest.java @@ -20,14 +20,14 @@ package com.metamx.druid.aggregation; -import com.google.common.collect.Lists; -import com.google.common.primitives.Doubles; -import com.metamx.druid.processing.FloatMetricSelector; +import java.nio.ByteBuffer; +import java.util.Arrays; + import org.junit.Assert; import org.junit.Test; -import java.nio.ByteBuffer; -import java.util.Arrays; +import com.google.common.collect.Lists; +import com.metamx.druid.processing.FloatMetricSelector; public class JavaScriptAggregatorTest { diff --git a/common/src/test/java/com/metamx/druid/aggregation/LongSumAggregatorTest.java b/common/src/test/java/com/metamx/druid/aggregation/LongSumAggregatorTest.java index 8db1a4a4755a..aba5a4b1d92b 100644 --- a/common/src/test/java/com/metamx/druid/aggregation/LongSumAggregatorTest.java +++ b/common/src/test/java/com/metamx/druid/aggregation/LongSumAggregatorTest.java @@ -19,11 +19,11 @@ package com.metamx.druid.aggregation; +import java.util.Comparator; + import org.junit.Assert; import org.junit.Test; -import java.util.Comparator; - /** */ public class LongSumAggregatorTest diff --git a/common/src/test/java/com/metamx/druid/aggregation/post/ArithmeticPostAggregatorTest.java b/common/src/test/java/com/metamx/druid/aggregation/post/ArithmeticPostAggregatorTest.java index c8365de19b6b..fbb9da1e7bb0 100644 --- a/common/src/test/java/com/metamx/druid/aggregation/post/ArithmeticPostAggregatorTest.java +++ b/common/src/test/java/com/metamx/druid/aggregation/post/ArithmeticPostAggregatorTest.java @@ -19,16 +19,17 @@ package com.metamx.druid.aggregation.post; -import com.google.common.collect.Lists; -import com.metamx.druid.aggregation.CountAggregator; -import org.junit.Assert; -import org.junit.Test; - import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.junit.Assert; +import org.junit.Test; + +import com.google.common.collect.Lists; +import com.metamx.druid.aggregation.CountAggregator; + /** */ public class ArithmeticPostAggregatorTest diff --git a/common/src/test/java/com/metamx/druid/aggregation/post/ConstantPostAggregatorTest.java b/common/src/test/java/com/metamx/druid/aggregation/post/ConstantPostAggregatorTest.java index 0de6e2c62e74..6495308cb350 100644 --- a/common/src/test/java/com/metamx/druid/aggregation/post/ConstantPostAggregatorTest.java +++ b/common/src/test/java/com/metamx/druid/aggregation/post/ConstantPostAggregatorTest.java @@ -19,11 +19,11 @@ package com.metamx.druid.aggregation.post; +import java.util.Comparator; + import org.junit.Assert; import org.junit.Test; -import java.util.Comparator; - /** */ public class ConstantPostAggregatorTest diff --git a/common/src/test/java/com/metamx/druid/aggregation/post/FieldAccessPostAggregatorTest.java b/common/src/test/java/com/metamx/druid/aggregation/post/FieldAccessPostAggregatorTest.java index e413504b1ad4..a0ffa56795eb 100644 --- a/common/src/test/java/com/metamx/druid/aggregation/post/FieldAccessPostAggregatorTest.java +++ b/common/src/test/java/com/metamx/druid/aggregation/post/FieldAccessPostAggregatorTest.java @@ -19,12 +19,13 @@ package com.metamx.druid.aggregation.post; -import com.metamx.druid.aggregation.CountAggregator; +import java.util.HashMap; +import java.util.Map; + import org.junit.Assert; import org.junit.Test; -import java.util.HashMap; -import java.util.Map; +import com.metamx.druid.aggregation.CountAggregator; /** */ diff --git a/common/src/test/java/com/metamx/druid/collect/OrderedMergeIteratorTest.java b/common/src/test/java/com/metamx/druid/collect/OrderedMergeIteratorTest.java index f06b337e3480..2ba2ab03ee6e 100644 --- a/common/src/test/java/com/metamx/druid/collect/OrderedMergeIteratorTest.java +++ b/common/src/test/java/com/metamx/druid/collect/OrderedMergeIteratorTest.java @@ -19,15 +19,17 @@ package com.metamx.druid.collect; -import com.google.common.collect.Lists; -import com.google.common.collect.Ordering; -import junit.framework.Assert; -import org.junit.Test; - import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; +import junit.framework.Assert; + +import org.junit.Test; + +import com.google.common.collect.Lists; +import com.google.common.collect.Ordering; + /** */ public class OrderedMergeIteratorTest diff --git a/common/src/test/java/com/metamx/druid/collect/OrderedMergeSequenceTest.java b/common/src/test/java/com/metamx/druid/collect/OrderedMergeSequenceTest.java index 7080a50c73c8..3b35ee1218f4 100644 --- a/common/src/test/java/com/metamx/druid/collect/OrderedMergeSequenceTest.java +++ b/common/src/test/java/com/metamx/druid/collect/OrderedMergeSequenceTest.java @@ -19,6 +19,17 @@ package com.metamx.druid.collect; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + +import javax.annotation.Nullable; + +import junit.framework.Assert; + +import org.junit.Test; + import com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; @@ -27,14 +38,6 @@ import com.metamx.common.guava.SequenceTestHelper; import com.metamx.common.guava.Sequences; import com.metamx.common.guava.TestSequence; -import junit.framework.Assert; -import org.junit.Test; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; /** */ diff --git a/common/src/test/java/com/metamx/druid/guava/CombiningSequenceTest.java b/common/src/test/java/com/metamx/druid/guava/CombiningSequenceTest.java index 388b7def6a86..5d0587587324 100644 --- a/common/src/test/java/com/metamx/druid/guava/CombiningSequenceTest.java +++ b/common/src/test/java/com/metamx/druid/guava/CombiningSequenceTest.java @@ -19,6 +19,15 @@ package com.metamx.druid.guava; +import java.io.IOException; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + +import junit.framework.Assert; + +import org.junit.Test; + import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import com.metamx.common.Pair; @@ -27,13 +36,6 @@ import com.metamx.common.guava.Yielder; import com.metamx.common.guava.YieldingAccumulator; import com.metamx.common.guava.nary.BinaryFn; -import junit.framework.Assert; -import org.junit.Test; - -import java.io.IOException; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; /** */ diff --git a/common/src/test/java/com/metamx/druid/histogram/HistogramTest.java b/common/src/test/java/com/metamx/druid/histogram/HistogramTest.java index e40cecaa203e..e4866234b45d 100644 --- a/common/src/test/java/com/metamx/druid/histogram/HistogramTest.java +++ b/common/src/test/java/com/metamx/druid/histogram/HistogramTest.java @@ -19,15 +19,16 @@ package com.metamx.druid.histogram; -import com.google.common.collect.Maps; -import com.metamx.druid.aggregation.Histogram; -import com.metamx.druid.jackson.DefaultObjectMapper; +import java.util.Arrays; +import java.util.Map; + import org.codehaus.jackson.map.ObjectMapper; import org.junit.Assert; import org.junit.Test; -import java.util.Arrays; -import java.util.Map; +import com.google.common.collect.Maps; +import com.metamx.druid.aggregation.Histogram; +import com.metamx.druid.jackson.DefaultObjectMapper; public class HistogramTest { diff --git a/common/src/test/java/com/metamx/druid/partition/IntegerPartitionChunkTest.java b/common/src/test/java/com/metamx/druid/partition/IntegerPartitionChunkTest.java index 0acb92911f55..1b00420558a8 100644 --- a/common/src/test/java/com/metamx/druid/partition/IntegerPartitionChunkTest.java +++ b/common/src/test/java/com/metamx/druid/partition/IntegerPartitionChunkTest.java @@ -19,11 +19,11 @@ package com.metamx.druid.partition; +import static com.metamx.druid.partition.IntegerPartitionChunk.make; + import org.junit.Assert; import org.junit.Test; -import static com.metamx.druid.partition.IntegerPartitionChunk.make; - /** */ public class IntegerPartitionChunkTest diff --git a/common/src/test/java/com/metamx/druid/partition/StringPartitionChunkTest.java b/common/src/test/java/com/metamx/druid/partition/StringPartitionChunkTest.java index c6a7cdfd0057..572c2ae70c14 100644 --- a/common/src/test/java/com/metamx/druid/partition/StringPartitionChunkTest.java +++ b/common/src/test/java/com/metamx/druid/partition/StringPartitionChunkTest.java @@ -19,11 +19,11 @@ package com.metamx.druid.partition; +import static com.metamx.druid.partition.StringPartitionChunk.make; + import org.junit.Assert; import org.junit.Test; -import static com.metamx.druid.partition.StringPartitionChunk.make; - /** */ public class StringPartitionChunkTest diff --git a/common/src/test/java/com/metamx/druid/utils/JodaUtilsTest.java b/common/src/test/java/com/metamx/druid/utils/JodaUtilsTest.java index 6abaf485b687..9b53504d2af1 100644 --- a/common/src/test/java/com/metamx/druid/utils/JodaUtilsTest.java +++ b/common/src/test/java/com/metamx/druid/utils/JodaUtilsTest.java @@ -19,14 +19,14 @@ package com.metamx.druid.utils; -import org.joda.time.Interval; -import org.junit.Assert; -import org.junit.Test; - import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.joda.time.Interval; +import org.junit.Assert; +import org.junit.Test; + /** */ public class JodaUtilsTest diff --git a/examples/twitter/src/main/java/druid/examples/RealtimeStandaloneMain.java b/examples/twitter/src/main/java/druid/examples/RealtimeStandaloneMain.java index 6fabdf04452a..be0f8ea93f97 100644 --- a/examples/twitter/src/main/java/druid/examples/RealtimeStandaloneMain.java +++ b/examples/twitter/src/main/java/druid/examples/RealtimeStandaloneMain.java @@ -1,5 +1,10 @@ package druid.examples; +import java.io.File; +import java.io.IOException; + +import org.codehaus.jackson.map.jsontype.NamedType; + import com.metamx.common.config.Config; import com.metamx.common.lifecycle.Lifecycle; import com.metamx.common.logger.Logger; @@ -13,11 +18,8 @@ import com.metamx.druid.realtime.RealtimeNode; import com.metamx.druid.realtime.SegmentPusher; import com.metamx.phonebook.PhoneBook; -import druid.examples.twitter.TwitterSpritzerFirehoseFactory; -import org.codehaus.jackson.map.jsontype.NamedType; -import java.io.File; -import java.io.IOException; +import druid.examples.twitter.TwitterSpritzerFirehoseFactory; /** Standalone Demo Realtime process. * Created: 20121009T2050 diff --git a/examples/twitter/src/main/java/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java b/examples/twitter/src/main/java/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java index 249ea12e3b19..57b20029a381 100644 --- a/examples/twitter/src/main/java/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java +++ b/examples/twitter/src/main/java/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java @@ -1,15 +1,6 @@ package druid.examples.twitter; -import com.metamx.common.logger.Logger; -import com.metamx.druid.input.InputRow; -import com.metamx.druid.input.MapBasedInputRow; -import com.metamx.druid.realtime.Firehose; -import com.metamx.druid.realtime.FirehoseFactory; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonTypeName; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.ObjectMapper; -import twitter4j.*; +import static java.lang.Thread.sleep; import java.io.IOException; import java.util.HashMap; @@ -19,7 +10,24 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; -import static java.lang.Thread.*; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.codehaus.jackson.annotate.JsonTypeName; + +import twitter4j.ConnectionLifeCycleListener; +import twitter4j.HashtagEntity; +import twitter4j.Status; +import twitter4j.StatusDeletionNotice; +import twitter4j.StatusListener; +import twitter4j.TwitterStream; +import twitter4j.TwitterStreamFactory; +import twitter4j.User; + +import com.metamx.common.logger.Logger; +import com.metamx.druid.input.InputRow; +import com.metamx.druid.input.MapBasedInputRow; +import com.metamx.druid.realtime.Firehose; +import com.metamx.druid.realtime.FirehoseFactory; /** diff --git a/index-common/src/main/java/com/metamx/druid/common/s3/S3Utils.java b/index-common/src/main/java/com/metamx/druid/common/s3/S3Utils.java index c68a3e543984..6284c2ee96a2 100644 --- a/index-common/src/main/java/com/metamx/druid/common/s3/S3Utils.java +++ b/index-common/src/main/java/com/metamx/druid/common/s3/S3Utils.java @@ -19,19 +19,20 @@ package com.metamx.druid.common.s3; -import com.google.common.io.CharStreams; -import com.metamx.common.logger.Logger; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.security.NoSuchAlgorithmException; +import java.util.regex.Pattern; + import org.jets3t.service.S3ServiceException; import org.jets3t.service.ServiceException; import org.jets3t.service.impl.rest.httpclient.RestS3Service; import org.jets3t.service.model.S3Bucket; import org.jets3t.service.model.S3Object; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.security.NoSuchAlgorithmException; -import java.util.regex.Pattern; +import com.google.common.io.CharStreams; +import com.metamx.common.logger.Logger; /** * diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatBufferObjectStrategy.java b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatBufferObjectStrategy.java index 6aa2355dc15e..a42c5ba94057 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatBufferObjectStrategy.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatBufferObjectStrategy.java @@ -19,13 +19,13 @@ package com.metamx.druid.index.v1; -import com.google.common.collect.Ordering; -import com.google.common.primitives.Floats; - import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.FloatBuffer; +import com.google.common.collect.Ordering; +import com.google.common.primitives.Floats; + /** */ public class CompressedFloatBufferObjectStrategy extends CompressedObjectStrategy diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplier.java b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplier.java index 12751ebebe8b..726cbf92e3f9 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplier.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplier.java @@ -19,6 +19,13 @@ package com.metamx.druid.index.v1; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.FloatBuffer; +import java.nio.channels.WritableByteChannel; +import java.util.Iterator; + import com.google.common.base.Preconditions; import com.google.common.base.Supplier; import com.google.common.io.Closeables; @@ -29,14 +36,6 @@ import com.metamx.druid.collect.StupidResourceHolder; import com.metamx.druid.kv.GenericIndexed; import com.metamx.druid.kv.IndexedFloats; -import com.metamx.druid.kv.IndexedIterable; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.FloatBuffer; -import java.nio.channels.WritableByteChannel; -import java.util.Iterator; /** */ diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializer.java b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializer.java index 090ab7b0c7aa..8fef71c287fb 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializer.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializer.java @@ -19,6 +19,11 @@ package com.metamx.druid.index.v1; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.ByteOrder; +import java.nio.FloatBuffer; + import com.google.common.io.ByteStreams; import com.google.common.io.Closeables; import com.google.common.io.OutputSupplier; @@ -28,11 +33,6 @@ import com.metamx.druid.kv.FlattenedArrayWriter; import com.metamx.druid.kv.IOPeon; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.ByteOrder; -import java.nio.FloatBuffer; - /** */ public class CompressedFloatsSupplierSerializer diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongBufferObjectStrategy.java b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongBufferObjectStrategy.java index 27dd331a52f4..c81e23ce235f 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongBufferObjectStrategy.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongBufferObjectStrategy.java @@ -19,13 +19,13 @@ package com.metamx.druid.index.v1; -import com.google.common.collect.Ordering; -import com.google.common.primitives.Longs; - import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.LongBuffer; +import com.google.common.collect.Ordering; +import com.google.common.primitives.Longs; + /** */ public class CompressedLongBufferObjectStrategy extends CompressedObjectStrategy diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplier.java b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplier.java index b76a21176e13..17cf06d5d7e7 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplier.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplier.java @@ -19,6 +19,13 @@ package com.metamx.druid.index.v1; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.LongBuffer; +import java.nio.channels.WritableByteChannel; +import java.util.Iterator; + import com.google.common.base.Preconditions; import com.google.common.base.Supplier; import com.google.common.io.Closeables; @@ -28,16 +35,8 @@ import com.metamx.druid.collect.ResourceHolder; import com.metamx.druid.collect.StupidResourceHolder; import com.metamx.druid.kv.GenericIndexed; -import com.metamx.druid.kv.IndexedIterable; import com.metamx.druid.kv.IndexedLongs; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.LongBuffer; -import java.nio.channels.WritableByteChannel; -import java.util.Iterator; - /** */ public class CompressedLongsIndexedSupplier implements Supplier diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializer.java b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializer.java index 57d326da04b9..62891f69e9aa 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializer.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializer.java @@ -19,6 +19,11 @@ package com.metamx.druid.index.v1; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.ByteOrder; +import java.nio.LongBuffer; + import com.google.common.io.ByteStreams; import com.google.common.io.Closeables; import com.google.common.io.OutputSupplier; @@ -29,11 +34,6 @@ import com.metamx.druid.kv.FlattenedArrayWriter; import com.metamx.druid.kv.IOPeon; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.ByteOrder; -import java.nio.LongBuffer; - /** */ public class CompressedLongsSupplierSerializer diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedObjectStrategy.java b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedObjectStrategy.java index 7733ec7fb2f0..f5bc7df22799 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedObjectStrategy.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedObjectStrategy.java @@ -19,6 +19,11 @@ package com.metamx.druid.index.v1; +import java.io.IOException; +import java.nio.Buffer; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; + import com.google.common.base.Throwables; import com.google.common.io.Closeables; import com.metamx.druid.collect.ResourceHolder; @@ -27,11 +32,6 @@ import com.ning.compress.lzf.LZFChunk; import com.ning.compress.lzf.LZFDecoder; -import java.io.IOException; -import java.nio.Buffer; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; - /** */ public class CompressedObjectStrategy implements ObjectStrategy> diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedPools.java b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedPools.java index a3061b670304..b2d0f0beb1e4 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedPools.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/CompressedPools.java @@ -19,16 +19,16 @@ package com.metamx.druid.index.v1; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.concurrent.atomic.AtomicLong; + import com.google.common.base.Supplier; import com.metamx.common.logger.Logger; import com.metamx.druid.collect.ResourceHolder; import com.metamx.druid.collect.StupidPool; import com.ning.compress.lzf.ChunkEncoder; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.util.concurrent.atomic.AtomicLong; - /** */ public class CompressedPools diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedFloats.java b/index-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedFloats.java index a46b990a2ba0..c5056e80661c 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedFloats.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedFloats.java @@ -19,6 +19,13 @@ package com.metamx.druid.index.v1; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.FloatBuffer; +import java.util.Arrays; +import java.util.List; + import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -28,13 +35,6 @@ import com.metamx.druid.kv.GenericIndexed; import com.metamx.druid.kv.IndexedFloats; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.FloatBuffer; -import java.util.Arrays; -import java.util.List; - /** */ public class InMemoryCompressedFloats implements IndexedFloats diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedLongs.java b/index-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedLongs.java index 9a408b46a4c2..aed0ec523cd3 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedLongs.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedLongs.java @@ -19,6 +19,13 @@ package com.metamx.druid.index.v1; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.LongBuffer; +import java.util.Arrays; +import java.util.List; + import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; @@ -28,13 +35,6 @@ import com.metamx.druid.kv.GenericIndexed; import com.metamx.druid.kv.IndexedLongs; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.LongBuffer; -import java.util.Arrays; -import java.util.List; - /** */ public class InMemoryCompressedLongs implements IndexedLongs diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndex.java b/index-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndex.java index 3b05c022cfbc..d40419015f34 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndex.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndex.java @@ -19,6 +19,21 @@ package com.metamx.druid.index.v1; +import java.util.Arrays; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentNavigableMap; +import java.util.concurrent.ConcurrentSkipListMap; +import java.util.concurrent.CopyOnWriteArrayList; + +import javax.annotation.Nullable; + +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -43,19 +58,6 @@ import com.metamx.druid.processing.ComplexMetricSelector; import com.metamx.druid.processing.FloatMetricSelector; import com.metamx.druid.processing.MetricSelectorFactory; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import javax.annotation.Nullable; -import java.util.Arrays; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentNavigableMap; -import java.util.concurrent.ConcurrentSkipListMap; -import java.util.concurrent.CopyOnWriteArrayList; /** */ diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/Index.java b/index-common/src/main/java/com/metamx/druid/index/v1/Index.java index 883fc38474cd..8f6c2efe665b 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/Index.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/Index.java @@ -19,13 +19,15 @@ package com.metamx.druid.index.v1; -import com.metamx.common.logger.Logger; import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; -import org.joda.time.Interval; import java.util.HashMap; import java.util.Map; +import org.joda.time.Interval; + +import com.metamx.common.logger.Logger; + /** * In-memory representation of a segment */ diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/IndexIO.java b/index-common/src/main/java/com/metamx/druid/index/v1/IndexIO.java index ced22ba67b46..2961ca4276b3 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/IndexIO.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/IndexIO.java @@ -19,6 +19,18 @@ package com.metamx.druid.index.v1; +import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.Map; + +import org.joda.time.Interval; + import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.io.Closeables; @@ -31,18 +43,6 @@ import com.metamx.druid.kv.IndexedIterable; import com.metamx.druid.kv.VSizeIndexed; import com.metamx.druid.utils.SerializerUtils; -import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; -import org.joda.time.Interval; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.channels.FileChannel; -import java.util.Map; /** * This should be changed to use DI instead of a static reference... diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/MMappedIndex.java b/index-common/src/main/java/com/metamx/druid/index/v1/MMappedIndex.java index f23e2b7d0617..60a0908f96c6 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/MMappedIndex.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/MMappedIndex.java @@ -19,6 +19,15 @@ package com.metamx.druid.index.v1; +import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; + +import java.nio.ByteOrder; +import java.nio.LongBuffer; +import java.util.Arrays; +import java.util.Map; + +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; @@ -27,18 +36,10 @@ import com.metamx.druid.kv.ConciseCompressedIndexedInts; import com.metamx.druid.kv.GenericIndexed; import com.metamx.druid.kv.Indexed; -import com.metamx.druid.kv.IndexedInts; import com.metamx.druid.kv.IndexedList; import com.metamx.druid.kv.IndexedLongs; import com.metamx.druid.kv.VSizeIndexed; import com.metamx.druid.kv.VSizeIndexedInts; -import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; -import org.joda.time.Interval; - -import java.nio.ByteOrder; -import java.nio.LongBuffer; -import java.util.Arrays; -import java.util.Map; /** */ diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/MetricHolder.java b/index-common/src/main/java/com/metamx/druid/index/v1/MetricHolder.java index 91cbf4f68186..6a010f03cc8f 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/MetricHolder.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/MetricHolder.java @@ -19,6 +19,13 @@ package com.metamx.druid.index.v1; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.channels.WritableByteChannel; + import com.google.common.io.ByteStreams; import com.google.common.io.Closeables; import com.google.common.io.InputSupplier; @@ -34,14 +41,6 @@ import com.metamx.druid.kv.ObjectStrategy; import com.metamx.druid.utils.SerializerUtils; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.channels.Channels; -import java.nio.channels.WritableByteChannel; - /** */ public class MetricHolder diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetrics.java b/index-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetrics.java index 33093f8f8258..415b46cb1a46 100644 --- a/index-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetrics.java +++ b/index-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetrics.java @@ -19,11 +19,11 @@ package com.metamx.druid.index.v1.serde; +import java.util.Map; + import com.google.common.collect.Maps; import com.metamx.common.ISE; -import java.util.Map; - /** */ public class ComplexMetrics diff --git a/index-common/src/main/java/com/metamx/druid/indexer/data/CSVDataSpec.java b/index-common/src/main/java/com/metamx/druid/indexer/data/CSVDataSpec.java index 72a683095b9c..96552e794a82 100644 --- a/index-common/src/main/java/com/metamx/druid/indexer/data/CSVDataSpec.java +++ b/index-common/src/main/java/com/metamx/druid/indexer/data/CSVDataSpec.java @@ -19,6 +19,13 @@ package com.metamx.druid.indexer.data; +import java.util.List; + +import javax.annotation.Nullable; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; @@ -26,11 +33,6 @@ import com.metamx.common.parsers.CSVParser; import com.metamx.common.parsers.Parser; import com.metamx.common.parsers.ToLowerCaseParser; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - -import javax.annotation.Nullable; -import java.util.List; /** */ diff --git a/index-common/src/main/java/com/metamx/druid/indexer/data/DataSpec.java b/index-common/src/main/java/com/metamx/druid/indexer/data/DataSpec.java index 668dbc00fffa..ee408366314d 100644 --- a/index-common/src/main/java/com/metamx/druid/indexer/data/DataSpec.java +++ b/index-common/src/main/java/com/metamx/druid/indexer/data/DataSpec.java @@ -19,11 +19,12 @@ package com.metamx.druid.indexer.data; -import com.metamx.common.parsers.Parser; +import java.util.List; + import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; -import java.util.List; +import com.metamx.common.parsers.Parser; /** */ diff --git a/index-common/src/main/java/com/metamx/druid/indexer/data/DelimitedDataSpec.java b/index-common/src/main/java/com/metamx/druid/indexer/data/DelimitedDataSpec.java index 0cad130da335..d5df7af3c169 100644 --- a/index-common/src/main/java/com/metamx/druid/indexer/data/DelimitedDataSpec.java +++ b/index-common/src/main/java/com/metamx/druid/indexer/data/DelimitedDataSpec.java @@ -19,6 +19,13 @@ package com.metamx.druid.indexer.data; +import java.util.List; + +import javax.annotation.Nullable; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; @@ -26,11 +33,6 @@ import com.metamx.common.parsers.DelimitedParser; import com.metamx.common.parsers.Parser; import com.metamx.common.parsers.ToLowerCaseParser; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - -import javax.annotation.Nullable; -import java.util.List; /** */ diff --git a/index-common/src/main/java/com/metamx/druid/indexer/data/JSONDataSpec.java b/index-common/src/main/java/com/metamx/druid/indexer/data/JSONDataSpec.java index 4c5f3d454444..1874cc86407e 100644 --- a/index-common/src/main/java/com/metamx/druid/indexer/data/JSONDataSpec.java +++ b/index-common/src/main/java/com/metamx/druid/indexer/data/JSONDataSpec.java @@ -19,15 +19,17 @@ package com.metamx.druid.indexer.data; +import java.util.List; + +import javax.annotation.Nullable; + +import org.codehaus.jackson.annotate.JsonProperty; + import com.google.common.base.Function; import com.google.common.collect.Lists; import com.metamx.common.parsers.JSONParser; import com.metamx.common.parsers.Parser; import com.metamx.common.parsers.ToLowerCaseParser; -import org.codehaus.jackson.annotate.JsonProperty; - -import javax.annotation.Nullable; -import java.util.List; /** */ diff --git a/index-common/src/main/java/com/metamx/druid/indexer/data/StringInputRowParser.java b/index-common/src/main/java/com/metamx/druid/indexer/data/StringInputRowParser.java index 29d12c202d00..20fc0f517968 100644 --- a/index-common/src/main/java/com/metamx/druid/indexer/data/StringInputRowParser.java +++ b/index-common/src/main/java/com/metamx/druid/indexer/data/StringInputRowParser.java @@ -19,19 +19,20 @@ package com.metamx.druid.indexer.data; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.joda.time.DateTime; + import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.metamx.common.exception.FormattedException; import com.metamx.common.parsers.Parser; import com.metamx.druid.input.InputRow; import com.metamx.druid.input.MapBasedInputRow; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.joda.time.DateTime; - -import java.util.List; -import java.util.Map; -import java.util.Set; /** */ diff --git a/index-common/src/main/java/com/metamx/druid/indexer/data/TimestampSpec.java b/index-common/src/main/java/com/metamx/druid/indexer/data/TimestampSpec.java index 4905f268ed48..59d1ca1ed283 100644 --- a/index-common/src/main/java/com/metamx/druid/indexer/data/TimestampSpec.java +++ b/index-common/src/main/java/com/metamx/druid/indexer/data/TimestampSpec.java @@ -19,13 +19,14 @@ package com.metamx.druid.indexer.data; -import com.google.common.base.Function; -import com.metamx.common.parsers.ParserUtils; +import java.util.Map; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; import org.joda.time.DateTime; -import java.util.Map; +import com.google.common.base.Function; +import com.metamx.common.parsers.ParserUtils; /** */ diff --git a/index-common/src/main/java/com/metamx/druid/kv/ConciseCompressedIndexedInts.java b/index-common/src/main/java/com/metamx/druid/kv/ConciseCompressedIndexedInts.java index c35d53328f28..dcbeab56b2fc 100644 --- a/index-common/src/main/java/com/metamx/druid/kv/ConciseCompressedIndexedInts.java +++ b/index-common/src/main/java/com/metamx/druid/kv/ConciseCompressedIndexedInts.java @@ -20,14 +20,16 @@ package com.metamx.druid.kv; -import com.google.common.collect.Ordering; import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; import it.uniroma3.mat.extendedset.intset.IntSet; -import javax.annotation.Nullable; import java.nio.ByteBuffer; import java.util.Iterator; +import javax.annotation.Nullable; + +import com.google.common.collect.Ordering; + /** */ public class ConciseCompressedIndexedInts implements IndexedInts, Comparable diff --git a/index-common/src/main/java/com/metamx/druid/kv/EmptyIndexedInts.java b/index-common/src/main/java/com/metamx/druid/kv/EmptyIndexedInts.java index aaf4d8bffef9..20850c2b6723 100644 --- a/index-common/src/main/java/com/metamx/druid/kv/EmptyIndexedInts.java +++ b/index-common/src/main/java/com/metamx/druid/kv/EmptyIndexedInts.java @@ -19,11 +19,10 @@ package com.metamx.druid.kv; -import com.google.common.collect.ImmutableList; - -import java.util.Collections; import java.util.Iterator; +import com.google.common.collect.ImmutableList; + /** */ public class EmptyIndexedInts implements IndexedInts diff --git a/index-common/src/main/java/com/metamx/druid/kv/FlattenedArrayWriter.java b/index-common/src/main/java/com/metamx/druid/kv/FlattenedArrayWriter.java index 4c5696a3b8fe..cf1a80ce0f7f 100644 --- a/index-common/src/main/java/com/metamx/druid/kv/FlattenedArrayWriter.java +++ b/index-common/src/main/java/com/metamx/druid/kv/FlattenedArrayWriter.java @@ -19,6 +19,12 @@ package com.metamx.druid.kv; +import java.io.Closeable; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Arrays; + import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; @@ -27,12 +33,6 @@ import com.google.common.io.InputSupplier; import com.google.common.primitives.Ints; -import java.io.Closeable; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.Arrays; - /** * Streams arrays of objects out in the binary format described by GenericIndexed */ diff --git a/index-common/src/main/java/com/metamx/druid/kv/GenericIndexed.java b/index-common/src/main/java/com/metamx/druid/kv/GenericIndexed.java index b168c4a790d4..ea855d8c7a36 100644 --- a/index-common/src/main/java/com/metamx/druid/kv/GenericIndexed.java +++ b/index-common/src/main/java/com/metamx/druid/kv/GenericIndexed.java @@ -19,12 +19,6 @@ package com.metamx.druid.kv; -import com.google.common.base.Charsets; -import com.google.common.collect.Ordering; -import com.google.common.io.Closeables; -import com.google.common.primitives.Ints; -import com.metamx.common.IAE; - import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.IOException; @@ -33,6 +27,12 @@ import java.util.Arrays; import java.util.Iterator; +import com.google.common.base.Charsets; +import com.google.common.collect.Ordering; +import com.google.common.io.Closeables; +import com.google.common.primitives.Ints; +import com.metamx.common.IAE; + /** * A generic, flat storage mechanism. Use static methods fromArray() or fromIterable() to construct. If input * is sorted, supports binary search index lookups. If input is not sorted, only supports array-like index lookups. diff --git a/index-common/src/main/java/com/metamx/druid/kv/IntBufferIndexedInts.java b/index-common/src/main/java/com/metamx/druid/kv/IntBufferIndexedInts.java index a6c7e42b049b..1a196e24742e 100644 --- a/index-common/src/main/java/com/metamx/druid/kv/IntBufferIndexedInts.java +++ b/index-common/src/main/java/com/metamx/druid/kv/IntBufferIndexedInts.java @@ -19,14 +19,14 @@ package com.metamx.druid.kv; -import com.google.common.collect.Ordering; -import com.google.common.primitives.Ints; -import com.metamx.druid.IntList; - import java.nio.ByteBuffer; import java.nio.IntBuffer; import java.util.Iterator; +import com.google.common.collect.Ordering; +import com.google.common.primitives.Ints; +import com.metamx.druid.IntList; + /** */ public class IntBufferIndexedInts implements IndexedInts, Comparable diff --git a/index-common/src/main/java/com/metamx/druid/kv/TmpFileIOPeon.java b/index-common/src/main/java/com/metamx/druid/kv/TmpFileIOPeon.java index 9af7e0b03378..48a4879ef928 100644 --- a/index-common/src/main/java/com/metamx/druid/kv/TmpFileIOPeon.java +++ b/index-common/src/main/java/com/metamx/druid/kv/TmpFileIOPeon.java @@ -19,8 +19,6 @@ package com.metamx.druid.kv; -import com.google.common.collect.Maps; - import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; @@ -30,6 +28,8 @@ import java.io.OutputStream; import java.util.Map; +import com.google.common.collect.Maps; + /** */ public class TmpFileIOPeon implements IOPeon diff --git a/index-common/src/main/java/com/metamx/druid/kv/VSizeIndexed.java b/index-common/src/main/java/com/metamx/druid/kv/VSizeIndexed.java index b77ab3ba4dbe..d5da8a9dd16f 100644 --- a/index-common/src/main/java/com/metamx/druid/kv/VSizeIndexed.java +++ b/index-common/src/main/java/com/metamx/druid/kv/VSizeIndexed.java @@ -19,10 +19,6 @@ package com.metamx.druid.kv; -import com.google.common.primitives.Ints; -import com.metamx.common.IAE; -import com.metamx.common.ISE; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.ByteBuffer; @@ -30,6 +26,10 @@ import java.util.Arrays; import java.util.Iterator; +import com.google.common.primitives.Ints; +import com.metamx.common.IAE; +import com.metamx.common.ISE; + /** */ public class VSizeIndexed implements Indexed diff --git a/index-common/src/main/java/com/metamx/druid/kv/VSizeIndexedInts.java b/index-common/src/main/java/com/metamx/druid/kv/VSizeIndexedInts.java index c4bd1adad2f3..449253acfd99 100644 --- a/index-common/src/main/java/com/metamx/druid/kv/VSizeIndexedInts.java +++ b/index-common/src/main/java/com/metamx/druid/kv/VSizeIndexedInts.java @@ -19,13 +19,13 @@ package com.metamx.druid.kv; -import com.google.common.primitives.Ints; -import com.metamx.common.IAE; - import java.nio.ByteBuffer; import java.util.Iterator; import java.util.List; +import com.google.common.primitives.Ints; +import com.metamx.common.IAE; + /** */ public class VSizeIndexedInts implements IndexedInts, Comparable diff --git a/index-common/src/main/java/com/metamx/druid/kv/VSizeIndexedWriter.java b/index-common/src/main/java/com/metamx/druid/kv/VSizeIndexedWriter.java index c50ea15ad531..5911192d6f73 100644 --- a/index-common/src/main/java/com/metamx/druid/kv/VSizeIndexedWriter.java +++ b/index-common/src/main/java/com/metamx/druid/kv/VSizeIndexedWriter.java @@ -19,6 +19,13 @@ package com.metamx.druid.kv; +import java.io.Closeable; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Arrays; +import java.util.List; + import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; @@ -28,13 +35,6 @@ import com.google.common.io.InputSupplier; import com.google.common.primitives.Ints; -import java.io.Closeable; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.Arrays; -import java.util.List; - /** * Streams arrays of objects out in the binary format described by VSizeIndexed */ diff --git a/index-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplierTest.java b/index-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplierTest.java index 850217c1f0d8..9deeb9ce1fc6 100644 --- a/index-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplierTest.java +++ b/index-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplierTest.java @@ -19,20 +19,21 @@ package com.metamx.druid.index.v1; -import com.google.common.io.Closeables; -import com.google.common.primitives.Floats; -import com.metamx.druid.kv.IndexedFloats; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - import java.nio.ByteOrder; import java.nio.FloatBuffer; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import com.google.common.io.Closeables; +import com.google.common.primitives.Floats; +import com.metamx.druid.kv.IndexedFloats; + /** */ public class CompressedFloatsIndexedSupplierTest diff --git a/index-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializerTest.java b/index-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializerTest.java index df300cf7f233..bbc9cd0053c8 100644 --- a/index-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializerTest.java +++ b/index-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializerTest.java @@ -19,26 +19,20 @@ package com.metamx.druid.index.v1; -import com.google.common.collect.Maps; -import com.google.common.io.OutputSupplier; -import com.metamx.druid.collect.ResourceHolder; -import com.metamx.druid.kv.FlattenedArrayWriter; -import com.metamx.druid.kv.IOPeon; -import com.metamx.druid.kv.IndexedFloats; -import org.junit.Assert; -import org.junit.Test; - -import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.FloatBuffer; -import java.util.Map; + +import org.junit.Assert; +import org.junit.Test; + +import com.google.common.io.OutputSupplier; +import com.metamx.druid.collect.ResourceHolder; +import com.metamx.druid.kv.FlattenedArrayWriter; +import com.metamx.druid.kv.IndexedFloats; /** */ diff --git a/index-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplierTest.java b/index-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplierTest.java index f14fcd29f86e..b299e11b9039 100644 --- a/index-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplierTest.java +++ b/index-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplierTest.java @@ -19,20 +19,21 @@ package com.metamx.druid.index.v1; -import com.google.common.io.Closeables; -import com.google.common.primitives.Longs; -import com.metamx.druid.kv.IndexedLongs; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - import java.nio.ByteOrder; import java.nio.LongBuffer; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import com.google.common.io.Closeables; +import com.google.common.primitives.Longs; +import com.metamx.druid.kv.IndexedLongs; + /** */ public class CompressedLongsIndexedSupplierTest diff --git a/index-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializerTest.java b/index-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializerTest.java index 1746c2c2331e..e0221154e5ef 100644 --- a/index-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializerTest.java +++ b/index-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializerTest.java @@ -19,13 +19,6 @@ package com.metamx.druid.index.v1; -import com.google.common.io.OutputSupplier; -import com.metamx.druid.collect.ResourceHolder; -import com.metamx.druid.kv.FlattenedArrayWriter; -import com.metamx.druid.kv.IndexedLongs; -import org.junit.Assert; -import org.junit.Test; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -33,6 +26,14 @@ import java.nio.ByteOrder; import java.nio.LongBuffer; +import org.junit.Assert; +import org.junit.Test; + +import com.google.common.io.OutputSupplier; +import com.metamx.druid.collect.ResourceHolder; +import com.metamx.druid.kv.FlattenedArrayWriter; +import com.metamx.druid.kv.IndexedLongs; + /** */ public class CompressedLongsSupplierSerializerTest diff --git a/index-common/src/test/java/com/metamx/druid/index/v1/IOPeonForTesting.java b/index-common/src/test/java/com/metamx/druid/index/v1/IOPeonForTesting.java index 6229d222e83d..632aaffc9ab1 100644 --- a/index-common/src/test/java/com/metamx/druid/index/v1/IOPeonForTesting.java +++ b/index-common/src/test/java/com/metamx/druid/index/v1/IOPeonForTesting.java @@ -19,9 +19,6 @@ package com.metamx.druid.index.v1; -import com.google.common.collect.Maps; -import com.metamx.druid.kv.IOPeon; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; @@ -30,6 +27,9 @@ import java.io.OutputStream; import java.util.Map; +import com.google.common.collect.Maps; +import com.metamx.druid.kv.IOPeon; + /** */ class IOPeonForTesting implements IOPeon diff --git a/index-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedFloatsTest.java b/index-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedFloatsTest.java index bb52785b9101..3aa08cf70dad 100644 --- a/index-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedFloatsTest.java +++ b/index-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedFloatsTest.java @@ -19,12 +19,13 @@ package com.metamx.druid.index.v1; -import com.metamx.druid.kv.IndexedFloats; +import java.nio.ByteOrder; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.nio.ByteOrder; +import com.metamx.druid.kv.IndexedFloats; /** */ diff --git a/index-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedLongsTest.java b/index-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedLongsTest.java index 00c01ac52beb..7df50eae7e1c 100644 --- a/index-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedLongsTest.java +++ b/index-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedLongsTest.java @@ -19,12 +19,13 @@ package com.metamx.druid.index.v1; -import com.metamx.druid.kv.IndexedLongs; +import java.nio.ByteOrder; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.nio.ByteOrder; +import com.metamx.druid.kv.IndexedLongs; /** */ diff --git a/index-common/src/test/java/com/metamx/druid/kv/GenericIndexedTest.java b/index-common/src/test/java/com/metamx/druid/kv/GenericIndexedTest.java index 41e6a65ebdee..50c1f4963e30 100644 --- a/index-common/src/test/java/com/metamx/druid/kv/GenericIndexedTest.java +++ b/index-common/src/test/java/com/metamx/druid/kv/GenericIndexedTest.java @@ -19,10 +19,6 @@ package com.metamx.druid.kv; -import com.google.common.collect.Maps; -import org.junit.Assert; -import org.junit.Test; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.ByteBuffer; @@ -31,6 +27,11 @@ import java.util.HashMap; import java.util.Map; +import org.junit.Assert; +import org.junit.Test; + +import com.google.common.collect.Maps; + /** */ public class GenericIndexedTest diff --git a/index-common/src/test/java/com/metamx/druid/kv/IndexedIntsTest.java b/index-common/src/test/java/com/metamx/druid/kv/IndexedIntsTest.java index d7341cb5c289..a58ffcbabad3 100644 --- a/index-common/src/test/java/com/metamx/druid/kv/IndexedIntsTest.java +++ b/index-common/src/test/java/com/metamx/druid/kv/IndexedIntsTest.java @@ -19,15 +19,15 @@ package com.metamx.druid.kv; +import java.io.IOException; +import java.util.Arrays; +import java.util.Collection; + import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collection; - /** */ @RunWith(Parameterized.class) diff --git a/index-common/src/test/java/com/metamx/druid/kv/VSizeIndexedTest.java b/index-common/src/test/java/com/metamx/druid/kv/VSizeIndexedTest.java index 39ce52a5133b..44b4f8f53f00 100644 --- a/index-common/src/test/java/com/metamx/druid/kv/VSizeIndexedTest.java +++ b/index-common/src/test/java/com/metamx/druid/kv/VSizeIndexedTest.java @@ -19,11 +19,6 @@ package com.metamx.druid.kv; -import com.google.common.base.Function; -import com.google.common.collect.Iterables; -import org.junit.Assert; -import org.junit.Test; - import java.io.ByteArrayOutputStream; import java.nio.ByteBuffer; import java.nio.channels.Channels; @@ -31,6 +26,12 @@ import java.util.Arrays; import java.util.List; +import org.junit.Assert; +import org.junit.Test; + +import com.google.common.base.Function; +import com.google.common.collect.Iterables; + /** */ public class VSizeIndexedTest diff --git a/indexer/src/main/java/com/metamx/druid/indexer/Bucket.java b/indexer/src/main/java/com/metamx/druid/indexer/Bucket.java index 6904522a4634..1559996a5f32 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/Bucket.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/Bucket.java @@ -19,10 +19,11 @@ package com.metamx.druid.indexer; -import com.metamx.common.Pair; +import java.nio.ByteBuffer; + import org.joda.time.DateTime; -import java.nio.ByteBuffer; +import com.metamx.common.Pair; public class Bucket { diff --git a/indexer/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java b/indexer/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java index d1925629bd25..b2005e296b8a 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java @@ -19,11 +19,11 @@ package com.metamx.druid.indexer; -import com.metamx.common.logger.Logger; -import com.metamx.druid.client.DataSegment; -import com.metamx.druid.db.DbConnector; -import com.metamx.druid.indexer.updater.DbUpdaterJobSpec; -import com.metamx.druid.jackson.DefaultObjectMapper; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.codehaus.jackson.map.ObjectMapper; @@ -32,10 +32,11 @@ import org.skife.jdbi.v2.Handle; import org.skife.jdbi.v2.tweak.HandleCallback; -import java.util.Collections; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; +import com.metamx.common.logger.Logger; +import com.metamx.druid.client.DataSegment; +import com.metamx.druid.db.DbConnector; +import com.metamx.druid.indexer.updater.DbUpdaterJobSpec; +import com.metamx.druid.jackson.DefaultObjectMapper; /** */ diff --git a/indexer/src/main/java/com/metamx/druid/indexer/DeterminePartitionsJob.java b/indexer/src/main/java/com/metamx/druid/indexer/DeterminePartitionsJob.java index a40642ebec5c..409eca0dd92d 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/DeterminePartitionsJob.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/DeterminePartitionsJob.java @@ -19,28 +19,14 @@ package com.metamx.druid.indexer; -import com.google.common.base.Charsets; -import com.google.common.base.Function; -import com.google.common.base.Joiner; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.base.Splitter; -import com.google.common.collect.Iterables; -import com.google.common.collect.Iterators; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.PeekingIterator; -import com.google.common.io.Closeables; -import com.metamx.common.IAE; -import com.metamx.common.Pair; -import com.metamx.common.guava.nary.BinaryFn; -import com.metamx.common.logger.Logger; -import com.metamx.common.parsers.Parser; -import com.metamx.common.parsers.ParserUtils; -import com.metamx.druid.CombiningIterable; -import com.metamx.druid.shard.NoneShardSpec; -import com.metamx.druid.shard.ShardSpec; -import com.metamx.druid.shard.SingleDimensionShardSpec; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -63,13 +49,28 @@ import org.joda.time.DateTimeComparator; import org.joda.time.Interval; -import java.io.IOException; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import com.google.common.base.Charsets; +import com.google.common.base.Function; +import com.google.common.base.Joiner; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.base.Splitter; +import com.google.common.collect.Iterables; +import com.google.common.collect.Iterators; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.PeekingIterator; +import com.google.common.io.Closeables; +import com.metamx.common.IAE; +import com.metamx.common.Pair; +import com.metamx.common.guava.nary.BinaryFn; +import com.metamx.common.logger.Logger; +import com.metamx.common.parsers.Parser; +import com.metamx.common.parsers.ParserUtils; +import com.metamx.druid.CombiningIterable; +import com.metamx.druid.shard.NoneShardSpec; +import com.metamx.druid.shard.ShardSpec; +import com.metamx.druid.shard.SingleDimensionShardSpec; /** */ diff --git a/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexer.java b/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexer.java index d8abc55cf310..3bc89a56c063 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexer.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexer.java @@ -19,17 +19,18 @@ package com.metamx.druid.indexer; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.metamx.common.Pair; -import com.metamx.druid.jackson.DefaultObjectMapper; +import java.io.File; +import java.util.Arrays; +import java.util.List; + import org.codehaus.jackson.map.ObjectMapper; import org.joda.time.DateTime; import org.joda.time.Interval; -import java.io.File; -import java.util.Arrays; -import java.util.List; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.metamx.common.Pair; +import com.metamx.druid.jackson.DefaultObjectMapper; /** */ diff --git a/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerAzkWrapper.java b/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerAzkWrapper.java index 8d073dd72974..ef099c9564c4 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerAzkWrapper.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerAzkWrapper.java @@ -19,20 +19,18 @@ package com.metamx.druid.indexer; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.metamx.common.Granularity; import com.metamx.common.MapUtils; import com.metamx.common.logger.Logger; -import com.metamx.druid.indexer.path.GranularityPathSpec; import com.metamx.druid.jackson.DefaultObjectMapper; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Properties; /** */ diff --git a/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java b/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java index bcc393829b54..bd8ebf4fbc8c 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java @@ -19,6 +19,23 @@ package com.metamx.druid.indexer; +import java.io.IOException; +import java.nio.charset.Charset; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.mapreduce.Job; +import org.codehaus.jackson.JsonGenerator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.codehaus.jackson.map.ObjectMapper; +import org.joda.time.DateTime; +import org.joda.time.Interval; +import org.joda.time.format.ISODateTimeFormat; + import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Optional; @@ -40,22 +57,6 @@ import com.metamx.druid.jackson.DefaultObjectMapper; import com.metamx.druid.shard.ShardSpec; import com.metamx.druid.utils.JodaUtils; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.mapreduce.Job; -import org.codehaus.jackson.JsonGenerator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.ObjectMapper; -import org.joda.time.DateTime; -import org.joda.time.Interval; -import org.joda.time.format.ISODateTimeFormat; - -import java.io.IOException; -import java.nio.charset.Charset; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; /** */ diff --git a/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerJob.java b/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerJob.java index eae1bfa885d9..9c1d80edd754 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerJob.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerJob.java @@ -19,6 +19,17 @@ package com.metamx.druid.indexer; +import java.io.IOException; +import java.util.List; +import java.util.Map; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.mapreduce.Job; +import org.joda.time.DateTime; +import org.joda.time.DateTimeComparator; +import org.joda.time.Interval; + import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.Lists; @@ -27,16 +38,6 @@ import com.metamx.common.logger.Logger; import com.metamx.druid.client.DataSegment; import com.metamx.druid.shard.NoneShardSpec; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.mapreduce.Job; -import org.joda.time.DateTime; -import org.joda.time.DateTimeComparator; -import org.joda.time.Interval; - -import java.io.IOException; -import java.util.List; -import java.util.Map; /** */ diff --git a/indexer/src/main/java/com/metamx/druid/indexer/HadoopIOPeon.java b/indexer/src/main/java/com/metamx/druid/indexer/HadoopIOPeon.java index 21f816f4aba0..2af3b200b56e 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/HadoopIOPeon.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/HadoopIOPeon.java @@ -19,14 +19,15 @@ package com.metamx.druid.indexer; -import com.metamx.druid.kv.IOPeon; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.mapreduce.JobContext; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.mapreduce.JobContext; + +import com.metamx.druid.kv.IOPeon; + /** */ class HadoopIOPeon implements IOPeon diff --git a/indexer/src/main/java/com/metamx/druid/indexer/HadoopyShardSpec.java b/indexer/src/main/java/com/metamx/druid/indexer/HadoopyShardSpec.java index d7f40087ba89..59c2591fb3a5 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/HadoopyShardSpec.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/HadoopyShardSpec.java @@ -19,10 +19,11 @@ package com.metamx.druid.indexer; -import com.metamx.druid.shard.ShardSpec; import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; +import com.metamx.druid.shard.ShardSpec; + /** * ShardSpec + a shard ID that is unique across this run. The shard ID is used for grouping and partitioning. * There is one HadoopyShardSpec per Bucket, and our shardNum matches the Bucket shardNum. diff --git a/indexer/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java b/indexer/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java index c1c4578acefe..af0cb283c3f9 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java @@ -19,6 +19,46 @@ package com.metamx.druid.indexer; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.nio.ByteBuffer; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +import javax.annotation.Nullable; + +import org.apache.commons.io.FileUtils; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FSDataOutputStream; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.LocalFileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.fs.s3native.NativeS3FileSystem; +import org.apache.hadoop.io.BytesWritable; +import org.apache.hadoop.io.LongWritable; +import org.apache.hadoop.io.Text; +import org.apache.hadoop.mapred.InvalidJobConfException; +import org.apache.hadoop.mapreduce.Counter; +import org.apache.hadoop.mapreduce.Job; +import org.apache.hadoop.mapreduce.JobContext; +import org.apache.hadoop.mapreduce.Mapper; +import org.apache.hadoop.mapreduce.Partitioner; +import org.apache.hadoop.mapreduce.Reducer; +import org.apache.hadoop.mapreduce.lib.input.TextInputFormat; +import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; +import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat; +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Predicate; @@ -28,7 +68,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.google.common.hash.Hashing; import com.google.common.io.Closeables; import com.google.common.primitives.Longs; import com.metamx.common.ISE; @@ -43,48 +82,9 @@ import com.metamx.druid.index.v1.IndexIO; import com.metamx.druid.index.v1.IndexMerger; import com.metamx.druid.index.v1.MMappedIndex; -import com.metamx.druid.index.v1.serde.ComplexMetrics; -import com.metamx.druid.input.MapBasedInputRow; import com.metamx.druid.indexer.rollup.DataRollupSpec; +import com.metamx.druid.input.MapBasedInputRow; import com.metamx.druid.jackson.DefaultObjectMapper; -import org.apache.commons.io.FileUtils; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FSDataOutputStream; -import org.apache.hadoop.fs.FileStatus; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.LocalFileSystem; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.fs.s3native.NativeS3FileSystem; -import org.apache.hadoop.io.BytesWritable; -import org.apache.hadoop.io.LongWritable; -import org.apache.hadoop.io.Text; -import org.apache.hadoop.mapred.InvalidJobConfException; -import org.apache.hadoop.mapreduce.Counter; -import org.apache.hadoop.mapreduce.Job; -import org.apache.hadoop.mapreduce.JobContext; -import org.apache.hadoop.mapreduce.Mapper; -import org.apache.hadoop.mapreduce.Partitioner; -import org.apache.hadoop.mapreduce.Reducer; -import org.apache.hadoop.mapreduce.lib.input.TextInputFormat; -import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; -import org.apache.hadoop.mapreduce.lib.output.TextOutputFormat; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import javax.annotation.Nullable; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.nio.ByteBuffer; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; /** */ diff --git a/indexer/src/main/java/com/metamx/druid/indexer/SortableBytes.java b/indexer/src/main/java/com/metamx/druid/indexer/SortableBytes.java index 3abaa7951b8a..c5e58c7b4524 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/SortableBytes.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/SortableBytes.java @@ -19,14 +19,15 @@ package com.metamx.druid.indexer; -import com.google.common.base.Charsets; +import java.nio.ByteBuffer; +import java.util.Arrays; + import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.WritableComparator; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.Partitioner; -import java.nio.ByteBuffer; -import java.util.Arrays; +import com.google.common.base.Charsets; /** */ diff --git a/indexer/src/main/java/com/metamx/druid/indexer/StringIntervalFunction.java b/indexer/src/main/java/com/metamx/druid/indexer/StringIntervalFunction.java index f47075863aed..c5afc4a0928b 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/StringIntervalFunction.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/StringIntervalFunction.java @@ -19,9 +19,10 @@ package com.metamx.druid.indexer; -import com.google.common.base.Function; import org.joda.time.Interval; +import com.google.common.base.Function; + /** */ class StringIntervalFunction implements Function diff --git a/indexer/src/main/java/com/metamx/druid/indexer/Utils.java b/indexer/src/main/java/com/metamx/druid/indexer/Utils.java index aa1c3ed2f4b4..38a3d42c28e5 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/Utils.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/Utils.java @@ -19,10 +19,13 @@ package com.metamx.druid.indexer; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterators; -import com.metamx.common.ISE; -import com.metamx.druid.jackson.DefaultObjectMapper; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.compress.CompressionCodec; @@ -33,12 +36,10 @@ import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.type.TypeReference; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import com.google.common.base.Preconditions; +import com.google.common.collect.Iterators; +import com.metamx.common.ISE; +import com.metamx.druid.jackson.DefaultObjectMapper; /** */ diff --git a/indexer/src/main/java/com/metamx/druid/indexer/ZkUpdaterJob.java b/indexer/src/main/java/com/metamx/druid/indexer/ZkUpdaterJob.java index cd2ed44bd59a..27c3792e9d38 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/ZkUpdaterJob.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/ZkUpdaterJob.java @@ -19,6 +19,12 @@ package com.metamx.druid.indexer; +import org.I0Itec.zkclient.ZkClient; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.codehaus.jackson.map.ObjectMapper; +import org.joda.time.DateTime; + import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.metamx.common.lifecycle.Lifecycle; @@ -28,11 +34,6 @@ import com.metamx.druid.initialization.Initialization; import com.metamx.druid.initialization.ZkClientConfig; import com.metamx.druid.jackson.DefaultObjectMapper; -import org.I0Itec.zkclient.ZkClient; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.Path; -import org.codehaus.jackson.map.ObjectMapper; -import org.joda.time.DateTime; /** */ diff --git a/indexer/src/main/java/com/metamx/druid/indexer/granularity/ArbitraryGranularitySpec.java b/indexer/src/main/java/com/metamx/druid/indexer/granularity/ArbitraryGranularitySpec.java index 151055271ecb..7b798e661eba 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/granularity/ArbitraryGranularitySpec.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/granularity/ArbitraryGranularitySpec.java @@ -19,19 +19,20 @@ package com.metamx.druid.indexer.granularity; -import com.google.common.base.Optional; -import com.google.common.collect.Iterators; -import com.google.common.collect.PeekingIterator; -import com.google.common.collect.Sets; -import com.metamx.common.guava.Comparators; +import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; import org.joda.time.DateTime; import org.joda.time.Interval; -import java.util.List; -import java.util.SortedSet; -import java.util.TreeSet; +import com.google.common.base.Optional; +import com.google.common.collect.Iterators; +import com.google.common.collect.PeekingIterator; +import com.google.common.collect.Sets; +import com.metamx.common.guava.Comparators; public class ArbitraryGranularitySpec implements GranularitySpec { diff --git a/indexer/src/main/java/com/metamx/druid/indexer/granularity/GranularitySpec.java b/indexer/src/main/java/com/metamx/druid/indexer/granularity/GranularitySpec.java index 30ce2df1171a..8357b5150cf9 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/granularity/GranularitySpec.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/granularity/GranularitySpec.java @@ -19,13 +19,14 @@ package com.metamx.druid.indexer.granularity; -import com.google.common.base.Optional; +import java.util.SortedSet; + import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; import org.joda.time.DateTime; import org.joda.time.Interval; -import java.util.SortedSet; +import com.google.common.base.Optional; /** * Tells the indexer how to group events based on timestamp. The events may then be further partitioned based diff --git a/indexer/src/main/java/com/metamx/druid/indexer/granularity/UniformGranularitySpec.java b/indexer/src/main/java/com/metamx/druid/indexer/granularity/UniformGranularitySpec.java index a1039caba1c4..538d2bdd2bc7 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/granularity/UniformGranularitySpec.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/granularity/UniformGranularitySpec.java @@ -19,18 +19,19 @@ package com.metamx.druid.indexer.granularity; -import com.google.common.base.Optional; -import com.google.common.collect.Sets; -import com.metamx.common.Granularity; -import com.metamx.common.guava.Comparators; +import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; import org.joda.time.DateTime; import org.joda.time.Interval; -import java.util.List; -import java.util.SortedSet; -import java.util.TreeSet; +import com.google.common.base.Optional; +import com.google.common.collect.Sets; +import com.metamx.common.Granularity; +import com.metamx.common.guava.Comparators; public class UniformGranularitySpec implements GranularitySpec { diff --git a/indexer/src/main/java/com/metamx/druid/indexer/hadoop/FSSpideringIterator.java b/indexer/src/main/java/com/metamx/druid/indexer/hadoop/FSSpideringIterator.java index a67e03c749cc..b105bef9f437 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/hadoop/FSSpideringIterator.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/hadoop/FSSpideringIterator.java @@ -19,14 +19,14 @@ package com.metamx.druid.indexer.hadoop; -import org.apache.hadoop.fs.FileStatus; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.Path; - import java.io.IOException; import java.util.Iterator; import java.util.NoSuchElementException; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; + /** */ public class FSSpideringIterator implements Iterator diff --git a/indexer/src/main/java/com/metamx/druid/indexer/path/GranularUnprocessedPathSpec.java b/indexer/src/main/java/com/metamx/druid/indexer/path/GranularUnprocessedPathSpec.java index 47e1676f848b..9c30b0ad0313 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/path/GranularUnprocessedPathSpec.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/path/GranularUnprocessedPathSpec.java @@ -19,29 +19,27 @@ package com.metamx.druid.indexer.path; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import com.metamx.common.Granularity; -import com.metamx.common.guava.Comparators; -import com.metamx.druid.common.s3.S3Utils; -import com.metamx.druid.indexer.HadoopDruidIndexerConfig; -import com.metamx.druid.indexer.granularity.UniformGranularitySpec; -import com.metamx.druid.indexer.hadoop.FSSpideringIterator; +import java.io.IOException; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapreduce.Job; import org.codehaus.jackson.annotate.JsonProperty; -import org.jets3t.service.model.S3Object; import org.joda.time.DateTime; import org.joda.time.Interval; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import com.metamx.common.Granularity; +import com.metamx.common.guava.Comparators; +import com.metamx.druid.indexer.HadoopDruidIndexerConfig; +import com.metamx.druid.indexer.granularity.UniformGranularitySpec; +import com.metamx.druid.indexer.hadoop.FSSpideringIterator; /** */ diff --git a/indexer/src/main/java/com/metamx/druid/indexer/path/GranularityPathSpec.java b/indexer/src/main/java/com/metamx/druid/indexer/path/GranularityPathSpec.java index aeca725bd1cb..2359b4ec8d50 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/path/GranularityPathSpec.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/path/GranularityPathSpec.java @@ -19,12 +19,10 @@ package com.metamx.druid.indexer.path; -import com.google.common.collect.Sets; -import com.metamx.common.Granularity; -import com.metamx.common.guava.Comparators; -import com.metamx.common.logger.Logger; -import com.metamx.druid.indexer.HadoopDruidIndexerConfig; -import com.metamx.druid.indexer.hadoop.FSSpideringIterator; +import java.io.IOException; +import java.util.Set; +import java.util.regex.Pattern; + import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -36,9 +34,12 @@ import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; -import java.io.IOException; -import java.util.Set; -import java.util.regex.Pattern; +import com.google.common.collect.Sets; +import com.metamx.common.Granularity; +import com.metamx.common.guava.Comparators; +import com.metamx.common.logger.Logger; +import com.metamx.druid.indexer.HadoopDruidIndexerConfig; +import com.metamx.druid.indexer.hadoop.FSSpideringIterator; /** */ diff --git a/indexer/src/main/java/com/metamx/druid/indexer/path/PathSpec.java b/indexer/src/main/java/com/metamx/druid/indexer/path/PathSpec.java index 776f51c99bd2..4c991624129f 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/path/PathSpec.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/path/PathSpec.java @@ -19,12 +19,13 @@ package com.metamx.druid.indexer.path; -import com.metamx.druid.indexer.HadoopDruidIndexerConfig; +import java.io.IOException; + import org.apache.hadoop.mapreduce.Job; import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; -import java.io.IOException; +import com.metamx.druid.indexer.HadoopDruidIndexerConfig; /** */ diff --git a/indexer/src/main/java/com/metamx/druid/indexer/path/StaticPathSpec.java b/indexer/src/main/java/com/metamx/druid/indexer/path/StaticPathSpec.java index f46135c32cc1..6630fd841592 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/path/StaticPathSpec.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/path/StaticPathSpec.java @@ -19,13 +19,14 @@ package com.metamx.druid.indexer.path; -import com.metamx.common.logger.Logger; -import com.metamx.druid.indexer.HadoopDruidIndexerConfig; +import java.io.IOException; + import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; import org.codehaus.jackson.annotate.JsonProperty; -import java.io.IOException; +import com.metamx.common.logger.Logger; +import com.metamx.druid.indexer.HadoopDruidIndexerConfig; /** * Class uses public fields to work around http://jira.codehaus.org/browse/MSHADE-92 diff --git a/indexer/src/main/java/com/metamx/druid/indexer/rollup/DataRollupSpec.java b/indexer/src/main/java/com/metamx/druid/indexer/rollup/DataRollupSpec.java index e2e1f9ce032b..467105124229 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/rollup/DataRollupSpec.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/rollup/DataRollupSpec.java @@ -19,12 +19,12 @@ package com.metamx.druid.indexer.rollup; -import com.metamx.common.Granularity; -import com.metamx.druid.QueryGranularity; -import com.metamx.druid.aggregation.AggregatorFactory; +import java.util.List; + import org.codehaus.jackson.annotate.JsonProperty; -import java.util.List; +import com.metamx.druid.QueryGranularity; +import com.metamx.druid.aggregation.AggregatorFactory; /** * Class uses public fields to work around http://jira.codehaus.org/browse/MSHADE-92 diff --git a/indexer/src/main/java/com/metamx/druid/indexer/updater/DbUpdaterJobSpec.java b/indexer/src/main/java/com/metamx/druid/indexer/updater/DbUpdaterJobSpec.java index 489a8e94931c..60b82069b535 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/updater/DbUpdaterJobSpec.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/updater/DbUpdaterJobSpec.java @@ -19,9 +19,10 @@ package com.metamx.druid.indexer.updater; -import com.metamx.druid.db.DbConnectorConfig; import org.codehaus.jackson.annotate.JsonProperty; +import com.metamx.druid.db.DbConnectorConfig; + /** */ public class DbUpdaterJobSpec extends DbConnectorConfig implements UpdaterJobSpec diff --git a/indexer/src/main/java/com/metamx/druid/indexer/updater/UpdaterJobSpec.java b/indexer/src/main/java/com/metamx/druid/indexer/updater/UpdaterJobSpec.java index 4818e4c99a96..3523a198ba67 100644 --- a/indexer/src/main/java/com/metamx/druid/indexer/updater/UpdaterJobSpec.java +++ b/indexer/src/main/java/com/metamx/druid/indexer/updater/UpdaterJobSpec.java @@ -19,8 +19,6 @@ package com.metamx.druid.indexer.updater; -import com.metamx.druid.indexer.DbUpdaterJob; -import com.metamx.druid.indexer.ZkUpdaterJob; import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; diff --git a/merger/src/main/java/com/metamx/druid/merger/common/TaskHolder.java b/merger/src/main/java/com/metamx/druid/merger/common/TaskHolder.java index d9479a7dbbfd..02928bb4a92d 100644 --- a/merger/src/main/java/com/metamx/druid/merger/common/TaskHolder.java +++ b/merger/src/main/java/com/metamx/druid/merger/common/TaskHolder.java @@ -19,11 +19,12 @@ package com.metamx.druid.merger.common; -import com.metamx.druid.merger.common.task.Task; -import com.metamx.druid.merger.coordinator.TaskContext; import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; +import com.metamx.druid.merger.common.task.Task; +import com.metamx.druid.merger.coordinator.TaskContext; + /** */ public class TaskHolder diff --git a/merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java b/merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java index 39b38a18a931..78ed44ec8606 100644 --- a/merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java +++ b/merger/src/main/java/com/metamx/druid/merger/common/TaskStatus.java @@ -19,16 +19,17 @@ package com.metamx.druid.merger.common; +import java.util.Collections; +import java.util.List; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.metamx.druid.client.DataSegment; import com.metamx.druid.merger.common.task.Task; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - -import java.util.Collections; -import java.util.List; public class TaskStatus { diff --git a/merger/src/main/java/com/metamx/druid/merger/common/TaskToolbox.java b/merger/src/main/java/com/metamx/druid/merger/common/TaskToolbox.java index e631db0eea22..9a5df0926d63 100644 --- a/merger/src/main/java/com/metamx/druid/merger/common/TaskToolbox.java +++ b/merger/src/main/java/com/metamx/druid/merger/common/TaskToolbox.java @@ -19,6 +19,12 @@ package com.metamx.druid.merger.common; +import java.io.File; +import java.util.Map; + +import org.codehaus.jackson.map.ObjectMapper; +import org.jets3t.service.impl.rest.httpclient.RestS3Service; + import com.google.common.collect.ImmutableMap; import com.metamx.druid.loading.S3SegmentGetter; import com.metamx.druid.loading.S3SegmentGetterConfig; @@ -28,11 +34,6 @@ import com.metamx.druid.merger.coordinator.config.IndexerCoordinatorConfig; import com.metamx.druid.realtime.SegmentPusher; import com.metamx.emitter.service.ServiceEmitter; -import org.codehaus.jackson.map.ObjectMapper; -import org.jets3t.service.impl.rest.httpclient.RestS3Service; - -import java.io.File; -import java.util.Map; /** * Stuff that may be needed by a Task in order to conduct its business. diff --git a/merger/src/main/java/com/metamx/druid/merger/common/index/StaticS3FirehoseFactory.java b/merger/src/main/java/com/metamx/druid/merger/common/index/StaticS3FirehoseFactory.java index 28b78f78ad6a..3e1a068a88b9 100644 --- a/merger/src/main/java/com/metamx/druid/merger/common/index/StaticS3FirehoseFactory.java +++ b/merger/src/main/java/com/metamx/druid/merger/common/index/StaticS3FirehoseFactory.java @@ -19,6 +19,25 @@ package com.metamx.druid.merger.common.index; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URI; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.Queue; +import java.util.zip.GZIPInputStream; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.io.LineIterator; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.codehaus.jackson.annotate.JsonTypeName; +import org.codehaus.jackson.map.annotate.JacksonInject; +import org.jets3t.service.S3Service; +import org.jets3t.service.model.S3Object; + import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; @@ -29,24 +48,6 @@ import com.metamx.druid.input.InputRow; import com.metamx.druid.realtime.Firehose; import com.metamx.druid.realtime.FirehoseFactory; -import org.apache.commons.io.IOUtils; -import org.apache.commons.io.LineIterator; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.annotate.JsonTypeName; -import org.codehaus.jackson.map.annotate.JacksonInject; -import org.jets3t.service.S3Service; -import org.jets3t.service.model.S3Object; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URI; -import java.util.List; -import java.util.NoSuchElementException; -import java.util.Queue; -import java.util.zip.GZIPInputStream; /** * Builds firehoses that read from a predefined list of S3 objects and then dry up. diff --git a/merger/src/main/java/com/metamx/druid/merger/common/index/YeOldePlumberSchool.java b/merger/src/main/java/com/metamx/druid/merger/common/index/YeOldePlumberSchool.java index 4ece129f49b9..286244449843 100644 --- a/merger/src/main/java/com/metamx/druid/merger/common/index/YeOldePlumberSchool.java +++ b/merger/src/main/java/com/metamx/druid/merger/common/index/YeOldePlumberSchool.java @@ -19,6 +19,16 @@ package com.metamx.druid.merger.common.index; +import java.io.File; +import java.util.List; +import java.util.Set; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.codehaus.jackson.annotate.JsonTypeName; +import org.codehaus.jackson.map.annotate.JacksonInject; +import org.joda.time.Interval; + import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.Iterables; @@ -38,15 +48,6 @@ import com.metamx.druid.realtime.Schema; import com.metamx.druid.realtime.SegmentPusher; import com.metamx.druid.realtime.Sink; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.annotate.JsonTypeName; -import org.codehaus.jackson.map.annotate.JacksonInject; -import org.joda.time.Interval; - -import java.io.File; -import java.util.List; -import java.util.Set; /** * Trains plumbers that create a single historical segment. diff --git a/merger/src/main/java/com/metamx/druid/merger/common/task/AbstractTask.java b/merger/src/main/java/com/metamx/druid/merger/common/task/AbstractTask.java index 6de3eb0d73ff..d176b8e76c5e 100644 --- a/merger/src/main/java/com/metamx/druid/merger/common/task/AbstractTask.java +++ b/merger/src/main/java/com/metamx/druid/merger/common/task/AbstractTask.java @@ -19,13 +19,14 @@ package com.metamx.druid.merger.common.task; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.joda.time.Interval; + import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.metamx.druid.merger.common.TaskStatus; import com.metamx.druid.merger.coordinator.TaskContext; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.joda.time.Interval; public abstract class AbstractTask implements Task { diff --git a/merger/src/main/java/com/metamx/druid/merger/common/task/AppendTask.java b/merger/src/main/java/com/metamx/druid/merger/common/task/AppendTask.java index f9898070aa1d..a7ef651b4c73 100644 --- a/merger/src/main/java/com/metamx/druid/merger/common/task/AppendTask.java +++ b/merger/src/main/java/com/metamx/druid/merger/common/task/AppendTask.java @@ -19,6 +19,16 @@ package com.metamx.druid.merger.common.task; +import java.io.File; +import java.util.List; +import java.util.Map; + +import javax.annotation.Nullable; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; @@ -33,14 +43,6 @@ import com.metamx.druid.index.v1.MMappedIndexAdapter; import com.metamx.druid.index.v1.Rowboat; import com.metamx.druid.index.v1.RowboatFilteringIndexAdapter; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.joda.time.Interval; - -import javax.annotation.Nullable; -import java.io.File; -import java.util.List; -import java.util.Map; /** */ diff --git a/merger/src/main/java/com/metamx/druid/merger/common/task/DefaultMergeTask.java b/merger/src/main/java/com/metamx/druid/merger/common/task/DefaultMergeTask.java index 6dfc95c22711..7273dfda4634 100644 --- a/merger/src/main/java/com/metamx/druid/merger/common/task/DefaultMergeTask.java +++ b/merger/src/main/java/com/metamx/druid/merger/common/task/DefaultMergeTask.java @@ -19,6 +19,15 @@ package com.metamx.druid.merger.common.task; +import java.io.File; +import java.util.List; +import java.util.Map; + +import javax.annotation.Nullable; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + import com.google.common.base.Function; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; @@ -28,13 +37,6 @@ import com.metamx.druid.index.v1.IndexIO; import com.metamx.druid.index.v1.IndexMerger; import com.metamx.druid.index.v1.MMappedIndex; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - -import javax.annotation.Nullable; -import java.io.File; -import java.util.List; -import java.util.Map; /** */ diff --git a/merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java b/merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java index 3127a5c5c900..68145fcadf23 100644 --- a/merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java +++ b/merger/src/main/java/com/metamx/druid/merger/common/task/DeleteTask.java @@ -19,6 +19,14 @@ package com.metamx.druid.merger.common.task; +import java.io.File; +import java.util.ArrayList; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.collect.Lists; import com.metamx.common.logger.Logger; import com.metamx.druid.QueryGranularity; @@ -28,19 +36,10 @@ import com.metamx.druid.index.v1.IncrementalIndexAdapter; import com.metamx.druid.index.v1.IndexMerger; import com.metamx.druid.index.v1.IndexableAdapter; -import com.metamx.druid.jackson.DefaultObjectMapper; import com.metamx.druid.merger.common.TaskStatus; import com.metamx.druid.merger.common.TaskToolbox; import com.metamx.druid.merger.coordinator.TaskContext; import com.metamx.druid.shard.NoneShardSpec; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.ObjectMapper; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import java.io.File; -import java.util.ArrayList; public class DeleteTask extends AbstractTask { diff --git a/merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java b/merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java index 55edfdbc3bc9..739a11f95ae9 100644 --- a/merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java +++ b/merger/src/main/java/com/metamx/druid/merger/common/task/IndexDeterminePartitionsTask.java @@ -19,8 +19,15 @@ package com.metamx.druid.merger.common.task; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.joda.time.Interval; + import com.google.common.base.Function; -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; @@ -38,14 +45,6 @@ import com.metamx.druid.shard.NoneShardSpec; import com.metamx.druid.shard.ShardSpec; import com.metamx.druid.shard.SingleDimensionShardSpec; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.joda.time.Interval; - -import javax.annotation.Nullable; -import java.util.List; -import java.util.Map; -import java.util.Set; public class IndexDeterminePartitionsTask extends AbstractTask { diff --git a/merger/src/main/java/com/metamx/druid/merger/common/task/IndexGeneratorTask.java b/merger/src/main/java/com/metamx/druid/merger/common/task/IndexGeneratorTask.java index 82da5561e24c..9cc097021799 100644 --- a/merger/src/main/java/com/metamx/druid/merger/common/task/IndexGeneratorTask.java +++ b/merger/src/main/java/com/metamx/druid/merger/common/task/IndexGeneratorTask.java @@ -19,10 +19,20 @@ package com.metamx.druid.merger.common.task; +import java.io.File; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CopyOnWriteArrayList; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import com.metamx.common.exception.FormattedException; import com.metamx.common.logger.Logger; import com.metamx.druid.client.DataSegment; import com.metamx.druid.input.InputRow; @@ -37,16 +47,6 @@ import com.metamx.druid.realtime.Schema; import com.metamx.druid.realtime.SegmentPusher; import com.metamx.druid.realtime.Sink; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import java.io.File; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.concurrent.CopyOnWriteArrayList; public class IndexGeneratorTask extends AbstractTask { diff --git a/merger/src/main/java/com/metamx/druid/merger/common/task/IndexTask.java b/merger/src/main/java/com/metamx/druid/merger/common/task/IndexTask.java index 6074765ddbf8..74160fca4b6b 100644 --- a/merger/src/main/java/com/metamx/druid/merger/common/task/IndexTask.java +++ b/merger/src/main/java/com/metamx/druid/merger/common/task/IndexTask.java @@ -19,6 +19,13 @@ package com.metamx.druid.merger.common.task; +import java.util.List; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.metamx.common.logger.Logger; @@ -31,12 +38,6 @@ import com.metamx.druid.realtime.FirehoseFactory; import com.metamx.druid.realtime.Schema; import com.metamx.druid.shard.NoneShardSpec; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import java.util.List; public class IndexTask extends AbstractTask { diff --git a/merger/src/main/java/com/metamx/druid/merger/common/task/MergeTask.java b/merger/src/main/java/com/metamx/druid/merger/common/task/MergeTask.java index db5ff0594dad..94769db1095e 100644 --- a/merger/src/main/java/com/metamx/druid/merger/common/task/MergeTask.java +++ b/merger/src/main/java/com/metamx/druid/merger/common/task/MergeTask.java @@ -19,6 +19,20 @@ package com.metamx.druid.merger.common.task; +import java.io.File; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.annotation.Nullable; + +import org.apache.commons.codec.digest.DigestUtils; +import org.codehaus.jackson.annotate.JsonProperty; +import org.codehaus.jackson.annotate.JsonSubTypes; +import org.codehaus.jackson.annotate.JsonTypeInfo; +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Objects; @@ -42,18 +56,6 @@ import com.metamx.emitter.service.AlertEvent; import com.metamx.emitter.service.ServiceEmitter; import com.metamx.emitter.service.ServiceMetricEvent; -import org.apache.commons.codec.digest.DigestUtils; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.annotate.JsonSubTypes; -import org.codehaus.jackson.annotate.JsonTypeInfo; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import javax.annotation.Nullable; -import java.io.File; -import java.util.List; -import java.util.Map; -import java.util.Set; /** */ diff --git a/merger/src/main/java/com/metamx/druid/merger/common/task/Task.java b/merger/src/main/java/com/metamx/druid/merger/common/task/Task.java index b2059210b58b..c2f7f1a47db4 100644 --- a/merger/src/main/java/com/metamx/druid/merger/common/task/Task.java +++ b/merger/src/main/java/com/metamx/druid/merger/common/task/Task.java @@ -19,17 +19,14 @@ package com.metamx.druid.merger.common.task; -import com.metamx.druid.merger.common.TaskStatus; -import com.metamx.druid.merger.common.TaskToolbox; -import com.metamx.druid.merger.coordinator.TaskContext; -import com.metamx.druid.merger.common.task.IndexDeterminePartitionsTask; -import com.metamx.druid.merger.common.task.IndexGeneratorTask; -import com.metamx.druid.merger.common.task.IndexTask; import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; -import org.joda.time.DateTime; import org.joda.time.Interval; +import com.metamx.druid.merger.common.TaskStatus; +import com.metamx.druid.merger.common.TaskToolbox; +import com.metamx.druid.merger.coordinator.TaskContext; + /** * Represents a task that can run on a worker. Immutable. */ diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/DbTaskStorage.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/DbTaskStorage.java index c1dbce4fc61d..5a494bebc8a8 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/DbTaskStorage.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/DbTaskStorage.java @@ -19,6 +19,15 @@ package com.metamx.druid.merger.coordinator; +import java.util.List; +import java.util.Map; + +import org.codehaus.jackson.map.ObjectMapper; +import org.joda.time.DateTime; +import org.skife.jdbi.v2.DBI; +import org.skife.jdbi.v2.Handle; +import org.skife.jdbi.v2.tweak.HandleCallback; + import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -29,14 +38,6 @@ import com.metamx.druid.merger.common.TaskStatus; import com.metamx.druid.merger.common.task.Task; import com.metamx.druid.merger.coordinator.config.IndexerDbConnectorConfig; -import org.codehaus.jackson.map.ObjectMapper; -import org.joda.time.DateTime; -import org.skife.jdbi.v2.DBI; -import org.skife.jdbi.v2.Handle; -import org.skife.jdbi.v2.tweak.HandleCallback; - -import java.util.List; -import java.util.Map; public class DbTaskStorage implements TaskStorage { diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/LocalTaskRunner.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/LocalTaskRunner.java index fc03504792f5..bad4024710d7 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/LocalTaskRunner.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/LocalTaskRunner.java @@ -19,16 +19,17 @@ package com.metamx.druid.merger.coordinator; +import java.io.File; +import java.util.concurrent.ExecutorService; + +import org.apache.commons.io.FileUtils; + import com.google.common.base.Throwables; import com.metamx.common.lifecycle.LifecycleStop; import com.metamx.common.logger.Logger; import com.metamx.druid.merger.common.TaskStatus; import com.metamx.druid.merger.common.TaskToolbox; import com.metamx.druid.merger.common.task.Task; -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.util.concurrent.ExecutorService; /** * Runs tasks in a JVM thread using an ExecutorService. diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/LocalTaskStorage.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/LocalTaskStorage.java index 16ecd06073f6..9ca8b01505c8 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/LocalTaskStorage.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/LocalTaskStorage.java @@ -19,20 +19,17 @@ package com.metamx.druid.merger.coordinator; +import java.util.List; +import java.util.Map; + import com.google.common.base.Optional; import com.google.common.base.Preconditions; -import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.metamx.common.logger.Logger; import com.metamx.druid.merger.common.TaskStatus; import com.metamx.druid.merger.common.task.Task; -import javax.annotation.Nullable; -import java.util.List; -import java.util.Map; - /** * Implements an in-heap TaskStorage facility, with no persistence across restarts. This class is not * thread safe. diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java index bc53ef0d4f7c..3fe59b0ffa63 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/MergerDBCoordinator.java @@ -19,14 +19,12 @@ package com.metamx.druid.merger.coordinator; -import com.google.common.base.Function; -import com.google.common.collect.Lists; -import com.google.common.collect.Ordering; -import com.metamx.common.logger.Logger; -import com.metamx.druid.TimelineObjectHolder; -import com.metamx.druid.VersionedIntervalTimeline; -import com.metamx.druid.client.DataSegment; -import com.metamx.druid.db.DbConnectorConfig; +import java.io.IOException; +import java.util.List; +import java.util.Map; + +import javax.annotation.Nullable; + import org.codehaus.jackson.map.ObjectMapper; import org.joda.time.DateTime; import org.joda.time.Interval; @@ -35,10 +33,14 @@ import org.skife.jdbi.v2.ResultIterator; import org.skife.jdbi.v2.tweak.HandleCallback; -import javax.annotation.Nullable; -import java.io.IOException; -import java.util.List; -import java.util.Map; +import com.google.common.base.Function; +import com.google.common.collect.Lists; +import com.google.common.collect.Ordering; +import com.metamx.common.logger.Logger; +import com.metamx.druid.TimelineObjectHolder; +import com.metamx.druid.VersionedIntervalTimeline; +import com.metamx.druid.client.DataSegment; +import com.metamx.druid.db.DbConnectorConfig; /** */ diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java index eaf000e5276b..d2843ae68e69 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/RemoteTaskRunner.java @@ -19,6 +19,16 @@ package com.metamx.druid.merger.coordinator; +import java.util.Comparator; +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +import org.apache.zookeeper.CreateMode; +import org.codehaus.jackson.map.ObjectMapper; + import com.google.common.base.Joiner; import com.google.common.base.Throwables; import com.google.common.collect.Maps; @@ -28,7 +38,6 @@ import com.metamx.common.lifecycle.LifecycleStop; import com.metamx.druid.merger.common.TaskHolder; import com.metamx.druid.merger.common.TaskStatus; -import com.metamx.druid.merger.common.TaskToolbox; import com.metamx.druid.merger.common.config.IndexerZkConfig; import com.metamx.druid.merger.common.task.Task; import com.metamx.druid.merger.worker.Worker; @@ -37,15 +46,6 @@ import com.netflix.curator.framework.recipes.cache.PathChildrenCache; import com.netflix.curator.framework.recipes.cache.PathChildrenCacheEvent; import com.netflix.curator.framework.recipes.cache.PathChildrenCacheListener; -import org.apache.zookeeper.CreateMode; -import org.codehaus.jackson.map.ObjectMapper; - -import java.util.Comparator; -import java.util.Map; -import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; /** */ diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/RetryPolicy.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/RetryPolicy.java index 1754e4269774..d10621f9b70c 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/RetryPolicy.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/RetryPolicy.java @@ -19,12 +19,12 @@ package com.metamx.druid.merger.coordinator; +import java.util.List; + import com.google.common.collect.Lists; import com.metamx.druid.merger.coordinator.config.RetryPolicyConfig; import com.metamx.emitter.EmittingLogger; -import java.util.List; - /** */ public class RetryPolicy diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskContext.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskContext.java index fcbb2450cbca..4fceeb5f3080 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskContext.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskContext.java @@ -19,11 +19,12 @@ package com.metamx.druid.merger.coordinator; -import com.metamx.druid.client.DataSegment; +import java.util.Set; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.util.Set; +import com.metamx.druid.client.DataSegment; /** * Information gathered by the coordinator, after acquiring a lock, that may be useful to a task. diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskGroup.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskGroup.java index 85b2ef62a049..b67aa419c8e0 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskGroup.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskGroup.java @@ -19,16 +19,17 @@ package com.metamx.druid.merger.coordinator; +import java.util.Set; +import java.util.TreeSet; + +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import com.metamx.druid.merger.common.task.Task; -import org.joda.time.Interval; - -import java.util.Set; -import java.util.TreeSet; /** * Represents a transaction as well as the lock it holds. Not immutable: the task set can change. diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskInventoryManager.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskInventoryManager.java index c8690bf5c363..fe33155b4092 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskInventoryManager.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskInventoryManager.java @@ -19,6 +19,8 @@ package com.metamx.druid.merger.coordinator; +import java.util.Map; + import com.metamx.common.Pair; import com.metamx.common.logger.Logger; import com.metamx.druid.client.InventoryManagementStrategy; @@ -30,8 +32,6 @@ import com.metamx.phonebook.PhoneBook; import com.metamx.phonebook.PhoneBookPeon; -import java.util.Map; - /** * A simple {@link InventoryManager} that monitors ZK for the creation and deletion of new Workers and the * tasks each worker is assigned. diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskMaster.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskMaster.java index 0481e8f21b69..ceeeeea06964 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskMaster.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskMaster.java @@ -19,6 +19,9 @@ package com.metamx.druid.merger.coordinator; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.ReentrantLock; + import com.google.common.base.Throwables; import com.metamx.common.lifecycle.Lifecycle; import com.metamx.common.lifecycle.LifecycleStart; @@ -34,9 +37,6 @@ import com.netflix.curator.framework.recipes.leader.LeaderSelectorListener; import com.netflix.curator.framework.state.ConnectionState; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.ReentrantLock; - /** * Encapsulates the indexer leadership lifecycle. */ diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskQueue.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskQueue.java index f674b8744cde..2f79d7213090 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskQueue.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskQueue.java @@ -19,6 +19,20 @@ package com.metamx.druid.merger.coordinator; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.NavigableMap; +import java.util.NavigableSet; +import java.util.TreeMap; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.ReentrantLock; + +import javax.annotation.Nullable; + +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -27,7 +41,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; -import com.google.common.primitives.Booleans; import com.metamx.common.Pair; import com.metamx.common.guava.Comparators; import com.metamx.common.guava.FunctionalIterable; @@ -37,18 +50,6 @@ import com.metamx.druid.client.DataSegment; import com.metamx.druid.merger.common.TaskStatus; import com.metamx.druid.merger.common.task.Task; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import javax.annotation.Nullable; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.NavigableMap; -import java.util.NavigableSet; -import java.util.TreeMap; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.ReentrantLock; /** * Interface between task producers and task consumers. diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskStorage.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskStorage.java index 13308db86a20..ae988c44647c 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskStorage.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/TaskStorage.java @@ -19,12 +19,12 @@ package com.metamx.druid.merger.coordinator; +import java.util.List; + import com.google.common.base.Optional; import com.metamx.druid.merger.common.TaskStatus; import com.metamx.druid.merger.common.task.Task; -import java.util.List; - public interface TaskStorage { /** diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/config/IndexerCoordinatorConfig.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/config/IndexerCoordinatorConfig.java index 18f317525fe7..11f9d90fdd97 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/config/IndexerCoordinatorConfig.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/config/IndexerCoordinatorConfig.java @@ -19,14 +19,15 @@ package com.metamx.druid.merger.coordinator.config; -import com.google.common.base.Splitter; -import com.google.common.collect.ImmutableSet; -import com.metamx.druid.merger.common.task.Task; +import java.io.File; +import java.util.Set; + import org.skife.config.Config; import org.skife.config.Default; -import java.io.File; -import java.util.Set; +import com.google.common.base.Splitter; +import com.google.common.collect.ImmutableSet; +import com.metamx.druid.merger.common.task.Task; /** */ diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/config/IndexerDbConnectorConfig.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/config/IndexerDbConnectorConfig.java index 26f0105771de..36b090c1673e 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/config/IndexerDbConnectorConfig.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/config/IndexerDbConnectorConfig.java @@ -19,10 +19,11 @@ package com.metamx.druid.merger.coordinator.config; -import com.metamx.druid.db.DbConnectorConfig; import org.codehaus.jackson.annotate.JsonProperty; import org.skife.config.Config; +import com.metamx.druid.db.DbConnectorConfig; + public abstract class IndexerDbConnectorConfig extends DbConnectorConfig { @JsonProperty("taskTable") diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/exec/TaskConsumer.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/exec/TaskConsumer.java index be2bca53fbbd..594fcf3da38e 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/exec/TaskConsumer.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/exec/TaskConsumer.java @@ -24,7 +24,6 @@ import com.google.common.collect.ImmutableSet; import com.metamx.common.lifecycle.LifecycleStart; import com.metamx.common.lifecycle.LifecycleStop; -import com.metamx.common.logger.Logger; import com.metamx.druid.client.DataSegment; import com.metamx.druid.merger.common.TaskStatus; import com.metamx.druid.merger.common.task.Task; @@ -39,8 +38,6 @@ import com.metamx.emitter.service.ServiceEmitter; import com.metamx.emitter.service.ServiceMetricEvent; -import java.util.concurrent.ExecutorService; - public class TaskConsumer implements Runnable { private final TaskQueue queue; diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java index 6da4c491897f..4c76224dd144 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorNode.java @@ -19,6 +19,26 @@ package com.metamx.druid.merger.coordinator.http; +import java.net.URL; +import java.util.List; +import java.util.Properties; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; + +import org.I0Itec.zkclient.ZkClient; +import org.codehaus.jackson.map.InjectableValues; +import org.codehaus.jackson.map.ObjectMapper; +import org.jets3t.service.S3ServiceException; +import org.jets3t.service.impl.rest.httpclient.RestS3Service; +import org.jets3t.service.security.AWSCredentials; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.servlet.Context; +import org.mortbay.jetty.servlet.DefaultServlet; +import org.mortbay.jetty.servlet.FilterHolder; +import org.mortbay.jetty.servlet.ServletHolder; +import org.skife.config.ConfigurationObjectFactory; + import com.google.common.base.Charsets; import com.google.common.base.Throwables; import com.google.common.collect.Lists; @@ -80,25 +100,6 @@ import com.metamx.metrics.SysMonitor; import com.metamx.phonebook.PhoneBook; import com.netflix.curator.framework.CuratorFramework; -import org.I0Itec.zkclient.ZkClient; -import org.codehaus.jackson.map.InjectableValues; -import org.codehaus.jackson.map.ObjectMapper; -import org.jets3t.service.S3ServiceException; -import org.jets3t.service.impl.rest.httpclient.RestS3Service; -import org.jets3t.service.security.AWSCredentials; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.DefaultServlet; -import org.mortbay.jetty.servlet.FilterHolder; -import org.mortbay.jetty.servlet.ServletHolder; -import org.skife.config.ConfigurationObjectFactory; - -import java.net.URL; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; /** */ diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorResource.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorResource.java index 6cf9b0a7c162..a4b27012adbf 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorResource.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorResource.java @@ -19,6 +19,14 @@ package com.metamx.druid.merger.coordinator.http; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Response; + import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; @@ -30,14 +38,6 @@ import com.metamx.druid.merger.coordinator.config.IndexerCoordinatorConfig; import com.metamx.emitter.service.ServiceEmitter; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Response; - /** */ @Path("/mmx/merger/v1") diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorServletModule.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorServletModule.java index 9c657bdc2926..ae478fbf3a9c 100644 --- a/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorServletModule.java +++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorServletModule.java @@ -19,16 +19,17 @@ package com.metamx.druid.merger.coordinator.http; +import javax.inject.Singleton; + +import org.codehaus.jackson.jaxrs.JacksonJsonProvider; +import org.codehaus.jackson.map.ObjectMapper; + import com.google.inject.Provides; import com.metamx.druid.merger.coordinator.TaskQueue; import com.metamx.druid.merger.coordinator.config.IndexerCoordinatorConfig; import com.metamx.emitter.service.ServiceEmitter; import com.sun.jersey.guice.JerseyServletModule; import com.sun.jersey.guice.spi.container.servlet.GuiceContainer; -import org.codehaus.jackson.jaxrs.JacksonJsonProvider; -import org.codehaus.jackson.map.ObjectMapper; - -import javax.inject.Singleton; /** */ diff --git a/merger/src/main/java/com/metamx/druid/merger/worker/TaskMonitor.java b/merger/src/main/java/com/metamx/druid/merger/worker/TaskMonitor.java index b70a6e9c2788..433304e7c457 100644 --- a/merger/src/main/java/com/metamx/druid/merger/worker/TaskMonitor.java +++ b/merger/src/main/java/com/metamx/druid/merger/worker/TaskMonitor.java @@ -19,6 +19,12 @@ package com.metamx.druid.merger.worker; +import java.io.File; +import java.util.concurrent.ExecutorService; + +import org.apache.commons.io.FileUtils; +import org.codehaus.jackson.map.ObjectMapper; + import com.metamx.common.lifecycle.LifecycleStart; import com.metamx.common.lifecycle.LifecycleStop; import com.metamx.druid.merger.common.TaskHolder; @@ -31,11 +37,6 @@ import com.netflix.curator.framework.recipes.cache.PathChildrenCache; import com.netflix.curator.framework.recipes.cache.PathChildrenCacheEvent; import com.netflix.curator.framework.recipes.cache.PathChildrenCacheListener; -import org.apache.commons.io.FileUtils; -import org.codehaus.jackson.map.ObjectMapper; - -import java.io.File; -import java.util.concurrent.ExecutorService; /** * The monitor watches ZK at a specified path for new tasks to appear. Upon starting the monitor, a listener will be diff --git a/merger/src/main/java/com/metamx/druid/merger/worker/Worker.java b/merger/src/main/java/com/metamx/druid/merger/worker/Worker.java index 032febb79b9b..bfeb7209c8c7 100644 --- a/merger/src/main/java/com/metamx/druid/merger/worker/Worker.java +++ b/merger/src/main/java/com/metamx/druid/merger/worker/Worker.java @@ -19,15 +19,16 @@ package com.metamx.druid.merger.worker; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + import com.google.common.collect.ImmutableMap; import com.metamx.common.logger.Logger; import com.metamx.druid.merger.common.TaskStatus; import com.metamx.druid.merger.worker.config.WorkerConfig; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; /** */ diff --git a/merger/src/main/java/com/metamx/druid/merger/worker/WorkerCuratorCoordinator.java b/merger/src/main/java/com/metamx/druid/merger/worker/WorkerCuratorCoordinator.java index 8510a890e1ca..5f04ec393185 100644 --- a/merger/src/main/java/com/metamx/druid/merger/worker/WorkerCuratorCoordinator.java +++ b/merger/src/main/java/com/metamx/druid/merger/worker/WorkerCuratorCoordinator.java @@ -19,6 +19,12 @@ package com.metamx.druid.merger.worker; +import java.util.Arrays; + +import org.apache.zookeeper.CreateMode; +import org.codehaus.jackson.map.ObjectMapper; +import org.joda.time.DateTime; + import com.google.common.base.Joiner; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; @@ -28,11 +34,6 @@ import com.metamx.druid.merger.common.TaskStatus; import com.metamx.druid.merger.common.config.IndexerZkConfig; import com.netflix.curator.framework.CuratorFramework; -import org.apache.zookeeper.CreateMode; -import org.codehaus.jackson.map.ObjectMapper; -import org.joda.time.DateTime; - -import java.util.Arrays; /** * The CuratorCoordinator provides methods to use Curator. Persistent ZK paths are created on {@link #start()}. diff --git a/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java b/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java index ee3888e12e4c..2f45f094b538 100644 --- a/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java +++ b/merger/src/main/java/com/metamx/druid/merger/worker/http/WorkerNode.java @@ -19,6 +19,24 @@ package com.metamx.druid.merger.worker.http; +import java.io.IOException; +import java.util.List; +import java.util.Properties; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; + +import org.codehaus.jackson.map.InjectableValues; +import org.codehaus.jackson.map.ObjectMapper; +import org.jets3t.service.S3ServiceException; +import org.jets3t.service.impl.rest.httpclient.RestS3Service; +import org.jets3t.service.security.AWSCredentials; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.servlet.Context; +import org.mortbay.jetty.servlet.DefaultServlet; +import org.mortbay.jetty.servlet.ServletHolder; +import org.skife.config.ConfigurationObjectFactory; + import com.google.common.collect.Lists; import com.google.inject.servlet.GuiceFilter; import com.metamx.common.concurrent.ScheduledExecutorFactory; @@ -57,23 +75,6 @@ import com.metamx.metrics.SysMonitor; import com.netflix.curator.framework.CuratorFramework; import com.netflix.curator.framework.recipes.cache.PathChildrenCache; -import org.codehaus.jackson.map.InjectableValues; -import org.codehaus.jackson.map.ObjectMapper; -import org.jets3t.service.S3ServiceException; -import org.jets3t.service.impl.rest.httpclient.RestS3Service; -import org.jets3t.service.security.AWSCredentials; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.DefaultServlet; -import org.mortbay.jetty.servlet.ServletHolder; -import org.skife.config.ConfigurationObjectFactory; - -import java.io.IOException; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; /** */ diff --git a/realtime/src/main/java/com/metamx/druid/realtime/FireDepartment.java b/realtime/src/main/java/com/metamx/druid/realtime/FireDepartment.java index b5709de1d6b9..9cb310049c45 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/FireDepartment.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/FireDepartment.java @@ -19,11 +19,11 @@ package com.metamx.druid.realtime; +import java.io.IOException; + import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; -import java.io.IOException; - /** * A Fire Department has a Firehose and a Plumber. * diff --git a/realtime/src/main/java/com/metamx/druid/realtime/FireDepartmentConfig.java b/realtime/src/main/java/com/metamx/druid/realtime/FireDepartmentConfig.java index b2afbbc48845..cb76e1590cb4 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/FireDepartmentConfig.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/FireDepartmentConfig.java @@ -19,10 +19,11 @@ package com.metamx.druid.realtime; -import com.google.common.base.Preconditions; import org.codehaus.jackson.annotate.JsonProperty; import org.joda.time.Period; +import com.google.common.base.Preconditions; + /** */ public class FireDepartmentConfig diff --git a/realtime/src/main/java/com/metamx/druid/realtime/Firehose.java b/realtime/src/main/java/com/metamx/druid/realtime/Firehose.java index e978428e0578..be4c706e6ef8 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/Firehose.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/Firehose.java @@ -19,10 +19,10 @@ package com.metamx.druid.realtime; -import com.metamx.druid.input.InputRow; - import java.io.Closeable; +import com.metamx.druid.input.InputRow; + /** * This is an interface that holds onto the stream of incoming data. Realtime data ingestion is built around this * abstraction. In order to add a new type of source for realtime data ingestion, all you need to do is implement diff --git a/realtime/src/main/java/com/metamx/druid/realtime/FirehoseFactory.java b/realtime/src/main/java/com/metamx/druid/realtime/FirehoseFactory.java index e090e088d08a..181b3aab613b 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/FirehoseFactory.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/FirehoseFactory.java @@ -19,11 +19,11 @@ package com.metamx.druid.realtime; +import java.io.IOException; + import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; -import java.io.IOException; - /** */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") diff --git a/realtime/src/main/java/com/metamx/druid/realtime/KafkaFirehoseFactory.java b/realtime/src/main/java/com/metamx/druid/realtime/KafkaFirehoseFactory.java index 05714ddfdbd5..443c6ad1971a 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/KafkaFirehoseFactory.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/KafkaFirehoseFactory.java @@ -19,20 +19,6 @@ package com.metamx.druid.realtime; -import com.google.common.base.Charsets; -import com.google.common.collect.ImmutableMap; -import com.metamx.common.exception.FormattedException; -import com.metamx.common.logger.Logger; -import com.metamx.druid.indexer.data.StringInputRowParser; -import com.metamx.druid.input.InputRow; -import kafka.consumer.Consumer; -import kafka.consumer.ConsumerConfig; -import kafka.consumer.KafkaMessageStream; -import kafka.javaapi.consumer.ConsumerConnector; -import kafka.message.Message; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - import java.io.IOException; import java.nio.CharBuffer; import java.nio.charset.CoderResult; @@ -42,6 +28,22 @@ import java.util.Map; import java.util.Properties; +import kafka.consumer.Consumer; +import kafka.consumer.ConsumerConfig; +import kafka.consumer.KafkaMessageStream; +import kafka.javaapi.consumer.ConsumerConnector; +import kafka.message.Message; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + +import com.google.common.base.Charsets; +import com.google.common.collect.ImmutableMap; +import com.metamx.common.exception.FormattedException; +import com.metamx.common.logger.Logger; +import com.metamx.druid.indexer.data.StringInputRowParser; +import com.metamx.druid.input.InputRow; + /** */ public class KafkaFirehoseFactory implements FirehoseFactory diff --git a/realtime/src/main/java/com/metamx/druid/realtime/MetadataUpdater.java b/realtime/src/main/java/com/metamx/druid/realtime/MetadataUpdater.java index 93c8e712fa6f..7e16ba163f1a 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/MetadataUpdater.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/MetadataUpdater.java @@ -19,22 +19,23 @@ package com.metamx.druid.realtime; -import com.google.common.collect.ImmutableMap; -import com.metamx.common.lifecycle.LifecycleStart; -import com.metamx.common.lifecycle.LifecycleStop; -import com.metamx.common.logger.Logger; -import com.metamx.druid.client.DataSegment; -import com.metamx.phonebook.PhoneBook; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + import org.codehaus.jackson.map.ObjectMapper; import org.joda.time.DateTime; import org.skife.jdbi.v2.DBI; import org.skife.jdbi.v2.Handle; import org.skife.jdbi.v2.tweak.HandleCallback; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import com.google.common.collect.ImmutableMap; +import com.metamx.common.lifecycle.LifecycleStart; +import com.metamx.common.lifecycle.LifecycleStop; +import com.metamx.common.logger.Logger; +import com.metamx.druid.client.DataSegment; +import com.metamx.phonebook.PhoneBook; /** */ diff --git a/realtime/src/main/java/com/metamx/druid/realtime/RealtimeManager.java b/realtime/src/main/java/com/metamx/druid/realtime/RealtimeManager.java index 97c7611801a2..e7d63c34d1e7 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/RealtimeManager.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/RealtimeManager.java @@ -19,6 +19,15 @@ package com.metamx.druid.realtime; +import java.io.Closeable; +import java.io.IOException; +import java.util.List; +import java.util.Map; + +import org.joda.time.DateTime; +import org.joda.time.Interval; +import org.joda.time.Period; + import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.collect.Maps; @@ -37,14 +46,6 @@ import com.metamx.druid.query.segment.QuerySegmentWalker; import com.metamx.druid.query.segment.SegmentDescriptor; import com.metamx.emitter.EmittingLogger; -import org.joda.time.DateTime; -import org.joda.time.Interval; -import org.joda.time.Period; - -import java.io.Closeable; -import java.io.IOException; -import java.util.List; -import java.util.Map; /** */ diff --git a/realtime/src/main/java/com/metamx/druid/realtime/RealtimeMetricsMonitor.java b/realtime/src/main/java/com/metamx/druid/realtime/RealtimeMetricsMonitor.java index 3d04392aab08..2c65c28b1d05 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/RealtimeMetricsMonitor.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/RealtimeMetricsMonitor.java @@ -19,14 +19,14 @@ package com.metamx.druid.realtime; +import java.util.List; +import java.util.Map; + import com.google.common.collect.Maps; import com.metamx.emitter.service.ServiceEmitter; import com.metamx.emitter.service.ServiceMetricEvent; import com.metamx.metrics.AbstractMonitor; -import java.util.List; -import java.util.Map; - /** */ public class RealtimeMetricsMonitor extends AbstractMonitor diff --git a/realtime/src/main/java/com/metamx/druid/realtime/RealtimeNode.java b/realtime/src/main/java/com/metamx/druid/realtime/RealtimeNode.java index 4b61a0b80a54..0b8d6efac452 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/RealtimeNode.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/RealtimeNode.java @@ -19,6 +19,30 @@ package com.metamx.druid.realtime; +import java.io.File; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.ScheduledExecutorService; + +import org.I0Itec.zkclient.ZkClient; +import org.codehaus.jackson.map.BeanProperty; +import org.codehaus.jackson.map.DeserializationContext; +import org.codehaus.jackson.map.InjectableValues; +import org.codehaus.jackson.map.ObjectMapper; +import org.codehaus.jackson.map.jsontype.NamedType; +import org.codehaus.jackson.smile.SmileFactory; +import org.codehaus.jackson.type.TypeReference; +import org.jets3t.service.S3ServiceException; +import org.jets3t.service.impl.rest.httpclient.RestS3Service; +import org.jets3t.service.security.AWSCredentials; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.servlet.Context; +import org.mortbay.jetty.servlet.ServletHolder; +import org.skife.config.ConfigurationObjectFactory; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.metamx.common.ISE; @@ -60,29 +84,6 @@ import com.metamx.metrics.MonitorSchedulerConfig; import com.metamx.metrics.SysMonitor; import com.metamx.phonebook.PhoneBook; -import org.I0Itec.zkclient.ZkClient; -import org.codehaus.jackson.map.BeanProperty; -import org.codehaus.jackson.map.DeserializationContext; -import org.codehaus.jackson.map.InjectableValues; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.jsontype.NamedType; -import org.codehaus.jackson.smile.SmileFactory; -import org.codehaus.jackson.type.TypeReference; -import org.jets3t.service.S3ServiceException; -import org.jets3t.service.impl.rest.httpclient.RestS3Service; -import org.jets3t.service.security.AWSCredentials; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.ServletHolder; -import org.skife.config.ConfigurationObjectFactory; - -import java.io.File; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.ScheduledExecutorService; /** */ diff --git a/realtime/src/main/java/com/metamx/druid/realtime/RealtimePlumberSchool.java b/realtime/src/main/java/com/metamx/druid/realtime/RealtimePlumberSchool.java index 5659758591b5..314bed367c9f 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/RealtimePlumberSchool.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/RealtimePlumberSchool.java @@ -19,6 +19,27 @@ package com.metamx.druid.realtime; +import java.io.File; +import java.io.IOException; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; + +import javax.annotation.Nullable; + +import org.apache.commons.io.FileUtils; +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; +import org.codehaus.jackson.map.annotate.JacksonInject; +import org.joda.time.DateTime; +import org.joda.time.Duration; +import org.joda.time.Interval; +import org.joda.time.Period; + import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; @@ -46,29 +67,9 @@ import com.metamx.druid.query.QueryRunnerFactory; import com.metamx.druid.query.QueryRunnerFactoryConglomerate; import com.metamx.druid.query.QueryToolChest; -import com.metamx.druid.shard.NoneShardSpec; import com.metamx.emitter.EmittingLogger; import com.metamx.emitter.service.ServiceEmitter; import com.metamx.emitter.service.ServiceMetricEvent; -import org.apache.commons.io.FileUtils; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JacksonInject; -import org.joda.time.DateTime; -import org.joda.time.Duration; -import org.joda.time.Interval; -import org.joda.time.Period; - -import javax.annotation.Nullable; -import java.io.File; -import java.io.IOException; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; /** */ diff --git a/realtime/src/main/java/com/metamx/druid/realtime/S3SegmentPusher.java b/realtime/src/main/java/com/metamx/druid/realtime/S3SegmentPusher.java index 6ae83c5f9bff..90b9083af1ff 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/S3SegmentPusher.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/S3SegmentPusher.java @@ -19,20 +19,6 @@ package com.metamx.druid.realtime; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableMap; -import com.google.common.io.Closeables; -import com.metamx.common.ISE; -import com.metamx.common.StreamUtils; -import com.metamx.druid.client.DataSegment; -import com.metamx.emitter.EmittingLogger; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.codehaus.jackson.map.ObjectMapper; -import org.jets3t.service.S3ServiceException; -import org.jets3t.service.impl.rest.httpclient.RestS3Service; -import org.jets3t.service.model.S3Object; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; @@ -42,6 +28,21 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.codehaus.jackson.map.ObjectMapper; +import org.jets3t.service.S3ServiceException; +import org.jets3t.service.impl.rest.httpclient.RestS3Service; +import org.jets3t.service.model.S3Object; + +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableMap; +import com.google.common.io.Closeables; +import com.metamx.common.ISE; +import com.metamx.common.StreamUtils; +import com.metamx.druid.client.DataSegment; +import com.metamx.emitter.EmittingLogger; + /** */ public class S3SegmentPusher implements SegmentPusher diff --git a/realtime/src/main/java/com/metamx/druid/realtime/Schema.java b/realtime/src/main/java/com/metamx/druid/realtime/Schema.java index b54c8efbbf67..83ae9388e21e 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/Schema.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/Schema.java @@ -19,16 +19,16 @@ package com.metamx.druid.realtime; +import java.util.Arrays; + +import org.codehaus.jackson.annotate.JsonCreator; +import org.codehaus.jackson.annotate.JsonProperty; + import com.google.common.base.Preconditions; import com.metamx.druid.QueryGranularity; import com.metamx.druid.aggregation.AggregatorFactory; -import com.metamx.druid.index.v1.IndexGranularity; import com.metamx.druid.shard.NoneShardSpec; import com.metamx.druid.shard.ShardSpec; -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonProperty; - -import java.util.Arrays; /** */ diff --git a/realtime/src/main/java/com/metamx/druid/realtime/SegmentPusher.java b/realtime/src/main/java/com/metamx/druid/realtime/SegmentPusher.java index 16a9253137c8..1ca2544399ba 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/SegmentPusher.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/SegmentPusher.java @@ -19,11 +19,11 @@ package com.metamx.druid.realtime; -import com.metamx.druid.client.DataSegment; - import java.io.File; import java.io.IOException; +import com.metamx.druid.client.DataSegment; + /** */ public interface SegmentPusher diff --git a/realtime/src/main/java/com/metamx/druid/realtime/Sink.java b/realtime/src/main/java/com/metamx/druid/realtime/Sink.java index 95d164f367fd..ed23ea91c4bd 100644 --- a/realtime/src/main/java/com/metamx/druid/realtime/Sink.java +++ b/realtime/src/main/java/com/metamx/druid/realtime/Sink.java @@ -19,6 +19,15 @@ package com.metamx.druid.realtime; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; + +import javax.annotation.Nullable; + +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; @@ -31,13 +40,6 @@ import com.metamx.druid.client.DataSegment; import com.metamx.druid.index.v1.IncrementalIndex; import com.metamx.druid.input.InputRow; -import org.joda.time.Interval; - -import javax.annotation.Nullable; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; /** */ diff --git a/server/src/main/java/com/metamx/TsvToJson.java b/server/src/main/java/com/metamx/TsvToJson.java index cca31bfd095c..a0d28d4364fb 100644 --- a/server/src/main/java/com/metamx/TsvToJson.java +++ b/server/src/main/java/com/metamx/TsvToJson.java @@ -19,14 +19,6 @@ package com.metamx; -import com.google.common.base.Charsets; -import com.google.common.collect.Maps; -import com.metamx.common.IAE; -import com.metamx.common.ISE; -import org.codehaus.jackson.map.ObjectMapper; -import org.joda.time.DateTime; -import org.joda.time.DateTimeZone; - import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -37,6 +29,13 @@ import java.io.OutputStreamWriter; import java.util.Map; +import org.codehaus.jackson.map.ObjectMapper; +import org.joda.time.DateTime; + +import com.google.common.base.Charsets; +import com.google.common.collect.Maps; +import com.metamx.common.IAE; + /** */ public class TsvToJson diff --git a/server/src/main/java/com/metamx/druid/BaseStorageAdapter.java b/server/src/main/java/com/metamx/druid/BaseStorageAdapter.java index b40409d1ede9..37c345da07e7 100644 --- a/server/src/main/java/com/metamx/druid/BaseStorageAdapter.java +++ b/server/src/main/java/com/metamx/druid/BaseStorageAdapter.java @@ -19,6 +19,11 @@ package com.metamx.druid; +import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; + +import java.util.List; +import java.util.TreeSet; + import com.google.common.collect.Sets; import com.metamx.common.guava.FunctionalIterable; import com.metamx.druid.index.brita.Filter; @@ -29,10 +34,6 @@ import com.metamx.druid.query.search.SearchHit; import com.metamx.druid.query.search.SearchQuery; import com.metamx.druid.query.search.SearchQuerySpec; -import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; - -import java.util.List; -import java.util.TreeSet; /** */ diff --git a/server/src/main/java/com/metamx/druid/GroupByQueryEngine.java b/server/src/main/java/com/metamx/druid/GroupByQueryEngine.java index 60d2596bd38a..b945f0bfb007 100644 --- a/server/src/main/java/com/metamx/druid/GroupByQueryEngine.java +++ b/server/src/main/java/com/metamx/druid/GroupByQueryEngine.java @@ -19,6 +19,17 @@ package com.metamx.druid; +import java.nio.ByteBuffer; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.TreeMap; + +import javax.annotation.Nullable; + +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; @@ -43,15 +54,6 @@ import com.metamx.druid.input.Row; import com.metamx.druid.query.dimension.DimensionSpec; import com.metamx.druid.query.group.GroupByQuery; -import org.joda.time.Interval; - -import javax.annotation.Nullable; -import java.nio.ByteBuffer; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.TreeMap; /** */ diff --git a/server/src/main/java/com/metamx/druid/SearchResultBuilder.java b/server/src/main/java/com/metamx/druid/SearchResultBuilder.java index 7a18d18e7182..9ef4af18c6b6 100644 --- a/server/src/main/java/com/metamx/druid/SearchResultBuilder.java +++ b/server/src/main/java/com/metamx/druid/SearchResultBuilder.java @@ -19,11 +19,12 @@ package com.metamx.druid; +import org.joda.time.DateTime; + import com.google.common.collect.Lists; import com.metamx.druid.query.search.SearchHit; import com.metamx.druid.result.Result; import com.metamx.druid.result.SearchResultValue; -import org.joda.time.DateTime; /** diff --git a/server/src/main/java/com/metamx/druid/StorageAdapter.java b/server/src/main/java/com/metamx/druid/StorageAdapter.java index 285d17b5b058..f17287e0d3d0 100644 --- a/server/src/main/java/com/metamx/druid/StorageAdapter.java +++ b/server/src/main/java/com/metamx/druid/StorageAdapter.java @@ -19,11 +19,12 @@ package com.metamx.druid; -import com.metamx.druid.index.v1.Searchable; -import com.metamx.druid.index.v1.processing.CursorFactory; import org.joda.time.DateTime; import org.joda.time.Interval; +import com.metamx.druid.index.v1.Searchable; +import com.metamx.druid.index.v1.processing.CursorFactory; + /** */ public interface StorageAdapter extends CursorFactory, Searchable diff --git a/server/src/main/java/com/metamx/druid/coordination/DataSegmentChangeRequest.java b/server/src/main/java/com/metamx/druid/coordination/DataSegmentChangeRequest.java index 4e68ad2995e6..645ef95e2b2c 100644 --- a/server/src/main/java/com/metamx/druid/coordination/DataSegmentChangeRequest.java +++ b/server/src/main/java/com/metamx/druid/coordination/DataSegmentChangeRequest.java @@ -19,10 +19,11 @@ package com.metamx.druid.coordination; -import com.metamx.druid.client.DataSegment; import org.codehaus.jackson.annotate.JsonSubTypes; import org.codehaus.jackson.annotate.JsonTypeInfo; +import com.metamx.druid.client.DataSegment; + /** */ @JsonTypeInfo(use=JsonTypeInfo.Id.NAME, property="action") diff --git a/server/src/main/java/com/metamx/druid/coordination/DruidClusterInfo.java b/server/src/main/java/com/metamx/druid/coordination/DruidClusterInfo.java index d5d6377a10ef..88921eef822b 100644 --- a/server/src/main/java/com/metamx/druid/coordination/DruidClusterInfo.java +++ b/server/src/main/java/com/metamx/druid/coordination/DruidClusterInfo.java @@ -19,12 +19,12 @@ package com.metamx.druid.coordination; -import com.metamx.druid.master.DruidMaster; -import com.metamx.phonebook.PhoneBook; - import java.util.Arrays; import java.util.Map; +import com.metamx.druid.master.DruidMaster; +import com.metamx.phonebook.PhoneBook; + /** */ public class DruidClusterInfo diff --git a/server/src/main/java/com/metamx/druid/coordination/SegmentChangeRequestDrop.java b/server/src/main/java/com/metamx/druid/coordination/SegmentChangeRequestDrop.java index 0093907d26e2..87e69f072871 100644 --- a/server/src/main/java/com/metamx/druid/coordination/SegmentChangeRequestDrop.java +++ b/server/src/main/java/com/metamx/druid/coordination/SegmentChangeRequestDrop.java @@ -19,11 +19,12 @@ package com.metamx.druid.coordination; -import com.metamx.druid.client.DataSegment; import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonUnwrapped; +import com.metamx.druid.client.DataSegment; + /** */ public class SegmentChangeRequestDrop implements DataSegmentChangeRequest diff --git a/server/src/main/java/com/metamx/druid/coordination/SegmentChangeRequestLoad.java b/server/src/main/java/com/metamx/druid/coordination/SegmentChangeRequestLoad.java index c98106efdfbe..d140b9259425 100644 --- a/server/src/main/java/com/metamx/druid/coordination/SegmentChangeRequestLoad.java +++ b/server/src/main/java/com/metamx/druid/coordination/SegmentChangeRequestLoad.java @@ -19,11 +19,12 @@ package com.metamx.druid.coordination; -import com.metamx.druid.client.DataSegment; import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonUnwrapped; +import com.metamx.druid.client.DataSegment; + /** */ public class SegmentChangeRequestLoad implements DataSegmentChangeRequest diff --git a/server/src/main/java/com/metamx/druid/coordination/ServerManager.java b/server/src/main/java/com/metamx/druid/coordination/ServerManager.java index 97806e14fe49..7c842046c064 100644 --- a/server/src/main/java/com/metamx/druid/coordination/ServerManager.java +++ b/server/src/main/java/com/metamx/druid/coordination/ServerManager.java @@ -19,6 +19,15 @@ package com.metamx.druid.coordination; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ExecutorService; + +import javax.annotation.Nullable; + +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.collect.Ordering; import com.metamx.common.guava.FunctionalIterable; @@ -49,13 +58,6 @@ import com.metamx.emitter.EmittingLogger; import com.metamx.emitter.service.ServiceEmitter; import com.metamx.emitter.service.ServiceMetricEvent; -import org.joda.time.Interval; - -import javax.annotation.Nullable; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ExecutorService; /** */ diff --git a/server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java b/server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java index 1fb756daafea..bbcaca9af0f4 100644 --- a/server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java +++ b/server/src/main/java/com/metamx/druid/coordination/ZkCoordinator.java @@ -19,6 +19,16 @@ package com.metamx.druid.coordination; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import org.codehaus.jackson.map.ObjectMapper; +import org.joda.time.DateTime; + import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; @@ -33,15 +43,6 @@ import com.metamx.emitter.service.ServiceEmitter; import com.metamx.phonebook.PhoneBook; import com.metamx.phonebook.PhoneBookPeon; -import org.codehaus.jackson.map.ObjectMapper; -import org.joda.time.DateTime; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; /** */ diff --git a/server/src/main/java/com/metamx/druid/coordination/ZkCoordinatorConfig.java b/server/src/main/java/com/metamx/druid/coordination/ZkCoordinatorConfig.java index 91afbcbbc5e4..caf8e97c1c86 100644 --- a/server/src/main/java/com/metamx/druid/coordination/ZkCoordinatorConfig.java +++ b/server/src/main/java/com/metamx/druid/coordination/ZkCoordinatorConfig.java @@ -19,10 +19,10 @@ package com.metamx.druid.coordination; -import org.skife.config.Config; - import java.io.File; +import org.skife.config.Config; + /** */ public abstract class ZkCoordinatorConfig diff --git a/server/src/main/java/com/metamx/druid/coordination/legacy/S3SizeLookup.java b/server/src/main/java/com/metamx/druid/coordination/legacy/S3SizeLookup.java index 29a15fea1459..248b4e6863e9 100644 --- a/server/src/main/java/com/metamx/druid/coordination/legacy/S3SizeLookup.java +++ b/server/src/main/java/com/metamx/druid/coordination/legacy/S3SizeLookup.java @@ -19,15 +19,15 @@ package com.metamx.druid.coordination.legacy; -import com.metamx.common.MapUtils; -import com.metamx.common.logger.Logger; +import java.util.Map; import org.jets3t.service.S3ServiceException; import org.jets3t.service.impl.rest.httpclient.RestS3Service; import org.jets3t.service.model.S3Bucket; import org.jets3t.service.model.S3Object; -import java.util.Map; +import com.metamx.common.MapUtils; +import com.metamx.common.logger.Logger; /** */ diff --git a/server/src/main/java/com/metamx/druid/coordination/legacy/TheSizeAdjuster.java b/server/src/main/java/com/metamx/druid/coordination/legacy/TheSizeAdjuster.java index 668161e5ceea..07f621f2db17 100644 --- a/server/src/main/java/com/metamx/druid/coordination/legacy/TheSizeAdjuster.java +++ b/server/src/main/java/com/metamx/druid/coordination/legacy/TheSizeAdjuster.java @@ -19,15 +19,16 @@ package com.metamx.druid.coordination.legacy; +import java.io.IOException; +import java.util.Map; + +import org.I0Itec.zkclient.ZkClient; +import org.codehaus.jackson.map.ObjectMapper; + import com.google.common.base.Joiner; import com.metamx.common.MapUtils; import com.metamx.common.logger.Logger; import com.metamx.druid.client.DataSegment; -import org.I0Itec.zkclient.ZkClient; -import org.codehaus.jackson.map.ObjectMapper; - -import java.io.IOException; -import java.util.Map; /** */ diff --git a/server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java b/server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java index ef620cd1e381..d86e6d47f23b 100644 --- a/server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java +++ b/server/src/main/java/com/metamx/druid/db/DatabaseSegmentManager.java @@ -19,18 +19,16 @@ package com.metamx.druid.db; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Ordering; -import com.metamx.common.concurrent.ScheduledExecutors; -import com.metamx.common.lifecycle.LifecycleStart; -import com.metamx.common.lifecycle.LifecycleStop; -import com.metamx.common.logger.Logger; -import com.metamx.druid.TimelineObjectHolder; -import com.metamx.druid.VersionedIntervalTimeline; -import com.metamx.druid.client.DataSegment; -import com.metamx.druid.client.DruidDataSource; +import java.sql.SQLException; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.atomic.AtomicReference; + +import javax.annotation.Nullable; + import org.codehaus.jackson.map.ObjectMapper; import org.joda.time.DateTime; import org.joda.time.Duration; @@ -43,14 +41,18 @@ import org.skife.jdbi.v2.StatementContext; import org.skife.jdbi.v2.tweak.HandleCallback; -import javax.annotation.Nullable; -import java.sql.SQLException; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.atomic.AtomicReference; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import com.google.common.collect.Ordering; +import com.metamx.common.concurrent.ScheduledExecutors; +import com.metamx.common.lifecycle.LifecycleStart; +import com.metamx.common.lifecycle.LifecycleStop; +import com.metamx.common.logger.Logger; +import com.metamx.druid.TimelineObjectHolder; +import com.metamx.druid.VersionedIntervalTimeline; +import com.metamx.druid.client.DataSegment; +import com.metamx.druid.client.DruidDataSource; /** */ diff --git a/server/src/main/java/com/metamx/druid/http/InfoResource.java b/server/src/main/java/com/metamx/druid/http/InfoResource.java index 949ef7127c68..f0550803ddc9 100644 --- a/server/src/main/java/com/metamx/druid/http/InfoResource.java +++ b/server/src/main/java/com/metamx/druid/http/InfoResource.java @@ -19,6 +19,24 @@ package com.metamx.druid.http; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +import javax.annotation.Nullable; +import javax.inject.Inject; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.Response; + import com.google.common.base.Function; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableMap; @@ -33,23 +51,6 @@ import com.metamx.druid.coordination.DruidClusterInfo; import com.metamx.druid.db.DatabaseSegmentManager; -import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - /** */ @Path("/info") diff --git a/server/src/main/java/com/metamx/druid/http/MasterMain.java b/server/src/main/java/com/metamx/druid/http/MasterMain.java index 52de6ffad81a..edac37078339 100644 --- a/server/src/main/java/com/metamx/druid/http/MasterMain.java +++ b/server/src/main/java/com/metamx/druid/http/MasterMain.java @@ -19,6 +19,23 @@ package com.metamx.druid.http; +import java.net.URL; +import java.util.Properties; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ScheduledExecutorService; + +import org.I0Itec.zkclient.ZkClient; +import org.codehaus.jackson.map.ObjectMapper; +import org.jets3t.service.impl.rest.httpclient.RestS3Service; +import org.jets3t.service.security.AWSCredentials; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.servlet.Context; +import org.mortbay.jetty.servlet.DefaultServlet; +import org.mortbay.jetty.servlet.FilterHolder; +import org.mortbay.jetty.servlet.ServletHolder; +import org.skife.config.ConfigurationObjectFactory; +import org.skife.jdbi.v2.DBI; + import com.google.common.base.Charsets; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; @@ -69,22 +86,6 @@ import com.netflix.curator.framework.CuratorFramework; import com.netflix.curator.x.discovery.ServiceDiscovery; import com.netflix.curator.x.discovery.ServiceProvider; -import org.I0Itec.zkclient.ZkClient; -import org.codehaus.jackson.map.ObjectMapper; -import org.jets3t.service.impl.rest.httpclient.RestS3Service; -import org.jets3t.service.security.AWSCredentials; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.DefaultServlet; -import org.mortbay.jetty.servlet.FilterHolder; -import org.mortbay.jetty.servlet.ServletHolder; -import org.skife.config.ConfigurationObjectFactory; -import org.skife.jdbi.v2.DBI; - -import java.net.URL; -import java.util.Properties; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ScheduledExecutorService; /** */ diff --git a/server/src/main/java/com/metamx/druid/http/MasterResource.java b/server/src/main/java/com/metamx/druid/http/MasterResource.java index ca992815eb61..f4d79e551852 100644 --- a/server/src/main/java/com/metamx/druid/http/MasterResource.java +++ b/server/src/main/java/com/metamx/druid/http/MasterResource.java @@ -19,19 +19,19 @@ package com.metamx.druid.http; -import com.metamx.druid.master.DruidMaster; -import com.metamx.druid.master.LoadPeonCallback; +import java.util.List; +import java.util.Map; import javax.inject.Inject; import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; -import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.Response; -import java.util.List; -import java.util.Map; + +import com.metamx.druid.master.DruidMaster; +import com.metamx.druid.master.LoadPeonCallback; /** */ diff --git a/server/src/main/java/com/metamx/druid/http/MasterServletModule.java b/server/src/main/java/com/metamx/druid/http/MasterServletModule.java index 3f42becbb8d4..059771d018b7 100644 --- a/server/src/main/java/com/metamx/druid/http/MasterServletModule.java +++ b/server/src/main/java/com/metamx/druid/http/MasterServletModule.java @@ -19,6 +19,11 @@ package com.metamx.druid.http; +import javax.inject.Singleton; + +import org.codehaus.jackson.jaxrs.JacksonJsonProvider; +import org.codehaus.jackson.map.ObjectMapper; + import com.google.inject.Provides; import com.metamx.druid.client.ServerInventoryManager; import com.metamx.druid.coordination.DruidClusterInfo; @@ -26,10 +31,6 @@ import com.metamx.druid.master.DruidMaster; import com.sun.jersey.guice.JerseyServletModule; import com.sun.jersey.guice.spi.container.servlet.GuiceContainer; -import org.codehaus.jackson.jaxrs.JacksonJsonProvider; -import org.codehaus.jackson.map.ObjectMapper; - -import javax.inject.Singleton; /** */ diff --git a/server/src/main/java/com/metamx/druid/http/RedirectFilter.java b/server/src/main/java/com/metamx/druid/http/RedirectFilter.java index 45fac15d4078..29887e2a3166 100644 --- a/server/src/main/java/com/metamx/druid/http/RedirectFilter.java +++ b/server/src/main/java/com/metamx/druid/http/RedirectFilter.java @@ -19,11 +19,8 @@ package com.metamx.druid.http; -import com.google.common.base.Throwables; -import com.google.common.io.ByteStreams; -import com.metamx.common.logger.Logger; -import com.metamx.http.client.HttpClient; -import com.metamx.http.client.response.HttpResponseHandler; +import java.io.IOException; +import java.net.URL; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -34,8 +31,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.HttpMethod; -import java.io.IOException; -import java.net.URL; + +import com.google.common.base.Throwables; +import com.google.common.io.ByteStreams; +import com.metamx.common.logger.Logger; +import com.metamx.http.client.HttpClient; +import com.metamx.http.client.response.HttpResponseHandler; /** */ diff --git a/server/src/main/java/com/metamx/druid/http/RedirectServlet.java b/server/src/main/java/com/metamx/druid/http/RedirectServlet.java index f91f03d987d6..0bc3d87224b0 100644 --- a/server/src/main/java/com/metamx/druid/http/RedirectServlet.java +++ b/server/src/main/java/com/metamx/druid/http/RedirectServlet.java @@ -19,16 +19,18 @@ package com.metamx.druid.http; -import com.metamx.common.logger.Logger; -import org.mortbay.jetty.servlet.DefaultServlet; +import java.io.IOException; +import java.net.URL; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.net.URL; + +import org.mortbay.jetty.servlet.DefaultServlet; + +import com.metamx.common.logger.Logger; /** */ diff --git a/server/src/main/java/com/metamx/druid/http/ServerMain.java b/server/src/main/java/com/metamx/druid/http/ServerMain.java index 76ed21870dbc..ed82c45e6006 100644 --- a/server/src/main/java/com/metamx/druid/http/ServerMain.java +++ b/server/src/main/java/com/metamx/druid/http/ServerMain.java @@ -19,6 +19,23 @@ package com.metamx.druid.http; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.ScheduledExecutorService; + +import org.I0Itec.zkclient.ZkClient; +import org.codehaus.jackson.map.ObjectMapper; +import org.codehaus.jackson.smile.SmileFactory; +import org.jets3t.service.impl.rest.httpclient.RestS3Service; +import org.jets3t.service.security.AWSCredentials; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.servlet.Context; +import org.mortbay.jetty.servlet.ServletHolder; +import org.skife.config.ConfigurationObjectFactory; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.metamx.common.concurrent.ExecutorServiceConfig; @@ -56,22 +73,6 @@ import com.metamx.metrics.MonitorSchedulerConfig; import com.metamx.metrics.SysMonitor; import com.metamx.phonebook.PhoneBook; -import org.I0Itec.zkclient.ZkClient; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.smile.SmileFactory; -import org.jets3t.service.impl.rest.httpclient.RestS3Service; -import org.jets3t.service.security.AWSCredentials; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.ServletHolder; -import org.skife.config.ConfigurationObjectFactory; - -import java.nio.ByteBuffer; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.ScheduledExecutorService; /** */ diff --git a/server/src/main/java/com/metamx/druid/index/brita/AndFilter.java b/server/src/main/java/com/metamx/druid/index/brita/AndFilter.java index 5132cd7bf8e7..9fe56f9f8947 100644 --- a/server/src/main/java/com/metamx/druid/index/brita/AndFilter.java +++ b/server/src/main/java/com/metamx/druid/index/brita/AndFilter.java @@ -19,11 +19,12 @@ package com.metamx.druid.index.brita; -import com.google.common.collect.Lists; import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; import java.util.List; +import com.google.common.collect.Lists; + /** */ public class AndFilter implements Filter diff --git a/server/src/main/java/com/metamx/druid/index/brita/DimensionPredicateFilter.java b/server/src/main/java/com/metamx/druid/index/brita/DimensionPredicateFilter.java index e588a8441d18..bf6bdb12eddf 100644 --- a/server/src/main/java/com/metamx/druid/index/brita/DimensionPredicateFilter.java +++ b/server/src/main/java/com/metamx/druid/index/brita/DimensionPredicateFilter.java @@ -19,13 +19,14 @@ package com.metamx.druid.index.brita; -import com.google.common.base.Function; -import com.google.common.base.Predicate; -import com.metamx.common.guava.FunctionalIterable; import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; import javax.annotation.Nullable; +import com.google.common.base.Function; +import com.google.common.base.Predicate; +import com.metamx.common.guava.FunctionalIterable; + /** */ class DimensionPredicateFilter implements Filter diff --git a/server/src/main/java/com/metamx/druid/index/brita/ExtractionFilter.java b/server/src/main/java/com/metamx/druid/index/brita/ExtractionFilter.java index 7eeb106936f9..a006756f96bb 100644 --- a/server/src/main/java/com/metamx/druid/index/brita/ExtractionFilter.java +++ b/server/src/main/java/com/metamx/druid/index/brita/ExtractionFilter.java @@ -19,13 +19,14 @@ package com.metamx.druid.index.brita; -import com.google.common.collect.Lists; -import com.metamx.druid.kv.Indexed; -import com.metamx.druid.query.extraction.DimExtractionFn; import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; import java.util.List; +import com.google.common.collect.Lists; +import com.metamx.druid.kv.Indexed; +import com.metamx.druid.query.extraction.DimExtractionFn; + /** */ public class ExtractionFilter implements Filter diff --git a/server/src/main/java/com/metamx/druid/index/brita/Filters.java b/server/src/main/java/com/metamx/druid/index/brita/Filters.java index bb14cbf2b41f..e81b4e24d5e6 100644 --- a/server/src/main/java/com/metamx/druid/index/brita/Filters.java +++ b/server/src/main/java/com/metamx/druid/index/brita/Filters.java @@ -19,6 +19,10 @@ package com.metamx.druid.index.brita; +import java.util.List; + +import javax.annotation.Nullable; + import com.google.common.base.Function; import com.google.common.collect.Lists; import com.metamx.druid.query.filter.AndDimFilter; @@ -29,9 +33,6 @@ import com.metamx.druid.query.filter.RegexDimFilter; import com.metamx.druid.query.filter.SelectorDimFilter; -import javax.annotation.Nullable; -import java.util.List; - /** */ public class Filters diff --git a/server/src/main/java/com/metamx/druid/index/brita/InvertedIndexSelector.java b/server/src/main/java/com/metamx/druid/index/brita/InvertedIndexSelector.java index 5361951075a5..2a7252768c88 100644 --- a/server/src/main/java/com/metamx/druid/index/brita/InvertedIndexSelector.java +++ b/server/src/main/java/com/metamx/druid/index/brita/InvertedIndexSelector.java @@ -19,9 +19,10 @@ package com.metamx.druid.index.brita; +import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; + import com.metamx.druid.index.v1.processing.Offset; import com.metamx.druid.kv.Indexed; -import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; /** */ diff --git a/server/src/main/java/com/metamx/druid/index/brita/OrFilter.java b/server/src/main/java/com/metamx/druid/index/brita/OrFilter.java index 3de948682a9e..e03a15842512 100644 --- a/server/src/main/java/com/metamx/druid/index/brita/OrFilter.java +++ b/server/src/main/java/com/metamx/druid/index/brita/OrFilter.java @@ -19,11 +19,12 @@ package com.metamx.druid.index.brita; -import com.google.common.collect.Lists; import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; import java.util.List; +import com.google.common.collect.Lists; + /** */ public class OrFilter implements Filter diff --git a/server/src/main/java/com/metamx/druid/index/brita/RegexFilter.java b/server/src/main/java/com/metamx/druid/index/brita/RegexFilter.java index a638ce576a74..bfeaaa5ee01a 100644 --- a/server/src/main/java/com/metamx/druid/index/brita/RegexFilter.java +++ b/server/src/main/java/com/metamx/druid/index/brita/RegexFilter.java @@ -19,10 +19,11 @@ package com.metamx.druid.index.brita; -import com.google.common.base.Predicate; +import java.util.regex.Pattern; import javax.annotation.Nullable; -import java.util.regex.Pattern; + +import com.google.common.base.Predicate; /** diff --git a/server/src/main/java/com/metamx/druid/index/v1/ComplexMetricColumnSerializer.java b/server/src/main/java/com/metamx/druid/index/v1/ComplexMetricColumnSerializer.java index 526877176a90..b23efe2fd80e 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/ComplexMetricColumnSerializer.java +++ b/server/src/main/java/com/metamx/druid/index/v1/ComplexMetricColumnSerializer.java @@ -19,16 +19,16 @@ package com.metamx.druid.index.v1; +import java.io.File; +import java.io.IOException; +import java.nio.ByteOrder; + import com.google.common.io.ByteStreams; import com.google.common.io.Files; import com.metamx.druid.index.v1.serde.ComplexMetricSerde; import com.metamx.druid.kv.FlattenedArrayWriter; import com.metamx.druid.kv.IOPeon; -import java.io.File; -import java.io.IOException; -import java.nio.ByteOrder; - /** */ public class ComplexMetricColumnSerializer implements MetricColumnSerializer diff --git a/server/src/main/java/com/metamx/druid/index/v1/ConciseOffset.java b/server/src/main/java/com/metamx/druid/index/v1/ConciseOffset.java index b08449e687cf..5ccbbe85bb25 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/ConciseOffset.java +++ b/server/src/main/java/com/metamx/druid/index/v1/ConciseOffset.java @@ -19,10 +19,11 @@ package com.metamx.druid.index.v1; -import com.metamx.druid.index.v1.processing.Offset; import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; import it.uniroma3.mat.extendedset.intset.IntSet; +import com.metamx.druid.index.v1.processing.Offset; + /** */ public class ConciseOffset implements Offset diff --git a/server/src/main/java/com/metamx/druid/index/v1/FloatMetricColumnSerializer.java b/server/src/main/java/com/metamx/druid/index/v1/FloatMetricColumnSerializer.java index 8207897e5020..947757a7323a 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/FloatMetricColumnSerializer.java +++ b/server/src/main/java/com/metamx/druid/index/v1/FloatMetricColumnSerializer.java @@ -19,13 +19,13 @@ package com.metamx.druid.index.v1; -import com.google.common.io.Files; -import com.metamx.druid.kv.IOPeon; - import java.io.File; import java.io.IOException; import java.nio.ByteOrder; +import com.google.common.io.Files; +import com.metamx.druid.kv.IOPeon; + /** */ public class FloatMetricColumnSerializer implements MetricColumnSerializer diff --git a/server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexAdapter.java b/server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexAdapter.java index d975770f5606..dc7863feee90 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexAdapter.java +++ b/server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexAdapter.java @@ -19,6 +19,17 @@ package com.metamx.druid.index.v1; +import it.uniroma3.mat.extendedset.intset.ConciseSet; +import it.uniroma3.mat.extendedset.intset.IntSet; + +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.annotation.Nullable; + +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.collect.Maps; import com.metamx.common.guava.FunctionalIterable; @@ -29,14 +40,6 @@ import com.metamx.druid.kv.IndexedInts; import com.metamx.druid.kv.IndexedIterable; import com.metamx.druid.kv.ListIndexed; -import it.uniroma3.mat.extendedset.intset.ConciseSet; -import it.uniroma3.mat.extendedset.intset.IntSet; -import org.joda.time.Interval; - -import javax.annotation.Nullable; -import java.util.Iterator; -import java.util.List; -import java.util.Map; /** */ diff --git a/server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapter.java b/server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapter.java index d2486aa585f1..f25923e981fe 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapter.java +++ b/server/src/main/java/com/metamx/druid/index/v1/IncrementalIndexStorageAdapter.java @@ -19,6 +19,18 @@ package com.metamx.druid.index.v1; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeSet; +import java.util.concurrent.ConcurrentNavigableMap; + +import javax.annotation.Nullable; + +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; @@ -46,16 +58,6 @@ import com.metamx.druid.query.search.SearchHit; import com.metamx.druid.query.search.SearchQuery; import com.metamx.druid.query.search.SearchQuerySpec; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; -import java.util.concurrent.ConcurrentNavigableMap; /** */ diff --git a/server/src/main/java/com/metamx/druid/index/v1/IndexGranularity.java b/server/src/main/java/com/metamx/druid/index/v1/IndexGranularity.java index 3069984739bf..3e40d2630c48 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/IndexGranularity.java +++ b/server/src/main/java/com/metamx/druid/index/v1/IndexGranularity.java @@ -19,7 +19,6 @@ package com.metamx.druid.index.v1; -import com.metamx.druid.QueryGranularity; import org.codehaus.jackson.annotate.JsonCreator; import org.joda.time.DateTime; import org.joda.time.Days; @@ -32,6 +31,8 @@ import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; +import com.metamx.druid.QueryGranularity; + /** */ public enum IndexGranularity diff --git a/server/src/main/java/com/metamx/druid/index/v1/IndexMerger.java b/server/src/main/java/com/metamx/druid/index/v1/IndexMerger.java index 8eea1be9eb3b..992d19595512 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/IndexMerger.java +++ b/server/src/main/java/com/metamx/druid/index/v1/IndexMerger.java @@ -19,6 +19,30 @@ package com.metamx.druid.index.v1; +import it.uniroma3.mat.extendedset.intset.ConciseSet; +import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.IntBuffer; +import java.nio.MappedByteBuffer; +import java.nio.channels.FileChannel; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeSet; + +import javax.annotation.Nullable; + +import org.apache.commons.io.FileUtils; +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.collect.Iterables; @@ -57,27 +81,6 @@ import com.metamx.druid.kv.VSizeIndexedWriter; import com.metamx.druid.utils.JodaUtils; import com.metamx.druid.utils.SerializerUtils; -import it.uniroma3.mat.extendedset.intset.ConciseSet; -import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; -import org.apache.commons.io.FileUtils; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import javax.annotation.Nullable; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.IntBuffer; -import java.nio.MappedByteBuffer; -import java.nio.channels.FileChannel; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; /** */ diff --git a/server/src/main/java/com/metamx/druid/index/v1/IndexStorageAdapter.java b/server/src/main/java/com/metamx/druid/index/v1/IndexStorageAdapter.java index 8d4c7691ee4f..81d726dbed11 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/IndexStorageAdapter.java +++ b/server/src/main/java/com/metamx/druid/index/v1/IndexStorageAdapter.java @@ -19,6 +19,16 @@ package com.metamx.druid.index.v1; +import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; + +import java.io.Closeable; +import java.util.Arrays; +import java.util.Iterator; +import java.util.Map; + +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -46,14 +56,6 @@ import com.metamx.druid.kv.ListIndexed; import com.metamx.druid.processing.ComplexMetricSelector; import com.metamx.druid.processing.FloatMetricSelector; -import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import java.io.Closeable; -import java.util.Arrays; -import java.util.Iterator; -import java.util.Map; /** */ diff --git a/server/src/main/java/com/metamx/druid/index/v1/IndexableAdapter.java b/server/src/main/java/com/metamx/druid/index/v1/IndexableAdapter.java index 5c65a9699575..4370b48cf77d 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/IndexableAdapter.java +++ b/server/src/main/java/com/metamx/druid/index/v1/IndexableAdapter.java @@ -19,9 +19,10 @@ package com.metamx.druid.index.v1; +import org.joda.time.Interval; + import com.metamx.druid.kv.Indexed; import com.metamx.druid.kv.IndexedInts; -import org.joda.time.Interval; /** */ diff --git a/server/src/main/java/com/metamx/druid/index/v1/MMappedIndexAdapter.java b/server/src/main/java/com/metamx/druid/index/v1/MMappedIndexAdapter.java index 396fb0e2de08..efb9679b66a6 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/MMappedIndexAdapter.java +++ b/server/src/main/java/com/metamx/druid/index/v1/MMappedIndexAdapter.java @@ -19,6 +19,12 @@ package com.metamx.druid.index.v1; +import java.util.Iterator; +import java.util.Map; +import java.util.NoSuchElementException; + +import org.joda.time.Interval; + import com.google.common.collect.Maps; import com.google.common.io.Closeables; import com.metamx.druid.kv.ConciseCompressedIndexedInts; @@ -26,11 +32,6 @@ import com.metamx.druid.kv.IndexedFloats; import com.metamx.druid.kv.IndexedInts; import com.metamx.druid.kv.IndexedLongs; -import org.joda.time.Interval; - -import java.util.Iterator; -import java.util.Map; -import java.util.NoSuchElementException; /** */ diff --git a/server/src/main/java/com/metamx/druid/index/v1/MMappedIndexStorageAdapter.java b/server/src/main/java/com/metamx/druid/index/v1/MMappedIndexStorageAdapter.java index 537f5cd55fba..d9dcb003ee82 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/MMappedIndexStorageAdapter.java +++ b/server/src/main/java/com/metamx/druid/index/v1/MMappedIndexStorageAdapter.java @@ -19,6 +19,15 @@ package com.metamx.druid.index.v1; +import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; + +import java.io.Closeable; +import java.util.Iterator; +import java.util.Map; + +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.collect.ImmutableList; @@ -41,13 +50,6 @@ import com.metamx.druid.kv.IndexedLongs; import com.metamx.druid.processing.ComplexMetricSelector; import com.metamx.druid.processing.FloatMetricSelector; -import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import java.io.Closeable; -import java.util.Iterator; -import java.util.Map; /** */ diff --git a/server/src/main/java/com/metamx/druid/index/v1/MetricColumnSerializer.java b/server/src/main/java/com/metamx/druid/index/v1/MetricColumnSerializer.java index 253ed3cf5a46..2452f820b255 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/MetricColumnSerializer.java +++ b/server/src/main/java/com/metamx/druid/index/v1/MetricColumnSerializer.java @@ -19,8 +19,6 @@ package com.metamx.druid.index.v1; -import com.metamx.druid.aggregation.Aggregator; - import java.io.IOException; /** diff --git a/server/src/main/java/com/metamx/druid/index/v1/Rowboat.java b/server/src/main/java/com/metamx/druid/index/v1/Rowboat.java index 551bf210bb57..f30a55e53fb5 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/Rowboat.java +++ b/server/src/main/java/com/metamx/druid/index/v1/Rowboat.java @@ -19,15 +19,16 @@ package com.metamx.druid.index.v1; +import java.util.Arrays; +import java.util.Map; +import java.util.TreeSet; + +import org.joda.time.DateTime; + import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; -import org.joda.time.DateTime; - -import java.util.Arrays; -import java.util.Map; -import java.util.TreeSet; public class Rowboat implements Comparable { diff --git a/server/src/main/java/com/metamx/druid/index/v1/RowboatFilteringIndexAdapter.java b/server/src/main/java/com/metamx/druid/index/v1/RowboatFilteringIndexAdapter.java index 95061ae39a8a..152118c147e2 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/RowboatFilteringIndexAdapter.java +++ b/server/src/main/java/com/metamx/druid/index/v1/RowboatFilteringIndexAdapter.java @@ -19,11 +19,12 @@ package com.metamx.druid.index.v1; +import org.joda.time.Interval; + import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.metamx.druid.kv.Indexed; import com.metamx.druid.kv.IndexedInts; -import org.joda.time.Interval; /** */ diff --git a/server/src/main/java/com/metamx/druid/index/v1/SegmentIdAttachedStorageAdapter.java b/server/src/main/java/com/metamx/druid/index/v1/SegmentIdAttachedStorageAdapter.java index 1e47528d8012..6357a905bf65 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/SegmentIdAttachedStorageAdapter.java +++ b/server/src/main/java/com/metamx/druid/index/v1/SegmentIdAttachedStorageAdapter.java @@ -19,6 +19,9 @@ package com.metamx.druid.index.v1; +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.metamx.druid.Capabilities; import com.metamx.druid.QueryGranularity; import com.metamx.druid.StorageAdapter; @@ -26,8 +29,6 @@ import com.metamx.druid.index.v1.processing.Cursor; import com.metamx.druid.query.search.SearchHit; import com.metamx.druid.query.search.SearchQuery; -import org.joda.time.DateTime; -import org.joda.time.Interval; /** */ diff --git a/server/src/main/java/com/metamx/druid/index/v1/processing/Cursor.java b/server/src/main/java/com/metamx/druid/index/v1/processing/Cursor.java index 419d23d11ee4..913ca44fb1c4 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/processing/Cursor.java +++ b/server/src/main/java/com/metamx/druid/index/v1/processing/Cursor.java @@ -19,9 +19,10 @@ package com.metamx.druid.index.v1.processing; -import com.metamx.druid.processing.MetricSelectorFactory; import org.joda.time.DateTime; +import com.metamx.druid.processing.MetricSelectorFactory; + /** */ public interface Cursor extends MetricSelectorFactory, DimensionSelectorFactory diff --git a/server/src/main/java/com/metamx/druid/index/v1/processing/CursorFactory.java b/server/src/main/java/com/metamx/druid/index/v1/processing/CursorFactory.java index b18fec4b3226..d32c9921fd07 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/processing/CursorFactory.java +++ b/server/src/main/java/com/metamx/druid/index/v1/processing/CursorFactory.java @@ -19,9 +19,10 @@ package com.metamx.druid.index.v1.processing; +import org.joda.time.Interval; + import com.metamx.druid.QueryGranularity; import com.metamx.druid.index.brita.Filter; -import org.joda.time.Interval; /** */ diff --git a/server/src/main/java/com/metamx/druid/initialization/ServerInit.java b/server/src/main/java/com/metamx/druid/initialization/ServerInit.java index 4a9c68d72aa2..21f69cdb9cb1 100644 --- a/server/src/main/java/com/metamx/druid/initialization/ServerInit.java +++ b/server/src/main/java/com/metamx/druid/initialization/ServerInit.java @@ -19,6 +19,13 @@ package com.metamx.druid.initialization; +import java.nio.ByteBuffer; +import java.util.Map; +import java.util.concurrent.atomic.AtomicLong; + +import org.jets3t.service.impl.rest.httpclient.RestS3Service; +import org.skife.config.ConfigurationObjectFactory; + import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; @@ -44,12 +51,6 @@ import com.metamx.druid.query.search.SearchQueryRunnerFactory; import com.metamx.druid.query.timeboundary.TimeBoundaryQuery; import com.metamx.druid.query.timeboundary.TimeBoundaryQueryRunnerFactory; -import org.jets3t.service.impl.rest.httpclient.RestS3Service; -import org.skife.config.ConfigurationObjectFactory; - -import java.nio.ByteBuffer; -import java.util.Map; -import java.util.concurrent.atomic.AtomicLong; /** */ diff --git a/server/src/main/java/com/metamx/druid/loading/ConvertingBaseQueryableFactory.java b/server/src/main/java/com/metamx/druid/loading/ConvertingBaseQueryableFactory.java index 8cb720affd2d..fb6d83bba447 100644 --- a/server/src/main/java/com/metamx/druid/loading/ConvertingBaseQueryableFactory.java +++ b/server/src/main/java/com/metamx/druid/loading/ConvertingBaseQueryableFactory.java @@ -19,13 +19,14 @@ package com.metamx.druid.loading; +import java.io.File; +import java.io.IOException; + +import org.apache.commons.io.FileUtils; + import com.metamx.common.logger.Logger; import com.metamx.druid.StorageAdapter; import com.metamx.druid.index.v1.IndexIO; -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.io.IOException; /** */ diff --git a/server/src/main/java/com/metamx/druid/loading/DelegatingStorageAdapterLoader.java b/server/src/main/java/com/metamx/druid/loading/DelegatingStorageAdapterLoader.java index 5d421df7a0a4..64e73cd63969 100644 --- a/server/src/main/java/com/metamx/druid/loading/DelegatingStorageAdapterLoader.java +++ b/server/src/main/java/com/metamx/druid/loading/DelegatingStorageAdapterLoader.java @@ -19,13 +19,14 @@ package com.metamx.druid.loading; +import java.util.Map; + +import javax.inject.Inject; + import com.metamx.common.MapUtils; import com.metamx.common.logger.Logger; import com.metamx.druid.StorageAdapter; -import javax.inject.Inject; -import java.util.Map; - /** */ public class DelegatingStorageAdapterLoader implements StorageAdapterLoader diff --git a/server/src/main/java/com/metamx/druid/loading/MMappedStorageAdapterFactory.java b/server/src/main/java/com/metamx/druid/loading/MMappedStorageAdapterFactory.java index 13c65ad5c4d7..c155dd6576e1 100644 --- a/server/src/main/java/com/metamx/druid/loading/MMappedStorageAdapterFactory.java +++ b/server/src/main/java/com/metamx/druid/loading/MMappedStorageAdapterFactory.java @@ -19,13 +19,13 @@ package com.metamx.druid.loading; +import java.io.File; +import java.io.IOException; + import com.metamx.druid.StorageAdapter; import com.metamx.druid.index.v1.IndexIO; import com.metamx.druid.index.v1.MMappedIndexStorageAdapter; -import java.io.File; -import java.io.IOException; - /** */ public class MMappedStorageAdapterFactory extends ConvertingBaseQueryableFactory diff --git a/server/src/main/java/com/metamx/druid/loading/RealtimeSegmentGetter.java b/server/src/main/java/com/metamx/druid/loading/RealtimeSegmentGetter.java index 15a37ebf6118..93f7b3da3453 100644 --- a/server/src/main/java/com/metamx/druid/loading/RealtimeSegmentGetter.java +++ b/server/src/main/java/com/metamx/druid/loading/RealtimeSegmentGetter.java @@ -19,12 +19,12 @@ package com.metamx.druid.loading; -import com.google.inject.Inject; -import com.metamx.common.logger.Logger; - import java.io.File; import java.util.Map; +import com.google.inject.Inject; +import com.metamx.common.logger.Logger; + /** */ public class RealtimeSegmentGetter implements SegmentGetter diff --git a/server/src/main/java/com/metamx/druid/loading/S3SegmentGetter.java b/server/src/main/java/com/metamx/druid/loading/S3SegmentGetter.java index d0d9fb7a0bdf..f35bdd7e90d9 100644 --- a/server/src/main/java/com/metamx/druid/loading/S3SegmentGetter.java +++ b/server/src/main/java/com/metamx/druid/loading/S3SegmentGetter.java @@ -19,22 +19,23 @@ package com.metamx.druid.loading; -import com.google.inject.Inject; -import com.metamx.common.MapUtils; -import com.metamx.common.StreamUtils; -import com.metamx.common.logger.Logger; -import com.metamx.druid.common.s3.S3Utils; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Map; +import java.util.zip.GZIPInputStream; + import org.apache.commons.io.FileUtils; import org.jets3t.service.impl.rest.httpclient.RestS3Service; import org.jets3t.service.model.S3Bucket; import org.jets3t.service.model.S3Object; import org.joda.time.DateTime; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.Map; -import java.util.zip.GZIPInputStream; +import com.google.inject.Inject; +import com.metamx.common.MapUtils; +import com.metamx.common.StreamUtils; +import com.metamx.common.logger.Logger; +import com.metamx.druid.common.s3.S3Utils; /** */ diff --git a/server/src/main/java/com/metamx/druid/loading/S3SegmentGetterConfig.java b/server/src/main/java/com/metamx/druid/loading/S3SegmentGetterConfig.java index c2a4c7f6308f..eaee8e574244 100644 --- a/server/src/main/java/com/metamx/druid/loading/S3SegmentGetterConfig.java +++ b/server/src/main/java/com/metamx/druid/loading/S3SegmentGetterConfig.java @@ -19,10 +19,10 @@ package com.metamx.druid.loading; -import org.skife.config.Config; - import java.io.File; +import org.skife.config.Config; + /** */ public abstract class S3SegmentGetterConfig diff --git a/server/src/main/java/com/metamx/druid/loading/S3ZippedSegmentGetter.java b/server/src/main/java/com/metamx/druid/loading/S3ZippedSegmentGetter.java index d90d33c586dd..f36b89568325 100644 --- a/server/src/main/java/com/metamx/druid/loading/S3ZippedSegmentGetter.java +++ b/server/src/main/java/com/metamx/druid/loading/S3ZippedSegmentGetter.java @@ -19,18 +19,6 @@ package com.metamx.druid.loading; -import com.google.common.io.Closeables; -import com.metamx.common.MapUtils; -import com.metamx.common.StreamUtils; -import com.metamx.common.logger.Logger; -import com.metamx.druid.common.s3.S3Utils; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.jets3t.service.impl.rest.httpclient.RestS3Service; -import org.jets3t.service.model.S3Bucket; -import org.jets3t.service.model.S3Object; -import org.joda.time.DateTime; - import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; @@ -41,6 +29,19 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.jets3t.service.impl.rest.httpclient.RestS3Service; +import org.jets3t.service.model.S3Bucket; +import org.jets3t.service.model.S3Object; +import org.joda.time.DateTime; + +import com.google.common.io.Closeables; +import com.metamx.common.MapUtils; +import com.metamx.common.StreamUtils; +import com.metamx.common.logger.Logger; +import com.metamx.druid.common.s3.S3Utils; + /** */ public class S3ZippedSegmentGetter implements SegmentGetter diff --git a/server/src/main/java/com/metamx/druid/loading/SingleStorageAdapterLoader.java b/server/src/main/java/com/metamx/druid/loading/SingleStorageAdapterLoader.java index 8c58ac1c2bdd..f83dfe8e7ecd 100644 --- a/server/src/main/java/com/metamx/druid/loading/SingleStorageAdapterLoader.java +++ b/server/src/main/java/com/metamx/druid/loading/SingleStorageAdapterLoader.java @@ -19,11 +19,11 @@ package com.metamx.druid.loading; +import java.util.Map; + import com.google.inject.Inject; import com.metamx.druid.StorageAdapter; -import java.util.Map; - /** */ public class SingleStorageAdapterLoader implements StorageAdapterLoader diff --git a/server/src/main/java/com/metamx/druid/loading/StorageAdapterFactory.java b/server/src/main/java/com/metamx/druid/loading/StorageAdapterFactory.java index 92fec4e76324..0ac75e7d9384 100644 --- a/server/src/main/java/com/metamx/druid/loading/StorageAdapterFactory.java +++ b/server/src/main/java/com/metamx/druid/loading/StorageAdapterFactory.java @@ -19,10 +19,10 @@ package com.metamx.druid.loading; -import com.metamx.druid.StorageAdapter; - import java.io.File; +import com.metamx.druid.StorageAdapter; + /** */ public interface StorageAdapterFactory diff --git a/server/src/main/java/com/metamx/druid/loading/StorageAdapterLoader.java b/server/src/main/java/com/metamx/druid/loading/StorageAdapterLoader.java index 96afd41e2ce5..8395828c4aa1 100644 --- a/server/src/main/java/com/metamx/druid/loading/StorageAdapterLoader.java +++ b/server/src/main/java/com/metamx/druid/loading/StorageAdapterLoader.java @@ -19,10 +19,10 @@ package com.metamx.druid.loading; -import com.metamx.druid.StorageAdapter; - import java.util.Map; +import com.metamx.druid.StorageAdapter; + /** */ public interface StorageAdapterLoader diff --git a/server/src/main/java/com/metamx/druid/master/BalancerAnalyzer.java b/server/src/main/java/com/metamx/druid/master/BalancerAnalyzer.java index bdf475b8d1b8..5974ba1083b8 100644 --- a/server/src/main/java/com/metamx/druid/master/BalancerAnalyzer.java +++ b/server/src/main/java/com/metamx/druid/master/BalancerAnalyzer.java @@ -19,6 +19,10 @@ package com.metamx.druid.master; +import java.util.Collections; +import java.util.List; +import java.util.Set; + import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.metamx.common.logger.Logger; @@ -26,10 +30,6 @@ import com.metamx.druid.client.DruidDataSource; import com.metamx.druid.client.DruidServer; -import java.util.Collections; -import java.util.List; -import java.util.Set; - /** * The BalancerAnalyzer keeps the state of the highest and lowest percent used servers. It will update * these states and perform lookaheads to make sure the updated states result in a more balanced cluster. diff --git a/server/src/main/java/com/metamx/druid/master/DruidMaster.java b/server/src/main/java/com/metamx/druid/master/DruidMaster.java index 622899271a68..f42021606bf0 100644 --- a/server/src/main/java/com/metamx/druid/master/DruidMaster.java +++ b/server/src/main/java/com/metamx/druid/master/DruidMaster.java @@ -19,6 +19,19 @@ package com.metamx.druid.master; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; +import java.util.concurrent.Callable; +import java.util.concurrent.ScheduledExecutorService; + +import org.I0Itec.zkclient.exception.ZkNodeExistsException; +import org.codehaus.jackson.map.ObjectMapper; +import org.joda.time.Duration; + import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -47,18 +60,6 @@ import com.metamx.phonebook.PhoneBook; import com.metamx.phonebook.PhoneBookPeon; import com.netflix.curator.x.discovery.ServiceProvider; -import org.I0Itec.zkclient.exception.ZkNodeExistsException; -import org.codehaus.jackson.map.ObjectMapper; -import org.joda.time.Duration; - -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; -import java.util.concurrent.Callable; -import java.util.concurrent.ScheduledExecutorService; /** */ diff --git a/server/src/main/java/com/metamx/druid/master/DruidMasterAssigner.java b/server/src/main/java/com/metamx/druid/master/DruidMasterAssigner.java index 8bbf82559efe..6ef0e9372eda 100644 --- a/server/src/main/java/com/metamx/druid/master/DruidMasterAssigner.java +++ b/server/src/main/java/com/metamx/druid/master/DruidMasterAssigner.java @@ -19,6 +19,10 @@ package com.metamx.druid.master; +import java.util.Collection; +import java.util.Map; +import java.util.PriorityQueue; + import com.google.common.collect.ImmutableMap; import com.metamx.common.guava.Comparators; import com.metamx.common.logger.Logger; @@ -26,10 +30,6 @@ import com.metamx.druid.client.DruidServer; import com.metamx.emitter.service.AlertEvent; -import java.util.Collection; -import java.util.Map; -import java.util.PriorityQueue; - /** */ public class DruidMasterAssigner implements DruidMasterHelper diff --git a/server/src/main/java/com/metamx/druid/master/DruidMasterBalancer.java b/server/src/main/java/com/metamx/druid/master/DruidMasterBalancer.java index b1e03a5e21a0..26854e097fc3 100644 --- a/server/src/main/java/com/metamx/druid/master/DruidMasterBalancer.java +++ b/server/src/main/java/com/metamx/druid/master/DruidMasterBalancer.java @@ -19,6 +19,11 @@ package com.metamx.druid.master; +import java.util.Comparator; +import java.util.Set; +import java.util.TreeSet; +import java.util.concurrent.ConcurrentHashMap; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; import com.metamx.common.guava.Comparators; @@ -28,11 +33,6 @@ import com.metamx.emitter.service.AlertEvent; import com.metamx.emitter.service.ServiceEmitter; -import java.util.Comparator; -import java.util.Set; -import java.util.TreeSet; -import java.util.concurrent.ConcurrentHashMap; - /** */ public class DruidMasterBalancer implements DruidMasterHelper diff --git a/server/src/main/java/com/metamx/druid/master/DruidMasterDropper.java b/server/src/main/java/com/metamx/druid/master/DruidMasterDropper.java index acf97e3cae30..d9ef02b01872 100644 --- a/server/src/main/java/com/metamx/druid/master/DruidMasterDropper.java +++ b/server/src/main/java/com/metamx/druid/master/DruidMasterDropper.java @@ -19,6 +19,10 @@ package com.metamx.druid.master; +import java.util.Collection; +import java.util.Map; +import java.util.Set; + import com.google.common.collect.Maps; import com.metamx.common.guava.Comparators; import com.metamx.common.logger.Logger; @@ -28,10 +32,6 @@ import com.metamx.druid.client.DruidDataSource; import com.metamx.druid.client.DruidServer; -import java.util.Collection; -import java.util.Map; -import java.util.Set; - /** */ public class DruidMasterDropper implements DruidMasterHelper diff --git a/server/src/main/java/com/metamx/druid/master/DruidMasterLogger.java b/server/src/main/java/com/metamx/druid/master/DruidMasterLogger.java index 47d02fd0f520..05a47cfda65d 100644 --- a/server/src/main/java/com/metamx/druid/master/DruidMasterLogger.java +++ b/server/src/main/java/com/metamx/druid/master/DruidMasterLogger.java @@ -19,6 +19,9 @@ package com.metamx.druid.master; +import java.util.Map; +import java.util.Set; + import com.metamx.common.logger.Logger; import com.metamx.druid.client.DataSegment; import com.metamx.druid.client.DruidDataSource; @@ -27,9 +30,6 @@ import com.metamx.emitter.service.ServiceEmitter; import com.metamx.emitter.service.ServiceMetricEvent; -import java.util.Map; -import java.util.Set; - /** */ public class DruidMasterLogger implements DruidMasterHelper diff --git a/server/src/main/java/com/metamx/druid/master/DruidMasterReplicator.java b/server/src/main/java/com/metamx/druid/master/DruidMasterReplicator.java index b02273def849..5c0d51dfd6ce 100644 --- a/server/src/main/java/com/metamx/druid/master/DruidMasterReplicator.java +++ b/server/src/main/java/com/metamx/druid/master/DruidMasterReplicator.java @@ -19,6 +19,13 @@ package com.metamx.druid.master; +import java.util.Collection; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; + import com.google.common.base.Function; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableMap; @@ -31,13 +38,6 @@ import com.metamx.druid.client.DruidServer; import com.metamx.emitter.service.AlertEvent; -import java.util.Collection; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; - /** * The Replicator is responsible for creating and destroying replicants in the cluster. */ diff --git a/server/src/main/java/com/metamx/druid/master/DruidMasterRuntimeParams.java b/server/src/main/java/com/metamx/druid/master/DruidMasterRuntimeParams.java index 2a4cd255bb4d..6728615cf2ad 100644 --- a/server/src/main/java/com/metamx/druid/master/DruidMasterRuntimeParams.java +++ b/server/src/main/java/com/metamx/druid/master/DruidMasterRuntimeParams.java @@ -19,6 +19,12 @@ package com.metamx.druid.master; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -28,12 +34,6 @@ import com.metamx.druid.client.DruidServer; import com.metamx.emitter.service.ServiceEmitter; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** */ public class DruidMasterRuntimeParams diff --git a/server/src/main/java/com/metamx/druid/master/DruidMasterSegmentInfoLoader.java b/server/src/main/java/com/metamx/druid/master/DruidMasterSegmentInfoLoader.java index 2158328c1d8a..97dfd2eb4a2c 100644 --- a/server/src/main/java/com/metamx/druid/master/DruidMasterSegmentInfoLoader.java +++ b/server/src/main/java/com/metamx/druid/master/DruidMasterSegmentInfoLoader.java @@ -19,11 +19,11 @@ package com.metamx.druid.master; +import java.util.Set; + import com.metamx.common.logger.Logger; import com.metamx.druid.client.DataSegment; -import java.util.Set; - public class DruidMasterSegmentInfoLoader implements DruidMasterHelper { private final DruidMaster master; diff --git a/server/src/main/java/com/metamx/druid/master/DruidMasterSegmentMerger.java b/server/src/main/java/com/metamx/druid/master/DruidMasterSegmentMerger.java index 3044b6dccbf6..2395e04ef959 100644 --- a/server/src/main/java/com/metamx/druid/master/DruidMasterSegmentMerger.java +++ b/server/src/main/java/com/metamx/druid/master/DruidMasterSegmentMerger.java @@ -19,6 +19,13 @@ package com.metamx.druid.master; +import java.util.List; +import java.util.Map; + +import org.codehaus.jackson.map.ObjectMapper; +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.google.common.base.Charsets; import com.google.common.base.Function; import com.google.common.base.Preconditions; @@ -41,12 +48,6 @@ import com.metamx.http.client.HttpClientInit; import com.metamx.http.client.response.ToStringResponseHandler; import com.netflix.curator.x.discovery.ServiceProvider; -import org.codehaus.jackson.map.ObjectMapper; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import java.util.List; -import java.util.Map; /** */ diff --git a/server/src/main/java/com/metamx/druid/master/HttpMergerClient.java b/server/src/main/java/com/metamx/druid/master/HttpMergerClient.java index 32c77fdff3dc..58d68e9bbe49 100644 --- a/server/src/main/java/com/metamx/druid/master/HttpMergerClient.java +++ b/server/src/main/java/com/metamx/druid/master/HttpMergerClient.java @@ -19,16 +19,17 @@ package com.metamx.druid.master; +import java.net.URL; +import java.util.List; + +import org.codehaus.jackson.map.ObjectMapper; + import com.google.common.base.Throwables; import com.metamx.druid.client.DataSegment; import com.metamx.druid.merge.ClientAppendQuery; import com.metamx.http.client.HttpClient; import com.metamx.http.client.response.HttpResponseHandler; import com.netflix.curator.x.discovery.ServiceProvider; -import org.codehaus.jackson.map.ObjectMapper; - -import java.net.URL; -import java.util.List; public class HttpMergerClient implements MergerClient { diff --git a/server/src/main/java/com/metamx/druid/master/LoadQueuePeon.java b/server/src/main/java/com/metamx/druid/master/LoadQueuePeon.java index 35953e26b0cb..59ea8e8f2b8c 100644 --- a/server/src/main/java/com/metamx/druid/master/LoadQueuePeon.java +++ b/server/src/main/java/com/metamx/druid/master/LoadQueuePeon.java @@ -19,18 +19,6 @@ package com.metamx.druid.master; -import com.google.common.base.Function; -import com.google.common.collect.Collections2; -import com.google.common.collect.Lists; -import com.metamx.common.guava.Comparators; -import com.metamx.common.logger.Logger; -import com.metamx.druid.client.DataSegment; -import com.metamx.druid.coordination.DataSegmentChangeRequest; -import com.metamx.druid.coordination.SegmentChangeRequestDrop; -import com.metamx.druid.coordination.SegmentChangeRequestLoad; -import com.metamx.phonebook.PhoneBook; -import com.metamx.phonebook.PhoneBookPeon; - import java.util.Arrays; import java.util.Collection; import java.util.Comparator; @@ -43,6 +31,18 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; +import com.google.common.base.Function; +import com.google.common.collect.Collections2; +import com.google.common.collect.Lists; +import com.metamx.common.guava.Comparators; +import com.metamx.common.logger.Logger; +import com.metamx.druid.client.DataSegment; +import com.metamx.druid.coordination.DataSegmentChangeRequest; +import com.metamx.druid.coordination.SegmentChangeRequestDrop; +import com.metamx.druid.coordination.SegmentChangeRequestLoad; +import com.metamx.phonebook.PhoneBook; +import com.metamx.phonebook.PhoneBookPeon; + /** */ public class LoadQueuePeon implements PhoneBookPeon diff --git a/server/src/main/java/com/metamx/druid/master/MergerClient.java b/server/src/main/java/com/metamx/druid/master/MergerClient.java index c2556ccaea05..9db2cb2b4165 100644 --- a/server/src/main/java/com/metamx/druid/master/MergerClient.java +++ b/server/src/main/java/com/metamx/druid/master/MergerClient.java @@ -19,10 +19,10 @@ package com.metamx.druid.master; -import com.metamx.druid.client.DataSegment; - import java.util.List; +import com.metamx.druid.client.DataSegment; + /** */ public interface MergerClient diff --git a/server/src/main/java/com/metamx/druid/metrics/ServerMonitor.java b/server/src/main/java/com/metamx/druid/metrics/ServerMonitor.java index 176f9e3d1744..4015c350699a 100644 --- a/server/src/main/java/com/metamx/druid/metrics/ServerMonitor.java +++ b/server/src/main/java/com/metamx/druid/metrics/ServerMonitor.java @@ -19,14 +19,14 @@ package com.metamx.druid.metrics; +import java.util.Map; + import com.metamx.druid.client.DruidServer; import com.metamx.druid.coordination.ServerManager; import com.metamx.emitter.service.ServiceEmitter; import com.metamx.emitter.service.ServiceMetricEvent; import com.metamx.metrics.AbstractMonitor; -import java.util.Map; - public class ServerMonitor extends AbstractMonitor { private final DruidServer druidServer; diff --git a/server/src/main/java/com/metamx/druid/query/DefaultQueryRunnerFactoryConglomerate.java b/server/src/main/java/com/metamx/druid/query/DefaultQueryRunnerFactoryConglomerate.java index d8db68446b03..3d2dab30266a 100644 --- a/server/src/main/java/com/metamx/druid/query/DefaultQueryRunnerFactoryConglomerate.java +++ b/server/src/main/java/com/metamx/druid/query/DefaultQueryRunnerFactoryConglomerate.java @@ -19,10 +19,10 @@ package com.metamx.druid.query; -import com.metamx.druid.Query; - import java.util.Map; +import com.metamx.druid.Query; + /** */ public class DefaultQueryRunnerFactoryConglomerate implements QueryRunnerFactoryConglomerate diff --git a/server/src/main/java/com/metamx/druid/query/QueryRunnerFactory.java b/server/src/main/java/com/metamx/druid/query/QueryRunnerFactory.java index 5eda9f40514e..2c6c7b340577 100644 --- a/server/src/main/java/com/metamx/druid/query/QueryRunnerFactory.java +++ b/server/src/main/java/com/metamx/druid/query/QueryRunnerFactory.java @@ -19,11 +19,11 @@ package com.metamx.druid.query; +import java.util.concurrent.ExecutorService; + import com.metamx.druid.Query; import com.metamx.druid.StorageAdapter; -import java.util.concurrent.ExecutorService; - /** */ public interface QueryRunnerFactory> diff --git a/server/src/main/java/com/metamx/druid/query/group/GroupByQueryRunnerFactory.java b/server/src/main/java/com/metamx/druid/query/group/GroupByQueryRunnerFactory.java index 01327a44c804..90b4e5783e45 100644 --- a/server/src/main/java/com/metamx/druid/query/group/GroupByQueryRunnerFactory.java +++ b/server/src/main/java/com/metamx/druid/query/group/GroupByQueryRunnerFactory.java @@ -19,6 +19,11 @@ package com.metamx.druid.query.group; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; + import com.google.common.base.Function; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; @@ -35,11 +40,6 @@ import com.metamx.druid.query.QueryRunnerFactory; import com.metamx.druid.query.QueryToolChest; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; - /** */ public class GroupByQueryRunnerFactory implements QueryRunnerFactory diff --git a/server/src/main/java/com/metamx/druid/query/search/SearchQueryRunnerFactory.java b/server/src/main/java/com/metamx/druid/query/search/SearchQueryRunnerFactory.java index ce4e8e89e6ef..d42c0c3051fd 100644 --- a/server/src/main/java/com/metamx/druid/query/search/SearchQueryRunnerFactory.java +++ b/server/src/main/java/com/metamx/druid/query/search/SearchQueryRunnerFactory.java @@ -19,6 +19,9 @@ package com.metamx.druid.query.search; +import java.util.Iterator; +import java.util.concurrent.ExecutorService; + import com.google.common.collect.Lists; import com.metamx.common.ISE; import com.metamx.common.guava.BaseSequence; @@ -35,9 +38,6 @@ import com.metamx.druid.result.Result; import com.metamx.druid.result.SearchResultValue; -import java.util.Iterator; -import java.util.concurrent.ExecutorService; - /** */ public class SearchQueryRunnerFactory implements QueryRunnerFactory, SearchQuery> diff --git a/server/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java b/server/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java index 459a520c9161..dc94a27f4081 100644 --- a/server/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java +++ b/server/src/main/java/com/metamx/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java @@ -19,12 +19,14 @@ package com.metamx.druid.query.timeboundary; +import java.util.Iterator; +import java.util.concurrent.ExecutorService; + import com.metamx.common.ISE; import com.metamx.common.guava.BaseSequence; import com.metamx.common.guava.Sequence; import com.metamx.druid.Query; import com.metamx.druid.StorageAdapter; -import com.metamx.druid.collect.StupidPool; import com.metamx.druid.query.ChainedExecutionQueryRunner; import com.metamx.druid.query.QueryRunner; import com.metamx.druid.query.QueryRunnerFactory; @@ -33,10 +35,6 @@ import com.metamx.druid.result.Result; import com.metamx.druid.result.TimeBoundaryResultValue; -import java.nio.ByteBuffer; -import java.util.Iterator; -import java.util.concurrent.ExecutorService; - /** */ public class TimeBoundaryQueryRunnerFactory diff --git a/server/src/main/java/com/metamx/druid/utils/ExposeS3DataSource.java b/server/src/main/java/com/metamx/druid/utils/ExposeS3DataSource.java index 2d72961a436f..d20e8621aaec 100644 --- a/server/src/main/java/com/metamx/druid/utils/ExposeS3DataSource.java +++ b/server/src/main/java/com/metamx/druid/utils/ExposeS3DataSource.java @@ -19,16 +19,12 @@ package com.metamx.druid.utils; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Sets; -import com.metamx.common.Granularity; -import com.metamx.common.MapUtils; -import com.metamx.common.logger.Logger; -import com.metamx.druid.client.DataSegment; -import com.metamx.druid.common.s3.S3Utils; -import com.metamx.druid.jackson.DefaultObjectMapper; -import com.metamx.druid.zk.StringZkSerializer; +import java.io.IOException; +import java.security.NoSuchAlgorithmException; +import java.util.Arrays; +import java.util.Map; +import java.util.TreeSet; + import org.I0Itec.zkclient.ZkClient; import org.I0Itec.zkclient.ZkConnection; import org.apache.commons.cli.CommandLine; @@ -44,11 +40,16 @@ import org.joda.time.DateTime; import org.joda.time.Interval; -import java.io.IOException; -import java.security.NoSuchAlgorithmException; -import java.util.Arrays; -import java.util.Map; -import java.util.TreeSet; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Sets; +import com.metamx.common.Granularity; +import com.metamx.common.MapUtils; +import com.metamx.common.logger.Logger; +import com.metamx.druid.client.DataSegment; +import com.metamx.druid.common.s3.S3Utils; +import com.metamx.druid.jackson.DefaultObjectMapper; +import com.metamx.druid.zk.StringZkSerializer; /** */ diff --git a/server/src/main/java/com/metamx/druid/utils/ZkSetup.java b/server/src/main/java/com/metamx/druid/utils/ZkSetup.java index 2c4b8f768afd..dd5d6c0daa7f 100644 --- a/server/src/main/java/com/metamx/druid/utils/ZkSetup.java +++ b/server/src/main/java/com/metamx/druid/utils/ZkSetup.java @@ -19,11 +19,12 @@ package com.metamx.druid.utils; +import org.I0Itec.zkclient.ZkClient; +import org.I0Itec.zkclient.ZkConnection; + import com.metamx.druid.db.DbConnector; import com.metamx.druid.db.DbConnectorConfig; import com.metamx.druid.zk.StringZkSerializer; -import org.I0Itec.zkclient.ZkClient; -import org.I0Itec.zkclient.ZkConnection; /** */ diff --git a/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestDropTest.java b/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestDropTest.java index 9673d15b3c02..df11470b5f03 100644 --- a/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestDropTest.java +++ b/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestDropTest.java @@ -19,18 +19,19 @@ package com.metamx.druid.coordination; -import com.google.common.collect.ImmutableMap; -import com.metamx.druid.client.DataSegment; -import com.metamx.druid.jackson.DefaultObjectMapper; -import com.metamx.druid.shard.NoneShardSpec; +import java.util.Arrays; +import java.util.Map; + import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.type.TypeReference; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; -import java.util.Arrays; -import java.util.Map; +import com.google.common.collect.ImmutableMap; +import com.metamx.druid.client.DataSegment; +import com.metamx.druid.jackson.DefaultObjectMapper; +import com.metamx.druid.shard.NoneShardSpec; /** */ diff --git a/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestLoadTest.java b/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestLoadTest.java index eaedcde0b6ad..83d157ecd9c1 100644 --- a/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestLoadTest.java +++ b/server/src/test/java/com/metamx/druid/coordination/SegmentChangeRequestLoadTest.java @@ -19,18 +19,19 @@ package com.metamx.druid.coordination; -import com.google.common.collect.ImmutableMap; -import com.metamx.druid.client.DataSegment; -import com.metamx.druid.jackson.DefaultObjectMapper; -import com.metamx.druid.shard.NoneShardSpec; +import java.util.Arrays; +import java.util.Map; + import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.type.TypeReference; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; -import java.util.Arrays; -import java.util.Map; +import com.google.common.collect.ImmutableMap; +import com.metamx.druid.client.DataSegment; +import com.metamx.druid.jackson.DefaultObjectMapper; +import com.metamx.druid.shard.NoneShardSpec; /** */ diff --git a/server/src/test/java/com/metamx/druid/coordination/ServerManagerTest.java b/server/src/test/java/com/metamx/druid/coordination/ServerManagerTest.java index 1f44bd3e65ff..2e8bbdbb5128 100644 --- a/server/src/test/java/com/metamx/druid/coordination/ServerManagerTest.java +++ b/server/src/test/java/com/metamx/druid/coordination/ServerManagerTest.java @@ -19,6 +19,20 @@ package com.metamx.druid.coordination; +import java.io.IOException; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorService; + +import org.codehaus.jackson.type.TypeReference; +import org.joda.time.DateTime; +import org.joda.time.Interval; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.collect.ImmutableList; @@ -57,19 +71,6 @@ import com.metamx.druid.shard.NoneShardSpec; import com.metamx.emitter.EmittingLogger; import com.metamx.emitter.service.ServiceMetricEvent; -import org.codehaus.jackson.type.TypeReference; -import org.joda.time.DateTime; -import org.joda.time.Interval; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import java.io.IOException; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ExecutorService; /** */ diff --git a/server/src/test/java/com/metamx/druid/coordination/ZkCoordinatorTest.java b/server/src/test/java/com/metamx/druid/coordination/ZkCoordinatorTest.java index a0b6fe539889..9a4b1d4c84f5 100644 --- a/server/src/test/java/com/metamx/druid/coordination/ZkCoordinatorTest.java +++ b/server/src/test/java/com/metamx/druid/coordination/ZkCoordinatorTest.java @@ -19,6 +19,19 @@ package com.metamx.druid.coordination; +import java.io.File; +import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.codehaus.jackson.map.ObjectMapper; +import org.easymock.EasyMock; +import org.joda.time.Interval; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.util.concurrent.MoreExecutors; @@ -32,18 +45,6 @@ import com.metamx.druid.metrics.NoopServiceEmitter; import com.metamx.druid.query.NoopQueryRunnerFactoryConglomerate; import com.metamx.druid.shard.NoneShardSpec; -import org.codehaus.jackson.map.ObjectMapper; -import org.easymock.EasyMock; -import org.joda.time.Interval; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import java.io.File; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; /** */ diff --git a/server/src/test/java/com/metamx/druid/db/DatabaseSegmentManagerTest.java b/server/src/test/java/com/metamx/druid/db/DatabaseSegmentManagerTest.java index d53ac4e783e5..d69929b7d137 100644 --- a/server/src/test/java/com/metamx/druid/db/DatabaseSegmentManagerTest.java +++ b/server/src/test/java/com/metamx/druid/db/DatabaseSegmentManagerTest.java @@ -19,9 +19,11 @@ package com.metamx.druid.db; -import com.google.common.base.Throwables; -import com.google.common.collect.Maps; -import com.metamx.druid.jackson.DefaultObjectMapper; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Executors; + import org.easymock.EasyMock; import org.joda.time.Duration; import org.junit.After; @@ -30,12 +32,8 @@ import org.skife.jdbi.v2.DBI; import org.skife.jdbi.v2.tweak.HandleCallback; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; +import com.google.common.collect.Maps; +import com.metamx.druid.jackson.DefaultObjectMapper; /** */ diff --git a/server/src/test/java/com/metamx/druid/index/v1/ConciseOffsetTest.java b/server/src/test/java/com/metamx/druid/index/v1/ConciseOffsetTest.java index f32ecae3a472..2a81ade14adc 100644 --- a/server/src/test/java/com/metamx/druid/index/v1/ConciseOffsetTest.java +++ b/server/src/test/java/com/metamx/druid/index/v1/ConciseOffsetTest.java @@ -19,12 +19,14 @@ package com.metamx.druid.index.v1; -import com.metamx.druid.index.v1.processing.Offset; import it.uniroma3.mat.extendedset.intset.ConciseSet; import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet; + import org.junit.Assert; import org.junit.Test; +import com.metamx.druid.index.v1.processing.Offset; + /** */ public class ConciseOffsetTest diff --git a/server/src/test/java/com/metamx/druid/index/v1/EmptyIndexTest.java b/server/src/test/java/com/metamx/druid/index/v1/EmptyIndexTest.java index 26faef365fae..71ec8e15e3a3 100644 --- a/server/src/test/java/com/metamx/druid/index/v1/EmptyIndexTest.java +++ b/server/src/test/java/com/metamx/druid/index/v1/EmptyIndexTest.java @@ -19,16 +19,17 @@ package com.metamx.druid.index.v1; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.metamx.druid.QueryGranularity; -import com.metamx.druid.aggregation.AggregatorFactory; +import java.io.File; +import java.util.ArrayList; + import org.joda.time.Interval; import org.junit.Assert; import org.junit.Test; -import java.io.File; -import java.util.ArrayList; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.metamx.druid.QueryGranularity; +import com.metamx.druid.aggregation.AggregatorFactory; public class EmptyIndexTest { diff --git a/server/src/test/java/com/metamx/druid/index/v1/processing/IntersectingOffsetTest.java b/server/src/test/java/com/metamx/druid/index/v1/processing/IntersectingOffsetTest.java index fb6a7826d1d8..b270c700da64 100644 --- a/server/src/test/java/com/metamx/druid/index/v1/processing/IntersectingOffsetTest.java +++ b/server/src/test/java/com/metamx/druid/index/v1/processing/IntersectingOffsetTest.java @@ -19,11 +19,12 @@ package com.metamx.druid.index.v1.processing; -import com.google.common.collect.Lists; +import java.util.LinkedList; + import org.junit.Assert; import org.junit.Test; -import java.util.LinkedList; +import com.google.common.collect.Lists; /** */ diff --git a/server/src/test/java/com/metamx/druid/index/v1/processing/UnioningOffsetTest.java b/server/src/test/java/com/metamx/druid/index/v1/processing/UnioningOffsetTest.java index a49ab9543414..68af2e19d242 100644 --- a/server/src/test/java/com/metamx/druid/index/v1/processing/UnioningOffsetTest.java +++ b/server/src/test/java/com/metamx/druid/index/v1/processing/UnioningOffsetTest.java @@ -19,11 +19,12 @@ package com.metamx.druid.index.v1.processing; -import com.google.common.collect.Lists; +import java.util.ArrayList; + import org.junit.Assert; import org.junit.Test; -import java.util.ArrayList; +import com.google.common.collect.Lists; /** */ diff --git a/server/src/test/java/com/metamx/druid/loading/NoopStorageAdapterLoader.java b/server/src/test/java/com/metamx/druid/loading/NoopStorageAdapterLoader.java index a5bcf8b0b34f..5c1a15be37ea 100644 --- a/server/src/test/java/com/metamx/druid/loading/NoopStorageAdapterLoader.java +++ b/server/src/test/java/com/metamx/druid/loading/NoopStorageAdapterLoader.java @@ -19,6 +19,11 @@ package com.metamx.druid.loading; +import java.util.Map; + +import org.joda.time.DateTime; +import org.joda.time.Interval; + import com.metamx.druid.Capabilities; import com.metamx.druid.QueryGranularity; import com.metamx.druid.StorageAdapter; @@ -26,10 +31,6 @@ import com.metamx.druid.index.v1.processing.Cursor; import com.metamx.druid.query.search.SearchHit; import com.metamx.druid.query.search.SearchQuery; -import org.joda.time.DateTime; -import org.joda.time.Interval; - -import java.util.Map; /** */ diff --git a/server/src/test/java/com/metamx/druid/master/BalancerAnalyzerTest.java b/server/src/test/java/com/metamx/druid/master/BalancerAnalyzerTest.java index 5c5c96b520da..585f5c76f3da 100644 --- a/server/src/test/java/com/metamx/druid/master/BalancerAnalyzerTest.java +++ b/server/src/test/java/com/metamx/druid/master/BalancerAnalyzerTest.java @@ -19,17 +19,19 @@ package com.metamx.druid.master; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import com.metamx.druid.client.DataSegment; -import com.metamx.druid.client.DruidDataSource; -import com.metamx.druid.client.DruidServer; import junit.framework.Assert; + import org.easymock.EasyMock; import org.junit.After; import org.junit.Before; import org.junit.Test; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import com.metamx.druid.client.DataSegment; +import com.metamx.druid.client.DruidDataSource; +import com.metamx.druid.client.DruidServer; + /** */ public class BalancerAnalyzerTest diff --git a/server/src/test/java/com/metamx/druid/master/DruidMasterBalancerTest.java b/server/src/test/java/com/metamx/druid/master/DruidMasterBalancerTest.java index 8ed7f28e8bf2..4aaf3838acdf 100644 --- a/server/src/test/java/com/metamx/druid/master/DruidMasterBalancerTest.java +++ b/server/src/test/java/com/metamx/druid/master/DruidMasterBalancerTest.java @@ -19,18 +19,20 @@ package com.metamx.druid.master; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Sets; -import com.metamx.druid.client.DataSegment; -import com.metamx.druid.client.DruidDataSource; -import com.metamx.druid.client.DruidServer; +import java.util.Arrays; + import junit.framework.Assert; + import org.easymock.EasyMock; import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.util.Arrays; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Sets; +import com.metamx.druid.client.DataSegment; +import com.metamx.druid.client.DruidDataSource; +import com.metamx.druid.client.DruidServer; /** */ diff --git a/server/src/test/java/com/metamx/druid/master/DruidMasterReplicatorTest.java b/server/src/test/java/com/metamx/druid/master/DruidMasterReplicatorTest.java index cd61649a1fbc..10da530d4983 100644 --- a/server/src/test/java/com/metamx/druid/master/DruidMasterReplicatorTest.java +++ b/server/src/test/java/com/metamx/druid/master/DruidMasterReplicatorTest.java @@ -19,20 +19,21 @@ package com.metamx.druid.master; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Sets; -import com.metamx.druid.client.DataSegment; -import com.metamx.druid.client.DruidDataSource; -import com.metamx.druid.client.DruidServer; +import java.util.Arrays; + import junit.framework.Assert; + import org.easymock.EasyMock; import org.joda.time.Interval; import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.util.Arrays; -import java.util.Map; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Sets; +import com.metamx.druid.client.DataSegment; +import com.metamx.druid.client.DruidDataSource; +import com.metamx.druid.client.DruidServer; /** diff --git a/server/src/test/java/com/metamx/druid/master/DruidMasterSegmentMergerTest.java b/server/src/test/java/com/metamx/druid/master/DruidMasterSegmentMergerTest.java index ddb120a98577..6e015906adf7 100644 --- a/server/src/test/java/com/metamx/druid/master/DruidMasterSegmentMergerTest.java +++ b/server/src/test/java/com/metamx/druid/master/DruidMasterSegmentMergerTest.java @@ -19,16 +19,18 @@ package com.metamx.druid.master; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import com.metamx.druid.client.DataSegment; +import java.util.Collection; +import java.util.List; + import junit.framework.Assert; + import org.joda.time.Interval; import org.junit.Test; -import java.util.Collection; -import java.util.List; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.metamx.druid.client.DataSegment; public class DruidMasterSegmentMergerTest { diff --git a/server/src/test/java/com/metamx/druid/master/DruidMasterTest.java b/server/src/test/java/com/metamx/druid/master/DruidMasterTest.java index c13f929ce0cd..ebbe1f0f733a 100644 --- a/server/src/test/java/com/metamx/druid/master/DruidMasterTest.java +++ b/server/src/test/java/com/metamx/druid/master/DruidMasterTest.java @@ -19,6 +19,14 @@ package com.metamx.druid.master; +import java.util.Map; + +import org.easymock.EasyMock; +import org.joda.time.Duration; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + import com.metamx.common.concurrent.ScheduledExecutorFactory; import com.metamx.common.logger.Logger; import com.metamx.druid.client.DataSegment; @@ -29,13 +37,6 @@ import com.metamx.druid.db.DatabaseSegmentManager; import com.metamx.druid.metrics.NoopServiceEmitter; import com.metamx.phonebook.PhoneBook; -import org.easymock.EasyMock; -import org.joda.time.Duration; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import java.util.Map; /** */ From 35f04b4df689d1b54c7322dc9b931cc257702ae4 Mon Sep 17 00:00:00 2001 From: Ian Brandt Date: Tue, 30 Oct 2012 23:26:21 -0700 Subject: [PATCH 3/7] Fixed some minor potential resource leaks. --- .../src/main/java/com/metamx/TsvToJson.java | 73 +++++++++++-------- .../metamx/druid/index/v1/IndexMerger.java | 6 +- 2 files changed, 46 insertions(+), 33 deletions(-) diff --git a/server/src/main/java/com/metamx/TsvToJson.java b/server/src/main/java/com/metamx/TsvToJson.java index a0d28d4364fb..29291fdb4dc0 100644 --- a/server/src/main/java/com/metamx/TsvToJson.java +++ b/server/src/main/java/com/metamx/TsvToJson.java @@ -67,42 +67,51 @@ else if ("ISO8601".equals(fieldParts[1])) { } } - BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(inFile), Charsets.UTF_8)); - BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), Charsets.UTF_8)); - String line = null; - int count = 0; - long currTime = System.currentTimeMillis(); - long startTime = currTime; - while ((line = in.readLine()) != null) { - if (count % 1000000 == 0) { - long nowTime = System.currentTimeMillis(); - System.out.printf("Processed [%,d] lines in %,d millis. Incremental time %,d millis.%n", count, nowTime - startTime, nowTime - currTime); - currTime = nowTime; + BufferedReader in = null; + BufferedWriter out = null; + try { + in = new BufferedReader(new InputStreamReader(new FileInputStream(inFile), Charsets.UTF_8)); + out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), Charsets.UTF_8)); + String line = null; + int count = 0; + long currTime = System.currentTimeMillis(); + long startTime = currTime; + while ((line = in.readLine()) != null) { + if (count % 1000000 == 0) { + long nowTime = System.currentTimeMillis(); + System.out.printf("Processed [%,d] lines in %,d millis. Incremental time %,d millis.%n", count, nowTime - startTime, nowTime - currTime); + currTime = nowTime; + } + ++count; + String[] splits = line.split("\t"); + + if (splits.length == 30) { + continue; + } + + if (splits.length != handlers.length) { + throw new IAE("splits.length[%d] != handlers.length[%d]; line[%s]", splits.length, handlers.length, line); + } + + Map jsonMap = Maps.newLinkedHashMap(); + for (int i = 0; i < handlers.length; ++i) { + jsonMap.put(handlers[i].getFieldName(), handlers[i].process(splits[i])); + } + + final String str = mapper.writeValueAsString(jsonMap); + out.write(str); + out.write("\n"); } - ++count; - String[] splits = line.split("\t"); - - if (splits.length == 30) { - continue; + System.out.printf("Completed %,d lines in %,d millis.%n", count, System.currentTimeMillis() - startTime); + out.flush(); + } finally { + if (out != null) { + out.close(); } - - if (splits.length != handlers.length) { - throw new IAE("splits.length[%d] != handlers.length[%d]; line[%s]", splits.length, handlers.length, line); + if (in != null) { + in.close(); } - - Map jsonMap = Maps.newLinkedHashMap(); - for (int i = 0; i < handlers.length; ++i) { - jsonMap.put(handlers[i].getFieldName(), handlers[i].process(splits[i])); - } - - final String str = mapper.writeValueAsString(jsonMap); - out.write(str); - out.write("\n"); } - System.out.printf("Completed %,d lines in %,d millis.%n", count, System.currentTimeMillis() - startTime); - out.flush(); - out.close(); - in.close(); } public static interface FieldHandler diff --git a/server/src/main/java/com/metamx/druid/index/v1/IndexMerger.java b/server/src/main/java/com/metamx/druid/index/v1/IndexMerger.java index 992d19595512..04a4faec2d82 100644 --- a/server/src/main/java/com/metamx/druid/index/v1/IndexMerger.java +++ b/server/src/main/java/com/metamx/druid/index/v1/IndexMerger.java @@ -416,9 +416,11 @@ private static File makeIndexFiles( long startTime = System.currentTimeMillis(); File indexFile = new File(outDir, "index.drd"); + FileOutputStream fileOutputStream = null; FileChannel channel = null; try { - channel = new FileOutputStream(indexFile).getChannel(); + fileOutputStream = new FileOutputStream(indexFile); + channel = fileOutputStream.getChannel(); channel.write(ByteBuffer.wrap(new byte[]{IndexIO.CURRENT_VERSION_ID})); GenericIndexed.fromIterable(mergedDimensions, GenericIndexed.stringStrategy).writeToChannel(channel); @@ -438,6 +440,8 @@ private static File makeIndexFiles( finally { Closeables.closeQuietly(channel); channel = null; + Closeables.closeQuietly(fileOutputStream); + fileOutputStream = null; } IndexIO.checkFileSize(indexFile); log.info("outDir[%s] completed index.drd in %,d millis.", outDir, System.currentTimeMillis() - startTime); From c5e2a8818791ac87dafb5bc5fbbbf1de3684cee1 Mon Sep 17 00:00:00 2001 From: Ian Brandt Date: Tue, 30 Oct 2012 23:59:31 -0700 Subject: [PATCH 4/7] Resolved dead code warning by null checking the correct variable according to the associated log statement. --- server/src/main/java/com/metamx/druid/master/DruidMaster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/metamx/druid/master/DruidMaster.java b/server/src/main/java/com/metamx/druid/master/DruidMaster.java index f42021606bf0..0a90e7f99dae 100644 --- a/server/src/main/java/com/metamx/druid/master/DruidMaster.java +++ b/server/src/main/java/com/metamx/druid/master/DruidMaster.java @@ -359,7 +359,7 @@ public Iterable apply(DruidDataSource input) DataSegment newDataSegment = sizeAdjuster.updateDescriptor(dataSegment); - if (dataSegment == null) { + if (newDataSegment == null) { log.warn("newDataSegment was null with old dataSegment[%s]. Skipping.", dataSegment); continue; } From e24948319bd3b56b0804e09cae8551b7e097d79a Mon Sep 17 00:00:00 2001 From: Ian Brandt Date: Wed, 31 Oct 2012 00:00:30 -0700 Subject: [PATCH 5/7] Removed some dead/unused code. --- .../query/ChainedExecutionQueryRunner.java | 28 ------------------- .../metamx/druid/guava/CombiningSequence.java | 1 - .../com/metamx/druid/jackson/JodaStuff.java | 1 - .../druid/coordination/ServerManager.java | 1 - 4 files changed, 31 deletions(-) diff --git a/client/src/main/java/com/metamx/druid/query/ChainedExecutionQueryRunner.java b/client/src/main/java/com/metamx/druid/query/ChainedExecutionQueryRunner.java index 1254dd96b539..63eb65d725b5 100644 --- a/client/src/main/java/com/metamx/druid/query/ChainedExecutionQueryRunner.java +++ b/client/src/main/java/com/metamx/druid/query/ChainedExecutionQueryRunner.java @@ -141,32 +141,4 @@ public void cleanup(Iterator tIterator) } ); } - - private static class ThreadNamingCallable implements Callable - { - private final Callable baseCallable; - private final String name; - - ThreadNamingCallable( - Callable baseCallable, - String name - ) - { - this.baseCallable = baseCallable; - this.name = name; - } - - @Override - public T call() throws Exception - { - String oldName = Thread.currentThread().getName(); - try { - Thread.currentThread().setName(name); - return baseCallable.call(); - } - finally { - Thread.currentThread().setName(oldName); - } - } - } } diff --git a/common/src/main/java/com/metamx/druid/guava/CombiningSequence.java b/common/src/main/java/com/metamx/druid/guava/CombiningSequence.java index b4c184f0c8f5..5da61094f052 100644 --- a/common/src/main/java/com/metamx/druid/guava/CombiningSequence.java +++ b/common/src/main/java/com/metamx/druid/guava/CombiningSequence.java @@ -59,7 +59,6 @@ public CombiningSequence( } @Override - @SuppressWarnings("unchecked") public OutType accumulate(OutType initValue, final Accumulator accumulator) { final AtomicReference retVal = new AtomicReference(initValue); diff --git a/common/src/main/java/com/metamx/druid/jackson/JodaStuff.java b/common/src/main/java/com/metamx/druid/jackson/JodaStuff.java index 3b907cdb5c9c..186811dd869d 100644 --- a/common/src/main/java/com/metamx/druid/jackson/JodaStuff.java +++ b/common/src/main/java/com/metamx/druid/jackson/JodaStuff.java @@ -80,7 +80,6 @@ public DateTimeDeserializer() { super(DateTime.class); } - @SuppressWarnings("unchecked") @Override public DateTime deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException diff --git a/server/src/main/java/com/metamx/druid/coordination/ServerManager.java b/server/src/main/java/com/metamx/druid/coordination/ServerManager.java index 7c842046c064..935360834ce8 100644 --- a/server/src/main/java/com/metamx/druid/coordination/ServerManager.java +++ b/server/src/main/java/com/metamx/druid/coordination/ServerManager.java @@ -211,7 +211,6 @@ public Iterable> apply(Interval inp new Function, Iterable>>() { @Override - @SuppressWarnings("unchecked") public Iterable> apply(@Nullable final TimelineObjectHolder holder) { if (holder == null) { From e8f02219bb0f06670e1a61a3ebf340f5d78e4f45 Mon Sep 17 00:00:00 2001 From: Ian Brandt Date: Wed, 31 Oct 2012 12:58:16 -0700 Subject: [PATCH 6/7] Streamlined the Maven POMs, in particular the plugin configurations. The 'mvn versions:display-plugin-updates' report is now warning free, and there are no more Maven warnings reported in Eclipse. --- client/pom.xml | 38 --------------- common/pom.xml | 33 -------------- examples/pom.xml | 61 +++---------------------- examples/rand/pom.xml | 38 --------------- examples/twitter/pom.xml | 38 --------------- index-common/pom.xml | 38 +-------------- indexer/pom.xml | 21 --------- merger/pom.xml | 32 ------------- pom.xml | 99 +++++++++++++++++++++++++++++++--------- realtime/pom.xml | 38 --------------- server/pom.xml | 40 ---------------- 11 files changed, 86 insertions(+), 390 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 4478013e8ab3..f5b3ffaef086 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -22,18 +22,8 @@ 4.0.0 com.metamx.druid druid-client - 0.1.0-SNAPSHOT druid-client druid-client - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - - - - UTF-8 - com.metamx @@ -168,18 +158,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins maven-shade-plugin - 1.6 package @@ -195,24 +174,7 @@ - org.apache.maven.plugins - maven-help-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - - org.apache.maven.plugins maven-jar-plugin - 2.4 diff --git a/common/pom.xml b/common/pom.xml index cbf3e74dc3c5..801d005fabc2 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,14 +22,8 @@ 4.0.0 com.metamx.druid druid-common - 0.1.0-SNAPSHOT druid-common druid-common - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - com.metamx @@ -38,7 +32,6 @@ - UTF-8 0.16.0 @@ -145,33 +138,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-help-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - - org.apache.maven.plugins maven-jar-plugin - 2.4 diff --git a/examples/pom.xml b/examples/pom.xml index f056936fd2d0..631b2e16dffd 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,69 +18,22 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 - com.metamx druid-examples pom - 0.1.0-SNAPSHOT druid-examples druid-examples - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - - - UTF-8 - + + com.metamx + druid + 0.1.0-SNAPSHOT + rand twitter - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - - - - - - pub-libs - pub-libs-local - https://metamx.artifactoryonline.com/metamx/pub-libs-releases-local - - - repo.codahale.com - http://repo.codahale.com - - - nativelibs4java - http://nativelibs4java.sourceforge.net/maven - - - thirdparty-uploads - JBoss Thirdparty Uploads - https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads - - - - - central-local - Central - https://metamx.artifactoryonline.com/metamx/pub-libs-releases-local - - diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 369396c1a8e8..379204d38b79 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -3,18 +3,8 @@ 4.0.0 com.metamx.druid druid-examples-rand - 0.1.0-SNAPSHOT druid-examples-rand druid-examples-rand - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - - - - UTF-8 - com.metamx @@ -159,18 +149,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins maven-shade-plugin - 1.6 package @@ -186,24 +165,7 @@ - org.apache.maven.plugins - maven-help-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - - org.apache.maven.plugins maven-jar-plugin - 2.4 diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index 2c35a040be70..a0e930229c42 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -3,18 +3,8 @@ 4.0.0 com.metamx.druid druid-examples-twitter - 0.1.0-SNAPSHOT druid-examples-twitter druid-examples-twitter - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - - - - UTF-8 - com.metamx @@ -175,18 +165,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins maven-shade-plugin - 1.6 package @@ -202,24 +181,7 @@ - org.apache.maven.plugins - maven-help-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - - org.apache.maven.plugins maven-jar-plugin - 2.4 diff --git a/index-common/pom.xml b/index-common/pom.xml index 9d3066ab1c85..651248848be8 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -18,18 +18,13 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid druid-index-common - 0.1.0-SNAPSHOT druid-index-common Druid Indexer - - scm:git:git://github.com/metamx/druid-index-common.git - scm:git:ssh://git@github.com/metamx/druid-index-common.git - http://github.com/metamx/druid-index-common - com.metamx @@ -63,33 +58,4 @@ test - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - - - - - - UTF-8 - \ No newline at end of file diff --git a/indexer/pom.xml b/indexer/pom.xml index 1d9dbb0785e4..1b45e48d946f 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -22,14 +22,8 @@ 4.0.0 com.metamx.druid druid-indexer - 0.1.0-SNAPSHOT druid-indexer Druid Indexer - - scm:git:git://github.com/metamx/druid-indexer.git - scm:git:ssh://git@github.com/metamx/druid-indexer.git - http://github.com/metamx/druid-indexer - com.metamx @@ -78,18 +72,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins maven-shade-plugin - 1.6 package @@ -112,8 +95,4 @@ - - - UTF-8 - diff --git a/merger/pom.xml b/merger/pom.xml index 016f9f545bc8..6b84d6a239af 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -22,14 +22,8 @@ 4.0.0 com.metamx.druid druid-merger - 0.1.0-SNAPSHOT druid-merger druid-merger - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - com.metamx @@ -77,18 +71,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins maven-shade-plugin - 1.6 package @@ -103,21 +86,6 @@ - - org.apache.maven.plugins - maven-help-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - diff --git a/pom.xml b/pom.xml index f1ebad70e010..957687dcaee3 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,8 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx druid @@ -32,6 +33,10 @@ http://www.github.com/metamx/druid + + 2.2.1 + + UTF-8 @@ -48,27 +53,77 @@ - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - + + + + maven-clean-plugin + 2.5 + + + maven-compiler-plugin + 2.5.1 + + 1.6 + 1.6 + + + + maven-dependency-plugin + 2.5 + + + maven-deploy-plugin + 2.7 + + + maven-help-plugin + 2.1.1 + + + maven-install-plugin + 2.3.1 + + + maven-jar-plugin + 2.4 + + + maven-resources-plugin + 2.5 + + + maven-shade-plugin + 1.7.1 + + + maven-site-plugin + 3.1 + + + maven-surefire-plugin + 2.12.2 + + + UTC + + + + + org.scala-tools + maven-scala-plugin + 2.15.2 + + + - - pub-libs - pub-libs-local - https://metamx.artifactoryonline.com/metamx/pub-libs-releases-local - - + + pub-libs + pub-libs-local + https://metamx.artifactoryonline.com/metamx/pub-libs-releases-local + + repo.codahale.com http://repo.codahale.com @@ -77,9 +132,9 @@ http://nativelibs4java.sourceforge.net/maven - thirdparty-uploads - JBoss Thirdparty Uploads - https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads + thirdparty-uploads + JBoss Thirdparty Uploads + https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads diff --git a/realtime/pom.xml b/realtime/pom.xml index a39774c1eb79..874a8f12d920 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -22,14 +22,8 @@ 4.0.0 com.metamx.druid druid-realtime - 0.1.0-SNAPSHOT druid-realtime druid-realtime - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - com.metamx @@ -139,18 +133,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins maven-shade-plugin - 1.6 package @@ -165,20 +148,9 @@ - - org.apache.maven.plugins - maven-dependency-plugin - 2.2 - - - org.apache.maven.plugins - maven-help-plugin - 2.1.1 - org.scala-tools maven-scala-plugin - 2.15.2 -unchecked @@ -208,16 +180,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - diff --git a/server/pom.xml b/server/pom.xml index 6097075e85d2..050be3a21de0 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -22,14 +22,8 @@ 4.0.0 com.metamx.druid druid-server - 0.1.0-SNAPSHOT druid-server druid-server - - scm:git:ssh://git@github.com/metamx/druid.git - scm:git:ssh://git@github.com/metamx/druid.git - http://www.github.com/metamx/druid - com.metamx @@ -178,18 +172,7 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins maven-shade-plugin - 1.6 package @@ -204,31 +187,8 @@ - - - org.apache.maven.plugins - maven-dependency-plugin - 2.2 - - - org.apache.maven.plugins - maven-help-plugin - 2.1.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - UTC - - - - org.apache.maven.plugins maven-jar-plugin - 2.4 From e7ec073d7562fff9da6bb7472810920ba19af6c1 Mon Sep 17 00:00:00 2001 From: Ian Brandt Date: Wed, 31 Oct 2012 16:10:07 -0700 Subject: [PATCH 7/7] Cleaned Maven dependency configuration. In particular the 'mvn dependency:analyze' report no longer warns of used but undeclared dependencies. --- client/pom.xml | 130 ++++++++++++++--------- common/pom.xml | 87 +++++++--------- examples/rand/pom.xml | 103 +++++++++--------- examples/twitter/pom.xml | 126 +++++++++++----------- index-common/pom.xml | 30 +++++- indexer/pom.xml | 47 ++++++++- merger/pom.xml | 118 ++++++++++++++++++++- pom.xml | 218 +++++++++++++++++++++++++++++++++++++++ realtime/pom.xml | 93 ++++++++++++++--- server/pom.xml | 139 +++++++++++++++++-------- 10 files changed, 801 insertions(+), 290 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index f5b3ffaef086..333b98689c12 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -18,7 +18,8 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid druid-client @@ -43,114 +44,143 @@ ${project.parent.version} + + com.metamx + emitter + com.metamx http-client - 0.6.1 com.metamx - emitter - 0.0.7 + java-util + + + com.metamx + server-metrics + + com.davekoelle + alphanum + + + commons-codec + commons-codec + + + org.skife.config + config-magic + + + com.netflix.curator + curator-client + + + com.netflix.curator + curator-framework + + + com.netflix.curator + curator-x-discovery + org.mortbay.jetty jetty - 6.1.26 - com.google.inject - guice - 3.0 + org.mortbay.jetty + jetty-util + 6.1.26 com.google.guava guava - 11.0.1 - com.sun.jersey - jersey-server - 1.9.1 + com.google.inject + guice - com.sun.jersey - jersey-core - 1.9.1 + com.ibm.icu + icu4j - com.sun.jersey.contribs - jersey-guice - 1.9.1 + org.codehaus.jackson + jackson-core-asl - com.google.inject.extensions - guice-servlet - 3.0 + org.codehaus.jackson + jackson-jaxrs org.codehaus.jackson - jackson-jaxrs - 1.9.9 + jackson-mapper-asl org.codehaus.jackson jackson-smile - 1.9.9 - log4j - log4j - 1.2.16 + javax.inject + javax.inject - org.slf4j - slf4j-log4j12 - 1.6.2 + com.sun.jersey + jersey-server - com.github.sgroschupf - zkclient - 0.1 + com.sun.jersey + jersey-core - commons-codec - commons-codec - 1.3 + com.sun.jersey.contribs + jersey-guice - org.skife.config - config-magic - 0.9 + joda-time + joda-time - com.metamx - server-metrics - 0.0.2 + com.google.code.findbugs + jsr305 - com.davekoelle - alphanum - 1.0.3 + com.google.inject.extensions + guice-servlet - com.ibm.icu - icu4j - 4.8.1 + log4j + log4j + + + org.jboss.netty + netty + 3.2.4.Final + + + org.mortbay.jetty + servlet-api + + + org.slf4j + slf4j-log4j12 + + + com.github.sgroschupf + zkclient junit junit - 4.8.1 test org.easymock easymock - 3.0 test diff --git a/common/pom.xml b/common/pom.xml index 801d005fabc2..5539f1298be6 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -18,7 +18,8 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid druid-common @@ -31,105 +32,95 @@ 0.1.0-SNAPSHOT - - 0.16.0 - - com.metamx java-util - ${metamx.java-util.version} + - joda-time - joda-time - 1.6 + commons-codec + commons-codec - com.google.guava - guava - 11.0.1 + commons-dbcp + commons-dbcp + 1.4 - log4j - log4j - 1.2.16 + commons-pool + commons-pool + 1.6 - commons-codec - commons-codec - 1.3 + org.skife.config + config-magic - - org.codehaus.jackson - jackson-core-asl - 1.9.9 + com.netflix.curator + curator-recipes - org.codehaus.jackson - jackson-mapper-asl - 1.9.9 + com.netflix.curator + curator-x-discovery it.uniroma3.mat extendedset - 1.3.2 - mysql - mysql-connector-java - 5.1.18 + com.google.guava + guava + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl org.jdbi jdbi - 2.32 - commons-pool - commons-pool - 1.6 + joda-time + joda-time - commons-dbcp - commons-dbcp - 1.4 + com.google.code.findbugs + jsr305 - org.mozilla - rhino - 1.7R4 + log4j + log4j - com.netflix.curator - curator-recipes - 1.2.2 + mysql + mysql-connector-java + 5.1.18 - com.netflix.curator - curator-x-discovery - 1.2.2 + org.mozilla + rhino + 1.7R4 junit junit - 4.8.1 test org.easymock easymock - 3.0 test com.metamx java-util - ${metamx.java-util.version} test-jar test diff --git a/examples/rand/pom.xml b/examples/rand/pom.xml index 379204d38b79..1eae59a2ced3 100644 --- a/examples/rand/pom.xml +++ b/examples/rand/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.metamx.druid druid-examples-rand @@ -29,119 +30,113 @@ ${project.parent.version} + + com.metamx + emitter + com.metamx http-client - 0.6.1 com.metamx - emitter - 0.0.7 + java-util + + + com.metamx + server-metrics - org.mortbay.jetty - jetty - 6.1.26 + com.davekoelle + alphanum - joda-time - joda-time - 2.1 + commons-codec + commons-codec - com.google.inject - guice - 3.0 + org.skife.config + config-magic com.google.guava guava - 11.0.1 - com.sun.jersey - jersey-server - 1.9.1 + com.google.inject + guice - com.sun.jersey - jersey-core - 1.9.1 + com.google.inject.extensions + guice-servlet - com.sun.jersey.contribs - jersey-guice - 1.9.1 + com.ibm.icu + icu4j - com.google.inject.extensions - guice-servlet - 3.0 + org.codehaus.jackson + jackson-core-asl org.codehaus.jackson jackson-jaxrs - 1.9.9 + + + org.codehaus.jackson + jackson-mapper-asl org.codehaus.jackson jackson-smile - 1.9.9 - log4j - log4j - 1.2.16 + org.jdbi + jdbi - org.slf4j - slf4j-log4j12 - 1.6.2 + com.sun.jersey + jersey-core - com.github.sgroschupf - zkclient - 0.1 + com.sun.jersey.contribs + jersey-guice - commons-codec - commons-codec - 1.3 + com.sun.jersey + jersey-server - org.skife.config - config-magic - 0.9 + org.mortbay.jetty + jetty - com.metamx - server-metrics - 0.0.2 + joda-time + joda-time - com.davekoelle - alphanum - 1.0.3 + log4j + log4j - com.ibm.icu - icu4j - 4.8.1 + org.slf4j + slf4j-log4j12 + + + com.github.sgroschupf + zkclient junit junit - 4.8.1 test org.easymock easymock - 3.0 test diff --git a/examples/twitter/pom.xml b/examples/twitter/pom.xml index a0e930229c42..d6d7cb89f918 100644 --- a/examples/twitter/pom.xml +++ b/examples/twitter/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.metamx.druid druid-examples-twitter @@ -29,135 +30,128 @@ ${project.parent.version} + + com.metamx + emitter + com.metamx http-client - 0.6.1 com.metamx - emitter - 0.0.7 + java-util + + + com.metamx + server-metrics - - org.twitter4j - twitter4j-core - 2.2.6 - - org.twitter4j - twitter4j-async - 2.2.6 + com.davekoelle + alphanum - org.twitter4j - twitter4j-stream - 2.2.6 + commons-codec + commons-codec - - org.mortbay.jetty - jetty - 6.1.26 + org.skife.config + config-magic - joda-time - joda-time - 2.1 + com.google.guava + guava com.google.inject guice - 3.0 - com.google.guava - guava - 11.0.1 + com.google.inject.extensions + guice-servlet + + + com.ibm.icu + icu4j + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-smile + + + org.jdbi + jdbi com.sun.jersey jersey-server - 1.9.1 com.sun.jersey jersey-core - 1.9.1 com.sun.jersey.contribs jersey-guice - 1.9.1 - - - com.google.inject.extensions - guice-servlet - 3.0 - org.codehaus.jackson - jackson-jaxrs - 1.9.9 + org.mortbay.jetty + jetty - org.codehaus.jackson - jackson-smile - 1.9.9 + joda-time + joda-time log4j log4j - 1.2.16 org.slf4j slf4j-log4j12 - 1.6.2 - - - com.github.sgroschupf - zkclient - 0.1 - commons-codec - commons-codec - 1.3 - - - org.skife.config - config-magic - 0.9 + org.twitter4j + twitter4j-core + 2.2.6 - com.metamx - server-metrics - 0.0.2 + org.twitter4j + twitter4j-async + 2.2.6 - com.davekoelle - alphanum - 1.0.3 + org.twitter4j + twitter4j-stream + 2.2.6 - com.ibm.icu - icu4j - 4.8.1 + com.github.sgroschupf + zkclient junit junit - 4.8.1 test org.easymock easymock - 3.0 test diff --git a/index-common/pom.xml b/index-common/pom.xml index 651248848be8..c204ac4b2a7a 100644 --- a/index-common/pom.xml +++ b/index-common/pom.xml @@ -38,23 +38,45 @@ druid-common ${project.parent.version} + + + com.metamx + java-util + + com.ning compress-lzf - 0.8.4 + + + it.uniroma3.mat + extendedset + + + org.codehaus.jackson + jackson-core-asl net.java.dev.jets3t jets3t - 0.8.1 - + + joda-time + joda-time + + + com.google.code.findbugs + jsr305 + + + com.google.guava + guava + junit junit - 4.8.1 test diff --git a/indexer/pom.xml b/indexer/pom.xml index 1b45e48d946f..c70c9fcf041a 100644 --- a/indexer/pom.xml +++ b/indexer/pom.xml @@ -18,7 +18,8 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid druid-indexer @@ -44,10 +45,10 @@ - org.apache.hadoop - hadoop-core - 0.20.2 + com.metamx + java-util + com.amazonaws aws-java-sdk @@ -59,12 +60,48 @@ + + commons-io + commons-io + + + com.google.guava + guava + + + org.apache.hadoop + hadoop-core + 0.20.2 + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.jdbi + jdbi + + + joda-time + joda-time + + + com.google.code.findbugs + jsr305 + + + com.github.sgroschupf + zkclient + junit junit - 4.8.1 test diff --git a/merger/pom.xml b/merger/pom.xml index 6b84d6a239af..e5fc6f99f69e 100644 --- a/merger/pom.xml +++ b/merger/pom.xml @@ -18,7 +18,8 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid druid-merger @@ -32,6 +33,11 @@ + + com.metamx.druid + druid-common + ${project.parent.version} + com.metamx.druid druid-server @@ -42,6 +48,11 @@ druid-client ${project.parent.version} + + com.metamx.druid + druid-index-common + ${project.parent.version} + com.metamx.druid druid-indexer @@ -53,17 +64,118 @@ ${project.parent.version} + + com.metamx + emitter + + + com.metamx + http-client + + + com.metamx + java-util + + + com.metamx + server-metrics + + + + commons-codec + commons-codec + + + commons-io + commons-io + + + org.skife.config + config-magic + + + com.netflix.curator + curator-framework + + + com.netflix.curator + curator-recipes + + + com.google.guava + guava + + + com.google.inject + guice + + + com.google.inject.extensions + guice-servlet + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-mapper-asl + + + javax.inject + javax.inject + + + org.jdbi + jdbi + + + com.sun.jersey + jersey-core + + + com.sun.jersey.contribs + jersey-guice + + + net.java.dev.jets3t + jets3t + + + org.mortbay.jetty + jetty + + + joda-time + joda-time + + + com.google.code.findbugs + jsr305 + + + com.github.sgroschupf + zkclient + + + org.apache.zookeeper + zookeeper + 3.4.3 + + junit junit - 4.8.1 test org.easymock easymock - 3.0 test diff --git a/pom.xml b/pom.xml index 957687dcaee3..35ecc263c9ac 100644 --- a/pom.xml +++ b/pom.xml @@ -52,6 +52,224 @@ examples + + + + + com.metamx + emitter + 0.0.7 + + + com.metamx + http-client + 0.6.1 + + + com.metamx + java-util + 0.16.0 + + + com.metamx + server-metrics + 0.0.2 + + + + com.davekoelle + alphanum + 1.0.3 + + + commons-codec + commons-codec + 1.3 + + + commons-httpclient + commons-httpclient + 3.1 + + + commons-io + commons-io + 2.0.1 + + + commons-logging + commons-logging + 1.1.1 + + + com.ning + compress-lzf + 0.8.4 + + + org.skife.config + config-magic + 0.9 + + + com.netflix.curator + curator-client + 1.2.2 + + + com.netflix.curator + curator-framework + 1.2.2 + + + com.netflix.curator + curator-recipes + 1.2.2 + + + com.netflix.curator + curator-x-discovery + 1.2.2 + + + it.uniroma3.mat + extendedset + 1.3.2 + + + com.google.guava + guava + 11.0.1 + + + com.google.inject + guice + 3.0 + + + com.google.inject.extensions + guice-servlet + 3.0 + + + com.ibm.icu + icu4j + 4.8.1 + + + org.codehaus.jackson + jackson-core-asl + 1.9.9 + + + org.codehaus.jackson + jackson-jaxrs + 1.9.9 + + + org.codehaus.jackson + jackson-mapper-asl + 1.9.9 + + + org.codehaus.jackson + jackson-smile + 1.9.9 + + + javax.inject + javax.inject + 1 + + + com.jamesmurty.utils + java-xmlbuilder + 0.4 + + + org.jdbi + jdbi + 2.32 + + + com.sun.jersey + jersey-core + 1.9.1 + + + com.sun.jersey.contribs + jersey-guice + 1.9.1 + + + com.sun.jersey + jersey-server + 1.9.1 + + + net.java.dev.jets3t + jets3t + 0.8.1 + + + org.mortbay.jetty + jetty + 6.1.26 + + + joda-time + joda-time + 2.1 + + + com.google.code.findbugs + jsr305 + 2.0.1 + + + log4j + log4j + 1.2.16 + + + org.mortbay.jetty + servlet-api + 2.5-20081211 + + + org.slf4j + slf4j-log4j12 + 1.6.2 + + + com.github.sgroschupf + zkclient + 0.1 + + + + + com.metamx + java-util + test-jar + test + 0.16.0 + + + + org.easymock + easymock + 3.0 + test + + + junit + junit + 4.8.1 + test + + + diff --git a/realtime/pom.xml b/realtime/pom.xml index 874a8f12d920..0356a4a04f69 100644 --- a/realtime/pom.xml +++ b/realtime/pom.xml @@ -18,7 +18,8 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid druid-realtime @@ -46,15 +47,72 @@ druid-client ${project.parent.version} + - org.scala-lang - scala-library - ${scala.version} + com.metamx + emitter - org.scala-lang - scala-compiler - ${scala.version} + com.metamx + http-client + + + com.metamx + java-util + + + com.metamx + server-metrics + + + + org.apache.directory.studio + org.apache.commons.collections + 3.2.1 + + + commons-io + commons-io + + + org.skife.config + config-magic + + + com.google.guava + guava + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-smile + + + org.jdbi + jdbi + + + net.java.dev.jets3t + jets3t + + + org.mortbay.jetty + jetty + + + joda-time + joda-time + + + com.google.code.findbugs + jsr305 kafka @@ -68,9 +126,18 @@ - org.apache.directory.studio - org.apache.commons.collections - 3.2.1 + org.scala-lang + scala-library + ${scala.version} + + + org.scala-lang + scala-compiler + ${scala.version} + + + com.github.sgroschupf + zkclient @@ -84,25 +151,21 @@ commons-codec commons-codec - 1.3 true commons-logging commons-logging - 1.1.1 true commons-httpclient commons-httpclient - 3.1 true com.jamesmurty.utils java-xmlbuilder - 0.4 true @@ -111,13 +174,11 @@ junit junit - 4.8.1 test org.easymock easymock - 3.0 test diff --git a/server/pom.xml b/server/pom.xml index 050be3a21de0..18125b45cf5f 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -18,7 +18,8 @@ ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --> - + 4.0.0 com.metamx.druid druid-server @@ -44,9 +45,26 @@ - org.mortbay.jetty - jetty - 6.1.26 + com.metamx + emitter + + + com.metamx + http-client + + + com.metamx + java-util + + + com.metamx + server-metrics + + + + commons-cli + commons-cli + 1.2 commons-lang @@ -56,92 +74,127 @@ commons-io commons-io - 2.0.1 - com.google.inject - guice - 3.0 + com.ning + compress-lzf + + + org.skife.config + config-magic + + + com.netflix.curator + curator-framework + + + com.netflix.curator + curator-x-discovery + + + it.uniroma3.mat + extendedset com.google.guava guava - 11.0.1 - log4j - log4j - 1.2.16 + com.google.inject + guice - org.slf4j - slf4j-log4j12 - 1.6.2 + com.google.inject.extensions + guice-servlet - commons-cli - commons-cli - 1.2 + org.codehaus.jackson + jackson-core-asl - com.github.sgroschupf - zkclient - 0.1 + org.codehaus.jackson + jackson-jaxrs - com.ning - compress-lzf - 0.8.4 + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-smile + + + javax.inject + javax.inject + + + org.jdbi + jdbi com.sun.jersey jersey-server - 1.9.1 com.sun.jersey jersey-core - 1.9.1 com.sun.jersey.contribs jersey-guice - 1.9.1 - com.google.inject.extensions - guice-servlet - 3.0 + net.java.dev.jets3t + jets3t - org.codehaus.jackson - jackson-jaxrs - 1.9.6 + org.mortbay.jetty + jetty + + + joda-time + joda-time + + + com.google.code.findbugs + jsr305 + + + log4j + log4j + + + org.mortbay.jetty + servlet-api + + + org.slf4j + slf4j-log4j12 + + + com.github.sgroschupf + zkclient commons-codec commons-codec - 1.3 true commons-logging commons-logging - 1.1.1 true commons-httpclient commons-httpclient - 3.1 true com.jamesmurty.utils java-xmlbuilder - 0.4 true @@ -150,21 +203,19 @@ junit junit - 4.8.1 test org.easymock easymock - 3.0 test - com.metamx.druid - druid-client - ${project.parent.version} - test-jar - test + com.metamx.druid + druid-client + ${project.parent.version} + test-jar + test