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:46 UTC
[1/3] cassandra git commit: Follow up 12443
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 <b....@gmail.com>
Authored: Fri Jan 20 15:53:34 2017 +0100
Committer: Benjamin Lerer <b....@gmail.com>
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<AbstractType<?>> 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<ByteBuffer, ColumnDefinition> 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<AbstractType<?>> keyTypes = extractTypes(partitionKeyColumns);
+ this.keyValidator = keyTypes.size() == 1 ? keyTypes.get(0) : CompositeType.getInstance(keyTypes);
+
if (isCompactTable())
this.compactValueColumn = CompactTables.getCompactValueColumn(partitionColumns, isSuper());
}
[3/3] cassandra git commit: Merge branch cassandra-3.11 into trunk
Posted by bl...@apache.org.
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()
[2/3] cassandra git commit: Merge branch cassandra-3.0 into
cassandra-3.11
Posted by bl...@apache.org.
Merge branch cassandra-3.0 into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a56dd06
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a56dd06
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a56dd06
Branch: refs/heads/trunk
Commit: 1a56dd063d8d032c33427013ff0e990f4e5b4760
Parents: e3d26b6 f3b452c
Author: Benjamin Lerer <b....@gmail.com>
Authored: Fri Jan 20 16:02:27 2017 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Fri Jan 20 16:02:27 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/1a56dd06/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 1d3bb3a,44f3a96..d0932ed
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -297,22 -283,18 +297,20 @@@ public final class CFMetaDat
this.clusteringColumns = clusteringColumns;
this.partitionColumns = partitionColumns;
- this.comparator = new ClusteringComparator(extractTypes(clusteringColumns));
- List<AbstractType<?>> keyTypes = extractTypes(partitionKeyColumns);
- this.keyValidator = keyTypes.size() == 1 ? keyTypes.get(0) : CompositeType.getInstance(keyTypes);
- this.serializers = new Serializers(this);
--
rebuild();
+
+ this.resource = DataResource.table(ksName, cfName);
+ this.serializers = new Serializers(this);
}
// This rebuild informations that are intrinsically duplicate of the table definition but
// are kept because they are often useful in a different format.
private void rebuild()
{
+ this.comparator = new ClusteringComparator(extractTypes(clusteringColumns));
+
- Map<ByteBuffer, ColumnDefinition> newColumnMetadata = new HashMap<>();
+ Map<ByteBuffer, ColumnDefinition> newColumnMetadata = Maps.newHashMapWithExpectedSize(partitionKeyColumns.size() + clusteringColumns.size() + partitionColumns.size());
+
for (ColumnDefinition def : partitionKeyColumns)
newColumnMetadata.put(def.name.bytes, def);
for (ColumnDefinition def : clusteringColumns)
@@@ -322,10 -304,11 +320,13 @@@
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()