You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/02/24 15:35:15 UTC
[1/3] cassandra git commit: ninja fix
SSTableReaderTest.testGetPositionsForRangesFromTableOpenedForBulkLoading with
compression
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 766d8c010 -> 990f478c2
refs/heads/trunk ec2c050ba -> 058e97720
ninja fix SSTableReaderTest.testGetPositionsForRangesFromTableOpenedForBulkLoading with compression
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/990f478c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/990f478c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/990f478c
Branch: refs/heads/cassandra-2.1
Commit: 990f478c24362dc5183c66d2c5a7e0a7ea8d83e0
Parents: 766d8c0
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Feb 24 14:34:59 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Tue Feb 24 14:34:59 2015 +0000
----------------------------------------------------------------------
test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/990f478c/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index 9607673..a037599 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
@@ -416,6 +416,8 @@ public class SSTableReaderTest extends SchemaLoader
// re-open the same sstable as it would be during bulk loading
Set<Component> components = Sets.newHashSet(Component.DATA, Component.PRIMARY_INDEX);
+ if (sstable.components.contains(Component.COMPRESSION_INFO))
+ components.add(Component.COMPRESSION_INFO);
SSTableReader bulkLoaded = SSTableReader.openForBatch(sstable.descriptor, components, store.metadata, sstable.partitioner);
sections = bulkLoaded.getPositionsForRanges(ranges);
assert sections.size() == 1 : "Expected to find range in sstable opened for bulk loading";
[2/3] cassandra git commit: ninja fix
SSTableReaderTest.testGetPositionsForRangesFromTableOpenedForBulkLoading with
compression
Posted by be...@apache.org.
ninja fix SSTableReaderTest.testGetPositionsForRangesFromTableOpenedForBulkLoading with compression
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/990f478c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/990f478c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/990f478c
Branch: refs/heads/trunk
Commit: 990f478c24362dc5183c66d2c5a7e0a7ea8d83e0
Parents: 766d8c0
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Feb 24 14:34:59 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Tue Feb 24 14:34:59 2015 +0000
----------------------------------------------------------------------
test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/990f478c/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index 9607673..a037599 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
@@ -416,6 +416,8 @@ public class SSTableReaderTest extends SchemaLoader
// re-open the same sstable as it would be during bulk loading
Set<Component> components = Sets.newHashSet(Component.DATA, Component.PRIMARY_INDEX);
+ if (sstable.components.contains(Component.COMPRESSION_INFO))
+ components.add(Component.COMPRESSION_INFO);
SSTableReader bulkLoaded = SSTableReader.openForBatch(sstable.descriptor, components, store.metadata, sstable.partitioner);
sections = bulkLoaded.getPositionsForRanges(ranges);
assert sections.size() == 1 : "Expected to find range in sstable opened for bulk loading";
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/058e9772
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/058e9772
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/058e9772
Branch: refs/heads/trunk
Commit: 058e97720258de6248ce7636989d596b9ae897be
Parents: ec2c050 990f478
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Feb 24 14:35:05 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Tue Feb 24 14:35:05 2015 +0000
----------------------------------------------------------------------
test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/058e9772/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
----------------------------------------------------------------------