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 93176200BB1 for ; Thu, 20 Oct 2016 03:22:38 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 91AF1160AFE; Thu, 20 Oct 2016 01:22:38 +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 DA985160AEA for ; Thu, 20 Oct 2016 03:22:37 +0200 (CEST) Received: (qmail 77463 invoked by uid 500); 20 Oct 2016 01:22:36 -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 77136 invoked by uid 99); 20 Oct 2016 01:22:36 -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; Thu, 20 Oct 2016 01:22:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9A456E0A59; Thu, 20 Oct 2016 01:22:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stefania@apache.org To: commits@cassandra.apache.org Date: Thu, 20 Oct 2016 01:22:38 -0000 Message-Id: <0cf87c16bc824659a505c3a8f6cee8db@git.apache.org> In-Reply-To: <968006016a914c7da3c45b1b8acb9520@git.apache.org> References: <968006016a914c7da3c45b1b8acb9520@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/6] cassandra git commit: Backport of "Fix test broken after second pass of CASSANDRA-11803 changes" from 3.X to 3.0 archived-at: Thu, 20 Oct 2016 01:22:38 -0000 Backport of "Fix test broken after second pass of CASSANDRA-11803 changes" from 3.X to 3.0 Patch by Alex Petrov; reviewed by Carl Yeksigian for CASSANDRA-11803 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/55568c17 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55568c17 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55568c17 Branch: refs/heads/trunk Commit: 55568c17d6100cedc77747dfe1ad05a40191216b Parents: 250b5c1 Author: Alex Petrov Authored: Wed Oct 19 08:32:49 2016 +0200 Committer: Stefania Alborghetti Committed: Thu Oct 20 09:20:11 2016 +0800 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStoreCQLHelperTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/55568c17/test/unit/org/apache/cassandra/db/ColumnFamilyStoreCQLHelperTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreCQLHelperTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreCQLHelperTest.java index fdcc99c..c2e5cb7 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreCQLHelperTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreCQLHelperTest.java @@ -635,10 +635,10 @@ public class ColumnFamilyStoreCQLHelperTest extends CQLTester assertTrue(ColumnFamilyStoreCQLHelper.getCFMetadataAsCQL(cfs.metadata, true).startsWith( "CREATE TABLE IF NOT EXISTS " + DYNAMIC_COMPOSITE + "." + DYNAMIC_COMPOSITE + " (\n" + - "\t\"key\" ascii,\n" + + "\tkey ascii,\n" + "\tcols 'org.apache.cassandra.db.marshal.DynamicCompositeType(a=>org.apache.cassandra.db.marshal.BytesType,b=>org.apache.cassandra.db.marshal.BytesType,c=>org.apache.cassandra.db.marshal.BytesType)',\n" + "\tval ascii,\n" + - "\tPRIMARY KEY (\"key\", cols))\n" + + "\tPRIMARY KEY (key, cols))\n" + "\tWITH ID = " + cfs.metadata.cfId + "\n" + "\tAND COMPACT STORAGE")); }