diff --git a/api/src/test/java/io/druid/segment/loading/DataSegmentPusherUtilTest.java b/api/src/test/java/io/druid/segment/loading/DataSegmentPusherUtilTest.java index 76256adff57..c424857e839 100644 --- a/api/src/test/java/io/druid/segment/loading/DataSegmentPusherUtilTest.java +++ b/api/src/test/java/io/druid/segment/loading/DataSegmentPusherUtilTest.java @@ -43,7 +43,7 @@ public class DataSegmentPusherUtilTest loadSpec, Arrays.asList("dim1", "dim2"), Arrays.asList("met1", "met2"), - new NoneShardSpec(), + NoneShardSpec.instance(), null, 1 ); diff --git a/api/src/test/java/io/druid/timeline/DataSegmentTest.java b/api/src/test/java/io/druid/timeline/DataSegmentTest.java index 1da50c06b32..6a0589291b8 100644 --- a/api/src/test/java/io/druid/timeline/DataSegmentTest.java +++ b/api/src/test/java/io/druid/timeline/DataSegmentTest.java @@ -100,7 +100,7 @@ public class DataSegmentTest loadSpec, Arrays.asList("dim1", "dim2"), Arrays.asList("met1", "met2"), - new NoneShardSpec(), + NoneShardSpec.instance(), TEST_VERSION, 1 ); @@ -152,7 +152,7 @@ public class DataSegmentTest .dataSource("foo") .interval(new Interval("2012-01-01/2012-01-02")) .version(new DateTime("2012-01-01T11:22:33.444Z").toString()) - .shardSpec(new NoneShardSpec()) + .shardSpec(NoneShardSpec.instance()) .build(); Assert.assertEquals( diff --git a/api/src/test/java/io/druid/timeline/partition/NoneShardSpecTest.java b/api/src/test/java/io/druid/timeline/partition/NoneShardSpecTest.java index 0c3035471d2..d3bae8afdd4 100644 --- a/api/src/test/java/io/druid/timeline/partition/NoneShardSpecTest.java +++ b/api/src/test/java/io/druid/timeline/partition/NoneShardSpecTest.java @@ -11,8 +11,8 @@ public class NoneShardSpecTest @Test public void testEqualsAndHashCode() { - final ShardSpec one = new NoneShardSpec(); - final ShardSpec two = new NoneShardSpec(); + final ShardSpec one = NoneShardSpec.instance(); + final ShardSpec two = NoneShardSpec.instance(); Assert.assertEquals(one, two); Assert.assertEquals(one.hashCode(), two.hashCode()); } diff --git a/benchmarks/src/main/java/io/druid/benchmark/query/SelectBenchmark.java b/benchmarks/src/main/java/io/druid/benchmark/query/SelectBenchmark.java index 0ef0fbde397..d8021e258cd 100644 --- a/benchmarks/src/main/java/io/druid/benchmark/query/SelectBenchmark.java +++ b/benchmarks/src/main/java/io/druid/benchmark/query/SelectBenchmark.java @@ -383,4 +383,4 @@ public class SelectBenchmark } } } -} \ No newline at end of file +} diff --git a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentKillerTest.java b/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentKillerTest.java index 155b79c0bf4..17428a545f6 100644 --- a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentKillerTest.java +++ b/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentKillerTest.java @@ -49,7 +49,7 @@ public class AzureDataSegmentKillerTest extends EasyMockSupport ImmutableMap.of("containerName", containerName, "blobPath", blobPath), null, null, - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 1 ); diff --git a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPullerTest.java b/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPullerTest.java index 08c2e51da1a..6ba560329c0 100644 --- a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPullerTest.java +++ b/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPullerTest.java @@ -56,7 +56,7 @@ public class AzureDataSegmentPullerTest extends EasyMockSupport ImmutableMap.of("containerName", containerName, "blobPath", blobPath), null, null, - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 1 ); diff --git a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPusherTest.java b/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPusherTest.java index 60bf5bb8786..89c99c73e32 100644 --- a/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPusherTest.java +++ b/extensions-contrib/azure-extensions/src/test/java/io/druid/storage/azure/AzureDataSegmentPusherTest.java @@ -60,7 +60,7 @@ public class AzureDataSegmentPusherTest extends EasyMockSupport ImmutableMap.of("containerName", containerName, "blobPath", blobPath), null, null, - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 1 ); @@ -99,7 +99,7 @@ public class AzureDataSegmentPusherTest extends EasyMockSupport Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, size ); diff --git a/extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPusherTest.java b/extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPusherTest.java index 2ec2c22390c..3014fcd5ad0 100644 --- a/extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPusherTest.java +++ b/extensions-contrib/cloudfiles-extensions/src/test/java/io/druid/storage/cloudfiles/CloudFilesDataSegmentPusherTest.java @@ -79,7 +79,7 @@ public class CloudFilesDataSegmentPusherTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, size ); diff --git a/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentKillerTest.java b/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentKillerTest.java index 3496a71d01c..7a93044a064 100644 --- a/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentKillerTest.java +++ b/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentKillerTest.java @@ -122,7 +122,7 @@ public class HdfsDataSegmentKillerTest ), ImmutableList.of("product"), ImmutableList.of("visited_sum", "unique_hosts"), - new NoneShardSpec(), + NoneShardSpec.instance(), 9, 12334 ); diff --git a/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentPusherTest.java b/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentPusherTest.java index 16969774a67..c32fb6ef1bd 100644 --- a/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentPusherTest.java +++ b/extensions-core/hdfs-storage/src/test/java/io/druid/storage/hdfs/HdfsDataSegmentPusherTest.java @@ -66,7 +66,7 @@ public class HdfsDataSegmentPusherTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, size ); diff --git a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentMoverTest.java b/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentMoverTest.java index e145f896f2c..97ab17e0188 100644 --- a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentMoverTest.java +++ b/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentMoverTest.java @@ -53,7 +53,7 @@ public class S3DataSegmentMoverTest ), ImmutableList.of("dim1", "dim1"), ImmutableList.of("metric1", "metric2"), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 1 ); @@ -128,7 +128,7 @@ public class S3DataSegmentMoverTest ), ImmutableList.of("dim1", "dim1"), ImmutableList.of("metric1", "metric2"), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 1 ), ImmutableMap.of("bucket", "DOES NOT EXIST", "baseKey", "baseKey")); @@ -151,7 +151,7 @@ public class S3DataSegmentMoverTest ), ImmutableList.of("dim1", "dim1"), ImmutableList.of("metric1", "metric2"), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 1 ), ImmutableMap.of("bucket", "DOES NOT EXIST", "baseKey", "baseKey2")); diff --git a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentPusherTest.java b/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentPusherTest.java index 6e26d87eeb8..7feffc167fc 100644 --- a/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentPusherTest.java +++ b/extensions-core/s3-extensions/src/test/java/io/druid/storage/s3/S3DataSegmentPusherTest.java @@ -73,7 +73,7 @@ public class S3DataSegmentPusherTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, size ); diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java b/indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java index 4212e4d1d1a..125237a909d 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java +++ b/indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java @@ -171,7 +171,7 @@ public class DetermineHashedPartitionsJob implements Jobby List actualSpecs = Lists.newArrayListWithExpectedSize(numberOfShards); if (numberOfShards == 1) { - actualSpecs.add(new HadoopyShardSpec(new NoneShardSpec(), shardCount++)); + actualSpecs.add(new HadoopyShardSpec(NoneShardSpec.instance(), shardCount++)); } else { for (int i = 0; i < numberOfShards; ++i) { actualSpecs.add( diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/DeterminePartitionsJob.java b/indexing-hadoop/src/main/java/io/druid/indexer/DeterminePartitionsJob.java index dda55506348..3d82f67c9de 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/DeterminePartitionsJob.java +++ b/indexing-hadoop/src/main/java/io/druid/indexer/DeterminePartitionsJob.java @@ -645,7 +645,7 @@ public class DeterminePartitionsJob implements Jobby final ShardSpec shardSpec; if (currentDimPartitions.partitions.isEmpty()) { - shardSpec = new NoneShardSpec(); + shardSpec = NoneShardSpec.instance(); } else { if (currentDimPartition.rows < config.getTargetPartitionSize() * SHARD_COMBINE_THRESHOLD) { // Combine with previous shard diff --git a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidDetermineConfigurationJob.java b/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidDetermineConfigurationJob.java index 554e64e6aa9..45e93f47de4 100644 --- a/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidDetermineConfigurationJob.java +++ b/indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidDetermineConfigurationJob.java @@ -80,7 +80,7 @@ public class HadoopDruidDetermineConfigurationJob implements Jobby shardSpecs.put(bucket, specs); log.info("DateTime[%s], spec[%s]", bucket, specs); } else { - final HadoopyShardSpec spec = new HadoopyShardSpec(new NoneShardSpec(), shardCount++); + final HadoopyShardSpec spec = new HadoopyShardSpec(NoneShardSpec.instance(), shardCount++); shardSpecs.put(bucket, Lists.newArrayList(spec)); log.info("DateTime[%s], spec[%s]", bucket, spec); } diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java b/indexing-hadoop/src/test/java/io/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java index f081a4cfc42..5ae005b248c 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java +++ b/indexing-hadoop/src/test/java/io/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java @@ -73,7 +73,7 @@ public class HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest ), ImmutableList.of("host"), ImmutableList.of("visited_sum", "unique_hosts"), - new NoneShardSpec(), + NoneShardSpec.instance(), 9, 2 ); diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceInputFormatTest.java b/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceInputFormatTest.java index 2f1293a5793..683183bf879 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceInputFormatTest.java +++ b/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceInputFormatTest.java @@ -73,7 +73,7 @@ public class DatasourceInputFormatTest ), ImmutableList.of("host"), ImmutableList.of("visited_sum", "unique_hosts"), - new NoneShardSpec(), + NoneShardSpec.instance(), 9, 2 ) @@ -89,7 +89,7 @@ public class DatasourceInputFormatTest ), ImmutableList.of("host"), ImmutableList.of("visited_sum", "unique_hosts"), - new NoneShardSpec(), + NoneShardSpec.instance(), 9, 11 ) @@ -105,7 +105,7 @@ public class DatasourceInputFormatTest ), ImmutableList.of("host"), ImmutableList.of("visited_sum", "unique_hosts"), - new NoneShardSpec(), + NoneShardSpec.instance(), 9, 4 ) diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceInputSplitTest.java b/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceInputSplitTest.java index dc17d198360..0017850e2c6 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceInputSplitTest.java +++ b/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/DatasourceInputSplitTest.java @@ -53,7 +53,7 @@ public class DatasourceInputSplitTest ), ImmutableList.of("host"), ImmutableList.of("visited_sum", "unique_hosts"), - new NoneShardSpec(), + NoneShardSpec.instance(), 9, 12334 ), diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/WindowedDataSegmentTest.java b/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/WindowedDataSegmentTest.java index 55862c77524..48d23bc8539 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/WindowedDataSegmentTest.java +++ b/indexing-hadoop/src/test/java/io/druid/indexer/hadoop/WindowedDataSegmentTest.java @@ -44,7 +44,7 @@ public class WindowedDataSegmentTest ), ImmutableList.of("host"), ImmutableList.of("visited_sum", "unique_hosts"), - new NoneShardSpec(), + NoneShardSpec.instance(), 9, 2 ); diff --git a/indexing-hadoop/src/test/java/io/druid/indexer/path/DatasourcePathSpecTest.java b/indexing-hadoop/src/test/java/io/druid/indexer/path/DatasourcePathSpecTest.java index 89296080273..510c012fb26 100644 --- a/indexing-hadoop/src/test/java/io/druid/indexer/path/DatasourcePathSpecTest.java +++ b/indexing-hadoop/src/test/java/io/druid/indexer/path/DatasourcePathSpecTest.java @@ -96,7 +96,7 @@ public class DatasourcePathSpecTest ), ImmutableList.of("product"), ImmutableList.of("visited_sum", "unique_hosts"), - new NoneShardSpec(), + NoneShardSpec.instance(), 9, 12334 ) @@ -112,7 +112,7 @@ public class DatasourcePathSpecTest ), ImmutableList.of("product"), ImmutableList.of("visited_sum", "unique_hosts"), - new NoneShardSpec(), + NoneShardSpec.instance(), 9, 12335 ) diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/IndexTask.java b/indexing-service/src/main/java/io/druid/indexing/common/task/IndexTask.java index c0a5d200bfd..87c21e424b3 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/IndexTask.java +++ b/indexing-service/src/main/java/io/druid/indexing/common/task/IndexTask.java @@ -214,7 +214,7 @@ public class IndexTask extends AbstractFixedIntervalTask shardSpecs.add(new HashBasedNumberedShardSpec(i, numShards, null, jsonMapper)); } } else { - shardSpecs = ImmutableList.of(new NoneShardSpec()); + shardSpecs = ImmutableList.of(NoneShardSpec.instance()); } } for (final ShardSpec shardSpec : shardSpecs) { @@ -301,7 +301,7 @@ public class IndexTask extends AbstractFixedIntervalTask final List shardSpecs = Lists.newArrayList(); if (numberOfShards == 1) { - shardSpecs.add(new NoneShardSpec()); + shardSpecs.add(NoneShardSpec.instance()); } else { for (int i = 0; i < numberOfShards; ++i) { shardSpecs.add(new HashBasedNumberedShardSpec(i, numberOfShards, null, jsonMapper)); diff --git a/indexing-service/src/main/java/io/druid/indexing/common/task/MergeTaskBase.java b/indexing-service/src/main/java/io/druid/indexing/common/task/MergeTaskBase.java index dee4ae29d7a..2a17202b626 100644 --- a/indexing-service/src/main/java/io/druid/indexing/common/task/MergeTaskBase.java +++ b/indexing-service/src/main/java/io/druid/indexing/common/task/MergeTaskBase.java @@ -320,7 +320,7 @@ public abstract class MergeTaskBase extends AbstractFixedIntervalTask .interval(mergedInterval) .version(version) .binaryVersion(IndexIO.CURRENT_VERSION_ID) - .shardSpec(new NoneShardSpec()) + .shardSpec(NoneShardSpec.instance()) .dimensions(Lists.newArrayList(mergedDimensions)) .metrics(Lists.newArrayList(mergedMetrics)) .build(); diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/ConvertSegmentTaskTest.java b/indexing-service/src/test/java/io/druid/indexing/common/task/ConvertSegmentTaskTest.java index 42900aca25f..74b07627fa2 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/ConvertSegmentTaskTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/common/task/ConvertSegmentTaskTest.java @@ -60,7 +60,7 @@ public class ConvertSegmentTaskTest ImmutableMap.of(), ImmutableList.of(), ImmutableList.of(), - new NoneShardSpec(), + NoneShardSpec.instance(), 9, 102937 ); diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/HadoopConverterTaskSerDeTest.java b/indexing-service/src/test/java/io/druid/indexing/common/task/HadoopConverterTaskSerDeTest.java index 5751f52714a..58cbc01eb8e 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/HadoopConverterTaskSerDeTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/common/task/HadoopConverterTaskSerDeTest.java @@ -47,7 +47,7 @@ public class HadoopConverterTaskSerDeTest private static final Map LOAD_SPEC = ImmutableMap.of("someKey", "someVal"); private static final List DIMENSIONS = ImmutableList.of("dim1", "dim2"); private static final List METRICS = ImmutableList.of("metric1", "metric2"); - private static final ShardSpec SHARD_SPEC = new NoneShardSpec(); + private static final ShardSpec SHARD_SPEC = NoneShardSpec.instance(); private static final int BINARY_VERSION = 34718; private static final long SEGMENT_SIZE = 7483901348790L; private static final IndexSpec INDEX_SPEC = new IndexSpec(new ConciseBitmapSerdeFactory(), "lz4", "lzf"); diff --git a/indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java b/indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java index 8a8123e3170..4db0d36b3c7 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java @@ -331,7 +331,7 @@ public class TaskSerdeTest null, null, 1, - new NoneShardSpec(), + NoneShardSpec.instance(), indexSpec, null, 0, @@ -487,7 +487,7 @@ public class TaskSerdeTest ImmutableMap.of(), ImmutableList.of("dim1", "dim2"), ImmutableList.of("metric1", "metric2"), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 12345L ), @@ -511,7 +511,7 @@ public class TaskSerdeTest ImmutableMap.of(), ImmutableList.of("dim1", "dim2"), ImmutableList.of("metric1", "metric2"), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 12345L ); diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLifecycleTest.java b/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLifecycleTest.java index 1e7bd3e85c9..907293b6598 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLifecycleTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLifecycleTest.java @@ -752,7 +752,7 @@ public class TaskLifecycleTest .version("2011-04-6T16:52:46.119-05:00") .dimensions(ImmutableList.of()) .metrics(ImmutableList.of()) - .shardSpec(new NoneShardSpec()) + .shardSpec(NoneShardSpec.instance()) .binaryVersion(9) .size(0) .build(); diff --git a/processing/src/main/java/io/druid/segment/serde/LongGenericColumnPartSerde.java b/processing/src/main/java/io/druid/segment/serde/LongGenericColumnPartSerde.java index 79091fca853..707050855a1 100644 --- a/processing/src/main/java/io/druid/segment/serde/LongGenericColumnPartSerde.java +++ b/processing/src/main/java/io/druid/segment/serde/LongGenericColumnPartSerde.java @@ -169,4 +169,4 @@ public class LongGenericColumnPartSerde implements ColumnPartSerde } }; } -} \ No newline at end of file +} diff --git a/processing/src/test/java/io/druid/query/select/MultiSegmentSelectQueryTest.java b/processing/src/test/java/io/druid/query/select/MultiSegmentSelectQueryTest.java index 1408afec6e7..dd668382c67 100644 --- a/processing/src/test/java/io/druid/query/select/MultiSegmentSelectQueryTest.java +++ b/processing/src/test/java/io/druid/query/select/MultiSegmentSelectQueryTest.java @@ -163,7 +163,7 @@ public class MultiSegmentSelectQueryTest interval.getStart(), interval.getEnd(), version, - new NoneShardSpec() + NoneShardSpec.instance() ); } diff --git a/processing/src/test/java/io/druid/segment/CompressedVSizeIndexedV3SupplierTest.java b/processing/src/test/java/io/druid/segment/CompressedVSizeIndexedV3SupplierTest.java index 557d01c4c1c..47e68270094 100644 --- a/processing/src/test/java/io/druid/segment/CompressedVSizeIndexedV3SupplierTest.java +++ b/processing/src/test/java/io/druid/segment/CompressedVSizeIndexedV3SupplierTest.java @@ -74,4 +74,4 @@ public class CompressedVSizeIndexedV3SupplierTest extends CompressedVSizeIndexed buffer, ByteOrder.nativeOrder() ); } -} \ No newline at end of file +} diff --git a/processing/src/test/java/io/druid/segment/SchemalessIndex.java b/processing/src/test/java/io/druid/segment/SchemalessIndex.java index 649384ff5c0..4c79bb3dd18 100644 --- a/processing/src/test/java/io/druid/segment/SchemalessIndex.java +++ b/processing/src/test/java/io/druid/segment/SchemalessIndex.java @@ -445,7 +445,7 @@ public class SchemalessIndex Ordering.natural().nullsFirst() ); - ShardSpec noneShardSpec = new NoneShardSpec(); + ShardSpec noneShardSpec = NoneShardSpec.instance(); for (int i = 0; i < intervals.size(); i++) { timeline.add(intervals.get(i), i, noneShardSpec.createChunk(filesToMap.get(i))); diff --git a/processing/src/test/java/io/druid/segment/data/CompressedIntsIndexedWriterTest.java b/processing/src/test/java/io/druid/segment/data/CompressedIntsIndexedWriterTest.java index 64ea94c5556..8b695df4487 100644 --- a/processing/src/test/java/io/druid/segment/data/CompressedIntsIndexedWriterTest.java +++ b/processing/src/test/java/io/druid/segment/data/CompressedIntsIndexedWriterTest.java @@ -165,4 +165,4 @@ public class CompressedIntsIndexedWriterTest vals = new int[0]; checkSerializedSizeAndData(2); } -} \ No newline at end of file +} diff --git a/processing/src/test/java/io/druid/segment/data/CompressedVSizeIndexedV3WriterTest.java b/processing/src/test/java/io/druid/segment/data/CompressedVSizeIndexedV3WriterTest.java index 23374ccecaf..4f44b11ff25 100644 --- a/processing/src/test/java/io/druid/segment/data/CompressedVSizeIndexedV3WriterTest.java +++ b/processing/src/test/java/io/druid/segment/data/CompressedVSizeIndexedV3WriterTest.java @@ -217,4 +217,4 @@ public class CompressedVSizeIndexedV3WriterTest vals = new ArrayList<>(); checkSerializedSizeAndData(1, 2); } -} \ No newline at end of file +} diff --git a/processing/src/test/java/io/druid/segment/data/CompressedVSizeIntsIndexedWriterTest.java b/processing/src/test/java/io/druid/segment/data/CompressedVSizeIntsIndexedWriterTest.java index fd2c9686c6f..f6fd2ec9e42 100644 --- a/processing/src/test/java/io/druid/segment/data/CompressedVSizeIntsIndexedWriterTest.java +++ b/processing/src/test/java/io/druid/segment/data/CompressedVSizeIntsIndexedWriterTest.java @@ -161,4 +161,4 @@ public class CompressedVSizeIntsIndexedWriterTest vals = new int[0]; checkSerializedSizeAndData(2); } -} \ No newline at end of file +} diff --git a/processing/src/test/java/io/druid/segment/data/VSizeIndexedIntsWriterTest.java b/processing/src/test/java/io/druid/segment/data/VSizeIndexedIntsWriterTest.java index a322e6744ea..ef515f22736 100644 --- a/processing/src/test/java/io/druid/segment/data/VSizeIndexedIntsWriterTest.java +++ b/processing/src/test/java/io/druid/segment/data/VSizeIndexedIntsWriterTest.java @@ -108,4 +108,4 @@ public class VSizeIndexedIntsWriterTest vals = new int[0]; checkSerializedSizeAndData(); } -} \ No newline at end of file +} diff --git a/processing/src/test/java/io/druid/segment/incremental/OnheapIncrementalIndexTest.java b/processing/src/test/java/io/druid/segment/incremental/OnheapIncrementalIndexTest.java index ac8289d2237..fb0b9abdb2c 100644 --- a/processing/src/test/java/io/druid/segment/incremental/OnheapIncrementalIndexTest.java +++ b/processing/src/test/java/io/druid/segment/incremental/OnheapIncrementalIndexTest.java @@ -96,4 +96,4 @@ public class OnheapIncrementalIndexTest Assert.assertEquals(0, checkFailedCount.get()); } -} \ No newline at end of file +} diff --git a/server/src/main/java/io/druid/segment/indexing/RealtimeTuningConfig.java b/server/src/main/java/io/druid/segment/indexing/RealtimeTuningConfig.java index a636d51107a..14dc723e9ad 100644 --- a/server/src/main/java/io/druid/segment/indexing/RealtimeTuningConfig.java +++ b/server/src/main/java/io/druid/segment/indexing/RealtimeTuningConfig.java @@ -45,7 +45,7 @@ public class RealtimeTuningConfig implements TuningConfig, AppenderatorConfig private static final VersioningPolicy defaultVersioningPolicy = new IntervalStartVersioningPolicy(); private static final RejectionPolicyFactory defaultRejectionPolicyFactory = new ServerTimeRejectionPolicyFactory(); private static final int defaultMaxPendingPersists = 0; - private static final ShardSpec defaultShardSpec = new NoneShardSpec(); + private static final ShardSpec defaultShardSpec = NoneShardSpec.instance(); private static final IndexSpec defaultIndexSpec = new IndexSpec(); private static final Boolean defaultBuildV9Directly = Boolean.FALSE; private static final Boolean defaultReportParseExceptions = Boolean.FALSE; diff --git a/server/src/test/java/io/druid/client/BrokerServerViewTest.java b/server/src/test/java/io/druid/client/BrokerServerViewTest.java index 2eee70602e9..8e228243935 100644 --- a/server/src/test/java/io/druid/client/BrokerServerViewTest.java +++ b/server/src/test/java/io/druid/client/BrokerServerViewTest.java @@ -358,7 +358,7 @@ public class BrokerServerViewTest extends CuratorTestBase .version(version) .dimensions(ImmutableList.of()) .metrics(ImmutableList.of()) - .shardSpec(new NoneShardSpec()) + .shardSpec(NoneShardSpec.instance()) .binaryVersion(9) .size(0) .build(); diff --git a/server/src/test/java/io/druid/client/CachingClusteredClientFunctionalityTest.java b/server/src/test/java/io/druid/client/CachingClusteredClientFunctionalityTest.java index 99d30caec6b..321043dbdd1 100644 --- a/server/src/test/java/io/druid/client/CachingClusteredClientFunctionalityTest.java +++ b/server/src/test/java/io/druid/client/CachingClusteredClientFunctionalityTest.java @@ -147,7 +147,7 @@ public class CachingClusteredClientFunctionalityTest { .dataSource("test") .interval(interval) .version(version) - .shardSpec(new NoneShardSpec()) + .shardSpec(NoneShardSpec.instance()) .build(), new TierSelectorStrategy() { @Override diff --git a/server/src/test/java/io/druid/client/CachingClusteredClientTest.java b/server/src/test/java/io/druid/client/CachingClusteredClientTest.java index 821953fbdc2..52dae617c18 100644 --- a/server/src/test/java/io/druid/client/CachingClusteredClientTest.java +++ b/server/src/test/java/io/druid/client/CachingClusteredClientTest.java @@ -2581,7 +2581,7 @@ public class CachingClusteredClientTest null, null, null, - new NoneShardSpec(), + NoneShardSpec.instance(), null, -1 ); diff --git a/server/src/test/java/io/druid/client/CoordinatorServerViewTest.java b/server/src/test/java/io/druid/client/CoordinatorServerViewTest.java index 234b765b1b9..91257734a29 100644 --- a/server/src/test/java/io/druid/client/CoordinatorServerViewTest.java +++ b/server/src/test/java/io/druid/client/CoordinatorServerViewTest.java @@ -353,7 +353,7 @@ public class CoordinatorServerViewTest extends CuratorTestBase .version(version) .dimensions(ImmutableList.of()) .metrics(ImmutableList.of()) - .shardSpec(new NoneShardSpec()) + .shardSpec(NoneShardSpec.instance()) .binaryVersion(9) .size(0) .build(); diff --git a/server/src/test/java/io/druid/client/DataSegmentTest.java b/server/src/test/java/io/druid/client/DataSegmentTest.java index 4350ac4390c..74030bdeb8b 100644 --- a/server/src/test/java/io/druid/client/DataSegmentTest.java +++ b/server/src/test/java/io/druid/client/DataSegmentTest.java @@ -61,7 +61,7 @@ public class DataSegmentTest loadSpec, Arrays.asList("dim1", "dim2"), Arrays.asList("met1", "met2"), - new NoneShardSpec(), + NoneShardSpec.instance(), IndexIO.CURRENT_VERSION_ID, 1 ); @@ -108,7 +108,7 @@ public class DataSegmentTest .dataSource("foo") .interval(new Interval("2012-01-01/2012-01-02")) .version(new DateTime("2012-01-01T11:22:33.444Z").toString()) - .shardSpec(new NoneShardSpec()) + .shardSpec(NoneShardSpec.instance()) .build(); Assert.assertEquals( diff --git a/server/src/test/java/io/druid/client/DirectDruidClientTest.java b/server/src/test/java/io/druid/client/DirectDruidClientTest.java index 1648e59584e..49ce19093c5 100644 --- a/server/src/test/java/io/druid/client/DirectDruidClientTest.java +++ b/server/src/test/java/io/druid/client/DirectDruidClientTest.java @@ -110,7 +110,7 @@ public class DirectDruidClientTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 0L ), @@ -220,7 +220,7 @@ public class DirectDruidClientTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 0L ), @@ -287,7 +287,7 @@ public class DirectDruidClientTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 0L ); diff --git a/server/src/test/java/io/druid/client/client/ImmutableSegmentLoadInfoTest.java b/server/src/test/java/io/druid/client/client/ImmutableSegmentLoadInfoTest.java index 1fba30287f5..912447f5cf8 100644 --- a/server/src/test/java/io/druid/client/client/ImmutableSegmentLoadInfoTest.java +++ b/server/src/test/java/io/druid/client/client/ImmutableSegmentLoadInfoTest.java @@ -50,7 +50,7 @@ public class ImmutableSegmentLoadInfoTest null, null, null, - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 0 ), Sets.newHashSet(new DruidServerMetadata("a", "host", 10, "type", "tier", 1)) ); diff --git a/server/src/test/java/io/druid/client/selector/ServerSelectorTest.java b/server/src/test/java/io/druid/client/selector/ServerSelectorTest.java index 12e875f380e..0dc42790694 100644 --- a/server/src/test/java/io/druid/client/selector/ServerSelectorTest.java +++ b/server/src/test/java/io/druid/client/selector/ServerSelectorTest.java @@ -51,7 +51,7 @@ public class ServerSelectorTest .version("v1") .dimensions(ImmutableList.of()) .metrics(ImmutableList.of()) - .shardSpec(new NoneShardSpec()) + .shardSpec(NoneShardSpec.instance()) .binaryVersion(9) .size(0) .build(), @@ -82,7 +82,7 @@ public class ServerSelectorTest )) .metrics( ImmutableList.of()) - .shardSpec(new NoneShardSpec()) + .shardSpec(NoneShardSpec.instance()) .binaryVersion(9) .size(0) .build() diff --git a/server/src/test/java/io/druid/client/selector/TierSelectorStrategyTest.java b/server/src/test/java/io/druid/client/selector/TierSelectorStrategyTest.java index 3ecce840d56..b5a3a8f4b7f 100644 --- a/server/src/test/java/io/druid/client/selector/TierSelectorStrategyTest.java +++ b/server/src/test/java/io/druid/client/selector/TierSelectorStrategyTest.java @@ -123,7 +123,7 @@ public class TierSelectorStrategyTest com.google.common.collect.Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 0L ), diff --git a/server/src/test/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java b/server/src/test/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java index b0078f4268f..3af817ed8d7 100644 --- a/server/src/test/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java +++ b/server/src/test/java/io/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java @@ -78,7 +78,7 @@ public class IndexerSQLMetadataStorageCoordinatorTest ImmutableMap.of(), ImmutableList.of("dim1"), ImmutableList.of("m1"), - new NoneShardSpec(), + NoneShardSpec.instance(), 9, 100 ); diff --git a/server/src/test/java/io/druid/metadata/MetadataSegmentManagerTest.java b/server/src/test/java/io/druid/metadata/MetadataSegmentManagerTest.java index cb87b1fb030..0a7ffd0fff3 100644 --- a/server/src/test/java/io/druid/metadata/MetadataSegmentManagerTest.java +++ b/server/src/test/java/io/druid/metadata/MetadataSegmentManagerTest.java @@ -57,7 +57,7 @@ public class MetadataSegmentManagerTest ), ImmutableList.of("dim1", "dim2", "dim3"), ImmutableList.of("count", "value"), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 1234L ); @@ -73,7 +73,7 @@ public class MetadataSegmentManagerTest ), ImmutableList.of("dim1", "dim2", "dim3"), ImmutableList.of("count", "value"), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 1234L ); diff --git a/server/src/test/java/io/druid/segment/indexing/RealtimeTuningConfigTest.java b/server/src/test/java/io/druid/segment/indexing/RealtimeTuningConfigTest.java index 3254deac80b..52371bb5d0d 100644 --- a/server/src/test/java/io/druid/segment/indexing/RealtimeTuningConfigTest.java +++ b/server/src/test/java/io/druid/segment/indexing/RealtimeTuningConfigTest.java @@ -69,7 +69,7 @@ public class RealtimeTuningConfigTest Assert.assertEquals(0, config.getHandoffConditionTimeout()); Assert.assertEquals(new IndexSpec(), config.getIndexSpec()); Assert.assertEquals(new Period("PT10M"), config.getIntermediatePersistPeriod()); - Assert.assertEquals(new NoneShardSpec(), config.getShardSpec()); + Assert.assertEquals(NoneShardSpec.instance(), config.getShardSpec()); Assert.assertEquals(0, config.getMaxPendingPersists()); Assert.assertEquals(75000, config.getMaxRowsInMemory()); Assert.assertEquals(0, config.getMergeThreadPriority()); @@ -111,7 +111,7 @@ public class RealtimeTuningConfigTest Assert.assertEquals(100, config.getHandoffConditionTimeout()); Assert.assertEquals(new IndexSpec(), config.getIndexSpec()); Assert.assertEquals(new Period("PT1H"), config.getIntermediatePersistPeriod()); - Assert.assertEquals(new NoneShardSpec(), config.getShardSpec()); + Assert.assertEquals(NoneShardSpec.instance(), config.getShardSpec()); Assert.assertEquals(100, config.getMaxPendingPersists()); Assert.assertEquals(100, config.getMaxRowsInMemory()); Assert.assertEquals(100, config.getMergeThreadPriority()); diff --git a/server/src/test/java/io/druid/segment/loading/LocalDataSegmentKillerTest.java b/server/src/test/java/io/druid/segment/loading/LocalDataSegmentKillerTest.java index e172afe1488..85ef8928c65 100644 --- a/server/src/test/java/io/druid/segment/loading/LocalDataSegmentKillerTest.java +++ b/server/src/test/java/io/druid/segment/loading/LocalDataSegmentKillerTest.java @@ -111,7 +111,7 @@ public class LocalDataSegmentKillerTest ), ImmutableList.of("product"), ImmutableList.of("visited_sum", "unique_hosts"), - new NoneShardSpec(), + NoneShardSpec.instance(), 9, 12334 ); diff --git a/server/src/test/java/io/druid/segment/loading/LocalDataSegmentPusherTest.java b/server/src/test/java/io/druid/segment/loading/LocalDataSegmentPusherTest.java index e7263e4e93f..7d9e9ab3c8b 100644 --- a/server/src/test/java/io/druid/segment/loading/LocalDataSegmentPusherTest.java +++ b/server/src/test/java/io/druid/segment/loading/LocalDataSegmentPusherTest.java @@ -54,7 +54,7 @@ public class LocalDataSegmentPusherTest null, null, null, - new NoneShardSpec(), + NoneShardSpec.instance(), null, -1 ); diff --git a/server/src/test/java/io/druid/segment/loading/SegmentLoaderLocalCacheManagerTest.java b/server/src/test/java/io/druid/segment/loading/SegmentLoaderLocalCacheManagerTest.java index c3ca5956963..f470bac8dae 100644 --- a/server/src/test/java/io/druid/segment/loading/SegmentLoaderLocalCacheManagerTest.java +++ b/server/src/test/java/io/druid/segment/loading/SegmentLoaderLocalCacheManagerTest.java @@ -146,7 +146,7 @@ public class SegmentLoaderLocalCacheManagerTest .version("2015-05-27T03:38:35.683Z") .dimensions(ImmutableList.of()) .metrics(ImmutableList.of()) - .shardSpec(new NoneShardSpec()) + .shardSpec(NoneShardSpec.instance()) .binaryVersion(9) .size(0) .build(); diff --git a/server/src/test/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierTest.java b/server/src/test/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierTest.java index c5766534464..8efbebac918 100644 --- a/server/src/test/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierTest.java +++ b/server/src/test/java/io/druid/segment/realtime/plumber/CoordinatorBasedSegmentHandoffNotifierTest.java @@ -354,4 +354,4 @@ public class CoordinatorBasedSegmentHandoffNotifierTest 0, 0 ); } -} \ No newline at end of file +} diff --git a/server/src/test/java/io/druid/server/coordination/SegmentChangeRequestDropTest.java b/server/src/test/java/io/druid/server/coordination/SegmentChangeRequestDropTest.java index 88fd1435423..76c59048c1a 100644 --- a/server/src/test/java/io/druid/server/coordination/SegmentChangeRequestDropTest.java +++ b/server/src/test/java/io/druid/server/coordination/SegmentChangeRequestDropTest.java @@ -52,7 +52,7 @@ public class SegmentChangeRequestDropTest loadSpec, Arrays.asList("dim1", "dim2"), Arrays.asList("met1", "met2"), - new NoneShardSpec(), + NoneShardSpec.instance(), IndexIO.CURRENT_VERSION_ID, 1 ); diff --git a/server/src/test/java/io/druid/server/coordination/SegmentChangeRequestLoadTest.java b/server/src/test/java/io/druid/server/coordination/SegmentChangeRequestLoadTest.java index fa5f065ad5d..ac0340f873c 100644 --- a/server/src/test/java/io/druid/server/coordination/SegmentChangeRequestLoadTest.java +++ b/server/src/test/java/io/druid/server/coordination/SegmentChangeRequestLoadTest.java @@ -52,7 +52,7 @@ public class SegmentChangeRequestLoadTest loadSpec, Arrays.asList("dim1", "dim2"), Arrays.asList("met1", "met2"), - new NoneShardSpec(), + NoneShardSpec.instance(), IndexIO.CURRENT_VERSION_ID, 1 ); diff --git a/server/src/test/java/io/druid/server/coordination/ServerManagerTest.java b/server/src/test/java/io/druid/server/coordination/ServerManagerTest.java index b2b968b497c..89868c8ab7b 100644 --- a/server/src/test/java/io/druid/server/coordination/ServerManagerTest.java +++ b/server/src/test/java/io/druid/server/coordination/ServerManagerTest.java @@ -467,7 +467,7 @@ public class ServerManagerTest ImmutableMap.of("version", version, "interval", interval), Arrays.asList("dim1", "dim2", "dim3"), Arrays.asList("metric1", "metric2"), - new NoneShardSpec(), + NoneShardSpec.instance(), IndexIO.CURRENT_VERSION_ID, 123L ) @@ -489,7 +489,7 @@ public class ServerManagerTest ImmutableMap.of("version", version, "interval", interval), Arrays.asList("dim1", "dim2", "dim3"), Arrays.asList("metric1", "metric2"), - new NoneShardSpec(), + NoneShardSpec.instance(), IndexIO.CURRENT_VERSION_ID, 123L ) diff --git a/server/src/test/java/io/druid/server/coordination/ZkCoordinatorTest.java b/server/src/test/java/io/druid/server/coordination/ZkCoordinatorTest.java index 04dcdebf3c1..db41b093b8c 100644 --- a/server/src/test/java/io/druid/server/coordination/ZkCoordinatorTest.java +++ b/server/src/test/java/io/druid/server/coordination/ZkCoordinatorTest.java @@ -418,7 +418,7 @@ public class ZkCoordinatorTest extends CuratorTestBase ImmutableMap.of("version", version, "interval", interval, "cacheDir", infoDir), Arrays.asList("dim1", "dim2", "dim3"), Arrays.asList("metric1", "metric2"), - new NoneShardSpec(), + NoneShardSpec.instance(), IndexIO.CURRENT_VERSION_ID, 123L ); diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerProfiler.java b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerProfiler.java index fcca60c4f46..523a7b08e3f 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerProfiler.java +++ b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerProfiler.java @@ -102,7 +102,7 @@ public class DruidCoordinatorBalancerProfiler Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 4L ) diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerTest.java b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerTest.java index a0074b13266..adab7c4da97 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerTest.java +++ b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorBalancerTest.java @@ -78,7 +78,7 @@ public class DruidCoordinatorBalancerTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 11L ); @@ -89,7 +89,7 @@ public class DruidCoordinatorBalancerTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 7L ); @@ -100,7 +100,7 @@ public class DruidCoordinatorBalancerTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 4L ); @@ -111,7 +111,7 @@ public class DruidCoordinatorBalancerTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 8L ); diff --git a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorRuleRunnerTest.java b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorRuleRunnerTest.java index c727f45a6a8..3686d3fdc8b 100644 --- a/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorRuleRunnerTest.java +++ b/server/src/test/java/io/druid/server/coordinator/DruidCoordinatorRuleRunnerTest.java @@ -79,7 +79,7 @@ public class DruidCoordinatorRuleRunnerTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), IndexIO.CURRENT_VERSION_ID, 1 ) @@ -992,7 +992,7 @@ public class DruidCoordinatorRuleRunnerTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 1, 0 ); @@ -1140,7 +1140,7 @@ public class DruidCoordinatorRuleRunnerTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 1, 0 ); diff --git a/server/src/test/java/io/druid/server/coordinator/LoadQueuePeonTest.java b/server/src/test/java/io/druid/server/coordinator/LoadQueuePeonTest.java index 5e3f56a41af..8adedea909e 100644 --- a/server/src/test/java/io/druid/server/coordinator/LoadQueuePeonTest.java +++ b/server/src/test/java/io/druid/server/coordinator/LoadQueuePeonTest.java @@ -351,7 +351,7 @@ public class LoadQueuePeonTest extends CuratorTestBase .version("2015-05-27T03:38:35.683Z") .dimensions(ImmutableList.of()) .metrics(ImmutableList.of()) - .shardSpec(new NoneShardSpec()) + .shardSpec(NoneShardSpec.instance()) .binaryVersion(9) .size(1200) .build(); diff --git a/server/src/test/java/io/druid/server/coordinator/ReservoirSegmentSamplerTest.java b/server/src/test/java/io/druid/server/coordinator/ReservoirSegmentSamplerTest.java index 46b0e76b166..4b33c928a8b 100644 --- a/server/src/test/java/io/druid/server/coordinator/ReservoirSegmentSamplerTest.java +++ b/server/src/test/java/io/druid/server/coordinator/ReservoirSegmentSamplerTest.java @@ -83,7 +83,7 @@ public class ReservoirSegmentSamplerTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 11L ); @@ -94,7 +94,7 @@ public class ReservoirSegmentSamplerTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 7L ); @@ -105,7 +105,7 @@ public class ReservoirSegmentSamplerTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 4L ); @@ -116,7 +116,7 @@ public class ReservoirSegmentSamplerTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 8L ); diff --git a/server/src/test/java/io/druid/server/coordinator/rules/LoadRuleTest.java b/server/src/test/java/io/druid/server/coordinator/rules/LoadRuleTest.java index 920447d6634..6d9e53beca4 100644 --- a/server/src/test/java/io/druid/server/coordinator/rules/LoadRuleTest.java +++ b/server/src/test/java/io/druid/server/coordinator/rules/LoadRuleTest.java @@ -94,7 +94,7 @@ public class LoadRuleTest Maps.newHashMap(), Lists.newArrayList(), Lists.newArrayList(), - new NoneShardSpec(), + NoneShardSpec.instance(), 0, 0 ); diff --git a/server/src/test/java/io/druid/server/coordinator/rules/PeriodDropRuleTest.java b/server/src/test/java/io/druid/server/coordinator/rules/PeriodDropRuleTest.java index a06a4d8779e..5d34502ed78 100644 --- a/server/src/test/java/io/druid/server/coordinator/rules/PeriodDropRuleTest.java +++ b/server/src/test/java/io/druid/server/coordinator/rules/PeriodDropRuleTest.java @@ -34,7 +34,7 @@ public class PeriodDropRuleTest private final static DataSegment.Builder builder = DataSegment.builder() .dataSource("test") .version(new DateTime("2012-12-31T01:00:00").toString()) - .shardSpec(new NoneShardSpec()); + .shardSpec(NoneShardSpec.instance()); @Test public void testAppliesToAll() diff --git a/server/src/test/java/io/druid/server/coordinator/rules/PeriodLoadRuleTest.java b/server/src/test/java/io/druid/server/coordinator/rules/PeriodLoadRuleTest.java index ad8e53400c0..e0b7d0bfb08 100644 --- a/server/src/test/java/io/druid/server/coordinator/rules/PeriodLoadRuleTest.java +++ b/server/src/test/java/io/druid/server/coordinator/rules/PeriodLoadRuleTest.java @@ -38,7 +38,7 @@ public class PeriodLoadRuleTest private final static DataSegment.Builder builder = DataSegment.builder() .dataSource("test") .version(new DateTime().toString()) - .shardSpec(new NoneShardSpec()); + .shardSpec(NoneShardSpec.instance()); @Test public void testAppliesToAll() diff --git a/services/src/test/java/io/druid/cli/validate/DruidJsonValidatorTest.java b/services/src/test/java/io/druid/cli/validate/DruidJsonValidatorTest.java index fcc12774d22..81fe013941c 100644 --- a/services/src/test/java/io/druid/cli/validate/DruidJsonValidatorTest.java +++ b/services/src/test/java/io/druid/cli/validate/DruidJsonValidatorTest.java @@ -175,7 +175,7 @@ public class DruidJsonValidatorTest null, null, 1, - new NoneShardSpec(), + NoneShardSpec.instance(), new IndexSpec(), null, 0,