You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by zh...@apache.org on 2020/04/20 00:29:45 UTC
[incubator-doris] branch master updated: Fix Colocate Join Bug
(#3354)
This is an automated email from the ASF dual-hosted git repository.
zhaoc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 929e936 Fix Colocate Join Bug (#3354)
929e936 is described below
commit 929e93699af3b75e0679fb401dbf0e944d3e3170
Author: wangbo <50...@qq.com>
AuthorDate: Mon Apr 20 08:29:34 2020 +0800
Fix Colocate Join Bug (#3354)
1 Fix sync error colocate group status between fe
2 Fix losing call of EditLog.logColocateRemoveTable
---
fe/src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java | 6 +++++-
fe/src/main/java/org/apache/doris/catalog/ColocateTableIndex.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/fe/src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java b/fe/src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java
index f508148..9c65f50 100644
--- a/fe/src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java
+++ b/fe/src/main/java/org/apache/doris/catalog/CatalogRecycleBin.java
@@ -28,6 +28,7 @@ import org.apache.doris.common.io.Text;
import org.apache.doris.common.io.Writable;
import org.apache.doris.common.util.MasterDaemon;
import org.apache.doris.common.util.RangeUtils;
+import org.apache.doris.persist.ColocatePersistInfo;
import org.apache.doris.persist.RecoverInfo;
import org.apache.doris.task.AgentBatchTask;
import org.apache.doris.task.AgentTaskExecutor;
@@ -243,7 +244,10 @@ public class CatalogRecycleBin extends MasterDaemon implements Writable {
AgentTaskExecutor.submit(batchTask);
// colocation
- Catalog.getCurrentColocateIndex().removeTable(olapTable.getId());
+ if (Catalog.getCurrentColocateIndex().removeTable(olapTable.getId())) {
+ Catalog.getCurrentCatalog().getEditLog().logColocateRemoveTable(
+ ColocatePersistInfo.createForRemoveTable(olapTable.getId()));
+ }
}
private synchronized void eraseTableWithSameName(long dbId, String tableName) {
diff --git a/fe/src/main/java/org/apache/doris/catalog/ColocateTableIndex.java b/fe/src/main/java/org/apache/doris/catalog/ColocateTableIndex.java
index 818ce74..381c40f 100644
--- a/fe/src/main/java/org/apache/doris/catalog/ColocateTableIndex.java
+++ b/fe/src/main/java/org/apache/doris/catalog/ColocateTableIndex.java
@@ -208,7 +208,7 @@ public class ColocateTableIndex implements Writable {
if (unstableGroups.remove(groupId)) {
if (needEditLog) {
ColocatePersistInfo info = ColocatePersistInfo.createForMarkStable(groupId);
- Catalog.getInstance().getEditLog().logColocateMarkUnstable(info);
+ Catalog.getInstance().getEditLog().logColocateMarkStable(info);
}
LOG.info("mark group {} as stable", groupId);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org