Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[hotfix]Fix the incorrent paramater transmission of PageNum and PageSize #3343

Merged
merged 9 commits into from
Dec 23, 2024
Merged

[hotfix]Fix the incorrent paramater transmission of PageNum and PageSize #3343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8fe4573
Fix the inconsistency issue between the values of parameters pageNum …
Nov 21, 2024
ec18b0b
Merge branch 'master' into AMORO-FixBug-in-PageHelper
zhangwl9 Dec 6, 2024
d93d57d
Merge branch 'master' into AMORO-FixBug-in-PageHelper
klion26 Dec 10, 2024
73751bc
Merge branch 'master' into AMORO-FixBug-in-PageHelper
zhangwl9 Dec 12, 2024
64e078d
Merge branch 'apache:master' into AMORO-FixBug-in-PageHelper
zhangwl9 Dec 13, 2024
54e2e02
Fix the inconsistency issue between the values of parameters pageNum …
Nov 21, 2024
78a8714
Merge branch 'AMORO-FixBug-in-PageHelper' of https://github.com/zhang…
Dec 13, 2024
324f009
Merge branch 'master' into AMORO-FixBug-in-PageHelper
klion26 Dec 20, 2024
c150983
Merge branch 'master' into AMORO-FixBug-in-PageHelper
zhoujinsong Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...o-ams/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 1 addition & 3 deletions amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/OptimizingMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
4 changes: 1 addition & 3 deletions amoro-ams/src/main/java/org/apache/amoro/server/persistence/mapper/TableMetaMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
7 changes: 1 addition & 6 deletions amoro-ams/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 3 additions & 9 deletions amoro-ams/src/test/java/org/apache/amoro/server/optimizing/BaseOptimizingChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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());
Expand Down
Loading