github-advanced-security[bot] commented on code in PR #18402: URL: https://github.com/apache/druid/pull/18402#discussion_r2280726201
########## embedded-tests/src/test/java/org/apache/druid/testing/embedded/compact/CompactionSupervisorTest.java: ########## @@ -0,0 +1,354 @@ +/* + * 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.compact; + +import org.apache.druid.catalog.guice.CatalogClientModule; +import org.apache.druid.catalog.guice.CatalogCoordinatorModule; +import org.apache.druid.catalog.model.ResolvedTable; +import org.apache.druid.catalog.model.TableId; +import org.apache.druid.catalog.model.TableSpec; +import org.apache.druid.catalog.model.table.IndexingTemplateDefn; +import org.apache.druid.catalog.sync.CatalogClient; +import org.apache.druid.common.utils.IdUtils; +import org.apache.druid.indexing.common.task.IndexTask; +import org.apache.druid.indexing.compact.CascadingCompactionTemplate; +import org.apache.druid.indexing.compact.CatalogCompactionJobTemplate; +import org.apache.druid.indexing.compact.CompactionJobTemplate; +import org.apache.druid.indexing.compact.CompactionRule; +import org.apache.druid.indexing.compact.CompactionStateMatcher; +import org.apache.druid.indexing.compact.CompactionSupervisorSpec; +import org.apache.druid.indexing.compact.InlineCompactionJobTemplate; +import org.apache.druid.indexing.compact.MSQCompactionJobTemplate; +import org.apache.druid.indexing.overlord.Segments; +import org.apache.druid.java.util.common.DateTimes; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.java.util.common.granularity.Granularity; +import org.apache.druid.msq.guice.IndexerMemoryManagementModule; +import org.apache.druid.msq.guice.MSQDurableStorageModule; +import org.apache.druid.msq.guice.MSQIndexingModule; +import org.apache.druid.msq.guice.MSQSqlModule; +import org.apache.druid.msq.guice.SqlTaskModule; +import org.apache.druid.query.DruidMetrics; +import org.apache.druid.query.http.ClientSqlQuery; +import org.apache.druid.rpc.UpdateResponse; +import org.apache.druid.server.coordinator.ClusterCompactionConfig; +import org.apache.druid.server.coordinator.DataSourceCompactionConfig; +import org.apache.druid.server.coordinator.InlineSchemaDataSourceCompactionConfig; +import org.apache.druid.server.coordinator.UserCompactionTaskGranularityConfig; +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.EmbeddedRouter; +import org.apache.druid.testing.embedded.indexing.MoreResources; +import org.apache.druid.testing.embedded.junit5.EmbeddedClusterTestBase; +import org.joda.time.DateTime; +import org.joda.time.Period; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import java.util.List; +import java.util.Map; + +public class CompactionSupervisorTest extends EmbeddedClusterTestBase +{ + private final EmbeddedBroker broker = new EmbeddedBroker(); + private final EmbeddedIndexer indexer = new EmbeddedIndexer() + .setServerMemory(4_000_000_000L) + .addProperty("druid.worker.capacity", "8"); + private final EmbeddedOverlord overlord = new EmbeddedOverlord() + .addProperty("druid.manager.segments.pollDuration", "PT1s") + .addProperty("druid.manager.segments.useIncrementalCache", "always"); + private final EmbeddedHistorical historical = new EmbeddedHistorical(); + private final EmbeddedCoordinator coordinator = new EmbeddedCoordinator() + .addProperty("druid.manager.segments.useIncrementalCache", "always"); + + @Override + public EmbeddedDruidCluster createCluster() + { + return EmbeddedDruidCluster.withEmbeddedDerbyAndZookeeper() + .useLatchableEmitter() + .addExtensions( + CatalogClientModule.class, + CatalogCoordinatorModule.class, + IndexerMemoryManagementModule.class, + MSQDurableStorageModule.class, + MSQIndexingModule.class, + MSQSqlModule.class, + SqlTaskModule.class + ) + .addServer(coordinator) + .addServer(overlord) + .addServer(indexer) + .addServer(historical) + .addServer(broker) + .addServer(new EmbeddedRouter()); + } + + @BeforeAll + public void enableCompactionSupervisors() + { + final UpdateResponse updateResponse = cluster.callApi().onLeaderOverlord( + o -> o.updateClusterCompactionConfig(new ClusterCompactionConfig(1.0, 10, null, true, null)) + ); + Assertions.assertTrue(updateResponse.isSuccess()); + } + + @Test + public void test_ingestDayGranularity_andCompactToMonthGranularity_withInlineConfig() + { + // Ingest data at DAY granularity and verify + runIngestionAtGranularity( + "DAY", + "2025-06-01T00:00:00.000Z,shirt,105" + + "\n2025-06-02T00:00:00.000Z,trousers,210" + + "\n2025-06-03T00:00:00.000Z,jeans,150" + ); + Assertions.assertEquals(3, getNumSegmentsWith(Granularities.DAY)); + + // Create a compaction config with MONTH granularity + InlineSchemaDataSourceCompactionConfig compactionConfig = + InlineSchemaDataSourceCompactionConfig + .builder() + .forDataSource(dataSource) + .withSkipOffsetFromLatest(Period.seconds(0)) + .withGranularitySpec( + new UserCompactionTaskGranularityConfig(Granularities.MONTH, null, null) + ) + .build(); + + runCompactionWithSpec(compactionConfig); + waitForCompactionTasksToFinish("compact", 1); + + Assertions.assertEquals(0, getNumSegmentsWith(Granularities.DAY)); + Assertions.assertEquals(1, getNumSegmentsWith(Granularities.MONTH)); + } + + @Test + public void test_ingestHourGranularity_andCompactToDayAndMonth_withInlineTemplates() + { + // Create a cascading template with DAY and MONTH granularity + CascadingCompactionTemplate cascadingTemplate = new CascadingCompactionTemplate( + dataSource, + List.of( + new CompactionRule(Period.days(1), new InlineCompactionJobTemplate(createMatcher(Granularities.DAY))), + new CompactionRule(Period.days(50), new InlineCompactionJobTemplate(createMatcher(Granularities.MONTH))) + ) + ); + + ingestSegments(1200, "HOUR"); + runCompactionWithSpec(cascadingTemplate); + waitForCompactionTasksToFinish("compact", 3); + + Assertions.assertEquals(0, getNumSegmentsWith(Granularities.HOUR)); + Assertions.assertTrue(getNumSegmentsWith(Granularities.DAY) >= 1); + Assertions.assertTrue(getNumSegmentsWith(Granularities.MONTH) >= 1); + } + + @Test + public void test_ingestHourGranularity_andCompactToDayAndMonth_withCatalogTemplates() + { + ingestSegments(1200, "HOUR"); + + // Add compaction templates to catalog + final String dayGranularityTemplateId = saveTemplateToCatalog( + new InlineCompactionJobTemplate(createMatcher(Granularities.DAY)) + ); + final String monthGranularityTemplateId = saveTemplateToCatalog( + new InlineCompactionJobTemplate(createMatcher(Granularities.MONTH)) + ); + + // Create a cascading template with DAY and MONTH granularity + CascadingCompactionTemplate cascadingTemplate = new CascadingCompactionTemplate( + dataSource, + List.of( + new CompactionRule(Period.days(1), new CatalogCompactionJobTemplate(dayGranularityTemplateId, null)), + new CompactionRule(Period.days(50), new CatalogCompactionJobTemplate(monthGranularityTemplateId, null)) + ) + ); + + runCompactionWithSpec(cascadingTemplate); + waitForCompactionTasksToFinish("compact", 3); + + Assertions.assertEquals(0, getNumSegmentsWith(Granularities.HOUR)); + Assertions.assertTrue(getNumSegmentsWith(Granularities.DAY) >= 1); + Assertions.assertTrue(getNumSegmentsWith(Granularities.MONTH) >= 1); + } + + @Test + public void test_ingestHourGranularity_andCompactToDayAndMonth_withCatalogMSQTemplates() + { + ingestSegments(1200, "HOUR"); + + // Add compaction templates to catalog + final String sqlDayGranularity = + "REPLACE INTO ${dataSource}" + + " OVERWRITE WHERE __time >= TIMESTAMP '${startTimestamp}' AND __time < TIMESTAMP '${endTimestamp}'" + + " SELECT * FROM ${dataSource}" + + " WHERE __time BETWEEN '${startTimestamp}' AND '${endTimestamp}'" + + " PARTITIONED BY DAY"; + final String dayGranularityTemplateId = saveTemplateToCatalog( + new MSQCompactionJobTemplate( + new ClientSqlQuery(sqlDayGranularity, null, false, false, false, null, null), + createMatcher(Granularities.DAY) + ) + ); + final String sqlMonthGranularity = + "REPLACE INTO ${dataSource}" + + " OVERWRITE WHERE __time >= TIMESTAMP '${startTimestamp}' AND __time < TIMESTAMP '${endTimestamp}'" + + " SELECT * FROM ${dataSource}" + + " WHERE __time >= TIMESTAMP '${startTimestamp}' AND __time < TIMESTAMP '${endTimestamp}'" + + " PARTITIONED BY MONTH"; + final String monthGranularityTemplateId = saveTemplateToCatalog( + new MSQCompactionJobTemplate( + new ClientSqlQuery(sqlMonthGranularity, null, false, false, false, null, null), + createMatcher(Granularities.MONTH) + ) + ); + + // Create a cascading template with DAY and MONTH granularity + CascadingCompactionTemplate cascadingTemplate = new CascadingCompactionTemplate( + dataSource, + List.of( + new CompactionRule(Period.days(1), new CatalogCompactionJobTemplate(dayGranularityTemplateId, null)), + new CompactionRule(Period.days(50), new CatalogCompactionJobTemplate(monthGranularityTemplateId, null)) + ) + ); + + runCompactionWithSpec(cascadingTemplate); + waitForCompactionTasksToFinish("query_controller", 3); + + Assertions.assertEquals(0, getNumSegmentsWith(Granularities.HOUR)); + Assertions.assertTrue(getNumSegmentsWith(Granularities.DAY) >= 1); + Assertions.assertTrue(getNumSegmentsWith(Granularities.MONTH) >= 1); + } + + private void ingestSegments(int numSegments, String granularityName) + { + runIngestionAtGranularity( + granularityName, + createHourlyInlineDataCsv(DateTimes.nowUtc(), numSegments) + ); + } + + private void runCompactionWithSpec(DataSourceCompactionConfig config) + { + final CompactionSupervisorSpec compactionSupervisor + = new CompactionSupervisorSpec(config, false, null); + cluster.callApi().postSupervisor(compactionSupervisor); + } + + private void waitForCompactionTasksToFinish(String taskType, int expectedCount) Review Comment: ## Useless parameter The parameter 'expectedCount' is never used. [Show more details](https://github.com/apache/druid/security/code-scanning/10229) -- 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]
