You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by da...@apache.org on 2024/06/12 13:55:48 UTC
(doris) branch master updated: [fix](alter) Remove rebuildAlterJob (#36196)
This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 42ae93093c7 [fix](alter) Remove rebuildAlterJob (#36196)
42ae93093c7 is described below
commit 42ae93093c7a738482bfbee94b8379dbb848d036
Author: walter <w4...@gmail.com>
AuthorDate: Wed Jun 12 21:55:41 2024 +0800
[fix](alter) Remove rebuildAlterJob (#36196)
The compatible subtype was introduced in #35989, after that the
RollupJobV2 and SchemaChangeJobV2 will be instanced to CloudRollupJobV2
and SchemaChangeJobV2. So there is no need to use rebuildAlterJob
anymore.
---
.../java/org/apache/doris/alter/AlterJobV2Factory.java | 15 ---------------
.../org/apache/doris/alter/MaterializedViewHandler.java | 2 --
.../java/org/apache/doris/alter/SchemaChangeHandler.java | 2 --
3 files changed, 19 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2Factory.java b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2Factory.java
index ef3c41d0aa1..8b1fdf12fa2 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2Factory.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2Factory.java
@@ -57,19 +57,4 @@ public class AlterJobV2Factory {
baseSchemaHash, rollupSchemaHash, rollupKeysType, rollupShortKeyColumnCount, origStmt);
}
}
-
- public static AlterJobV2 rebuildAlterJobV2(AlterJobV2 job) throws AnalysisException {
- try {
- if (Config.isCloudMode()) {
- if (job.getType() == AlterJobV2.JobType.SCHEMA_CHANGE) {
- job = CloudSchemaChangeJobV2.buildCloudSchemaChangeJobV2((SchemaChangeJobV2) job);
- } else if (job.getType() == AlterJobV2.JobType.ROLLUP) {
- job = CloudRollupJobV2.buildCloudRollupJobV2((RollupJobV2) job);
- }
- }
- return job;
- } catch (IllegalAccessException e) {
- throw new AnalysisException(e.getMessage());
- }
- }
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/MaterializedViewHandler.java b/fe/fe-core/src/main/java/org/apache/doris/alter/MaterializedViewHandler.java
index 635d0e63962..33e6aa58de0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/MaterializedViewHandler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/MaterializedViewHandler.java
@@ -114,7 +114,6 @@ public class MaterializedViewHandler extends AlterHandler {
@Override
public void addAlterJobV2(AlterJobV2 alterJob) throws AnalysisException {
- alterJob = AlterJobV2Factory.rebuildAlterJobV2(alterJob);
super.addAlterJobV2(alterJob);
addAlterJobV2ToTableNotFinalStateJobMap(alterJob);
}
@@ -1120,7 +1119,6 @@ public class MaterializedViewHandler extends AlterHandler {
// replay the alter job v2
@Override
public void replayAlterJobV2(AlterJobV2 alterJob) throws AnalysisException {
- alterJob = AlterJobV2Factory.rebuildAlterJobV2(alterJob);
super.replayAlterJobV2(alterJob);
if (!alterJob.isDone()) {
addAlterJobV2ToTableNotFinalStateJobMap(alterJob);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java
index aa747a6d699..cd1632faf8f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java
@@ -2647,7 +2647,6 @@ public class SchemaChangeHandler extends AlterHandler {
@Override
public void addAlterJobV2(AlterJobV2 alterJob) throws AnalysisException {
- alterJob = AlterJobV2Factory.rebuildAlterJobV2(alterJob);
super.addAlterJobV2(alterJob);
runnableSchemaChangeJobV2.put(alterJob.getJobId(), alterJob);
}
@@ -2698,7 +2697,6 @@ public class SchemaChangeHandler extends AlterHandler {
@Override
public void replayAlterJobV2(AlterJobV2 alterJob) throws AnalysisException {
- alterJob = AlterJobV2Factory.rebuildAlterJobV2(alterJob);
if (!alterJob.isDone() && !runnableSchemaChangeJobV2.containsKey(alterJob.getJobId())) {
runnableSchemaChangeJobV2.put(alterJob.getJobId(), alterJob);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org