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 CA8DC187B3 for ; Mon, 24 Aug 2015 15:12:06 +0000 (UTC) Received: (qmail 75255 invoked by uid 500); 24 Aug 2015 15:12:06 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 75222 invoked by uid 500); 24 Aug 2015 15:12:06 -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 75202 invoked by uid 99); 24 Aug 2015 15:12:06 -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; Mon, 24 Aug 2015 15:12:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7E6E1E060C; Mon, 24 Aug 2015 15:12:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snazy@apache.org To: commits@cassandra.apache.org Date: Mon, 24 Aug 2015 15:12:06 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cassandra git commit: SchemaKeyspace.addAggregateToSchemaMutation keeps previous on CREATE OR REPLACE AGGREGATE Repository: cassandra Updated Branches: refs/heads/trunk 640ecf354 -> 903a54d8a SchemaKeyspace.addAggregateToSchemaMutation keeps previous on CREATE OR REPLACE AGGREGATE patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-10157 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7ad1da56 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ad1da56 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ad1da56 Branch: refs/heads/trunk Commit: 7ad1da5678b3eca3383e3f70862d0a7728ec6be9 Parents: 707b2da Author: Robert Stupp Authored: Mon Aug 24 17:10:31 2015 +0200 Committer: Robert Stupp Committed: Mon Aug 24 17:10:31 2015 +0200 ---------------------------------------------------------------------- .../apache/cassandra/schema/SchemaKeyspace.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ad1da56/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java index acd9e93..2df4ca4 100644 --- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java +++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java @@ -1553,18 +1553,12 @@ public final class SchemaKeyspace .clustering(aggregate.name().name, functionSignatureWithTypes(aggregate)); adder.add("return_type", aggregate.returnType().toString()) - .add("state_func", aggregate.stateFunction().name().name); - - if (aggregate.stateType() != null) - adder.add("state_type", aggregate.stateType().toString()); - if (aggregate.finalFunction() != null) - adder.add("final_func", aggregate.finalFunction().name().name); - if (aggregate.initialCondition() != null) - adder.add("initcond", aggregate.initialCondition()); - - adder.frozenList("argument_types", aggregate.argTypes().stream().map(AbstractType::toString).collect(Collectors.toList())); - - adder.build(); + .add("state_func", aggregate.stateFunction().name().name) + .add("state_type", aggregate.stateType() != null ? aggregate.stateType().toString() : null) + .add("final_func", aggregate.finalFunction() != null ? aggregate.finalFunction().name().name : null) + .add("initcond", aggregate.initialCondition()) + .frozenList("argument_types", aggregate.argTypes().stream().map(AbstractType::toString).collect(Collectors.toList())) + .build(); } private static Collection createAggregatesFromAggregatesPartition(RowIterator partition)