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 EAFCB17AC4 for ; Thu, 2 Oct 2014 11:13:58 +0000 (UTC) Received: (qmail 77265 invoked by uid 500); 2 Oct 2014 11:13:58 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 77135 invoked by uid 500); 2 Oct 2014 11:13:58 -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 77098 invoked by uid 99); 2 Oct 2014 11:13:58 -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, 02 Oct 2014 11:13:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 447BFA121D4; Thu, 2 Oct 2014 11:13:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Thu, 02 Oct 2014 11:13:59 -0000 Message-Id: <856d96b39f83488b8aa0f72f1e9aa13b@git.apache.org> In-Reply-To: <01b136ca76034a2783fbe2817ce44f73@git.apache.org> References: <01b136ca76034a2783fbe2817ce44f73@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bb8f14a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bb8f14a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bb8f14a Branch: refs/heads/trunk Commit: 4bb8f14a5b2e528bc3cb14810ee29e83072d507a Parents: 0db5074 1c39320 Author: Marcus Eriksson Authored: Thu Oct 2 11:49:10 2014 +0200 Committer: Marcus Eriksson Committed: Thu Oct 2 13:12:58 2014 +0200 ---------------------------------------------------------------------- .../cassandra/db/marshal/DynamicCompositeTypeTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bb8f14a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java index eaedb4b,e248eae..d36150a --- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java @@@ -214,8 -197,8 +214,8 @@@ public class DynamicCompositeTypeTes @Test public void testFullRoundReversed() throws Exception { -- Keyspace keyspace = Keyspace.open("Keyspace1"); -- ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfName); ++ Keyspace keyspace = Keyspace.open(KEYSPACE1); ++ ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF_STANDARDDYNCOMPOSITE); ByteBuffer cname1 = createDynamicCompositeKey("test1", null, -1, false, true); ByteBuffer cname2 = createDynamicCompositeKey("test1", uuids[0], 24, false, true); @@@ -224,7 -207,7 +224,7 @@@ ByteBuffer cname5 = createDynamicCompositeKey("test2", uuids[1], 42, false, true); ByteBuffer key = ByteBufferUtil.bytes("kr"); - RowMutation rm = new RowMutation("Keyspace1", key); - Mutation rm = new Mutation("Keyspace1", key); ++ Mutation rm = new Mutation(KEYSPACE1, key); addColumn(rm, cname5); addColumn(rm, cname1); addColumn(rm, cname4); @@@ -232,9 -215,9 +232,9 @@@ addColumn(rm, cname3); rm.apply(); -- ColumnFamily cf = cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk("kr"), cfName, System.currentTimeMillis())); ++ ColumnFamily cf = cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk("kr"), CF_STANDARDDYNCOMPOSITE, System.currentTimeMillis())); - Iterator iter = cf.getSortedColumns().iterator(); + Iterator iter = cf.getSortedColumns().iterator(); assert iter.next().name().equals(cname5); assert iter.next().name().equals(cname4);