Skip to content
This repository has been archived by the owner on Jan 3, 2023. It is now read-only.

Fix #1504, Fix long-run action state update issue #1506

Merged
merged 1 commit into from
Dec 26, 2017
Merged

Fix #1504, Fix long-run action state update issue #1506

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions smart-engine/src/main/java/org/smartdata/server/engine/CmdletManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,9 +818,17 @@ public ActionGroup(List<ActionInfo> actions, long totalNumOfActions) {

public ActionGroup listActions(long pageIndex, long numPerPage,
List<String> orderBy, List<Boolean> isDesc) throws IOException, MetaStoreException {
List<ActionInfo> infos = metaStore.listPageAction((pageIndex - 1) * numPerPage,
numPerPage, orderBy, isDesc);
for (ActionInfo info : infos) {
ActionInfo memInfo = idToActions.get(info.getActionId());
if (memInfo != null) {
info.setCreateTime(memInfo.getCreateTime());
info.setProgress(memInfo.getProgress());
}
}

return new ActionGroup(metaStore.listPageAction((pageIndex - 1) * numPerPage,
numPerPage, orderBy, isDesc), metaStore.getCountOfAllAction());
return new ActionGroup(infos, metaStore.getCountOfAllAction());
}

public List<ActionInfo> getActions(long rid, int size) throws IOException {
Expand Down