From 26e0eb62cbefe3db4dedbce30b37b2de573b8062 Mon Sep 17 00:00:00 2001 From: fjy Date: Wed, 15 May 2013 17:28:08 -0700 Subject: [PATCH] merge and other refactorings --- client/pom.xml | 7 +++++- {index-common => indexing-common}/pom.xml | 6 ++--- .../com/metamx/druid/common/s3/S3Utils.java | 0 .../metamx/druid/index/QueryableIndex.java | 0 .../druid/index/SimpleQueryableIndex.java | 0 .../druid/index/column/AbstractColumn.java | 0 .../druid/index/column/BitmapIndex.java | 0 .../com/metamx/druid/index/column/Column.java | 0 .../druid/index/column/ColumnBuilder.java | 0 .../index/column/ColumnCapabilities.java | 0 .../index/column/ColumnCapabilitiesImpl.java | 0 .../druid/index/column/ColumnDescriptor.java | 0 .../druid/index/column/ColumnSelector.java | 0 .../druid/index/column/ComplexColumn.java | 0 .../druid/index/column/ComplexColumnImpl.java | 0 .../index/column/DictionaryEncodedColumn.java | 0 .../druid/index/column/FloatColumn.java | 0 .../druid/index/column/GenericColumn.java | 0 .../index/column/IndexedComplexColumn.java | 0 .../column/IndexedFloatsGenericColumn.java | 0 .../column/IndexedLongsGenericColumn.java | 0 .../metamx/druid/index/column/LongColumn.java | 0 .../druid/index/column/RunLengthColumn.java | 0 .../druid/index/column/SimpleColumn.java | 0 .../column/SimpleDictionaryEncodedColumn.java | 0 .../druid/index/column/SpatialIndex.java | 0 .../index/column/StringMultiValueColumn.java | 0 .../metamx/druid/index/column/ValueType.java | 0 .../serde/BitmapIndexColumnPartSupplier.java | 0 .../druid/index/serde/ColumnPartSerde.java | 0 .../index/serde/ComplexColumnPartSerde.java | 0 .../serde/ComplexColumnPartSupplier.java | 0 .../DictionaryEncodedColumnPartSerde.java | 0 .../DictionaryEncodedColumnSupplier.java | 0 .../serde/FloatGenericColumnPartSerde.java | 0 .../serde/FloatGenericColumnSupplier.java | 0 .../serde/LongGenericColumnPartSerde.java | 0 .../serde/LongGenericColumnSupplier.java | 0 .../serde/SpatialIndexColumnPartSupplier.java | 0 .../v1/ComplexMetricColumnSerializer.java | 0 .../CompressedFloatBufferObjectStrategy.java | 0 .../v1/CompressedFloatsIndexedSupplier.java | 0 .../CompressedFloatsSupplierSerializer.java | 0 .../CompressedLongBufferObjectStrategy.java | 0 .../v1/CompressedLongsIndexedSupplier.java | 0 .../v1/CompressedLongsSupplierSerializer.java | 0 .../index/v1/CompressedObjectStrategy.java | 0 .../druid/index/v1/CompressedPools.java | 0 .../druid/index/v1/DimensionColumn.java | 0 .../index/v1/FloatMetricColumnSerializer.java | 0 .../index/v1/InMemoryCompressedFloats.java | 0 .../index/v1/InMemoryCompressedLongs.java | 0 .../druid/index/v1/IncrementalIndex.java | 0 .../index/v1/IncrementalIndexAdapter.java | 0 .../index/v1/IncrementalIndexSchema.java | 0 .../java/com/metamx/druid/index/v1/Index.java | 0 .../com/metamx/druid/index/v1/IndexIO.java | 0 .../metamx/druid/index/v1/IndexMerger.java | 0 .../druid/index/v1/IndexableAdapter.java | 0 .../metamx/druid/index/v1/MMappedIndex.java | 0 .../druid/index/v1/MMappedIndexAdapter.java | 0 .../index/v1/MetricColumnSerializer.java | 0 .../metamx/druid/index/v1/MetricHolder.java | 0 .../v1/QueryableIndexIndexableAdapter.java | 0 .../com/metamx/druid/index/v1/Rowboat.java | 0 .../v1/SpatialDimensionRowFormatter.java | 0 .../index/v1/SpatialDimensionSchema.java | 0 .../v1/serde/ComplexMetricExtractor.java | 0 .../index/v1/serde/ComplexMetricSerde.java | 0 .../druid/index/v1/serde/ComplexMetrics.java | 0 .../druid/index/v1/serde/Registererer.java | 0 .../druid/indexer/data/CSVDataSpec.java | 0 .../metamx/druid/indexer/data/DataSpec.java | 0 .../druid/indexer/data/DelimitedDataSpec.java | 0 .../druid/indexer/data/InputRowParser.java | 0 .../druid/indexer/data/JSONDataSpec.java | 0 .../druid/indexer/data/MapInputRowParser.java | 0 .../indexer/data/StringInputRowParser.java | 0 .../druid/indexer/data/TimestampSpec.java | 0 .../indexer/data/ToLowercaseDataSpec.java | 0 .../druid/kv/ArrayBasedIndexedInts.java | 0 .../com/metamx/druid/kv/ArrayIndexed.java | 0 .../metamx/druid/kv/ByteBufferSerializer.java | 0 .../com/metamx/druid/kv/ByteBufferWriter.java | 0 .../kv/ConciseCompressedIndexedInts.java | 0 .../com/metamx/druid/kv/EmptyIndexedInts.java | 0 .../com/metamx/druid/kv/GenericIndexed.java | 0 .../metamx/druid/kv/GenericIndexedWriter.java | 0 .../main/java/com/metamx/druid/kv/IOPeon.java | 0 .../java/com/metamx/druid/kv/Indexed.java | 0 .../com/metamx/druid/kv/IndexedFloats.java | 0 .../java/com/metamx/druid/kv/IndexedInts.java | 0 .../metamx/druid/kv/IndexedIntsIterator.java | 0 .../com/metamx/druid/kv/IndexedIterable.java | 0 .../java/com/metamx/druid/kv/IndexedList.java | 0 .../com/metamx/druid/kv/IndexedLongs.java | 0 .../com/metamx/druid/kv/IndexedRTree.java | 0 .../java/com/metamx/druid/kv/Indexedids.java | 0 .../metamx/druid/kv/IntBufferIndexedInts.java | 0 .../java/com/metamx/druid/kv/ListIndexed.java | 0 .../com/metamx/druid/kv/ObjectStrategy.java | 0 .../com/metamx/druid/kv/TmpFileIOPeon.java | 0 .../com/metamx/druid/kv/VSizeIndexed.java | 0 .../com/metamx/druid/kv/VSizeIndexedInts.java | 0 .../metamx/druid/kv/VSizeIndexedWriter.java | 0 .../CompressedFloatsIndexedSupplierTest.java | 0 ...ompressedFloatsSupplierSerializerTest.java | 0 .../CompressedLongsIndexedSupplierTest.java | 0 ...CompressedLongsSupplierSerializerTest.java | 0 .../druid/index/v1/IOPeonForTesting.java | 0 .../v1/InMemoryCompressedFloatsTest.java | 0 .../index/v1/InMemoryCompressedLongsTest.java | 0 .../druid/index/v1/IncrementalIndexTest.java | 0 .../metamx/druid/kv/GenericIndexedTest.java | 0 .../com/metamx/druid/kv/IndexedIntsTest.java | 0 .../metamx/druid/kv/VSizeIndexedIntsTest.java | 0 .../com/metamx/druid/kv/VSizeIndexedTest.java | 0 .../src/test/resources/druid.sample.tsv | 0 .../test/resources/druid.sample.tsv.bottom | 0 .../src/test/resources/druid.sample.tsv.top | 0 {indexer => indexing-hadoop}/README | 0 {indexer => indexing-hadoop}/pom.xml | 6 ++--- .../java/com/metamx/druid/indexer/Bucket.java | 0 .../metamx/druid/indexer/DbUpdaterJob.java | 0 .../druid/indexer/DeterminePartitionsJob.java | 0 .../druid/indexer/HadoopDruidIndexer.java | 0 .../indexer/HadoopDruidIndexerAzkWrapper.java | 0 .../indexer/HadoopDruidIndexerConfig.java | 0 .../druid/indexer/HadoopDruidIndexerJob.java | 0 .../druid/indexer/HadoopDruidIndexerMain.java | 0 .../indexer/HadoopDruidIndexerMapper.java | 0 .../druid/indexer/HadoopDruidIndexerNode.java | 0 .../metamx/druid/indexer/HadoopIOPeon.java | 0 .../druid/indexer/HadoopyShardSpec.java | 0 .../druid/indexer/IndexGeneratorJob.java | 0 .../java/com/metamx/druid/indexer/Jobby.java | 0 .../metamx/druid/indexer/SortableBytes.java | 0 .../druid/indexer/StringIntervalFunction.java | 0 .../java/com/metamx/druid/indexer/Utils.java | 0 .../granularity/ArbitraryGranularitySpec.java | 0 .../indexer/granularity/GranularitySpec.java | 0 .../granularity/UniformGranularitySpec.java | 0 .../indexer/hadoop/FSSpideringIterator.java | 0 .../indexer/partitions/PartitionsSpec.java | 0 .../path/GranularUnprocessedPathSpec.java | 0 .../indexer/path/GranularityPathSpec.java | 0 .../metamx/druid/indexer/path/PathSpec.java | 0 .../druid/indexer/path/StaticPathSpec.java | 0 .../druid/indexer/rollup/DataRollupSpec.java | 0 .../indexer/updater/DbUpdaterJobSpec.java | 0 .../druid/indexer/updater/UpdaterJobSpec.java | 0 .../indexer/updater/ZkUpdaterJobSpec.java | 0 .../indexer/HadoopDruidIndexerConfigTest.java | 0 .../druid/indexer/SortableBytesTest.java | 0 .../granularity/ArbitraryGranularityTest.java | 0 .../granularity/UniformGranularityTest.java | 0 .../hadoop/FSSpideringIteratorTest.java | 0 pom.xml | 22 +++++++++---------- 158 files changed, 23 insertions(+), 18 deletions(-) rename {index-common => indexing-common}/pom.xml (96%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/common/s3/S3Utils.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/QueryableIndex.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/SimpleQueryableIndex.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/AbstractColumn.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/BitmapIndex.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/Column.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/ColumnBuilder.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/ColumnCapabilities.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/ColumnCapabilitiesImpl.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/ColumnDescriptor.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/ColumnSelector.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/ComplexColumn.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/ComplexColumnImpl.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/DictionaryEncodedColumn.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/FloatColumn.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/GenericColumn.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/IndexedComplexColumn.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/IndexedFloatsGenericColumn.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/IndexedLongsGenericColumn.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/LongColumn.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/RunLengthColumn.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/SimpleColumn.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/SimpleDictionaryEncodedColumn.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/SpatialIndex.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/StringMultiValueColumn.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/column/ValueType.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/serde/BitmapIndexColumnPartSupplier.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/serde/ColumnPartSerde.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/serde/ComplexColumnPartSerde.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/serde/ComplexColumnPartSupplier.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/serde/DictionaryEncodedColumnPartSerde.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/serde/DictionaryEncodedColumnSupplier.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/serde/FloatGenericColumnPartSerde.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/serde/FloatGenericColumnSupplier.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/serde/LongGenericColumnPartSerde.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/serde/LongGenericColumnSupplier.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/serde/SpatialIndexColumnPartSupplier.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/ComplexMetricColumnSerializer.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/CompressedFloatBufferObjectStrategy.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplier.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializer.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/CompressedLongBufferObjectStrategy.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplier.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializer.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/CompressedObjectStrategy.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/CompressedPools.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/DimensionColumn.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/FloatMetricColumnSerializer.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedFloats.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedLongs.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/IncrementalIndex.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/IncrementalIndexAdapter.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/IncrementalIndexSchema.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/Index.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/IndexIO.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/IndexMerger.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/IndexableAdapter.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/MMappedIndex.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/MMappedIndexAdapter.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/MetricColumnSerializer.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/MetricHolder.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/QueryableIndexIndexableAdapter.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/Rowboat.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/SpatialDimensionRowFormatter.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/SpatialDimensionSchema.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetricExtractor.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetricSerde.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetrics.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/index/v1/serde/Registererer.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/indexer/data/CSVDataSpec.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/indexer/data/DataSpec.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/indexer/data/DelimitedDataSpec.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/indexer/data/InputRowParser.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/indexer/data/JSONDataSpec.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/indexer/data/MapInputRowParser.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/indexer/data/StringInputRowParser.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/indexer/data/TimestampSpec.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/indexer/data/ToLowercaseDataSpec.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/ArrayBasedIndexedInts.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/ArrayIndexed.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/ByteBufferSerializer.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/ByteBufferWriter.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/ConciseCompressedIndexedInts.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/EmptyIndexedInts.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/GenericIndexed.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/GenericIndexedWriter.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/IOPeon.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/Indexed.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/IndexedFloats.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/IndexedInts.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/IndexedIntsIterator.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/IndexedIterable.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/IndexedList.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/IndexedLongs.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/IndexedRTree.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/Indexedids.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/IntBufferIndexedInts.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/ListIndexed.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/ObjectStrategy.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/TmpFileIOPeon.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/VSizeIndexed.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/VSizeIndexedInts.java (100%) rename {index-common => indexing-common}/src/main/java/com/metamx/druid/kv/VSizeIndexedWriter.java (100%) rename {index-common => indexing-common}/src/test/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplierTest.java (100%) rename {index-common => indexing-common}/src/test/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializerTest.java (100%) rename {index-common => indexing-common}/src/test/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplierTest.java (100%) rename {index-common => indexing-common}/src/test/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializerTest.java (100%) rename {index-common => indexing-common}/src/test/java/com/metamx/druid/index/v1/IOPeonForTesting.java (100%) rename {index-common => indexing-common}/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedFloatsTest.java (100%) rename {index-common => indexing-common}/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedLongsTest.java (100%) rename {index-common => indexing-common}/src/test/java/com/metamx/druid/index/v1/IncrementalIndexTest.java (100%) rename {index-common => indexing-common}/src/test/java/com/metamx/druid/kv/GenericIndexedTest.java (100%) rename {index-common => indexing-common}/src/test/java/com/metamx/druid/kv/IndexedIntsTest.java (100%) rename {index-common => indexing-common}/src/test/java/com/metamx/druid/kv/VSizeIndexedIntsTest.java (100%) rename {index-common => indexing-common}/src/test/java/com/metamx/druid/kv/VSizeIndexedTest.java (100%) rename {index-common => indexing-common}/src/test/resources/druid.sample.tsv (100%) rename {index-common => indexing-common}/src/test/resources/druid.sample.tsv.bottom (100%) rename {index-common => indexing-common}/src/test/resources/druid.sample.tsv.top (100%) rename {indexer => indexing-hadoop}/README (100%) rename {indexer => indexing-hadoop}/pom.xml (96%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/Bucket.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/DeterminePartitionsJob.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexer.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerAzkWrapper.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerJob.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerMain.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerMapper.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerNode.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/HadoopIOPeon.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/HadoopyShardSpec.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/Jobby.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/SortableBytes.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/StringIntervalFunction.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/Utils.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/granularity/ArbitraryGranularitySpec.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/granularity/GranularitySpec.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/granularity/UniformGranularitySpec.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/hadoop/FSSpideringIterator.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/partitions/PartitionsSpec.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/path/GranularUnprocessedPathSpec.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/path/GranularityPathSpec.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/path/PathSpec.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/path/StaticPathSpec.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/rollup/DataRollupSpec.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/updater/DbUpdaterJobSpec.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/updater/UpdaterJobSpec.java (100%) rename {indexer => indexing-hadoop}/src/main/java/com/metamx/druid/indexer/updater/ZkUpdaterJobSpec.java (100%) rename {indexer => indexing-hadoop}/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java (100%) rename {indexer => indexing-hadoop}/src/test/java/com/metamx/druid/indexer/SortableBytesTest.java (100%) rename {indexer => indexing-hadoop}/src/test/java/com/metamx/druid/indexer/granularity/ArbitraryGranularityTest.java (100%) rename {indexer => indexing-hadoop}/src/test/java/com/metamx/druid/indexer/granularity/UniformGranularityTest.java (100%) rename {indexer => indexing-hadoop}/src/test/java/com/metamx/druid/indexer/hadoop/FSSpideringIteratorTest.java (100%) diff --git a/client/pom.xml b/client/pom.xml index c5b28662317..72b8d00cb79 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 @@ -178,6 +179,10 @@ commons-cli commons-cli + + com.metamx + bytebuffer-collections + diff --git a/index-common/pom.xml b/indexing-common/pom.xml similarity index 96% rename from index-common/pom.xml rename to indexing-common/pom.xml index 5379d9f829b..1f712205f46 100644 --- a/index-common/pom.xml +++ b/indexing-common/pom.xml @@ -22,9 +22,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 com.metamx.druid - druid-index-common - druid-index-common - Druid Indexer + druid-indexing-common + druid-indexing-common + Druid Indexing Common com.metamx diff --git a/index-common/src/main/java/com/metamx/druid/common/s3/S3Utils.java b/indexing-common/src/main/java/com/metamx/druid/common/s3/S3Utils.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/common/s3/S3Utils.java rename to indexing-common/src/main/java/com/metamx/druid/common/s3/S3Utils.java diff --git a/index-common/src/main/java/com/metamx/druid/index/QueryableIndex.java b/indexing-common/src/main/java/com/metamx/druid/index/QueryableIndex.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/QueryableIndex.java rename to indexing-common/src/main/java/com/metamx/druid/index/QueryableIndex.java diff --git a/index-common/src/main/java/com/metamx/druid/index/SimpleQueryableIndex.java b/indexing-common/src/main/java/com/metamx/druid/index/SimpleQueryableIndex.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/SimpleQueryableIndex.java rename to indexing-common/src/main/java/com/metamx/druid/index/SimpleQueryableIndex.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/AbstractColumn.java b/indexing-common/src/main/java/com/metamx/druid/index/column/AbstractColumn.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/AbstractColumn.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/AbstractColumn.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/BitmapIndex.java b/indexing-common/src/main/java/com/metamx/druid/index/column/BitmapIndex.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/BitmapIndex.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/BitmapIndex.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/Column.java b/indexing-common/src/main/java/com/metamx/druid/index/column/Column.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/Column.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/Column.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/ColumnBuilder.java b/indexing-common/src/main/java/com/metamx/druid/index/column/ColumnBuilder.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/ColumnBuilder.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/ColumnBuilder.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/ColumnCapabilities.java b/indexing-common/src/main/java/com/metamx/druid/index/column/ColumnCapabilities.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/ColumnCapabilities.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/ColumnCapabilities.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/ColumnCapabilitiesImpl.java b/indexing-common/src/main/java/com/metamx/druid/index/column/ColumnCapabilitiesImpl.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/ColumnCapabilitiesImpl.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/ColumnCapabilitiesImpl.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/ColumnDescriptor.java b/indexing-common/src/main/java/com/metamx/druid/index/column/ColumnDescriptor.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/ColumnDescriptor.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/ColumnDescriptor.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/ColumnSelector.java b/indexing-common/src/main/java/com/metamx/druid/index/column/ColumnSelector.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/ColumnSelector.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/ColumnSelector.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/ComplexColumn.java b/indexing-common/src/main/java/com/metamx/druid/index/column/ComplexColumn.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/ComplexColumn.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/ComplexColumn.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/ComplexColumnImpl.java b/indexing-common/src/main/java/com/metamx/druid/index/column/ComplexColumnImpl.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/ComplexColumnImpl.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/ComplexColumnImpl.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/DictionaryEncodedColumn.java b/indexing-common/src/main/java/com/metamx/druid/index/column/DictionaryEncodedColumn.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/DictionaryEncodedColumn.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/DictionaryEncodedColumn.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/FloatColumn.java b/indexing-common/src/main/java/com/metamx/druid/index/column/FloatColumn.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/FloatColumn.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/FloatColumn.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/GenericColumn.java b/indexing-common/src/main/java/com/metamx/druid/index/column/GenericColumn.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/GenericColumn.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/GenericColumn.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/IndexedComplexColumn.java b/indexing-common/src/main/java/com/metamx/druid/index/column/IndexedComplexColumn.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/IndexedComplexColumn.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/IndexedComplexColumn.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/IndexedFloatsGenericColumn.java b/indexing-common/src/main/java/com/metamx/druid/index/column/IndexedFloatsGenericColumn.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/IndexedFloatsGenericColumn.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/IndexedFloatsGenericColumn.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/IndexedLongsGenericColumn.java b/indexing-common/src/main/java/com/metamx/druid/index/column/IndexedLongsGenericColumn.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/IndexedLongsGenericColumn.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/IndexedLongsGenericColumn.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/LongColumn.java b/indexing-common/src/main/java/com/metamx/druid/index/column/LongColumn.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/LongColumn.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/LongColumn.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/RunLengthColumn.java b/indexing-common/src/main/java/com/metamx/druid/index/column/RunLengthColumn.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/RunLengthColumn.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/RunLengthColumn.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/SimpleColumn.java b/indexing-common/src/main/java/com/metamx/druid/index/column/SimpleColumn.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/SimpleColumn.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/SimpleColumn.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/SimpleDictionaryEncodedColumn.java b/indexing-common/src/main/java/com/metamx/druid/index/column/SimpleDictionaryEncodedColumn.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/SimpleDictionaryEncodedColumn.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/SimpleDictionaryEncodedColumn.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/SpatialIndex.java b/indexing-common/src/main/java/com/metamx/druid/index/column/SpatialIndex.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/SpatialIndex.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/SpatialIndex.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/StringMultiValueColumn.java b/indexing-common/src/main/java/com/metamx/druid/index/column/StringMultiValueColumn.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/StringMultiValueColumn.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/StringMultiValueColumn.java diff --git a/index-common/src/main/java/com/metamx/druid/index/column/ValueType.java b/indexing-common/src/main/java/com/metamx/druid/index/column/ValueType.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/column/ValueType.java rename to indexing-common/src/main/java/com/metamx/druid/index/column/ValueType.java diff --git a/index-common/src/main/java/com/metamx/druid/index/serde/BitmapIndexColumnPartSupplier.java b/indexing-common/src/main/java/com/metamx/druid/index/serde/BitmapIndexColumnPartSupplier.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/serde/BitmapIndexColumnPartSupplier.java rename to indexing-common/src/main/java/com/metamx/druid/index/serde/BitmapIndexColumnPartSupplier.java diff --git a/index-common/src/main/java/com/metamx/druid/index/serde/ColumnPartSerde.java b/indexing-common/src/main/java/com/metamx/druid/index/serde/ColumnPartSerde.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/serde/ColumnPartSerde.java rename to indexing-common/src/main/java/com/metamx/druid/index/serde/ColumnPartSerde.java diff --git a/index-common/src/main/java/com/metamx/druid/index/serde/ComplexColumnPartSerde.java b/indexing-common/src/main/java/com/metamx/druid/index/serde/ComplexColumnPartSerde.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/serde/ComplexColumnPartSerde.java rename to indexing-common/src/main/java/com/metamx/druid/index/serde/ComplexColumnPartSerde.java diff --git a/index-common/src/main/java/com/metamx/druid/index/serde/ComplexColumnPartSupplier.java b/indexing-common/src/main/java/com/metamx/druid/index/serde/ComplexColumnPartSupplier.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/serde/ComplexColumnPartSupplier.java rename to indexing-common/src/main/java/com/metamx/druid/index/serde/ComplexColumnPartSupplier.java diff --git a/index-common/src/main/java/com/metamx/druid/index/serde/DictionaryEncodedColumnPartSerde.java b/indexing-common/src/main/java/com/metamx/druid/index/serde/DictionaryEncodedColumnPartSerde.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/serde/DictionaryEncodedColumnPartSerde.java rename to indexing-common/src/main/java/com/metamx/druid/index/serde/DictionaryEncodedColumnPartSerde.java diff --git a/index-common/src/main/java/com/metamx/druid/index/serde/DictionaryEncodedColumnSupplier.java b/indexing-common/src/main/java/com/metamx/druid/index/serde/DictionaryEncodedColumnSupplier.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/serde/DictionaryEncodedColumnSupplier.java rename to indexing-common/src/main/java/com/metamx/druid/index/serde/DictionaryEncodedColumnSupplier.java diff --git a/index-common/src/main/java/com/metamx/druid/index/serde/FloatGenericColumnPartSerde.java b/indexing-common/src/main/java/com/metamx/druid/index/serde/FloatGenericColumnPartSerde.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/serde/FloatGenericColumnPartSerde.java rename to indexing-common/src/main/java/com/metamx/druid/index/serde/FloatGenericColumnPartSerde.java diff --git a/index-common/src/main/java/com/metamx/druid/index/serde/FloatGenericColumnSupplier.java b/indexing-common/src/main/java/com/metamx/druid/index/serde/FloatGenericColumnSupplier.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/serde/FloatGenericColumnSupplier.java rename to indexing-common/src/main/java/com/metamx/druid/index/serde/FloatGenericColumnSupplier.java diff --git a/index-common/src/main/java/com/metamx/druid/index/serde/LongGenericColumnPartSerde.java b/indexing-common/src/main/java/com/metamx/druid/index/serde/LongGenericColumnPartSerde.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/serde/LongGenericColumnPartSerde.java rename to indexing-common/src/main/java/com/metamx/druid/index/serde/LongGenericColumnPartSerde.java diff --git a/index-common/src/main/java/com/metamx/druid/index/serde/LongGenericColumnSupplier.java b/indexing-common/src/main/java/com/metamx/druid/index/serde/LongGenericColumnSupplier.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/serde/LongGenericColumnSupplier.java rename to indexing-common/src/main/java/com/metamx/druid/index/serde/LongGenericColumnSupplier.java diff --git a/index-common/src/main/java/com/metamx/druid/index/serde/SpatialIndexColumnPartSupplier.java b/indexing-common/src/main/java/com/metamx/druid/index/serde/SpatialIndexColumnPartSupplier.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/serde/SpatialIndexColumnPartSupplier.java rename to indexing-common/src/main/java/com/metamx/druid/index/serde/SpatialIndexColumnPartSupplier.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/ComplexMetricColumnSerializer.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/ComplexMetricColumnSerializer.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/ComplexMetricColumnSerializer.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/ComplexMetricColumnSerializer.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatBufferObjectStrategy.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatBufferObjectStrategy.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatBufferObjectStrategy.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatBufferObjectStrategy.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplier.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplier.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplier.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplier.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializer.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializer.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializer.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializer.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongBufferObjectStrategy.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedLongBufferObjectStrategy.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongBufferObjectStrategy.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedLongBufferObjectStrategy.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplier.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplier.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplier.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplier.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializer.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializer.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializer.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializer.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedObjectStrategy.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedObjectStrategy.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/CompressedObjectStrategy.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedObjectStrategy.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/CompressedPools.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedPools.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/CompressedPools.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/CompressedPools.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/DimensionColumn.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/DimensionColumn.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/DimensionColumn.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/DimensionColumn.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/FloatMetricColumnSerializer.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/FloatMetricColumnSerializer.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/FloatMetricColumnSerializer.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/FloatMetricColumnSerializer.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedFloats.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedFloats.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedFloats.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedFloats.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedLongs.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedLongs.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedLongs.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/InMemoryCompressedLongs.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndex.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndex.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndex.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndex.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndexAdapter.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndexAdapter.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndexAdapter.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndexAdapter.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndexSchema.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndexSchema.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndexSchema.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/IncrementalIndexSchema.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/Index.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/Index.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/Index.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/Index.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/IndexIO.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/IndexIO.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/IndexIO.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/IndexIO.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/IndexMerger.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/IndexMerger.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/IndexMerger.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/IndexMerger.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/IndexableAdapter.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/IndexableAdapter.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/IndexableAdapter.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/IndexableAdapter.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/MMappedIndex.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/MMappedIndex.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/MMappedIndex.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/MMappedIndex.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/MMappedIndexAdapter.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/MMappedIndexAdapter.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/MMappedIndexAdapter.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/MMappedIndexAdapter.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/MetricColumnSerializer.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/MetricColumnSerializer.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/MetricColumnSerializer.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/MetricColumnSerializer.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/MetricHolder.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/MetricHolder.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/MetricHolder.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/MetricHolder.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/QueryableIndexIndexableAdapter.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/QueryableIndexIndexableAdapter.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/QueryableIndexIndexableAdapter.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/QueryableIndexIndexableAdapter.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/Rowboat.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/Rowboat.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/Rowboat.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/Rowboat.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/SpatialDimensionRowFormatter.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/SpatialDimensionRowFormatter.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/SpatialDimensionRowFormatter.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/SpatialDimensionRowFormatter.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/SpatialDimensionSchema.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/SpatialDimensionSchema.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/SpatialDimensionSchema.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/SpatialDimensionSchema.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetricExtractor.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetricExtractor.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetricExtractor.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetricExtractor.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetricSerde.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetricSerde.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetricSerde.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetricSerde.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetrics.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetrics.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetrics.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/serde/ComplexMetrics.java diff --git a/index-common/src/main/java/com/metamx/druid/index/v1/serde/Registererer.java b/indexing-common/src/main/java/com/metamx/druid/index/v1/serde/Registererer.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/index/v1/serde/Registererer.java rename to indexing-common/src/main/java/com/metamx/druid/index/v1/serde/Registererer.java diff --git a/index-common/src/main/java/com/metamx/druid/indexer/data/CSVDataSpec.java b/indexing-common/src/main/java/com/metamx/druid/indexer/data/CSVDataSpec.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/indexer/data/CSVDataSpec.java rename to indexing-common/src/main/java/com/metamx/druid/indexer/data/CSVDataSpec.java diff --git a/index-common/src/main/java/com/metamx/druid/indexer/data/DataSpec.java b/indexing-common/src/main/java/com/metamx/druid/indexer/data/DataSpec.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/indexer/data/DataSpec.java rename to indexing-common/src/main/java/com/metamx/druid/indexer/data/DataSpec.java diff --git a/index-common/src/main/java/com/metamx/druid/indexer/data/DelimitedDataSpec.java b/indexing-common/src/main/java/com/metamx/druid/indexer/data/DelimitedDataSpec.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/indexer/data/DelimitedDataSpec.java rename to indexing-common/src/main/java/com/metamx/druid/indexer/data/DelimitedDataSpec.java diff --git a/index-common/src/main/java/com/metamx/druid/indexer/data/InputRowParser.java b/indexing-common/src/main/java/com/metamx/druid/indexer/data/InputRowParser.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/indexer/data/InputRowParser.java rename to indexing-common/src/main/java/com/metamx/druid/indexer/data/InputRowParser.java diff --git a/index-common/src/main/java/com/metamx/druid/indexer/data/JSONDataSpec.java b/indexing-common/src/main/java/com/metamx/druid/indexer/data/JSONDataSpec.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/indexer/data/JSONDataSpec.java rename to indexing-common/src/main/java/com/metamx/druid/indexer/data/JSONDataSpec.java diff --git a/index-common/src/main/java/com/metamx/druid/indexer/data/MapInputRowParser.java b/indexing-common/src/main/java/com/metamx/druid/indexer/data/MapInputRowParser.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/indexer/data/MapInputRowParser.java rename to indexing-common/src/main/java/com/metamx/druid/indexer/data/MapInputRowParser.java diff --git a/index-common/src/main/java/com/metamx/druid/indexer/data/StringInputRowParser.java b/indexing-common/src/main/java/com/metamx/druid/indexer/data/StringInputRowParser.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/indexer/data/StringInputRowParser.java rename to indexing-common/src/main/java/com/metamx/druid/indexer/data/StringInputRowParser.java diff --git a/index-common/src/main/java/com/metamx/druid/indexer/data/TimestampSpec.java b/indexing-common/src/main/java/com/metamx/druid/indexer/data/TimestampSpec.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/indexer/data/TimestampSpec.java rename to indexing-common/src/main/java/com/metamx/druid/indexer/data/TimestampSpec.java diff --git a/index-common/src/main/java/com/metamx/druid/indexer/data/ToLowercaseDataSpec.java b/indexing-common/src/main/java/com/metamx/druid/indexer/data/ToLowercaseDataSpec.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/indexer/data/ToLowercaseDataSpec.java rename to indexing-common/src/main/java/com/metamx/druid/indexer/data/ToLowercaseDataSpec.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/ArrayBasedIndexedInts.java b/indexing-common/src/main/java/com/metamx/druid/kv/ArrayBasedIndexedInts.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/ArrayBasedIndexedInts.java rename to indexing-common/src/main/java/com/metamx/druid/kv/ArrayBasedIndexedInts.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/ArrayIndexed.java b/indexing-common/src/main/java/com/metamx/druid/kv/ArrayIndexed.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/ArrayIndexed.java rename to indexing-common/src/main/java/com/metamx/druid/kv/ArrayIndexed.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/ByteBufferSerializer.java b/indexing-common/src/main/java/com/metamx/druid/kv/ByteBufferSerializer.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/ByteBufferSerializer.java rename to indexing-common/src/main/java/com/metamx/druid/kv/ByteBufferSerializer.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/ByteBufferWriter.java b/indexing-common/src/main/java/com/metamx/druid/kv/ByteBufferWriter.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/ByteBufferWriter.java rename to indexing-common/src/main/java/com/metamx/druid/kv/ByteBufferWriter.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/ConciseCompressedIndexedInts.java b/indexing-common/src/main/java/com/metamx/druid/kv/ConciseCompressedIndexedInts.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/ConciseCompressedIndexedInts.java rename to indexing-common/src/main/java/com/metamx/druid/kv/ConciseCompressedIndexedInts.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/EmptyIndexedInts.java b/indexing-common/src/main/java/com/metamx/druid/kv/EmptyIndexedInts.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/EmptyIndexedInts.java rename to indexing-common/src/main/java/com/metamx/druid/kv/EmptyIndexedInts.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/GenericIndexed.java b/indexing-common/src/main/java/com/metamx/druid/kv/GenericIndexed.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/GenericIndexed.java rename to indexing-common/src/main/java/com/metamx/druid/kv/GenericIndexed.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/GenericIndexedWriter.java b/indexing-common/src/main/java/com/metamx/druid/kv/GenericIndexedWriter.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/GenericIndexedWriter.java rename to indexing-common/src/main/java/com/metamx/druid/kv/GenericIndexedWriter.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/IOPeon.java b/indexing-common/src/main/java/com/metamx/druid/kv/IOPeon.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/IOPeon.java rename to indexing-common/src/main/java/com/metamx/druid/kv/IOPeon.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/Indexed.java b/indexing-common/src/main/java/com/metamx/druid/kv/Indexed.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/Indexed.java rename to indexing-common/src/main/java/com/metamx/druid/kv/Indexed.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/IndexedFloats.java b/indexing-common/src/main/java/com/metamx/druid/kv/IndexedFloats.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/IndexedFloats.java rename to indexing-common/src/main/java/com/metamx/druid/kv/IndexedFloats.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/IndexedInts.java b/indexing-common/src/main/java/com/metamx/druid/kv/IndexedInts.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/IndexedInts.java rename to indexing-common/src/main/java/com/metamx/druid/kv/IndexedInts.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/IndexedIntsIterator.java b/indexing-common/src/main/java/com/metamx/druid/kv/IndexedIntsIterator.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/IndexedIntsIterator.java rename to indexing-common/src/main/java/com/metamx/druid/kv/IndexedIntsIterator.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/IndexedIterable.java b/indexing-common/src/main/java/com/metamx/druid/kv/IndexedIterable.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/IndexedIterable.java rename to indexing-common/src/main/java/com/metamx/druid/kv/IndexedIterable.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/IndexedList.java b/indexing-common/src/main/java/com/metamx/druid/kv/IndexedList.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/IndexedList.java rename to indexing-common/src/main/java/com/metamx/druid/kv/IndexedList.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/IndexedLongs.java b/indexing-common/src/main/java/com/metamx/druid/kv/IndexedLongs.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/IndexedLongs.java rename to indexing-common/src/main/java/com/metamx/druid/kv/IndexedLongs.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/IndexedRTree.java b/indexing-common/src/main/java/com/metamx/druid/kv/IndexedRTree.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/IndexedRTree.java rename to indexing-common/src/main/java/com/metamx/druid/kv/IndexedRTree.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/Indexedids.java b/indexing-common/src/main/java/com/metamx/druid/kv/Indexedids.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/Indexedids.java rename to indexing-common/src/main/java/com/metamx/druid/kv/Indexedids.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/IntBufferIndexedInts.java b/indexing-common/src/main/java/com/metamx/druid/kv/IntBufferIndexedInts.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/IntBufferIndexedInts.java rename to indexing-common/src/main/java/com/metamx/druid/kv/IntBufferIndexedInts.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/ListIndexed.java b/indexing-common/src/main/java/com/metamx/druid/kv/ListIndexed.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/ListIndexed.java rename to indexing-common/src/main/java/com/metamx/druid/kv/ListIndexed.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/ObjectStrategy.java b/indexing-common/src/main/java/com/metamx/druid/kv/ObjectStrategy.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/ObjectStrategy.java rename to indexing-common/src/main/java/com/metamx/druid/kv/ObjectStrategy.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/TmpFileIOPeon.java b/indexing-common/src/main/java/com/metamx/druid/kv/TmpFileIOPeon.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/TmpFileIOPeon.java rename to indexing-common/src/main/java/com/metamx/druid/kv/TmpFileIOPeon.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/VSizeIndexed.java b/indexing-common/src/main/java/com/metamx/druid/kv/VSizeIndexed.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/VSizeIndexed.java rename to indexing-common/src/main/java/com/metamx/druid/kv/VSizeIndexed.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/VSizeIndexedInts.java b/indexing-common/src/main/java/com/metamx/druid/kv/VSizeIndexedInts.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/VSizeIndexedInts.java rename to indexing-common/src/main/java/com/metamx/druid/kv/VSizeIndexedInts.java diff --git a/index-common/src/main/java/com/metamx/druid/kv/VSizeIndexedWriter.java b/indexing-common/src/main/java/com/metamx/druid/kv/VSizeIndexedWriter.java similarity index 100% rename from index-common/src/main/java/com/metamx/druid/kv/VSizeIndexedWriter.java rename to indexing-common/src/main/java/com/metamx/druid/kv/VSizeIndexedWriter.java diff --git a/index-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplierTest.java b/indexing-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplierTest.java similarity index 100% rename from index-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplierTest.java rename to indexing-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsIndexedSupplierTest.java diff --git a/index-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializerTest.java b/indexing-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializerTest.java similarity index 100% rename from index-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializerTest.java rename to indexing-common/src/test/java/com/metamx/druid/index/v1/CompressedFloatsSupplierSerializerTest.java diff --git a/index-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplierTest.java b/indexing-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplierTest.java similarity index 100% rename from index-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplierTest.java rename to indexing-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsIndexedSupplierTest.java diff --git a/index-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializerTest.java b/indexing-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializerTest.java similarity index 100% rename from index-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializerTest.java rename to indexing-common/src/test/java/com/metamx/druid/index/v1/CompressedLongsSupplierSerializerTest.java diff --git a/index-common/src/test/java/com/metamx/druid/index/v1/IOPeonForTesting.java b/indexing-common/src/test/java/com/metamx/druid/index/v1/IOPeonForTesting.java similarity index 100% rename from index-common/src/test/java/com/metamx/druid/index/v1/IOPeonForTesting.java rename to indexing-common/src/test/java/com/metamx/druid/index/v1/IOPeonForTesting.java diff --git a/index-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedFloatsTest.java b/indexing-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedFloatsTest.java similarity index 100% rename from index-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedFloatsTest.java rename to indexing-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedFloatsTest.java diff --git a/index-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedLongsTest.java b/indexing-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedLongsTest.java similarity index 100% rename from index-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedLongsTest.java rename to indexing-common/src/test/java/com/metamx/druid/index/v1/InMemoryCompressedLongsTest.java diff --git a/index-common/src/test/java/com/metamx/druid/index/v1/IncrementalIndexTest.java b/indexing-common/src/test/java/com/metamx/druid/index/v1/IncrementalIndexTest.java similarity index 100% rename from index-common/src/test/java/com/metamx/druid/index/v1/IncrementalIndexTest.java rename to indexing-common/src/test/java/com/metamx/druid/index/v1/IncrementalIndexTest.java diff --git a/index-common/src/test/java/com/metamx/druid/kv/GenericIndexedTest.java b/indexing-common/src/test/java/com/metamx/druid/kv/GenericIndexedTest.java similarity index 100% rename from index-common/src/test/java/com/metamx/druid/kv/GenericIndexedTest.java rename to indexing-common/src/test/java/com/metamx/druid/kv/GenericIndexedTest.java diff --git a/index-common/src/test/java/com/metamx/druid/kv/IndexedIntsTest.java b/indexing-common/src/test/java/com/metamx/druid/kv/IndexedIntsTest.java similarity index 100% rename from index-common/src/test/java/com/metamx/druid/kv/IndexedIntsTest.java rename to indexing-common/src/test/java/com/metamx/druid/kv/IndexedIntsTest.java diff --git a/index-common/src/test/java/com/metamx/druid/kv/VSizeIndexedIntsTest.java b/indexing-common/src/test/java/com/metamx/druid/kv/VSizeIndexedIntsTest.java similarity index 100% rename from index-common/src/test/java/com/metamx/druid/kv/VSizeIndexedIntsTest.java rename to indexing-common/src/test/java/com/metamx/druid/kv/VSizeIndexedIntsTest.java diff --git a/index-common/src/test/java/com/metamx/druid/kv/VSizeIndexedTest.java b/indexing-common/src/test/java/com/metamx/druid/kv/VSizeIndexedTest.java similarity index 100% rename from index-common/src/test/java/com/metamx/druid/kv/VSizeIndexedTest.java rename to indexing-common/src/test/java/com/metamx/druid/kv/VSizeIndexedTest.java diff --git a/index-common/src/test/resources/druid.sample.tsv b/indexing-common/src/test/resources/druid.sample.tsv similarity index 100% rename from index-common/src/test/resources/druid.sample.tsv rename to indexing-common/src/test/resources/druid.sample.tsv diff --git a/index-common/src/test/resources/druid.sample.tsv.bottom b/indexing-common/src/test/resources/druid.sample.tsv.bottom similarity index 100% rename from index-common/src/test/resources/druid.sample.tsv.bottom rename to indexing-common/src/test/resources/druid.sample.tsv.bottom diff --git a/index-common/src/test/resources/druid.sample.tsv.top b/indexing-common/src/test/resources/druid.sample.tsv.top similarity index 100% rename from index-common/src/test/resources/druid.sample.tsv.top rename to indexing-common/src/test/resources/druid.sample.tsv.top diff --git a/indexer/README b/indexing-hadoop/README similarity index 100% rename from indexer/README rename to indexing-hadoop/README diff --git a/indexer/pom.xml b/indexing-hadoop/pom.xml similarity index 96% rename from indexer/pom.xml rename to indexing-hadoop/pom.xml index 772d73498b8..a444a42e745 100644 --- a/indexer/pom.xml +++ b/indexing-hadoop/pom.xml @@ -21,9 +21,9 @@ 4.0.0 com.metamx.druid - druid-indexer - druid-indexer - Druid Indexer + druid-indexing-hadoop + druid-indexing-hadoop + Druid Indexing Hadoop com.metamx diff --git a/indexer/src/main/java/com/metamx/druid/indexer/Bucket.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/Bucket.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/Bucket.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/Bucket.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/DeterminePartitionsJob.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/DeterminePartitionsJob.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/DeterminePartitionsJob.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/DeterminePartitionsJob.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexer.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexer.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexer.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexer.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerAzkWrapper.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerAzkWrapper.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerAzkWrapper.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerAzkWrapper.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerConfig.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerJob.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerJob.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerJob.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerJob.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerMain.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerMain.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerMain.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerMain.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerMapper.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerMapper.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerMapper.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerMapper.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerNode.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerNode.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerNode.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexerNode.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/HadoopIOPeon.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopIOPeon.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/HadoopIOPeon.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopIOPeon.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/HadoopyShardSpec.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopyShardSpec.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/HadoopyShardSpec.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopyShardSpec.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/IndexGeneratorJob.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/Jobby.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/Jobby.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/Jobby.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/Jobby.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/SortableBytes.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/SortableBytes.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/SortableBytes.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/SortableBytes.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/StringIntervalFunction.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/StringIntervalFunction.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/StringIntervalFunction.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/StringIntervalFunction.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/Utils.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/Utils.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/Utils.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/Utils.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/granularity/ArbitraryGranularitySpec.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/granularity/ArbitraryGranularitySpec.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/granularity/ArbitraryGranularitySpec.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/granularity/ArbitraryGranularitySpec.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/granularity/GranularitySpec.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/granularity/GranularitySpec.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/granularity/GranularitySpec.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/granularity/GranularitySpec.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/granularity/UniformGranularitySpec.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/granularity/UniformGranularitySpec.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/granularity/UniformGranularitySpec.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/granularity/UniformGranularitySpec.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/hadoop/FSSpideringIterator.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/hadoop/FSSpideringIterator.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/hadoop/FSSpideringIterator.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/hadoop/FSSpideringIterator.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/partitions/PartitionsSpec.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/partitions/PartitionsSpec.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/partitions/PartitionsSpec.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/partitions/PartitionsSpec.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/path/GranularUnprocessedPathSpec.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/path/GranularUnprocessedPathSpec.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/path/GranularUnprocessedPathSpec.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/path/GranularUnprocessedPathSpec.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/path/GranularityPathSpec.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/path/GranularityPathSpec.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/path/GranularityPathSpec.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/path/GranularityPathSpec.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/path/PathSpec.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/path/PathSpec.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/path/PathSpec.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/path/PathSpec.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/path/StaticPathSpec.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/path/StaticPathSpec.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/path/StaticPathSpec.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/path/StaticPathSpec.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/rollup/DataRollupSpec.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/rollup/DataRollupSpec.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/rollup/DataRollupSpec.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/rollup/DataRollupSpec.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/updater/DbUpdaterJobSpec.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/updater/DbUpdaterJobSpec.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/updater/DbUpdaterJobSpec.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/updater/DbUpdaterJobSpec.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/updater/UpdaterJobSpec.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/updater/UpdaterJobSpec.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/updater/UpdaterJobSpec.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/updater/UpdaterJobSpec.java diff --git a/indexer/src/main/java/com/metamx/druid/indexer/updater/ZkUpdaterJobSpec.java b/indexing-hadoop/src/main/java/com/metamx/druid/indexer/updater/ZkUpdaterJobSpec.java similarity index 100% rename from indexer/src/main/java/com/metamx/druid/indexer/updater/ZkUpdaterJobSpec.java rename to indexing-hadoop/src/main/java/com/metamx/druid/indexer/updater/ZkUpdaterJobSpec.java diff --git a/indexer/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java b/indexing-hadoop/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java similarity index 100% rename from indexer/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java rename to indexing-hadoop/src/test/java/com/metamx/druid/indexer/HadoopDruidIndexerConfigTest.java diff --git a/indexer/src/test/java/com/metamx/druid/indexer/SortableBytesTest.java b/indexing-hadoop/src/test/java/com/metamx/druid/indexer/SortableBytesTest.java similarity index 100% rename from indexer/src/test/java/com/metamx/druid/indexer/SortableBytesTest.java rename to indexing-hadoop/src/test/java/com/metamx/druid/indexer/SortableBytesTest.java diff --git a/indexer/src/test/java/com/metamx/druid/indexer/granularity/ArbitraryGranularityTest.java b/indexing-hadoop/src/test/java/com/metamx/druid/indexer/granularity/ArbitraryGranularityTest.java similarity index 100% rename from indexer/src/test/java/com/metamx/druid/indexer/granularity/ArbitraryGranularityTest.java rename to indexing-hadoop/src/test/java/com/metamx/druid/indexer/granularity/ArbitraryGranularityTest.java diff --git a/indexer/src/test/java/com/metamx/druid/indexer/granularity/UniformGranularityTest.java b/indexing-hadoop/src/test/java/com/metamx/druid/indexer/granularity/UniformGranularityTest.java similarity index 100% rename from indexer/src/test/java/com/metamx/druid/indexer/granularity/UniformGranularityTest.java rename to indexing-hadoop/src/test/java/com/metamx/druid/indexer/granularity/UniformGranularityTest.java diff --git a/indexer/src/test/java/com/metamx/druid/indexer/hadoop/FSSpideringIteratorTest.java b/indexing-hadoop/src/test/java/com/metamx/druid/indexer/hadoop/FSSpideringIteratorTest.java similarity index 100% rename from indexer/src/test/java/com/metamx/druid/indexer/hadoop/FSSpideringIteratorTest.java rename to indexing-hadoop/src/test/java/com/metamx/druid/indexer/hadoop/FSSpideringIteratorTest.java diff --git a/pom.xml b/pom.xml index 0f10681e780..5d1537319af 100644 --- a/pom.xml +++ b/pom.xml @@ -40,18 +40,18 @@ UTF-8 0.22.3 - 2.0.1-21-22 + 2.0.1-21-22 - common - index-common client - indexer - server + common + examples + indexing-common + indexing-hadoop indexing-service realtime - examples + server services @@ -127,22 +127,22 @@ org.apache.curator curator-client - ${netflix.curator.version} + ${apache.curator.version} org.apache.curator curator-framework - ${netflix.curator.version} + ${apache.curator.version} org.apache.curator curator-recipes - ${netflix.curator.version} + ${apache.curator.version} org.apache.curator curator-x-discovery - ${netflix.curator.version} + ${apache.curator.version} org.apache.hadoop @@ -346,7 +346,7 @@ org.apache.curator curator-test - ${netflix.curator.version} + ${apache.curator.version} test