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-08-24 10:14:40 +01:00
parent 77cf2185b6 b265b4658e
commit 4226cbbec6
5 changed files with 56 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,5 +1,6 @@
5.1
Merged from 5.0:
* Forbid SAI indexes with analysis options on primary key columns (CASSANDRA-18782)
* Expose bootstrap failure state via JMX and nodetool info (CASSANDRA-18749)
* Reduce size of per-SSTable index components for SAI (CASSANDRA-18673)
* Remove unnecessary Netty dependencies after upgrade to version 4.1.96 (CASSANDRA-18729)

11
src/java/org/apache/cassandra/index/sai/StorageAttachedIndex.java
View File

@ -48,6 +48,7 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.cql3.CQL3Type;
import org.apache.cassandra.cql3.CqlBuilder;
import org.apache.cassandra.cql3.Operator;
import org.apache.cassandra.cql3.statements.schema.IndexTarget;
import org.apache.cassandra.db.CassandraWriteContext;
@ -96,6 +97,9 @@ import org.apache.cassandra.utils.concurrent.OpOrder;
public class StorageAttachedIndex implements Index
{
public static final String NAME = "sai";
@VisibleForTesting
public static final String ANALYSIS_ON_KEY_COLUMNS_MESSAGE = "Analysis options are not supported on primary key columns, but found ";
private static final Logger logger = LoggerFactory.getLogger(StorageAttachedIndex.class);
@ -253,7 +257,12 @@ public class StorageAttachedIndex implements Index
throw new InvalidRequestException("Unsupported type: " + type.asCQL3Type());
}
AbstractAnalyzer.fromOptions(type, options);
Map<String, String> analysisOptions = AbstractAnalyzer.getAnalyzerOptions(options);
if (target.left.isPrimaryKeyColumn() && !analysisOptions.isEmpty())
{
throw new InvalidRequestException(ANALYSIS_ON_KEY_COLUMNS_MESSAGE + new CqlBuilder().append(analysisOptions));
}
AbstractAnalyzer.fromOptions(type, analysisOptions);
return Collections.emptyMap();
}

12
src/java/org/apache/cassandra/index/sai/analyzer/AbstractAnalyzer.java
View File

@ -22,6 +22,7 @@ import java.nio.ByteBuffer;
import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.stream.Collectors;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.StringType;
@ -103,9 +104,14 @@ public abstract class AbstractAnalyzer implements Iterator<ByteBuffer>
private static boolean hasNonTokenizingOptions(Map<String, String> options)
{
return options.get(NonTokenizingOptions.ASCII) != null ||
options.containsKey(NonTokenizingOptions.CASE_SENSITIVE) ||
options.containsKey(NonTokenizingOptions.NORMALIZE);
return options.keySet().stream().anyMatch(NonTokenizingOptions::hasOption);
}
public static Map<String, String> getAnalyzerOptions(Map<String, String> options)
{
return options.entrySet().stream()
.filter(e -> NonTokenizingOptions.hasOption(e.getKey()))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
}
}

5
src/java/org/apache/cassandra/index/sai/analyzer/NonTokenizingOptions.java
View File

@ -65,6 +65,11 @@ public class NonTokenizingOptions
this.normalized = normalized;
}
static boolean hasOption(String option)
{
return option.equals(NORMALIZE) || option.equals(CASE_SENSITIVE) || option.equals(ASCII);
}
public static class OptionsBuilder
{
private boolean caseSensitive = true;

31
test/unit/org/apache/cassandra/index/sai/cql/StorageAttachedIndexDDLTest.java
View File

@ -24,11 +24,13 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.LongStream;
import com.google.common.collect.ImmutableMap;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@ -40,6 +42,7 @@ import com.datastax.driver.core.exceptions.ReadFailureException;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.cql3.CQL3Type;
import org.apache.cassandra.cql3.ColumnIdentifier;
import org.apache.cassandra.cql3.CqlBuilder;
import org.apache.cassandra.cql3.restrictions.IndexRestrictions;
import org.apache.cassandra.cql3.statements.schema.CreateIndexStatement;
import org.apache.cassandra.db.ColumnFamilyStore;
@ -58,6 +61,7 @@ import org.apache.cassandra.index.sai.IndexContext;
import org.apache.cassandra.index.sai.SAITester;
import org.apache.cassandra.index.sai.StorageAttachedIndex;
import org.apache.cassandra.index.sai.StorageAttachedIndexBuilder;
import org.apache.cassandra.index.sai.analyzer.NonTokenizingOptions;
import org.apache.cassandra.index.sai.disk.format.IndexComponent;
import org.apache.cassandra.index.sai.disk.format.Version;
import org.apache.cassandra.index.sai.disk.v1.segment.SegmentBuilder;
@ -417,6 +421,33 @@ public class StorageAttachedIndexDDLTest extends SAITester
assertEquals(1, execute("SELECT id FROM %s WHERE val = 'eppinger'").size());
}
@Test
public void shouldRejectAnalysisOnPrimaryKeyColumns()
{
createTable("CREATE TABLE %s (k1 text, k2 text, c1 text, c2 text, PRIMARY KEY((k1, k2), c1, c2))");
for (String column : Arrays.asList("k1", "k2", "c1", "c2"))
{
for (String enabled : Arrays.asList("true", "false"))
{
assertRejectsAnalysisOnPrimaryKeyColumns(column, ImmutableMap.of(NonTokenizingOptions.NORMALIZE, enabled));
assertRejectsAnalysisOnPrimaryKeyColumns(column, ImmutableMap.of(NonTokenizingOptions.CASE_SENSITIVE, enabled));
assertRejectsAnalysisOnPrimaryKeyColumns(column, ImmutableMap.of(NonTokenizingOptions.ASCII, enabled));
assertRejectsAnalysisOnPrimaryKeyColumns(column, ImmutableMap.of(NonTokenizingOptions.NORMALIZE, enabled,
NonTokenizingOptions.CASE_SENSITIVE, enabled,
NonTokenizingOptions.ASCII, enabled));
}
}
}
private void assertRejectsAnalysisOnPrimaryKeyColumns(String column, Map<String, String> optionsMap)
{
String options = new CqlBuilder().append(optionsMap).toString();
Assertions.assertThatThrownBy(() -> createIndex("CREATE INDEX ON %s(" + column + ") USING 'sai' WITH OPTIONS = " + options))
.hasRootCauseInstanceOf(InvalidRequestException.class)
.hasRootCauseMessage(StorageAttachedIndex.ANALYSIS_ON_KEY_COLUMNS_MESSAGE + options);
}
@Test
public void shouldCreateIndexOnReversedType()
{