Skip to content

[Minor] Store shuffleId int to be consistent with other data structure #10

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

Merged
roryqi merged 1 commit into from
Jul 2, 2022
Merged

[Minor] Store shuffleId int to be consistent with other data structure #10

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
6 changes: 3 additions & 3 deletions server/src/main/java/com/tencent/rss/server/ShuffleTaskManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public class ShuffleTaskManager {
private ShuffleBufferManager shuffleBufferManager;
private Map<String, Long> appIds = Maps.newConcurrentMap();
// appId -> shuffleId -> commit count
private Map<String, Map<Long, AtomicInteger>> commitCounts = Maps.newConcurrentMap();
private Map<String, Map<Integer, AtomicInteger>> commitCounts = Maps.newConcurrentMap();
private Map<String, Map<Integer, Object>> commitLocks = Maps.newConcurrentMap();
// appId -> shuffleId -> blockIds
private Map<String, Map<Integer, Roaring64NavigableMap>> cachedBlockIds = Maps.newConcurrentMap();
Expand Down Expand Up @@ -229,9 +229,9 @@ public void addFinishedBlockIds(
}
}

public int updateAndGetCommitCount(String appId, long shuffleId) {
public int updateAndGetCommitCount(String appId, int shuffleId) {
commitCounts.putIfAbsent(appId, Maps.newConcurrentMap());
Map<Long, AtomicInteger> shuffleCommit = commitCounts.get(appId);
Map<Integer, AtomicInteger> shuffleCommit = commitCounts.get(appId);
shuffleCommit.putIfAbsent(shuffleId, new AtomicInteger(0));
AtomicInteger commitNum = shuffleCommit.get(shuffleId);
return commitNum.incrementAndGet();
Expand Down