Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 76BAAD1D6 for ; Wed, 24 Oct 2012 03:42:42 +0000 (UTC) Received: (qmail 21434 invoked by uid 500); 24 Oct 2012 03:42:42 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 21385 invoked by uid 500); 24 Oct 2012 03:42:41 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 21356 invoked by uid 99); 24 Oct 2012 03:42:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Oct 2012 03:42:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id AE4CF4EA22; Wed, 24 Oct 2012 03:42:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: cleanup unused imports Message-Id: <20121024034239.AE4CF4EA22@tyr.zones.apache.org> Date: Wed, 24 Oct 2012 03:42:39 +0000 (UTC) Updated Branches: refs/heads/trunk 1ded4ff29 -> 95f94a4da cleanup unused imports Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95f94a4d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95f94a4d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95f94a4d Branch: refs/heads/trunk Commit: 95f94a4da0b31ffbf6f8c1e17e720b5e3ae70e91 Parents: 1ded4ff Author: Dave Brosius Authored: Tue Oct 23 23:39:47 2012 -0400 Committer: Dave Brosius Committed: Tue Oct 23 23:39:47 2012 -0400 ---------------------------------------------------------------------- .../cassandra/thrift/AuthenticationException.java | 23 ++++-------- .../cassandra/thrift/AuthenticationRequest.java | 28 +++++---------- .../apache/cassandra/auth/IAuthorityContainer.java | 1 - .../org/apache/cassandra/cache/KeyCacheKey.java | 1 - src/java/org/apache/cassandra/cql3/Attributes.java | 2 - src/java/org/apache/cassandra/cql3/CFPropDefs.java | 2 - .../org/apache/cassandra/cql3/QueryProcessor.java | 1 - src/java/org/apache/cassandra/cql3/ResultSet.java | 2 - src/java/org/apache/cassandra/cql3/Term.java | 3 -- .../cassandra/cql3/statements/BatchStatement.java | 3 -- .../cql3/statements/CreateKeyspaceStatement.java | 4 -- .../cql3/statements/ModificationStatement.java | 2 - .../cql3/statements/SchemaAlteringStatement.java | 7 ---- .../cassandra/cql3/statements/SelectStatement.java | 1 - .../db/AbstractThreadUnsafeSortedColumns.java | 4 -- .../apache/cassandra/db/CollationController.java | 5 +-- src/java/org/apache/cassandra/db/ColumnFamily.java | 1 - .../org/apache/cassandra/db/ColumnSerializer.java | 1 - .../org/apache/cassandra/db/ConsistencyLevel.java | 1 - src/java/org/apache/cassandra/db/IMutation.java | 1 - .../org/apache/cassandra/db/WriteResponse.java | 1 - .../apache/cassandra/db/commitlog/CommitLog.java | 1 - .../db/compaction/AbstractCompactionStrategy.java | 2 - .../db/compaction/LazilyCompactedRow.java | 2 - .../db/compaction/LeveledCompactionTask.java | 1 - .../cassandra/db/filter/SliceQueryFilter.java | 1 - .../db/index/PerColumnSecondaryIndex.java | 3 +- .../cassandra/db/index/PerRowSecondaryIndex.java | 5 +-- .../apache/cassandra/db/index/SecondaryIndex.java | 5 +-- .../cassandra/db/index/SecondaryIndexBuilder.java | 1 - .../org/apache/cassandra/db/marshal/ListType.java | 2 - .../org/apache/cassandra/db/marshal/MapType.java | 2 - .../org/apache/cassandra/db/marshal/SetType.java | 2 - .../cassandra/exceptions/CassandraException.java | 2 - .../cassandra/exceptions/ReadTimeoutException.java | 5 --- .../exceptions/RequestExecutionException.java | 2 - .../exceptions/RequestTimeoutException.java | 5 --- .../cassandra/exceptions/TransportException.java | 2 - .../cassandra/exceptions/UnavailableException.java | 5 --- .../exceptions/WriteTimeoutException.java | 4 -- .../org/apache/cassandra/gms/TokenSerializer.java | 1 - .../org/apache/cassandra/gms/VersionedValue.java | 2 - src/java/org/apache/cassandra/io/FSReadError.java | 2 - src/java/org/apache/cassandra/io/FSWriteError.java | 2 - .../org/apache/cassandra/io/util/FileUtils.java | 1 - .../org/apache/cassandra/locator/Ec2Snitch.java | 3 +- .../locator/GossipingPropertyFileSnitch.java | 1 - .../org/apache/cassandra/metrics/CacheMetrics.java | 1 - .../cassandra/metrics/ClientRequestMetrics.java | 1 - .../cassandra/service/AbstractRowResolver.java | 3 -- .../cassandra/service/DatacenterReadCallback.java | 3 -- .../org/apache/cassandra/service/PBSPredictor.java | 6 +--- .../org/apache/cassandra/service/ReadCallback.java | 3 -- .../apache/cassandra/service/RepairCallback.java | 1 - .../ScheduledRangeTransferExecutorService.java | 3 +- .../apache/cassandra/thrift/CassandraServer.java | 1 - .../apache/cassandra/thrift/ThriftValidation.java | 2 - .../cassandra/transport/ProtocolException.java | 2 - .../apache/cassandra/transport/ServerError.java | 2 - .../apache/cassandra/transport/SimpleClient.java | 1 - .../cassandra/transport/messages/ErrorMessage.java | 2 - .../cassandra/transport/messages/EventMessage.java | 1 - .../transport/messages/StartupMessage.java | 1 - .../transport/messages/SupportedMessage.java | 1 - 64 files changed, 24 insertions(+), 168 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java ---------------------------------------------------------------------- diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java index 5d88cd9..4bea125 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java @@ -5,7 +5,7 @@ */ package org.apache.cassandra.thrift; /* - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -13,34 +13,25 @@ package org.apache.cassandra.thrift; * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ import org.apache.commons.lang.builder.HashCodeBuilder; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * invalid authentication request (invalid keyspace, user does not exist, or credentials invalid) @@ -115,7 +106,7 @@ public class AuthenticationException extends Exception implements org.apache.thr public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.WHY, new org.apache.thrift.meta_data.FieldMetaData("why", org.apache.thrift.TFieldRequirementType.REQUIRED, + tmpMap.put(_Fields.WHY, new org.apache.thrift.meta_data.FieldMetaData("why", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AuthenticationException.class, metaDataMap); @@ -276,14 +267,14 @@ public class AuthenticationException extends Exception implements org.apache.thr while (true) { field = iprot.readFieldBegin(); - if (field.type == org.apache.thrift.protocol.TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // WHY if (field.type == org.apache.thrift.protocol.TType.STRING) { this.why = iprot.readString(); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java ---------------------------------------------------------------------- diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java index 0f68426..42cce37 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java @@ -5,7 +5,7 @@ */ package org.apache.cassandra.thrift; /* - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -13,34 +13,24 @@ package org.apache.cassandra.thrift; * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ - import org.apache.commons.lang.builder.HashCodeBuilder; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Authentication requests can contain any data, dependent on the IAuthenticator used @@ -115,9 +105,9 @@ public class AuthenticationRequest implements org.apache.thrift.TBase metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), + tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AuthenticationRequest.class, metaDataMap); @@ -301,7 +291,7 @@ public class AuthenticationRequest implements org.apache.thrift.TBase extends CollectionType> http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/db/marshal/MapType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/MapType.java b/src/java/org/apache/cassandra/db/marshal/MapType.java index faf153f..8364ea0 100644 --- a/src/java/org/apache/cassandra/db/marshal/MapType.java +++ b/src/java/org/apache/cassandra/db/marshal/MapType.java @@ -24,8 +24,6 @@ import java.util.*; import org.apache.cassandra.db.IColumn; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.SyntaxException; -import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; public class MapType extends CollectionType> http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/db/marshal/SetType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/SetType.java b/src/java/org/apache/cassandra/db/marshal/SetType.java index c76273a..bbfb46f 100644 --- a/src/java/org/apache/cassandra/db/marshal/SetType.java +++ b/src/java/org/apache/cassandra/db/marshal/SetType.java @@ -24,8 +24,6 @@ import java.util.*; import org.apache.cassandra.db.IColumn; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.SyntaxException; -import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; public class SetType extends CollectionType> http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/exceptions/CassandraException.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/exceptions/CassandraException.java b/src/java/org/apache/cassandra/exceptions/CassandraException.java index 00790d6..aaa8055 100644 --- a/src/java/org/apache/cassandra/exceptions/CassandraException.java +++ b/src/java/org/apache/cassandra/exceptions/CassandraException.java @@ -17,8 +17,6 @@ */ package org.apache.cassandra.exceptions; -import java.nio.ByteBuffer; - public abstract class CassandraException extends Exception implements TransportException { private final ExceptionCode code; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/exceptions/ReadTimeoutException.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/exceptions/ReadTimeoutException.java b/src/java/org/apache/cassandra/exceptions/ReadTimeoutException.java index 3af638d..05f3510 100644 --- a/src/java/org/apache/cassandra/exceptions/ReadTimeoutException.java +++ b/src/java/org/apache/cassandra/exceptions/ReadTimeoutException.java @@ -17,12 +17,7 @@ */ package org.apache.cassandra.exceptions; -import java.net.InetAddress; -import java.util.Set; -import java.nio.ByteBuffer; - import org.apache.cassandra.db.ConsistencyLevel; -import org.apache.cassandra.utils.ByteBufferUtil; public class ReadTimeoutException extends RequestTimeoutException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/exceptions/RequestExecutionException.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/exceptions/RequestExecutionException.java b/src/java/org/apache/cassandra/exceptions/RequestExecutionException.java index 8d9839f..4db108a 100644 --- a/src/java/org/apache/cassandra/exceptions/RequestExecutionException.java +++ b/src/java/org/apache/cassandra/exceptions/RequestExecutionException.java @@ -17,8 +17,6 @@ */ package org.apache.cassandra.exceptions; -import org.apache.cassandra.db.ConsistencyLevel; - public abstract class RequestExecutionException extends CassandraException { protected RequestExecutionException(ExceptionCode code, String msg) http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/exceptions/RequestTimeoutException.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/exceptions/RequestTimeoutException.java b/src/java/org/apache/cassandra/exceptions/RequestTimeoutException.java index b6cfb86..156dce7 100644 --- a/src/java/org/apache/cassandra/exceptions/RequestTimeoutException.java +++ b/src/java/org/apache/cassandra/exceptions/RequestTimeoutException.java @@ -17,12 +17,7 @@ */ package org.apache.cassandra.exceptions; -import java.net.InetAddress; -import java.util.Set; -import java.nio.ByteBuffer; - import org.apache.cassandra.db.ConsistencyLevel; -import org.apache.cassandra.utils.ByteBufferUtil; public class RequestTimeoutException extends RequestExecutionException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/exceptions/TransportException.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/exceptions/TransportException.java b/src/java/org/apache/cassandra/exceptions/TransportException.java index 940f723..70d1da5 100644 --- a/src/java/org/apache/cassandra/exceptions/TransportException.java +++ b/src/java/org/apache/cassandra/exceptions/TransportException.java @@ -17,8 +17,6 @@ */ package org.apache.cassandra.exceptions; -import java.nio.ByteBuffer; - public interface TransportException { /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/exceptions/UnavailableException.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/exceptions/UnavailableException.java b/src/java/org/apache/cassandra/exceptions/UnavailableException.java index ceb87d8..e557550 100644 --- a/src/java/org/apache/cassandra/exceptions/UnavailableException.java +++ b/src/java/org/apache/cassandra/exceptions/UnavailableException.java @@ -17,12 +17,7 @@ */ package org.apache.cassandra.exceptions; -import java.net.InetAddress; -import java.util.Collection; -import java.nio.ByteBuffer; - import org.apache.cassandra.db.ConsistencyLevel; -import org.apache.cassandra.utils.ByteBufferUtil; public class UnavailableException extends RequestExecutionException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/exceptions/WriteTimeoutException.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/exceptions/WriteTimeoutException.java b/src/java/org/apache/cassandra/exceptions/WriteTimeoutException.java index 2802fe9..af8d42b 100644 --- a/src/java/org/apache/cassandra/exceptions/WriteTimeoutException.java +++ b/src/java/org/apache/cassandra/exceptions/WriteTimeoutException.java @@ -17,10 +17,6 @@ */ package org.apache.cassandra.exceptions; -import java.net.InetAddress; -import java.util.Set; -import java.nio.ByteBuffer; - import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.WriteType; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/gms/TokenSerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/gms/TokenSerializer.java b/src/java/org/apache/cassandra/gms/TokenSerializer.java index b55967c..cc7f177 100644 --- a/src/java/org/apache/cassandra/gms/TokenSerializer.java +++ b/src/java/org/apache/cassandra/gms/TokenSerializer.java @@ -20,7 +20,6 @@ package org.apache.cassandra.gms; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.io.ISerializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/gms/VersionedValue.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/gms/VersionedValue.java b/src/java/org/apache/cassandra/gms/VersionedValue.java index e2d68a7..5841c4b 100644 --- a/src/java/org/apache/cassandra/gms/VersionedValue.java +++ b/src/java/org/apache/cassandra/gms/VersionedValue.java @@ -20,9 +20,7 @@ package org.apache.cassandra.gms; import java.io.*; import java.net.InetAddress; -import java.util.ArrayList; import java.util.Collection; -import java.util.List; import java.util.UUID; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/io/FSReadError.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/FSReadError.java b/src/java/org/apache/cassandra/io/FSReadError.java index 1f208c0..c557fc5 100644 --- a/src/java/org/apache/cassandra/io/FSReadError.java +++ b/src/java/org/apache/cassandra/io/FSReadError.java @@ -19,8 +19,6 @@ package org.apache.cassandra.io; import java.io.File; -import org.apache.cassandra.io.sstable.Descriptor; - public class FSReadError extends FSError { public FSReadError(Throwable cause, File path) http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/io/FSWriteError.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/FSWriteError.java b/src/java/org/apache/cassandra/io/FSWriteError.java index 4b68f1b..6169904 100644 --- a/src/java/org/apache/cassandra/io/FSWriteError.java +++ b/src/java/org/apache/cassandra/io/FSWriteError.java @@ -19,8 +19,6 @@ package org.apache.cassandra.io; import java.io.File; -import org.apache.cassandra.io.sstable.Descriptor; - public class FSWriteError extends FSError { public FSWriteError(Throwable cause, File path) http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/io/util/FileUtils.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/FileUtils.java b/src/java/org/apache/cassandra/io/util/FileUtils.java index bc4d67e..24464f7 100644 --- a/src/java/org/apache/cassandra/io/util/FileUtils.java +++ b/src/java/org/apache/cassandra/io/util/FileUtils.java @@ -23,7 +23,6 @@ import java.lang.reflect.Method; import java.nio.MappedByteBuffer; import java.text.DecimalFormat; import java.util.Arrays; -import java.util.Comparator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/locator/Ec2Snitch.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/Ec2Snitch.java b/src/java/org/apache/cassandra/locator/Ec2Snitch.java index eec47fc..e5b5126 100644 --- a/src/java/org/apache/cassandra/locator/Ec2Snitch.java +++ b/src/java/org/apache/cassandra/locator/Ec2Snitch.java @@ -32,7 +32,6 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.gms.ApplicationState; import org.apache.cassandra.gms.EndpointState; import org.apache.cassandra.gms.Gossiper; -import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; /** @@ -59,7 +58,7 @@ public class Ec2Snitch extends AbstractNetworkTopologySnitch ec2region = az.substring(0, az.length() - 1); if (ec2region.endsWith("1")) ec2region = az.substring(0, az.length() - 3); - + logger.info("EC2Snitch using region: " + ec2region + ", zone: " + ec2zone + "."); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java index 249512d..405d8e4 100644 --- a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java +++ b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java @@ -23,7 +23,6 @@ import org.apache.cassandra.gms.ApplicationState; import org.apache.cassandra.gms.EndpointState; import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.io.util.FileUtils; -import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/metrics/CacheMetrics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/CacheMetrics.java b/src/java/org/apache/cassandra/metrics/CacheMetrics.java index dee9319..7891998 100644 --- a/src/java/org/apache/cassandra/metrics/CacheMetrics.java +++ b/src/java/org/apache/cassandra/metrics/CacheMetrics.java @@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; 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; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/metrics/ClientRequestMetrics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/ClientRequestMetrics.java b/src/java/org/apache/cassandra/metrics/ClientRequestMetrics.java index 1e9a3b9..d6ff01b 100644 --- a/src/java/org/apache/cassandra/metrics/ClientRequestMetrics.java +++ b/src/java/org/apache/cassandra/metrics/ClientRequestMetrics.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import com.yammer.metrics.Metrics; import com.yammer.metrics.core.Counter; import com.yammer.metrics.core.Meter; -import com.yammer.metrics.core.MetricName; public class ClientRequestMetrics extends LatencyMetrics { http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/service/AbstractRowResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/AbstractRowResolver.java b/src/java/org/apache/cassandra/service/AbstractRowResolver.java index beaf73c..472a4dc 100644 --- a/src/java/org/apache/cassandra/service/AbstractRowResolver.java +++ b/src/java/org/apache/cassandra/service/AbstractRowResolver.java @@ -18,7 +18,6 @@ package org.apache.cassandra.service; import java.nio.ByteBuffer; -import java.util.Collections; import java.util.Set; import org.cliffc.high_scale_lib.NonBlockingHashSet; @@ -29,8 +28,6 @@ import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.ReadResponse; import org.apache.cassandra.db.Row; import org.apache.cassandra.net.MessageIn; -import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.utils.FBUtilities; public abstract class AbstractRowResolver implements IResponseResolver { http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/service/DatacenterReadCallback.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/DatacenterReadCallback.java b/src/java/org/apache/cassandra/service/DatacenterReadCallback.java index 84e0c59..d125553 100644 --- a/src/java/org/apache/cassandra/service/DatacenterReadCallback.java +++ b/src/java/org/apache/cassandra/service/DatacenterReadCallback.java @@ -23,10 +23,7 @@ import java.util.Comparator; import java.util.List; import org.apache.cassandra.db.ConsistencyLevel; -import org.apache.cassandra.db.ReadResponse; -import org.apache.cassandra.db.Table; import org.apache.cassandra.exceptions.UnavailableException; -import org.apache.cassandra.locator.NetworkTopologyStrategy; import org.apache.cassandra.net.MessageIn; import org.apache.thrift.protocol.TMessage; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/service/PBSPredictor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/PBSPredictor.java b/src/java/org/apache/cassandra/service/PBSPredictor.java index 4bd6381..f4f3353 100644 --- a/src/java/org/apache/cassandra/service/PBSPredictor.java +++ b/src/java/org/apache/cassandra/service/PBSPredictor.java @@ -18,8 +18,6 @@ package org.apache.cassandra.service; -import org.apache.cassandra.net.MessageIn; - import java.lang.management.ManagementFactory; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -28,8 +26,6 @@ import java.util.concurrent.LinkedBlockingQueue; import javax.management.MBeanServer; import javax.management.ObjectName; -import com.google.common.primitives.Longs; - import org.apache.cassandra.thrift.InvalidRequestException; import org.slf4j.Logger; @@ -286,7 +282,7 @@ public class PBSPredictor implements PBSPredictorMBean return list.get((int) (list.size() * percentile)); } - /* + /* * For our trials, sample the latency for the (replicaNumber)th * reply for one of WARS * if replicaNumber > the number of replicas we have data for http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/service/ReadCallback.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/ReadCallback.java b/src/java/org/apache/cassandra/service/ReadCallback.java index 25affe9..1bfff2e 100644 --- a/src/java/org/apache/cassandra/service/ReadCallback.java +++ b/src/java/org/apache/cassandra/service/ReadCallback.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.net.InetAddress; import java.util.Collections; import java.util.List; -import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; @@ -35,8 +34,6 @@ import org.apache.cassandra.concurrent.StageManager; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ReadCommand; -import org.apache.cassandra.db.ReadResponse; -import org.apache.cassandra.db.Table; import org.apache.cassandra.exceptions.ReadTimeoutException; import org.apache.cassandra.exceptions.UnavailableException; import org.apache.cassandra.locator.IEndpointSnitch; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/service/RepairCallback.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/RepairCallback.java b/src/java/org/apache/cassandra/service/RepairCallback.java index 8b010fe..b078d26 100644 --- a/src/java/org/apache/cassandra/service/RepairCallback.java +++ b/src/java/org/apache/cassandra/service/RepairCallback.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.net.InetAddress; import java.util.List; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import org.apache.cassandra.config.DatabaseDescriptor; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java b/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java index 3063b83..88a1126 100644 --- a/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java +++ b/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java @@ -31,7 +31,6 @@ import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.db.SystemTable; import org.apache.cassandra.dht.Token; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FBUtilities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,7 +62,7 @@ public class ScheduledRangeTransferExecutorService LOG.warn("Unabled to shutdown; Scheduler never enabled"); return; } - + LOG.info("Shutting down range transfer scheduler"); scheduler.shutdownNow(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java index d21d9a2..5703855 100644 --- a/src/java/org/apache/cassandra/thrift/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@ -30,7 +30,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.apache.cassandra.hadoop.ColumnFamilySplit; import org.apache.cassandra.utils.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/thrift/ThriftValidation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/ThriftValidation.java b/src/java/org/apache/cassandra/thrift/ThriftValidation.java index 4bb5387..f40dee1 100644 --- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java +++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java @@ -30,12 +30,10 @@ import org.apache.cassandra.db.filter.NamesQueryFilter; import org.apache.cassandra.db.filter.SliceQueryFilter; import org.apache.cassandra.db.index.SecondaryIndexManager; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.db.marshal.MarshalException; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.RandomPartitioner; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.locator.*; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/transport/ProtocolException.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/ProtocolException.java b/src/java/org/apache/cassandra/transport/ProtocolException.java index fd62581..9af9dc0 100644 --- a/src/java/org/apache/cassandra/transport/ProtocolException.java +++ b/src/java/org/apache/cassandra/transport/ProtocolException.java @@ -17,8 +17,6 @@ */ package org.apache.cassandra.transport; -import java.nio.ByteBuffer; - import org.apache.cassandra.exceptions.ExceptionCode; import org.apache.cassandra.exceptions.TransportException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/transport/ServerError.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/ServerError.java b/src/java/org/apache/cassandra/transport/ServerError.java index 55d5177..c18c611 100644 --- a/src/java/org/apache/cassandra/transport/ServerError.java +++ b/src/java/org/apache/cassandra/transport/ServerError.java @@ -17,8 +17,6 @@ */ package org.apache.cassandra.transport; -import java.nio.ByteBuffer; - import org.apache.cassandra.exceptions.ExceptionCode; import org.apache.cassandra.exceptions.TransportException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/transport/SimpleClient.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/SimpleClient.java b/src/java/org/apache/cassandra/transport/SimpleClient.java index 1d67317..7118bc1 100644 --- a/src/java/org/apache/cassandra/transport/SimpleClient.java +++ b/src/java/org/apache/cassandra/transport/SimpleClient.java @@ -38,7 +38,6 @@ import org.jboss.netty.logging.Slf4JLoggerFactory; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.transport.messages.*; -import org.apache.cassandra.service.ClientState; public class SimpleClient { http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java b/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java index b42ba62..114c2fb 100644 --- a/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java @@ -18,7 +18,6 @@ package org.apache.cassandra.transport.messages; import java.nio.ByteBuffer; -import java.util.concurrent.TimeoutException; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; @@ -32,7 +31,6 @@ import org.apache.cassandra.transport.CBUtil; import org.apache.cassandra.transport.Message; import org.apache.cassandra.transport.ProtocolException; import org.apache.cassandra.transport.ServerError; -import org.apache.cassandra.thrift.AuthenticationException; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.MD5Digest; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/transport/messages/EventMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/EventMessage.java b/src/java/org/apache/cassandra/transport/messages/EventMessage.java index 0028395..d8fd6f0 100644 --- a/src/java/org/apache/cassandra/transport/messages/EventMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/EventMessage.java @@ -18,7 +18,6 @@ package org.apache.cassandra.transport.messages; import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; import org.apache.cassandra.transport.Event; import org.apache.cassandra.transport.Message; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/transport/messages/StartupMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/StartupMessage.java b/src/java/org/apache/cassandra/transport/messages/StartupMessage.java index 24430e0..7e4db6e 100644 --- a/src/java/org/apache/cassandra/transport/messages/StartupMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/StartupMessage.java @@ -19,7 +19,6 @@ package org.apache.cassandra.transport.messages; import java.util.Map; -import com.google.common.base.Charsets; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f94a4d/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java b/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java index fe0fa77..b031ca8 100644 --- a/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.transport.messages; -import java.util.ArrayList; import java.util.List; import java.util.Map;