Merge branch 'feat_1.8_mergeGetPlanNew' into 'v1.8.0_dev'

remove log level and modify objectmapper class



See merge request !252

Author: zoudaokoulife

core/pom.xml

@@ -121,11 +121,6 @@
             <artifactId>junit</artifactId>
             <version>4.12</version>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.1.7</version>
-        </dependency>
 
     </dependencies>
 

core/src/main/java/com/dtstack/flink/sql/Main.java

@@ -27,9 +27,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.LoggerContext;
-
 /**
  * Date: 2018/6/26
  * Company: www.dtstack.com
@@ -45,10 +42,4 @@ public static void main(String[] args) throws Exception {
         env.execute(paramsInfo.getName());
         LOG.info("program {} execution success", paramsInfo.getName());
     }
-    private static void setLogLevel(String level){
-        LoggerContext loggerContext= (LoggerContext) LoggerFactory.getILoggerFactory();
-        //设置全局日志级别
-        ch.qos.logback.classic.Logger logger = loggerContext.getLogger("root");
-        logger.setLevel(Level.toLevel(level, Level.INFO));
-    }
 }

core/src/main/java/com/dtstack/flink/sql/exec/ApiResult.java

@@ -1,6 +1,6 @@
 package com.dtstack.flink.sql.exec;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

core/src/main/java/com/dtstack/flink/sql/exec/ExecuteProcessHelper.java

@@ -18,8 +18,6 @@
 
 package com.dtstack.flink.sql.exec;
 
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.LoggerContext;
 import com.dtstack.flink.sql.classloader.ClassLoaderManager;
 import com.dtstack.flink.sql.config.CalciteConfig;
 import com.dtstack.flink.sql.enums.ClusterMode;
@@ -128,7 +126,6 @@ public static ParamsInfo parseParams(String[] args) throws Exception {
                 .setDeployMode(deployMode)
                 .setConfProp(confProperties)
                 .setJarUrlList(jarURList)
-                .setLogLevel(logLevel)
                 .build();
 
     }
@@ -154,8 +151,6 @@ public static StreamExecutionEnvironment getStreamExecution(ParamsInfo paramsInf
         StreamTableEnvironment tableEnv = StreamTableEnvironment.create(env);
         StreamQueryConfig streamQueryConfig = StreamEnvConfigManager.getStreamQueryConfig(tableEnv, paramsInfo.getConfProp());
 
-        setLogLevel(paramsInfo.getLogLevel());
-
         SqlParser.setLocalSqlPluginRoot(paramsInfo.getLocalSqlPluginPath());
         SqlTree sqlTree = SqlParser.parseSql(paramsInfo.getSql());
 
@@ -348,11 +343,5 @@ public static StreamExecutionEnvironment getStreamExeEnv(Properties confProperti
         return env;
     }
 
-    private static void setLogLevel(String level){
-        LoggerContext loggerContext= (LoggerContext) LoggerFactory.getILoggerFactory();
-        //设置全局日志级别
-        ch.qos.logback.classic.Logger logger = loggerContext.getLogger("root");
-        logger.setLevel(Level.toLevel(level, Level.INFO));
-    }
 
 }

core/src/main/java/com/dtstack/flink/sql/exec/ParamsInfo.java

@@ -38,19 +38,17 @@ public class ParamsInfo {
     private String remoteSqlPluginPath;
     private String pluginLoadMode;
     private String deployMode;
-    private String logLevel;
     private Properties confProp;
 
     public ParamsInfo(String sql, String name, List<URL> jarUrlList, String localSqlPluginPath,
-                      String remoteSqlPluginPath, String pluginLoadMode, String deployMode, String logLevel, Properties confProp) {
+                      String remoteSqlPluginPath, String pluginLoadMode, String deployMode, Properties confProp) {
         this.sql = sql;
         this.name = name;
         this.jarUrlList = jarUrlList;
         this.localSqlPluginPath = localSqlPluginPath;
         this.remoteSqlPluginPath = remoteSqlPluginPath;
         this.pluginLoadMode = pluginLoadMode;
         this.deployMode = deployMode;
-        this.logLevel = logLevel;
         this.confProp = confProp;
     }
 
@@ -86,10 +84,6 @@ public Properties getConfProp() {
         return confProp;
     }
 
-    public String getLogLevel() {
-        return logLevel;
-    }
-
     @Override
     public String toString() {
         return "ParamsInfo{" +
@@ -100,7 +94,6 @@ public String toString() {
                 ", remoteSqlPluginPath='" + remoteSqlPluginPath + '\'' +
                 ", pluginLoadMode='" + pluginLoadMode + '\'' +
                 ", deployMode='" + deployMode + '\'' +
-                ", logLevel='" + logLevel + '\'' +
                 ", confProp=" + confProp +
                 '}';
     }
@@ -160,10 +153,6 @@ public ParamsInfo.Builder setDeployMode(String deployMode) {
             return this;
         }
 
-        public ParamsInfo.Builder setLogLevel(String logLevel) {
-            this.logLevel = logLevel;
-            return this;
-        }
 
         public ParamsInfo.Builder setConfProp(Properties confProp) {
             this.confProp = confProp;
@@ -172,7 +161,7 @@ public ParamsInfo.Builder setConfProp(Properties confProp) {
 
         public ParamsInfo build() {
             return new ParamsInfo(sql, name, jarUrlList, localSqlPluginPath,
-                    remoteSqlPluginPath, pluginLoadMode, deployMode, logLevel, confProp);
+                    remoteSqlPluginPath, pluginLoadMode, deployMode, confProp);
         }
     }
 }