This is an automated email from the ASF dual-hosted git repository.
maedhroz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 94964b54b6b01b7cb4587de1822b5cced3c22352
Author: Caleb Rackliffe <calebrackli...@gmail.com>
AuthorDate: Tue Jul 25 16:35:32 2023 -0500
minor fixes after rebase on trunk at
c1bf002234bd44bce120658e9b08b3d67901e5bb
---
.../org/apache/cassandra/db/PartitionRangeReadCommand.java | 2 +-
.../cassandra/db/compaction/UnifiedCompactionStrategy.java | 4 ++--
.../cassandra/db/compaction/unified/ShardedMultiWriter.java | 12 ++++++------
.../org/apache/cassandra/index/sai/disk/SSTableIndex.java | 6 +++---
.../apache/cassandra/index/sai/plan/QueryViewBuilder.java | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
index ea19efef13..7cca335c4c 100644
--- a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
+++ b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
@@ -530,7 +530,7 @@ public class PartitionRangeReadCommand extends ReadCommand
implements PartitionR
throws IOException
{
DataRange range = DataRange.serializer.deserialize(in, version,
metadata);
- return new PartitionRangeReadCommand(isDigest, digestVersion,
acceptsTransient, metadata, nowInSec, columnFilter, rowFilter, limits, range,
indexQueryPlan, false);
+ return PartitionRangeReadCommand.create(isDigest, digestVersion,
acceptsTransient, metadata, nowInSec, columnFilter, rowFilter, limits, range,
indexQueryPlan, false);
}
}
diff --git
a/src/java/org/apache/cassandra/db/compaction/UnifiedCompactionStrategy.java
b/src/java/org/apache/cassandra/db/compaction/UnifiedCompactionStrategy.java
index 95e901b7b8..c410bf1e1b 100644
--- a/src/java/org/apache/cassandra/db/compaction/UnifiedCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/UnifiedCompactionStrategy.java
@@ -267,7 +267,7 @@ public class UnifiedCompactionStrategy extends
AbstractCompactionStrategy
IntervalSet<CommitLogPosition> commitLogPositions,
int sstableLevel,
SerializationHeader
header,
- Collection<Index>
indexes,
+ Collection<Index.Group>
indexGroups,
LifecycleNewTracker
lifecycleNewTracker)
{
ShardManager shardManager = getShardManager();
@@ -281,7 +281,7 @@ public class UnifiedCompactionStrategy extends
AbstractCompactionStrategy
isTransient,
commitLogPositions,
header,
- indexes,
+ indexGroups,
lifecycleNewTracker,
boundaries);
}
diff --git
a/src/java/org/apache/cassandra/db/compaction/unified/ShardedMultiWriter.java
b/src/java/org/apache/cassandra/db/compaction/unified/ShardedMultiWriter.java
index 1fff50ad8c..58ce924c12 100644
---
a/src/java/org/apache/cassandra/db/compaction/unified/ShardedMultiWriter.java
+++
b/src/java/org/apache/cassandra/db/compaction/unified/ShardedMultiWriter.java
@@ -63,7 +63,7 @@ public class ShardedMultiWriter implements SSTableMultiWriter
private final boolean isTransient;
private final IntervalSet<CommitLogPosition> commitLogPositions;
private final SerializationHeader header;
- private final Collection<Index> indexes;
+ private final Collection<Index.Group> indexGroups;
private final LifecycleNewTracker lifecycleNewTracker;
private final ShardTracker boundaries;
private final SSTableWriter[] writers;
@@ -77,7 +77,7 @@ public class ShardedMultiWriter implements SSTableMultiWriter
boolean isTransient,
IntervalSet<CommitLogPosition>
commitLogPositions,
SerializationHeader header,
- Collection<Index> indexes,
+ Collection<Index.Group> indexGroups,
LifecycleNewTracker lifecycleNewTracker,
ShardTracker boundaries)
{
@@ -89,7 +89,7 @@ public class ShardedMultiWriter implements SSTableMultiWriter
this.isTransient = isTransient;
this.commitLogPositions = commitLogPositions;
this.header = header;
- this.indexes = indexes;
+ this.indexGroups = indexGroups;
this.lifecycleNewTracker = lifecycleNewTracker;
this.boundaries = boundaries;
this.writers = new SSTableWriter[this.boundaries.count()]; // at least
one
@@ -116,8 +116,8 @@ public class ShardedMultiWriter implements
SSTableMultiWriter
.setTableMetadataRef(cfs.metadata)
.setMetadataCollector(metadataCollector)
.setSerializationHeader(header)
- .addDefaultComponents()
- .addFlushObserversForSecondaryIndexes(indexes,
lifecycleNewTracker.opType())
+ .addDefaultComponents(indexGroups)
+ .addFlushObserversForSecondaryIndexes(indexGroups,
lifecycleNewTracker, cfs.metadata.get())
.build(lifecycleNewTracker, cfs);
}
@@ -251,4 +251,4 @@ public class ShardedMultiWriter implements
SSTableMultiWriter
if (writer != null)
writer.close();
}
-}
\ No newline at end of file
+}
diff --git a/src/java/org/apache/cassandra/index/sai/disk/SSTableIndex.java
b/src/java/org/apache/cassandra/index/sai/disk/SSTableIndex.java
index 2227291626..f1b7712a44 100644
--- a/src/java/org/apache/cassandra/index/sai/disk/SSTableIndex.java
+++ b/src/java/org/apache/cassandra/index/sai/disk/SSTableIndex.java
@@ -55,8 +55,8 @@ public abstract class SSTableIndex
private static final Logger logger =
LoggerFactory.getLogger(SSTableIndex.class);
// sort sstable indexes by first key, then last key, then descriptor id
- public static final Comparator<SSTableIndex> COMPARATOR =
Comparator.comparing((SSTableIndex s) -> s.getSSTable().first)
-
.thenComparing(s -> s.getSSTable().last)
+ public static final Comparator<SSTableIndex> COMPARATOR =
Comparator.comparing((SSTableIndex s) -> s.getSSTable().getFirst())
+
.thenComparing(s -> s.getSSTable().getLast())
.thenComparing(s -> s.getSSTable().descriptor.id, SSTableIdFactory.COMPARATOR);
protected final SSTableContext sstableContext;
@@ -123,7 +123,7 @@ public abstract class SSTableIndex
/**
* Perform a search on the index for a single expression and keyRange.
- *
+ * <p>
* The result is a {@link List} of {@link KeyRangeIterator} because there
will
* be a {@link KeyRangeIterator} for each segment in the index. The result
* will never be null but may be an empty {@link List}.
diff --git a/src/java/org/apache/cassandra/index/sai/plan/QueryViewBuilder.java
b/src/java/org/apache/cassandra/index/sai/plan/QueryViewBuilder.java
index 85f4735610..709f530b6f 100644
--- a/src/java/org/apache/cassandra/index/sai/plan/QueryViewBuilder.java
+++ b/src/java/org/apache/cassandra/index/sai/plan/QueryViewBuilder.java
@@ -187,6 +187,6 @@ public class QueryViewBuilder
private boolean indexInRange(SSTableIndex index)
{
SSTableReader sstable = index.getSSTable();
- return range.left.compareTo(sstable.last) <= 0 &&
(range.right.isMinimum() || sstable.first.compareTo(range.right) <= 0);
+ return range.left.compareTo(sstable.getLast()) <= 0 &&
(range.right.isMinimum() || sstable.getFirst().compareTo(range.right) <= 0);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
