natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-5.0' into trunk

This commit is contained in:
Stefan Miklosovic 2024-01-05 11:11:34 +01:00
parent 82c01d5e0e ad642d5e25
commit d557b68648
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
6 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -6,6 +6,7 @@
* Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
* Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787)
Merged from 5.0:
* Creating a SASI index after creating an SAI index does not break secondary index queries (CASSANDRA-18939)
* Optionally fail when a non-partition-restricted query is issued against an index (CASSANDRA-18796)
* Add a startup check to fail startup when using invalid configuration with certain Kernel and FS type (CASSANDRA-19196)
* UCS min_sstable_size should not be lower than target_sstable_size lower bound (CASSANDRA-19112)

4
src/java/org/apache/cassandra/index/SecondaryIndexManager.java
View File

@ -1278,13 +1278,13 @@ public class SecondaryIndexManager implements IndexRegistry, INotificationConsum
return indexes.values().stream().filter((i) -> i.supportsExpression(expression.column(), expression.operator())).findFirst();
}
public <T extends Index> Set<T> getBestIndexFor(RowFilter.Expression expression, Class<T> indexType)
public <T extends Index> Optional<T> getBestIndexFor(RowFilter.Expression expression, Class<T> indexType)
{
return indexes.values()
.stream()
.filter(i -> indexType.isInstance(i) && i.supportsExpression(expression.column(), expression.operator()))
.map(indexType::cast)
.collect(Collectors.toSet());
.findFirst();
}
/**

7
src/java/org/apache/cassandra/index/sai/plan/QueryController.java
View File

@ -23,9 +23,10 @@ import java.io.UncheckedIOException;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import com.google.common.collect.Lists;
import org.apache.cassandra.cql3.Operator;
@ -135,10 +136,10 @@ public class QueryController
return ranges;
}
@Nullable
public StorageAttachedIndex indexFor(RowFilter.Expression expression)
{
Set<StorageAttachedIndex> indexes = cfs.indexManager.getBestIndexFor(expression, StorageAttachedIndex.class);
return indexes.isEmpty() ? null : indexes.iterator().next();
return cfs.indexManager.getBestIndexFor(expression, StorageAttachedIndex.class).orElse(null);
}
public boolean hasAnalyzer(RowFilter.Expression expression)

5
src/java/org/apache/cassandra/index/sai/plan/VectorTopKProcessor.java
View File

@ -20,7 +20,6 @@ package org.apache.cassandra.index.sai.plan;
import java.nio.ByteBuffer;
import java.util.Comparator;
import java.util.Optional;
import java.util.PriorityQueue;
import java.util.TreeMap;
import java.util.TreeSet;
@ -41,7 +40,6 @@ import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator;
import org.apache.cassandra.db.rows.BaseRowIterator;
import org.apache.cassandra.db.rows.Row;
import org.apache.cassandra.db.rows.Unfiltered;
import org.apache.cassandra.index.Index;
import org.apache.cassandra.index.SecondaryIndexManager;
import org.apache.cassandra.index.sai.StorageAttachedIndex;
import org.apache.cassandra.index.sai.utils.InMemoryPartitionIterator;
@ -187,7 +185,6 @@ public class VectorTopKProcessor
if (e.operator() != Operator.ANN)
return null;
Optional<Index> index = sim.getBestIndexFor(e);
return (StorageAttachedIndex) index.filter(i -> i instanceof StorageAttachedIndex).orElse(null);
return sim.getBestIndexFor(e, StorageAttachedIndex.class).orElse(null);
}
}

8
src/java/org/apache/cassandra/index/sasi/plan/QueryController.java
View File

@ -20,6 +20,8 @@ package org.apache.cassandra.index.sasi.plan;
import java.util.*;
import java.util.concurrent.TimeUnit;
import javax.annotation.Nullable;
import com.google.common.collect.Sets;
import org.apache.cassandra.db.ColumnFamilyStore;
@ -32,7 +34,6 @@ import org.apache.cassandra.db.filter.DataLimits;
import org.apache.cassandra.db.filter.RowFilter;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.rows.UnfilteredRowIterator;
import org.apache.cassandra.index.Index;
import org.apache.cassandra.index.sasi.SASIIndex;
import org.apache.cassandra.index.sasi.SSTableIndex;
import org.apache.cassandra.index.sasi.TermIterator;
@ -90,13 +91,12 @@ public class QueryController
return cfs.metadata().partitionKeyType;
}
@Nullable
public ColumnIndex getIndex(RowFilter.Expression expression)
{
Optional<Index> index = cfs.indexManager.getBestIndexFor(expression);
return index.isPresent() ? ((SASIIndex) index.get()).getIndex() : null;
return cfs.indexManager.getBestIndexFor(expression, SASIIndex.class).map(SASIIndex::getIndex).orElse(null);
}
public UnfilteredRowIterator getPartition(DecoratedKey key, ReadExecutionController executionController)
{
if (key == null)

12
test/unit/org/apache/cassandra/index/SecondaryIndexManagerTest.java
View File

@ -56,6 +56,18 @@ public class SecondaryIndexManagerTest extends CQLTester
TestingIndex.clear();
}
@Test
public void createSasiAfterSai()
{
createTable("CREATE TABLE %s (id int PRIMARY KEY, val text)");
createIndex("CREATE INDEX idx0 ON %s (val) USING 'sai'");
execute("INSERT INTO %s (id, val) VALUES (1, 'a')");
execute("SELECT * FROM %s WHERE val = 'a'");
flush();
createIndex("CREATE CUSTOM INDEX idx1 ON %s (val) USING 'org.apache.cassandra.index.sasi.SASIIndex'");
execute("SELECT * FROM %s WHERE val = 'a'");
}
@Test
public void creatingIndexMarksTheIndexAsBuilt()
{