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 70800200C02 for ; Fri, 20 Jan 2017 16:05:48 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6F44B160B58; Fri, 20 Jan 2017 15:05:48 +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 B5CD6160B39 for ; Fri, 20 Jan 2017 16:05:47 +0100 (CET) Received: (qmail 17408 invoked by uid 500); 20 Jan 2017 15:05:46 -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 17386 invoked by uid 99); 20 Jan 2017 15:05:46 -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; Fri, 20 Jan 2017 15:05:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB2FFDFA43; Fri, 20 Jan 2017 15:05:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blerer@apache.org To: commits@cassandra.apache.org Date: Fri, 20 Jan 2017 15:05:46 -0000 Message-Id: <3a7b98db4d48428594f8dd0975889d67@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] cassandra git commit: Follow up 12443 archived-at: Fri, 20 Jan 2017 15:05:48 -0000 Repository: cassandra Updated Branches: refs/heads/trunk d6da7b799 -> d3704d8a0 Follow up 12443 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f3b452c5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3b452c5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3b452c5 Branch: refs/heads/trunk Commit: f3b452c54dea0366436ebe2bceac747bdf599e90 Parents: 7a06df7 Author: Benjamin Lerer Authored: Fri Jan 20 15:53:34 2017 +0100 Committer: Benjamin Lerer Committed: Fri Jan 20 15:53:34 2017 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/CFMetaData.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3b452c5/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java index a3370dc..44f3a96 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -84,9 +84,9 @@ public final class CFMetaData private final boolean isView; private final boolean isIndex; - public final ClusteringComparator comparator; // bytes, long, timeuuid, utf8, etc. This is built directly from clusteringColumns + public volatile ClusteringComparator comparator; // bytes, long, timeuuid, utf8, etc. This is built directly from clusteringColumns public final IPartitioner partitioner; // partitioner the table uses - private final AbstractType keyValidator; + private volatile AbstractType keyValidator; private final Serializers serializers; @@ -285,10 +285,6 @@ public final class CFMetaData this.serializers = new Serializers(this); - this.comparator = new ClusteringComparator(extractTypes(clusteringColumns)); - List> keyTypes = extractTypes(partitionKeyColumns); - this.keyValidator = keyTypes.size() == 1 ? keyTypes.get(0) : CompositeType.getInstance(keyTypes); - rebuild(); } @@ -296,6 +292,8 @@ public final class CFMetaData // are kept because they are often useful in a different format. private void rebuild() { + this.comparator = new ClusteringComparator(extractTypes(clusteringColumns)); + Map newColumnMetadata = new HashMap<>(); for (ColumnDefinition def : partitionKeyColumns) newColumnMetadata.put(def.name.bytes, def); @@ -306,6 +304,9 @@ public final class CFMetaData this.columnMetadata = newColumnMetadata; + List> keyTypes = extractTypes(partitionKeyColumns); + this.keyValidator = keyTypes.size() == 1 ? keyTypes.get(0) : CompositeType.getInstance(keyTypes); + if (isCompactTable()) this.compactValueColumn = CompactTables.getCompactValueColumn(partitionColumns, isSuper()); }