Skip to content

Fix create colocate table bug #5139

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
morningman merged 6 commits into from
Jan 4, 2021
Merged

Fix create colocate table bug #5139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
005de54
fix
Nov 20, 2020
9087ae9
Merge branch 'master' of github.com:apache/incubator-doris
Nov 26, 2020
2e5313e
Merge branch 'master' of github.com:apache/incubator-doris
Dec 3, 2020
6441e42
Merge branch 'master' of github.com:apache/incubator-doris
Dec 18, 2020
437e8e1
Merge branch 'master' of github.com:apache/incubator-doris
Dec 24, 2020
74ef47c
Fix create colocate table bug (#1408)
gengjun-git Dec 21, 2020
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: 3 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/catalog/Catalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4371,8 +4371,10 @@ private void createTablets(String clusterName, MaterializedIndex index, ReplicaS
Preconditions.checkState(chosenBackendIds.size() == replicationNum, chosenBackendIds.size() + " vs. "+ replicationNum);
}

if (groupId != null) {
if (groupId != null && chooseBackendsArbitrary) {
colocateIndex.addBackendsPerBucketSeq(groupId, backendsPerBucketSeq);
ColocatePersistInfo info = ColocatePersistInfo.createForBackendsPerBucketSeq(groupId, backendsPerBucketSeq);
editLog.logColocateBackendsPerBucketSeq(info);
}

} else {
Expand Down
13 changes: 8 additions & 5 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/ColocateTableIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@ public GroupId addTableToGroup(long dbId, OlapTable tbl, String groupName, Group
// generate a new one
groupId = new GroupId(dbId, Catalog.getCurrentCatalog().getNextId());
}
groupName2Id.put(fullGroupName, groupId);
HashDistributionInfo distributionInfo = (HashDistributionInfo) tbl.getDefaultDistributionInfo();
ColocateGroupSchema groupSchema = new ColocateGroupSchema(groupId,
distributionInfo.getDistributionColumns(), distributionInfo.getBucketNum(),
tbl.getPartitionInfo().idToReplicationNum.values().stream().findFirst().get());
tbl.getDefaultReplicationNum());
groupName2Id.put(fullGroupName, groupId);
group2Schema.put(groupId, groupSchema);
}
group2Tables.put(groupId, tbl.getId());
Expand Down Expand Up @@ -321,8 +321,12 @@ public Set<Long> getBackendsByGroup(GroupId groupId) {
try {
Set<Long> allBackends = new HashSet<>();
List<List<Long>> backendsPerBucketSeq = group2BackendsPerBucketSeq.get(groupId);
for (List<Long> bes : backendsPerBucketSeq) {
allBackends.addAll(bes);
// if create colocate table with empty partition or create colocate table
// with dynamic_partition will cause backendsPerBucketSeq == null
if (backendsPerBucketSeq != null) {
for (List<Long> bes : backendsPerBucketSeq) {
allBackends.addAll(bes);
}
}
return allBackends;
} finally {
Expand Down Expand Up @@ -446,7 +450,6 @@ public void replayAddTableToGroup(ColocatePersistInfo info) {
writeLock();
try {
if (!group2BackendsPerBucketSeq.containsKey(info.getGroupId())) {
Preconditions.checkState(!info.getBackendsPerBucketSeq().isEmpty());
group2BackendsPerBucketSeq.put(info.getGroupId(), info.getBackendsPerBucketSeq());
}

Expand Down
8 changes: 8 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/clone/ColocateTableBalancer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@ private void relocateAndBalanceGroup() {
if (statistic == null) {
continue;
}
List<List<Long>> backendsPerBucketSeq = colocateIndex.getBackendsPerBucketSeq(groupId);
if (backendsPerBucketSeq.isEmpty()) {
continue;
}

Set<Long> unavailableBeIdsInGroup = getUnavailableBeIdsInGroup(infoService, colocateIndex, groupId);
List<Long> availableBeIds = getAvailableBeIds(db.getClusterName(), infoService);
Expand Down Expand Up @@ -183,6 +187,10 @@ private void matchGroup() {
}

List<Set<Long>> backendBucketsSeq = colocateIndex.getBackendsPerBucketSeqSet(groupId);
if (backendBucketsSeq.isEmpty()) {
continue;
}

boolean isGroupStable = true;
db.readLock();
try {
Expand Down