CNDB-16182: CNDB-15608 simplify ceiling row id from primary key (#2142)

src/java/org/apache/cassandra/cql3/CqlBuilder.java

@@ -271,12 +271,7 @@ public String toString()
 
     /**
      * Builds a `WITH option1 = ... AND option2 = ... AND option3 = ... clause
-<<<<<<< HEAD
      * @param builder a receiver to receive a builder allowing to add each option
-=======
-     *
-     * @param builder a consumer to receive a builder for the options to append
->>>>>>> 4714c43331 (CNDB-13129: Add index hints)
      */
     public CqlBuilder appendOptions(Consumer<OptionsBuilder> builder)
     {

src/java/org/apache/cassandra/index/sai/IndexContext.java

@@ -624,7 +624,7 @@ public int getIntOption(String name, int defaultValue)
         }
         catch (NumberFormatException e)
         {
-            logger.error("Failed to parse index configuration " + name + " = " + value + " as integer");
+            logger.error("Failed to parse index configuration {} = {} as integer", name, value);
             return defaultValue;
         }
     }
@@ -1019,7 +1019,7 @@ public long indexFileCacheSize()
     public IndexFeatureSet indexFeatureSet()
     {
         IndexFeatureSet.Accumulator accumulator = new IndexFeatureSet.Accumulator(version);
-        getView().getIndexes().stream().map(SSTableIndex::indexFeatureSet).forEach(set -> accumulator.accumulate(set));
+        getView().getIndexes().stream().map(SSTableIndex::indexFeatureSet).forEach(accumulator::accumulate);
         return accumulator.complete();
     }
 }

src/java/org/apache/cassandra/index/sai/SSTableContext.java

@@ -65,7 +65,6 @@ private SSTableContext(SSTableContext copy)
         this.primaryKeyMapFactory = copy.primaryKeyMapFactory;
     }
 
-    @SuppressWarnings("resource")
     public static SSTableContext create(SSTableReader sstable, IndexComponents.ForRead perSSTableComponents)
     {
         var onDiskFormat = perSSTableComponents.onDiskFormat();

src/java/org/apache/cassandra/index/sai/StorageAttachedIndexGroup.java

@@ -249,7 +249,7 @@ public void rangeTombstone(RangeTombstone tombstone)
 
             private void forEach(Consumer<Index.Indexer> action)
             {
-                indexers.forEach(action::accept);
+                indexers.forEach(action);
             }
         };
     }
@@ -326,7 +326,7 @@ public void handleNotification(INotification notification, Object sender)
             // validate index checksum. Also avoid validation for UNKNOWN operations (imports) as they
             // are already validated in SSTableImporter.
             boolean validate = notice.fromStreaming() || 
-                              (!notice.memtable().isPresent() && notice.operationType != OperationType.UNKNOWN);
+                              (notice.memtable().isEmpty() && notice.operationType != OperationType.UNKNOWN);
             onSSTableChanged(Collections.emptySet(), Lists.newArrayList(notice.added), indices, validate);
         }
         else if (notification instanceof SSTableListChangedNotification)
