Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ABAC3F041 for ; Thu, 11 Apr 2013 16:23:17 +0000 (UTC) Received: (qmail 22113 invoked by uid 500); 11 Apr 2013 16:23:17 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 22061 invoked by uid 500); 11 Apr 2013 16:23:17 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 21925 invoked by uid 99); 11 Apr 2013 16:23:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Apr 2013 16:23:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0688A880A53; Thu, 11 Apr 2013 16:23:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Message-Id: <04c8ced03faf4f60b37162e8f0900f09@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: fix merge failure Date: Thu, 11 Apr 2013 16:23:16 +0000 (UTC) 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 Authored: Thu Apr 11 11:23:08 2013 -0500 Committer: Yuki Morishita 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)));