This is an automated email from the ASF dual-hosted git repository.
czy006 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 893ae22c4 [hotfix]Fix the incorrent paramater transmission of PageNum
and PageSize (#3343)
893ae22c4 is described below
commit 893ae22c42c676d57b0a19863639b6cd595f18ba
Author: zhangwl9 <[email protected]>
AuthorDate: Mon Dec 23 17:59:40 2024 +0800
[hotfix]Fix the incorrent paramater transmission of PageNum and PageSize
(#3343)
* Fix the inconsistency issue between the values of parameters pageNum and
pageSize in 'PageHelper#startPage' and the
TableMetaMapper#selectTableRuntimesForOptimizerGroup,OptimizingMapper#selectOptimizingProcesses
* Fix the inconsistency issue between the values of parameters pageNum and
pageSize in 'PageHelper#startPage' and the
TableMetaMapper#selectTableRuntimesForOptimizerGroup,OptimizingMapper#selectOptimizingProcesses
---------
Co-authored-by: 张文领 <[email protected]>
Co-authored-by: Congxian Qiu <[email protected]>
Co-authored-by: ZhouJinsong <[email protected]>
---
.../server/dashboard/MixedAndIcebergTableDescriptor.java | 4 +---
.../amoro/server/persistence/mapper/OptimizingMapper.java | 4 +---
.../amoro/server/persistence/mapper/TableMetaMapper.java | 4 +---
.../org/apache/amoro/server/table/DefaultTableService.java | 7 +------
.../amoro/server/optimizing/BaseOptimizingChecker.java | 12 +++---------
5 files changed, 7 insertions(+), 24 deletions(-)
diff --git
a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
index cc82e4cb7..ac1fb6076 100644
---
a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
+++
b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
@@ -524,9 +524,7 @@ public class MixedAndIcebergTableDescriptor extends
PersistentBase
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
index 4b131407b..99c5a2645 100644
---
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 @@ public interface OptimizingMapper {
@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
index 10e4c2d54..e91d88b98 100644
---
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 @@ public interface TableMetaMapper {
@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
index 71055ceb3..565cce4e0 100644
---
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 class DefaultTableService extends
StatedPersistentBase implements TableSe
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
index d3d912635..a38842bf4 100644
---
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 @@ public class BaseOptimizingChecker extends PersistentBase {
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 @@ public class BaseOptimizingChecker extends PersistentBase {
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 @@ public class BaseOptimizingChecker extends PersistentBase {
tableIdentifier.getDatabase(),
tableIdentifier.getTableName(),
null,
- null,
- 0,
- Integer.MAX_VALUE))
+ null))
.stream()
.filter(p -> p.getProcessId() > lastProcessId)
.collect(Collectors.toList());
