Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java?rev=794429&r1=794428&r2=794429&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java Wed Jul 15 22:04:43 2009 @@ -25,6 +25,7 @@ import static junit.framework.Assert.assertNull; import org.apache.cassandra.db.filter.IdentityQueryFilter; +import org.apache.cassandra.db.filter.QueryPath; public class RemoveColumnFamilyWithFlush1Test { @@ -37,17 +38,17 @@ // add data rm = new RowMutation("Table1", "key1"); - rm.add("Standard1:Column1", "asdf".getBytes(), 0); - rm.add("Standard1:Column2", "asdf".getBytes(), 0); + rm.add(new QueryPath("Standard1", null, "Column1"), "asdf".getBytes(), 0); + rm.add(new QueryPath("Standard1", null, "Column2"), "asdf".getBytes(), 0); rm.apply(); store.forceBlockingFlush(); // remove rm = new RowMutation("Table1", "key1"); - rm.delete("Standard1", 1); + rm.delete(new QueryPath("Standard1"), 1); rm.apply(); - ColumnFamily retrieved = store.getColumnFamily(new IdentityQueryFilter("key1", "Standard1")); + ColumnFamily retrieved = store.getColumnFamily(new IdentityQueryFilter("key1", new QueryPath("Standard1"))); assert retrieved.isMarkedForDelete(); assertNull(retrieved.getColumn("Column1")); assertNull(ColumnFamilyStore.removeDeleted(retrieved, Integer.MAX_VALUE));
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java?rev=794429&r1=794428&r2=794429&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java Wed Jul 15 22:04:43 2009 @@ -25,6 +25,7 @@ import static junit.framework.Assert.assertNull; import org.apache.cassandra.db.filter.IdentityQueryFilter; +import org.apache.cassandra.db.filter.QueryPath; public class RemoveColumnFamilyWithFlush2Test { @@ -37,15 +38,15 @@ // add data rm = new RowMutation("Table1", "key1"); - rm.add("Standard1:Column1", "asdf".getBytes(), 0); + rm.add(new QueryPath("Standard1", null, "Column1"), "asdf".getBytes(), 0); rm.apply(); // remove rm = new RowMutation("Table1", "key1"); - rm.delete("Standard1", 1); + rm.delete(new QueryPath("Standard1"), 1); rm.apply(); store.forceBlockingFlush(); - ColumnFamily retrieved = store.getColumnFamily(new IdentityQueryFilter("key1", "Standard1:Column1")); + ColumnFamily retrieved = store.getColumnFamily(new IdentityQueryFilter("key1", new QueryPath("Standard1", null, "Column1"))); assert retrieved.isMarkedForDelete(); assertNull(retrieved.getColumn("Column1")); assertNull(ColumnFamilyStore.removeDeleted(retrieved, Integer.MAX_VALUE)); Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnTest.java?rev=794429&r1=794428&r2=794429&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnTest.java Wed Jul 15 22:04:43 2009 @@ -26,6 +26,7 @@ import static junit.framework.Assert.assertNull; import org.apache.cassandra.db.filter.IdentityQueryFilter; import org.apache.cassandra.db.filter.NamesQueryFilter; +import org.apache.cassandra.db.filter.QueryPath; public class RemoveColumnTest { @@ -38,18 +39,18 @@ // add data rm = new RowMutation("Table1", "key1"); - rm.add("Standard1:Column1", "asdf".getBytes(), 0); + rm.add(new QueryPath("Standard1", null, "Column1"), "asdf".getBytes(), 0); rm.apply(); store.forceBlockingFlush(); // remove rm = new RowMutation("Table1", "key1"); - rm.delete("Standard1:Column1", 1); + rm.delete(new QueryPath("Standard1", null, "Column1"), 1); rm.apply(); - ColumnFamily retrieved = store.getColumnFamily(new NamesQueryFilter("key1", "Standard1", "Column1")); + ColumnFamily retrieved = store.getColumnFamily(new NamesQueryFilter("key1", new QueryPath("Standard1"), "Column1")); assert retrieved.getColumn("Column1").isMarkedForDelete(); assertNull(ColumnFamilyStore.removeDeleted(retrieved, Integer.MAX_VALUE)); - assertNull(ColumnFamilyStore.removeDeleted(store.getColumnFamily(new IdentityQueryFilter("key1", "Standard1")), Integer.MAX_VALUE)); + assertNull(ColumnFamilyStore.removeDeleted(store.getColumnFamily(new IdentityQueryFilter("key1", new QueryPath("Standard1"))), Integer.MAX_VALUE)); } } \ No newline at end of file Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java?rev=794429&r1=794428&r2=794429&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java Wed Jul 15 22:04:43 2009 @@ -25,6 +25,7 @@ import static junit.framework.Assert.assertNull; import org.apache.cassandra.db.filter.IdentityQueryFilter; +import org.apache.cassandra.db.filter.QueryPath; public class RemoveSubColumnTest { @@ -37,16 +38,16 @@ // add data rm = new RowMutation("Table1", "key1"); - rm.add("Super1:SC1:Column1", "asdf".getBytes(), 0); + rm.add(new QueryPath("Super1", "SC1", "Column1"), "asdf".getBytes(), 0); rm.apply(); store.forceBlockingFlush(); // remove rm = new RowMutation("Table1", "key1"); - rm.delete("Super1:SC1:Column1", 1); + rm.delete(new QueryPath("Super1", "SC1", "Column1"), 1); rm.apply(); - ColumnFamily retrieved = store.getColumnFamily(new IdentityQueryFilter("key1", "Super1:SC1")); + ColumnFamily retrieved = store.getColumnFamily(new IdentityQueryFilter("key1", new QueryPath("Super1", "SC1"))); assert retrieved.getColumn("SC1").getSubColumn("Column1").isMarkedForDelete(); assertNull(ColumnFamilyStore.removeDeleted(retrieved, Integer.MAX_VALUE)); } Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java?rev=794429&r1=794428&r2=794429&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java Wed Jul 15 22:04:43 2009 @@ -32,6 +32,7 @@ import org.apache.cassandra.db.filter.IdentityQueryFilter; import org.apache.cassandra.db.filter.NamesQueryFilter; +import org.apache.cassandra.db.filter.QueryPath; public class RemoveSuperColumnTest { @@ -43,13 +44,13 @@ // add data rm = new RowMutation("Table1", "key1"); - rm.add("Super1:SC1:Column1", "asdf".getBytes(), 0); + rm.add(new QueryPath("Super1", "SC1", "Column1"), "asdf".getBytes(), 0); rm.apply(); store.forceBlockingFlush(); // remove rm = new RowMutation("Table1", "key1"); - rm.delete("Super1:SC1", 1); + rm.delete(new QueryPath("Super1", "SC1"), 1); rm.apply(); validateRemoveTwoSources(); @@ -66,17 +67,17 @@ private void validateRemoveTwoSources() throws IOException { ColumnFamilyStore store = Table.open("Table1").getColumnFamilyStore("Super1"); - ColumnFamily resolved = store.getColumnFamily(new NamesQueryFilter("key1", "Super1", "SC1")); + ColumnFamily resolved = store.getColumnFamily(new NamesQueryFilter("key1", new QueryPath("Super1"), "SC1")); assert resolved.getAllColumns().first().getMarkedForDeleteAt() == 1; assert resolved.getAllColumns().first().getSubColumns().size() == 0; assertNull(ColumnFamilyStore.removeDeleted(resolved, Integer.MAX_VALUE)); - assertNull(ColumnFamilyStore.removeDeleted(store.getColumnFamily(new IdentityQueryFilter("key1", "Super1")), Integer.MAX_VALUE)); + assertNull(ColumnFamilyStore.removeDeleted(store.getColumnFamily(new IdentityQueryFilter("key1", new QueryPath("Super1"))), Integer.MAX_VALUE)); } private void validateRemoveCompacted() throws IOException { ColumnFamilyStore store = Table.open("Table1").getColumnFamilyStore("Super1"); - ColumnFamily resolved = store.getColumnFamily(new NamesQueryFilter("key1", "Super1", "SC1")); + ColumnFamily resolved = store.getColumnFamily(new NamesQueryFilter("key1", new QueryPath("Super1"), "SC1")); assert resolved.getAllColumns().first().getMarkedForDeleteAt() == 1; Collection<IColumn> subColumns = resolved.getAllColumns().first().getSubColumns(); assert subColumns.size() == 0; @@ -90,18 +91,18 @@ // add data rm = new RowMutation("Table1", "key1"); - rm.add("Super2:SC1:Column1", "asdf".getBytes(), 0); + rm.add(new QueryPath("Super2", "SC1", "Column1"), "asdf".getBytes(), 0); rm.apply(); store.forceBlockingFlush(); // remove rm = new RowMutation("Table1", "key1"); - rm.delete("Super2:SC1", 1); + rm.delete(new QueryPath("Super2", "SC1"), 1); rm.apply(); // new data rm = new RowMutation("Table1", "key1"); - rm.add("Super2:SC1:Column2", "asdf".getBytes(), 2); + rm.add(new QueryPath("Super2", "SC1", "Column2"), "asdf".getBytes(), 2); rm.apply(); validateRemoveWithNewData(); @@ -118,7 +119,7 @@ private void validateRemoveWithNewData() throws IOException { ColumnFamilyStore store = Table.open("Table1").getColumnFamilyStore("Super2"); - ColumnFamily resolved = store.getColumnFamily(new NamesQueryFilter("key1", "Super2:SC1", "Column2")); + ColumnFamily resolved = store.getColumnFamily(new NamesQueryFilter("key1", new QueryPath("Super2", "SC1"), "Column2")); validateNewDataFamily(resolved); } Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java?rev=794429&r1=794428&r2=794429&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java Wed Jul 15 22:04:43 2009 @@ -23,6 +23,7 @@ import org.junit.Test; import static junit.framework.Assert.assertEquals; +import org.apache.cassandra.db.filter.QueryPath; public class RowTest { @@ -30,7 +31,7 @@ public void testDiffColumnFamily() { ColumnFamily cf1 = ColumnFamily.create("Table1", "Standard1"); - cf1.addColumn("one", "onev".getBytes(), 0); + cf1.addColumn(QueryPath.column("one"), "onev".getBytes(), 0); ColumnFamily cf2 = ColumnFamily.create("Table1", "Standard1"); cf2.delete(0, 0); @@ -59,15 +60,15 @@ { Row row1 = new Row(); ColumnFamily cf1 = ColumnFamily.create("Table1", "Standard1"); - cf1.addColumn("one", "A".getBytes(), 0); + cf1.addColumn(QueryPath.column("one"), "A".getBytes(), 0); row1.addColumnFamily(cf1); Row row2 = new Row(); ColumnFamily cf2 = ColumnFamily.create("Table1", "Standard1"); - cf2.addColumn("one", "B".getBytes(), 1); - cf2.addColumn("two", "C".getBytes(), 1); + cf2.addColumn(QueryPath.column("one"), "B".getBytes(), 1); + cf2.addColumn(QueryPath.column("two"), "C".getBytes(), 1); ColumnFamily cf3 = ColumnFamily.create("Table2", "Standard2"); - cf3.addColumn("three", "D".getBytes(), 1); + cf3.addColumn(QueryPath.column("three"), "D".getBytes(), 1); row2.addColumnFamily(cf2); row2.addColumnFamily(cf3); Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java?rev=794429&r1=794428&r2=794429&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java Wed Jul 15 22:04:43 2009 @@ -27,6 +27,7 @@ import static junit.framework.Assert.*; import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.db.filter.NamesQueryFilter; +import org.apache.cassandra.db.filter.QueryPath; import org.apache.cassandra.io.SSTableReader; public class TableTest extends CleanupHelper @@ -58,6 +59,8 @@ public void testGetRowSingleColumn() throws Throwable { final Table table = Table.open("Table1"); + final ColumnFamilyStore cfStore = table.getColumnFamilyStore("Standard1"); + Runner setup = new Runner() { public void run() throws Exception @@ -70,13 +73,13 @@ { public void run() throws Exception { - Row result; + ColumnFamily cf; - result = table.getRow(TEST_KEY, new NamesQueryFilter(TEST_KEY, "Standard1", "col1")); - assertColumns(result.getColumnFamily("Standard1"), "col1"); + cf = cfStore.getColumnFamily(new NamesQueryFilter(TEST_KEY, new QueryPath("Standard1"), "col1")); + assertColumns(cf, "col1"); - result = table.getRow(TEST_KEY, new NamesQueryFilter(TEST_KEY, "Standard1", "col3")); - assertColumns(result.getColumnFamily("Standard1"), "col3"); + cf = cfStore.getColumnFamily(new NamesQueryFilter(TEST_KEY, new QueryPath("Standard1"), "col3")); + assertColumns(cf, "col3"); } }; reTest(setup, table.getColumnFamilyStore("Standard1"), verify); @@ -87,7 +90,8 @@ { String key = TEST_KEY+"slicerow"; Table table = Table.open("Table1"); - RowMutation rm = new RowMutation("Table1",key); + ColumnFamilyStore cfStore = table.getColumnFamilyStore("Standard1"); + RowMutation rm = new RowMutation("Table1", key); ColumnFamily cf = ColumnFamily.create("Table1", "Standard1"); // First write "a", "b", "c" cf.addColumn(new Column("a", "val1".getBytes(), 1L)); @@ -96,17 +100,17 @@ rm.add(cf); rm.apply(); - Row result = table.getRow(key, "Standard1", "b", "c", true, 0, 100); - assertEquals(2, result.getColumnFamily("Standard1").getColumnCount()); + cf = cfStore.getColumnFamily(key, new QueryPath("Standard1"), "b", "c", true, 0, 100); + assertEquals(2, cf.getColumnCount()); - result = table.getRow(key, "Standard1", "b", "b", true, 0, 100); - assertEquals(1, result.getColumnFamily("Standard1").getColumnCount()); + cf = cfStore.getColumnFamily(key, new QueryPath("Standard1"), "b", "b", true, 0, 100); + assertEquals(1, cf.getColumnCount()); - result = table.getRow(key, "Standard1", "b", "c", true, 0, 1); - assertEquals(1, result.getColumnFamily("Standard1").getColumnCount()); + cf = cfStore.getColumnFamily(key, new QueryPath("Standard1"), "b", "c", true, 0, 1); + assertEquals(1, cf.getColumnCount()); - result = table.getRow(key, "Standard1", "c", "b", true, 0, 1); - assertNull(result.getColumnFamily("Standard1")); + cf = cfStore.getColumnFamily(key, new QueryPath("Standard1"), "c", "b", true, 0, 1); + assertNull(cf); } private RowMutation makeSimpleRowMutation() @@ -142,17 +146,15 @@ private void validateGetSliceNoMatch(Table table) throws IOException { - Row result; + ColumnFamilyStore cfStore = table.getColumnFamilyStore("Standard2"); ColumnFamily cf; // key before the rows that exists - result = table.getRow("a", "Standard2", "", "", true, 0, 1); - cf = result.getColumnFamily("Standard2"); + cf = cfStore.getColumnFamily("a", new QueryPath("Standard2"), "", "", true, 0, 1); assertColumns(cf); // key after the rows that exist - result = table.getRow("z", "Standard2", "", "", true, 0, 1); - cf = result.getColumnFamily("Standard2"); + cf = cfStore.getColumnFamily("z", new QueryPath("Standard2"), "", "", true, 0, 1); assertColumns(cf); } @@ -161,6 +163,7 @@ { // tests slicing against data from one row in a memtable and then flushed to an sstable final Table table = Table.open("Table1"); + final ColumnFamilyStore cfStore = table.getColumnFamilyStore("Standard1"); final String ROW = "row1"; Runner setup = new Runner() { @@ -178,7 +181,7 @@ rm.apply(); rm = new RowMutation("Table1", ROW); - rm.delete("Standard1:col4", 2L); + rm.delete(new QueryPath("Standard1", null, "col4"), 2L); rm.apply(); } }; @@ -190,28 +193,22 @@ Row result; ColumnFamily cf; - result = table.getRow(ROW, "Standard1", "col5", "", true, 0, 2); - cf = result.getColumnFamily("Standard1"); + cf = cfStore.getColumnFamily(ROW, new QueryPath("Standard1"), "col5", "", true, 0, 2); assertColumns(cf, "col5", "col7"); - result = table.getRow(ROW, "Standard1", "col4", "", true, 0, 2); - cf = result.getColumnFamily("Standard1"); + cf = cfStore.getColumnFamily(ROW, new QueryPath("Standard1"), "col4", "", true, 0, 2); assertColumns(cf, "col5", "col7"); - result = table.getRow(ROW, "Standard1", "col5", "", false, 0, 2); - cf = result.getColumnFamily("Standard1"); + cf = cfStore.getColumnFamily(ROW, new QueryPath("Standard1"), "col5", "", false, 0, 2); assertColumns(cf, "col3", "col4", "col5"); - result = table.getRow(ROW, "Standard1", "col6", "", false, 0, 2); - cf = result.getColumnFamily("Standard1"); + cf = cfStore.getColumnFamily(ROW, new QueryPath("Standard1"), "col6", "", false, 0, 2); assertColumns(cf, "col3", "col4", "col5"); - result = table.getRow(ROW, "Standard1", "col95", "", true, 0, 2); - cf = result.getColumnFamily("Standard1"); + cf = cfStore.getColumnFamily(ROW, new QueryPath("Standard1"), "col95", "", true, 0, 2); assertColumns(cf); - result = table.getRow(ROW, "Standard1", "col0", "", false, 0, 2); - cf = result.getColumnFamily("Standard1"); + cf = cfStore.getColumnFamily(ROW, new QueryPath("Standard1"), "col0", "", false, 0, 2); assertColumns(cf); } }; @@ -224,6 +221,7 @@ { // tests slicing against data from one row spread across two sstables final Table table = Table.open("Table1"); + final ColumnFamilyStore cfStore = table.getColumnFamilyStore("Standard1"); final String ROW = "row2"; Runner setup = new Runner() { @@ -239,7 +237,7 @@ cf.addColumn(new Column("col6", "val6".getBytes(), 1L)); rm.add(cf); rm.apply(); - table.getColumnFamilyStore("Standard1").forceBlockingFlush(); + cfStore.forceBlockingFlush(); rm = new RowMutation("Table1", ROW); cf = ColumnFamily.create("Table1", "Standard1"); @@ -255,15 +253,13 @@ { public void run() throws Exception { - Row result; - ColumnFamily cfres; + ColumnFamily cf; - result = table.getRow(ROW, "Standard1", "col2", "", true, 0, 3); - cfres = result.getColumnFamily("Standard1"); - assertColumns(cfres, "col2", "col3", "col4"); - assertEquals(new String(cfres.getColumn("col2").value()), "valx"); - assertEquals(new String(cfres.getColumn("col3").value()), "valx"); - assertEquals(new String(cfres.getColumn("col4").value()), "val4"); + cf = cfStore.getColumnFamily(ROW, new QueryPath("Standard1"), "col2", "", true, 0, 3); + assertColumns(cf, "col2", "col3", "col4"); + assertEquals(new String(cf.getColumn("col2").value()), "valx"); + assertEquals(new String(cf.getColumn("col3").value()), "valx"); + assertEquals(new String(cf.getColumn("col4").value()), "val4"); } }; @@ -275,6 +271,7 @@ { // tests slicing against 1000 columns in an sstable Table table = Table.open("Table1"); + ColumnFamilyStore cfStore = table.getColumnFamilyStore("Standard1"); String ROW = "row3"; RowMutation rm = new RowMutation("Table1", ROW); ColumnFamily cf = ColumnFamily.create("Table1", "Standard1"); @@ -282,51 +279,43 @@ cf.addColumn(new Column("col" + i, ("vvvvvvvvvvvvvvvv" + i).getBytes(), 1L)); rm.add(cf); rm.apply(); - table.getColumnFamilyStore("Standard1").forceBlockingFlush(); + cfStore.forceBlockingFlush(); - Row result; - ColumnFamily cfres; - result = table.getRow(ROW, "Standard1", "col1000", "", true, 0, 3); - cfres = result.getColumnFamily("Standard1"); - assertColumns(cfres, "col1000", "col1001", "col1002"); - assertEquals(new String(cfres.getColumn("col1000").value()), "vvvvvvvvvvvvvvvv1000"); - assertEquals(new String(cfres.getColumn("col1001").value()), "vvvvvvvvvvvvvvvv1001"); - assertEquals(new String(cfres.getColumn("col1002").value()), "vvvvvvvvvvvvvvvv1002"); - - result = table.getRow(ROW, "Standard1", "col1195", "", true, 0, 3); - cfres = result.getColumnFamily("Standard1"); - assertColumns(cfres, "col1195", "col1196", "col1197"); - assertEquals(new String(cfres.getColumn("col1195").value()), "vvvvvvvvvvvvvvvv1195"); - assertEquals(new String(cfres.getColumn("col1196").value()), "vvvvvvvvvvvvvvvv1196"); - assertEquals(new String(cfres.getColumn("col1197").value()), "vvvvvvvvvvvvvvvv1197"); - - result = table.getRow(ROW, "Standard1", "col1195", "", true, 10, 3); - cfres = result.getColumnFamily("Standard1"); - assertColumns(cfres, "col1205", "col1206", "col1207"); - assertEquals(new String(cfres.getColumn("col1205").value()), "vvvvvvvvvvvvvvvv1205"); - assertEquals(new String(cfres.getColumn("col1206").value()), "vvvvvvvvvvvvvvvv1206"); - assertEquals(new String(cfres.getColumn("col1207").value()), "vvvvvvvvvvvvvvvv1207"); - - result = table.getRow(ROW, "Standard1", "col1196", "", false, 0, 3); - cfres = result.getColumnFamily("Standard1"); - assertColumns(cfres, "col1194", "col1195", "col1196"); - assertEquals(new String(cfres.getColumn("col1194").value()), "vvvvvvvvvvvvvvvv1194"); - assertEquals(new String(cfres.getColumn("col1195").value()), "vvvvvvvvvvvvvvvv1195"); - assertEquals(new String(cfres.getColumn("col1196").value()), "vvvvvvvvvvvvvvvv1196"); - - result = table.getRow(ROW, "Standard1", "col1196", "", false, 10, 3); - cfres = result.getColumnFamily("Standard1"); - assertColumns(cfres, "col1184", "col1185", "col1186"); - assertEquals(new String(cfres.getColumn("col1184").value()), "vvvvvvvvvvvvvvvv1184"); - assertEquals(new String(cfres.getColumn("col1185").value()), "vvvvvvvvvvvvvvvv1185"); - assertEquals(new String(cfres.getColumn("col1186").value()), "vvvvvvvvvvvvvvvv1186"); - - result = table.getRow(ROW, "Standard1", "col1990", "", true, 0, 3); - cfres = result.getColumnFamily("Standard1"); - assertColumns(cfres, "col1990", "col1991", "col1992"); - assertEquals(new String(cfres.getColumn("col1990").value()), "vvvvvvvvvvvvvvvv1990"); - assertEquals(new String(cfres.getColumn("col1991").value()), "vvvvvvvvvvvvvvvv1991"); - assertEquals(new String(cfres.getColumn("col1992").value()), "vvvvvvvvvvvvvvvv1992"); + cf = cfStore.getColumnFamily(ROW, new QueryPath("Standard1"), "col1000", "", true, 0, 3); + assertColumns(cf, "col1000", "col1001", "col1002"); + assertEquals(new String(cf.getColumn("col1000").value()), "vvvvvvvvvvvvvvvv1000"); + assertEquals(new String(cf.getColumn("col1001").value()), "vvvvvvvvvvvvvvvv1001"); + assertEquals(new String(cf.getColumn("col1002").value()), "vvvvvvvvvvvvvvvv1002"); + + cf = cfStore.getColumnFamily(ROW, new QueryPath("Standard1"), "col1195", "", true, 0, 3); + assertColumns(cf, "col1195", "col1196", "col1197"); + assertEquals(new String(cf.getColumn("col1195").value()), "vvvvvvvvvvvvvvvv1195"); + assertEquals(new String(cf.getColumn("col1196").value()), "vvvvvvvvvvvvvvvv1196"); + assertEquals(new String(cf.getColumn("col1197").value()), "vvvvvvvvvvvvvvvv1197"); + + cf = cfStore.getColumnFamily(ROW, new QueryPath("Standard1"), "col1195", "", true, 10, 3); + assertColumns(cf, "col1205", "col1206", "col1207"); + assertEquals(new String(cf.getColumn("col1205").value()), "vvvvvvvvvvvvvvvv1205"); + assertEquals(new String(cf.getColumn("col1206").value()), "vvvvvvvvvvvvvvvv1206"); + assertEquals(new String(cf.getColumn("col1207").value()), "vvvvvvvvvvvvvvvv1207"); + + cf = cfStore.getColumnFamily(ROW, new QueryPath("Standard1"), "col1196", "", false, 0, 3); + assertColumns(cf, "col1194", "col1195", "col1196"); + assertEquals(new String(cf.getColumn("col1194").value()), "vvvvvvvvvvvvvvvv1194"); + assertEquals(new String(cf.getColumn("col1195").value()), "vvvvvvvvvvvvvvvv1195"); + assertEquals(new String(cf.getColumn("col1196").value()), "vvvvvvvvvvvvvvvv1196"); + + cf = cfStore.getColumnFamily(ROW, new QueryPath("Standard1"), "col1196", "", false, 10, 3); + assertColumns(cf, "col1184", "col1185", "col1186"); + assertEquals(new String(cf.getColumn("col1184").value()), "vvvvvvvvvvvvvvvv1184"); + assertEquals(new String(cf.getColumn("col1185").value()), "vvvvvvvvvvvvvvvv1185"); + assertEquals(new String(cf.getColumn("col1186").value()), "vvvvvvvvvvvvvvvv1186"); + + cf = cfStore.getColumnFamily(ROW, new QueryPath("Standard1"), "col1990", "", true, 0, 3); + assertColumns(cf, "col1990", "col1991", "col1992"); + assertEquals(new String(cf.getColumn("col1990").value()), "vvvvvvvvvvvvvvvv1990"); + assertEquals(new String(cf.getColumn("col1991").value()), "vvvvvvvvvvvvvvvv1991"); + assertEquals(new String(cf.getColumn("col1992").value()), "vvvvvvvvvvvvvvvv1992"); } @Test @@ -334,6 +323,7 @@ { // tests slicing against data from one row spread across two sstables final Table table = Table.open("Table1"); + final ColumnFamilyStore cfStore = table.getColumnFamilyStore("Super1"); final String ROW = "row2"; Runner setup = new Runner() { @@ -353,13 +343,9 @@ { public void run() throws Exception { - Row result; - ColumnFamily cfres; - - result = table.getRow(ROW, "Super1", "", "", true, 0, 10); - cfres = result.getColumnFamily("Super1"); - assertColumns(cfres, "sc1"); - assertEquals(new String(cfres.getColumn("sc1").getSubColumn("col1").value()), "val1"); + ColumnFamily cf = cfStore.getColumnFamily(ROW, new QueryPath("Super1"), "", "", true, 0, 10); + assertColumns(cf, "sc1"); + assertEquals(new String(cf.getColumn("sc1").getSubColumn("col1").value()), "val1"); } }; Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TimeSortTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TimeSortTest.java?rev=794429&r1=794428&r2=794429&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TimeSortTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TimeSortTest.java Wed Jul 15 22:04:43 2009 @@ -27,6 +27,7 @@ import org.junit.Test; import org.apache.cassandra.CleanupHelper; +import org.apache.cassandra.db.filter.QueryPath; public class TimeSortTest extends CleanupHelper { @@ -34,20 +35,19 @@ public void testMixedSources() throws IOException, ExecutionException, InterruptedException { Table table = Table.open("Table1"); + ColumnFamilyStore cfStore = table.getColumnFamilyStore("StandardByTime1"); RowMutation rm; rm = new RowMutation("Table1", "key0"); - rm.add("StandardByTime1:C0", "a".getBytes(), 100); + rm.add(new QueryPath("StandardByTime1", null, "C0"), "a".getBytes(), 100); rm.apply(); - table.getColumnFamilyStore("StandardByTime1").forceBlockingFlush(); + cfStore.forceBlockingFlush(); rm = new RowMutation("Table1", "key0"); - rm.add("StandardByTime1:C1", "b".getBytes(), 0); + rm.add(new QueryPath("StandardByTime1", null, "C1"), "b".getBytes(), 0); rm.apply(); - Row row = table.getRow("key0", "StandardByTime1", 10); - assert !row.isEmpty(); - ColumnFamily cf = row.getColumnFamilies().iterator().next(); + ColumnFamily cf = cfStore.getColumnFamily("key0", new QueryPath("StandardByTime1"), 10); SortedSet<IColumn> columns = cf.getAllColumns(); assert columns.size() == 1; } @@ -56,6 +56,7 @@ public void testTimeSort() throws IOException, ExecutionException, InterruptedException { Table table = Table.open("Table1"); + ColumnFamilyStore cfStore = table.getColumnFamilyStore("StandardByTime1"); for (int i = 900; i < 1000; ++i) { @@ -64,14 +65,14 @@ for (int j = 0; j < 8; ++j) { byte[] bytes = j % 2 == 0 ? "a".getBytes() : "b".getBytes(); - rm.add("StandardByTime1:" + "Column-" + j, bytes, j * 2); + rm.add(new QueryPath("StandardByTime1", null, "Column-" + j), bytes, j * 2); } rm.apply(); } validateTimeSort(table); - table.getColumnFamilyStore("StandardByTime1").forceBlockingFlush(); + cfStore.forceBlockingFlush(); validateTimeSort(table); // interleave some new data to test memtable + sstable @@ -79,18 +80,18 @@ RowMutation rm = new RowMutation("Table1", key); for (int j = 0; j < 4; ++j) { - rm.add("StandardByTime1:" + "Column+" + j, ArrayUtils.EMPTY_BYTE_ARRAY, j * 2 + 1); + rm.add(new QueryPath("StandardByTime1", null, "Column+" + j), ArrayUtils.EMPTY_BYTE_ARRAY, j * 2 + 1); } rm.apply(); // and some overwrites rm = new RowMutation("Table1", key); for (int j = 4; j < 8; ++j) { - rm.add("StandardByTime1:" + "Column-" + j, ArrayUtils.EMPTY_BYTE_ARRAY, j * 3); + rm.add(new QueryPath("StandardByTime1", null, "Column-" + j), ArrayUtils.EMPTY_BYTE_ARRAY, j * 3); } rm.apply(); // verify - ColumnFamily cf = table.getRow(key, "StandardByTime1", 0).getColumnFamilies().iterator().next(); + ColumnFamily cf = cfStore.getColumnFamily(key, new QueryPath("StandardByTime1"), 0); SortedSet<IColumn> columns = cf.getAllColumns(); assert columns.size() == 12; Iterator<IColumn> iter = columns.iterator(); @@ -118,7 +119,7 @@ String key = Integer.toString(i); for (int j = 0; j < 8; j += 3) { - ColumnFamily cf = table.getRow(key, "StandardByTime1", j * 2).getColumnFamilies().iterator().next(); + ColumnFamily cf = table.getColumnFamilyStore("StandardByTime1").getColumnFamily(key, new QueryPath("StandardByTime1"), j * 2); SortedSet<IColumn> columns = cf.getAllColumns(); assert columns.size() == 8 - j; int k = 7; Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/CassandraServerTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/CassandraServerTest.java?rev=794429&r1=794428&r2=794429&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/CassandraServerTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/CassandraServerTest.java Wed Jul 15 22:04:43 2009 @@ -31,27 +31,27 @@ server.start(); try { - column_t c1 = new column_t("c1", "0", 0L); - column_t c2 = new column_t("c2", "0", 0L); - List<column_t> columns = new ArrayList<column_t>(); + Column c1 = new Column("c1", "0", 0L); + Column c2 = new Column("c2", "0", 0L); + List<Column> columns = new ArrayList<Column>(); columns.add(c1); columns.add(c2); - Map<String, List<column_t>> cfmap = new HashMap<String, List<column_t>>(); + Map<String, List<Column>> cfmap = new HashMap<String, List<Column>>(); cfmap.put("Standard1", columns); cfmap.put("Standard2", columns); - batch_mutation_t m = new batch_mutation_t("Table1", "key1", cfmap); + BatchMutation m = new BatchMutation("Table1", "key1", cfmap); server.batch_insert(m, 1); - column_t column; + Column column; column = server.get_column("Table1", "key1", "Standard1:c2"); assert column.value.equals("0"); column = server.get_column("Table1", "key1", "Standard2:c2"); assert column.value.equals("0"); - ArrayList<column_t> column_ts = server.get_slice_strong("Table1", "key1", "Standard1", -1, -1); - assert column_ts.size() == 2; + ArrayList<Column> Columns = server.get_slice_strong("Table1", "key1", "Standard1", -1, -1); + assert Columns.size() == 2; } finally { server.shutdown(); }
