You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2010/12/29 19:20:48 UTC
svn commit: r1053692 [1/3] - in /cassandra/branches/cassandra-0.7.0: ./
interface/thrift/gen-java/org/apache/cassandra/thrift/
src/java/org/apache/cassandra/auth/ src/java/org/apache/cassandra/avro/
src/java/org/apache/cassandra/cache/ src/java/org/apa...
Author: jbellis
Date: Wed Dec 29 18:20:43 2010
New Revision: 1053692
URL: http://svn.apache.org/viewvc?rev=1053692&view=rev
Log:
merge r1052358 from 0.7
Modified:
cassandra/branches/cassandra-0.7.0/ (props changed)
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java (props changed)
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java (props changed)
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java (props changed)
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java (props changed)
cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java (props changed)
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/AllowAllAuthority.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/Resources.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/SimpleAuthenticator.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/SimpleAuthority.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/AvroRecordFactory.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/AvroValidation.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/CassandraDaemon.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/CassandraServer.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cache/InstrumentedCache.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliClient.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliCompiler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliMain.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliUserHelp.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliUtils.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/client/RingCache.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/concurrent/AIOExecutorService.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/concurrent/JMXEnabledThreadPoolExecutor.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/concurrent/NamedThreadFactory.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/CFMetaData.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/KSMetaData.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/BinaryMemtable.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/BinaryVerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Column.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamily.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnIndexer.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/CompactionManager.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DefinitionsAnnounceVerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DefinitionsUpdateResponseVerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DefsTable.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DeletedColumn.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ExpiringColumn.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/HintedHandOffManager.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/IFlushable.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/IndexScanCommand.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Memtable.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RangeSliceReply.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadResponse.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadVerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Row.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RowIteratorFactory.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RowMutation.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RowMutationMessage.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SchemaCheckVerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SuperColumn.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SystemTable.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Table.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/TruncateVerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Truncation.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/columniterator/IColumnIterator.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/columniterator/SimpleAbstractColumnIterator.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/commitlog/PeriodicCommitLogExecutorService.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/filter/QueryFilter.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/filter/QueryPath.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/marshal/LocalByPartionerType.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/marshal/UTF8Type.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/migration/AddColumnFamily.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/migration/AddKeyspace.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/migration/DropColumnFamily.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/migration/DropKeyspace.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/migration/Migration.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/migration/RenameColumnFamily.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/migration/RenameKeyspace.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/migration/UpdateKeyspace.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/dht/BootStrapper.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/dht/Bounds.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/dht/ByteOrderedPartitioner.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/dht/CollatingOrderPreservingPartitioner.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/dht/LocalPartitioner.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/dht/RandomPartitioner.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/dht/Range.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/gms/FailureDetector.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/gms/GossipDigest.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/gms/GossipDigestAck2Message.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/gms/GossipDigestAckMessage.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/gms/PureRandom.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/hadoop/streaming/AvroOutputReader.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/CompactionIterator.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/ICompactSerializer.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/ICompactSerializer2.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/LazilyCompactedRow.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/PrecompactedRow.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/SerDeUtils.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/sstable/SSTable.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/sstable/SSTableTracker.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/util/FileDataInput.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/util/IIterableColumns.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/util/MappedFileDataInput.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/util/OutputBuffer.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/io/util/SegmentedFile.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/AbstractEndpointSnitch.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/EndpointSnitchInfo.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/IEndpointSnitch.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/ILatencyPublisher.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/LocalStrategy.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/OldNetworkTopologyStrategy.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/SimpleStrategy.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/locator/TokenMetadata.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/CompactEndpointSerializationHelper.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/Header.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/IAsyncResult.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/ResponseVerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/net/sink/IMessageSink.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/scheduler/RoundRobinScheduler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/AntiEntropyService.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/ClientState.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/ConsistencyChecker.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/EmbeddedCassandraService.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/IResponseResolver.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/IndexScanVerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/MigrationManager.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/QuorumResponseHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/ReadResponseResolver.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/StorageService.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/StorageServiceMBean.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/TruncateResponseHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/service/WriteResponseHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/streaming/FileStreamTask.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/streaming/ReplicationFinishedVerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/streaming/StreamIn.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/streaming/StreamInSession.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/streaming/StreamOut.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/streaming/StreamOutSession.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/streaming/StreamReplyVerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/streaming/StreamRequestMessage.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/streaming/StreamingService.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/thrift/CassandraServer.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/thrift/ThriftValidation.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/tools/ClusterCmd.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/tools/NodeCmd.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/tools/NodeProbe.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/tools/SSTableExport.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/tools/SSTableImport.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/tools/SchemaTool.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/utils/AbstractStatsDeque.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/utils/BitSetSerializer.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/utils/BloomFilter.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/utils/ExpiringMap.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/utils/FBUtilities.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/utils/LatencyTracker.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/utils/MerkleTree.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/utils/MurmurHash.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/utils/Mx4jTool.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/utils/SimpleCondition.java
cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/utils/XMLUtils.java
Propchange: cassandra/branches/cassandra-0.7.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 18:20:43 2010
@@ -1,5 +1,5 @@
-/cassandra/branches/cassandra-0.6:922689-1051640,1051662
-/cassandra/branches/cassandra-0.7:1035666,1050269,1052002,1052021,1052027,1052355
+/cassandra/branches/cassandra-0.6:922689-1051640,1051662,1052357
+/cassandra/branches/cassandra-0.7:1052002,1052021,1052027,1052355,1052358
/cassandra/trunk:1026516-1026734,1028929
/incubator/cassandra/branches/cassandra-0.3:774578-796573
/incubator/cassandra/branches/cassandra-0.4:810145-834239,834349-834350
Propchange: cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 18:20:43 2010
@@ -1,5 +1,5 @@
-/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1051640,1051662
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1035666,1050269,1052002,1052021,1052027,1052355
+/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1051640,1051662,1052357
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1052002,1052021,1052027,1052355,1052358
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1026734,1028929
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Cassandra.java:810145-834239,834349-834350
Propchange: cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 18:20:43 2010
@@ -1,5 +1,5 @@
-/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1051640,1051662
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1035666,1050269,1052002,1052021,1052027,1052355
+/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1051640,1051662,1052357
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1052002,1052021,1052027,1052355,1052358
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1026734,1028929
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/column_t.java:774578-792198
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Column.java:810145-834239,834349-834350
Propchange: cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 18:20:43 2010
@@ -1,5 +1,5 @@
-/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1051640,1051662
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1035666,1050269,1052002,1052021,1052027,1052355
+/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1051640,1051662,1052357
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1052002,1052021,1052027,1052355,1052358
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1026734,1028929
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:810145-834239,834349-834350
Propchange: cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 18:20:43 2010
@@ -1,5 +1,5 @@
-/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-1051640,1051662
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1035666,1050269,1052002,1052021,1052027,1052355
+/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-1051640,1051662,1052357
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1052002,1052021,1052027,1052355,1052358
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1026734,1028929
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:810145-834239,834349-834350
Propchange: cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 18:20:43 2010
@@ -1,5 +1,5 @@
-/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-1051640,1051662
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1035666,1050269,1052002,1052021,1052027,1052355
+/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-1051640,1051662,1052357
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1052002,1052021,1052027,1052355,1052358
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1026734,1028929
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:774578-792198
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:810145-834239,834349-834350
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/AllowAllAuthority.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/AllowAllAuthority.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/AllowAllAuthority.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/AllowAllAuthority.java Wed Dec 29 18:20:43 2010
@@ -22,10 +22,8 @@ package org.apache.cassandra.auth;
import java.util.EnumSet;
import java.util.List;
-import java.util.Map;
import org.apache.cassandra.config.ConfigurationException;
-import org.apache.cassandra.thrift.AuthorizationException;
public class AllowAllAuthority implements IAuthority
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/Resources.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/Resources.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/Resources.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/Resources.java Wed Dec 29 18:20:43 2010
@@ -21,7 +21,6 @@
package org.apache.cassandra.auth;
-import java.nio.ByteBuffer;
import java.util.List;
import org.apache.cassandra.utils.FBUtilities;
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/SimpleAuthenticator.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/SimpleAuthenticator.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/SimpleAuthenticator.java Wed Dec 29 18:20:43 2010
@@ -21,11 +21,14 @@ package org.apache.cassandra.auth;
*/
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.util.Properties;
import java.util.Map;
+import java.util.Properties;
import org.apache.cassandra.config.ConfigurationException;
import org.apache.cassandra.thrift.AuthenticationException;
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/SimpleAuthority.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/SimpleAuthority.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/SimpleAuthority.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/auth/SimpleAuthority.java Wed Dec 29 18:20:43 2010
@@ -21,7 +21,8 @@ package org.apache.cassandra.auth;
*/
-import java.io.*;
+import java.io.FileInputStream;
+import java.io.IOException;
import java.util.EnumSet;
import java.util.List;
import java.util.Properties;
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/AvroRecordFactory.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/AvroRecordFactory.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/AvroRecordFactory.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/AvroRecordFactory.java Wed Dec 29 18:20:43 2010
@@ -23,7 +23,6 @@ package org.apache.cassandra.avro;
import java.nio.ByteBuffer;
import java.util.List;
-import java.util.Map;
import org.apache.avro.generic.GenericArray;
import org.apache.avro.util.Utf8;
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/AvroValidation.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/AvroValidation.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/AvroValidation.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/AvroValidation.java Wed Dec 29 18:20:43 2010
@@ -29,8 +29,8 @@ import java.util.Set;
import org.apache.avro.util.Utf8;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamily;
-import org.apache.cassandra.db.IColumn;
import org.apache.cassandra.db.ColumnFamilyType;
+import org.apache.cassandra.db.IColumn;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.MarshalException;
@@ -40,8 +40,8 @@ import org.apache.cassandra.dht.Token;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
-import static org.apache.cassandra.avro.ErrorFactory.newInvalidRequestException;
import static org.apache.cassandra.avro.AvroRecordFactory.newColumnPath;
+import static org.apache.cassandra.avro.ErrorFactory.newInvalidRequestException;
/**
* The Avro analogue to org.apache.cassandra.service.ThriftValidation
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/CassandraDaemon.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/CassandraDaemon.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/CassandraDaemon.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/CassandraDaemon.java Wed Dec 29 18:20:43 2010
@@ -25,7 +25,6 @@ import org.slf4j.LoggerFactory;
import org.apache.avro.ipc.ResponderServlet;
import org.apache.avro.specific.SpecificResponder;
-import org.apache.cassandra.utils.Mx4jTool;
import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.ServletHolder;
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/CassandraServer.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/CassandraServer.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/CassandraServer.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/avro/CassandraServer.java Wed Dec 29 18:20:43 2010
@@ -22,48 +22,30 @@ package org.apache.cassandra.avro;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeoutException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.avro.Schema;
import org.apache.avro.generic.GenericArray;
import org.apache.avro.generic.GenericData;
import org.apache.avro.ipc.AvroRemoteException;
import org.apache.avro.util.Utf8;
-import org.apache.cassandra.concurrent.Stage;
-import org.apache.cassandra.db.migration.DropKeyspace;
-import org.apache.cassandra.db.migration.UpdateColumnFamily;
-import org.apache.cassandra.db.migration.UpdateKeyspace;
-import org.apache.cassandra.dht.*;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.cassandra.auth.AllowAllAuthenticator;
import org.apache.cassandra.auth.Permission;
+import org.apache.cassandra.concurrent.Stage;
import org.apache.cassandra.concurrent.StageManager;
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.config.ColumnDefinition;
-import org.apache.cassandra.config.ConfigurationException;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.config.KSMetaData;
+import org.apache.cassandra.config.*;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.db.marshal.MarshalException;
-import org.apache.cassandra.db.migration.AddColumnFamily;
-import org.apache.cassandra.db.migration.AddKeyspace;
-import org.apache.cassandra.db.migration.DropColumnFamily;
-import org.apache.cassandra.db.migration.Migration;
+import org.apache.cassandra.db.migration.*;
+import org.apache.cassandra.dht.*;
import org.apache.cassandra.locator.AbstractReplicationStrategy;
import org.apache.cassandra.scheduler.IRequestScheduler;
import org.apache.cassandra.service.ClientState;
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cache/InstrumentedCache.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cache/InstrumentedCache.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cache/InstrumentedCache.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cache/InstrumentedCache.java Wed Dec 29 18:20:43 2010
@@ -24,8 +24,8 @@ package org.apache.cassandra.cache;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
-import com.googlecode.concurrentlinkedhashmap.Weighers;
import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
+import com.googlecode.concurrentlinkedhashmap.Weighers;
public class InstrumentedCache<K, V>
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliClient.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliClient.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliClient.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliClient.java Wed Dec 29 18:20:43 2010
@@ -17,6 +17,9 @@
*/
package org.apache.cassandra.cli;
+import java.nio.ByteBuffer;
+import java.util.*;
+
import com.google.common.base.Charsets;
import org.antlr.runtime.tree.Tree;
@@ -31,10 +34,6 @@ import org.apache.thrift.TBaseHelper;
import org.apache.thrift.TException;
import org.safehaus.uuid.UUIDGenerator;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.*;
-
// Cli Client Side Library
public class CliClient extends CliUserHelp
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliCompiler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliCompiler.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliCompiler.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliCompiler.java Wed Dec 29 18:20:43 2010
@@ -18,13 +18,15 @@
package org.apache.cassandra.cli;
-import org.antlr.runtime.*;
-import org.antlr.runtime.tree.*;
-import org.apache.cassandra.thrift.KsDef;
-import org.apache.cassandra.thrift.CfDef;
-
import java.util.List;
+import org.antlr.runtime.ANTLRStringStream;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.tree.Tree;
+import org.apache.cassandra.thrift.CfDef;
+import org.apache.cassandra.thrift.KsDef;
+
public class CliCompiler
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliMain.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliMain.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliMain.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliMain.java Wed Dec 29 18:20:43 2010
@@ -18,6 +18,12 @@
package org.apache.cassandra.cli;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.*;
+
import jline.ConsoleReader;
import jline.History;
import org.apache.cassandra.auth.SimpleAuthenticator;
@@ -28,13 +34,6 @@ import org.apache.thrift.transport.TFram
import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransport;
-import java.io.*;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
/**
* Cassandra Command Line Interface (CLI) Main
*/
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliUserHelp.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliUserHelp.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliUserHelp.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliUserHelp.java Wed Dec 29 18:20:43 2010
@@ -17,10 +17,10 @@
*/
package org.apache.cassandra.cli;
-import org.antlr.runtime.tree.Tree;
-
import java.util.EnumMap;
+import org.antlr.runtime.tree.Tree;
+
/**
* @author Pavel A. Yaskevich
*/
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliUtils.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliUtils.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliUtils.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/cli/CliUtils.java Wed Dec 29 18:20:43 2010
@@ -1,11 +1,11 @@
package org.apache.cassandra.cli;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
import org.apache.cassandra.thrift.CfDef;
import org.apache.cassandra.thrift.IndexOperator;
import org.apache.cassandra.thrift.KsDef;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/client/RingCache.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/client/RingCache.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/client/RingCache.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/client/RingCache.java Wed Dec 29 18:20:43 2010
@@ -25,6 +25,11 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
@@ -35,11 +40,6 @@ import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.transport.TFramedTransport;
import org.apache.thrift.transport.TSocket;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
/**
* A class for caching the ring map at the client. For usage example, see
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/concurrent/AIOExecutorService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/concurrent/AIOExecutorService.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/concurrent/AIOExecutorService.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/concurrent/AIOExecutorService.java Wed Dec 29 18:20:43 2010
@@ -20,17 +20,7 @@ package org.apache.cassandra.concurrent;
import java.util.Collection;
import java.util.List;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.*;
public class AIOExecutorService implements ExecutorService
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/concurrent/JMXEnabledThreadPoolExecutor.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/concurrent/JMXEnabledThreadPoolExecutor.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/concurrent/JMXEnabledThreadPoolExecutor.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/concurrent/JMXEnabledThreadPoolExecutor.java Wed Dec 29 18:20:43 2010
@@ -23,7 +23,8 @@ import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
-import javax.management.*;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
/**
* This is a wrapper class for the <i>ScheduledThreadPoolExecutor</i>. It provides an implementation
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/concurrent/NamedThreadFactory.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/concurrent/NamedThreadFactory.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/concurrent/NamedThreadFactory.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/concurrent/NamedThreadFactory.java Wed Dec 29 18:20:43 2010
@@ -18,8 +18,8 @@
package org.apache.cassandra.concurrent;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* This class is an implementation of the <i>ThreadFactory</i> interface. This
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/CFMetaData.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/CFMetaData.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/CFMetaData.java Wed Dec 29 18:20:43 2010
@@ -19,18 +19,16 @@
package org.apache.cassandra.config;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
+import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
import org.apache.avro.util.Utf8;
-import org.apache.cassandra.avro.CfDef;
import org.apache.cassandra.avro.ColumnDef;
import org.apache.cassandra.db.ColumnFamilyType;
import org.apache.cassandra.db.HintedHandOffManager;
@@ -45,12 +43,6 @@ import org.apache.cassandra.io.SerDeUtil
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Pair;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
public final class CFMetaData
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/DatabaseDescriptor.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/DatabaseDescriptor.java Wed Dec 29 18:20:43 2010
@@ -47,7 +47,6 @@ import org.apache.cassandra.io.util.File
import org.apache.cassandra.locator.*;
import org.apache.cassandra.scheduler.IRequestScheduler;
import org.apache.cassandra.scheduler.NoScheduler;
-import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Pair;
import org.yaml.snakeyaml.Loader;
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/KSMetaData.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/KSMetaData.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/KSMetaData.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/config/KSMetaData.java Wed Dec 29 18:20:43 2010
@@ -18,19 +18,18 @@
package org.apache.cassandra.config;
-import org.apache.cassandra.locator.AbstractReplicationStrategy;
-import org.apache.cassandra.locator.SimpleStrategy;
-import org.apache.cassandra.io.SerDeUtils;
-
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.avro.util.Utf8;
-
import org.apache.commons.lang.ObjectUtils;
+import org.apache.avro.util.Utf8;
+import org.apache.cassandra.io.SerDeUtils;
+import org.apache.cassandra.locator.AbstractReplicationStrategy;
+import org.apache.cassandra.locator.SimpleStrategy;
+
public final class KSMetaData
{
public final String name;
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/BinaryMemtable.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/BinaryMemtable.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/BinaryMemtable.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/BinaryMemtable.java Wed Dec 29 18:20:43 2010
@@ -31,6 +31,9 @@ import java.util.concurrent.locks.Condit
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.io.sstable.SSTableReader;
@@ -38,8 +41,6 @@ import org.apache.cassandra.io.sstable.S
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.WrappedRunnable;
import org.cliffc.high_scale_lib.NonBlockingHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class BinaryMemtable implements IFlushable
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/BinaryVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/BinaryVerbHandler.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/BinaryVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/BinaryVerbHandler.java Wed Dec 29 18:20:43 2010
@@ -21,13 +21,13 @@ package org.apache.cassandra.db;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class BinaryVerbHandler implements IVerbHandler
{
private static Logger logger_ = LoggerFactory.getLogger(BinaryVerbHandler.class);
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Column.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Column.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Column.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Column.java Wed Dec 29 18:20:43 2010
@@ -23,12 +23,13 @@ import java.nio.ByteBuffer;
import java.security.MessageDigest;
import java.util.Collection;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamily.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamily.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamily.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamily.java Wed Dec 29 18:20:43 2010
@@ -29,6 +29,9 @@ import java.util.concurrent.ConcurrentSk
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.filter.QueryPath;
@@ -36,8 +39,6 @@ import org.apache.cassandra.db.marshal.A
import org.apache.cassandra.io.ICompactSerializer2;
import org.apache.cassandra.io.util.IIterableColumns;
import org.apache.cassandra.utils.FBUtilities;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class ColumnFamily implements IColumnContainer, IIterableColumns
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java Wed Dec 29 18:20:43 2010
@@ -21,9 +21,9 @@ package org.apache.cassandra.db;
*/
+import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.io.DataInput;
import java.util.Collection;
import org.slf4j.Logger;
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java Wed Dec 29 18:20:43 2010
@@ -18,10 +18,8 @@
package org.apache.cassandra.db;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
import java.io.IOException;
-import java.util.concurrent.atomic.AtomicLongArray;
+import java.util.concurrent.ExecutionException;
/**
* The MBean interface for ColumnFamilyStore
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnIndexer.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnIndexer.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnIndexer.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ColumnIndexer.java Wed Dec 29 18:20:43 2010
@@ -18,15 +18,15 @@
package org.apache.cassandra.db;
+import java.io.DataOutput;
import java.io.IOError;
import java.io.IOException;
-import java.io.DataOutput;
import java.util.ArrayList;
import java.util.List;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.io.sstable.IndexHelper;
+import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.io.util.IIterableColumns;
import org.apache.cassandra.utils.BloomFilter;
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/CompactionManager.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/CompactionManager.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/CompactionManager.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/CompactionManager.java Wed Dec 29 18:20:43 2010
@@ -19,19 +19,14 @@
package org.apache.cassandra.db;
import java.io.File;
-import java.io.IOError;
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.net.InetAddress;
import java.util.*;
import java.util.Map.Entry;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.*;
import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
import javax.management.MBeanServer;
import javax.management.ObjectName;
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DefinitionsAnnounceVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DefinitionsAnnounceVerbHandler.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DefinitionsAnnounceVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DefinitionsAnnounceVerbHandler.java Wed Dec 29 18:20:43 2010
@@ -18,12 +18,12 @@
package org.apache.cassandra.db;
+import java.util.UUID;
+
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.service.MigrationManager;
-import java.util.UUID;
-
public class DefinitionsAnnounceVerbHandler implements IVerbHandler
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DefinitionsUpdateResponseVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DefinitionsUpdateResponseVerbHandler.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DefinitionsUpdateResponseVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DefinitionsUpdateResponseVerbHandler.java Wed Dec 29 18:20:43 2010
@@ -18,6 +18,14 @@
package org.apache.cassandra.db;
+import java.io.IOError;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.UUID;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.concurrent.Stage;
import org.apache.cassandra.concurrent.StageManager;
import org.apache.cassandra.config.ConfigurationException;
@@ -28,13 +36,6 @@ import org.apache.cassandra.net.Message;
import org.apache.cassandra.service.MigrationManager;
import org.apache.cassandra.utils.UUIDGen;
import org.apache.cassandra.utils.WrappedRunnable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOError;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.UUID;
public class DefinitionsUpdateResponseVerbHandler implements IVerbHandler
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DefsTable.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DefsTable.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DefsTable.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DefsTable.java Wed Dec 29 18:20:43 2010
@@ -18,18 +18,11 @@
package org.apache.cassandra.db;
-import static com.google.common.base.Charsets.UTF_8;
-
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
import org.apache.avro.Schema;
import org.apache.cassandra.config.DatabaseDescriptor;
@@ -39,8 +32,10 @@ import org.apache.cassandra.db.filter.Qu
import org.apache.cassandra.db.migration.Migration;
import org.apache.cassandra.io.SerDeUtils;
import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.UUIDGen;
import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.utils.UUIDGen;
+
+import static com.google.common.base.Charsets.UTF_8;
public class DefsTable
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DeletedColumn.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DeletedColumn.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DeletedColumn.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/DeletedColumn.java Wed Dec 29 18:20:43 2010
@@ -20,11 +20,12 @@ package org.apache.cassandra.db;
import java.nio.ByteBuffer;
-import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.FBUtilities;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.utils.FBUtilities;
+
public class DeletedColumn extends Column
{
private static Logger logger = LoggerFactory.getLogger(DeletedColumn.class);
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ExpiringColumn.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ExpiringColumn.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ExpiringColumn.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ExpiringColumn.java Wed Dec 29 18:20:43 2010
@@ -22,10 +22,11 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.security.MessageDigest;
+import org.apache.log4j.Logger;
+
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.log4j.Logger;
/**
* Alternative to Column that have an expiring time.
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/HintedHandOffManager.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/HintedHandOffManager.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/HintedHandOffManager.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/HintedHandOffManager.java Wed Dec 29 18:20:43 2010
@@ -18,8 +18,6 @@
package org.apache.cassandra.db;
-import static com.google.common.base.Charsets.UTF_8;
-
import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -29,6 +27,10 @@ import java.util.Collection;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeoutException;
+import org.apache.commons.lang.ArrayUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.filter.QueryFilter;
@@ -44,10 +46,9 @@ import org.apache.cassandra.service.Writ
import org.apache.cassandra.thrift.InvalidRequestException;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.WrappedRunnable;
-import org.apache.commons.lang.ArrayUtils;
import org.cliffc.high_scale_lib.NonBlockingHashSet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import static com.google.common.base.Charsets.UTF_8;
/**
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/IFlushable.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/IFlushable.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/IFlushable.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/IFlushable.java Wed Dec 29 18:20:43 2010
@@ -23,7 +23,6 @@ package org.apache.cassandra.db;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.locks.Condition;
public interface IFlushable
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/IndexScanCommand.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/IndexScanCommand.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/IndexScanCommand.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/IndexScanCommand.java Wed Dec 29 18:20:43 2010
@@ -22,8 +22,6 @@ package org.apache.cassandra.db;
import java.io.*;
import java.util.Arrays;
-import org.apache.cassandra.concurrent.Stage;
-import org.apache.cassandra.concurrent.StageManager;
import org.apache.cassandra.dht.AbstractBounds;
import org.apache.cassandra.io.ICompactSerializer2;
import org.apache.cassandra.io.util.DataOutputBuffer;
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Memtable.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Memtable.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Memtable.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Memtable.java Wed Dec 29 18:20:43 2010
@@ -31,6 +31,11 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicInteger;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.PeekingIterator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.db.columniterator.IColumnIterator;
import org.apache.cassandra.db.columniterator.SimpleAbstractColumnIterator;
import org.apache.cassandra.db.filter.AbstractColumnIterator;
@@ -40,11 +45,6 @@ import org.apache.cassandra.db.marshal.A
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.sstable.SSTableWriter;
import org.apache.cassandra.utils.WrappedRunnable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.Iterators;
-import com.google.common.collect.PeekingIterator;
public class Memtable implements Comparable<Memtable>, IFlushable
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RangeSliceReply.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RangeSliceReply.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RangeSliceReply.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RangeSliceReply.java Wed Dec 29 18:20:43 2010
@@ -18,15 +18,18 @@
package org.apache.cassandra.db;
-import org.apache.cassandra.io.util.DataOutputBuffer;
-import org.apache.cassandra.net.Message;
-import org.apache.cassandra.utils.FBUtilities;
-import org.apache.commons.lang.StringUtils;
-
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+
+import org.apache.cassandra.io.util.DataOutputBuffer;
+import org.apache.cassandra.net.Message;
+import org.apache.cassandra.utils.FBUtilities;
public class RangeSliceReply
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java Wed Dec 29 18:20:43 2010
@@ -18,14 +18,17 @@
package org.apache.cassandra.db;
-import java.io.*;
-
-import org.apache.cassandra.net.IVerbHandler;
-import org.apache.cassandra.net.Message;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOError;
+import java.io.IOException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.cassandra.net.IVerbHandler;
+import org.apache.cassandra.net.Message;
+
public class ReadRepairVerbHandler implements IVerbHandler
{
private static Logger logger_ = LoggerFactory.getLogger(ReadRepairVerbHandler.class);
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadResponse.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadResponse.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadResponse.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadResponse.java Wed Dec 29 18:20:43 2010
@@ -25,7 +25,6 @@ import java.nio.ByteBuffer;
import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.commons.lang.ArrayUtils;
/*
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadVerbHandler.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/ReadVerbHandler.java Wed Dec 29 18:20:43 2010
@@ -21,22 +21,17 @@ package org.apache.cassandra.db;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
-import java.util.List;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.io.util.DataOutputBuffer;
-import java.net.InetAddress;
-import java.nio.ByteBuffer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class ReadVerbHandler implements IVerbHandler
{
protected static class ReadContext
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Row.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Row.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Row.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Row.java Wed Dec 29 18:20:43 2010
@@ -21,9 +21,6 @@ package org.apache.cassandra.db;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.util.Collection;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RowIteratorFactory.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RowIteratorFactory.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RowIteratorFactory.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RowIteratorFactory.java Wed Dec 29 18:20:43 2010
@@ -20,25 +20,20 @@ package org.apache.cassandra.db;
import java.io.Closeable;
import java.io.IOError;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
+import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterators;
+import org.apache.commons.collections.IteratorUtils;
+
import org.apache.cassandra.db.columniterator.IColumnIterator;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.sstable.SSTableScanner;
import org.apache.cassandra.utils.ReducingIterator;
-import org.apache.commons.collections.IteratorUtils;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterators;
public class RowIteratorFactory
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RowMutation.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RowMutation.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RowMutation.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RowMutation.java Wed Dec 29 18:20:43 2010
@@ -23,13 +23,11 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ExecutionException;
+import org.apache.commons.lang.StringUtils;
+
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.filter.QueryPath;
@@ -42,7 +40,6 @@ import org.apache.cassandra.thrift.Delet
import org.apache.cassandra.thrift.Mutation;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.commons.lang.StringUtils;
public class RowMutation
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RowMutationMessage.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RowMutationMessage.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RowMutationMessage.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/RowMutationMessage.java Wed Dec 29 18:20:43 2010
@@ -22,15 +22,12 @@ import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-
import javax.xml.bind.annotation.XmlElement;
-import org.apache.cassandra.concurrent.Stage;
import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.concurrent.StageManager;
public class RowMutationMessage
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SchemaCheckVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SchemaCheckVerbHandler.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SchemaCheckVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SchemaCheckVerbHandler.java Wed Dec 29 18:20:43 2010
@@ -1,12 +1,12 @@
package org.apache.cassandra.db;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
-import org.apache.cassandra.utils.FBUtilities;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Licensed to the Apache Software Foundation (ASF) under one
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java Wed Dec 29 18:20:43 2010
@@ -21,11 +21,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
+import java.util.*;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.db.filter.QueryPath;
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SuperColumn.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SuperColumn.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SuperColumn.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SuperColumn.java Wed Dec 29 18:20:43 2010
@@ -29,13 +29,14 @@ import java.util.concurrent.ConcurrentSk
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.io.ICompactSerializer2;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class SuperColumn implements IColumn, IColumnContainer
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SystemTable.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SystemTable.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SystemTable.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/SystemTable.java Wed Dec 29 18:20:43 2010
@@ -18,8 +18,6 @@
package org.apache.cassandra.db;
-import static com.google.common.base.Charsets.UTF_8;
-
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOError;
@@ -32,6 +30,9 @@ import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.ExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.config.ConfigurationException;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.filter.QueryFilter;
@@ -43,8 +44,7 @@ import org.apache.cassandra.service.Stor
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static com.google.common.base.Charsets.UTF_8;
public class SystemTable
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Table.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Table.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Table.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Table.java Wed Dec 29 18:20:43 2010
@@ -30,6 +30,11 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.ConfigurationException;
import org.apache.cassandra.config.DatabaseDescriptor;
@@ -47,11 +52,6 @@ import org.apache.cassandra.locator.Abst
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
import org.cliffc.high_scale_lib.NonBlockingHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
public class Table
{
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/TruncateVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/TruncateVerbHandler.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/TruncateVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/TruncateVerbHandler.java Wed Dec 29 18:20:43 2010
@@ -23,11 +23,12 @@ import java.io.DataInputStream;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Handles the TRUNCATE verb
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Truncation.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Truncation.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Truncation.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/Truncation.java Wed Dec 29 18:20:43 2010
@@ -23,10 +23,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.cassandra.concurrent.Stage;
-import org.apache.cassandra.concurrent.StageManager;
import org.apache.cassandra.io.ICompactSerializer;
-import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
Modified: cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/columniterator/IColumnIterator.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/columniterator/IColumnIterator.java?rev=1053692&r1=1053691&r2=1053692&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/columniterator/IColumnIterator.java (original)
+++ cassandra/branches/cassandra-0.7.0/src/java/org/apache/cassandra/db/columniterator/IColumnIterator.java Wed Dec 29 18:20:43 2010
@@ -21,12 +21,12 @@ package org.apache.cassandra.db.columnit
*/
-import java.util.Iterator;
import java.io.IOException;
+import java.util.Iterator;
+import org.apache.cassandra.db.ColumnFamily;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.IColumn;
-import org.apache.cassandra.db.ColumnFamily;
public interface IColumnIterator extends Iterator<IColumn>
{