cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 18 Mar 2015 19:43:06 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java


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

Branch: refs/heads/trunk
Commit: dab8ddb8def779d22384355da2bcf5baf33e8ec5
Parents: 69d4322 9b9dda6
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Wed Mar 18 19:42:53 2015 +0000
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Wed Mar 18 19:42:53 2015 +0000

----------------------------------------------------------------------
 .../cassandra/db/compaction/CompactionsTest.java       | 13 ++++++-------
 .../apache/cassandra/io/sstable/IndexSummaryTest.java  |  1 +
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dab8ddb8/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
index 3c34bf3,cc10eb6..b649ed6
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
@@@ -26,22 -27,23 +26,21 @@@ import java.util.concurrent.TimeUnit
  import org.apache.cassandra.OrderedJUnit4ClassRunner;
  import org.apache.cassandra.SchemaLoader;
  import org.apache.cassandra.Util;
 +import org.apache.cassandra.config.KSMetaData;
  import org.apache.cassandra.config.CFMetaData;
 -import org.apache.cassandra.config.DatabaseDescriptor;
  import org.apache.cassandra.db.*;
+ import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
  import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
  import org.apache.cassandra.db.filter.QueryFilter;
 +import org.apache.cassandra.db.marshal.BytesType;
 +import org.apache.cassandra.db.marshal.LongType;
- import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken;
- import org.apache.cassandra.dht.Range;
- import org.apache.cassandra.dht.Token;
 +import org.apache.cassandra.exceptions.ConfigurationException;
+ import org.apache.cassandra.dht.*;
  import org.apache.cassandra.io.sstable.*;
 -import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
 +import org.apache.cassandra.io.sstable.format.SSTableReader;
 +import org.apache.cassandra.io.sstable.format.SSTableWriter;
  import org.apache.cassandra.io.sstable.metadata.StatsMetadata;
 -import org.apache.cassandra.service.StorageService;
 +import org.apache.cassandra.locator.SimpleStrategy;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.FBUtilities;
  import org.apache.cassandra.utils.Pair;
@@@ -186,12 -156,12 +185,12 @@@ public class CompactionsTes
  
          // check that the shadowed column is gone
          SSTableReader sstable = cfs.getSSTables().iterator().next();
-         Range<RowPosition> keyRange = new Range<RowPosition>(key, sstable.partitioner.getMinimumToken().maxKeyBound());
-         ISSTableScanner scanner = sstable.getScanner(DataRange.forKeyRange(keyRange));
+         AbstractBounds<RowPosition> bounds = new Bounds<RowPosition>(key, sstable.partitioner.getMinimumToken().maxKeyBound());
+         ISSTableScanner scanner = sstable.getScanner(new DataRange(bounds, new IdentityQueryFilter()));
          OnDiskAtomIterator iter = scanner.next();
          assertEquals(key, iter.getKey());
 -        assert iter.next() instanceof RangeTombstone;
 -        assert !iter.hasNext();
 +        assertTrue(iter.next() instanceof RangeTombstone);
 +        assertFalse(iter.hasNext());
      }
  
      @Test
@@@ -524,8 -504,8 +523,8 @@@
  
      private static Range<Token> rangeFor(int start, int end)
      {
--        return new Range<Token>(new BytesToken(String.format("%03d", start).getBytes()),
--                                new BytesToken(String.format("%03d", end).getBytes()));
++        return new Range<Token>(new ByteOrderedPartitioner.BytesToken(String.format("%03d",
start).getBytes()),
++                                new ByteOrderedPartitioner.BytesToken(String.format("%03d",
end).getBytes()));
      }
  
      private static Collection<Range<Token>> makeRanges(int ... keys)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dab8ddb8/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
index 95183d4,95183d4..35b3fc6
--- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
@@@ -30,6 -30,6 +30,7 @@@ import org.apache.cassandra.config.Data
  import org.apache.cassandra.db.*;
  import org.apache.cassandra.dht.IPartitioner;
  import org.apache.cassandra.dht.RandomPartitioner;
++import org.apache.cassandra.io.sstable.format.SSTableReader;
  import org.apache.cassandra.io.util.DataOutputBuffer;
  import org.apache.cassandra.io.util.FileUtils;
  import org.apache.cassandra.utils.ByteBufferUtil;


Mime
View raw message