Fix the inconsistency issue between the values of parameters pageNum …

…and pageSize in 'PageHelper#startPage' and the TableMetaMapper#selectTableRuntimesForOptimizerGroup,OptimizingMapper#selectOptimizingProcesses
apache · Dec 6, 2024 · 8fe4573 · 8fe4573
1 parent 604d1c1
commit 8fe4573
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 24 deletions.
diff --git a/...o-ams/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java b/...o-ams/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
@@ -524,9 +524,7 @@ public Pair<List<OptimizingProcessInfo>, Integer> getOptimizingProcessesInfo(
                       tableIdentifier.getDatabase(),
                       tableIdentifier.getTableName(),
                       type,
-                      status,
-                      offset,
-                      limit));
+                      status));
       PageInfo<OptimizingProcessMeta> pageInfo = new PageInfo<>(processMetaList);
       total = (int) pageInfo.getTotal();
       LOG.info(

diff --git a/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizingMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizingMapper.java
@@ -130,9 +130,7 @@ List<OptimizingProcessMeta> selectOptimizingProcesses(
       @Param("dbName") String dbName,
       @Param("tableName") String tableName,
       @Param("optimizingType") String optimizingType,
-      @Param("optimizingStatus") ProcessStatus optimizingStatus,
-      @Param("pageNum") int pageNum,
-      @Param("pageSize") int pageSize);
+      @Param("optimizingStatus") ProcessStatus optimizingStatus);
 
   /** Optimizing TaskRuntime operation below */
   @Insert({

diff --git a/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/TableMetaMapper.java b/amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/TableMetaMapper.java
@@ -526,7 +526,5 @@ List<TableRuntimeMeta> selectTableRuntimesForOptimizerGroup(
       @Param("optimizerGroup") String optimizerGroup,
       @Param("fuzzyDbName") String fuzzyDbName,
       @Param("fuzzyTableName") String fuzzyTableName,
-      @Param("statusCodeFilter") List<Integer> statusCodeFilter,
-      @Param("pageNum") int pageNum,
-      @Param("pageSize") int pageSize);
+      @Param("statusCodeFilter") List<Integer> statusCodeFilter);
 }
diff --git a/amoro-ams/src/main/java/org/apache/amoro/server/table/DefaultTableService.java b/amoro-ams/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
@@ -365,12 +365,7 @@ public Pair<List<TableRuntimeMeta>, Integer> getTableRuntimes(
               TableMetaMapper.class,
               mapper ->
                   mapper.selectTableRuntimesForOptimizerGroup(
-                      optimizerGroup,
-                      fuzzyDbName,
-                      fuzzyTableName,
-                      statusCodeFilters,
-                      limit,
-                      offset));
+                      optimizerGroup, fuzzyDbName, fuzzyTableName, statusCodeFilters));
       PageInfo<TableRuntimeMeta> pageInfo = new PageInfo<>(ret);
       total = (int) pageInfo.getTotal();
       return Pair.of(ret, total);

diff --git a/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/BaseOptimizingChecker.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/BaseOptimizingChecker.java
@@ -120,9 +120,7 @@ protected OptimizingProcessMeta waitOptimizeResult() {
                                 tableIdentifier.getDatabase(),
                                 tableIdentifier.getTableName(),
                                 null,
-                                null,
-                                0,
-                                Integer.MAX_VALUE));
+                                null));
                 if (tableOptimizingProcesses == null || tableOptimizingProcesses.isEmpty()) {
                   LOG.info("optimize history is empty");
                   return Status.RUNNING;
@@ -161,9 +159,7 @@ protected OptimizingProcessMeta waitOptimizeResult() {
                           tableIdentifier.getDatabase(),
                           tableIdentifier.getTableName(),
                           null,
-                          null,
-                          0,
-                          Integer.MAX_VALUE))
+                          null))
               .stream()
               .filter(p -> p.getProcessId() > lastProcessId)
               .filter(p -> p.getStatus().equals(ProcessStatus.SUCCESS))
@@ -194,9 +190,7 @@ protected void assertOptimizeHangUp() {
                         tableIdentifier.getDatabase(),
                         tableIdentifier.getTableName(),
                         null,
-                        null,
-                        0,
-                        Integer.MAX_VALUE))
+                        null))
             .stream()
             .filter(p -> p.getProcessId() > lastProcessId)
             .collect(Collectors.toList());