Refactor: Clean up compaction config classes (#16810)

Changes:
- Rename `CoordinatorCompactionConfig` to `DruidCompactionConfig`
- Rename `CompactionConfigUpdateRequest` to `ClusterCompactionConfig`
- Refactor methods in `DruidCompactionConfig`
- Clean up `DataSourceCompactionConfigHistory` and its tests
- Clean up tests and add new tests
- Change API path `/druid/coordinator/v1/config/global` to `/druid/coordinator/v1/config/cluster`

integration-tests/src/main/java/org/apache/druid/testing/clients/CompactionResourceTestClient.java

@@ -28,8 +28,8 @@
 import org.apache.druid.java.util.http.client.Request;
 import org.apache.druid.java.util.http.client.response.StatusResponseHandler;
 import org.apache.druid.java.util.http.client.response.StatusResponseHolder;
-import org.apache.druid.server.coordinator.CoordinatorCompactionConfig;
 import org.apache.druid.server.coordinator.DataSourceCompactionConfig;
+import org.apache.druid.server.coordinator.DruidCompactionConfig;
 import org.apache.druid.testing.IntegrationTestingConfig;
 import org.apache.druid.testing.guice.TestClient;
 import org.jboss.netty.handler.codec.http.HttpMethod;
@@ -86,7 +86,7 @@ public void submitCompactionConfig(final DataSourceCompactionConfig dataSourceCo
     }
   }
 
-  public void deleteCompactionConfig(final String dataSource) throws Exception
+  public void deleteDataSourceCompactionConfig(final String dataSource) throws Exception
   {
     String url = StringUtils.format("%sconfig/compaction/%s", getCoordinatorURL(), StringUtils.urlEncode(dataSource));
     StatusResponseHolder response = httpClient.go(new Request(HttpMethod.DELETE, new URL(url)), responseHandler).get();
@@ -100,7 +100,7 @@ public void deleteCompactionConfig(final String dataSource) throws Exception
     }
   }
 
-  public CoordinatorCompactionConfig getCoordinatorCompactionConfigs() throws Exception
+  public DruidCompactionConfig getCompactionConfig() throws Exception
   {
     String url = StringUtils.format("%sconfig/compaction", getCoordinatorURL());
     StatusResponseHolder response = httpClient.go(
@@ -113,7 +113,7 @@ public CoordinatorCompactionConfig getCoordinatorCompactionConfigs() throws Exce
           response.getContent()
       );
     }
-    return jsonMapper.readValue(response.getContent(), new TypeReference<CoordinatorCompactionConfig>() {});
+    return jsonMapper.readValue(response.getContent(), new TypeReference<DruidCompactionConfig>() {});
   }
 
   public DataSourceCompactionConfig getDataSourceCompactionConfig(String dataSource) throws Exception

integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionLockContentionTest.java

@@ -27,12 +27,11 @@
 import org.apache.druid.java.util.common.logger.Logger;
 import org.apache.druid.metadata.LockFilterPolicy;
 import org.apache.druid.query.aggregation.LongSumAggregatorFactory;
-import org.apache.druid.server.coordinator.CoordinatorCompactionConfig;
 import org.apache.druid.server.coordinator.DataSourceCompactionConfig;
+import org.apache.druid.server.coordinator.DruidCompactionConfig;
 import org.apache.druid.testing.clients.CompactionResourceTestClient;
 import org.apache.druid.testing.clients.TaskResponseObject;
 import org.apache.druid.testing.guice.DruidTestModuleFactory;
-import org.apache.druid.testing.utils.CompactionUtil;
 import org.apache.druid.testing.utils.EventSerializer;
 import org.apache.druid.testing.utils.ITRetryUtil;
 import org.apache.druid.testing.utils.KafkaUtil;
