[AMORO-3235] Support action filter by ams backend (#3236)

* Support action filter by ams backend * Support action filter by ams backend(merged) * Apply spotless * Fix bug * spotless apply --------- Co-authored-by: majin.nathan <majin.nathan@bytedance.com> Co-authored-by: ZhouJinsong <zhoujinsong0505@163.com>
apache · Oct 14, 2024 · ba47df7 · ba47df7
1 parent 9933215
commit ba47df7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
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
@@ -278,6 +278,7 @@ private EndpointGroup apiGroup() {
       path(
           "/optimize",
           () -> {
+            get("/actions", optimizerGroupController::getActions);
             get(
                 "/optimizerGroups/{optimizerGroup}/tables",
                 optimizerGroupController::getOptimizerTables);

diff --git a/.../src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerGroupController.java b/.../src/main/java/org/apache/amoro/server/dashboard/controller/OptimizerGroupController.java
@@ -29,6 +29,7 @@
 import org.apache.amoro.server.dashboard.response.OkResponse;
 import org.apache.amoro.server.dashboard.response.PageResult;
 import org.apache.amoro.server.dashboard.utils.OptimizingUtil;
+import org.apache.amoro.server.optimizing.OptimizingStatus;
 import org.apache.amoro.server.persistence.TableRuntimeMeta;
 import org.apache.amoro.server.resource.ContainerMetadata;
 import org.apache.amoro.server.resource.OptimizerInstance;
@@ -40,10 +41,13 @@
 import javax.ws.rs.BadRequestException;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /** The controller that handles optimizer requests. */
@@ -58,13 +62,22 @@ public OptimizerGroupController(
     this.optimizerManager = optimizerManager;
   }
 
+  public void getActions(Context ctx) {
+    ctx.json(
+        OkResponse.of(
+            Arrays.stream(OptimizingStatus.values())
+                .map(OptimizingStatus::displayValue)
+                .collect(Collectors.toList())));
+  }
+
   /** Get optimize tables. * @return List of {@link TableOptimizingInfo} */
   public void getOptimizerTables(Context ctx) {
     String optimizerGroup = ctx.pathParam("optimizerGroup");
     String dbFilterStr = ctx.queryParam("dbSearchInput");
     String tableFilterStr = ctx.queryParam("tableSearchInput");
     Integer page = ctx.queryParamAsClass("page", Integer.class).getOrDefault(1);
     Integer pageSize = ctx.queryParamAsClass("pageSize", Integer.class).getOrDefault(20);
+    Set<String> actionFilter = new HashSet<>(ctx.queryParams("actions[]"));
     int offset = (page - 1) * pageSize;
 
     String optimizerGroupUsedInDbFilter = ALL_GROUP.equals(optimizerGroup) ? null : optimizerGroup;
@@ -76,6 +89,10 @@ public void getOptimizerTables(Context ctx) {
     List<TableRuntime> tableRuntimes =
         tableRuntimeBeans.stream()
             .map(meta -> tableService.getRuntime(meta.getTableId()))
+            .filter(
+                tableRuntime ->
+                    actionFilter.isEmpty()
+                        || actionFilter.contains(tableRuntime.getOptimizingStatus().displayValue()))
             .collect(Collectors.toList());
 
     PageResult<TableOptimizingInfo> amsPageResult =