[1/2] cassandra git commit: imports cleanup

2016-07-16 Thread dbrosius 
Repository: cassandra
Updated Branches:
  refs/heads/trunk f6ca48251 -> 087264f29


http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/net/MessageIn.java
--
diff --git a/src/java/org/apache/cassandra/net/MessageIn.java 
b/src/java/org/apache/cassandra/net/MessageIn.java
index 014ee93..fe85595 100644
--- a/src/java/org/apache/cassandra/net/MessageIn.java
+++ b/src/java/org/apache/cassandra/net/MessageIn.java
@@ -27,10 +27,8 @@ import com.google.common.collect.ImmutableMap;
 import org.apache.cassandra.concurrent.Stage;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.monitoring.ConstructionTime;
-import org.apache.cassandra.db.monitoring.MonitorableImpl;
 import org.apache.cassandra.io.IVersionedSerializer;
 import org.apache.cassandra.io.util.DataInputPlus;
-import org.apache.cassandra.io.util.FileUtils;
 
 public class MessageIn
 {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
--
diff --git a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java 
b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
index 312daed..52625bf 100644
--- a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
+++ b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
@@ -21,7 +21,6 @@ import java.net.InetAddress;
 import java.util.*;
 
 import com.google.common.base.Predicate;
-import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import org.slf4j.Logger;
@@ -30,8 +29,6 @@ import org.slf4j.LoggerFactory;
 import org.apache.cassandra.db.ColumnFamilyStore;
 import org.apache.cassandra.db.compaction.CompactionManager;
 import org.apache.cassandra.dht.Bounds;
-import org.apache.cassandra.dht.Range;
-import org.apache.cassandra.dht.Token;
 import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.cassandra.net.IVerbHandler;
 import org.apache.cassandra.net.MessageIn;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/repair/ValidationTask.java
--
diff --git a/src/java/org/apache/cassandra/repair/ValidationTask.java 
b/src/java/org/apache/cassandra/repair/ValidationTask.java
index bd866d2..177ad3e 100644
--- a/src/java/org/apache/cassandra/repair/ValidationTask.java
+++ b/src/java/org/apache/cassandra/repair/ValidationTask.java
@@ -18,16 +18,12 @@
 package org.apache.cassandra.repair;
 
 import java.net.InetAddress;
-import java.util.Map;
 
 import com.google.common.util.concurrent.AbstractFuture;
 
-import org.apache.cassandra.dht.Range;
-import org.apache.cassandra.dht.Token;
 import org.apache.cassandra.exceptions.RepairException;
 import org.apache.cassandra.net.MessagingService;
 import org.apache.cassandra.repair.messages.ValidationRequest;
-import org.apache.cassandra.utils.MerkleTree;
 import org.apache.cassandra.utils.MerkleTrees;
 
 /**

http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/scheduler/WeightedQueue.java
--
diff --git a/src/java/org/apache/cassandra/scheduler/WeightedQueue.java 
b/src/java/org/apache/cassandra/scheduler/WeightedQueue.java
index 298938d..76c7e9d 100644
--- a/src/java/org/apache/cassandra/scheduler/WeightedQueue.java
+++ b/src/java/org/apache/cassandra/scheduler/WeightedQueue.java
@@ -20,9 +20,6 @@ package org.apache.cassandra.scheduler;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.TimeUnit;
-import java.lang.management.ManagementFactory;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
 
 import org.apache.cassandra.metrics.LatencyMetrics;
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
--
diff --git a/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java 
b/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
index 93591f0..c70161e 100644
--- a/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
+++ b/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
@@ -40,9 +40,7 @@ import org.apache.cassandra.db.marshal.*;
 import org.apache.cassandra.db.rows.RowIterator;
 import org.apache.cassandra.db.rows.UnfilteredRowIterators;
 import org.apache.cassandra.exceptions.InvalidRequestException;
-import org.apache.cassandra.utils.ByteBufferUtil;
 import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.c

[2/2] cassandra git commit: imports cleanup

2016-07-16 Thread dbrosius 
imports cleanup


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/087264f2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/087264f2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/087264f2

Branch: refs/heads/trunk
Commit: 087264f29c309ed0b2a18cc20b79016a05847f1c
Parents: f6ca482
Author: Dave Brosius 
Authored: Sat Jul 16 12:40:05 2016 -0400
Committer: Dave Brosius 
Committed: Sat Jul 16 12:40:05 2016 -0400

--
 .../cassandra/thrift/AuthenticationException.java  | 13 -
 .../org/apache/cassandra/thrift/CfSplit.java   | 13 -
 .../org/apache/cassandra/thrift/Column.java| 11 ---
 .../org/apache/cassandra/thrift/ColumnDef.java | 12 
 .../cassandra/thrift/ColumnOrSuperColumn.java  | 13 -
 .../org/apache/cassandra/thrift/ColumnPath.java| 12 
 .../org/apache/cassandra/thrift/CounterColumn.java |  1 -
 .../apache/cassandra/auth/CassandraAuthorizer.java |  6 --
 .../org/apache/cassandra/auth/RoleResource.java|  1 -
 .../cassandra/auth/jmx/AuthorizationProxy.java |  3 ---
 .../org/apache/cassandra/cache/ChunkCache.java |  1 -
 .../AbstractLocalAwareExecutorService.java |  2 --
 .../concurrent/DebuggableThreadPoolExecutor.java   |  3 ---
 .../apache/cassandra/concurrent/ExecutorLocal.java |  1 -
 .../apache/cassandra/concurrent/StageManager.java  |  1 -
 .../cassandra/config/ParameterizedClass.java   |  1 -
 .../org/apache/cassandra/cql3/AbstractMarker.java  |  1 -
 src/java/org/apache/cassandra/cql3/Attributes.java |  3 ---
 .../apache/cassandra/cql3/ColumnIdentifier.java|  6 --
 .../org/apache/cassandra/cql3/FieldIdentifier.java |  1 -
 src/java/org/apache/cassandra/cql3/Json.java   |  1 -
 src/java/org/apache/cassandra/cql3/Operation.java  |  1 -
 src/java/org/apache/cassandra/cql3/Tuples.java |  1 -
 .../cassandra/cql3/functions/AggregateFcts.java|  1 -
 .../apache/cassandra/cql3/functions/TimeFcts.java  |  1 -
 .../apache/cassandra/cql3/functions/ToJsonFct.java |  2 --
 .../cassandra/cql3/selection/FieldSelector.java|  1 -
 .../cassandra/cql3/selection/Selectable.java   |  1 -
 .../apache/cassandra/cql3/selection/Selection.java |  1 -
 .../cql3/selection/SelectionColumnMapping.java |  2 --
 .../cassandra/cql3/selection/TermSelector.java |  3 ---
 .../cql3/statements/AlterTableStatementColumn.java |  1 -
 .../cql3/statements/CreateTypeStatement.java   |  2 --
 .../cql3/statements/CreateViewStatement.java   |  1 -
 .../cql3/statements/DropViewStatement.java |  2 --
 .../cassandra/cql3/statements/IndexTarget.java |  1 -
 .../cql3/statements/ModificationStatement.java |  1 -
 .../cassandra/cql3/statements/SelectStatement.java |  4 
 .../cql3/statements/TruncateStatement.java |  1 -
 .../org/apache/cassandra/db/BufferClustering.java  |  4 
 .../org/apache/cassandra/db/CounterMutation.java   |  1 -
 .../cassandra/db/CounterMutationVerbHandler.java   |  1 -
 src/java/org/apache/cassandra/db/LivenessInfo.java |  1 -
 .../apache/cassandra/db/MutableDeletionInfo.java   |  1 -
 .../apache/cassandra/db/MutationVerbHandler.java   |  1 -
 .../apache/cassandra/db/NativeDecoratedKey.java|  1 -
 .../org/apache/cassandra/db/PartitionPosition.java |  1 -
 .../cassandra/db/PartitionRangeReadCommand.java|  1 -
 .../cassandra/db/SinglePartitionReadCommand.java   |  1 -
 src/java/org/apache/cassandra/db/Slices.java   |  1 -
 .../cassandra/db/commitlog/CommitLogReader.java|  1 -
 .../cassandra/db/commitlog/CompressedSegment.java  |  2 --
 .../db/compaction/AbstractCompactionStrategy.java  |  1 -
 .../db/compaction/CompactionController.java|  1 -
 .../db/compaction/CompactionManagerMBean.java  |  1 -
 .../db/compaction/LeveledCompactionStrategy.java   |  1 -
 .../cassandra/db/compaction/LeveledManifest.java   |  1 -
 .../compaction/SizeTieredCompactionStrategy.java   |  1 -
 .../apache/cassandra/db/filter/ColumnFilter.java   |  1 -
 .../org/apache/cassandra/db/lifecycle/View.java|  2 --
 .../org/apache/cassandra/db/marshal/TimeType.java  |  1 -
 .../org/apache/cassandra/db/marshal/UserType.java  |  2 --
 .../cassandra/db/partitions/PartitionIterator.java |  2 --
 .../db/partitions/PartitionIterators.java  |  1 -
 .../org/apache/cassandra/db/rows/CellPath.java |  1 -
 .../cassandra/db/rows/UnfilteredRowIterator.java   |  3 ---
 .../cassandra/db/rows/WithOnlyQueriedData.java |  1 -
 .../org/apache/cassandra/db/view/ViewBuilder.java  |  2 --
 .../cassandra/db/view/ViewUpdateGenerator.java |  1 -
 src/java/org/apache/cassandra/dht/Bounds.java  |  1 -
 .../org/apache/cassandra/hints/HintsBuffer.java|  1 -
 .../cassandra/hints/HintsDispatchTrigger.java  |  1 -
 .../cassandra/index/internal/IndexEntry.java   |  1 -
 .

git commit: imports cleanup

2014-08-22 Thread dbrosius 
Repository: cassandra
Updated Branches:
  refs/heads/trunk 0a0ee442f -> 3ca9576c9


imports cleanup


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3ca9576c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ca9576c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ca9576c

Branch: refs/heads/trunk
Commit: 3ca9576c91386e920a0a3356fc9fa10e2f9c580b
Parents: 0a0ee44
Author: Dave Brosius 
Authored: Fri Aug 22 19:38:05 2014 -0400
Committer: Dave Brosius 
Committed: Fri Aug 22 19:38:05 2014 -0400

--
 src/java/org/apache/cassandra/config/UFMetaData.java | 2 --
 .../org/apache/cassandra/cql3/statements/CQL3CasRequest.java | 1 -
 src/java/org/apache/cassandra/db/AtomicBTreeColumns.java | 1 -
 src/java/org/apache/cassandra/db/BufferDecoratedKey.java | 2 --
 src/java/org/apache/cassandra/db/DecoratedKey.java   | 3 ---
 src/java/org/apache/cassandra/db/DeletionInfo.java   | 1 -
 src/java/org/apache/cassandra/db/Memtable.java   | 1 -
 src/java/org/apache/cassandra/db/NativeDecoratedKey.java | 1 -
 src/java/org/apache/cassandra/db/RangeTombstoneList.java | 1 -
 .../org/apache/cassandra/db/compaction/LeveledManifest.java  | 2 --
 .../db/composites/AbstractCompoundCellNameType.java  | 2 --
 src/java/org/apache/cassandra/db/composites/SimpleCType.java | 2 --
 src/java/org/apache/cassandra/db/filter/ExtendedFilter.java  | 3 ---
 .../org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java| 8 
 .../org/apache/cassandra/io/sstable/ColumnNameHelper.java| 1 -
 .../org/apache/cassandra/locator/SimpleSeedProvider.java | 6 --
 src/java/org/apache/cassandra/net/ResponseVerbHandler.java   | 1 -
 src/java/org/apache/cassandra/service/MigrationManager.java  | 1 -
 .../org/apache/cassandra/streaming/StreamTransferTask.java   | 2 --
 src/java/org/apache/cassandra/thrift/CassandraServer.java| 1 -
 .../apache/cassandra/tools/BulkLoadConnectionFactory.java| 2 --
 src/java/org/apache/cassandra/tools/BulkLoader.java  | 1 -
 src/java/org/apache/cassandra/tools/StandaloneSplitter.java  | 1 -
 src/java/org/apache/cassandra/tools/StandaloneUpgrader.java  | 1 -
 src/java/org/apache/cassandra/utils/memory/MemoryUtil.java   | 1 -
 25 files changed, 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/config/UFMetaData.java
--
diff --git a/src/java/org/apache/cassandra/config/UFMetaData.java 
b/src/java/org/apache/cassandra/config/UFMetaData.java
index f11d7ac..4d5f6d3 100644
--- a/src/java/org/apache/cassandra/config/UFMetaData.java
+++ b/src/java/org/apache/cassandra/config/UFMetaData.java
@@ -50,9 +50,7 @@ import org.apache.cassandra.db.composites.Composite;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.db.marshal.CompositeType;
 import org.apache.cassandra.db.marshal.UTF8Type;
-import org.apache.cassandra.exceptions.ConfigurationException;
 import org.apache.cassandra.exceptions.InvalidRequestException;
-import org.apache.cassandra.exceptions.SyntaxException;
 
 /**
  * Defined (and loaded) user functions.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
--
diff --git a/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java 
b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
index b04c624..06f80e0 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
@@ -25,7 +25,6 @@ import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.composites.Composite;
 import org.apache.cassandra.db.filter.*;
-import org.apache.cassandra.db.marshal.CompositeType;
 import org.apache.cassandra.exceptions.InvalidRequestException;
 import org.apache.cassandra.service.CASRequest;
 import org.apache.cassandra.utils.Pair;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
--
diff --git a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java 
b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
index 2ce4fda..0572c4a 100644
--- a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
+++ b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
@@ -42,7 +42,6 @@ import org.apache.cassandra.utils.btree.UpdateFunction;
 import org.apache.cassandra.utils.concurrent.OpOrder;
 import org.apache.cassandra.utils.memory

git commit: imports cleanup

2013-06-16 Thread dbrosius 
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 
Authored: Sun Jun 16 18:22:30 2013 -0400
Committer: Dave Brosius 
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