Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id AD064200B35 for ; Tue, 5 Jul 2016 11:22:46 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id ABA3E160A60; Tue, 5 Jul 2016 09:22:46 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EFD29160A6F for ; Tue, 5 Jul 2016 11:22:45 +0200 (CEST) Received: (qmail 90402 invoked by uid 500); 5 Jul 2016 09:22:45 -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 90128 invoked by uid 99); 5 Jul 2016 09:22:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jul 2016 09:22:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B0F2CE07F6; Tue, 5 Jul 2016 09:22:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: samt@apache.org To: commits@cassandra.apache.org Date: Tue, 05 Jul 2016 09:22:45 -0000 Message-Id: <6223bfea413d4776adf731326003beaa@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] cassandra git commit: Various fixes to SASI tests archived-at: Tue, 05 Jul 2016 09:22:46 -0000 Various fixes to SASI tests Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for CASSANDRA-12130 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb0d1ca4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb0d1ca4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb0d1ca4 Branch: refs/heads/trunk Commit: cb0d1ca4514be44ddf65221b0d7cf75b026be2e8 Parents: 7107646 Author: Sam Tunnicliffe Authored: Mon Jul 4 14:45:32 2016 +0100 Committer: Sam Tunnicliffe Committed: Tue Jul 5 10:12:41 2016 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/index/sasi/SASIIndexTest.java | 4 ++-- .../io/sstable/format/SSTableFlushObserverTest.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb0d1ca4/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java index a27db74..46d1a3c 100644 --- a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java @@ -103,7 +103,7 @@ public class SASIIndexTest SchemaLoader.fullTextSearchSASICFMD(KS_NAME, FTS_CF_NAME)))); } - @After + @Before public void cleanUp() { Keyspace.open(KS_NAME).getColumnFamilyStore(CF_NAME).truncateBlocking(); @@ -1093,8 +1093,8 @@ public class SASIIndexTest Mutation rm = new Mutation(KS_NAME, decoratedKey(AsciiType.instance.decompose("key1"))); update(rm, new ArrayList() {{ - add(buildCell(firstName, AsciiType.instance.decompose("pavel"), System.currentTimeMillis())); add(buildCell(age, LongType.instance.decompose(26L), System.currentTimeMillis())); + add(buildCell(firstName, AsciiType.instance.decompose("pavel"), System.currentTimeMillis())); }}); rm.apply(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb0d1ca4/test/unit/org/apache/cassandra/io/sstable/format/SSTableFlushObserverTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/format/SSTableFlushObserverTest.java b/test/unit/org/apache/cassandra/io/sstable/format/SSTableFlushObserverTest.java index 27c76dd..dafad37 100644 --- a/test/unit/org/apache/cassandra/io/sstable/format/SSTableFlushObserverTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/format/SSTableFlushObserverTest.java @@ -100,22 +100,22 @@ public class SSTableFlushObserverTest final long now = System.currentTimeMillis(); ByteBuffer key = UTF8Type.instance.fromString("key1"); - expected.putAll(key, Arrays.asList(BufferCell.live(getColumn(cfm, "first_name"), now,UTF8Type.instance.fromString("jack")), - BufferCell.live(getColumn(cfm, "age"), now, Int32Type.instance.decompose(27)), + expected.putAll(key, Arrays.asList(BufferCell.live(getColumn(cfm, "age"), now, Int32Type.instance.decompose(27)), + BufferCell.live(getColumn(cfm, "first_name"), now,UTF8Type.instance.fromString("jack")), BufferCell.live(getColumn(cfm, "height"), now, LongType.instance.decompose(183L)))); writer.append(new RowIterator(cfm, key.duplicate(), Collections.singletonList(buildRow(expected.get(key))))); key = UTF8Type.instance.fromString("key2"); - expected.putAll(key, Arrays.asList(BufferCell.live(getColumn(cfm, "first_name"), now,UTF8Type.instance.fromString("jim")), - BufferCell.live(getColumn(cfm, "age"), now, Int32Type.instance.decompose(30)), + expected.putAll(key, Arrays.asList(BufferCell.live(getColumn(cfm, "age"), now, Int32Type.instance.decompose(30)), + BufferCell.live(getColumn(cfm, "first_name"), now,UTF8Type.instance.fromString("jim")), BufferCell.live(getColumn(cfm, "height"), now, LongType.instance.decompose(180L)))); writer.append(new RowIterator(cfm, key, Collections.singletonList(buildRow(expected.get(key))))); key = UTF8Type.instance.fromString("key3"); - expected.putAll(key, Arrays.asList(BufferCell.live(getColumn(cfm, "first_name"), now,UTF8Type.instance.fromString("ken")), - BufferCell.live(getColumn(cfm, "age"), now, Int32Type.instance.decompose(30)), + expected.putAll(key, Arrays.asList(BufferCell.live(getColumn(cfm, "age"), now, Int32Type.instance.decompose(30)), + BufferCell.live(getColumn(cfm, "first_name"), now,UTF8Type.instance.fromString("ken")), BufferCell.live(getColumn(cfm, "height"), now, LongType.instance.decompose(178L)))); writer.append(new RowIterator(cfm, key, Collections.singletonList(buildRow(expected.get(key)))));