adelapena commented on code in PR #2463: URL: https://github.com/apache/cassandra/pull/2463#discussion_r1250768143
########## test/distributed/org/apache/cassandra/distributed/test/sai/ConcurrencyFactorTest.java: ########## @@ -0,0 +1,138 @@ +/* + * 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.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.impl.TracingUtil; +import org.apache.cassandra.distributed.test.TestBaseImpl; +import org.apache.cassandra.utils.TimeUUID; + +import static org.apache.cassandra.distributed.api.Feature.GOSSIP; +import static org.apache.cassandra.distributed.api.Feature.NETWORK; +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 org.apache.cassandra.distributed.Cluster cluster; + + @Before + public void init() throws IOException + { + cluster = init(Cluster.build(nodes).withTokenSupplier(node -> { + switch (node) + { + case 1: return -9223372036854775808L; + case 2: return -3074457345618258602L; + case 3: return 3074457345618258603L; + default: throw new IllegalArgumentException(); Review Comment: This version of token supplier seems deprecated. It seems all dtests have moved to use `withTokenSupplier(TokenSupplier.evenlyDistributedTokens(NODES, 1))`. I guess we could use that here too, but that would produce a slightly different distribution, so we might prefer to leave the current deprecated token supplier as it is. ########## test/distributed/org/apache/cassandra/distributed/test/sai/ConcurrencyFactorTest.java: ########## @@ -0,0 +1,138 @@ +/* + * 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.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.impl.TracingUtil; +import org.apache.cassandra.distributed.test.TestBaseImpl; +import org.apache.cassandra.utils.TimeUUID; + +import static org.apache.cassandra.distributed.api.Feature.GOSSIP; +import static org.apache.cassandra.distributed.api.Feature.NETWORK; +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; Review Comment: Nit: use upper case for the constant ```suggestion private static final int NODES = 3; ``` ########## src/java/org/apache/cassandra/service/reads/range/RangeCommands.java: ########## @@ -79,19 +79,30 @@ static RangeCommandIterator rangeCommandIterator(PartitionRangeReadCommand comma 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()) Review Comment: ```suggestion if (queryPlan == null || queryPlan.shouldEstimateInitialConcurrency()) ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
