This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 3ff82b5004d (fix)[branch-2.0][export] fix replay export NPE issue
(#28732)
3ff82b5004d is described below
commit 3ff82b5004dc8153bff4bff66ed8cbe7398bad39
Author: Mingyu Chen <[email protected]>
AuthorDate: Wed Dec 20 19:53:12 2023 +0800
(fix)[branch-2.0][export] fix replay export NPE issue (#28732)
---
.../src/main/java/org/apache/doris/analysis/ExportStmt.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExportStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExportStmt.java
index 2533dbeb5a7..38f02c49cc4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ExportStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ExportStmt.java
@@ -122,8 +122,16 @@ public class ExportStmt extends StatementBase {
this.lineDelimiter = DEFAULT_LINE_DELIMITER;
this.timeout = DEFAULT_TIMEOUT;
this.columns = DEFAULT_COLUMNS;
- this.sessionVariables =
VariableMgr.cloneSessionVariable(Optional.ofNullable(
-
ConnectContext.get().getSessionVariable()).orElse(VariableMgr.getDefaultSessionVariable()));
+
+ // The ExportStmt may be created in replay thread, there is no
ConnectionContext
+ // in replay thread, so we need to clone session variable from default
session variable.
+ if (ConnectContext.get() != null) {
+ this.sessionVariables =
VariableMgr.cloneSessionVariable(Optional.ofNullable(
+
ConnectContext.get().getSessionVariable()).orElse(VariableMgr.getDefaultSessionVariable()));
+ } else {
+ this.sessionVariables =
VariableMgr.cloneSessionVariable(VariableMgr.getDefaultSessionVariable());
+ }
+
}
public String getColumns() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]