You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2017/01/20 15:05:48 UTC
[3/3] cassandra git commit: Merge branch cassandra-3.11 into trunk
Merge branch cassandra-3.11 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d3704d8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3704d8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3704d8a
Branch: refs/heads/trunk
Commit: d3704d8a06927e234250463796fc515e2b14d2cb
Parents: d6da7b7 1a56dd0
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri Jan 20 16:03:30 2017 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri Jan 20 16:03:37 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/d3704d8a/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 097f29d,d0932ed..c8180f3
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -89,10 -90,12 +89,10 @@@ public final class CFMetaDat
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;
-
// non-final, for now
public volatile TableParams params = TableParams.DEFAULT;
@@@ -315,8 -320,13 +313,11 @@@
this.columnMetadata = newColumnMetadata;
+ List<AbstractType<?>> keyTypes = extractTypes(partitionKeyColumns);
+ this.keyValidator = keyTypes.size() == 1 ? keyTypes.get(0) : CompositeType.getInstance(keyTypes);
+
if (isCompactTable())
this.compactValueColumn = CompactTables.getCompactValueColumn(partitionColumns, isSuper());
-
- this.allColumnFilter = ColumnFilter.all(this);
}
public Indexes getIndexes()