Updated Branches: refs/heads/cassandra-1.2 187f73f89 -> 00b96f8ff refs/heads/trunk 308afb20b -> 1755dc027
Fix reading DeletionTime from 1.1-format sstables patch by jbellis; reviewed by aleksey for CASSANDRA-5814 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00b96f8f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00b96f8f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00b96f8f Branch: refs/heads/cassandra-1.2 Commit: 00b96f8ffd09dc1d3ff299abc9e8551bb2d0cdeb Parents: 187f73f Author: Jonathan Ellis <jbel...@apache.org> Authored: Sat Jul 27 14:18:52 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sat Jul 27 14:18:59 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/columniterator/IndexedSliceReader.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/00b96f8f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 955af7b..e2502e1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.2.8 + * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814) * cqlsh: add collections support to COPY (CASSANDRA-5698) * retry important messages for any IOException (CASSANDRA-5804) * Allow empty IN relations in SELECT/UPDATE/DELETE statements (CASSANDRA-5626) http://git-wip-us.apache.org/repos/asf/cassandra/blob/00b96f8f/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java index bc8c7ca..472ecfc 100644 --- a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java +++ b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java @@ -106,7 +106,7 @@ class IndexedSliceReader extends AbstractIterator<OnDiskAtom> implements OnDiskA IndexHelper.skipBloomFilter(file); this.indexes = IndexHelper.deserializeIndex(file); this.emptyColumnFamily = ColumnFamily.create(sstable.metadata); - emptyColumnFamily.delete(indexEntry.deletionTime()); + emptyColumnFamily.delete(DeletionTime.serializer.deserialize(file)); fetcher = indexes.isEmpty() ? new SimpleBlockFetcher() : new IndexedBlockFetcher(file.getFilePointer() + 4); // We still have the column count to
