cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/5] git commit: Add missing file from previous commit
Date Fri, 29 Jun 2012 16:33:52 GMT
Updated Branches:
  refs/heads/trunk ce807c6a2 -> 9d1bf3723


Add missing file from previous commit


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

Branch: refs/heads/trunk
Commit: 9d1bf372309f67ccd7242a24ef8061641e2857f7
Parents: 29124f6
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Jun 29 18:33:46 2012 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Jun 29 18:33:46 2012 +0200

----------------------------------------------------------------------
 .../apache/cassandra/db/RangeTombstoneTest.java    |  184 +++++++++++++++
 1 files changed, 184 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d1bf372/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
new file mode 100644
index 0000000..1bc846b
--- /dev/null
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
@@ -0,0 +1,184 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*    http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+package org.apache.cassandra.db;
+
+import java.nio.ByteBuffer;
+import java.util.*;
+
+import org.junit.Test;
+
+import org.apache.cassandra.SchemaLoader;
+import org.apache.cassandra.db.compaction.CompactionManager;
+import org.apache.cassandra.db.filter.*;
+import org.apache.cassandra.utils.ByteBufferUtil;
+
+import static org.apache.cassandra.Util.dk;
+
+public class RangeTombstoneTest extends SchemaLoader
+{
+    private static final String KSNAME = "Keyspace1";
+    private static final String CFNAME = "StandardInteger1";
+
+    @Test
+    public void simpleQueryWithRangeTombstoneTest() throws Exception
+    {
+        Table table = Table.open(KSNAME);
+        ColumnFamilyStore cfs = table.getColumnFamilyStore(CFNAME);
+
+        // Inserting data
+        String key = "k1";
+        RowMutation rm;
+        ColumnFamily cf;
+
+        rm = new RowMutation(KSNAME, ByteBufferUtil.bytes(key));
+        for (int i = 0; i < 40; i += 2)
+            add(rm, i, 0);
+        rm.apply();
+        cfs.forceBlockingFlush();
+
+        rm = new RowMutation(KSNAME, ByteBufferUtil.bytes(key));
+        cf = rm.addOrGet(CFNAME);
+        delete(cf, 10, 22, 1);
+        rm.apply();
+        cfs.forceBlockingFlush();
+
+        rm = new RowMutation(KSNAME, ByteBufferUtil.bytes(key));
+        for (int i = 1; i < 40; i += 2)
+            add(rm, i, 2);
+        rm.apply();
+        cfs.forceBlockingFlush();
+
+        rm = new RowMutation(KSNAME, ByteBufferUtil.bytes(key));
+        cf = rm.addOrGet(CFNAME);
+        delete(cf, 19, 27, 3);
+        rm.apply();
+        // We don't flush to test with both a range tomsbtone in memtable and in sstable
+
+        QueryPath path = new QueryPath(CFNAME);
+
+        // Queries by name
+        int[] live = new int[]{ 4, 9, 11, 17, 28 };
+        int[] dead = new int[]{ 12, 19, 21, 24, 27 };
+        SortedSet<ByteBuffer> columns = new TreeSet<ByteBuffer>(cfs.getComparator());
+        for (int i : live)
+            columns.add(b(i));
+        for (int i : dead)
+            columns.add(b(i));
+        cf = cfs.getColumnFamily(QueryFilter.getNamesFilter(dk(key), path, columns));
+
+        for (int i : live)
+            assert isLive(cf, cf.getColumn(b(i))) : "Column " + i + " should be live";
+        for (int i : dead)
+            assert !isLive(cf, cf.getColumn(b(i))) : "Column " + i + " shouldn't be live";
+
+        // Queries by slices
+        cf = cfs.getColumnFamily(QueryFilter.getSliceFilter(dk(key), path, b(7), b(30), false,
Integer.MAX_VALUE));
+
+        for (int i : new int[]{ 7, 8, 9, 11, 13, 15, 17, 28, 29, 30 })
+            assert isLive(cf, cf.getColumn(b(i))) : "Column " + i + " should be live";
+        for (int i : new int[]{ 10, 12, 14, 16, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 })
+            assert !isLive(cf, cf.getColumn(b(i))) : "Column " + i + " shouldn't be live";
+    }
+
+    @Test
+    public void overlappingRangeTest() throws Exception
+    {
+        CompactionManager.instance.disableAutoCompaction();
+        Table table = Table.open(KSNAME);
+        ColumnFamilyStore cfs = table.getColumnFamilyStore(CFNAME);
+
+        // Inserting data
+        String key = "k2";
+        RowMutation rm;
+        ColumnFamily cf;
+
+        rm = new RowMutation(KSNAME, ByteBufferUtil.bytes(key));
+        for (int i = 0; i < 20; i++)
+            add(rm, i, 0);
+        rm.apply();
+        cfs.forceBlockingFlush();
+
+        rm = new RowMutation(KSNAME, ByteBufferUtil.bytes(key));
+        cf = rm.addOrGet(CFNAME);
+        delete(cf, 5, 15, 1);
+        rm.apply();
+        cfs.forceBlockingFlush();
+
+        rm = new RowMutation(KSNAME, ByteBufferUtil.bytes(key));
+        cf = rm.addOrGet(CFNAME);
+        delete(cf, 5, 10, 1);
+        rm.apply();
+        cfs.forceBlockingFlush();
+
+        rm = new RowMutation(KSNAME, ByteBufferUtil.bytes(key));
+        cf = rm.addOrGet(CFNAME);
+        delete(cf, 5, 8, 2);
+        rm.apply();
+        cfs.forceBlockingFlush();
+
+        QueryPath path = new QueryPath(CFNAME);
+        cf = cfs.getColumnFamily(QueryFilter.getIdentityFilter(dk(key), path));
+
+        for (int i = 0; i < 5; i++)
+            assert isLive(cf, cf.getColumn(b(i))) : "Column " + i + " should be live";
+        for (int i = 16; i < 20; i++)
+            assert isLive(cf, cf.getColumn(b(i))) : "Column " + i + " should be live";
+        for (int i = 5; i <= 15; i++)
+            assert !isLive(cf, cf.getColumn(b(i))) : "Column " + i + " shouldn't be live";
+
+        // Compact everything and re-test
+        CompactionManager.instance.performMaximal(cfs);
+        cf = cfs.getColumnFamily(QueryFilter.getIdentityFilter(dk(key), path));
+
+        for (int i = 0; i < 5; i++)
+            assert isLive(cf, cf.getColumn(b(i))) : "Column " + i + " should be live";
+        for (int i = 16; i < 20; i++)
+            assert isLive(cf, cf.getColumn(b(i))) : "Column " + i + " should be live";
+        for (int i = 5; i <= 15; i++)
+            assert !isLive(cf, cf.getColumn(b(i))) : "Column " + i + " shouldn't be live";
+    }
+
+    private static boolean isLive(ColumnFamily cf, IColumn c)
+    {
+        return c != null && !c.isMarkedForDelete() && !cf.deletionInfo().isDeleted(c);
+    }
+
+    private static ByteBuffer b(int i)
+    {
+        return ByteBufferUtil.bytes(i);
+    }
+
+    private static void insertData(ColumnFamilyStore cfs, String key) throws Exception
+    {
+    }
+
+    private static void add(RowMutation rm, int value, long timestamp)
+    {
+        rm.add(new QueryPath(CFNAME, null, b(value)), b(value), timestamp);
+    }
+
+    private static void delete(ColumnFamily cf, int from, int to, long timestamp)
+    {
+        cf.delete(new DeletionInfo(b(from),
+                                   b(to),
+                                   cf.getComparator(),
+                                   timestamp,
+                                   (int)(System.currentTimeMillis() / 1000)));
+    }
+}


Mime
View raw message