cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Tue, 02 Jun 2015 12:58:38 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts:
	src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a30d8bd2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a30d8bd2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a30d8bd2

Branch: refs/heads/trunk
Commit: a30d8bd212a9a2fb4499130d2493eca34c3715a2
Parents: 94a68a1 c0f96e1
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Jun 2 14:57:44 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Jun 2 14:57:44 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../io/sstable/SSTableIdentityIterator.java     | 10 ++++
 .../io/sstable/format/SSTableReader.java        | 57 +++++++++++++++-----
 .../compaction/BlacklistingCompactionsTest.java | 17 +++---
 4 files changed, 67 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a30d8bd2/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a30d8bd2/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
index 6300749,498ad26..17f9a8d
--- a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
@@@ -78,10 -81,12 +81,11 @@@ import org.apache.cassandra.serializers
          this.in = in;
          this.filename = filename;
          this.key = key;
 -        this.dataSize = dataSize;
          this.flag = flag;
          this.validateColumns = checkData;
+         this.sstable = sstable;
  
 -        Descriptor.Version dataVersion = sstable == null ? Descriptor.Version.CURRENT :
sstable.descriptor.version;
 +        Version dataVersion = sstable == null ? DatabaseDescriptor.getSSTableFormat().info.getLatestVersion()
: sstable.descriptor.version;
          int expireBefore = (int) (System.currentTimeMillis() / 1000);
          columnFamily = ArrayBackedSortedColumns.factory.create(metadata);
  


Mime
View raw message