Repository: cassandra Updated Branches: refs/heads/trunk 3648549a9 -> b743eabd7
Fix failing unit tests (bad CASSANDRA-7744 merge) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/508db1e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/508db1e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/508db1e9 Branch: refs/heads/trunk Commit: 508db1e9ddfac1abb49cf29a5e6618fba4aab275 Parents: 35cfa61 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Aug 23 01:04:09 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Aug 23 01:04:09 2014 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/CFMetaData.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/508db1e9/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 51f9b99..70cd648 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -2020,9 +2020,12 @@ public final class CFMetaData public CFMetaData rebuild() { + if (isDense == null) + setDense(isDense(comparator.asAbstractType(), allColumns())); + List<ColumnDefinition> pkCols = nullInitializedList(keyValidator.componentsCount()); List<ColumnDefinition> ckCols = nullInitializedList(comparator.clusteringPrefixSize()); - // We keep things sorted to get consistent/predicatable order in select queries + // We keep things sorted to get consistent/predictable order in select queries SortedSet<ColumnDefinition> regCols = new TreeSet<>(regularColumnComparator); SortedSet<ColumnDefinition> statCols = new TreeSet<>(regularColumnComparator); ColumnDefinition compactCol = null;
