github-advanced-security[bot] commented on code in PR #18777: URL: https://github.com/apache/druid/pull/18777#discussion_r2558243184
########## embedded-tests/src/test/java/org/apache/druid/testing/embedded/msq/HighPartitionNumberTest.java: ########## @@ -0,0 +1,129 @@ +/* + * 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.druid.testing.embedded.msq; + +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.msq.exec.ClusterStatisticsMergeMode; +import org.apache.druid.msq.util.MultiStageQueryContext; +import org.apache.druid.query.http.SqlTaskStatus; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.testing.embedded.EmbeddedBroker; +import org.apache.druid.testing.embedded.EmbeddedCoordinator; +import org.apache.druid.testing.embedded.EmbeddedDruidCluster; +import org.apache.druid.testing.embedded.EmbeddedHistorical; +import org.apache.druid.testing.embedded.EmbeddedIndexer; +import org.apache.druid.testing.embedded.EmbeddedOverlord; +import org.apache.druid.testing.embedded.indexing.MoreResources; +import org.apache.druid.testing.embedded.indexing.Resources; +import org.apache.druid.testing.embedded.junit5.EmbeddedClusterTestBase; +import org.apache.druid.timeline.partition.PartitionIds; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import java.util.Map; + +/** + * Test to verify that high partition numbers (above the limit of {@link PartitionIds#ROOT_GEN_END_PARTITION_ID}) + * work correctly when segment locking is not in play. + */ +public class HighPartitionNumberTest extends EmbeddedClusterTestBase +{ + /** + * Expected number of rows for {@link Resources.DataFile#tinyWiki1Json()}. + */ + private static final int EXPECTED_TOTAL_ROWS = 3; + + private final EmbeddedBroker broker = new EmbeddedBroker(); + private final EmbeddedOverlord overlord = new EmbeddedOverlord(); + private final EmbeddedCoordinator coordinator = new EmbeddedCoordinator(); + private final EmbeddedIndexer indexer = new EmbeddedIndexer() + .setServerMemory(300_000_000L) + .addProperty("druid.worker.capacity", "2"); + + private EmbeddedMSQApis msqApis; + + @Override + protected EmbeddedDruidCluster createCluster() + { + return EmbeddedDruidCluster + .withEmbeddedDerbyAndZookeeper() + .useLatchableEmitter() + .useDefaultTimeoutForLatchableEmitter(180_000) + .addServer(overlord) + .addServer(coordinator) + .addServer(indexer) + .addServer(broker) + .addServer(new EmbeddedHistorical()) + .addCommonProperty( // Start at a high number so we don't need to individually create 30k+ segments + "druid.indexer.tasklock.initialAllocationPartitionNumber", + String.valueOf(PartitionIds.ROOT_GEN_END_PARTITION_ID - 1) + ); + } + + @BeforeAll + public void initTestClient() + { + msqApis = new EmbeddedMSQApis(cluster, overlord); + } + + @Test + public void testHighPartitionNumbers() + { + // Insert tinyWiki1Json in 3 segments (it's a 3 line file). + String queryLocal = StringUtils.format( + MoreResources.MSQ.INSERT_TINY_WIKI_JSON, + dataSource, + Resources.DataFile.tinyWiki1Json() + ); + + Map<String, Object> context = Map.of( + MultiStageQueryContext.CTX_CLUSTER_STATISTICS_MERGE_MODE, + ClusterStatisticsMergeMode.PARALLEL, + MultiStageQueryContext.CTX_ROWS_PER_SEGMENT, + 1 + ); + + final SqlTaskStatus sqlTaskStatus = msqApis.submitTaskSql(context, queryLocal); + cluster.callApi().waitForTaskToSucceed(sqlTaskStatus.getTaskId(), overlord); + cluster.callApi().waitForAllSegmentsToBeAvailable(dataSource, coordinator, broker); + + // Verify that we have segments with partition numbers slightly above and below the old limit + final int minPartitionNum = Integer.parseInt(cluster.runSql( + "SELECT MIN(partition_num) FROM sys.segments WHERE datasource=%s", + Calcites.escapeStringLiteral(dataSource) + ).trim()); Review Comment: ## Missing catch of NumberFormatException Potential uncaught 'java.lang.NumberFormatException'. [Show more details](https://github.com/apache/druid/security/code-scanning/10567) ########## embedded-tests/src/test/java/org/apache/druid/testing/embedded/msq/HighPartitionNumberTest.java: ########## @@ -0,0 +1,129 @@ +/* + * 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.druid.testing.embedded.msq; + +import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.msq.exec.ClusterStatisticsMergeMode; +import org.apache.druid.msq.util.MultiStageQueryContext; +import org.apache.druid.query.http.SqlTaskStatus; +import org.apache.druid.sql.calcite.planner.Calcites; +import org.apache.druid.testing.embedded.EmbeddedBroker; +import org.apache.druid.testing.embedded.EmbeddedCoordinator; +import org.apache.druid.testing.embedded.EmbeddedDruidCluster; +import org.apache.druid.testing.embedded.EmbeddedHistorical; +import org.apache.druid.testing.embedded.EmbeddedIndexer; +import org.apache.druid.testing.embedded.EmbeddedOverlord; +import org.apache.druid.testing.embedded.indexing.MoreResources; +import org.apache.druid.testing.embedded.indexing.Resources; +import org.apache.druid.testing.embedded.junit5.EmbeddedClusterTestBase; +import org.apache.druid.timeline.partition.PartitionIds; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import java.util.Map; + +/** + * Test to verify that high partition numbers (above the limit of {@link PartitionIds#ROOT_GEN_END_PARTITION_ID}) + * work correctly when segment locking is not in play. + */ +public class HighPartitionNumberTest extends EmbeddedClusterTestBase +{ + /** + * Expected number of rows for {@link Resources.DataFile#tinyWiki1Json()}. + */ + private static final int EXPECTED_TOTAL_ROWS = 3; + + private final EmbeddedBroker broker = new EmbeddedBroker(); + private final EmbeddedOverlord overlord = new EmbeddedOverlord(); + private final EmbeddedCoordinator coordinator = new EmbeddedCoordinator(); + private final EmbeddedIndexer indexer = new EmbeddedIndexer() + .setServerMemory(300_000_000L) + .addProperty("druid.worker.capacity", "2"); + + private EmbeddedMSQApis msqApis; + + @Override + protected EmbeddedDruidCluster createCluster() + { + return EmbeddedDruidCluster + .withEmbeddedDerbyAndZookeeper() + .useLatchableEmitter() + .useDefaultTimeoutForLatchableEmitter(180_000) + .addServer(overlord) + .addServer(coordinator) + .addServer(indexer) + .addServer(broker) + .addServer(new EmbeddedHistorical()) + .addCommonProperty( // Start at a high number so we don't need to individually create 30k+ segments + "druid.indexer.tasklock.initialAllocationPartitionNumber", + String.valueOf(PartitionIds.ROOT_GEN_END_PARTITION_ID - 1) + ); + } + + @BeforeAll + public void initTestClient() + { + msqApis = new EmbeddedMSQApis(cluster, overlord); + } + + @Test + public void testHighPartitionNumbers() + { + // Insert tinyWiki1Json in 3 segments (it's a 3 line file). + String queryLocal = StringUtils.format( + MoreResources.MSQ.INSERT_TINY_WIKI_JSON, + dataSource, + Resources.DataFile.tinyWiki1Json() + ); + + Map<String, Object> context = Map.of( + MultiStageQueryContext.CTX_CLUSTER_STATISTICS_MERGE_MODE, + ClusterStatisticsMergeMode.PARALLEL, + MultiStageQueryContext.CTX_ROWS_PER_SEGMENT, + 1 + ); + + final SqlTaskStatus sqlTaskStatus = msqApis.submitTaskSql(context, queryLocal); + cluster.callApi().waitForTaskToSucceed(sqlTaskStatus.getTaskId(), overlord); + cluster.callApi().waitForAllSegmentsToBeAvailable(dataSource, coordinator, broker); + + // Verify that we have segments with partition numbers slightly above and below the old limit + final int minPartitionNum = Integer.parseInt(cluster.runSql( + "SELECT MIN(partition_num) FROM sys.segments WHERE datasource=%s", + Calcites.escapeStringLiteral(dataSource) + ).trim()); + + final int maxPartitionNum = Integer.parseInt(cluster.runSql( + "SELECT MAX(partition_num) FROM sys.segments WHERE datasource=%s", + Calcites.escapeStringLiteral(dataSource) + ).trim()); Review Comment: ## Missing catch of NumberFormatException Potential uncaught 'java.lang.NumberFormatException'. [Show more details](https://github.com/apache/druid/security/code-scanning/10568) -- 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]
