cassandra-commits mailing list archives

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

Branch: refs/heads/trunk
Commit: 51c8387deac074ee404eba0070016867253d90b1
Parents: 6ec4452 7eecf89
Author: Blake Eggleston <bdeggleston@gmail.com>
Authored: Tue Nov 6 12:00:06 2018 -0800
Committer: Blake Eggleston <bdeggleston@gmail.com>
Committed: Tue Nov 6 12:00:06 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/51c8387d/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
index d7c6b61,0ac5187..19fa20c
mode 100755,100644..100755
--- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
@@@ -99,10 -96,10 +100,10 @@@ public class MetadataCollector implemen
      protected final MinMaxIntTracker localDeletionTimeTracker = new MinMaxIntTracker(Cell.NO_DELETION_TIME,
Cell.NO_DELETION_TIME);
      protected final MinMaxIntTracker ttlTracker = new MinMaxIntTracker(Cell.NO_TTL, Cell.NO_TTL);
      protected double compressionRatio = NO_COMPRESSION_RATIO;
 -    protected StreamingHistogram.StreamingHistogramBuilder estimatedTombstoneDropTime =
defaultTombstoneDropTimeHistogramBuilder();
 +    protected StreamingTombstoneHistogramBuilder estimatedTombstoneDropTime = new StreamingTombstoneHistogramBuilder(SSTable.TOMBSTONE_HISTOGRAM_BIN_SIZE,
SSTable.TOMBSTONE_HISTOGRAM_SPOOL_SIZE, SSTable.TOMBSTONE_HISTOGRAM_TTL_ROUND_SECONDS);
      protected int sstableLevel;
-     private ClusteringPrefix minClustering = ClusteringBound.TOP;
-     private ClusteringPrefix maxClustering = ClusteringBound.BOTTOM;
+     private ClusteringPrefix minClustering = null;
+     private ClusteringPrefix maxClustering = null;
      protected boolean hasLegacyCounterShards = false;
      protected long totalColumnsSet;
      protected long totalRows;
@@@ -269,9 -272,12 +270,12 @@@
          this.hasLegacyCounterShards = this.hasLegacyCounterShards || hasLegacyCounterShards;
      }
  
 -    public Map<MetadataType, MetadataComponent> finalizeMetadata(String partitioner,
double bloomFilterFPChance, long repairedAt, SerializationHeader header)
 +    public Map<MetadataType, MetadataComponent> finalizeMetadata(String partitioner,
double bloomFilterFPChance, long repairedAt, UUID pendingRepair, boolean isTransient, 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 = new EnumMap<>(MetadataType.class);
          components.put(MetadataType.VALIDATION, new ValidationMetadata(partitioner, bloomFilterFPChance));
          components.put(MetadataType.STATS, new StatsMetadata(estimatedPartitionSize,


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


Mime
View raw message