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 07f7137fd20 [fix](cloud) fix schema change cluster name npe (#34690)
07f7137fd20 is described below
commit 07f7137fd204d4c867c3b9b2e54c65184c326751
Author: yujun <[email protected]>
AuthorDate: Sat May 11 19:56:50 2024 +0800
[fix](cloud) fix schema change cluster name npe (#34690)
---
fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java | 3 ++-
.../src/main/java/org/apache/doris/alter/CloudRollupJobV2.java | 8 ++++++--
.../main/java/org/apache/doris/alter/CloudSchemaChangeJobV2.java | 9 ++++++---
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java
b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java
index 292e347a129..171a5fee68e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterJobV2.java
@@ -31,6 +31,7 @@ import org.apache.doris.persist.gson.GsonUtils;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.task.AgentTask;
+import com.google.common.base.Strings;
import com.google.common.collect.Maps;
import com.google.gson.annotations.SerializedName;
import org.apache.logging.log4j.LogManager;
@@ -223,7 +224,7 @@ public abstract class AlterJobV2 implements Writable {
return;
}
- if (!cloudClusterName.isEmpty()) {
+ if (!Strings.isNullOrEmpty(cloudClusterName)) {
ConnectContext ctx = new ConnectContext();
ctx.setThreadLocalInfo();
ctx.setCloudCluster(cloudClusterName);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/alter/CloudRollupJobV2.java
b/fe/fe-core/src/main/java/org/apache/doris/alter/CloudRollupJobV2.java
index 1474de4d22f..560ae41e6fd 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/CloudRollupJobV2.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/CloudRollupJobV2.java
@@ -41,6 +41,7 @@ import org.apache.doris.thrift.TTabletType;
import org.apache.doris.thrift.TTaskType;
import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
import com.google.gson.annotations.SerializedName;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -89,8 +90,11 @@ public class CloudRollupJobV2 extends RollupJobV2 {
baseSchemaHash, rollupSchemaHash, rollupKeysType,
rollupShortKeyColumnCount, origStmt);
ConnectContext context = ConnectContext.get();
if (context != null) {
- LOG.debug("rollup job add cloud cluster, context not null,
cluster: {}", context.getCloudCluster());
- setCloudClusterName(context.getCloudCluster());
+ String clusterName = context.getCloudCluster();
+ LOG.debug("rollup job add cloud cluster, context not null,
cluster: {}", clusterName);
+ if (!Strings.isNullOrEmpty(clusterName)) {
+ setCloudClusterName(clusterName);
+ }
}
LOG.debug("rollup job add cloud cluster, context {}", context);
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/alter/CloudSchemaChangeJobV2.java
b/fe/fe-core/src/main/java/org/apache/doris/alter/CloudSchemaChangeJobV2.java
index 22ef8c0d619..42ad2a67d20 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/alter/CloudSchemaChangeJobV2.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/alter/CloudSchemaChangeJobV2.java
@@ -39,6 +39,7 @@ import org.apache.doris.task.AgentTaskQueue;
import org.apache.doris.thrift.TTaskType;
import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
import com.google.gson.annotations.SerializedName;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -77,9 +78,11 @@ public class CloudSchemaChangeJobV2 extends
SchemaChangeJobV2 {
super(rawSql, jobId, dbId, tableId, tableName, timeoutMs);
ConnectContext context = ConnectContext.get();
if (context != null) {
- LOG.debug("schema change job add cloud cluster, context not null,
cluster: {}",
- context.getCloudCluster());
- setCloudClusterName(context.getCloudCluster());
+ String clusterName = context.getCloudCluster();
+ LOG.debug("rollup job add cloud cluster, context not null,
cluster: {}", clusterName);
+ if (!Strings.isNullOrEmpty(clusterName)) {
+ setCloudClusterName(clusterName);
+ }
}
LOG.debug("schema change job add cloud cluster, context {}", context);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
