natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

unused imports warnings cleanups

This commit is contained in:
Dave Brosius 2013-04-06 17:57:19 -04:00
parent 7bad35230c
commit 56f35dbf79
66 changed files with 15 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
View File

@ -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 authorization request (user does not have access to keyspace)
@ -115,7 +106,7 @@ public class AuthorizationException extends Exception implements org.apache.thri
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(AuthorizationException.class, metaDataMap);
@ -276,14 +267,14 @@ public class AuthorizationException extends Exception implements org.apache.thri
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;

1
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
View File

@ -38,7 +38,6 @@ import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.DefsTable;
import org.apache.cassandra.db.SystemTable;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.FSWriteError;

2
src/java/org/apache/cassandra/cql3/AbstractMarker.java
View File

@ -17,8 +17,6 @@
*/
package org.apache.cassandra.cql3;
import java.nio.ByteBuffer;
import org.apache.cassandra.db.marshal.CollectionType;
import org.apache.cassandra.exceptions.InvalidRequestException;

1
src/java/org/apache/cassandra/cql3/CFDefinition.java
View File

@ -30,7 +30,6 @@ import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.ColumnToCollectionType;
import org.apache.cassandra.db.marshal.CompositeType;
import org.apache.cassandra.db.marshal.UTF8Type;
import org.apache.cassandra.exceptions.InvalidRequestException;
import org.apache.cassandra.utils.ByteBufferUtil;
/**

3
src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java
View File

@ -18,9 +18,6 @@
package org.apache.cassandra.cql3;
import java.nio.ByteBuffer;
import java.util.List;
import org.apache.cassandra.exceptions.InvalidRequestException;
/**
* Build a potentially composite column name.

3
src/java/org/apache/cassandra/cql3/Constants.java
View File

@ -18,11 +18,8 @@
package org.apache.cassandra.cql3;
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import com.google.common.base.Objects;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

1
src/java/org/apache/cassandra/cql3/Maps.java
View File

@ -19,7 +19,6 @@ package org.apache.cassandra.cql3;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

5
src/java/org/apache/cassandra/cql3/Term.java
View File

@ -18,13 +18,8 @@
package org.apache.cassandra.cql3;
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.BytesType;
import org.apache.cassandra.db.marshal.MarshalException;
import org.apache.cassandra.exceptions.InvalidRequestException;
/**

2
src/java/org/apache/cassandra/cql3/functions/AbstractFunction.java
View File

@ -17,12 +17,10 @@
*/
package org.apache.cassandra.cql3.functions;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.List;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.exceptions.InvalidRequestException;
public abstract class AbstractFunction implements Function
{

1
src/java/org/apache/cassandra/cql3/functions/FunctionCall.java
View File

@ -21,7 +21,6 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import org.apache.cassandra.cql3.ColumnIdentifier;
import org.apache.cassandra.cql3.ColumnSpecification;
import org.apache.cassandra.cql3.Constants;
import org.apache.cassandra.cql3.Lists;

2
src/java/org/apache/cassandra/cql3/functions/Functions.java
View File

@ -17,8 +17,6 @@
*/
package org.apache.cassandra.cql3.functions;
import java.util.HashMap;
import java.util.Map;
import java.util.List;
import com.google.common.collect.ArrayListMultimap;

4
src/java/org/apache/cassandra/cql3/functions/TimeuuidFcts.java
View File

@ -18,16 +18,12 @@
package org.apache.cassandra.cql3.functions;
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import org.apache.cassandra.cql3.ColumnSpecification;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.DateType;
import org.apache.cassandra.db.marshal.TimeUUIDType;
import org.apache.cassandra.db.marshal.LongType;
import org.apache.cassandra.db.marshal.UTF8Type;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.UUIDGen;

2
src/java/org/apache/cassandra/cql3/functions/TokenFct.java
View File

@ -18,14 +18,12 @@
package org.apache.cassandra.cql3.functions;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.Schema;
import org.apache.cassandra.cql3.CFDefinition;
import org.apache.cassandra.cql3.ColumnNameBuilder;
import org.apache.cassandra.cql3.ColumnSpecification;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.exceptions.InvalidRequestException;

1
src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
View File

@ -29,7 +29,6 @@ import org.apache.cassandra.db.RowMutation;
import org.apache.cassandra.db.marshal.*;
import org.apache.cassandra.exceptions.*;
import org.apache.cassandra.thrift.ThriftValidation;
import org.apache.cassandra.utils.Pair;
/**
* A <code>DELETE</code> parsed from a CQL query statement.

1
src/java/org/apache/cassandra/cql3/statements/ListUsersStatement.java
View File

@ -20,7 +20,6 @@ package org.apache.cassandra.cql3.statements;
import org.apache.cassandra.auth.Auth;
import org.apache.cassandra.cql3.QueryProcessor;
import org.apache.cassandra.db.ConsistencyLevel;
import org.apache.cassandra.exceptions.InvalidRequestException;
import org.apache.cassandra.exceptions.RequestExecutionException;
import org.apache.cassandra.exceptions.RequestValidationException;
import org.apache.cassandra.exceptions.UnauthorizedException;

2
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
View File

@ -32,8 +32,6 @@ import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.ColumnDefinition;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.filter.*;
import org.apache.cassandra.db.index.SecondaryIndex;
import org.apache.cassandra.db.index.SecondaryIndexManager;
import org.apache.cassandra.db.marshal.*;
import org.apache.cassandra.dht.*;
import org.apache.cassandra.exceptions.*;

1
src/java/org/apache/cassandra/db/DefsTable.java
View File

@ -21,7 +21,6 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

7
src/java/org/apache/cassandra/db/Directories.java
View File

@ -25,7 +25,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSortedSet;
import com.google.common.primitives.Longs;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@ -101,13 +100,13 @@ public class Directories
if (!StorageService.instance.isClientMode())
{
for (File dir : sstableDirectories)
for (File dir : sstableDirectories)
{
try
try
{
FileUtils.createDirectory(dir);
}
catch (FSError e)
catch (FSError e)
{
// don't just let the default exception handler do this, we need the create loop to continue
logger.error("Failed to create {} directory", dir);

1
src/java/org/apache/cassandra/db/ReadCommand.java
View File

@ -33,7 +33,6 @@ import org.apache.cassandra.net.MessageOut;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.service.IReadCommand;
import org.apache.cassandra.service.RowDataResolver;
import org.apache.cassandra.utils.IFilter;
public abstract class ReadCommand implements IReadCommand

5
src/java/org/apache/cassandra/db/SystemTable.java
View File

@ -25,12 +25,8 @@ import java.nio.charset.CharacterCodingException;
import java.util.*;
import java.util.concurrent.ExecutionException;
import com.google.common.base.Function;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Iterables;
import com.google.common.collect.SetMultimap;
import com.google.common.collect.Sets;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -47,7 +43,6 @@ import org.apache.cassandra.db.marshal.*;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.locator.IEndpointSnitch;
import org.apache.cassandra.service.StorageService;

1
src/java/org/apache/cassandra/db/Table.java
View File

@ -38,7 +38,6 @@ import org.apache.cassandra.db.filter.ColumnSlice;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.db.index.SecondaryIndex;
import org.apache.cassandra.db.index.SecondaryIndexManager;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.locator.AbstractReplicationStrategy;
import org.apache.cassandra.service.StorageService;

1
src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
View File

@ -18,7 +18,6 @@
package org.apache.cassandra.db.compaction;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.cassandra.utils.CloseableIterator;

2
src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java
View File

@ -20,8 +20,6 @@ package org.apache.cassandra.db.compaction;
import java.util.Collection;
import java.util.Set;
import com.google.common.annotations.VisibleForTesting;
import org.apache.cassandra.db.Directories;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.db.ColumnFamilyStore;

3
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
View File

@ -27,10 +27,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import com.google.common.base.Predicates;
import com.google.common.base.Throwables;
import com.google.common.collect.ConcurrentHashMultiset;
import com.google.common.collect.Iterators;
import com.google.common.collect.Multiset;
import com.google.common.primitives.Longs;
import org.slf4j.Logger;
@ -54,7 +52,6 @@ import org.apache.cassandra.dht.Token;
import org.apache.cassandra.io.sstable.*;
import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.metrics.CompactionMetrics;
import org.apache.cassandra.io.util.RandomAccessReader;
import org.apache.cassandra.service.AntiEntropyService;
import org.apache.cassandra.service.CacheService;
import org.apache.cassandra.service.StorageService;

1
src/java/org/apache/cassandra/db/compaction/CompactionTask.java
View File

@ -21,7 +21,6 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Throwables;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;

1
src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
View File

@ -34,7 +34,6 @@ import org.apache.cassandra.dht.Token;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.sstable.SSTable;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.sstable.SSTableScanner;
import org.apache.cassandra.notifications.INotification;
import org.apache.cassandra.notifications.INotificationConsumer;
import org.apache.cassandra.notifications.SSTableAddedNotification;

2
src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
View File

@ -25,7 +25,6 @@ import java.util.List;
import java.util.concurrent.*;
import java.util.concurrent.locks.Condition;
import com.google.common.base.Functions;
import com.google.common.collect.AbstractIterator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -35,7 +34,6 @@ import org.apache.cassandra.concurrent.NamedThreadFactory;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.columniterator.ICountableColumnIterator;
import org.apache.cassandra.db.index.SecondaryIndexManager;
import org.apache.cassandra.io.sstable.SSTableIdentityIterator;
import org.apache.cassandra.utils.*;

1
src/java/org/apache/cassandra/db/marshal/AbstractType.java
View File

@ -21,7 +21,6 @@ import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Comparator;
import java.util.Map;
import java.util.Set;
import org.apache.cassandra.cql3.CQL3Type;
import org.apache.cassandra.exceptions.SyntaxException;

1
src/java/org/apache/cassandra/db/marshal/BooleanType.java
View File

@ -20,7 +20,6 @@ package org.apache.cassandra.db.marshal;
import java.nio.ByteBuffer;
import org.apache.cassandra.cql.jdbc.JdbcBoolean;
import org.apache.cassandra.cql3.Constants;
import org.apache.cassandra.cql3.CQL3Type;
public class BooleanType extends AbstractType<Boolean>

2
src/java/org/apache/cassandra/db/marshal/CompositeType.java
View File

@ -28,11 +28,9 @@ import java.util.Map;
import com.google.common.collect.ImmutableList;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.exceptions.InvalidRequestException;
import org.apache.cassandra.exceptions.SyntaxException;
import org.apache.cassandra.cql3.ColumnNameBuilder;
import org.apache.cassandra.cql3.Relation;
import org.apache.cassandra.cql3.Term;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.utils.ByteBufferUtil;

1
src/java/org/apache/cassandra/db/marshal/CounterColumnType.java
View File

@ -19,7 +19,6 @@ package org.apache.cassandra.db.marshal;
import java.nio.ByteBuffer;
import org.apache.cassandra.cql3.Constants;
import org.apache.cassandra.cql3.CQL3Type;
import org.apache.cassandra.db.*;
import org.apache.cassandra.utils.ByteBufferUtil;

1
src/java/org/apache/cassandra/db/marshal/DateType.java
View File

@ -25,7 +25,6 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.cassandra.cql.jdbc.JdbcDate;
import org.apache.cassandra.cql3.Constants;
import org.apache.cassandra.cql3.CQL3Type;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.commons.lang.time.DateUtils;

1
src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
View File

@ -19,7 +19,6 @@ package org.apache.cassandra.db.marshal;
import java.nio.ByteBuffer;
import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.cassandra.cql.jdbc.JdbcTimeUUID;

1
src/java/org/apache/cassandra/db/marshal/UTF8Type.java
View File

@ -20,7 +20,6 @@ package org.apache.cassandra.db.marshal;
import java.nio.ByteBuffer;
import org.apache.cassandra.cql.jdbc.JdbcUTF8;
import org.apache.cassandra.cql3.Constants;
import org.apache.cassandra.cql3.CQL3Type;
public class UTF8Type extends AbstractType<String>

1
src/java/org/apache/cassandra/db/marshal/UUIDType.java
View File

@ -25,7 +25,6 @@ import java.util.UUID;
import org.apache.cassandra.cql.jdbc.JdbcUUID;
import org.apache.cassandra.cql3.CQL3Type;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.UUIDGen;
import org.apache.commons.lang.time.DateUtils;

3
src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
View File

@ -22,9 +22,6 @@ import java.nio.ByteBuffer;
import java.util.zip.CRC32;
import java.util.zip.Checksum;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.primitives.Ints;
import org.apache.cassandra.io.FSReadError;
import org.apache.cassandra.io.sstable.CorruptSSTableException;
import org.apache.cassandra.io.util.CompressedSegmentedFile;

3
src/java/org/apache/cassandra/io/sstable/SSTableBoundedScanner.java
View File

@ -18,13 +18,10 @@
package org.apache.cassandra.io.sstable;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
import org.apache.cassandra.db.RowPosition;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.utils.Pair;
/**

1
src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
View File

@ -19,7 +19,6 @@ package org.apache.cassandra.io.sstable;
import java.io.*;
import org.apache.cassandra.utils.FilterFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

1
src/java/org/apache/cassandra/locator/LocalStrategy.java
View File

@ -24,7 +24,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.dht.RingPosition;
import org.apache.cassandra.dht.Token;

1
src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java
View File

@ -24,7 +24,6 @@ import java.util.Map.Entry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.locator.TokenMetadata.Topology;

1
src/java/org/apache/cassandra/locator/OldNetworkTopologyStrategy.java
View File

@ -25,7 +25,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.dht.Token;

1
src/java/org/apache/cassandra/locator/SimpleStrategy.java
View File

@ -25,7 +25,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.dht.Token;

1
src/java/org/apache/cassandra/service/AntiEntropyService.java
View File

@ -40,7 +40,6 @@ import org.apache.cassandra.db.*;
import org.apache.cassandra.db.compaction.AbstractCompactedRow;
import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.dht.AbstractBounds;
import org.apache.cassandra.dht.RandomPartitioner;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.gms.*;

6
src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
View File

@ -20,21 +20,15 @@ package org.apache.cassandra.service;
import java.net.InetAddress;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import com.google.common.collect.Iterables;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.exceptions.UnavailableException;
import org.apache.cassandra.gms.FailureDetector;
import org.apache.cassandra.locator.IEndpointSnitch;
import org.apache.cassandra.locator.NetworkTopologyStrategy;
import org.apache.cassandra.net.MessageIn;
import org.apache.cassandra.db.ConsistencyLevel;
import org.apache.cassandra.db.WriteType;
import org.apache.cassandra.utils.FBUtilities;
/**
* This class blocks for a quorum of responses _in all datacenters_ (CL.EACH_QUORUM).

5
src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
View File

@ -20,17 +20,12 @@ package org.apache.cassandra.service;
import java.net.InetAddress;
import java.util.Collection;
import com.google.common.collect.Iterables;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.exceptions.UnavailableException;
import org.apache.cassandra.gms.FailureDetector;
import org.apache.cassandra.locator.IEndpointSnitch;
import org.apache.cassandra.net.MessageIn;
import org.apache.cassandra.db.ConsistencyLevel;
import org.apache.cassandra.db.WriteType;
import org.apache.cassandra.utils.FBUtilities;
/**
* This class blocks for a quorum of responses _in the local datacenter only_ (CL.LOCAL_QUORUM).

3
src/java/org/apache/cassandra/service/WriteResponseHandler.java
View File

@ -23,13 +23,10 @@ import java.util.Collection;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicInteger;
import com.google.common.collect.Iterables;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.exceptions.UnavailableException;
import org.apache.cassandra.gms.FailureDetector;
import org.apache.cassandra.net.MessageIn;
import org.apache.cassandra.db.ConsistencyLevel;
import org.apache.cassandra.db.WriteType;

1
src/java/org/apache/cassandra/streaming/AbstractStreamSession.java
View File

@ -27,7 +27,6 @@ import org.slf4j.Logger;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.gms.*;
import org.apache.cassandra.utils.Pair;
public abstract class AbstractStreamSession implements IEndpointStateChangeSubscriber, IFailureDetectionEventListener
{

2
src/java/org/apache/cassandra/streaming/StreamOutSession.java
View File

@ -20,14 +20,12 @@ package org.apache.cassandra.streaming;
import java.net.InetAddress;
import java.util.*;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.Pair;
import org.apache.cassandra.utils.UUIDGen;
import org.cliffc.high_scale_lib.NonBlockingHashMap;

2
src/java/org/apache/cassandra/thrift/ThriftClientState.java
View File

@ -23,8 +23,6 @@ import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.cql.CQLStatement;
import org.apache.cassandra.service.ClientState;
import org.apache.cassandra.service.QueryState;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
/**
* ClientState used by thrift that also provide a QueryState.

1
src/java/org/apache/cassandra/thrift/ThriftValidation.java
View File

@ -32,7 +32,6 @@ import org.apache.cassandra.db.index.SecondaryIndexManager;
import org.apache.cassandra.db.marshal.AbstractType;
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.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;

1
src/java/org/apache/cassandra/tracing/TraceState.java
View File

@ -24,7 +24,6 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit;
import com.google.common.base.Stopwatch;
import org.slf4j.Logger;
import org.slf4j.helpers.MessageFormatter;
import org.apache.cassandra.concurrent.Stage;

2
src/java/org/apache/cassandra/transport/SimpleClient.java
View File

@ -47,13 +47,11 @@ import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.Channels;
import org.jboss.netty.channel.ExceptionEvent;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
import org.jboss.netty.handler.logging.LoggingHandler;
import org.jboss.netty.handler.ssl.SslHandler;
import org.jboss.netty.logging.InternalLoggerFactory;
import org.jboss.netty.logging.Slf4JLoggerFactory;

1
src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java
View File

@ -32,7 +32,6 @@ import org.apache.cassandra.exceptions.PreparedQueryNotFoundException;
import org.apache.cassandra.service.QueryState;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.transport.*;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.MD5Digest;
import org.apache.cassandra.utils.UUIDGen;

1
src/java/org/apache/cassandra/transport/messages/PrepareMessage.java
View File

@ -26,7 +26,6 @@ import org.apache.cassandra.cql3.QueryProcessor;
import org.apache.cassandra.service.QueryState;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.transport.*;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.UUIDGen;
public class PrepareMessage extends Message.Request

1
src/java/org/apache/cassandra/transport/messages/QueryMessage.java
View File

@ -29,7 +29,6 @@ import org.apache.cassandra.exceptions.*;
import org.apache.cassandra.service.QueryState;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.transport.*;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.UUIDGen;
/**

1
src/java/org/apache/cassandra/transport/messages/ResultMessage.java
View File

@ -25,7 +25,6 @@ import org.jboss.netty.buffer.ChannelBuffers;
import org.apache.cassandra.cql3.ColumnSpecification;
import org.apache.cassandra.cql3.ResultSet;
import org.apache.cassandra.transport.*;
import org.apache.cassandra.db.marshal.TypeParser;
import org.apache.cassandra.thrift.CqlPreparedResult;
import org.apache.cassandra.thrift.CqlResult;
import org.apache.cassandra.thrift.CqlResultType;

4
src/java/org/apache/cassandra/utils/UUIDGen.java
View File

@ -18,14 +18,10 @@
package org.apache.cassandra.utils;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
import java.util.Random;
import java.util.UUID;

1
test/unit/org/apache/cassandra/cql/jdbc/ClientUtilsTest.java
View File

@ -23,7 +23,6 @@ package org.apache.cassandra.cql.jdbc;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
import java.sql.Date;

13
test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
View File

@ -28,7 +28,6 @@ import java.util.concurrent.Future;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.junit.Test;
@ -49,9 +48,7 @@ import static org.apache.commons.lang.ArrayUtils.EMPTY_BYTE_ARRAY;
import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.ColumnDefinition;
import org.apache.cassandra.config.Schema;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
import org.apache.cassandra.db.filter.*;
@ -419,7 +416,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader
assert "k1".equals( key );
}
@Test
public void testDeleteOfInconsistentValuesInKeysIndex() throws Exception
{
@ -431,7 +428,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader
cfs.truncate().get();
ByteBuffer rowKey = ByteBufferUtil.bytes("k1");
ByteBuffer colName = ByteBufferUtil.bytes("birthdate");
ByteBuffer colName = ByteBufferUtil.bytes("birthdate");
ByteBuffer val1 = ByteBufferUtil.bytes(1L);
ByteBuffer val2 = ByteBufferUtil.bytes(2L);
@ -456,7 +453,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader
table.apply(rm, true, false);
// Now searching the index for either the old or new value should return 0 rows
// because the new value was not indexed and the old value should be ignored
// because the new value was not indexed and the old value should be ignored
// (and in fact purged from the index cf).
// first check for the old value
rows = table.getColumnFamilyStore(cfName).search(clause, range, 100, filter);
@ -495,7 +492,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader
ByteBuffer rowKey = ByteBufferUtil.bytes("k1");
ByteBuffer clusterKey = ByteBufferUtil.bytes("ck1");
ByteBuffer colName = ByteBufferUtil.bytes("col1");
ByteBuffer colName = ByteBufferUtil.bytes("col1");
CompositeType baseComparator = (CompositeType)cfs.getComparator();
CompositeType.Builder builder = baseComparator.builder();
builder.add(clusterKey);
@ -530,7 +527,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader
table.apply(rm, true, false);
// Now searching the index for either the old or new value should return 0 rows
// because the new value was not indexed and the old value should be ignored
// because the new value was not indexed and the old value should be ignored
// (and in fact purged from the index cf).
// first check for the old value
rows = table.getColumnFamilyStore(cfName).search(clause, range, 100, filter);

2
test/unit/org/apache/cassandra/db/SecondaryIndexColumnSizeTest.java
View File

@ -19,9 +19,7 @@
package org.apache.cassandra.db;
import java.nio.ByteBuffer;
import java.util.List;
import java.util.Set;
import java.util.SortedSet;
import org.junit.Test;

1
test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
View File

@ -20,7 +20,6 @@ package org.apache.cassandra.db.marshal;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.UUID;

3
test/unit/org/apache/cassandra/db/marshal/RoundTripTest.java
View File

@ -24,15 +24,12 @@ package org.apache.cassandra.db.marshal;
import com.google.common.base.Charsets;
import org.apache.cassandra.cql.jdbc.*;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Hex;
import org.apache.cassandra.utils.UUIDGen;
import org.junit.Test;
import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.util.Calendar;
import java.util.TimeZone;
import java.util.UUID;
public class RoundTripTest

1
test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java
View File

@ -18,7 +18,6 @@
*/
package org.apache.cassandra.db.marshal;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
import java.util.Arrays;

1
test/unit/org/apache/cassandra/dht/BootStrapperTest.java
View File

@ -28,7 +28,6 @@ import java.util.HashMap;
import java.util.Set;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import org.junit.Test;
import org.junit.runner.RunWith;

1
test/unit/org/apache/cassandra/gms/SerializationsTest.java
View File

@ -33,7 +33,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
public class SerializationsTest extends AbstractSerializationsTester
{

1
test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java
View File

@ -44,7 +44,6 @@ import org.apache.cassandra.io.util.MappedFileDataInput;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.CloseableIterator;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.UUIDGen;
import static junit.framework.Assert.assertEquals;