This is an automated email from the ASF dual-hosted git repository.
baiyangtx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/master by this push:
new 7c43e754b [AMORO-3348] Extract the implementation of OptimizerManager
(#3437)
7c43e754b is described below
commit 7c43e754b3214626e58bab5d6e2e2113265fdff3
Author: mansonliwh <[email protected]>
AuthorDate: Wed Feb 19 14:28:26 2025 +0800
[AMORO-3348] Extract the implementation of OptimizerManager (#3437)
[AMORO-3346] Extract the implementation of OptimizerManager
Co-authored-by: baiyangtx <[email protected]>
---
.../apache/amoro/server/AmoroServiceContainer.java | 18 ++-
.../amoro/server/DefaultOptimizingService.java | 70 ++---------
.../amoro/server/dashboard/DashboardServer.java | 9 +-
.../dashboard/controller/OptimizerController.java | 11 +-
.../controller/OptimizerGroupController.java | 19 +--
.../server/resource/DefaultOptimizerManager.java | 128 +++++++++++++++++++++
.../apache/amoro/server/AMSManagerTestBase.java | 8 ++
.../apache/amoro/server/AMSServiceTestBase.java | 2 +-
.../org/apache/amoro/server/AmsEnvironment.java | 6 +-
.../amoro/server/TestDefaultOptimizingService.java | 7 +-
.../org/apache/amoro/resource/ResourceManager.java | 3 -
11 files changed, 193 insertions(+), 88 deletions(-)
diff --git
a/amoro-ams/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java
b/amoro-ams/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java
index 15c532d5d..899b434fd 100644
--- a/amoro-ams/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java
+++ b/amoro-ams/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java
@@ -42,6 +42,7 @@ import org.apache.amoro.server.persistence.DataSourceFactory;
import org.apache.amoro.server.persistence.HttpSessionHandlerFactory;
import org.apache.amoro.server.persistence.SqlSessionFactoryProvider;
import org.apache.amoro.server.resource.ContainerMetadata;
+import org.apache.amoro.server.resource.DefaultOptimizerManager;
import org.apache.amoro.server.resource.OptimizerManager;
import org.apache.amoro.server.resource.ResourceContainers;
import org.apache.amoro.server.table.DefaultTableManager;
@@ -99,6 +100,7 @@ public class AmoroServiceContainer {
private DataSource dataSource;
private CatalogManager catalogManager;
private TableManager tableManager;
+ private OptimizerManager optimizerManager;
private TableService tableService;
private DefaultOptimizingService optimizingService;
private TerminalManager terminalManager;
@@ -155,10 +157,13 @@ public class AmoroServiceContainer {
catalogManager = new DefaultCatalogManager(serviceConfig);
tableManager = new DefaultTableManager(serviceConfig, catalogManager);
+ optimizerManager = new DefaultOptimizerManager(serviceConfig);
tableService = new DefaultTableService(serviceConfig, catalogManager);
+
optimizingService =
- new DefaultOptimizingService(serviceConfig, catalogManager,
tableManager, tableService);
+ new DefaultOptimizingService(
+ serviceConfig, catalogManager, tableManager, optimizerManager,
tableService);
LOG.info("Setting up AMS table executors...");
AsyncTableExecutors.getInstance().setup(tableService, serviceConfig);
@@ -253,7 +258,12 @@ public class AmoroServiceContainer {
private void initHttpService() {
DashboardServer dashboardServer =
new DashboardServer(
- serviceConfig, catalogManager, tableManager, optimizingService,
terminalManager);
+ serviceConfig,
+ catalogManager,
+ tableManager,
+ optimizerManager,
+ optimizingService,
+ terminalManager);
RestCatalogService restCatalogService = new
RestCatalogService(catalogManager, tableManager);
httpServer =
@@ -558,7 +568,7 @@ public class AmoroServiceContainer {
}
@VisibleForTesting
- public OptimizerManager getOptimizingService() {
- return this.optimizingService;
+ public OptimizerManager getOptimizerManager() {
+ return this.optimizerManager;
}
}
diff --git
a/amoro-ams/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java
b/amoro-ams/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java
index a34e06421..9cfb1c21b 100644
---
a/amoro-ams/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java
+++
b/amoro-ams/src/main/java/org/apache/amoro/server/DefaultOptimizingService.java
@@ -35,7 +35,6 @@ import org.apache.amoro.exception.ObjectNotExistsException;
import org.apache.amoro.exception.PluginRetryAuthException;
import org.apache.amoro.exception.TaskNotFoundException;
import org.apache.amoro.properties.CatalogMetaProperties;
-import org.apache.amoro.resource.Resource;
import org.apache.amoro.resource.ResourceGroup;
import org.apache.amoro.server.catalog.CatalogManager;
import org.apache.amoro.server.optimizing.OptimizingProcess;
@@ -56,7 +55,6 @@ import org.apache.amoro.server.table.RuntimeHandlerChain;
import org.apache.amoro.server.table.TableRuntime;
import org.apache.amoro.server.table.TableService;
import org.apache.amoro.shade.guava32.com.google.common.base.Preconditions;
-import org.apache.amoro.shade.guava32.com.google.common.collect.ImmutableList;
import
org.apache.amoro.shade.guava32.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.amoro.shade.thrift.org.apache.thrift.TException;
import org.apache.amoro.table.TableProperties;
@@ -90,7 +88,7 @@ import java.util.stream.Collectors;
* suspending tasks.
*/
public class DefaultOptimizingService extends StatedPersistentBase
- implements OptimizingService.Iface, OptimizerManager, QuotaProvider {
+ implements OptimizingService.Iface, QuotaProvider {
private static final Logger LOG =
LoggerFactory.getLogger(DefaultOptimizingService.class);
@@ -103,6 +101,7 @@ public class DefaultOptimizingService extends
StatedPersistentBase
private final Map<String, OptimizerInstance> authOptimizers = new
ConcurrentHashMap<>();
private final OptimizerKeeper optimizerKeeper = new OptimizerKeeper();
private final CatalogManager catalogManager;
+ private final OptimizerManager optimizerManager;
private final TableService tableService;
private final MaintainedTableManager tableManager;
private final RuntimeHandlerChain tableHandlerChain;
@@ -112,6 +111,7 @@ public class DefaultOptimizingService extends
StatedPersistentBase
Configurations serviceConfig,
CatalogManager catalogManager,
MaintainedTableManager tableManager,
+ OptimizerManager optimizerManager,
TableService tableService) {
this.optimizerTouchTimeout =
serviceConfig.get(AmoroManagementConf.OPTIMIZER_HB_TIMEOUT).toMillis();
@@ -124,6 +124,7 @@ public class DefaultOptimizingService extends
StatedPersistentBase
this.tableService = tableService;
this.catalogManager = catalogManager;
this.tableManager = tableManager;
+ this.optimizerManager = optimizerManager;
this.tableHandlerChain = new TableRuntimeHandlerImpl();
this.planExecutor =
Executors.newCachedThreadPool(
@@ -317,19 +318,7 @@ public class DefaultOptimizingService extends
StatedPersistentBase
.orElseThrow(() -> new PluginRetryAuthException("Optimizer has not
been authenticated"));
}
- @Override
- public List<OptimizerInstance> listOptimizers() {
- return ImmutableList.copyOf(authOptimizers.values());
- }
-
- @Override
- public List<OptimizerInstance> listOptimizers(String group) {
- return authOptimizers.values().stream()
- .filter(optimizer -> optimizer.getGroupName().equals(group))
- .collect(Collectors.toList());
- }
-
- @Override
+ // TODO need to use optimizer manager
public void deleteOptimizer(String group, String resourceId) {
List<OptimizerInstance> deleteOptimizers =
getAs(OptimizerMapper.class, mapper ->
mapper.selectByResourceId(resourceId));
@@ -340,11 +329,10 @@ public class DefaultOptimizingService extends
StatedPersistentBase
});
}
- @Override
public void createResourceGroup(ResourceGroup resourceGroup) {
doAsTransaction(
() -> {
- doAs(ResourceMapper.class, mapper ->
mapper.insertResourceGroup(resourceGroup));
+ optimizerManager.createResourceGroup(resourceGroup);
OptimizingQueue optimizingQueue =
new OptimizingQueue(
catalogManager,
@@ -357,10 +345,9 @@ public class DefaultOptimizingService extends
StatedPersistentBase
});
}
- @Override
public void deleteResourceGroup(String groupName) {
if (canDeleteResourceGroup(groupName)) {
- doAs(ResourceMapper.class, mapper ->
mapper.deleteResourceGroup(groupName));
+ optimizerManager.deleteResourceGroup(groupName);
OptimizingQueue optimizingQueue =
optimizingQueueByGroup.remove(groupName);
optimizingQueue.dispose();
} else {
@@ -371,52 +358,13 @@ public class DefaultOptimizingService extends
StatedPersistentBase
}
}
- @Override
public void updateResourceGroup(ResourceGroup resourceGroup) {
Preconditions.checkNotNull(resourceGroup, "The resource group cannot be
null.");
Optional.ofNullable(optimizingQueueByGroup.get(resourceGroup.getName()))
.ifPresent(queue -> queue.updateOptimizerGroup(resourceGroup));
- doAs(ResourceMapper.class, mapper ->
mapper.updateResourceGroup(resourceGroup));
- }
-
- @Override
- public void createResource(Resource resource) {
- doAs(ResourceMapper.class, mapper -> mapper.insertResource(resource));
- }
-
- @Override
- public void deleteResource(String resourceId) {
- doAs(ResourceMapper.class, mapper -> mapper.deleteResource(resourceId));
+ optimizerManager.updateResourceGroup(resourceGroup);
}
- @Override
- public List<ResourceGroup> listResourceGroups() {
- return getAs(ResourceMapper.class, ResourceMapper::selectResourceGroups);
- }
-
- @Override
- public List<ResourceGroup> listResourceGroups(String containerName) {
- return getAs(ResourceMapper.class,
ResourceMapper::selectResourceGroups).stream()
- .filter(group -> group.getContainer().equals(containerName))
- .collect(Collectors.toList());
- }
-
- @Override
- public ResourceGroup getResourceGroup(String groupName) {
- return getAs(ResourceMapper.class, mapper ->
mapper.selectResourceGroup(groupName));
- }
-
- @Override
- public List<Resource> listResourcesByGroup(String groupName) {
- return getAs(ResourceMapper.class, mapper ->
mapper.selectResourcesByGroup(groupName));
- }
-
- @Override
- public Resource getResource(String resourceId) {
- return getAs(ResourceMapper.class, mapper ->
mapper.selectResource(resourceId));
- }
-
- @Override
public void dispose() {
optimizerKeeper.dispose();
tableHandlerChain.dispose();
@@ -439,7 +387,7 @@ public class DefaultOptimizingService extends
StatedPersistentBase
return false;
}
}
- for (OptimizerInstance optimizer : listOptimizers()) {
+ for (OptimizerInstance optimizer : optimizerManager.listOptimizers()) {
if (optimizer.getGroupName().equals(name)) {
return false;
}
diff --git
a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
index acb13e55f..6614f2038 100644
---
a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
+++
b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
@@ -51,6 +51,7 @@ import
org.apache.amoro.server.dashboard.controller.TerminalController;
import org.apache.amoro.server.dashboard.controller.VersionController;
import org.apache.amoro.server.dashboard.response.ErrorResponse;
import org.apache.amoro.server.dashboard.utils.ParamSignatureCalculator;
+import org.apache.amoro.server.resource.OptimizerManager;
import org.apache.amoro.server.table.TableManager;
import org.apache.amoro.server.terminal.TerminalManager;
import org.apache.amoro.shade.guava32.com.google.common.base.Preconditions;
@@ -99,15 +100,17 @@ public class DashboardServer {
Configurations serviceConfig,
CatalogManager catalogManager,
TableManager tableManager,
- DefaultOptimizingService optimizerManager,
+ OptimizerManager optimizerManager,
+ DefaultOptimizingService optimizingService,
TerminalManager terminalManager) {
PlatformFileManager platformFileManager = new PlatformFileManager();
this.catalogController = new CatalogController(catalogManager,
platformFileManager);
this.healthCheckController = new HealthCheckController();
this.loginController = new LoginController(serviceConfig);
// TODO: remove table service from OptimizerGroupController
- this.optimizerGroupController = new OptimizerGroupController(tableManager,
optimizerManager);
- this.optimizerController = new OptimizerController(optimizerManager);
+ this.optimizerGroupController =
+ new OptimizerGroupController(tableManager, optimizingService,
optimizerManager);
+ this.optimizerController = new OptimizerController(optimizingService,
optimizerManager);
this.platformFileInfoController = new
PlatformFileInfoController(platformFileManager);
this.settingController = new SettingController(serviceConfig,
optimizerManager);
ServerTableDescriptor tableDescriptor =
diff --git
a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java
b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java
index 9e34df3ab..55259c5a0 100644
---
a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java
+++
b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerController.java
@@ -26,6 +26,7 @@ import org.apache.amoro.server.DefaultOptimizingService;
import org.apache.amoro.server.dashboard.response.OkResponse;
import org.apache.amoro.server.resource.ContainerMetadata;
import org.apache.amoro.server.resource.OptimizerInstance;
+import org.apache.amoro.server.resource.OptimizerManager;
import org.apache.amoro.server.resource.ResourceContainers;
import org.apache.amoro.shade.guava32.com.google.common.base.Preconditions;
@@ -36,9 +37,13 @@ import java.util.stream.Collectors;
/** The controller that handles optimizer requests. */
public class OptimizerController {
- private final DefaultOptimizingService optimizerManager;
+ private final OptimizerManager optimizerManager;
- public OptimizerController(DefaultOptimizingService optimizerManager) {
+ private final DefaultOptimizingService optimizingService;
+
+ public OptimizerController(
+ DefaultOptimizingService optimizingService, OptimizerManager
optimizerManager) {
+ this.optimizingService = optimizingService;
this.optimizerManager = optimizerManager;
}
@@ -64,7 +69,7 @@ public class OptimizerController {
resource.getProperties().putAll(optimizerInstances.get(0).getProperties());
ResourceContainers.get(resource.getContainerName()).releaseOptimizer(resource);
optimizerManager.deleteResource(resourceId);
- optimizerManager.deleteOptimizer(resource.getGroupName(), resourceId);
+ optimizingService.deleteOptimizer(resource.getGroupName(), resourceId);
ctx.json(OkResponse.of("Success to release optimizer"));
}
diff --git
a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerGroupController.java
b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerGroupController.java
index e8b3a6d5a..bfe36d069 100644
---
a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerGroupController.java
+++
b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerGroupController.java
@@ -31,6 +31,7 @@ import org.apache.amoro.server.dashboard.response.PageResult;
import org.apache.amoro.server.optimizing.OptimizingStatus;
import org.apache.amoro.server.resource.ContainerMetadata;
import org.apache.amoro.server.resource.OptimizerInstance;
+import org.apache.amoro.server.resource.OptimizerManager;
import org.apache.amoro.server.resource.ResourceContainers;
import org.apache.amoro.server.table.TableManager;
import org.apache.amoro.shade.guava32.com.google.common.base.Preconditions;
@@ -56,11 +57,15 @@ public class OptimizerGroupController {
private static final String ALL_GROUP = "all";
private final TableManager tableManager;
- private final DefaultOptimizingService optimizerManager;
+ private final DefaultOptimizingService optimizingService;
+ private final OptimizerManager optimizerManager;
public OptimizerGroupController(
- TableManager tableManager, DefaultOptimizingService optimizerManager) {
+ TableManager tableManager,
+ DefaultOptimizingService optimizingService,
+ OptimizerManager optimizerManager) {
this.tableManager = tableManager;
+ this.optimizingService = optimizingService;
this.optimizerManager = optimizerManager;
}
@@ -205,7 +210,7 @@ public class OptimizerGroupController {
resource.getProperties().putAll(optimizerInstances.get(0).getProperties());
ResourceContainers.get(resource.getContainerName()).releaseOptimizer(resource);
optimizerManager.deleteResource(resourceId);
- optimizerManager.deleteOptimizer(resource.getGroupName(), resourceId);
+ optimizingService.deleteOptimizer(resource.getGroupName(), resourceId);
ctx.json(OkResponse.of("Success to release optimizer"));
}
@@ -263,7 +268,7 @@ public class OptimizerGroupController {
}
ResourceGroup.Builder builder = new ResourceGroup.Builder(name, container);
builder.addProperties(properties);
- optimizerManager.createResourceGroup(builder.build());
+ optimizingService.createResourceGroup(builder.build());
ctx.json(OkResponse.of("The optimizer group has been successfully
created."));
}
@@ -278,21 +283,21 @@ public class OptimizerGroupController {
Map<String, String> properties = (Map) map.get("properties");
ResourceGroup.Builder builder = new ResourceGroup.Builder(name, container);
builder.addProperties(properties);
- optimizerManager.updateResourceGroup(builder.build());
+ optimizingService.updateResourceGroup(builder.build());
ctx.json(OkResponse.of("The optimizer group has been successfully
updated."));
}
/** delete optimizeGroup url = /optimize/resourceGroups/{resourceGroupName}
*/
public void deleteResourceGroup(Context ctx) {
String name = ctx.pathParam("resourceGroupName");
- optimizerManager.deleteResourceGroup(name);
+ optimizingService.deleteResourceGroup(name);
ctx.json(OkResponse.of("The optimizer group has been successfully
deleted."));
}
/** check if optimizerGroup can be deleted url =
/optimize/resourceGroups/delete/check */
public void deleteCheckResourceGroup(Context ctx) {
String name = ctx.pathParam("resourceGroupName");
- ctx.json(OkResponse.of(optimizerManager.canDeleteResourceGroup(name)));
+ ctx.json(OkResponse.of(optimizingService.canDeleteResourceGroup(name)));
}
/** check if optimizerGroup can be deleted url = /optimize/containers/get */
diff --git
a/amoro-ams/src/main/java/org/apache/amoro/server/resource/DefaultOptimizerManager.java
b/amoro-ams/src/main/java/org/apache/amoro/server/resource/DefaultOptimizerManager.java
new file mode 100644
index 000000000..4a3d89cbc
--- /dev/null
+++
b/amoro-ams/src/main/java/org/apache/amoro/server/resource/DefaultOptimizerManager.java
@@ -0,0 +1,128 @@
+/*
+ * 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.amoro.server.resource;
+
+import org.apache.amoro.config.Configurations;
+import org.apache.amoro.resource.Resource;
+import org.apache.amoro.resource.ResourceGroup;
+import org.apache.amoro.server.persistence.PersistentBase;
+import org.apache.amoro.server.persistence.mapper.OptimizerMapper;
+import org.apache.amoro.server.persistence.mapper.ResourceMapper;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * DefaultOptimizingService is implementing the OptimizerManager Thrift
service, which manages the
+ * optimizing tasks for tables. It includes methods for authenticating
optimizers, polling tasks
+ * from the optimizing queue, acknowledging tasks,and completing tasks. The
code uses several data
+ * structures, including maps for optimizing queues ,task runtimes, and
authenticated optimizers.
+ *
+ * <p>The code also includes a TimerTask for detecting and removing expired
optimizers and
+ * suspending tasks.
+ */
+public class DefaultOptimizerManager extends PersistentBase implements
OptimizerManager {
+
+ protected final Configurations serverConfiguration;
+
+ public DefaultOptimizerManager(Configurations serverConfiguration) {
+ this.serverConfiguration = serverConfiguration;
+ }
+
+ private void unregisterOptimizer(String token) {
+ doAs(OptimizerMapper.class, mapper -> mapper.deleteOptimizer(token));
+ }
+
+ @Override
+ public List<OptimizerInstance> listOptimizers() {
+ return getAs(OptimizerMapper.class, OptimizerMapper::selectAll);
+ }
+
+ @Override
+ public List<OptimizerInstance> listOptimizers(String group) {
+ List<OptimizerInstance> authOptimizers =
+ getAs(OptimizerMapper.class, OptimizerMapper::selectAll);
+ return authOptimizers.stream()
+ .filter(optimizer -> optimizer.getGroupName().equals(group))
+ .collect(Collectors.toList());
+ }
+
+ @Override
+ public void deleteOptimizer(String group, String resourceId) {
+ List<OptimizerInstance> deleteOptimizers =
+ getAs(OptimizerMapper.class, mapper ->
mapper.selectByResourceId(resourceId));
+ deleteOptimizers.forEach(
+ optimizer -> {
+ String token = optimizer.getToken();
+ unregisterOptimizer(token);
+ });
+ }
+
+ @Override
+ public void createResourceGroup(ResourceGroup resourceGroup) {
+ doAs(ResourceMapper.class, mapper ->
mapper.insertResourceGroup(resourceGroup));
+ }
+
+ @Override
+ public void deleteResourceGroup(String groupName) {
+ doAs(ResourceMapper.class, mapper ->
mapper.deleteResourceGroup(groupName));
+ }
+
+ @Override
+ public void updateResourceGroup(ResourceGroup resourceGroup) {
+ doAs(ResourceMapper.class, mapper ->
mapper.updateResourceGroup(resourceGroup));
+ }
+
+ @Override
+ public void createResource(Resource resource) {
+ doAs(ResourceMapper.class, mapper -> mapper.insertResource(resource));
+ }
+
+ @Override
+ public void deleteResource(String resourceId) {
+ doAs(ResourceMapper.class, mapper -> mapper.deleteResource(resourceId));
+ }
+
+ @Override
+ public List<ResourceGroup> listResourceGroups() {
+ return getAs(ResourceMapper.class, ResourceMapper::selectResourceGroups);
+ }
+
+ @Override
+ public List<ResourceGroup> listResourceGroups(String containerName) {
+ return getAs(ResourceMapper.class,
ResourceMapper::selectResourceGroups).stream()
+ .filter(group -> group.getContainer().equals(containerName))
+ .collect(Collectors.toList());
+ }
+
+ @Override
+ public ResourceGroup getResourceGroup(String groupName) {
+ return getAs(ResourceMapper.class, mapper ->
mapper.selectResourceGroup(groupName));
+ }
+
+ @Override
+ public List<Resource> listResourcesByGroup(String groupName) {
+ return getAs(ResourceMapper.class, mapper ->
mapper.selectResourcesByGroup(groupName));
+ }
+
+ @Override
+ public Resource getResource(String resourceId) {
+ return getAs(ResourceMapper.class, mapper ->
mapper.selectResource(resourceId));
+ }
+}
diff --git
a/amoro-ams/src/test/java/org/apache/amoro/server/AMSManagerTestBase.java
b/amoro-ams/src/test/java/org/apache/amoro/server/AMSManagerTestBase.java
index da95059bc..e89567c9c 100644
--- a/amoro-ams/src/test/java/org/apache/amoro/server/AMSManagerTestBase.java
+++ b/amoro-ams/src/test/java/org/apache/amoro/server/AMSManagerTestBase.java
@@ -23,6 +23,8 @@ import org.apache.amoro.resource.ResourceGroup;
import org.apache.amoro.server.catalog.DefaultCatalogManager;
import org.apache.amoro.server.manager.EventsManager;
import org.apache.amoro.server.manager.MetricManager;
+import org.apache.amoro.server.resource.DefaultOptimizerManager;
+import org.apache.amoro.server.resource.OptimizerManager;
import org.apache.amoro.server.table.DefaultTableManager;
import org.apache.amoro.server.table.DerbyPersistence;
import org.apache.amoro.server.table.TableManager;
@@ -37,6 +39,7 @@ public abstract class AMSManagerTestBase {
protected static DefaultCatalogManager CATALOG_MANAGER = null;
protected static DefaultTableManager TABLE_MANAGER = null;
+ protected static DefaultOptimizerManager OPTIMIZER_MANAGER = null;
@BeforeClass
public static void initTableManger() {
@@ -44,6 +47,7 @@ public abstract class AMSManagerTestBase {
Configurations configurations = new Configurations();
CATALOG_MANAGER = new DefaultCatalogManager(configurations);
TABLE_MANAGER = new DefaultTableManager(configurations, CATALOG_MANAGER);
+ OPTIMIZER_MANAGER = new DefaultOptimizerManager(configurations);
} catch (Throwable throwable) {
Assert.fail(throwable.getMessage());
}
@@ -59,6 +63,10 @@ public abstract class AMSManagerTestBase {
return TABLE_MANAGER;
}
+ protected OptimizerManager optimizerManager() {
+ return OPTIMIZER_MANAGER;
+ }
+
protected static ResourceGroup defaultResourceGroup() {
return new ResourceGroup.Builder("default", "local").build();
}
diff --git
a/amoro-ams/src/test/java/org/apache/amoro/server/AMSServiceTestBase.java
b/amoro-ams/src/test/java/org/apache/amoro/server/AMSServiceTestBase.java
index b1f29861d..ae3ad604e 100644
--- a/amoro-ams/src/test/java/org/apache/amoro/server/AMSServiceTestBase.java
+++ b/amoro-ams/src/test/java/org/apache/amoro/server/AMSServiceTestBase.java
@@ -41,7 +41,7 @@ public abstract class AMSServiceTestBase extends
AMSManagerTestBase {
TABLE_SERVICE = new DefaultTableService(new Configurations(),
CATALOG_MANAGER);
OPTIMIZING_SERVICE =
new DefaultOptimizingService(
- configurations, CATALOG_MANAGER, TABLE_MANAGER, TABLE_SERVICE);
+ configurations, CATALOG_MANAGER, TABLE_MANAGER,
OPTIMIZER_MANAGER, TABLE_SERVICE);
TABLE_SERVICE.addHandlerChain(OPTIMIZING_SERVICE.getTableRuntimeHandler());
TABLE_SERVICE.initialize();
try {
diff --git
a/amoro-ams/src/test/java/org/apache/amoro/server/AmsEnvironment.java
b/amoro-ams/src/test/java/org/apache/amoro/server/AmsEnvironment.java
index 38d95adb0..1e37a071c 100644
--- a/amoro-ams/src/test/java/org/apache/amoro/server/AmsEnvironment.java
+++ b/amoro-ams/src/test/java/org/apache/amoro/server/AmsEnvironment.java
@@ -283,7 +283,7 @@ public class AmsEnvironment {
if (optimizingStarted) {
return;
}
- OptimizerManager optimizerManager =
serviceContainer.getOptimizingService();
+ OptimizerManager optimizerManager = serviceContainer.getOptimizerManager();
optimizerManager.createResourceGroup(
new ResourceGroup.Builder("default", "localContainer")
.addProperty("memory", "1024")
@@ -302,8 +302,8 @@ public class AmsEnvironment {
}
public void stopOptimizer() {
- DynFields.UnboundField<DefaultOptimizingService> field =
- DynFields.builder().hiddenImpl(AmoroServiceContainer.class,
"optimizingService").build();
+ DynFields.UnboundField<OptimizerManager> field =
+ DynFields.builder().hiddenImpl(AmoroServiceContainer.class,
"optimizerManager").build();
field
.bind(serviceContainer)
.get()
diff --git
a/amoro-ams/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java
b/amoro-ams/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java
index a97738ae8..55fac3a49 100644
---
a/amoro-ams/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java
+++
b/amoro-ams/src/test/java/org/apache/amoro/server/TestDefaultOptimizingService.java
@@ -110,7 +110,7 @@ public class TestDefaultOptimizingService extends
AMSTableTestBase {
toucher.stop();
toucher = null;
}
- optimizingService()
+ optimizerManager()
.listOptimizers()
.forEach(
optimizer ->
@@ -228,11 +228,12 @@ public class TestDefaultOptimizingService extends
AMSTableTestBase {
@Test
public void testTouch() throws InterruptedException {
- OptimizerInstance optimizer = optimizingService().listOptimizers().get(0);
+ OptimizerInstance optimizer = optimizerManager().listOptimizers().get(0);
long oldTouchTime = optimizer.getTouchTime();
Thread.sleep(1);
optimizingService().touch(token);
- Assertions.assertTrue(optimizer.getTouchTime() > oldTouchTime);
+ OptimizerInstance optimizerAfterTouched =
optimizerManager().listOptimizers().get(0);
+ Assertions.assertTrue(optimizerAfterTouched.getTouchTime() > oldTouchTime);
}
@Test
diff --git
a/amoro-common/src/main/java/org/apache/amoro/resource/ResourceManager.java
b/amoro-common/src/main/java/org/apache/amoro/resource/ResourceManager.java
index c03ffc98b..03bf0fae8 100644
--- a/amoro-common/src/main/java/org/apache/amoro/resource/ResourceManager.java
+++ b/amoro-common/src/main/java/org/apache/amoro/resource/ResourceManager.java
@@ -41,7 +41,4 @@ public interface ResourceManager {
List<Resource> listResourcesByGroup(String groupName);
Resource getResource(String resourceId);
-
- /** close this resource manager */
- void dispose();
}
