remove unused imports

2015-02-02 21:53:39 +05:30 · 2015-02-02 21:53:39 +05:30 · ba932bb1f2
parent b94b24c46e
commit ba932bb1f2
147 changed files with 0 additions and 224 deletions
--- a/common/src/main/java/io/druid/collections/OrderedMergeIterator.java
+++ b/common/src/main/java/io/druid/collections/OrderedMergeIterator.java
@ -25,7 +25,6 @@ import com.google.common.collect.Iterators;
 import com.google.common.collect.PeekingIterator;
 import com.metamx.common.guava.FunctionalIterator;

-import javax.annotation.Nullable;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
--- a/common/src/main/java/io/druid/collections/OrderedMergeSequence.java
+++ b/common/src/main/java/io/druid/collections/OrderedMergeSequence.java
@ -30,7 +30,6 @@ import com.metamx.common.guava.Yielders;
 import com.metamx.common.guava.YieldingAccumulator;
 import com.metamx.common.guava.YieldingAccumulators;

-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.PriorityQueue;

--- a/common/src/main/java/io/druid/common/utils/JodaUtils.java
+++ b/common/src/main/java/io/druid/common/utils/JodaUtils.java
@ -27,7 +27,6 @@ import com.metamx.common.guava.Comparators;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;

-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.TreeSet;
--- a/common/src/main/java/io/druid/timeline/TimelineLookup.java
+++ b/common/src/main/java/io/druid/timeline/TimelineLookup.java
@ -22,8 +22,6 @@ package io.druid.timeline;
 import io.druid.timeline.partition.PartitionHolder;
 import org.joda.time.Interval;

