This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch cep-7-sai in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6ac577308c37ed6b3c8c4400048725223ce1112a Author: Caleb Rackliffe <[email protected]> AuthorDate: Thu Jun 1 14:43:20 2023 -0500 post-rebase fixes for the rebase on trunk at fad1f7457032544ab6a7b40c5d38ecb8b25899bb --- .../config/CassandraRelevantProperties.java | 16 +++++--- .../cassandra/config/DatabaseDescriptor.java | 1 + .../apache/cassandra/index/IndexStatusManager.java | 18 ++++----- .../apache/cassandra/index/sai/QueryContext.java | 4 +- .../index/sai/disk/v1/RowAwarePrimaryKeyMap.java | 6 +-- .../index/sai/disk/v1/SSTableIndexWriter.java | 7 +++- .../sai/disk/v1/sortedterms/SortedTermsWriter.java | 2 +- .../index/sai/disk/v1/trie/TriePrefixSearcher.java | 4 +- .../apache/cassandra/index/sai/utils/TypeUtil.java | 6 +-- .../io/sstable/format/bti/BtiTableWriter.java | 6 ++- .../org/apache/cassandra/io/tries/TrieNode.java | 2 +- .../apache/cassandra/io/tries/ValueIterator.java | 8 ++-- .../org/apache/cassandra/index/sai/SAITester.java | 13 ++++-- .../sai/disk/v1/InvertedIndexSearcherTest.java | 2 +- .../index/sai/disk/v1/SegmentFlushTest.java | 2 +- .../index/sai/disk/v1/TermsReaderTest.java | 4 +- .../cassandra/index/sai/disk/v1/TermsScanner.java | 4 +- .../sai/disk/v1/sortedterms/SortedTermsTest.java | 16 ++++---- .../sai/disk/v1/trie/TriePrefixSearcherTest.java | 46 +++++++++++----------- .../sai/disk/v1/trie/TrieTermsDictionaryTest.java | 8 ++-- .../index/sai/memory/RAMStringIndexerTest.java | 2 +- .../index/sai/memory/TrieMemoryIndexTest.java | 2 +- .../cassandra/index/sai/plan/OperationTest.java | 3 +- .../index/sai/utils/AbstractPrimaryKeyTester.java | 2 +- .../cassandra/index/sai/utils/TypeUtilTest.java | 2 +- .../index/sai/virtual/SegmentsSystemViewTest.java | 4 +- .../org/apache/cassandra/io/tries/WalkerTest.java | 1 - .../apache/cassandra/io/util/SizedIntsTest.java | 1 - .../io/util/TailOverridingRebuffererTest.java | 4 +- 29 files changed, 105 insertions(+), 91 deletions(-) diff --git a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java index 99dc65cdb6..a81bcd9ed1 100644 --- a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java +++ b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java @@ -390,16 +390,20 @@ public enum CassandraRelevantProperties RESET_BOOTSTRAP_PROGRESS("cassandra.reset_bootstrap_progress"), RING_DELAY("cassandra.ring_delay_ms"), /** Defines how often schema definitions are pulled from the other nodes */ - SCHEMA_PULL_INTERVAL_MS("cassandra.schema_pull_interval_ms", "60000"), - SCHEMA_UPDATE_HANDLER_FACTORY_CLASS("cassandra.schema.update_handler_factory.class"), - SEARCH_CONCURRENCY_FACTOR("cassandra.search_concurrency_factor", "1"), // SAI specific properties - /** Latest version to be used for SAI index writing */ - SAI_LATEST_VERSION("cassandra.sai.latest_version", "aa"), /** Controls the maximum number of index query intersections that will take part in a query */ SAI_INTERSECTION_CLAUSE_LIMIT("cassandra.sai.intersection.clause.limit", "2"), + /** Latest version to be used for SAI index writing */ + SAI_LATEST_VERSION("cassandra.sai.latest_version", "aa"), + SAI_MAX_FROZEN_TERM_SIZE("cassandra.sai.max_frozen_term_size_kb", "5"), + SAI_MAX_STRING_TERM_SIZE("cassandra.sai.max_string_term_size_kb", "1"), + SAI_TEST_DISABLE_TIMEOUT("cassandra.sai.test.disable.timeout", "false"), + + SCHEMA_PULL_INTERVAL_MS("cassandra.schema_pull_interval_ms", "60000"), + SCHEMA_UPDATE_HANDLER_FACTORY_CLASS("cassandra.schema.update_handler_factory.class"), + SEARCH_CONCURRENCY_FACTOR("cassandra.search_concurrency_factor", "1"), /** * The maximum number of seeds returned by a seed provider before emmitting a warning. @@ -461,6 +465,7 @@ public enum CassandraRelevantProperties TEST_DEBUG_REF_COUNT("cassandra.debugrefcount"), TEST_DRIVER_CONNECTION_TIMEOUT_MS("cassandra.test.driver.connection_timeout_ms", "5000"), TEST_DRIVER_READ_TIMEOUT_MS("cassandra.test.driver.read_timeout_ms", "12000"), + TEST_ENCRYPTION("cassandra.test.encryption", "false"), TEST_FAIL_MV_LOCKS_COUNT("cassandra.test.fail_mv_locks_count", "0"), TEST_FAIL_WRITES_KS("cassandra.test.fail_writes_ks", ""), /** Flush changes of {@link org.apache.cassandra.schema.SchemaKeyspace} after each schema modification. In production, @@ -473,6 +478,7 @@ public enum CassandraRelevantProperties TEST_JVM_DTEST_DISABLE_SSL("cassandra.test.disable_ssl"), TEST_LEGACY_SSTABLE_ROOT("legacy-sstable-root"), TEST_ORG_CAFFINITAS_OHC_SEGMENTCOUNT("org.caffinitas.ohc.segmentCount"), + TEST_RANDOM_SEED("cassandra.test.random.seed"), TEST_READ_ITERATION_DELAY_MS("cassandra.test.read_iteration_delay_ms", "0"), TEST_REUSE_PREPARED("cassandra.test.reuse_prepared", "true"), TEST_ROW_CACHE_SIZE("cassandra.test.row_cache_size"), diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 84d85e8e46..0e8756cec0 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -37,6 +37,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; +import java.util.OptionalDouble; import java.util.ServiceLoader; import java.util.Set; import java.util.UUID; diff --git a/src/java/org/apache/cassandra/index/IndexStatusManager.java b/src/java/org/apache/cassandra/index/IndexStatusManager.java index 0a872b5a0d..13a51831f9 100644 --- a/src/java/org/apache/cassandra/index/IndexStatusManager.java +++ b/src/java/org/apache/cassandra/index/IndexStatusManager.java @@ -31,7 +31,6 @@ import com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.cassandra.concurrent.ExecutorPlus; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.Keyspace; @@ -42,19 +41,19 @@ import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.gms.VersionedValue; import org.apache.cassandra.locator.Endpoints; import org.apache.cassandra.locator.InetAddressAndPort; +import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; -import org.json.simple.JSONValue; -import org.json.simple.parser.ParseException; +import org.apache.cassandra.utils.JsonUtils; import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory; /** * Handles the status of an index across the ring, updating the status per index and endpoint * in a per-endpoint map. - * + * <p> * Peer status changes are recieved via the {@link StorageService} {@link org.apache.cassandra.gms.IEndpointStateChangeSubscriber}. - * + * <p> * Local status changes are propagated to the {@link Gossiper} using an async executor. */ public class IndexStatusManager @@ -66,8 +65,6 @@ public class IndexStatusManager // executes index status propagation task asynchronously to avoid potential deadlock on SIM private final ExecutorPlus statusPropagationExecutor = executorFactory().withJmxInternal() .sequential("StatusPropagationExecutor"); - // used to produce a status string from the current endpoint states in JSON format for Gossip propagation - private final ObjectMapper objectMapper = new ObjectMapper(); /** * A map of per-endpoint index statuses: the key of inner map is the identifier "keyspace.index" @@ -135,8 +132,7 @@ public class IndexStatusManager if (endpoint.equals(FBUtilities.getBroadcastAddressAndPort())) return; - @SuppressWarnings("unchecked") - Map<String, String> peerStatus = (Map<String, String>) JSONValue.parseWithException(versionedValue.value); + Map<String, String> peerStatus = JsonUtils.fromJsonMap(versionedValue.value); Map<String, Index.Status> indexStatus = new HashMap<>(); for (Map.Entry<String, String> e : peerStatus.entrySet()) @@ -153,7 +149,7 @@ public class IndexStatusManager logger.debug("Received index status for peer {}:\n Updated: {}\n Removed: {}", endpoint, updated, removed); } - catch (ParseException | IllegalArgumentException e) + catch (MarshalException | IllegalArgumentException e) { logger.warn("Unable to parse index status: {}", e.getMessage()); } @@ -185,7 +181,7 @@ public class IndexStatusManager // logged and this causes a number of dtests to fail. if (Gossiper.instance.isEnabled()) { - String newStatus = objectMapper.writeValueAsString(states); + String newStatus = JsonUtils.JSON_OBJECT_MAPPER.writeValueAsString(states); statusPropagationExecutor.submit(() -> { // schedule gossiper update asynchronously to avoid potential deadlock when another thread is holding // gossiper taskLock. diff --git a/src/java/org/apache/cassandra/index/sai/QueryContext.java b/src/java/org/apache/cassandra/index/sai/QueryContext.java index 4996acbd97..6bb85df219 100644 --- a/src/java/org/apache/cassandra/index/sai/QueryContext.java +++ b/src/java/org/apache/cassandra/index/sai/QueryContext.java @@ -25,6 +25,8 @@ import org.apache.cassandra.db.ReadCommand; import org.apache.cassandra.exceptions.QueryCancelledException; import org.apache.cassandra.utils.Clock; +import static org.apache.cassandra.config.CassandraRelevantProperties.SAI_TEST_DISABLE_TIMEOUT; + /** * Tracks state relevant to the execution of a single query, including metrics and timeout monitoring. * @@ -33,7 +35,7 @@ import org.apache.cassandra.utils.Clock; @NotThreadSafe public class QueryContext { - private static final boolean DISABLE_TIMEOUT = Boolean.getBoolean("cassandra.sai.test.disable.timeout"); + private static final boolean DISABLE_TIMEOUT = SAI_TEST_DISABLE_TIMEOUT.getBoolean(); private final ReadCommand readCommand; private final long queryStartTimeNanos; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/RowAwarePrimaryKeyMap.java b/src/java/org/apache/cassandra/index/sai/disk/v1/RowAwarePrimaryKeyMap.java index d06969f21a..1319006d21 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/RowAwarePrimaryKeyMap.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/RowAwarePrimaryKeyMap.java @@ -158,7 +158,7 @@ public class RowAwarePrimaryKeyMap implements PrimaryKeyMap @Override public long rowIdFromPrimaryKey(PrimaryKey key) { - return triePrefixSearcher.prefixSearch(key.asComparableBytes(ByteComparable.Version.OSS42)); + return triePrefixSearcher.prefixSearch(key.asComparableBytes(ByteComparable.Version.OSS50)); } @Override @@ -172,10 +172,10 @@ public class RowAwarePrimaryKeyMap implements PrimaryKeyMap try { cursor.seekToPointId(sstableRowId); - ByteSource.Peekable peekable = ByteSource.peekable(cursor.term().asComparableBytes(ByteComparable.Version.OSS42)); + ByteSource.Peekable peekable = ByteSource.peekable(cursor.term().asComparableBytes(ByteComparable.Version.OSS50)); Token token = partitioner.getTokenFactory().fromComparableBytes(ByteSourceInverse.nextComponentSource(peekable), - ByteComparable.Version.OSS42); + ByteComparable.Version.OSS50); byte[] keyBytes = ByteSourceInverse.getUnescapedBytes(ByteSourceInverse.nextComponentSource(peekable)); if (keyBytes == null) diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/SSTableIndexWriter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/SSTableIndexWriter.java index fc12c41c85..8248bd80ac 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/SSTableIndexWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/SSTableIndexWriter.java @@ -46,6 +46,9 @@ import org.apache.cassandra.utils.Clock; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.NoSpamLogger; +import static org.apache.cassandra.config.CassandraRelevantProperties.SAI_MAX_FROZEN_TERM_SIZE; +import static org.apache.cassandra.config.CassandraRelevantProperties.SAI_MAX_STRING_TERM_SIZE; + /** * Column index writer that accumulates (on-heap) indexed data from a compacted SSTable as it's being flushed to disk. */ @@ -55,8 +58,8 @@ public class SSTableIndexWriter implements PerColumnIndexWriter private static final Logger logger = LoggerFactory.getLogger(SSTableIndexWriter.class); private static final NoSpamLogger noSpamLogger = NoSpamLogger.getLogger(logger, 1, TimeUnit.MINUTES); - public static final int MAX_STRING_TERM_SIZE = Integer.getInteger("cassandra.sai.max_string_term_size_kb", 1) * 1024; - public static final int MAX_FROZEN_TERM_SIZE = Integer.getInteger("cassandra.sai.max_frozen_term_size_kb", 5) * 1024; + public static final int MAX_STRING_TERM_SIZE = SAI_MAX_STRING_TERM_SIZE.getInt() * 1024; + public static final int MAX_FROZEN_TERM_SIZE = SAI_MAX_FROZEN_TERM_SIZE.getInt() * 1024; public static final String TERM_OVERSIZE_MESSAGE = "Can't add term of column {} to index for key: {}, term size {} " + "max allowed size {}, use analyzed = true (if not yet set) for that column."; diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/sortedterms/SortedTermsWriter.java b/src/java/org/apache/cassandra/index/sai/disk/v1/sortedterms/SortedTermsWriter.java index 9cbb232649..a3b810680e 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/sortedterms/SortedTermsWriter.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/sortedterms/SortedTermsWriter.java @@ -195,7 +195,7 @@ public class SortedTermsWriter implements Closeable private void copyBytes(ByteComparable source, BytesRefBuilder dest) { - ByteSource byteSource = source.asComparableBytes(ByteComparable.Version.OSS42); + ByteSource byteSource = source.asComparableBytes(ByteComparable.Version.OSS50); int val; while ((val = byteSource.next()) != ByteSource.END_OF_STREAM) dest.append((byte) val); diff --git a/src/java/org/apache/cassandra/index/sai/disk/v1/trie/TriePrefixSearcher.java b/src/java/org/apache/cassandra/index/sai/disk/v1/trie/TriePrefixSearcher.java index 8acacd1aea..2fe6c46404 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/v1/trie/TriePrefixSearcher.java +++ b/src/java/org/apache/cassandra/index/sai/disk/v1/trie/TriePrefixSearcher.java @@ -28,10 +28,10 @@ import org.apache.cassandra.utils.bytecomparable.ByteSource; /** * Thread-unsafe specialized value -> long trie prefix searcher. - * + * <p> * This is a specialization of the {@link Walker} that will look for a prefix or * a complete term and return the first payload associated with the term. - * + * <p> * TODO Make generic to handle any payload type. * TODO Extend search to return first payload or all sub-payloads as iterator (LIKE support?) */ diff --git a/src/java/org/apache/cassandra/index/sai/utils/TypeUtil.java b/src/java/org/apache/cassandra/index/sai/utils/TypeUtil.java index e72b496395..220c24c337 100644 --- a/src/java/org/apache/cassandra/index/sai/utils/TypeUtil.java +++ b/src/java/org/apache/cassandra/index/sai/utils/TypeUtil.java @@ -118,7 +118,7 @@ public class TypeUtil */ public static ByteComparable min(ByteComparable a, ByteComparable b) { - return a == null ? b : (b == null || ByteComparable.compare(b, a, ByteComparable.Version.OSS42) > 0) ? a : b; + return a == null ? b : (b == null || ByteComparable.compare(b, a, ByteComparable.Version.OSS50) > 0) ? a : b; } /** @@ -127,7 +127,7 @@ public class TypeUtil */ public static ByteComparable max(ByteComparable a, ByteComparable b) { - return a == null ? b : (b == null || ByteComparable.compare(b, a, ByteComparable.Version.OSS42) < 0) ? a : b; + return a == null ? b : (b == null || ByteComparable.compare(b, a, ByteComparable.Version.OSS50) < 0) ? a : b; } public static AbstractType<?> cellValueType(ColumnMetadata columnMetadata, IndexTarget.Type indexType) @@ -474,7 +474,7 @@ public class TypeUtil public static ByteBuffer encodeDecimal(ByteBuffer value) { - ByteSource bs = DecimalType.instance.asComparableBytes(value, ByteComparable.Version.OSS42); + ByteSource bs = DecimalType.instance.asComparableBytes(value, ByteComparable.Version.OSS50); bs = ByteSource.cutOrRightPad(bs, DECIMAL_APPROXIMATION_BYTES, 0); return ByteBuffer.wrap(ByteSourceInverse.readBytes(bs, DECIMAL_APPROXIMATION_BYTES)); } diff --git a/src/java/org/apache/cassandra/io/sstable/format/bti/BtiTableWriter.java b/src/java/org/apache/cassandra/io/sstable/format/bti/BtiTableWriter.java index ea343fdd06..c5c175c802 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/bti/BtiTableWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/format/bti/BtiTableWriter.java @@ -18,6 +18,7 @@ package org.apache.cassandra.io.sstable.format.bti; import java.io.IOException; +import java.util.Collection; import java.util.function.Consumer; import java.util.function.Supplier; @@ -31,6 +32,7 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.DeletionTime; import org.apache.cassandra.db.lifecycle.LifecycleNewTracker; +import org.apache.cassandra.index.Index; import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.io.sstable.AbstractRowIndexEntry; @@ -379,9 +381,9 @@ public class BtiTableWriter extends SortedTableWriter<BtiFormatPartitionWriter> } @Override - public Builder addDefaultComponents() + public Builder addDefaultComponents(Collection<Index.Group> indexGroups) { - super.addDefaultComponents(); + super.addDefaultComponents(indexGroups); addComponents(ImmutableSet.of(Components.PARTITION_INDEX, Components.ROW_INDEX)); diff --git a/src/java/org/apache/cassandra/io/tries/TrieNode.java b/src/java/org/apache/cassandra/io/tries/TrieNode.java index 7da4ee39e0..02f7d15018 100644 --- a/src/java/org/apache/cassandra/io/tries/TrieNode.java +++ b/src/java/org/apache/cassandra/io/tries/TrieNode.java @@ -59,7 +59,7 @@ import org.apache.cassandra.io.util.SizedInts; public abstract class TrieNode { /** Value used to indicate a branch (e.g. for transition and lastTransition) does not exist. */ - public static int NONE = -1; + public static final int NONE = -1; // Consumption (read) methods diff --git a/src/java/org/apache/cassandra/io/tries/ValueIterator.java b/src/java/org/apache/cassandra/io/tries/ValueIterator.java index f44e6e1580..6ddbebad2a 100644 --- a/src/java/org/apache/cassandra/io/tries/ValueIterator.java +++ b/src/java/org/apache/cassandra/io/tries/ValueIterator.java @@ -36,17 +36,17 @@ public class ValueIterator<CONCRETE extends ValueIterator<CONCRETE>> extends Wal { private final ByteSource limit; private final TransitionBytesCollector collector; - private IterationPosition stack; + protected IterationPosition stack; private long next; - static class IterationPosition + public static class IterationPosition { final long node; final int limit; final IterationPosition prev; int childIndex; - IterationPosition(long node, int childIndex, int limit, IterationPosition prev) + public IterationPosition(long node, int childIndex, int limit, IterationPosition prev) { super(); this.node = node; @@ -207,7 +207,7 @@ public class ValueIterator<CONCRETE extends ValueIterator<CONCRETE>> extends Wal return collector.toByteComparable(); } - private long advanceNode() + protected long advanceNode() { long child; int transitionByte; diff --git a/test/unit/org/apache/cassandra/index/sai/SAITester.java b/test/unit/org/apache/cassandra/index/sai/SAITester.java index dc963153ae..9ec9ecb5b4 100644 --- a/test/unit/org/apache/cassandra/index/sai/SAITester.java +++ b/test/unit/org/apache/cassandra/index/sai/SAITester.java @@ -47,6 +47,7 @@ import javax.management.ObjectName; import com.google.common.collect.Sets; import org.junit.After; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Rule; import org.junit.rules.TestRule; import org.junit.rules.TestWatcher; @@ -98,6 +99,7 @@ import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.Throwables; import org.apache.lucene.codecs.CodecUtil; +import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_RANDOM_SEED; import static org.apache.cassandra.inject.ActionBuilder.newActionBuilder; import static org.apache.cassandra.inject.Expression.quote; import static org.apache.cassandra.inject.InvokePointBuilder.newInvokePoint; @@ -141,8 +143,11 @@ public abstract class SAITester extends CQLTester public static final PrimaryKey.Factory TEST_FACTORY = new PrimaryKey.Factory(EMPTY_COMPARATOR); - static + @BeforeClass + public static void setUpClass() { + CQLTester.setUpClass(); + // Ensure that the on-disk format statics are loaded before the test run Version.LATEST.onDiskFormat(); } @@ -556,7 +561,7 @@ public abstract class SAITester extends CQLTester return createTable(KEYSPACE, query); } - public UntypedResultSet execute(String query, Object... values) throws Throwable + public UntypedResultSet execute(String query, Object... values) { return executeFormattedQuery(formatQuery(query), values); } @@ -776,13 +781,13 @@ public abstract class SAITester extends CQLTester Randomization() { - seed = Long.getLong("cassandra.test.random.seed", System.nanoTime()); + seed = TEST_RANDOM_SEED.getLong(System.nanoTime()); random = new Random(seed); } public void printSeedOnFailure() { - logger.error("Randomized test failed. To rerun test use -Dcassandra.test.random.seed=" + seed); + logger.error("Randomized test failed. To rerun test use -D{}={}", TEST_RANDOM_SEED.getKey(), seed); } public int nextInt() diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/InvertedIndexSearcherTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/InvertedIndexSearcherTest.java index 02e0c5b0aa..485d2b095a 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/InvertedIndexSearcherTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/InvertedIndexSearcherTest.java @@ -213,6 +213,6 @@ public class InvertedIndexSearcherTest extends SAIRandomizedTester private ByteBuffer wrap(ByteComparable bc) { - return ByteBuffer.wrap(ByteSourceInverse.readBytes(bc.asComparableBytes(ByteComparable.Version.OSS42))); + return ByteBuffer.wrap(ByteSourceInverse.readBytes(bc.asComparableBytes(ByteComparable.Version.OSS50))); } } diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/SegmentFlushTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/SegmentFlushTest.java index 751064a9d5..5778a2a201 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/SegmentFlushTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/SegmentFlushTest.java @@ -208,7 +208,7 @@ public class SegmentFlushTest ByteComparable term = iterator.next(); PostingList postings = iterator.postings(); - assertEquals(0, ByteComparable.compare(term, ByteComparable.fixedLength(expectedTerm), ByteComparable.Version.OSS42)); + assertEquals(0, ByteComparable.compare(term, ByteComparable.fixedLength(expectedTerm), ByteComparable.Version.OSS50)); assertEquals(minSegmentRowId == maxSegmentRowId ? 1 : 2, postings.size()); } diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsReaderTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsReaderTest.java index 1566668dc4..f6c9a72e47 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsReaderTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsReaderTest.java @@ -91,7 +91,7 @@ public class TermsReaderTest extends SAIRandomizedTester for (ByteComparable term = iterator.next(); term != null; term = iterator.next()) { final ByteComparable expected = termsEnum.get(i++).left; - assertEquals(0, ByteComparable.compare(expected, term, ByteComparable.Version.OSS42)); + assertEquals(0, ByteComparable.compare(expected, term, ByteComparable.Version.OSS50)); } } } @@ -122,7 +122,7 @@ public class TermsReaderTest extends SAIRandomizedTester { for (Pair<ByteComparable, LongArrayList> pair : termsEnum) { - final byte[] bytes = ByteSourceInverse.readBytes(pair.left.asComparableBytes(ByteComparable.Version.OSS42)); + final byte[] bytes = ByteSourceInverse.readBytes(pair.left.asComparableBytes(ByteComparable.Version.OSS50)); QueryEventListener.TrieIndexEventListener listener = mock(QueryEventListener.TrieIndexEventListener.class); when(listener.postingListEventListener()).thenReturn(mock(QueryEventListener.PostingListEventListener.class)); try (PostingList actualPostingList = reader.exactMatch(ByteComparable.fixedLength(bytes), diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsScanner.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsScanner.java index 2626d172d1..b317f4f301 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsScanner.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/TermsScanner.java @@ -45,8 +45,8 @@ public class TermsScanner implements TermsIterator { this.postingsFile = postingsFile; this.iterator = new TrieTermsIterator(termFile.instantiateRebufferer(null), trieRoot); - this.minTerm = ByteBuffer.wrap(ByteSourceInverse.readBytes(iterator.getMinTerm().asComparableBytes(ByteComparable.Version.OSS42))); - this.maxTerm = ByteBuffer.wrap(ByteSourceInverse.readBytes(iterator.getMaxTerm().asComparableBytes(ByteComparable.Version.OSS42))); + this.minTerm = ByteBuffer.wrap(ByteSourceInverse.readBytes(iterator.getMinTerm().asComparableBytes(ByteComparable.Version.OSS50))); + this.maxTerm = ByteBuffer.wrap(ByteSourceInverse.readBytes(iterator.getMaxTerm().asComparableBytes(ByteComparable.Version.OSS50))); } @Override diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/sortedterms/SortedTermsTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/sortedterms/SortedTermsTest.java index cc7608cbb7..9192665de6 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/sortedterms/SortedTermsTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/sortedterms/SortedTermsTest.java @@ -75,13 +75,13 @@ public class SortedTermsTest extends SAIRandomizedTester trieWriter)) { ByteBuffer buffer = Int32Type.instance.decompose(99999); - ByteSource byteSource = Int32Type.instance.asComparableBytes(buffer, ByteComparable.Version.OSS42); + ByteSource byteSource = Int32Type.instance.asComparableBytes(buffer, ByteComparable.Version.OSS50); byte[] bytes1 = ByteSourceInverse.readBytes(byteSource); writer.add(ByteComparable.fixedLength(bytes1)); buffer = Int32Type.instance.decompose(444); - byteSource = Int32Type.instance.asComparableBytes(buffer, ByteComparable.Version.OSS42); + byteSource = Int32Type.instance.asComparableBytes(buffer, ByteComparable.Version.OSS50); byte[] bytes2 = ByteSourceInverse.readBytes(byteSource); assertThrows(IllegalArgumentException.class, () -> writer.add(ByteComparable.fixedLength(bytes2))); @@ -154,7 +154,7 @@ public class SortedTermsTest extends SAIRandomizedTester { ByteComparable term = cursor.term(); - byte[] bytes = ByteSourceInverse.readBytes(term.asComparableBytes(ByteComparable.Version.OSS42)); + byte[] bytes = ByteSourceInverse.readBytes(term.asComparableBytes(ByteComparable.Version.OSS50)); assertArrayEquals(terms.get(x), bytes); x++; } @@ -181,7 +181,7 @@ public class SortedTermsTest extends SAIRandomizedTester { ByteComparable term = cursor.term(); - byte[] bytes = ByteSourceInverse.readBytes(term.asComparableBytes(ByteComparable.Version.OSS42)); + byte[] bytes = ByteSourceInverse.readBytes(term.asComparableBytes(ByteComparable.Version.OSS50)); assertArrayEquals(terms.get(x), bytes); x++; @@ -210,7 +210,7 @@ public class SortedTermsTest extends SAIRandomizedTester cursor.seekToPointId(x); ByteComparable term = cursor.term(); - byte[] bytes = ByteSourceInverse.readBytes(term.asComparableBytes(ByteComparable.Version.OSS42)); + byte[] bytes = ByteSourceInverse.readBytes(term.asComparableBytes(ByteComparable.Version.OSS50)); assertArrayEquals(terms.get(x), bytes); } }); @@ -223,7 +223,7 @@ public class SortedTermsTest extends SAIRandomizedTester cursor.seekToPointId(x); ByteComparable term = cursor.term(); - byte[] bytes = ByteSourceInverse.readBytes(term.asComparableBytes(ByteComparable.Version.OSS42)); + byte[] bytes = ByteSourceInverse.readBytes(term.asComparableBytes(ByteComparable.Version.OSS50)); assertArrayEquals(terms.get(x), bytes); } }); @@ -237,7 +237,7 @@ public class SortedTermsTest extends SAIRandomizedTester cursor.seekToPointId(target); ByteComparable term = cursor.term(); - byte[] bytes = ByteSourceInverse.readBytes(term.asComparableBytes(ByteComparable.Version.OSS42)); + byte[] bytes = ByteSourceInverse.readBytes(term.asComparableBytes(ByteComparable.Version.OSS50)); assertArrayEquals(terms.get(target), bytes); } }); @@ -276,7 +276,7 @@ public class SortedTermsTest extends SAIRandomizedTester for (int x = 0; x < 1000 * 4; x++) { ByteBuffer buffer = Int32Type.instance.decompose(x); - ByteSource byteSource = Int32Type.instance.asComparableBytes(buffer, ByteComparable.Version.OSS42); + ByteSource byteSource = Int32Type.instance.asComparableBytes(buffer, ByteComparable.Version.OSS50); byte[] bytes = ByteSourceInverse.readBytes(byteSource); terms.add(bytes); diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/trie/TriePrefixSearcherTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/trie/TriePrefixSearcherTest.java index 8f5ac200a6..5537f05e2d 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/trie/TriePrefixSearcherTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/trie/TriePrefixSearcherTest.java @@ -52,9 +52,9 @@ public class TriePrefixSearcherTest extends SAIRandomizedTester try (FileHandle trieFileHandle = indexDescriptor.createPerSSTableFileHandle(IndexComponent.PRIMARY_KEY_TRIE); TriePrefixSearcher searcher = new TriePrefixSearcher(trieFileHandle.instantiateRebufferer(null), trieFilePointer)) { - assertEquals(1L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("abcdef"), ByteComparable.Version.OSS42))); - assertEquals(2L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("abdefg"), ByteComparable.Version.OSS42))); - assertEquals(3L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("abdfgh"), ByteComparable.Version.OSS42))); + assertEquals(1L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("abcdef"), ByteComparable.Version.OSS50))); + assertEquals(2L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("abdefg"), ByteComparable.Version.OSS50))); + assertEquals(3L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("abdfgh"), ByteComparable.Version.OSS50))); } } @@ -66,13 +66,13 @@ public class TriePrefixSearcherTest extends SAIRandomizedTester try (FileHandle trieFileHandle = indexDescriptor.createPerSSTableFileHandle(IndexComponent.PRIMARY_KEY_TRIE); TriePrefixSearcher searcher = new TriePrefixSearcher(trieFileHandle.instantiateRebufferer(null), trieFilePointer)) { - assertEquals(1L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString(""), ByteComparable.Version.OSS42))); - assertEquals(1L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("a"), ByteComparable.Version.OSS42))); - assertEquals(1L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("ab"), ByteComparable.Version.OSS42))); - assertEquals(1L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("abc"), ByteComparable.Version.OSS42))); - assertEquals(2L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("abd"), ByteComparable.Version.OSS42))); - assertEquals(2L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("abde"), ByteComparable.Version.OSS42))); - assertEquals(3L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("abdf"), ByteComparable.Version.OSS42))); + assertEquals(1L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString(""), ByteComparable.Version.OSS50))); + assertEquals(1L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("a"), ByteComparable.Version.OSS50))); + assertEquals(1L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("ab"), ByteComparable.Version.OSS50))); + assertEquals(1L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("abc"), ByteComparable.Version.OSS50))); + assertEquals(2L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("abd"), ByteComparable.Version.OSS50))); + assertEquals(2L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("abde"), ByteComparable.Version.OSS50))); + assertEquals(3L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("abdf"), ByteComparable.Version.OSS50))); } } @@ -84,7 +84,7 @@ public class TriePrefixSearcherTest extends SAIRandomizedTester try (FileHandle trieFileHandle = indexDescriptor.createPerSSTableFileHandle(IndexComponent.PRIMARY_KEY_TRIE); TriePrefixSearcher searcher = new TriePrefixSearcher(trieFileHandle.instantiateRebufferer(null), trieFilePointer)) { - assertEquals(-1L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("b"), ByteComparable.Version.OSS42))); + assertEquals(-1L, searcher.prefixSearch(UTF8Type.instance.asComparableBytes(UTF8Type.instance.fromString("b"), ByteComparable.Version.OSS50))); } } @@ -96,10 +96,10 @@ public class TriePrefixSearcherTest extends SAIRandomizedTester try (FileHandle trieFileHandle = indexDescriptor.createPerSSTableFileHandle(IndexComponent.PRIMARY_KEY_TRIE); TriePrefixSearcher searcher = new TriePrefixSearcher(trieFileHandle.instantiateRebufferer(null), trieFilePointer)) { - assertEquals(1L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS42, "abc", "def", "ghi"))); - assertEquals(2L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS42, "abc", "def", "jkl"))); - assertEquals(3L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS42, "abc", "ghi", "jkl"))); - assertEquals(4L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS42, "def", "ghi", "jkl"))); + assertEquals(1L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS50, "abc", "def", "ghi"))); + assertEquals(2L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS50, "abc", "def", "jkl"))); + assertEquals(3L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS50, "abc", "ghi", "jkl"))); + assertEquals(4L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS50, "def", "ghi", "jkl"))); } } @@ -111,14 +111,14 @@ public class TriePrefixSearcherTest extends SAIRandomizedTester try (FileHandle trieFileHandle = indexDescriptor.createPerSSTableFileHandle(IndexComponent.PRIMARY_KEY_TRIE); TriePrefixSearcher searcher = new TriePrefixSearcher(trieFileHandle.instantiateRebufferer(null), trieFilePointer)) { - assertEquals(1L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS42, "ab"))); - assertEquals(1L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS42, "abc"))); - assertEquals(1L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS42, "abc", "de"))); - assertEquals(1L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS42, "abc", "def"))); - assertEquals(1L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS42, "abc", "def", "gh"))); - assertEquals(2L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS42, "abc", "def", "jk"))); - assertEquals(3L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS42, "abc", "ghi"))); - assertEquals(4L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS42, "d"))); + assertEquals(1L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS50, "ab"))); + assertEquals(1L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS50, "abc"))); + assertEquals(1L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS50, "abc", "de"))); + assertEquals(1L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS50, "abc", "def"))); + assertEquals(1L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS50, "abc", "def", "gh"))); + assertEquals(2L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS50, "abc", "def", "jk"))); + assertEquals(3L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS50, "abc", "ghi"))); + assertEquals(4L, searcher.prefixSearch(createMultiPart(ByteComparable.Version.OSS50, "d"))); } } diff --git a/test/unit/org/apache/cassandra/index/sai/disk/v1/trie/TrieTermsDictionaryTest.java b/test/unit/org/apache/cassandra/index/sai/disk/v1/trie/TrieTermsDictionaryTest.java index 6b672032a9..273765c3e8 100644 --- a/test/unit/org/apache/cassandra/index/sai/disk/v1/trie/TrieTermsDictionaryTest.java +++ b/test/unit/org/apache/cassandra/index/sai/disk/v1/trie/TrieTermsDictionaryTest.java @@ -39,7 +39,7 @@ import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.bytecomparable.ByteComparable; -import static org.apache.cassandra.utils.bytecomparable.ByteComparable.Version.OSS42; +import static org.apache.cassandra.utils.bytecomparable.ByteComparable.Version.OSS50; import static org.apache.cassandra.utils.bytecomparable.ByteComparable.compare; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -114,7 +114,7 @@ public class TrieTermsDictionaryTest extends SAIRandomizedTester assertTrue(expected.hasNext()); final Pair<ByteComparable, Long> actual = iterator.next(); - assertEquals(0, compare(expected.next(), actual.left, OSS42)); + assertEquals(0, compare(expected.next(), actual.left, OSS50)); assertEquals(offset++, actual.right.longValue()); } assertFalse(expected.hasNext()); @@ -141,11 +141,11 @@ public class TrieTermsDictionaryTest extends SAIRandomizedTester { final ByteComparable expectedMaxTerm = byteComparables.get(byteComparables.size() - 1); final ByteComparable actualMaxTerm = reader.getMaxTerm(); - assertEquals(0, compare(expectedMaxTerm, actualMaxTerm, OSS42)); + assertEquals(0, compare(expectedMaxTerm, actualMaxTerm, OSS50)); final ByteComparable expectedMinTerm = byteComparables.get(0); final ByteComparable actualMinTerm = reader.getMinTerm(); - assertEquals(0, compare(expectedMinTerm, actualMinTerm, OSS42)); + assertEquals(0, compare(expectedMinTerm, actualMinTerm, OSS50)); } } diff --git a/test/unit/org/apache/cassandra/index/sai/memory/RAMStringIndexerTest.java b/test/unit/org/apache/cassandra/index/sai/memory/RAMStringIndexerTest.java index cc7424892f..56ea67a1d1 100644 --- a/test/unit/org/apache/cassandra/index/sai/memory/RAMStringIndexerTest.java +++ b/test/unit/org/apache/cassandra/index/sai/memory/RAMStringIndexerTest.java @@ -95,7 +95,7 @@ public class RAMStringIndexerTest extends SAIRandomizedTester while (terms.hasNext()) { term = terms.next(); - final ByteBuffer decoded = ByteBuffer.wrap(ByteSourceInverse.readBytes(term.asComparableBytes(ByteComparable.Version.OSS42))); + final ByteBuffer decoded = ByteBuffer.wrap(ByteSourceInverse.readBytes(term.asComparableBytes(ByteComparable.Version.OSS50))); assertEquals(String.format("%04d", termOrd), string(decoded)); try (PostingList postingList = terms.postings()) diff --git a/test/unit/org/apache/cassandra/index/sai/memory/TrieMemoryIndexTest.java b/test/unit/org/apache/cassandra/index/sai/memory/TrieMemoryIndexTest.java index be5d3bae2d..9cf8ff5318 100644 --- a/test/unit/org/apache/cassandra/index/sai/memory/TrieMemoryIndexTest.java +++ b/test/unit/org/apache/cassandra/index/sai/memory/TrieMemoryIndexTest.java @@ -220,7 +220,7 @@ public class TrieMemoryIndexTest extends SAIRandomizedTester ? ByteComparable.fixedLength(decompose.apply(rowId)) : version -> type.asComparableBytes(decompose.apply(rowId), version); final ByteComparable actualByteComparable = pair.left; - assertEquals("Mismatch at: " + i, 0, ByteComparable.compare(expectedByteComparable, actualByteComparable, ByteComparable.Version.OSS42)); + assertEquals("Mismatch at: " + i, 0, ByteComparable.compare(expectedByteComparable, actualByteComparable, ByteComparable.Version.OSS50)); i++; } diff --git a/test/unit/org/apache/cassandra/index/sai/plan/OperationTest.java b/test/unit/org/apache/cassandra/index/sai/plan/OperationTest.java index 10ed7f5035..e4da6c9fe3 100644 --- a/test/unit/org/apache/cassandra/index/sai/plan/OperationTest.java +++ b/test/unit/org/apache/cassandra/index/sai/plan/OperationTest.java @@ -71,6 +71,7 @@ import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.utils.FBUtilities; +import static org.apache.cassandra.config.CassandraRelevantProperties.CASSANDRA_CONFIG; import static org.apache.cassandra.db.marshal.Int32Type.instance; public class OperationTest @@ -91,7 +92,7 @@ public class OperationTest @BeforeClass public static void loadSchema() throws ConfigurationException { - System.setProperty("cassandra.config", "cassandra-murmur.yaml"); + CASSANDRA_CONFIG.setString("cassandra-murmur.yaml"); SchemaLoader.loadSchema(); diff --git a/test/unit/org/apache/cassandra/index/sai/utils/AbstractPrimaryKeyTester.java b/test/unit/org/apache/cassandra/index/sai/utils/AbstractPrimaryKeyTester.java index 2897d9983d..77d334ccab 100644 --- a/test/unit/org/apache/cassandra/index/sai/utils/AbstractPrimaryKeyTester.java +++ b/test/unit/org/apache/cassandra/index/sai/utils/AbstractPrimaryKeyTester.java @@ -122,7 +122,7 @@ public class AbstractPrimaryKeyTester extends SAIRandomizedTester { assertEquals(expected, ByteComparable.compare(a::asComparableBytes, b::asComparableBytes, - ByteComparable.Version.OSS42)); + ByteComparable.Version.OSS50)); } void assertCompareToAndEquals(PrimaryKey a, PrimaryKey b, int expected) diff --git a/test/unit/org/apache/cassandra/index/sai/utils/TypeUtilTest.java b/test/unit/org/apache/cassandra/index/sai/utils/TypeUtilTest.java index 642233ac57..9f91c271ba 100644 --- a/test/unit/org/apache/cassandra/index/sai/utils/TypeUtilTest.java +++ b/test/unit/org/apache/cassandra/index/sai/utils/TypeUtilTest.java @@ -245,7 +245,7 @@ public class TypeUtilTest extends SAIRandomizedTester // simulate: saving into on-disk trie ByteComparable t0 = ByteComparable.fixedLength(b0); ByteComparable t1 = ByteComparable.fixedLength(b1); - assertTrue("#" + i, ByteComparable.compare(t0, t1, ByteComparable.Version.OSS42) <= 0); + assertTrue("#" + i, ByteComparable.compare(t0, t1, ByteComparable.Version.OSS50) <= 0); } } } diff --git a/test/unit/org/apache/cassandra/index/sai/virtual/SegmentsSystemViewTest.java b/test/unit/org/apache/cassandra/index/sai/virtual/SegmentsSystemViewTest.java index f37dcf86f0..910f9f11fa 100644 --- a/test/unit/org/apache/cassandra/index/sai/virtual/SegmentsSystemViewTest.java +++ b/test/unit/org/apache/cassandra/index/sai/virtual/SegmentsSystemViewTest.java @@ -51,6 +51,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; +import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_ENCRYPTION; + /** * Tests the virtual table exposing SSTable index segment metadata. */ @@ -170,7 +172,7 @@ public class SegmentsSystemViewTest extends SAITester indexLengths.put(indexType, value + length); } } - if (!Boolean.parseBoolean(System.getProperty("cassandra.test.encryption", "false"))) + if (!TEST_ENCRYPTION.getBoolean()) assertEquals(indexFileLengths(), indexLengths); } diff --git a/test/unit/org/apache/cassandra/io/tries/WalkerTest.java b/test/unit/org/apache/cassandra/io/tries/WalkerTest.java index deb37e743a..d47bf4d2b9 100644 --- a/test/unit/org/apache/cassandra/io/tries/WalkerTest.java +++ b/test/unit/org/apache/cassandra/io/tries/WalkerTest.java @@ -307,5 +307,4 @@ public class WalkerTest extends AbstractTrieTestBase s = StringUtils.leftPad(s, size, '0'); return source(s); } - } diff --git a/test/unit/org/apache/cassandra/io/util/SizedIntsTest.java b/test/unit/org/apache/cassandra/io/util/SizedIntsTest.java index 9a3a953fcf..8793d46431 100644 --- a/test/unit/org/apache/cassandra/io/util/SizedIntsTest.java +++ b/test/unit/org/apache/cassandra/io/util/SizedIntsTest.java @@ -35,7 +35,6 @@ import static org.quicktheories.generators.SourceDSL.longs; public class SizedIntsTest { - @Test public void nonZeroSize() { diff --git a/test/unit/org/apache/cassandra/io/util/TailOverridingRebuffererTest.java b/test/unit/org/apache/cassandra/io/util/TailOverridingRebuffererTest.java index 7bb65a04bd..85da3573c8 100644 --- a/test/unit/org/apache/cassandra/io/util/TailOverridingRebuffererTest.java +++ b/test/unit/org/apache/cassandra/io/util/TailOverridingRebuffererTest.java @@ -18,7 +18,6 @@ package org.apache.cassandra.io.util; -import java.io.IOException; import java.nio.ByteBuffer; import org.junit.Test; @@ -32,7 +31,6 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; - public class TailOverridingRebuffererTest { ByteBuffer head = ByteBuffer.wrap(new byte[]{ 1, 2, 3, 4, 5, 6, 7, 8 }); @@ -101,7 +99,7 @@ public class TailOverridingRebuffererTest } @Test - public void testOtherMethods() throws IOException + public void testOtherMethods() { Rebufferer tor = new TailOverridingRebufferer(r, 8, tail.duplicate()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
