[incubator-doris] branch master updated: Change sqlmode 'required' to 'optional' in forward master request, (#2236)

[zhaoc]

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 db8819d  Change sqlmode 'required' to 'optional' in forward master 
request,  (#2236)
db8819d is described below

commit db8819d365a4bcb64d273a59dadc2ff47b6c6242
Author: xy720 <22125576+xy...@users.noreply.github.com>
AuthorDate: Tue Nov 19 17:32:37 2019 +0800

    Change sqlmode 'required' to 'optional' in forward master request,  (#2236)
---
 fe/src/main/java/org/apache/doris/qe/ConnectProcessor.java | 4 +++-
 gensrc/thrift/FrontendService.thrift                       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fe/src/main/java/org/apache/doris/qe/ConnectProcessor.java 
b/fe/src/main/java/org/apache/doris/qe/ConnectProcessor.java
index 6362336..c2ea972 100644
--- a/fe/src/main/java/org/apache/doris/qe/ConnectProcessor.java
+++ b/fe/src/main/java/org/apache/doris/qe/ConnectProcessor.java
@@ -321,7 +321,6 @@ public class ConnectProcessor {
         ctx.setQualifiedUser(request.user);
         ctx.setCatalog(Catalog.getInstance());
         ctx.getState().reset();
-        ctx.getSessionVariable().setSqlMode(request.sqlMode);
         if (request.isSetCluster()) {
             ctx.setCluster(request.cluster);
         }
@@ -343,6 +342,9 @@ public class ConnectProcessor {
         if (request.isSetStmt_id()) {
             ctx.setForwardedStmtId(request.getStmt_id());
         }
+        if (request.isSetSqlMode()) {
+            ctx.getSessionVariable().setSqlMode(request.sqlMode);
+        }
 
         ctx.setThreadLocalInfo();
 
diff --git a/gensrc/thrift/FrontendService.thrift 
b/gensrc/thrift/FrontendService.thrift
index 7fd6839..f42339c 100644
--- a/gensrc/thrift/FrontendService.thrift
+++ b/gensrc/thrift/FrontendService.thrift
@@ -413,7 +413,7 @@ struct TMasterOpRequest {
     8: optional string user_ip
     9: optional string time_zone
     10: optional i64 stmt_id
-    11: required i64 sqlMode
+    11: optional i64 sqlMode
 }
 
 struct TColumnDefinition {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org