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 2012/03/02 19:32:37 UTC
[6/8] git commit: merge from 1.1
merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5613f8fd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5613f8fd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5613f8fd
Branch: refs/heads/trunk
Commit: 5613f8fda2d6835c4b614c87e4ace60c2025f235
Parents: a3c07ee 7e4ef1c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Mar 2 12:10:14 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Mar 2 12:10:14 2012 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/db/ColumnFamilyStore.java | 4 +-
src/java/org/apache/cassandra/db/DecoratedKey.java | 8 +++---
.../apache/cassandra/db/HintedHandOffManager.java | 2 +-
src/java/org/apache/cassandra/db/Row.java | 4 +-
.../cassandra/db/SliceByNamesReadCommand.java | 2 +-
.../apache/cassandra/db/SliceFromReadCommand.java | 2 +-
src/java/org/apache/cassandra/db/Table.java | 6 ++--
.../db/compaction/AbstractCompactedRow.java | 4 +-
.../cassandra/db/compaction/PrecompactedRow.java | 4 +-
.../org/apache/cassandra/db/filter/IFilter.java | 6 ++--
.../cassandra/db/filter/NamesQueryFilter.java | 6 ++--
.../apache/cassandra/db/filter/QueryFilter.java | 16 +++++++-------
.../cassandra/db/filter/SliceQueryFilter.java | 6 ++--
.../db/index/PerColumnSecondaryIndex.java | 6 ++--
.../cassandra/db/index/PerRowSecondaryIndex.java | 2 +-
.../cassandra/db/index/SecondaryIndexBuilder.java | 2 +-
.../cassandra/db/index/SecondaryIndexManager.java | 12 +++++-----
.../apache/cassandra/db/index/keys/KeysIndex.java | 6 ++--
.../apache/cassandra/db/migration/Migration.java | 2 +-
.../dht/AbstractByteOrderedPartitioner.java | 8 +++---
.../org/apache/cassandra/dht/IPartitioner.java | 4 +-
.../org/apache/cassandra/dht/LocalPartitioner.java | 6 ++--
.../cassandra/dht/OrderPreservingPartitioner.java | 8 +++---
.../apache/cassandra/dht/RandomPartitioner.java | 8 +++---
.../apache/cassandra/io/sstable/IndexSummary.java | 10 ++++----
.../apache/cassandra/io/sstable/KeyIterator.java | 4 +-
.../cassandra/io/sstable/ReducingKeyIterator.java | 6 ++--
.../org/apache/cassandra/io/sstable/SSTable.java | 2 +-
.../io/sstable/SSTableIdentityIterator.java | 12 +++++-----
.../apache/cassandra/io/sstable/SSTableReader.java | 16 +++++++-------
.../cassandra/io/sstable/SSTableScanner.java | 2 +-
.../apache/cassandra/io/sstable/SSTableWriter.java | 14 ++++++------
.../cassandra/service/AbstractRowResolver.java | 2 +-
.../cassandra/service/DigestMismatchException.java | 2 +-
.../cassandra/service/RowRepairResolver.java | 2 +-
.../org/apache/cassandra/db/KeyCollisionTest.java | 6 ++--
36 files changed, 106 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/DecoratedKey.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 6cd7af2,0789726..8c07bfd
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@@ -290,9 -291,9 +290,9 @@@ public class HintedHandOffManager imple
// find the hints for the node using its token.
Token<?> token = StorageService.instance.getTokenMetadata().getToken(endpoint);
- logger_.info("Started hinted handoff for token: {} with IP: {}", token, endpoint);
+ logger.info("Started hinted handoff for token: {} with IP: {}", token, endpoint);
ByteBuffer tokenBytes = StorageService.getPartitioner().getTokenFactory().toByteArray(token);
- DecoratedKey<?> epkey = StorageService.getPartitioner().decorateKey(tokenBytes);
+ DecoratedKey epkey = StorageService.getPartitioner().decorateKey(tokenBytes);
int rowsReplayed = 0;
ByteBuffer startColumn = ByteBufferUtil.EMPTY_BYTE_BUFFER;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/Row.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/SliceFromReadCommand.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/Table.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/filter/IFilter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/filter/QueryFilter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/db/migration/Migration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/dht/IPartitioner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/dht/LocalPartitioner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/dht/RandomPartitioner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/IndexSummary.java
index 2afd66e,398ec4e..e36bc90
--- a/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
@@@ -30,8 -34,8 +30,8 @@@ import org.apache.cassandra.db.Decorate
*/
public class IndexSummary
{
- private ArrayList<Long> positions;
- private ArrayList<DecoratedKey> keys;
+ private final ArrayList<Long> positions;
- private final ArrayList<DecoratedKey<?>> keys;
++ private final ArrayList<DecoratedKey> keys;
private long keysWritten = 0;
public IndexSummary(long expectedKeys)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/io/sstable/KeyIterator.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/io/sstable/ReducingKeyIterator.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/io/sstable/SSTable.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
index 04a91b6,40ab697..b146d81
--- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
@@@ -46,9 -48,9 +46,9 @@@ public class SSTableWriter extends SSTa
private IndexWriter iwriter;
private SegmentedFile.Builder dbuilder;
private final SequentialWriter dataFile;
- private DecoratedKey<?> lastWrittenKey;
+ private DecoratedKey lastWrittenKey;
private FileMark dataMark;
- private SSTableMetadata.Collector sstableMetadataCollector;
+ private final SSTableMetadata.Collector sstableMetadataCollector;
public SSTableWriter(String filename, long keyCount) throws IOException
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/service/AbstractRowResolver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/service/DigestMismatchException.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5613f8fd/src/java/org/apache/cassandra/service/RowRepairResolver.java
----------------------------------------------------------------------