@@ -489,7 +489,7 @@ public int totalIndexBuildsInProgress()
      */
     public int totalQueryableIndexCount()
     {
-        return (int) indices.stream().filter(i -> baseCfs.indexManager.isIndexQueryable(i)).count();
+        return (int) indices.stream().filter(baseCfs.indexManager::isIndexQueryable).count();
     }
 
     /**
@@ -566,7 +566,7 @@ public void unsafeReload()
     public void reset()
     {
         contextManager.clear();
-        indices.forEach(index -> index.makeIndexNonQueryable());
+        indices.forEach(StorageAttachedIndex::makeIndexNonQueryable);
         onSSTableChanged(baseCfs.getLiveSSTables(), Collections.emptySet(), indices, false);
     }
 

src/java/org/apache/cassandra/index/sai/disk/PerSSTableWriter.java

@@ -28,7 +28,7 @@
  */
 public interface PerSSTableWriter
 {
-    public static final PerSSTableWriter NONE = (key) -> {};
+    PerSSTableWriter NONE = key -> {};
 
     default void startPartition(long position) throws IOException
     {}

src/java/org/apache/cassandra/index/sai/disk/format/IndexDescriptor.java

@@ -531,7 +531,7 @@ public void markComplete() throws IOException
         {
             addOrGet(completionMarkerComponent()).createEmpty();
             sealed = true;
-            // Until this call, the group is not attached to the parent. This create the link.
+            // Until this call, the group is not attached to the parent. This creates the link.
             updateParentLink(this);
         }
 

src/java/org/apache/cassandra/index/sai/disk/format/OnDiskFormat.java

@@ -29,6 +29,7 @@
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.index.sai.IndexContext;
 import org.apache.cassandra.index.sai.SSTableContext;
+import org.apache.cassandra.index.sai.SSTableIndex;
 import org.apache.cassandra.index.sai.StorageAttachedIndex;
 import org.apache.cassandra.index.sai.disk.PerIndexWriter;
 import org.apache.cassandra.index.sai.disk.PerSSTableWriter;
@@ -74,15 +75,15 @@ public interface OnDiskFormat
      *
      * @return the index feature set
      */
-    public IndexFeatureSet indexFeatureSet();
+    IndexFeatureSet indexFeatureSet();
 
     /**
      * Returns the {@link PrimaryKey.Factory} for the on-disk format
      *
      * @param comparator
      * @return the primary key factory
      */
-    public PrimaryKey.Factory newPrimaryKeyFactory(ClusteringComparator comparator);
+    PrimaryKey.Factory newPrimaryKeyFactory(ClusteringComparator comparator);
 
     /**
      * Returns a {@link PrimaryKeyMap.Factory} for the SSTable
@@ -93,18 +94,18 @@ public interface OnDiskFormat
      * @return a {@link PrimaryKeyMap.Factory} for the SSTable
      * @throws IOException
      */
-    public PrimaryKeyMap.Factory newPrimaryKeyMapFactory(IndexComponents.ForRead perSSTableComponents, PrimaryKey.Factory primaryKeyFactory, SSTableReader sstable) throws IOException;
+    PrimaryKeyMap.Factory newPrimaryKeyMapFactory(IndexComponents.ForRead perSSTableComponents, PrimaryKey.Factory primaryKeyFactory, SSTableReader sstable) throws IOException;
 
     /**
-     * Create a new {@link SearchableIndex} for an on-disk index. This is held by the {@SSTableIndex}
+     * Create a new {@link SearchableIndex} for an on-disk index. This is held by the {@link SSTableIndex}
      * and shared between queries.
      *
      * @param sstableContext The {@link SSTableContext} holding the per-SSTable information for the index
      * @param perIndexComponents The group of per-index sstable components to use/read for the returned index (which
      *                           also link to the underlying {@link IndexContext} for the index).
      * @return the created {@link SearchableIndex}.
      */
-    public SearchableIndex newSearchableIndex(SSTableContext sstableContext, IndexComponents.ForRead perIndexComponents);
+    SearchableIndex newSearchableIndex(SSTableContext sstableContext, IndexComponents.ForRead perIndexComponents);
 
     IndexSearcher newIndexSearcher(SSTableContext sstableContext,
                                    IndexContext indexContext,
@@ -118,7 +119,7 @@ IndexSearcher newIndexSearcher(SSTableContext sstableContext,
      * @return The {@link PerSSTableWriter} to write the per-SSTable on-disk components
      * @throws IOException
      */
-    public PerSSTableWriter newPerSSTableWriter(IndexDescriptor indexDescriptor) throws IOException;
+    PerSSTableWriter newPerSSTableWriter(IndexDescriptor indexDescriptor) throws IOException;
 
     /**
      * Create a new writer for the per-index on-disk components of an index. The {@link LifecycleNewTracker}
@@ -133,10 +134,10 @@ IndexSearcher newIndexSearcher(SSTableContext sstableContext,
      * @param keyCount
      * @return The {@link PerIndexWriter} that will write the per-index on-disk components
      */
-    public PerIndexWriter newPerIndexWriter(StorageAttachedIndex index,
-                                            IndexDescriptor indexDescriptor,
-                                            LifecycleNewTracker tracker,
-                                            RowMapping rowMapping, long keyCount);
+    PerIndexWriter newPerIndexWriter(StorageAttachedIndex index,
+                                     IndexDescriptor indexDescriptor,
+                                     LifecycleNewTracker tracker,
+                                     RowMapping rowMapping, long keyCount);
 
     /**
      * Validate the provided on-disk components (that must be for this version).
@@ -155,7 +156,7 @@ public PerIndexWriter newPerIndexWriter(StorageAttachedIndex index,
      *
      * @return The set of {@link IndexComponentType} for the per-SSTable index
      */
-    public Set<IndexComponentType> perSSTableComponentTypes();
+    Set<IndexComponentType> perSSTableComponentTypes();
 
     /**
      * Returns the set of {@link IndexComponentType} for the per-index part of an index.
@@ -165,12 +166,12 @@ public PerIndexWriter newPerIndexWriter(StorageAttachedIndex index,
      * @param indexContext The {@link IndexContext} for the index
      * @return The set of {@link IndexComponentType} for the per-index index
      */
-    default public Set<IndexComponentType> perIndexComponentTypes(IndexContext indexContext)
+    default Set<IndexComponentType> perIndexComponentTypes(IndexContext indexContext)
     {
         return perIndexComponentTypes(indexContext.getValidator());
     }
 
-    public Set<IndexComponentType> perIndexComponentTypes(AbstractType<?> validator);
+    Set<IndexComponentType> perIndexComponentTypes(AbstractType<?> validator);
 
     /**
      * Return the number of open per-SSTable files that can be open during a query.
@@ -179,7 +180,7 @@ default public Set<IndexComponentType> perIndexComponentTypes(IndexContext index
      *
      * @return The number of open per-SSTable files
      */
-    public int openFilesPerSSTable();
+    int openFilesPerSSTable();
 
     /**
      * Return the number of open per-index files that can be open during a query.
@@ -189,7 +190,7 @@ default public Set<IndexComponentType> perIndexComponentTypes(IndexContext index
      * @param indexContext The {@link IndexContext} for the index
      * @return The number of open per-index files
      */
-    public int openFilesPerIndex(IndexContext indexContext);
+    int openFilesPerIndex(IndexContext indexContext);
 
     /**
      * Return the {@link ByteOrder} for the given {@link IndexComponentType} and {@link IndexContext}.
@@ -198,7 +199,7 @@ default public Set<IndexComponentType> perIndexComponentTypes(IndexContext index
      * @param context   - The {@link IndexContext} for the index
      * @return The {@link ByteOrder} for the file associated with the {@link IndexComponentType}
      */
-    public ByteOrder byteOrderFor(IndexComponentType component, IndexContext context);
+    ByteOrder byteOrderFor(IndexComponentType component, IndexContext context);
 
     /**
      * Encode the given {@link ByteBuffer} into a {@link ByteComparable} object based on the provided {@link AbstractType}

src/java/org/apache/cassandra/index/sai/disk/v1/PartitionAwarePrimaryKeyFactory.java

@@ -56,7 +56,7 @@ public PrimaryKey create(DecoratedKey partitionKey, Clustering clustering)
         return new PartitionAwarePrimaryKey(partitionKey.getToken(), partitionKey, null);
     }
 
-    private class PartitionAwarePrimaryKey implements PrimaryKey
+    private static class PartitionAwarePrimaryKey implements PrimaryKey
     {
         private final Token token;
         private DecoratedKey partitionKey;

src/java/org/apache/cassandra/index/sai/disk/v1/PartitionAwarePrimaryKeyMap.java

@@ -109,8 +109,8 @@ public PrimaryKeyMap newPerSSTablePrimaryKeyMap()
             IKeyFetcher keyFetcher = null;
             try
             {
-                rowIdToToken = new LongArray.DeferredLongArray(() -> tokenReaderFactory.open());
-                rowIdToOffset = new LongArray.DeferredLongArray(() -> offsetReaderFactory.open());
+                rowIdToToken = new LongArray.DeferredLongArray(tokenReaderFactory::open);
+                rowIdToOffset = new LongArray.DeferredLongArray(offsetReaderFactory::open);
                 keyFetcher = sstable.openKeyFetcher(false);
 
                 return new PartitionAwarePrimaryKeyMap(rowIdToToken, rowIdToOffset, partitioner, keyFetcher, primaryKeyFactory, sstableId);
@@ -179,13 +179,7 @@ public long exactRowIdOrInvertedCeiling(PrimaryKey key)
     @Override
     public long ceiling(PrimaryKey key)
     {
-        var rowId = exactRowIdOrInvertedCeiling(key);
-        if (rowId >= 0)
-            return rowId;
-        if (rowId == Long.MIN_VALUE)
-            return -1;
-        else
-            return -rowId - 1;
+        return rowIdToToken.ceilingRowId(key.token().getLongValue());
     }
 
     @Override

src/java/org/apache/cassandra/index/sai/disk/v1/V1OnDiskFormat.java

@@ -156,7 +156,7 @@ public PrimaryKey.Factory newPrimaryKeyFactory(ClusteringComparator comparator)
     }
 
     @Override
-    public PrimaryKeyMap.Factory newPrimaryKeyMapFactory(IndexComponents.ForRead perSSTableComponents, PrimaryKey.Factory primaryKeyFactory, SSTableReader sstable) throws IOException
+    public PrimaryKeyMap.Factory newPrimaryKeyMapFactory(IndexComponents.ForRead perSSTableComponents, PrimaryKey.Factory primaryKeyFactory, SSTableReader sstable)
     {
         return new PartitionAwarePrimaryKeyMap.PartitionAwarePrimaryKeyMapFactory(perSSTableComponents, sstable, primaryKeyFactory);
     }

src/java/org/apache/cassandra/index/sai/disk/v2/RowAwarePrimaryKeyFactory.java

@@ -75,7 +75,7 @@ PrimaryKey createWithSource(PrimaryKeyMap primaryKeyMap, long sstableRowId, Prim
 
     private class RowAwarePrimaryKey implements PrimaryKey
     {
-        private Token token;
+        private final Token token;
         private DecoratedKey partitionKey;
         private Clustering clustering;
         private Supplier<PrimaryKey> primaryKeySupplier;

src/java/org/apache/cassandra/index/sai/disk/v2/RowAwarePrimaryKeyMap.java

@@ -117,11 +117,10 @@ public RowAwarePrimaryKeyMapFactory(IndexComponents.ForRead perSSTableComponents
         @Override
         public PrimaryKeyMap newPerSSTablePrimaryKeyMap()
         {
-            final LongArray rowIdToToken = new LongArray.DeferredLongArray(() -> tokenReaderFactory.open());
+            final LongArray rowIdToToken = new LongArray.DeferredLongArray(tokenReaderFactory::open);
             try
             {
                 return new RowAwarePrimaryKeyMap(rowIdToToken,
-                                                 sortedTermsReader,
                                                  sortedTermsReader.openCursor(),
                                                  partitioner,
                                                  primaryKeyFactory,
@@ -149,7 +148,6 @@ public void close() throws IOException
     }
 
     private final LongArray rowIdToToken;
-    private final SortedTermsReader sortedTermsReader;
     private final SortedTermsReader.Cursor cursor;
     private final IPartitioner partitioner;
     private final RowAwarePrimaryKeyFactory primaryKeyFactory;
@@ -158,7 +156,6 @@ public void close() throws IOException
     private final boolean hasStaticColumns;
 
     private RowAwarePrimaryKeyMap(LongArray rowIdToToken,
-                                  SortedTermsReader sortedTermsReader,
                                   SortedTermsReader.Cursor cursor,
                                   IPartitioner partitioner,
                                   RowAwarePrimaryKeyFactory primaryKeyFactory,
@@ -167,7 +164,6 @@ private RowAwarePrimaryKeyMap(LongArray rowIdToToken,
                                   boolean hasStaticColumns)
     {
         this.rowIdToToken = rowIdToToken;
-        this.sortedTermsReader = sortedTermsReader;
         this.cursor = cursor;
         this.partitioner = partitioner;
         this.primaryKeyFactory = primaryKeyFactory;
@@ -235,10 +231,10 @@ public long exactRowIdOrInvertedCeiling(PrimaryKey key)
         if (clusteringComparator.size() == 0)
             return skinnyExactRowIdOrInvertedCeiling(key);
 
-        long pointId = cursor.getExactPointId(v -> key.asComparableBytes(v));
+        long pointId = cursor.getExactPointId(key::asComparableBytes);
         if (pointId >= 0)
             return pointId;
-        long ceiling = cursor.ceiling(v -> key.asComparableBytesMinPrefix(v));
+        long ceiling = cursor.ceiling(key::asComparableBytesMinPrefix);
         // Use min value since -(Long.MIN_VALUE) - 1 == Long.MAX_VALUE.
         return ceiling < 0 ? Long.MIN_VALUE : -ceiling - 1;
     }

src/java/org/apache/cassandra/index/sai/disk/v2/sortedterms/SortedTermsReader.java

@@ -146,7 +146,7 @@ public class Cursor implements AutoCloseable
         // The point id the cursor currently points to. -1 means before the first item.
         private long pointId = -1;
 
-        private TrieTermsDictionaryReader reader;
+        private final TrieTermsDictionaryReader reader;
 
         Cursor(FileHandle termsData, LongArray.Factory blockOffsetsFactory) throws IOException
         {

src/java/org/apache/cassandra/index/sai/disk/v2/sortedterms/SortedTermsWriter.java

@@ -73,8 +73,6 @@ public class SortedTermsWriter implements Closeable
     static final int TERMS_DICT_BLOCK_SIZE = 1 << TERMS_DICT_BLOCK_SHIFT;
     static final int TERMS_DICT_BLOCK_MASK = TERMS_DICT_BLOCK_SIZE - 1;
 
-    static final int DIRECT_MONOTONIC_BLOCK_SHIFT = 16;
-
     private final IncrementalTrieWriter<Long> trieWriter;
     private final IndexOutputWriter trieOutput;
     private final IndexOutput termsOutput;

test/microbench/org/apache/cassandra/test/microbench/index/sai/memory/AbstractTrieMemoryIndexBench.java

@@ -56,7 +56,7 @@ public abstract class AbstractTrieMemoryIndexBench
     private static final String INTEGER_INDEX = "integer_index";
     private static final int RANDOM_STRING_SIZE = 64 * 1024 * 1024;
 
-    private char[] randomChars = new char[RANDOM_STRING_SIZE];
+    private final char[] randomChars = new char[RANDOM_STRING_SIZE];
 
     protected int randomSeed;