You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2022/07/18 00:47:31 UTC
[doris] branch master updated: [fix](alter) fix bug that fe crash because npe on rollupBatchTask (#10943)
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 2e94674cb5 [fix](alter) fix bug that fe crash because npe on rollupBatchTask (#10943)
2e94674cb5 is described below
commit 2e94674cb5574ec690847745da5f022f55d8890d
Author: caiconghui <55...@users.noreply.github.com>
AuthorDate: Mon Jul 18 08:47:25 2022 +0800
[fix](alter) fix bug that fe crash because npe on rollupBatchTask (#10943)
Co-authored-by: caiconghui1 <ca...@jd.com>
---
fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java | 4 ++++
.../src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java b/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java
index 76d880c9b4..51e8e5b209 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java
@@ -134,6 +134,10 @@ public class RollupJobV2 extends AlterJobV2 implements GsonPostProcessable {
// save failed task after retry three times, tabletId -> agentTask
private Map<Long, List<AgentTask>> failedAgentTasks = Maps.newHashMap();
+ private RollupJobV2() {
+ super(JobType.ROLLUP);
+ }
+
public RollupJobV2(long jobId, long dbId, long tableId, String tableName, long timeoutMs,
long baseIndexId, long rollupIndexId, String baseIndexName, String rollupIndexName,
List<Column> rollupSchema, int baseSchemaHash, int rollupSchemaHash, KeysType rollupKeysType,
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
index 2ba96bda7e..f7d8de938b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
@@ -132,6 +132,10 @@ public class SchemaChangeJobV2 extends AlterJobV2 {
// save failed task after retry three times, tabletId -> agentTask
private Map<Long, List<AgentTask>> failedAgentTasks = Maps.newHashMap();
+ private SchemaChangeJobV2() {
+ super(JobType.SCHEMA_CHANGE);
+ }
+
public SchemaChangeJobV2(long jobId, long dbId, long tableId, String tableName, long timeoutMs) {
super(jobId, JobType.SCHEMA_CHANGE, dbId, tableId, tableName, timeoutMs);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org