Merge branch '1.8_release_3.10.x' into feat_1.8_autoJsonArray

Author: a49a

core/pom.xml

@@ -122,6 +122,7 @@
             <artifactId>junit</artifactId>
             <version>4.12</version>
         </dependency>
+
     </dependencies>
 
     <build>

core/src/main/java/com/dtstack/flink/sql/option/Options.java

@@ -72,6 +72,10 @@ public class Options {
     @OptionRequired(description = "log level")
     private String logLevel = "info";
 
+    @OptionRequired(description = "file add to ship file")
+    private  String addShipfile;
+
+
     public String getMode() {
         return mode;
     }
@@ -183,4 +187,13 @@ public String getLogLevel() {
 	public void setLogLevel(String logLevel) {
 		this.logLevel = logLevel;
 	}
+
+    public String getAddShipfile() {
+        return addShipfile;
+    }
+
+    public void setAddShipfile(String addShipfile) {
+        this.addShipfile = addShipfile;
+    }
+
 }

core/src/main/java/com/dtstack/flink/sql/parser/CreateTmpTableParser.java

@@ -22,11 +22,7 @@
 
 import com.dtstack.flink.sql.util.DtStringUtil;
 import org.apache.calcite.config.Lex;
-import org.apache.calcite.sql.SqlBasicCall;
-import org.apache.calcite.sql.SqlJoin;
-import org.apache.calcite.sql.SqlKind;
-import org.apache.calcite.sql.SqlNode;
-import org.apache.calcite.sql.SqlSelect;
+import org.apache.calcite.sql.*;
 import org.apache.calcite.sql.parser.SqlParseException;
 import org.apache.calcite.sql.parser.SqlParser;
 import com.google.common.collect.Lists;
@@ -164,6 +160,10 @@ private static void parseNode(SqlNode sqlNode, CreateTmpTableParser.SqlParserRes
                     parseNode(unionRight, sqlParseResult);
                 }
                 break;
+            case MATCH_RECOGNIZE:
+                SqlMatchRecognize node = (SqlMatchRecognize) sqlNode;
+                sqlParseResult.addSourceTable(node.getTableRef().toString());
+                break;
             default:
                 //do nothing
                 break;

core/src/main/java/com/dtstack/flink/sql/util/AuthUtil.java

@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.dtstack.flink.sql.util;
+
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *  Utility methods for helping with security tasks.
+ * Date: 2019/12/28
+ * Company: www.dtstack.com
+ * @author maqi
+ */
+public class AuthUtil {
+
+    public static String creatJaasFile(String prefix, String suffix, JAASConfig jaasConfig) throws IOException {
+        File krbConf = new File(System.getProperty("user.dir"));
+        File temp = File.createTempFile(prefix, suffix, krbConf);
+        temp.deleteOnExit();
+        FileUtils.writeStringToFile(temp, jaasConfig.toString());
+        return temp.getAbsolutePath();
+    }
+
+
+    public static class JAASConfig {
+        private String entryName;
+        private String loginModule;
+        private String loginModuleFlag;
+        private Map<String, String> loginModuleOptions;
+
+        public JAASConfig(String entryName, String loginModule, String loginModuleFlag, Map<String, String> loginModuleOptions) {
+            this.entryName = entryName;
+            this.loginModule = loginModule;
+            this.loginModuleFlag = loginModuleFlag;
+            this.loginModuleOptions = loginModuleOptions;
+        }
+
+        public static Builder builder() {
+            return new Builder();
+        }
+
+        @Override
+        public String toString() {
+            StringBuilder stringBuilder = new StringBuilder(entryName).append(" {\n\t")
+                    .append(loginModule).append("  ").append(loginModuleFlag).append("\n\t");
+            String[] keys = loginModuleOptions.keySet().toArray(new String[loginModuleOptions.size()]);
+            for (int i = 0; i < keys.length; i++) {
+                stringBuilder.append(keys[i]).append("=").append(loginModuleOptions.get(keys[i]));
+                if (i != keys.length - 1) {
+                    stringBuilder.append("\n\t");
+                } else {
+                    stringBuilder.append(";\n");
+                }
+
+            }
+            stringBuilder.append("\n").append("};");
+            return stringBuilder.toString();
+        }
+
+        public static class Builder {
+            private String entryName;
+            private String loginModule;
+            private String loginModuleFlag;
+            private Map<String, String> loginModuleOptions;
+
+            public Builder setEntryName(String entryName) {
+                this.entryName = entryName;
+                return this;
+            }
+
+            public Builder setLoginModule(String loginModule) {
+                this.loginModule = loginModule;
+                return this;
+            }
+
+            public Builder setLoginModuleFlag(String loginModuleFlag) {
+                this.loginModuleFlag = loginModuleFlag;
+                return this;
+            }
+
+            public Builder setLoginModuleOptions(Map<String, String> loginModuleOptions) {
+                this.loginModuleOptions = loginModuleOptions;
+                return this;
+            }
+
+            public JAASConfig build() {
+                return new JAASConfig(
+                        entryName, loginModule, loginModuleFlag, loginModuleOptions);
+            }
+        }
+    }
+}

docs/config.md

@@ -46,6 +46,11 @@ sh submit.sh -key1 val1 -key2 val2
     * 描述：扩展jar路径,当前主要是UDF定义的jar；
     * 必选：否
     * 默认值：无
+
+* **addShipfile**
+    * 描述：扩展上传的文件，比如开启；Kerberos认证需要的keytab文件和krb5.conf文件    
+    * 必选：否
+    * 默认值：无
 
 * **confProp**
     * 描述：一些参数设置