Updated Branches: refs/heads/trunk 0aaf67a74 -> eba27a641
fix merge failure Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eba27a64 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eba27a64 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eba27a64 Branch: refs/heads/trunk Commit: eba27a641341878c08180c88814e33287ca8b05b Parents: 0aaf67a Author: Yuki Morishita <yu...@apache.org> Authored: Thu Apr 11 11:23:08 2013 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Apr 11 11:23:08 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnIndex.java | 1 - .../cassandra/streaming/StreamingTransferTest.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eba27a64/src/java/org/apache/cassandra/db/ColumnIndex.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnIndex.java b/src/java/org/apache/cassandra/db/ColumnIndex.java index daaac63..b523814 100644 --- a/src/java/org/apache/cassandra/db/ColumnIndex.java +++ b/src/java/org/apache/cassandra/db/ColumnIndex.java @@ -58,7 +58,6 @@ public class ColumnIndex public Builder(ColumnFamily cf, ByteBuffer key, - DataOutput output) DataOutput output, boolean fromStream) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/eba27a64/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java index 335f98c..e3d9b8a 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java @@ -146,8 +146,8 @@ public class StreamingTransferTest extends SchemaLoader String key = "key1"; RowMutation rm = new RowMutation(ks, ByteBufferUtil.bytes(key)); // add columns of size slightly less than column_index_size to force insert column index - rm.add(new QueryPath(cfname, null, ByteBufferUtil.bytes(1)), ByteBuffer.wrap(new byte[DatabaseDescriptor.getColumnIndexSize() - 64]), 2); - rm.add(new QueryPath(cfname, null, ByteBufferUtil.bytes(6)), ByteBuffer.wrap(new byte[DatabaseDescriptor.getColumnIndexSize()]), 2); + rm.add(cfname, ByteBufferUtil.bytes(1), ByteBuffer.wrap(new byte[DatabaseDescriptor.getColumnIndexSize() - 64]), 2); + rm.add(cfname, ByteBufferUtil.bytes(6), ByteBuffer.wrap(new byte[DatabaseDescriptor.getColumnIndexSize()]), 2); ColumnFamily cf = rm.addOrGet(cfname); // add RangeTombstones cf.delete(new DeletionInfo(ByteBufferUtil.bytes(2), ByteBufferUtil.bytes(3), cf.getComparator(), 1, (int) (System.currentTimeMillis() / 1000)));
