Author: jbellis
Date: Sat Dec 11 06:26:45 2010
New Revision: 1044570
URL: http://svn.apache.org/viewvc?rev=1044570&view=rev
Log:
make NameSortTest fast to make Hudson quit bitching
patch by jbellis
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/RowMutation.java
cassandra/branches/cassandra-0.7/test/conf/cassandra.yaml
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/db/NameSortTest.java
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/RowMutation.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/RowMutation.java?rev=1044570&r1=1044569&r2=1044570&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/RowMutation.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/RowMutation.java
Sat Dec 11 06:26:45 2010
@@ -197,6 +197,11 @@ public class RowMutation
Table.open(table_).apply(this, getSerializedBuffer(), true);
}
+ public void applyUnsafe() throws IOException
+ {
+ Table.open(table_).apply(this, getSerializedBuffer(), false);
+ }
+
/*
* This is equivalent to calling commit. Applies the changes to
* to the table that is obtained by calling Table.open().
Modified: cassandra/branches/cassandra-0.7/test/conf/cassandra.yaml
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/test/conf/cassandra.yaml?rev=1044570&r1=1044569&r2=1044570&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/test/conf/cassandra.yaml (original)
+++ cassandra/branches/cassandra-0.7/test/conf/cassandra.yaml Sat Dec 11
06:26:45 2010
@@ -4,8 +4,8 @@
#
cluster_name: Test Cluster
in_memory_compaction_limit_in_mb: 1
-commitlog_sync: batch
-commitlog_sync_batch_window_in_ms: 1.0
+commitlog_sync: periodic
+commitlog_sync_period_in_ms: 10000
partitioner: org.apache.cassandra.dht.CollatingOrderPreservingPartitioner
rpc_timeout_in_ms: 5000
listen_address: 127.0.0.1
Modified:
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/db/NameSortTest.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/db/NameSortTest.java?rev=1044570&r1=1044569&r2=1044570&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/db/NameSortTest.java
(original)
+++
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/db/NameSortTest.java
Sat Dec 11 06:26:45 2010
@@ -20,6 +20,7 @@ package org.apache.cassandra.db;
import static junit.framework.Assert.assertEquals;
import static org.apache.cassandra.Util.addMutation;
+import static org.apache.cassandra.Util.column;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -28,7 +29,10 @@ import java.util.concurrent.ExecutionExc
import org.apache.cassandra.CleanupHelper;
import org.apache.cassandra.Util;
+import org.apache.cassandra.db.commitlog.CommitLog;
import org.apache.cassandra.db.filter.QueryPath;
+import org.apache.cassandra.utils.ByteBufferUtil;
+
import org.junit.Test;
public class NameSortTest extends CleanupHelper
@@ -69,7 +73,7 @@ public class NameSortTest extends Cleanu
ByteBuffer bytes = ByteBuffer.wrap(j % 2 == 0 ? "a".getBytes()
: "b".getBytes());
rm = new RowMutation("Keyspace1", key);
rm.add(new QueryPath("Standard1", null,
ByteBuffer.wrap(("Column-" + j).getBytes())), bytes, j);
- rm.apply();
+ rm.applyUnsafe();
}
// super
@@ -81,7 +85,7 @@ public class NameSortTest extends Cleanu
String value = (j + k) % 2 == 0 ? "a" : "b";
addMutation(rm, "Super1", "SuperColumn-" + j, k, value, k);
}
- rm.apply();
+ rm.applyUnsafe();
}
}
@@ -103,10 +107,10 @@ public class NameSortTest extends Cleanu
Collection<IColumn> columns = cf.getSortedColumns();
for (IColumn column : columns)
{
- int j = Integer.valueOf(new
String(column.name().array(),column.name().position(),column.name().remaining()).split("-")[1]);
+ String name = ByteBufferUtil.string(column.name());
+ int j = Integer.valueOf(name.substring(name.length() - 1));
byte[] bytes = j % 2 == 0 ? "a".getBytes() : "b".getBytes();
- assertEquals(new String(bytes), new
String(column.value().array(), column.value().position(), column
- .value().remaining()));
+ assertEquals(new String(bytes),
ByteBufferUtil.string(column.value()));
}
cf = Util.getColumnFamily(table, key, "Super1");
@@ -115,15 +119,14 @@ public class NameSortTest extends Cleanu
assert superColumns.size() == 8 : cf;
for (IColumn superColumn : superColumns)
{
- int j = Integer.valueOf(new
String(superColumn.name().array(),superColumn.name().position(),superColumn.name().remaining()).split("-")[1]);
+ int j =
Integer.valueOf(ByteBufferUtil.string(superColumn.name()).split("-")[1]);
Collection<IColumn> subColumns = superColumn.getSubColumns();
assert subColumns.size() == 4;
for (IColumn subColumn : subColumns)
{
long k =
subColumn.name().getLong(subColumn.name().position() +
subColumn.name().arrayOffset());
byte[] bytes = (j + k) % 2 == 0 ? "a".getBytes() :
"b".getBytes();
- assertEquals(new String(bytes), new
String(subColumn.value().array(), subColumn.value().position(),
- subColumn.value().remaining()));
+ assertEquals(new String(bytes),
ByteBufferUtil.string(subColumn.value()));
}
}
}
