You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2014/03/03 14:40:59 UTC
[1/2] git commit: Fix merge
Repository: cassandra
Updated Branches:
refs/heads/trunk e80564f39 -> 2c8100af2
Fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04395312
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04395312
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04395312
Branch: refs/heads/trunk
Commit: 04395312745805ed7e4fd201b88bcd3d46b3a601
Parents: e4437bc
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon Mar 3 14:39:40 2014 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Mar 3 14:39:40 2014 +0100
----------------------------------------------------------------------
.../cassandra/io/compress/CompressedRandomAccessReaderTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/04395312/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
index c9ddfea..f8fcf76 100644
--- a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
@@ -29,6 +29,7 @@ import org.apache.cassandra.db.marshal.BytesType;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.sstable.CorruptSSTableException;
import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
+import org.apache.cassandra.io.sstable.metadata.StatsMetadata;
import org.apache.cassandra.io.util.*;
import static org.junit.Assert.assertEquals;
@@ -59,7 +60,7 @@ public class CompressedRandomAccessReaderTest
try
{
- SSTableMetadata.Collector sstableMetadataCollector = SSTableMetadata.createCollector(BytesType.instance).replayPosition(null);
+ MetadataCollector sstableMetadataCollector = new MetadataCollector(new SimpleDenseCellNameType(BytesType.instance));
CompressedSequentialWriter writer = new CompressedSequentialWriter(f, filename + ".metadata", false, new CompressionParameters(SnappyCompressor.instance, 32, Collections.<String, String>emptyMap()), sstableMetadataCollector);
for (int i = 0; i < 20; i++)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ma...@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/2c8100af
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c8100af
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2c8100af
Branch: refs/heads/trunk
Commit: 2c8100af210990bf1f15cc6691066787b88e5f25
Parents: e80564f 0439531
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon Mar 3 14:39:45 2014 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Mar 3 14:39:45 2014 +0100
----------------------------------------------------------------------
.../cassandra/io/compress/CompressedRandomAccessReaderTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------