This is an automated email from the ASF dual-hosted git repository.
maedhroz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit cba3e19ccd81d705ca9f89c0eedab65824e9dd16
Author: Mike Adamson <madam...@datastax.com>
AuthorDate: Wed May 10 15:05:15 2023 +0100
Query all ranges at once for SAI distributed queries
patch by Mike Adamson; reviewed by Caleb Rackliffe, Andres de la Peña, and
Berenguer Blasi for CASSANDRA-18515
---
.../service/reads/range/RangeCommands.java | 31 +++--
.../test/sai/ConcurrencyFactorTest.java | 133 +++++++++++++++++++++
2 files changed, 154 insertions(+), 10 deletions(-)
diff --git
a/src/java/org/apache/cassandra/service/reads/range/RangeCommands.java
b/src/java/org/apache/cassandra/service/reads/range/RangeCommands.java
index 865b03d487..ca1ceebe76 100644
--- a/src/java/org/apache/cassandra/service/reads/range/RangeCommands.java
+++ b/src/java/org/apache/cassandra/service/reads/range/RangeCommands.java
@@ -79,19 +79,30 @@ public class RangeCommands
keyspace,
consistencyLevel);
- // our estimate of how many result rows there will be per-range
- float resultsPerRange = estimateResultsPerRange(command, keyspace);
- // underestimate how many rows we will get per-range in order to
increase the likelihood that we'll
- // fetch enough rows in the first round
- resultsPerRange -= resultsPerRange * CONCURRENT_SUBREQUESTS_MARGIN;
int maxConcurrencyFactor = Math.min(replicaPlans.size(),
MAX_CONCURRENT_RANGE_REQUESTS);
- int concurrencyFactor = resultsPerRange == 0.0
+ int concurrencyFactor = maxConcurrencyFactor;
+ Index.QueryPlan queryPlan = command.indexQueryPlan();
+ if (queryPlan == null || queryPlan.shouldEstimateInitialConcurrency())
+ {
+ // our estimate of how many result rows there will be per-range
+ float resultsPerRange = estimateResultsPerRange(command, keyspace);
+ // underestimate how many rows we will get per-range in order to
increase the likelihood that we'll
+ // fetch enough rows in the first round
+ resultsPerRange -= resultsPerRange * CONCURRENT_SUBREQUESTS_MARGIN;
+ concurrencyFactor = resultsPerRange == 0.0
? 1
: Math.max(1, Math.min(maxConcurrencyFactor,
(int) Math.ceil(command.limits().count() / resultsPerRange)));
- logger.trace("Estimated result rows per range: {}; requested rows: {},
ranges.size(): {}; concurrent range requests: {}",
- resultsPerRange, command.limits().count(),
replicaPlans.size(), concurrencyFactor);
- Tracing.trace("Submitting range requests on {} ranges with a
concurrency of {} ({} rows per range expected)",
- replicaPlans.size(), concurrencyFactor, resultsPerRange);
+ logger.trace("Estimated result rows per range: {}; requested rows:
{}, ranges.size(): {}; concurrent range requests: {}",
+ resultsPerRange, command.limits().count(),
replicaPlans.size(), concurrencyFactor);
+ Tracing.trace("Submitting range requests on {} ranges with a
concurrency of {} ({} rows per range expected)",
+ replicaPlans.size(), concurrencyFactor,
resultsPerRange);
+ }
+ else
+ {
+ logger.trace("Max concurrent range requests: {}; requested rows:
{}, ranges.size(): {}; concurrent range requests: {}",
+ MAX_CONCURRENT_RANGE_REQUESTS,
command.limits().count(), replicaPlans.size(), concurrencyFactor);
+ Tracing.trace("Submitting range requests on {} ranges with a
concurrency of {}", replicaPlans.size(), concurrencyFactor);
+ }
ReplicaPlanMerger mergedReplicaPlans = new
ReplicaPlanMerger(replicaPlans, keyspace, consistencyLevel);
return new RangeCommandIterator(mergedReplicaPlans,
diff --git
a/test/distributed/org/apache/cassandra/distributed/test/sai/ConcurrencyFactorTest.java
b/test/distributed/org/apache/cassandra/distributed/test/sai/ConcurrencyFactorTest.java
new file mode 100644
index 0000000000..6c39591c2f
--- /dev/null
+++
b/test/distributed/org/apache/cassandra/distributed/test/sai/ConcurrencyFactorTest.java
@@ -0,0 +1,133 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.distributed.test.sai;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.cassandra.distributed.Cluster;
+import org.apache.cassandra.distributed.api.ConsistencyLevel;
+import org.apache.cassandra.distributed.api.TokenSupplier;
+import org.apache.cassandra.distributed.impl.TracingUtil;
+import org.apache.cassandra.distributed.test.TestBaseImpl;
+import org.apache.cassandra.utils.TimeUUID;
+
+import static org.awaitility.Awaitility.await;
+
+public class ConcurrencyFactorTest extends TestBaseImpl
+{
+ private static final String SAI_TABLE = "sai_simple_primary_key";
+ private static final int NODES = 3;
+
+ private Cluster cluster;
+
+ @Before
+ public void init() throws IOException
+ {
+ cluster =
init(Cluster.build(NODES).withTokenSupplier(generateTokenSupplier()).withTokenCount(1).start());
+ }
+
+ @After
+ public void cleanup()
+ {
+ cluster.close();
+ }
+
+ @Test
+ public void testInitialConcurrencySelection()
+ {
+ cluster.schemaChange(String.format("CREATE TABLE %s.%s (pk int, state
ascii, gdp bigint, PRIMARY KEY (pk)) WITH compaction = " +
+ " {'class' :
'SizeTieredCompactionStrategy', 'enabled' : false }", KEYSPACE, SAI_TABLE));
+ cluster.schemaChange(String.format("CREATE CUSTOM INDEX ON %s.%s (gdp)
USING 'StorageAttachedIndex'", KEYSPACE, SAI_TABLE));
+
+ String template = "INSERT INTO %s.%s (pk, state, gdp) VALUES (%s, %s)";
+ Random rnd = new Random();
+ String fakeState, rowData;
+ int i = 0;
+ for (long val = 1_000_000_000L; val <= 16_000_000_000L; val +=
1_000_000_000L)
+ {
+ fakeState = String.format("%c%c", (char)(rnd.nextInt(26) + 'A'),
(char)(rnd.nextInt(26) + 'A'));
+ rowData = String.format("'%s', %s", fakeState, val);
+ cluster.coordinator(1).execute(String.format(template, KEYSPACE,
SAI_TABLE, i++, rowData), ConsistencyLevel.LOCAL_ONE);
+ }
+
+ // flush all nodes, expected row distribution by partition key value
+ // node0: 9, 14, 12, 3
+ // node1: 5, 10, 13, 11, 1, 8, 0, 2
+ // node2: 4, 15, 7, 6
+ cluster.forEach((node) -> node.flush(KEYSPACE));
+
+ // We are expecting any of 3 specific trace messages indicating how
the query has been handled:
+ //
+ // Submitting range requests on <n> ranges with a concurrency of <n>
+ // Initial concurrency wasn't estimated and max concurrency was used
instead (and SAI index was involved)
+ // Submitting range requests on <n> ranges with a concurrency of <n>
(<m> rows per range expected)
+ // Initial concurrency was estimated based on estimated rows per
range (non-SAI range query)
+ // Executing single-partition query on <table>
+ // Non-range single-partition query
+
+ // SAI range query so should bypass initial concurrency estimation
+ String query = String.format("SELECT state FROM %s.%s WHERE gdp > ?
AND gdp < ? LIMIT 20", KEYSPACE, SAI_TABLE);
+ runAndValidate("Submitting range requests on 3 ranges with a
concurrency of 3", query, 3_000_000_000L, 7_000_000_000L);
+
+ // Partition-restricted query so not a range query
+ query = String.format("SELECT state FROM %s.%s WHERE pk = ?",
KEYSPACE, SAI_TABLE);
+ runAndValidate("Executing single-partition query on
sai_simple_primary_key", query, 0);
+
+ // Token-restricted range query not using SAI so should use initial
concurrency estimation
+ query = String.format("SELECT * FROM %s.%s WHERE token(pk) > 0",
KEYSPACE, SAI_TABLE);
+ runAndValidate("Submitting range requests on 2 ranges with a
concurrency of 2 (230.4 rows per range expected)", query);
+
+ // Token-restricted range query with SAI so should bypass initial
concurrency estimation
+ query = String.format("SELECT * FROM %s.%s WHERE token(pk) > 0 AND gdp
> ?", KEYSPACE, SAI_TABLE);
+ runAndValidate("Submitting range requests on 2 ranges with a
concurrency of 2", query, 3_000_000_000L);
+ }
+
+ /**
+ * Run the given query and check that the given trace message exists in
the trace entries.
+ */
+ private void runAndValidate(String trace, String query, Object...
bondValues)
+ {
+ UUID sessionId = TimeUUID.Generator.nextTimeAsUUID();
+
+ cluster.coordinator(1).executeWithTracingWithResult(sessionId, query,
ConsistencyLevel.ALL, bondValues);
+
+ await().atMost(5, TimeUnit.SECONDS).until(() -> {
+ List<TracingUtil.TraceEntry> traceEntries =
TracingUtil.getTrace(cluster, sessionId, ConsistencyLevel.ONE);
+ return traceEntries.stream().anyMatch(entry ->
entry.activity.equals(trace));
+ });
+ }
+
+ private static TokenSupplier generateTokenSupplier()
+ {
+ List<List<String>> tokens =
Arrays.asList(Collections.singletonList("-9223372036854775808"),
+
Collections.singletonList("-3074457345618258602"),
+
Collections.singletonList("3074457345618258603"));
+ return nodeIdx -> tokens.get(nodeIdx - 1);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