@@ -305,26 +304,26 @@ private boolean shouldSkipTest(boolean testEnableTransaction)
    */
   private void submitAndVerifyCompactionConfig() throws Exception
   {
-    final DataSourceCompactionConfig compactionConfig = CompactionUtil
-        .createCompactionConfig(fullDatasourceName, Specs.MAX_ROWS_PER_SEGMENT, Period.ZERO);
+    final DataSourceCompactionConfig dataSourceCompactionConfig = DataSourceCompactionConfig
+        .builder()
+        .forDataSource(fullDatasourceName)
+        .withSkipOffsetFromLatest(Period.ZERO)
+        .withMaxRowsPerSegment(Specs.MAX_ROWS_PER_SEGMENT)
+        .build();
     compactionResource.updateCompactionTaskSlot(0.5, 10, null);
-    compactionResource.submitCompactionConfig(compactionConfig);
+    compactionResource.submitCompactionConfig(dataSourceCompactionConfig);
 
     // Wait for compaction config to persist
     Thread.sleep(2000);
 
     // Verify that the compaction config is updated correctly.
-    CoordinatorCompactionConfig coordinatorCompactionConfig = compactionResource.getCoordinatorCompactionConfigs();
-    DataSourceCompactionConfig observedCompactionConfig = null;
-    for (DataSourceCompactionConfig dataSourceCompactionConfig : coordinatorCompactionConfig.getCompactionConfigs()) {
-      if (dataSourceCompactionConfig.getDataSource().equals(fullDatasourceName)) {
-        observedCompactionConfig = dataSourceCompactionConfig;
-      }
-    }
-    Assert.assertEquals(observedCompactionConfig, compactionConfig);
+    DruidCompactionConfig compactionConfig = compactionResource.getCompactionConfig();
+    DataSourceCompactionConfig observedCompactionConfig
+        = compactionConfig.findConfigForDatasource(fullDatasourceName).orNull();
+    Assert.assertEquals(observedCompactionConfig, dataSourceCompactionConfig);
 
     observedCompactionConfig = compactionResource.getDataSourceCompactionConfig(fullDatasourceName);
-    Assert.assertEquals(observedCompactionConfig, compactionConfig);
+    Assert.assertEquals(observedCompactionConfig, dataSourceCompactionConfig);
   }
 
   /**

integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java

@@ -54,8 +54,8 @@
 import org.apache.druid.query.filter.SelectorDimFilter;
 import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec;
 import org.apache.druid.server.coordinator.AutoCompactionSnapshot;
-import org.apache.druid.server.coordinator.CoordinatorCompactionConfig;
 import org.apache.druid.server.coordinator.DataSourceCompactionConfig;
+import org.apache.druid.server.coordinator.DruidCompactionConfig;
 import org.apache.druid.server.coordinator.UserCompactionTaskDimensionsConfig;
 import org.apache.druid.server.coordinator.UserCompactionTaskGranularityConfig;
 import org.apache.druid.server.coordinator.UserCompactionTaskIOConfig;
@@ -1605,17 +1605,17 @@ public void testUpdateCompactionTaskSlotWithUseAutoScaleSlots() throws Exception
   {
     // First try update without useAutoScaleSlots
     updateCompactionTaskSlot(3, 5, null);
-    CoordinatorCompactionConfig coordinatorCompactionConfig = compactionResource.getCoordinatorCompactionConfigs();
+    DruidCompactionConfig compactionConfig = compactionResource.getCompactionConfig();
     // Should be default value which is false
-    Assert.assertFalse(coordinatorCompactionConfig.isUseAutoScaleSlots());
+    Assert.assertFalse(compactionConfig.isUseAutoScaleSlots());
     // Now try update from default value to useAutoScaleSlots=true
     updateCompactionTaskSlot(3, 5, true);
-    coordinatorCompactionConfig = compactionResource.getCoordinatorCompactionConfigs();
-    Assert.assertTrue(coordinatorCompactionConfig.isUseAutoScaleSlots());
+    compactionConfig = compactionResource.getCompactionConfig();
+    Assert.assertTrue(compactionConfig.isUseAutoScaleSlots());
     // Now try update from useAutoScaleSlots=true to useAutoScaleSlots=false
     updateCompactionTaskSlot(3, 5, false);
-    coordinatorCompactionConfig = compactionResource.getCoordinatorCompactionConfigs();
-    Assert.assertFalse(coordinatorCompactionConfig.isUseAutoScaleSlots());
+    compactionConfig = compactionResource.getCompactionConfig();
+    Assert.assertFalse(compactionConfig.isUseAutoScaleSlots());
   }
 
   private void loadData(String indexTask) throws Exception
@@ -1802,7 +1802,7 @@ private void submitCompactionConfig(
       @Nullable CompactionEngine engine
   ) throws Exception
   {
-    DataSourceCompactionConfig compactionConfig = new DataSourceCompactionConfig(
+    DataSourceCompactionConfig dataSourceCompactionConfig = new DataSourceCompactionConfig(
         fullDatasourceName,
         null,
         null,
@@ -1837,19 +1837,15 @@ private void submitCompactionConfig(
         engine,
         ImmutableMap.of("maxNumTasks", 2)
     );
-    compactionResource.submitCompactionConfig(compactionConfig);
+    compactionResource.submitCompactionConfig(dataSourceCompactionConfig);
 
     // Wait for compaction config to persist
     Thread.sleep(2000);
 
     // Verify that the compaction config is updated correctly.
-    CoordinatorCompactionConfig coordinatorCompactionConfig = compactionResource.getCoordinatorCompactionConfigs();
-    DataSourceCompactionConfig foundDataSourceCompactionConfig = null;
-    for (DataSourceCompactionConfig dataSourceCompactionConfig : coordinatorCompactionConfig.getCompactionConfigs()) {
-      if (dataSourceCompactionConfig.getDataSource().equals(fullDatasourceName)) {
-        foundDataSourceCompactionConfig = dataSourceCompactionConfig;
-      }
-    }
+    DruidCompactionConfig compactionConfig = compactionResource.getCompactionConfig();
+    DataSourceCompactionConfig foundDataSourceCompactionConfig
+        = compactionConfig.findConfigForDatasource(fullDatasourceName).orNull();
     Assert.assertNotNull(foundDataSourceCompactionConfig);
     Assert.assertNotNull(foundDataSourceCompactionConfig.getTuningConfig());
     Assert.assertEquals(foundDataSourceCompactionConfig.getTuningConfig().getPartitionsSpec(), partitionsSpec);
@@ -1864,16 +1860,12 @@ private void submitCompactionConfig(
 
   private void deleteCompactionConfig() throws Exception
   {
-    compactionResource.deleteCompactionConfig(fullDatasourceName);
+    compactionResource.deleteDataSourceCompactionConfig(fullDatasourceName);
 
     // Verify that the compaction config is updated correctly.
-    CoordinatorCompactionConfig coordinatorCompactionConfig = compactionResource.getCoordinatorCompactionConfigs();
-    DataSourceCompactionConfig foundDataSourceCompactionConfig = null;
-    for (DataSourceCompactionConfig dataSourceCompactionConfig : coordinatorCompactionConfig.getCompactionConfigs()) {
-      if (dataSourceCompactionConfig.getDataSource().equals(fullDatasourceName)) {
-        foundDataSourceCompactionConfig = dataSourceCompactionConfig;
-      }
-    }
+    DruidCompactionConfig compactionConfig = compactionResource.getCompactionConfig();
+    DataSourceCompactionConfig foundDataSourceCompactionConfig
+        = compactionConfig.findConfigForDatasource(fullDatasourceName).orNull();
     Assert.assertNull(foundDataSourceCompactionConfig);
   }
 
@@ -1955,11 +1947,11 @@ private void updateCompactionTaskSlot(double compactionTaskSlotRatio, int maxCom
   {
     compactionResource.updateCompactionTaskSlot(compactionTaskSlotRatio, maxCompactionTaskSlots, useAutoScaleSlots);
     // Verify that the compaction config is updated correctly.
-    CoordinatorCompactionConfig coordinatorCompactionConfig = compactionResource.getCoordinatorCompactionConfigs();
-    Assert.assertEquals(coordinatorCompactionConfig.getCompactionTaskSlotRatio(), compactionTaskSlotRatio);
-    Assert.assertEquals(coordinatorCompactionConfig.getMaxCompactionTaskSlots(), maxCompactionTaskSlots);
+    DruidCompactionConfig compactionConfig = compactionResource.getCompactionConfig();
+    Assert.assertEquals(compactionConfig.getCompactionTaskSlotRatio(), compactionTaskSlotRatio);
+    Assert.assertEquals(compactionConfig.getMaxCompactionTaskSlots(), maxCompactionTaskSlots);
     if (useAutoScaleSlots != null) {
-      Assert.assertEquals(coordinatorCompactionConfig.isUseAutoScaleSlots(), useAutoScaleSlots.booleanValue());
+      Assert.assertEquals(compactionConfig.isUseAutoScaleSlots(), useAutoScaleSlots.booleanValue());
     }
   }