You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/08/07 18:24:42 UTC
svn commit: r802077 -
/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java
Author: jbellis
Date: Fri Aug 7 16:24:41 2009
New Revision: 802077
URL: http://svn.apache.org/viewvc?rev=802077&view=rev
Log:
inline excessively abstracted reTest setup
patch by jbellis; reviewed by Jun Rao for CASSANDRA-351
Modified:
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java
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=802077&r1=802076&r2=802077&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 Fri Aug 7 16:24:41 2009
@@ -47,9 +47,8 @@
public void run() throws Exception;
}
- private void reTest(Runner setup, ColumnFamilyStore cfs, Runner verify) throws Exception
+ private void reTest(ColumnFamilyStore cfs, Runner verify) throws Exception
{
- setup.run();
verify.run();
cfs.forceBlockingFlush();
verify.run();
@@ -68,14 +67,12 @@
final Table table = Table.open("Keyspace2");
final ColumnFamilyStore cfStore = table.getColumnFamilyStore("Standard3");
- Runner setup = new Runner()
- {
- public void run() throws Exception
- {
- RowMutation rm = makeSimpleRowMutation();
- rm.apply();
- }
- };
+ RowMutation rm = new RowMutation("Keyspace2", TEST_KEY);
+ ColumnFamily cf = ColumnFamily.create("Keyspace2", "Standard3");
+ cf.addColumn(column("col1","val1", 1L));
+ rm.add(cf);
+ rm.apply();
+
Runner verify = new Runner()
{
public void run() throws Exception
@@ -89,7 +86,7 @@
assertColumns(cf);
}
};
- reTest(setup, table.getColumnFamilyStore("Standard3"), verify);
+ reTest(table.getColumnFamilyStore("Standard3"), verify);
}
@Test
@@ -98,14 +95,14 @@
final Table table = Table.open("Keyspace1");
final ColumnFamilyStore cfStore = table.getColumnFamilyStore("Standard1");
- Runner setup = new Runner()
- {
- public void run() throws Exception
- {
- RowMutation rm = makeSimpleRowMutation();
- rm.apply();
- }
- };
+ RowMutation rm = new RowMutation("Keyspace1", TEST_KEY);
+ ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
+ cf.addColumn(column("col1","val1", 1L));
+ cf.addColumn(column("col2","val2", 1L));
+ cf.addColumn(column("col3","val3", 1L));
+ rm.add(cf);
+ rm.apply();
+
Runner verify = new Runner()
{
public void run() throws Exception
@@ -119,7 +116,7 @@
assertColumns(cf, "col3");
}
};
- reTest(setup, table.getColumnFamilyStore("Standard1"), verify);
+ reTest(table.getColumnFamilyStore("Standard1"), verify);
}
@Test
@@ -150,17 +147,6 @@
assertNull(cf);
}
- private RowMutation makeSimpleRowMutation()
- {
- RowMutation rm = new RowMutation("Keyspace1", TEST_KEY);
- ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
- cf.addColumn(column("col1","val1", 1L));
- cf.addColumn(column("col2","val2", 1L));
- cf.addColumn(column("col3","val3", 1L));
- rm.add(cf);
- return rm;
- }
-
@Test
public void testGetSliceNoMatch() throws Throwable
{
@@ -202,26 +188,21 @@
final Table table = Table.open("Keyspace1");
final ColumnFamilyStore cfStore = table.getColumnFamilyStore("Standard1");
final String ROW = "row1";
- Runner setup = new Runner()
- {
- public void run() throws Exception
- {
- RowMutation rm = new RowMutation("Keyspace1", ROW);
- ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
- cf.addColumn(column("col1", "val1", 1L));
- cf.addColumn(column("col3", "val3", 1L));
- cf.addColumn(column("col4", "val4", 1L));
- cf.addColumn(column("col5", "val5", 1L));
- cf.addColumn(column("col7", "val7", 1L));
- cf.addColumn(column("col9", "val9", 1L));
- rm.add(cf);
- rm.apply();
-
- rm = new RowMutation("Keyspace1", ROW);
- rm.delete(new QueryPath("Standard1", null, "col4".getBytes()), 2L);
- rm.apply();
- }
- };
+
+ RowMutation rm = new RowMutation("Keyspace1", ROW);
+ ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
+ cf.addColumn(column("col1", "val1", 1L));
+ cf.addColumn(column("col3", "val3", 1L));
+ cf.addColumn(column("col4", "val4", 1L));
+ cf.addColumn(column("col5", "val5", 1L));
+ cf.addColumn(column("col7", "val7", 1L));
+ cf.addColumn(column("col9", "val9", 1L));
+ rm.add(cf);
+ rm.apply();
+
+ rm = new RowMutation("Keyspace1", ROW);
+ rm.delete(new QueryPath("Standard1", null, "col4".getBytes()), 2L);
+ rm.apply();
Runner verify = new Runner()
{
@@ -253,7 +234,7 @@
}
};
- reTest(setup, table.getColumnFamilyStore("Standard1"), verify);
+ reTest(table.getColumnFamilyStore("Standard1"), verify);
}
@Test
@@ -263,31 +244,26 @@
final Table table = Table.open("Keyspace1");
final ColumnFamilyStore cfStore = table.getColumnFamilyStore("Standard1");
final String ROW = "row2";
- Runner setup = new Runner()
- {
- public void run() throws Exception
- {
- RowMutation rm = new RowMutation("Keyspace1", ROW);
- ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
- cf.addColumn(column("col1", "val1", 1L));
- cf.addColumn(column("col2", "val2", 1L));
- cf.addColumn(column("col3", "val3", 1L));
- cf.addColumn(column("col4", "val4", 1L));
- cf.addColumn(column("col5", "val5", 1L));
- cf.addColumn(column("col6", "val6", 1L));
- rm.add(cf);
- rm.apply();
- cfStore.forceBlockingFlush();
-
- rm = new RowMutation("Keyspace1", ROW);
- cf = ColumnFamily.create("Keyspace1", "Standard1");
- cf.addColumn(column("col1", "valx", 2L));
- cf.addColumn(column("col2", "valx", 2L));
- cf.addColumn(column("col3", "valx", 2L));
- rm.add(cf);
- rm.apply();
- }
- };
+
+ RowMutation rm = new RowMutation("Keyspace1", ROW);
+ ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
+ cf.addColumn(column("col1", "val1", 1L));
+ cf.addColumn(column("col2", "val2", 1L));
+ cf.addColumn(column("col3", "val3", 1L));
+ cf.addColumn(column("col4", "val4", 1L));
+ cf.addColumn(column("col5", "val5", 1L));
+ cf.addColumn(column("col6", "val6", 1L));
+ rm.add(cf);
+ rm.apply();
+ cfStore.forceBlockingFlush();
+
+ rm = new RowMutation("Keyspace1", ROW);
+ cf = ColumnFamily.create("Keyspace1", "Standard1");
+ cf.addColumn(column("col1", "valx", 2L));
+ cf.addColumn(column("col2", "valx", 2L));
+ cf.addColumn(column("col3", "valx", 2L));
+ rm.add(cf);
+ rm.apply();
Runner verify = new Runner()
{
@@ -303,7 +279,7 @@
}
};
- reTest(setup, table.getColumnFamilyStore("Standard1"), verify);
+ reTest(table.getColumnFamilyStore("Standard1"), verify);
}
@Test
@@ -385,19 +361,14 @@
final Table table = Table.open("Keyspace1");
final ColumnFamilyStore cfStore = table.getColumnFamilyStore("Super1");
final String ROW = "row2";
- Runner setup = new Runner()
- {
- public void run() throws Exception
- {
- RowMutation rm = new RowMutation("Keyspace1", ROW);
- ColumnFamily cf = ColumnFamily.create("Keyspace1", "Super1");
- SuperColumn sc = new SuperColumn("sc1".getBytes(), new LongType());
- sc.addColumn(new Column(getBytes(1), "val1".getBytes(), 1L));
- cf.addColumn(sc);
- rm.add(cf);
- rm.apply();
- }
- };
+
+ RowMutation rm = new RowMutation("Keyspace1", ROW);
+ ColumnFamily cf = ColumnFamily.create("Keyspace1", "Super1");
+ SuperColumn sc = new SuperColumn("sc1".getBytes(), new LongType());
+ sc.addColumn(new Column(getBytes(1), "val1".getBytes(), 1L));
+ cf.addColumn(sc);
+ rm.add(cf);
+ rm.apply();
Runner verify = new Runner()
{
@@ -409,7 +380,7 @@
}
};
- reTest(setup, table.getColumnFamilyStore("Standard1"), verify);
+ reTest(table.getColumnFamilyStore("Standard1"), verify);
}
public static void assertColumns(ColumnFamily cf, String... columnNames)