resolve conflict

Author: simenliuxing

core/src/main/java/com/dtstack/flink/sql/side/SidePredicatesParser.java

@@ -49,8 +49,7 @@ public class SidePredicatesParser {
     private FlinkPlanner flinkPlanner = new FlinkPlanner();
 
     public void fillPredicatesForSideTable(String exeSql, Map<String, AbstractSideTableInfo> sideTableMap) throws SqlParseException {
-
-        SqlNode sqlNode = org.apache.calcite.sql.parser.SqlParser.create(exeSql).parseStmt();
+        SqlNode sqlNode = flinkPlanner.getParser().parse(exeSql);
         parseSql(sqlNode, sideTableMap, Maps.newHashMap());
     }
 

launcher/src/main/java/com/dtstack/flink/sql/launcher/executor/StandaloneExecutor.java

@@ -47,7 +47,7 @@ public StandaloneExecutor(JobParamsInfo jobParamsInfo) {
 
     public void exec() throws Exception {
 
-        Preconditions.checkArgument(!StringUtils.equalsIgnoreCase(jobParamsInfo.getPluginLoadMode(), EPluginLoadMode.CLASSPATH.name()),
+        Preconditions.checkArgument(StringUtils.equalsIgnoreCase(jobParamsInfo.getPluginLoadMode(), EPluginLoadMode.CLASSPATH.name()),
                 "standalone only supports classpath mode");
 
         JobGraph jobGraph = JobGraphBuildUtil.buildJobGraph(jobParamsInfo);

launcher/src/main/java/com/dtstack/flink/sql/launcher/executor/YarnJobClusterExecutor.java

@@ -79,7 +79,7 @@ public void exec() throws Exception {
         if (jobParamsInfo.getAddShipFile() != null) {
             List<String> addShipFilesPath = parsePathFromStr(jobParamsInfo.getAddShipFile());
             for (String path : addShipFilesPath) {
-                shipFiles.addAll(getShipFiles(path, jobParamsInfo.getPluginLoadMode(), jobGraph, clusterDescriptor));
+                shipFiles.add(getAddShipFile(path));
             }
         }
 
@@ -122,6 +122,18 @@ protected List<File> getShipFiles(String flinkJarPath, String pluginLoadMode, Jo
         return shipFiles;
     }
 
+    private File getAddShipFile(String addShipFile) {
+        if (StringUtils.isEmpty(addShipFile) || !new File(addShipFile).exists()) {
+            throw new RuntimeException("path " + addShipFile + " is not exist");
+        }
+        File shipFile = new File(addShipFile);
+        if (shipFile.isFile()) {
+            return shipFile;
+        } else {
+            throw new RuntimeException("addShipfile only supports file path,E.g : {\\\"a.keytab\\\",\\\"b.txt\\\"}");
+        }
+    }
+
     private void dealFlinkLibJar(String flinkJarPath, YarnClusterDescriptor clusterDescriptor, List<File> shipFiles) throws MalformedURLException {
         if (StringUtils.isEmpty(flinkJarPath) || !new File(flinkJarPath).exists()) {
             throw new RuntimeException("path " + flinkJarPath + " is not exist");

tidb/tidb-side/tidb-all-side/pom.xml

@@ -73,14 +73,14 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy todir="${basedir}/../../../plugins/tidballside">
+                                <copy todir="${basedir}/../../../sqlplugins/tidballside">
                                     <fileset dir="target/">
                                         <include name="${project.artifactId}-${project.version}.jar"/>
                                     </fileset>
                                 </copy>
 
-                                <move file="${basedir}/../../../plugins/tidballside/${project.artifactId}-${project.version}.jar"
-                                      tofile="${basedir}/../../../plugins/tidballside/${project.name}-${git.branch}.jar"/>
+                                <move file="${basedir}/../../../sqlplugins/tidballside/${project.artifactId}-${project.version}.jar"
+                                      tofile="${basedir}/../../../sqlplugins/tidballside/${project.name}-${git.branch}.jar"/>
                             </tasks>
                         </configuration>
                     </execution>

tidb/tidb-side/tidb-async-side/pom.xml

@@ -74,14 +74,14 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy todir="${basedir}/../../../plugins/tidbasyncside">
+                                <copy todir="${basedir}/../../../sqlplugins/tidbasyncside">
                                     <fileset dir="target/">
                                         <include name="${project.artifactId}-${project.version}.jar"/>
                                     </fileset>
                                 </copy>
 
-                                <move file="${basedir}/../../../plugins/tidbasyncside/${project.artifactId}-${project.version}.jar"
-                                      tofile="${basedir}/../../../plugins/tidbasyncside/${project.name}-${git.branch}.jar"/>
+                                <move file="${basedir}/../../../sqlplugins/tidbasyncside/${project.artifactId}-${project.version}.jar"
+                                      tofile="${basedir}/../../../sqlplugins/tidbasyncside/${project.name}-${git.branch}.jar"/>
                             </tasks>
                         </configuration>
                     </execution>

tidb/tidb-sink/pom.xml

@@ -74,14 +74,14 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy todir="${basedir}/../../plugins/tidbsink">
+                                <copy todir="${basedir}/../../sqlplugins/tidbsink">
                                     <fileset dir="target/">
                                         <include name="${project.artifactId}-${project.version}.jar"/>
                                     </fileset>
                                 </copy>
 
-                                <move file="${basedir}/../../plugins/tidbsink/${project.artifactId}-${project.version}.jar"
-                                      tofile="${basedir}/../../plugins/tidbsink/${project.name}-${git.branch}.jar"/>
+                                <move file="${basedir}/../../sqlplugins/tidbsink/${project.artifactId}-${project.version}.jar"
+                                      tofile="${basedir}/../../sqlplugins/tidbsink/${project.name}-${git.branch}.jar"/>
                             </tasks>
                         </configuration>
                     </execution>