Updated Branches: refs/heads/trunk 2ca07f523 -> ed4d45565
imports cleanup Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed4d4556 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed4d4556 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed4d4556 Branch: refs/heads/trunk Commit: ed4d45565789cbfb1fafcfee8527e24790e4803d Parents: 2ca07f5 Author: Dave Brosius <[email protected]> Authored: Sun Jun 16 18:22:30 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Sun Jun 16 18:22:30 2013 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/YamlConfigurationLoader.java | 1 - src/java/org/apache/cassandra/cql3/statements/BatchStatement.java | 1 - .../org/apache/cassandra/db/compaction/CompactionController.java | 2 -- .../org/apache/cassandra/db/compaction/LazilyCompactedRow.java | 1 - src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 3 --- src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java | 1 - .../apache/cassandra/locator/YamlFileNetworkTopologySnitch.java | 1 - src/java/org/apache/cassandra/metrics/ReadRepairMetrics.java | 3 --- src/java/org/apache/cassandra/thrift/TServerCustomFactory.java | 1 - src/java/org/apache/cassandra/tools/NodeCmd.java | 2 -- 10 files changed, 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed4d4556/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java index 2eb4e6e..642fe8b 100644 --- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java +++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java @@ -27,7 +27,6 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.util.FileUtils; -import org.yaml.snakeyaml.Loader; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.error.YAMLException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed4d4556/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java index 777c80f..1436811 100644 --- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java @@ -23,7 +23,6 @@ import java.util.*; import org.apache.cassandra.cql3.*; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.IMutation; -import org.apache.cassandra.db.RowMutation; import org.apache.cassandra.exceptions.*; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed4d4556/src/java/org/apache/cassandra/db/compaction/CompactionController.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionController.java b/src/java/org/apache/cassandra/db/compaction/CompactionController.java index 15878c5..7c79368 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java @@ -28,14 +28,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.ColumnFamily; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DataTracker; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.io.sstable.SSTable; import org.apache.cassandra.io.sstable.SSTableIdentityIterator; import org.apache.cassandra.io.sstable.SSTableReader; -import org.apache.cassandra.service.CacheService; import org.apache.cassandra.utils.AlwaysPresentFilter; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed4d4556/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java index 5635652..e9cd2f1 100644 --- a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java +++ b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java @@ -37,7 +37,6 @@ import org.apache.cassandra.io.sstable.ColumnStats; import org.apache.cassandra.io.sstable.SSTable; import org.apache.cassandra.io.sstable.SSTableWriter; import org.apache.cassandra.io.util.DataOutputBuffer; -import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.MergeIterator; import org.apache.cassandra.utils.StreamingHistogram; http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed4d4556/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java index 2a83960..fda7ac5 100644 --- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java +++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java @@ -21,7 +21,6 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Comparator; @@ -34,14 +33,12 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.db.*; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.columniterator.SSTableSliceIterator; -import org.apache.cassandra.db.marshal.AbstractCompositeType; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.io.util.FileDataInput; import org.apache.cassandra.tracing.Tracing; -import org.apache.cassandra.utils.ByteBufferUtil; public class SliceQueryFilter implements IDiskAtomFilter { http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed4d4556/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java index 69c7ddb..0ebadc0 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java @@ -22,7 +22,6 @@ import org.apache.hadoop.mapreduce.InputSplit; import java.io.DataInput; import java.io.DataOutput; -import java.io.EOFException; import java.io.IOException; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed4d4556/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java b/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java index e430435..eb3fd3e 100644 --- a/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java +++ b/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java @@ -38,7 +38,6 @@ import org.apache.cassandra.utils.ResourceWatcher; import org.apache.cassandra.utils.WrappedRunnable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.yaml.snakeyaml.Loader; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor; http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed4d4556/src/java/org/apache/cassandra/metrics/ReadRepairMetrics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/ReadRepairMetrics.java b/src/java/org/apache/cassandra/metrics/ReadRepairMetrics.java index 5b61e42..c67ed90 100644 --- a/src/java/org/apache/cassandra/metrics/ReadRepairMetrics.java +++ b/src/java/org/apache/cassandra/metrics/ReadRepairMetrics.java @@ -24,11 +24,8 @@ package org.apache.cassandra.metrics; import java.util.concurrent.TimeUnit; import com.yammer.metrics.Metrics; -import com.yammer.metrics.core.Counter; -import com.yammer.metrics.core.Gauge; import com.yammer.metrics.core.Meter; import com.yammer.metrics.core.MetricName; -import com.yammer.metrics.util.RatioGauge; /** * Metrics related to Read Repair. http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed4d4556/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java b/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java index 4bf0acd..25800a0 100644 --- a/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java +++ b/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java @@ -21,7 +21,6 @@ package org.apache.cassandra.thrift; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.thinkaurelius.thrift.TDisruptorServer; import org.apache.thrift.server.TServer; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed4d4556/src/java/org/apache/cassandra/tools/NodeCmd.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java index 9f524fc..b0b9e23 100644 --- a/src/java/org/apache/cassandra/tools/NodeCmd.java +++ b/src/java/org/apache/cassandra/tools/NodeCmd.java @@ -32,8 +32,6 @@ import java.util.concurrent.ExecutionException; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Maps; import org.apache.commons.cli.*; -import org.yaml.snakeyaml.Loader; -import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor;
