cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdeggles...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Tue, 06 Nov 2018 20:01:19 GMT
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/7eecf891
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7eecf891
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7eecf891

Branch: refs/heads/cassandra-3.11
Commit: 7eecf891f5a12a0f74b69a9aa60a91f584235d0c
Parents: a6a9dce e04efab
Author: Blake Eggleston <bdeggleston@gmail.com>
Authored: Tue Nov 6 11:59:49 2018 -0800
Committer: Blake Eggleston <bdeggleston@gmail.com>
Committed: Tue Nov 6 11:59:49 2018 -0800

----------------------------------------------------------------------
 .../io/sstable/metadata/MetadataCollector.java    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7eecf891/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
index a618c96,437d80f..0ac5187
--- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
@@@ -273,8 -272,11 +274,11 @@@ public class MetadataCollector implemen
  
      public Map<MetadataType, MetadataComponent> finalizeMetadata(String partitioner,
double bloomFilterFPChance, long repairedAt, SerializationHeader header)
      {
-         Preconditions.checkState(comparator.compare(maxClustering, minClustering) >=
0);
+         Preconditions.checkState((minClustering == null && maxClustering == null)
+                                  || comparator.compare(maxClustering, minClustering) >=
0);
+         ByteBuffer[] minValues = minClustering != null ? minClustering.getRawValues() :
EMPTY_CLUSTERING;
+         ByteBuffer[] maxValues = maxClustering != null ? maxClustering.getRawValues() :
EMPTY_CLUSTERING;
 -        Map<MetadataType, MetadataComponent> components = Maps.newHashMap();
 +        Map<MetadataType, MetadataComponent> components = new EnumMap<>(MetadataType.class);
          components.put(MetadataType.VALIDATION, new ValidationMetadata(partitioner, bloomFilterFPChance));
          components.put(MetadataType.STATS, new StatsMetadata(estimatedPartitionSize,
                                                               estimatedCellPerPartitionCount,


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message