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 B2EDA17CF1 for ; Fri, 7 Nov 2014 18:37:18 +0000 (UTC) Received: (qmail 27983 invoked by uid 500); 7 Nov 2014 18:37:18 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 27870 invoked by uid 500); 7 Nov 2014 18:37:18 -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 27612 invoked by uid 99); 7 Nov 2014 18:37:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Nov 2014 18:37:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1F25C98B9A5; Fri, 7 Nov 2014 18:37:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Fri, 07 Nov 2014 18:37:20 -0000 Message-Id: In-Reply-To: <227e2031179945cba150b414cdae9a8e@git.apache.org> References: <227e2031179945cba150b414cdae9a8e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] cassandra git commit: Add schema_usertypes cleanup to SystemKeyspace#finishStartup() Add schema_usertypes cleanup to SystemKeyspace#finishStartup() Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7920ebeb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7920ebeb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7920ebeb Branch: refs/heads/trunk Commit: 7920ebebe2640ffb59225b7d32d5d818ce76dd12 Parents: 6d2d60a Author: Aleksey Yeschenko Authored: Fri Nov 7 21:36:40 2014 +0300 Committer: Aleksey Yeschenko Committed: Fri Nov 7 21:36:40 2014 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/SystemKeyspace.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7920ebeb/src/java/org/apache/cassandra/db/SystemKeyspace.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java b/src/java/org/apache/cassandra/db/SystemKeyspace.java index 02a9530..2a3535a 100644 --- a/src/java/org/apache/cassandra/db/SystemKeyspace.java +++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java @@ -120,7 +120,8 @@ public class SystemKeyspace for (String cfname : Arrays.asList(SystemKeyspace.SCHEMA_KEYSPACES_CF, SystemKeyspace.SCHEMA_COLUMNFAMILIES_CF, SystemKeyspace.SCHEMA_COLUMNS_CF, - SystemKeyspace.SCHEMA_TRIGGERS_CF)) + SystemKeyspace.SCHEMA_TRIGGERS_CF, + SystemKeyspace.SCHEMA_USER_TYPES_CF)) executeOnceInternal(String.format("DELETE FROM system.%s WHERE keyspace_name = ?", cfname), ksmd.name); // (+1 to timestamp to make sure we don't get shadowed by the tombstones we just added)