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:
Andrés de la Peña 2023-11-23 11:52:57 +00:00
parent 1793c3fd36 c26f2a3d69
commit 06dabb8b3a
3 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -3,6 +3,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:
* Fix SAI unindexed contexts not considering CONTAINS KEY (CASSANDRA-19040)
* Ensure that empty SAI column indexes do not fail on validation after full-SSTable streaming (CASSANDRA-19017)
* SAI in-memory index should check max term size (CASSANDRA-18926)
* Set default disk_access_mode to mmap_index_only (CASSANDRA-19021)

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

@ -146,7 +146,9 @@ public class QueryController
cfs.getPartitioner(),
cfs.getComparator(),
expression.column(),
IndexTarget.Type.VALUES,
expression.operator().isContainsKey()
? IndexTarget.Type.KEYS
: IndexTarget.Type.VALUES,
null)
: indexes.iterator().next().getIndexContext();
}

40
test/unit/org/apache/cassandra/index/sai/cql/CollectionIndexingTest.java
View File

@ -42,28 +42,28 @@ public class CollectionIndexingTest extends SAITester
}
@Test
public void indexMap() throws Throwable
public void indexMap()
{
createPopulatedMap(createIndexDDL("value"));
assertEquals(2, execute("SELECT * FROM %s WHERE value CONTAINS 'v1'").size());
}
@Test
public void indexMapKeys() throws Throwable
public void indexMapKeys()
{
createPopulatedMap(createIndexDDL("KEYS(value)"));
assertEquals(2, execute("SELECT * FROM %s WHERE value CONTAINS KEY 1").size());
}
@Test
public void indexMapValues() throws Throwable
public void indexMapValues()
{
createPopulatedMap(createIndexDDL("VALUES(value)"));
assertEquals(2, execute("SELECT * FROM %s WHERE value CONTAINS 'v1'").size());
}
@Test
public void indexMapEntries() throws Throwable
public void indexMapEntries()
{
createPopulatedMap(createIndexDDL("ENTRIES(value)"));
assertEquals(2, execute("SELECT * FROM %s WHERE value[1] = 'v1'").size());
@ -71,7 +71,7 @@ public class CollectionIndexingTest extends SAITester
}
@Test
public void indexFrozenList() throws Throwable
public void indexFrozenList()
{
createPopulatedFrozenList(createIndexDDL("FULL(value)"));
assertEquals(2, execute("SELECT * FROM %s WHERE value = ?", Arrays.asList(1, 2, 3)).size());
@ -176,6 +176,34 @@ public class CollectionIndexingTest extends SAITester
assertUnsupportedIndexOperator(2, "SELECT * FROM %s WHERE value[1] = 'v1'");
}
@Test
public void unindexedContainsExpressions()
{
createTable("CREATE TABLE %s (k int PRIMARY KEY, v int, m map<int, int>)");
createIndex("CREATE INDEX ON %s(v) USING 'SAI'"); // just to make sure that SAI is involved
Object[] row = row(0, 1, map(2, 3));
execute("INSERT INTO %s (k, v, m) VALUES (?, ?, ?)", row);
execute("INSERT INTO %s (k, v, m) VALUES (?, ?, ?)", 1, 1, map(12, 13));
// try without any indexes on the map
assertRows(execute("SELECT k, v, m FROM %s WHERE v = 1 AND m CONTAINS 3 ALLOW FILTERING"), row);
assertRows(execute("SELECT k, v, m FROM %s WHERE v = 1 AND m CONTAINS KEY 2 ALLOW FILTERING"), row);
assertRows(execute("SELECT k, v, m FROM %s WHERE v = 1 AND m CONTAINS KEY 2 AND m CONTAINS 3 ALLOW FILTERING"), row);
// try with index on map values
createIndex("CREATE INDEX ON %s(m) USING 'SAI'");
assertRows(execute("SELECT k, v, m FROM %s WHERE v = 1 AND m CONTAINS 3"), row);
assertRows(execute("SELECT k, v, m FROM %s WHERE v = 1 AND m CONTAINS KEY 2 ALLOW FILTERING"), row);
assertRows(execute("SELECT k, v, m FROM %s WHERE v = 1 AND m CONTAINS KEY 2 AND m CONTAINS 3 ALLOW FILTERING"), row);
// try with index on map keys
createIndex("CREATE INDEX ON %s(KEYS(m)) USING 'SAI'");
assertRows(execute("SELECT k, v, m FROM %s WHERE v = 1 AND m CONTAINS 3"), row);
assertRows(execute("SELECT k, v, m FROM %s WHERE v = 1 AND m CONTAINS KEY 2"), row);
assertRows(execute("SELECT k, v, m FROM %s WHERE v = 1 AND m CONTAINS KEY 2 AND m CONTAINS 3"), row);
}
private void createPopulatedMap(String createIndex)
{
createTable("CREATE TABLE %s (pk int primary key, value map<int, text>)");
@ -191,7 +219,7 @@ public class CollectionIndexingTest extends SAITester
}
@SuppressWarnings("SameParameterValue")
private void createPopulatedFrozenMap(String createIndex) throws Throwable
private void createPopulatedFrozenMap(String createIndex)
{
createTable("CREATE TABLE %s (pk int primary key, value frozen<map<int, text>>)");
createIndex(createIndex);