This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new 2b0eec3b0cf [fix](fe) Avoid eager allocations in cloud tablet indexes
(#66378) (#67248)
2b0eec3b0cf is described below
commit 2b0eec3b0cf6f5cc2c9bfc10636348ac598a4279
Author: deardeng <[email protected]>
AuthorDate: Tue Sep 8 07:43:56 2026 +0800
[fix](fe) Avoid eager allocations in cloud tablet indexes (#66378) (#67248)
pick from https://github.com/apache/doris/pull/66378
Use computeIfAbsent to avoid eager route-index allocations.
### What problem does this PR solve?
Issue Number: close #xxx
Related PR: #xxx
Problem Summary:
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
---
.../doris/cloud/catalog/CloudTabletRebalancer.java | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudTabletRebalancer.java
b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudTabletRebalancer.java
index 37dc60ea5d9..2aed435acad 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudTabletRebalancer.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudTabletRebalancer.java
@@ -1150,18 +1150,16 @@ public class CloudTabletRebalancer extends MasterDaemon
{
globalBeToTablets.computeIfAbsent(be,
globalTabletSetFactory).add(tabletId);
// table
- beToTabletsInTable.putIfAbsent(tableId, new ConcurrentHashMap<Long,
Set<Long>>());
- ConcurrentHashMap<Long, Set<Long>> beToTabletsOfTable =
beToTabletsInTable.get(tableId);
- beToTabletsOfTable.putIfAbsent(be, ConcurrentHashMap.newKeySet());
- beToTabletsOfTable.get(be).add(tabletId);
+ ConcurrentHashMap<Long, Set<Long>> beToTabletsOfTable =
+ beToTabletsInTable.computeIfAbsent(tableId, ignored -> new
ConcurrentHashMap<>());
+ beToTabletsOfTable.computeIfAbsent(be, ignored ->
ConcurrentHashMap.newKeySet()).add(tabletId);
// partition
- partToTablets.putIfAbsent(partId, new ConcurrentHashMap<Long,
ConcurrentHashMap<Long, Set<Long>>>());
- ConcurrentHashMap<Long, ConcurrentHashMap<Long, Set<Long>>>
indexToTablets = partToTablets.get(partId);
- indexToTablets.putIfAbsent(indexId, new ConcurrentHashMap<Long,
Set<Long>>());
- ConcurrentHashMap<Long, Set<Long>> beToTabletsOfIndex =
indexToTablets.get(indexId);
- beToTabletsOfIndex.putIfAbsent(be, ConcurrentHashMap.newKeySet());
- beToTabletsOfIndex.get(be).add(tabletId);
+ ConcurrentHashMap<Long, ConcurrentHashMap<Long, Set<Long>>>
indexToTablets =
+ partToTablets.computeIfAbsent(partId, ignored -> new
ConcurrentHashMap<>());
+ ConcurrentHashMap<Long, Set<Long>> beToTabletsOfIndex =
+ indexToTablets.computeIfAbsent(indexId, ignored -> new
ConcurrentHashMap<>());
+ beToTabletsOfIndex.computeIfAbsent(be, ignored ->
ConcurrentHashMap.newKeySet()).add(tabletId);
}
private Function<Long, Set<Long>> newGlobalTabletSetFactory(Map<Long,
Set<Long>> previousBeToTablets) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]