-import java.util.List;
-

 public interface TimelineLookup<VersionType, ObjectType>
 {
--- a/extensions/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraDataSegmentPuller.java
+++ b/extensions/cassandra-storage/src/main/java/io/druid/storage/cassandra/CassandraDataSegmentPuller.java
@ -23,9 +23,6 @@ import com.google.common.io.Files;
 import com.google.inject.Inject;
 import com.metamx.common.ISE;
 import com.metamx.common.logger.Logger;
-import com.netflix.astyanax.connectionpool.OperationResult;
-import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
-import com.netflix.astyanax.model.ColumnList;
 import com.netflix.astyanax.recipes.storage.ChunkedStorage;
 import com.netflix.astyanax.recipes.storage.ObjectMetadata;
 import io.druid.segment.loading.DataSegmentPuller;
--- a/extensions/hdfs-storage/src/main/java/io/druid/storage/hdfs/tasklog/HdfsTaskLogs.java
+++ b/extensions/hdfs-storage/src/main/java/io/druid/storage/hdfs/tasklog/HdfsTaskLogs.java
@ -20,7 +20,6 @@ package io.druid.storage.hdfs.tasklog;

 import com.google.common.base.Optional;
 import com.google.common.io.ByteSource;
-import com.google.common.io.InputSupplier;
 import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
 import io.druid.tasklogs.TaskLogs;
--- a/extensions/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java
+++ b/extensions/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java
@ -23,21 +23,14 @@ package io.druid.query.aggregation.histogram;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.Floats;
 import com.google.common.primitives.Ints;
 import com.metamx.common.StringUtils;
 import io.druid.query.aggregation.Aggregator;
 import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.Aggregators;
 import io.druid.query.aggregation.BufferAggregator;
-import io.druid.query.aggregation.hyperloglog.HyperLogLogCollector;
-import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregator;
-import io.druid.query.aggregation.hyperloglog.HyperUniquesBufferAggregator;
 import io.druid.segment.ColumnSelectorFactory;
-import io.druid.segment.FloatColumnSelector;
-import io.druid.segment.ObjectColumnSelector;
 import org.apache.commons.codec.binary.Base64;

 import java.nio.ByteBuffer;
--- a/extensions/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java
+++ b/extensions/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java
@ -22,7 +22,6 @@ package io.druid.query.aggregation.histogram;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.google.common.base.Charsets;
 import com.google.common.primitives.Floats;
 import com.google.common.primitives.Ints;
 import com.metamx.common.IAE;
--- a/extensions/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/RabbitMQFirehoseFactory.java
+++ b/extensions/rabbitmq/src/main/java/io/druid/firehose/rabbitmq/RabbitMQFirehoseFactory.java
@ -21,7 +21,6 @@ package io.druid.firehose.rabbitmq;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.metamx.common.logger.Logger;
 import com.metamx.common.StringUtils;
 import com.rabbitmq.client.AMQP;
@ -33,7 +32,6 @@ import com.rabbitmq.client.Envelope;
 import com.rabbitmq.client.QueueingConsumer.Delivery;
 import com.rabbitmq.client.ShutdownListener;
 import com.rabbitmq.client.ShutdownSignalException;
-import io.druid.data.input.ByteBufferInputRowParser;
 import io.druid.data.input.Firehose;
 import io.druid.data.input.FirehoseFactory;
 import io.druid.data.input.InputRow;
--- a/extensions/rabbitmq/src/test/java/io/druid/examples/rabbitmq/RabbitMQFirehoseFactoryTest.java
+++ b/extensions/rabbitmq/src/test/java/io/druid/examples/rabbitmq/RabbitMQFirehoseFactoryTest.java
@ -21,13 +21,7 @@ package io.druid.examples.rabbitmq;

 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
 import com.rabbitmq.client.ConnectionFactory;
-import io.druid.data.input.impl.DimensionsSpec;
-import io.druid.data.input.impl.JSONParseSpec;
-import io.druid.data.input.impl.SpatialDimensionSchema;
-import io.druid.data.input.impl.StringInputRowParser;
-import io.druid.data.input.impl.TimestampSpec;
 import io.druid.firehose.rabbitmq.JacksonifiedConnectionFactory;
 import io.druid.firehose.rabbitmq.RabbitMQFirehoseConfig;
 import io.druid.firehose.rabbitmq.RabbitMQFirehoseFactory;
@ -35,8 +29,6 @@ import io.druid.jackson.DefaultObjectMapper;
 import org.junit.Assert;
 import org.junit.Test;

-import java.util.Arrays;
-
 /**
 */
 public class RabbitMQFirehoseFactoryTest
--- a/extensions/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentPuller.java
+++ b/extensions/s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentPuller.java
@ -33,7 +33,6 @@ import io.druid.utils.CompressionUtils;
 import org.apache.commons.io.FileUtils;
 import org.jets3t.service.S3ServiceException;
 import org.jets3t.service.impl.rest.httpclient.RestS3Service;
-import org.jets3t.service.model.S3Bucket;
 import org.jets3t.service.model.S3Object;

 import java.io.File;
--- a/extensions/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageDruidModule.java
+++ b/extensions/s3-extensions/src/main/java/io/druid/storage/s3/S3StorageDruidModule.java
@ -20,19 +20,12 @@
 package io.druid.storage.s3;

 import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.AWSCredentialsProviderChain;
-import com.amazonaws.auth.EnvironmentVariableCredentialsProvider;
-import com.amazonaws.auth.InstanceProfileCredentialsProvider;
-import com.amazonaws.auth.SystemPropertiesCredentialsProvider;
-import com.amazonaws.auth.profile.ProfileCredentialsProvider;
 import com.fasterxml.jackson.databind.Module;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Binder;
 import com.google.inject.Provides;
 import io.druid.common.aws.AWSCredentialsConfig;
 import io.druid.common.aws.AWSCredentialsUtils;
-import io.druid.common.aws.ConfigDrivenAwsCredentialsConfigProvider;
-import io.druid.common.aws.LazyFileSessionCredentialsProvider;
 import io.druid.guice.Binders;
 import io.druid.guice.JsonConfigProvider;
 import io.druid.guice.LazySingleton;
--- a/extensions/s3-extensions/src/main/java/io/druid/storage/s3/S3TaskLogs.java
+++ b/extensions/s3-extensions/src/main/java/io/druid/storage/s3/S3TaskLogs.java
@ -22,7 +22,6 @@ package io.druid.storage.s3;
 import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import com.google.common.io.ByteSource;
-import com.google.common.io.InputSupplier;
 import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
 import io.druid.tasklogs.TaskLogs;
--- a/indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.java
+++ b/indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.java
@ -45,8 +45,6 @@ import io.druid.segment.LoggingProgressIndicator;
 import io.druid.segment.ProgressIndicator;
 import io.druid.segment.QueryableIndex;
 import io.druid.segment.SegmentUtils;
-import io.druid.segment.data.BitmapSerde;
-import io.druid.segment.data.BitmapSerdeFactory;
 import io.druid.segment.incremental.IncrementalIndex;
 import io.druid.segment.incremental.IncrementalIndexSchema;
 import io.druid.segment.incremental.OffheapIncrementalIndex;
--- a/indexing-hadoop/src/main/java/io/druid/indexer/SortableBytes.java
+++ b/indexing-hadoop/src/main/java/io/druid/indexer/SortableBytes.java
@ -19,7 +19,6 @@

 package io.druid.indexer;

-import com.google.common.base.Charsets;
 import com.metamx.common.StringUtils;
 import org.apache.hadoop.io.BytesWritable;
 import org.apache.hadoop.io.WritableComparator;
--- a/indexing-hadoop/src/test/java/io/druid/indexer/SortableBytesTest.java
+++ b/indexing-hadoop/src/test/java/io/druid/indexer/SortableBytesTest.java
@ -19,7 +19,6 @@

 package io.druid.indexer;

-import com.google.common.base.Charsets;
 import com.metamx.common.StringUtils;
 import org.apache.hadoop.io.WritableComparator;
 import org.junit.Assert;
--- a/indexing-service/src/main/java/io/druid/indexing/common/index/YeOldePlumberSchool.java
+++ b/indexing-service/src/main/java/io/druid/indexing/common/index/YeOldePlumberSchool.java
@ -29,7 +29,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.metamx.common.Granularity;
 import com.metamx.common.logger.Logger;
 import io.druid.data.input.InputRow;
 import io.druid.query.Query;
--- a/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/FileTaskLogs.java
+++ b/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/FileTaskLogs.java
@ -22,7 +22,6 @@ package io.druid.indexing.common.tasklogs;
 import com.google.common.base.Optional;
 import com.google.common.io.ByteSource;
 import com.google.common.io.Files;
-import com.google.common.io.InputSupplier;
 import com.google.inject.Inject;
 import com.metamx.common.logger.Logger;
 import io.druid.indexing.common.config.FileTaskLogsConfig;
--- a/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/LogUtils.java
+++ b/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/LogUtils.java
@ -1,7 +1,5 @@
 package io.druid.indexing.common.tasklogs;

-import com.google.common.io.ByteSource;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
--- a/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/SwitchingTaskLogStreamer.java
+++ b/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/SwitchingTaskLogStreamer.java
@ -22,12 +22,10 @@ package io.druid.indexing.common.tasklogs;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.ByteSource;
-import com.google.common.io.InputSupplier;
 import com.google.inject.Inject;
 import io.druid.tasklogs.TaskLogStreamer;

 import java.io.IOException;
-import java.io.InputStream;
 import java.util.List;

 /**
--- a/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/TaskRunnerTaskLogStreamer.java
+++ b/indexing-service/src/main/java/io/druid/indexing/common/tasklogs/TaskRunnerTaskLogStreamer.java
@ -21,14 +21,12 @@ package io.druid.indexing.common.tasklogs;

 import com.google.common.base.Optional;
 import com.google.common.io.ByteSource;
-import com.google.common.io.InputSupplier;
 import com.google.inject.Inject;
 import io.druid.indexing.overlord.TaskMaster;
 import io.druid.indexing.overlord.TaskRunner;
 import io.druid.tasklogs.TaskLogStreamer;

 import java.io.IOException;
-import java.io.InputStream;

 /**
 */
--- a/indexing-service/src/main/java/io/druid/indexing/overlord/ForkingTaskRunner.java
+++ b/indexing-service/src/main/java/io/druid/indexing/overlord/ForkingTaskRunner.java
@ -33,7 +33,6 @@ import com.google.common.io.ByteSource;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.Closer;
 import com.google.common.io.Files;
-import com.google.common.io.InputSupplier;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
--- a/indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunnerFactory.java
+++ b/indexing-service/src/main/java/io/druid/indexing/overlord/RemoteTaskRunnerFactory.java
@ -26,11 +26,8 @@ import com.metamx.http.client.HttpClient;
 import io.druid.curator.cache.SimplePathChildrenCacheFactory;
 import io.druid.guice.annotations.Global;
 import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig;
-import io.druid.indexing.overlord.setup.FillCapacityWorkerSelectStrategy;
 import io.druid.indexing.overlord.setup.WorkerBehaviorConfig;
-import io.druid.indexing.overlord.setup.WorkerSelectStrategy;
 import io.druid.server.initialization.IndexerZkConfig;
-import io.druid.server.initialization.ZkPathsConfig;
 import org.apache.curator.framework.CuratorFramework;

 /**
--- a/indexing-service/src/main/java/io/druid/indexing/overlord/TaskMaster.java
+++ b/indexing-service/src/main/java/io/druid/indexing/overlord/TaskMaster.java
@ -39,7 +39,6 @@ import io.druid.indexing.overlord.autoscaling.ResourceManagementScheduler;
 import io.druid.indexing.overlord.autoscaling.ResourceManagementSchedulerFactory;
 import io.druid.server.DruidNode;
 import io.druid.server.initialization.IndexerZkConfig;
-import io.druid.server.initialization.ZkPathsConfig;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.leader.LeaderSelector;
 import org.apache.curator.framework.recipes.leader.LeaderSelectorListener;
--- a/indexing-service/src/main/java/io/druid/indexing/overlord/ThreadPoolTaskRunner.java
+++ b/indexing-service/src/main/java/io/druid/indexing/overlord/ThreadPoolTaskRunner.java
@ -48,10 +48,8 @@ import io.druid.query.UnionQueryRunner;
 import org.apache.commons.io.FileUtils;
 import org.joda.time.Interval;

-import javax.annotation.Nullable;
 import java.io.File;
 import java.util.Collection;
-import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentSkipListSet;
--- a/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/StringEC2UserData.java
+++ b/indexing-service/src/main/java/io/druid/indexing/overlord/autoscaling/ec2/StringEC2UserData.java
@ -21,7 +21,6 @@ package io.druid.indexing.overlord.autoscaling.ec2;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.metamx.common.StringUtils;
 import org.apache.commons.codec.binary.Base64;

--- a/indexing-service/src/main/java/io/druid/indexing/worker/http/WorkerResource.java
+++ b/indexing-service/src/main/java/io/druid/indexing/worker/http/WorkerResource.java
@ -42,7 +42,6 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
-import java.io.InputStream;

 /**
 */
--- a/indexing-service/src/test/java/io/druid/indexing/common/TestRealtimeTask.java
+++ b/indexing-service/src/test/java/io/druid/indexing/common/TestRealtimeTask.java
@ -22,8 +22,6 @@ package io.druid.indexing.common;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.metamx.common.Granularity;
-import io.druid.granularity.QueryGranularity;
 import io.druid.indexing.common.task.RealtimeIndexTask;
 import io.druid.indexing.common.task.TaskResource;
 import io.druid.query.aggregation.AggregatorFactory;
@ -35,7 +33,6 @@ import io.druid.segment.realtime.FireDepartmentMetrics;
 import io.druid.segment.realtime.firehose.LocalFirehoseFactory;
 import io.druid.segment.realtime.plumber.Plumber;
 import io.druid.segment.realtime.plumber.PlumberSchool;
-import io.druid.timeline.partition.NoneShardSpec;

 import java.io.File;

--- 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
@ -42,7 +42,6 @@ import io.druid.segment.realtime.FireDepartmentMetrics;
 import io.druid.segment.realtime.firehose.LocalFirehoseFactory;
 import io.druid.segment.realtime.plumber.Plumber;
 import io.druid.segment.realtime.plumber.PlumberSchool;
-import io.druid.segment.realtime.plumber.RealtimePlumberSchool;
 import io.druid.timeline.DataSegment;
 import io.druid.timeline.partition.NoneShardSpec;
 import junit.framework.Assert;
--- a/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTest.java
+++ b/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerTest.java
@ -40,7 +40,6 @@ import io.druid.indexing.common.TestUtils;
 import io.druid.indexing.common.task.Task;
 import io.druid.indexing.common.task.TaskResource;
 import io.druid.indexing.overlord.config.RemoteTaskRunnerConfig;
-import io.druid.indexing.overlord.setup.FillCapacityWorkerSelectStrategy;
 import io.druid.indexing.overlord.setup.WorkerBehaviorConfig;
 import io.druid.indexing.worker.TaskAnnouncement;
 import io.druid.indexing.worker.Worker;
--- a/indexing-service/src/test/java/io/druid/indexing/overlord/setup/EqualDistributionWorkerSelectStrategyTest.java
+++ b/indexing-service/src/test/java/io/druid/indexing/overlord/setup/EqualDistributionWorkerSelectStrategyTest.java
@ -29,10 +29,6 @@ import io.druid.indexing.worker.Worker;
 import junit.framework.Assert;
 import org.junit.Test;

-import java.util.Arrays;
-
-import static org.junit.Assert.*;
-
 public class EqualDistributionWorkerSelectStrategyTest
 {

--- a/indexing-service/src/test/java/io/druid/indexing/worker/TaskAnnouncementTest.java
+++ b/indexing-service/src/test/java/io/druid/indexing/worker/TaskAnnouncementTest.java
@ -20,8 +20,6 @@
 package io.druid.indexing.worker;

 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.metamx.common.Granularity;
-import io.druid.granularity.QueryGranularity;
 import io.druid.indexing.common.TaskStatus;
 import io.druid.indexing.common.task.RealtimeIndexTask;
 import io.druid.indexing.common.task.Task;
@ -36,9 +34,7 @@ import io.druid.segment.realtime.FireDepartmentMetrics;
 import io.druid.segment.realtime.firehose.LocalFirehoseFactory;
 import io.druid.segment.realtime.plumber.Plumber;
 import io.druid.segment.realtime.plumber.PlumberSchool;
-import io.druid.timeline.partition.NoneShardSpec;
 import junit.framework.Assert;
-import org.joda.time.Period;
 import org.junit.Test;

 import java.io.File;
--- a/integration-tests/src/main/java/io/druid/testing/DockerConfigProvider.java
+++ b/integration-tests/src/main/java/io/druid/testing/DockerConfigProvider.java
@ -21,11 +21,8 @@ package io.druid.testing;


 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.api.client.repackaged.com.google.common.base.Throwables;
-import org.apache.commons.io.IOUtils;

 import javax.validation.constraints.NotNull;
-import java.util.List;

 public class DockerConfigProvider  implements IntegrationTestingConfigProvider
 {
--- a/integration-tests/src/main/java/io/druid/testing/guice/DruidTestModule.java
+++ b/integration-tests/src/main/java/io/druid/testing/guice/DruidTestModule.java
@ -27,7 +27,6 @@ import com.google.inject.Provides;
 import com.metamx.emitter.core.LoggingEmitter;
 import com.metamx.emitter.core.LoggingEmitterConfig;
 import com.metamx.emitter.service.ServiceEmitter;
-import io.druid.guice.ConfigProvider;
 import io.druid.guice.JsonConfigProvider;
 import io.druid.guice.LazySingleton;
 import io.druid.guice.ManageLifecycle;
--- a/processing/src/main/java/io/druid/data/input/ProtoBufInputRowParser.java
+++ b/processing/src/main/java/io/druid/data/input/ProtoBufInputRowParser.java
@ -29,16 +29,11 @@ import com.google.protobuf.Descriptors;
 import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.metamx.common.logger.Logger;
-import io.druid.data.input.impl.DimensionsSpec;
-import io.druid.data.input.impl.JSONParseSpec;
 import io.druid.data.input.impl.MapInputRowParser;
 import io.druid.data.input.impl.ParseSpec;
-import io.druid.data.input.impl.SpatialDimensionSchema;
-import io.druid.data.input.impl.TimestampSpec;

 import java.io.InputStream;
 import java.nio.ByteBuffer;
-import java.util.List;
 import java.util.Map;

 import static com.google.protobuf.DescriptorProtos.FileDescriptorSet;
--- a/processing/src/main/java/io/druid/granularity/PeriodGranularity.java
+++ b/processing/src/main/java/io/druid/granularity/PeriodGranularity.java
@ -21,7 +21,6 @@ package io.druid.granularity;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.metamx.common.StringUtils;
 import org.joda.time.Chronology;
 import org.joda.time.DateTime;
--- a/processing/src/main/java/io/druid/guice/PropertiesModule.java
+++ b/processing/src/main/java/io/druid/guice/PropertiesModule.java
@ -21,7 +21,6 @@ package io.druid.guice;;

 import com.google.common.base.Charsets;
 import com.google.common.base.Throwables;
-import com.google.common.io.Closeables;
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.metamx.common.guava.CloseQuietly;
--- a/processing/src/main/java/io/druid/query/ConcatQueryRunner.java
+++ b/processing/src/main/java/io/druid/query/ConcatQueryRunner.java
@ -23,7 +23,6 @@ import com.google.common.base.Function;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.Sequences;

-import java.util.List;
 import java.util.Map;

 /**
--- a/processing/src/main/java/io/druid/query/FinalizeResultsQueryRunner.java
+++ b/processing/src/main/java/io/druid/query/FinalizeResultsQueryRunner.java
@ -28,8 +28,6 @@ import com.metamx.common.guava.Sequences;
 import io.druid.query.aggregation.MetricManipulationFn;
 import io.druid.query.aggregation.MetricManipulatorFns;

-import javax.annotation.Nullable;
-import java.util.List;
 import java.util.Map;

 /**
--- a/processing/src/main/java/io/druid/query/IntervalChunkingQueryRunner.java
+++ b/processing/src/main/java/io/druid/query/IntervalChunkingQueryRunner.java
@ -29,7 +29,6 @@ import io.druid.query.spec.MultipleIntervalSegmentSpec;
 import org.joda.time.Interval;
 import org.joda.time.Period;

-import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
--- a/processing/src/main/java/io/druid/query/MetricsEmittingQueryRunner.java
+++ b/processing/src/main/java/io/druid/query/MetricsEmittingQueryRunner.java
@ -28,7 +28,6 @@ import com.metamx.emitter.service.ServiceEmitter;
 import com.metamx.emitter.service.ServiceMetricEvent;

 import java.io.IOException;
-import java.util.List;
 import java.util.Map;

 /**
--- a/processing/src/main/java/io/druid/query/NoopQueryRunner.java
+++ b/processing/src/main/java/io/druid/query/NoopQueryRunner.java
@ -22,7 +22,6 @@ package io.druid.query;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.Sequences;

-import java.util.List;
 import java.util.Map;

 /**
--- a/processing/src/main/java/io/druid/query/Queries.java
+++ b/processing/src/main/java/io/druid/query/Queries.java
@ -26,7 +26,6 @@ import com.google.common.collect.Sets;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.query.aggregation.PostAggregator;

-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Set;

--- a/processing/src/main/java/io/druid/query/QueryRunnerHelper.java
+++ b/processing/src/main/java/io/druid/query/QueryRunnerHelper.java
@ -33,7 +33,6 @@ import io.druid.segment.Cursor;
 import io.druid.segment.StorageAdapter;
 import org.joda.time.Interval;

-import javax.annotation.Nullable;
 import java.util.List;

 /**
--- a/processing/src/main/java/io/druid/query/ReferenceCountingSegmentQueryRunner.java
+++ b/processing/src/main/java/io/druid/query/ReferenceCountingSegmentQueryRunner.java
@ -25,7 +25,6 @@ import com.metamx.common.guava.Sequence;
 import io.druid.segment.ReferenceCountingSegment;

 import java.io.Closeable;
-import java.util.List;
 import java.util.Map;

 /**
--- a/processing/src/main/java/io/druid/query/ResultMergeQueryRunner.java
+++ b/processing/src/main/java/io/druid/query/ResultMergeQueryRunner.java
@ -24,7 +24,6 @@ import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.nary.BinaryFn;
 import io.druid.common.guava.CombiningSequence;

-import java.util.List;
 import java.util.Map;

 /**
--- a/processing/src/main/java/io/druid/query/SubqueryQueryRunner.java
+++ b/processing/src/main/java/io/druid/query/SubqueryQueryRunner.java
@ -23,7 +23,6 @@ package io.druid.query;

 import com.metamx.common.guava.Sequence;

-import java.util.List;
 import java.util.Map;

 /**
--- a/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/DoubleSumAggregatorFactory.java
@ -21,7 +21,6 @@ package io.druid.query.aggregation;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.Doubles;
 import com.metamx.common.StringUtils;
--- a/processing/src/main/java/io/druid/query/aggregation/FilteredBufferAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/FilteredBufferAggregator.java
@ -20,8 +20,6 @@
 package io.druid.query.aggregation;

 import io.druid.query.filter.ValueMatcher;
-import io.druid.segment.DimensionSelector;
-import io.druid.segment.data.IndexedInts;

 import java.nio.ByteBuffer;

--- a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java
@ -21,7 +21,6 @@ package io.druid.query.aggregation;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.primitives.Floats;
--- a/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java
@ -21,7 +21,6 @@ package io.druid.query.aggregation;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
--- a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/LongSumAggregator.java
@ -20,7 +20,6 @@
 package io.druid.query.aggregation;

 import com.google.common.primitives.Longs;
-import io.druid.segment.FloatColumnSelector;
 import io.druid.segment.LongColumnSelector;

 import java.util.Comparator;
--- a/processing/src/main/java/io/druid/query/aggregation/LongSumAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/LongSumAggregatorFactory.java
@ -21,7 +21,6 @@ package io.druid.query.aggregation;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.Longs;
 import com.metamx.common.StringUtils;
--- a/processing/src/main/java/io/druid/query/aggregation/LongSumBufferAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/LongSumBufferAggregator.java
@ -19,7 +19,6 @@

 package io.druid.query.aggregation;

-import io.druid.segment.FloatColumnSelector;
 import io.druid.segment.LongColumnSelector;

 import java.nio.ByteBuffer;
--- a/processing/src/main/java/io/druid/query/aggregation/MaxAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/MaxAggregatorFactory.java
@ -21,7 +21,6 @@ package io.druid.query.aggregation;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.Doubles;
 import com.metamx.common.StringUtils;
--- a/processing/src/main/java/io/druid/query/aggregation/MinAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/MinAggregatorFactory.java
@ -21,7 +21,6 @@ package io.druid.query.aggregation;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.Doubles;
 import com.metamx.common.StringUtils;
--- a/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java
@ -21,7 +21,6 @@ package io.druid.query.aggregation.cardinality;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.base.Predicates;
--- a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregatorFactory.java
@ -21,7 +21,6 @@ package io.druid.query.aggregation.hyperloglog;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.metamx.common.IAE;
 import com.metamx.common.StringUtils;
 import io.druid.query.aggregation.Aggregator;
--- a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java
+++ b/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java
@ -19,7 +19,6 @@

 package io.druid.query.aggregation.hyperloglog;

-import com.google.common.base.Charsets;
 import com.google.common.collect.Ordering;
 import com.google.common.hash.HashFunction;
 import com.metamx.common.StringUtils;
--- a/processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceMetadataQuery.java
+++ b/processing/src/main/java/io/druid/query/datasourcemetadata/DataSourceMetadataQuery.java
@ -22,7 +22,6 @@ package io.druid.query.datasourcemetadata;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import io.druid.common.utils.JodaUtils;
 import io.druid.query.BaseQuery;
 import io.druid.query.DataSource;
--- a/processing/src/main/java/io/druid/query/dimension/DefaultDimensionSpec.java
+++ b/processing/src/main/java/io/druid/query/dimension/DefaultDimensionSpec.java
@ -21,7 +21,6 @@ package io.druid.query.dimension;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.metamx.common.StringUtils;
 import io.druid.query.extraction.DimExtractionFn;

--- a/processing/src/main/java/io/druid/query/dimension/ExtractionDimensionSpec.java
+++ b/processing/src/main/java/io/druid/query/dimension/ExtractionDimensionSpec.java
@ -21,7 +21,6 @@ package io.druid.query.dimension;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.metamx.common.StringUtils;
 import io.druid.query.extraction.DimExtractionFn;

--- a/processing/src/main/java/io/druid/query/extraction/JavascriptDimExtractionFn.java
+++ b/processing/src/main/java/io/druid/query/extraction/JavascriptDimExtractionFn.java
@ -21,7 +21,6 @@ package io.druid.query.extraction;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Function;
 import com.metamx.common.StringUtils;
 import org.mozilla.javascript.Context;
--- a/processing/src/main/java/io/druid/query/extraction/PartialDimExtractionFn.java
+++ b/processing/src/main/java/io/druid/query/extraction/PartialDimExtractionFn.java
@ -21,7 +21,6 @@ package io.druid.query.extraction;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.metamx.common.StringUtils;

 import java.nio.ByteBuffer;
--- a/processing/src/main/java/io/druid/query/extraction/RegexDimExtractionFn.java
+++ b/processing/src/main/java/io/druid/query/extraction/RegexDimExtractionFn.java
@ -21,7 +21,6 @@ package io.druid.query.extraction;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.metamx.common.StringUtils;

 import java.nio.ByteBuffer;
--- a/processing/src/main/java/io/druid/query/extraction/TimeDimExtractionFn.java
+++ b/processing/src/main/java/io/druid/query/extraction/TimeDimExtractionFn.java
@ -21,7 +21,6 @@ package io.druid.query.extraction;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.ibm.icu.text.SimpleDateFormat;
 import com.metamx.common.StringUtils;

--- a/processing/src/main/java/io/druid/query/filter/ExtractionDimFilter.java
+++ b/processing/src/main/java/io/druid/query/filter/ExtractionDimFilter.java
@ -21,7 +21,6 @@ package io.druid.query.filter;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.metamx.common.StringUtils;
 import io.druid.query.extraction.DimExtractionFn;
--- a/processing/src/main/java/io/druid/query/filter/JavaScriptDimFilter.java
+++ b/processing/src/main/java/io/druid/query/filter/JavaScriptDimFilter.java
@ -21,7 +21,6 @@ package io.druid.query.filter;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.metamx.common.StringUtils;

--- a/processing/src/main/java/io/druid/query/filter/RegexDimFilter.java
+++ b/processing/src/main/java/io/druid/query/filter/RegexDimFilter.java
@ -21,7 +21,6 @@ package io.druid.query.filter;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.metamx.common.StringUtils;

--- a/processing/src/main/java/io/druid/query/filter/SearchQueryDimFilter.java
+++ b/processing/src/main/java/io/druid/query/filter/SearchQueryDimFilter.java
@ -20,7 +20,6 @@
 package io.druid.query.filter;

 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.metamx.common.StringUtils;
 import io.druid.query.search.search.SearchQuerySpec;
--- a/processing/src/main/java/io/druid/query/filter/SelectorDimFilter.java
+++ b/processing/src/main/java/io/druid/query/filter/SelectorDimFilter.java
@ -21,7 +21,6 @@ package io.druid.query.filter;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.metamx.common.StringUtils;

--- a/processing/src/main/java/io/druid/query/filter/SpatialDimFilter.java
+++ b/processing/src/main/java/io/druid/query/filter/SpatialDimFilter.java
@ -20,7 +20,6 @@ package io.druid.query.filter;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.metamx.collections.spatial.search.Bound;
 import com.metamx.common.StringUtils;
--- a/processing/src/main/java/io/druid/query/groupby/GroupByQueryEngine.java
+++ b/processing/src/main/java/io/druid/query/groupby/GroupByQueryEngine.java
@ -62,7 +62,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.TreeMap;

 /**
 */
--- a/processing/src/main/java/io/druid/query/groupby/having/EqualToHavingSpec.java
+++ b/processing/src/main/java/io/druid/query/groupby/having/EqualToHavingSpec.java
@ -21,7 +21,6 @@ package io.druid.query.groupby.having;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.primitives.Bytes;
 import com.metamx.common.StringUtils;
 import io.druid.data.input.Row;
--- a/processing/src/main/java/io/druid/query/groupby/having/GreaterThanHavingSpec.java
+++ b/processing/src/main/java/io/druid/query/groupby/having/GreaterThanHavingSpec.java
@ -21,7 +21,6 @@ package io.druid.query.groupby.having;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.primitives.Bytes;
 import com.metamx.common.StringUtils;
 import io.druid.data.input.Row;
--- a/processing/src/main/java/io/druid/query/groupby/having/LessThanHavingSpec.java
+++ b/processing/src/main/java/io/druid/query/groupby/having/LessThanHavingSpec.java
@ -20,7 +20,6 @@
 package io.druid.query.groupby.having;

 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.primitives.Bytes;
 import com.metamx.common.StringUtils;
 import io.druid.data.input.Row;
--- a/processing/src/main/java/io/druid/query/groupby/orderby/OrderByColumnSpec.java
+++ b/processing/src/main/java/io/druid/query/groupby/orderby/OrderByColumnSpec.java
@ -21,7 +21,6 @@ package io.druid.query.groupby.orderby;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
--- a/processing/src/main/java/io/druid/query/metadata/SegmentAnalyzer.java
+++ b/processing/src/main/java/io/druid/query/metadata/SegmentAnalyzer.java
@ -19,7 +19,6 @@

 package io.druid.query.metadata;

-import com.google.common.base.Charsets;
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
--- a/processing/src/main/java/io/druid/query/metadata/metadata/ListColumnIncluderator.java
+++ b/processing/src/main/java/io/druid/query/metadata/metadata/ListColumnIncluderator.java
@ -21,7 +21,6 @@ package io.druid.query.metadata.metadata;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.metamx.common.StringUtils;
--- a/processing/src/main/java/io/druid/query/search/SearchQueryQueryToolChest.java
+++ b/processing/src/main/java/io/druid/query/search/SearchQueryQueryToolChest.java
@ -20,7 +20,6 @@
 package io.druid.query.search;

 import com.fasterxml.jackson.core.type.TypeReference;
-import com.google.common.base.Charsets;
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.collect.Iterables;
--- a/processing/src/main/java/io/druid/query/search/SearchQueryRunner.java
+++ b/processing/src/main/java/io/druid/query/search/SearchQueryRunner.java
@ -21,7 +21,6 @@ package io.druid.query.search;

 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
--- a/processing/src/main/java/io/druid/query/search/search/FragmentSearchQuerySpec.java
+++ b/processing/src/main/java/io/druid/query/search/search/FragmentSearchQuerySpec.java
@ -21,7 +21,6 @@ package io.druid.query.search.search;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.metamx.common.StringUtils;

 import java.nio.ByteBuffer;
--- a/processing/src/main/java/io/druid/query/search/search/InsensitiveContainsSearchQuerySpec.java
+++ b/processing/src/main/java/io/druid/query/search/search/InsensitiveContainsSearchQuerySpec.java
@ -21,7 +21,6 @@ package io.druid.query.search.search;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.metamx.common.StringUtils;

 import java.nio.ByteBuffer;
--- a/processing/src/main/java/io/druid/query/select/PagingSpec.java
+++ b/processing/src/main/java/io/druid/query/select/PagingSpec.java
@ -21,7 +21,6 @@ package io.druid.query.select;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.primitives.Ints;
 import com.metamx.common.StringUtils;

--- a/processing/src/main/java/io/druid/query/select/SelectQueryQueryToolChest.java
+++ b/processing/src/main/java/io/druid/query/select/SelectQueryQueryToolChest.java
@ -21,7 +21,6 @@ package io.druid.query.select;

 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Charsets;
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.collect.Ordering;
--- a/processing/src/main/java/io/druid/query/select/SelectQueryRunnerFactory.java
+++ b/processing/src/main/java/io/druid/query/select/SelectQueryRunnerFactory.java
@ -31,7 +31,6 @@ import io.druid.query.QueryWatcher;
 import io.druid.query.Result;
 import io.druid.segment.Segment;

-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;

--- a/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQuery.java
+++ b/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQuery.java
@ -21,7 +21,6 @@ package io.druid.query.timeboundary;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.metamx.common.StringUtils;
--- a/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java
+++ b/processing/src/main/java/io/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java
@ -35,7 +35,6 @@ import io.druid.segment.StorageAdapter;
 import org.joda.time.DateTime;

 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;

--- a/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryRunnerFactory.java
+++ b/processing/src/main/java/io/druid/query/timeseries/TimeseriesQueryRunnerFactory.java
@ -32,7 +32,6 @@ import io.druid.query.Result;
 import io.druid.segment.Segment;
 import io.druid.segment.StorageAdapter;

-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;

--- a/processing/src/main/java/io/druid/query/topn/AlphaNumericTopNMetricSpec.java
+++ b/processing/src/main/java/io/druid/query/topn/AlphaNumericTopNMetricSpec.java
@ -22,7 +22,6 @@ package io.druid.query.topn;
 import com.davekoelle.alphanum.AlphanumComparator;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.metamx.common.StringUtils;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.query.aggregation.PostAggregator;
--- a/processing/src/main/java/io/druid/query/topn/BySegmentTopNResultValue.java
+++ b/processing/src/main/java/io/druid/query/topn/BySegmentTopNResultValue.java
@ -23,7 +23,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.druid.query.BySegmentResultValue;
-import io.druid.query.BySegmentResultValueClass;
 import io.druid.query.Result;
 import org.joda.time.Interval;

--- a/processing/src/main/java/io/druid/query/topn/LexicographicTopNMetricSpec.java
+++ b/processing/src/main/java/io/druid/query/topn/LexicographicTopNMetricSpec.java
@ -21,7 +21,6 @@ package io.druid.query.topn;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.primitives.UnsignedBytes;
 import com.metamx.common.StringUtils;
 import io.druid.query.aggregation.AggregatorFactory;
--- a/processing/src/main/java/io/druid/query/topn/NumericTopNMetricSpec.java
+++ b/processing/src/main/java/io/druid/query/topn/NumericTopNMetricSpec.java
@ -21,7 +21,6 @@ package io.druid.query.topn;

 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
--- a/processing/src/main/java/io/druid/query/topn/TopNNumericResultBuilder.java
+++ b/processing/src/main/java/io/druid/query/topn/TopNNumericResultBuilder.java
@ -30,7 +30,6 @@ import io.druid.query.aggregation.PostAggregator;
 import io.druid.query.dimension.DimensionSpec;
 import org.joda.time.DateTime;

-import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Iterator;
--- a/processing/src/main/java/io/druid/query/topn/TopNQueryRunnerFactory.java
+++ b/processing/src/main/java/io/druid/query/topn/TopNQueryRunnerFactory.java
@ -34,7 +34,6 @@ import io.druid.query.Result;
 import io.druid.segment.Segment;

 import java.nio.ByteBuffer;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;

--- a/processing/src/main/java/io/druid/segment/IndexableAdapter.java
+++ b/processing/src/main/java/io/druid/segment/IndexableAdapter.java
@ -20,7 +20,6 @@
 package io.druid.segment;

 import io.druid.segment.column.ColumnCapabilities;
-import io.druid.segment.column.ValueType;
 import io.druid.segment.data.Indexed;
 import io.druid.segment.data.IndexedInts;
 import org.joda.time.Interval;
--- a/processing/src/main/java/io/druid/segment/MMappedIndex.java
+++ b/processing/src/main/java/io/druid/segment/MMappedIndex.java
@ -20,14 +20,12 @@
 package io.druid.segment;

 import com.metamx.collections.bitmap.ImmutableBitmap;
-import com.metamx.collections.bitmap.WrappedImmutableConciseBitmap;
 import com.metamx.collections.spatial.ImmutableRTree;
 import com.metamx.common.io.smoosh.SmooshedFileMapper;
 import com.metamx.common.logger.Logger;
 import io.druid.segment.data.CompressedLongsIndexedSupplier;
 import io.druid.segment.data.GenericIndexed;
 import io.druid.segment.data.VSizeIndexed;
-import it.uniroma3.mat.extendedset.intset.ImmutableConciseSet;
 import org.joda.time.Interval;

 import java.io.IOException;
--- a/processing/src/main/java/io/druid/segment/data/CompressedLongsSupplierSerializer.java
+++ b/processing/src/main/java/io/druid/segment/data/CompressedLongsSupplierSerializer.java
@ -22,10 +22,8 @@ package io.druid.segment.data;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.OutputSupplier;
 import com.google.common.primitives.Ints;
-import com.google.common.primitives.Longs;
 import io.druid.collections.ResourceHolder;
 import io.druid.collections.StupidResourceHolder;
-import io.druid.segment.CompressedPools;

 import java.io.IOException;
 import java.io.OutputStream;
--- a/processing/src/main/java/io/druid/segment/data/CompressedObjectStrategy.java
+++ b/processing/src/main/java/io/druid/segment/data/CompressedObjectStrategy.java
@ -23,7 +23,6 @@ import com.google.common.base.Throwables;
 import com.google.common.collect.Maps;
 import com.metamx.common.logger.Logger;
 import com.ning.compress.BufferRecycler;
-import com.ning.compress.lzf.ChunkEncoder;
 import com.ning.compress.lzf.LZFDecoder;
 import com.ning.compress.lzf.LZFEncoder;
 import io.druid.collections.ResourceHolder;
--- a/processing/src/main/java/io/druid/segment/data/GenericIndexed.java
+++ b/processing/src/main/java/io/druid/segment/data/GenericIndexed.java
@ -19,8 +19,6 @@

 package io.druid.segment.data;

-import com.google.common.base.Charsets;
-import com.google.common.base.Throwables;
 import com.google.common.collect.Ordering;
 import com.google.common.primitives.Ints;
 import com.metamx.common.IAE;
@ -31,7 +29,6 @@ import com.metamx.common.logger.Logger;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 import java.util.Arrays;
--- a/Show More
+++ b/Show More