解决血缘分析与执行图分析异常

dlink-admin/src/main/java/com/dlink/service/impl/StudioServiceImpl.java

@@ -8,6 +8,7 @@ import com.dlink.dto.StudioExecuteDTO;
 import com.dlink.explainer.ca.CABuilder;
 import com.dlink.explainer.ca.ColumnCANode;
 import com.dlink.explainer.ca.TableCANode;
+import com.dlink.gateway.GatewayType;
 import com.dlink.gateway.model.JobInfo;
 import com.dlink.gateway.result.SavePointResult;
 import com.dlink.job.JobConfig;
@@ -89,6 +90,7 @@ public class StudioServiceImpl implements StudioService {
     @Override
     public ObjectNode getStreamGraph(StudioExecuteDTO studioExecuteDTO) {
         JobConfig config = studioExecuteDTO.getJobConfig();
+        config.setType(GatewayType.LOCAL.getLongValue());
         if(!config.isUseSession()) {
             config.setAddress(clusterService.buildEnvironmentAddress(config.isUseRemote(), studioExecuteDTO.getClusterId()));
         }

dlink-core/src/main/java/com/dlink/explainer/Explainer.java

@@ -51,7 +51,7 @@ public class Explainer {
                 if(Asserts.isNullString(sql)){
                     continue;
                 }
-                SqlType operationType = Operations.getOperationType(statement);
+                SqlType operationType = Operations.getOperationType(item);
                 if (operationType.equals(SqlType.INSERT)||operationType.equals(SqlType.SELECT)) {
                     record = executor.explainSqlRecord(sql);
                     if(Asserts.isNull(record)){

dlink-executor/src/main/java/com/dlink/interceptor/FlinkInterceptor.java

@@ -36,14 +36,14 @@ public class FlinkInterceptor {
 
     // return false to continue with executeSql
     public static boolean build(Executor executor, String statement) {
-        if(executor.parseAndLoadConfiguration(statement)){
-            return true;
-        }
         Operation operation = Operations.buildOperation(statement);
         if (Asserts.isNotNull(operation)) {
             operation.build(executor.getCustomTableEnvironmentImpl());
             return operation.noExecute();
         }
+        if(executor.parseAndLoadConfiguration(statement)){
+            return true;
+        }
         return false;
     }
 

dlink-gateway/src/main/java/com/dlink/gateway/GatewayType.java

@@ -10,7 +10,7 @@ import com.dlink.assertion.Asserts;
  **/
 public enum GatewayType {
 
-    STANDALONE("s","standalone"),YARN_SESSION("ys","yarn-session"),YARN_APPLICATION("ya","yarn-application"),YARN_PER_JOB("ypj","yarn-per-job");
+    LOCAL("l","local"),STANDALONE("s","standalone"),YARN_SESSION("ys","yarn-session"),YARN_APPLICATION("ya","yarn-application"),YARN_PER_JOB("ypj","yarn-per-job");
 
     private String value;
     private String longValue;

dlink-web/src/components/Studio/StudioConsole/StudioCA/index.tsx

@@ -165,7 +165,7 @@ const StudioCA = (props:any) => {
           {oneTableCAData!=null?<IndentedTreeGraph {...config} />:<Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />}
         </div>
       </TabPane>
-      <TabPane
+      {/*<TabPane
         tab={
           <span>
           单任务字段级血缘
@@ -185,7 +185,7 @@ const StudioCA = (props:any) => {
           </div>
           {oneColumnCAData!=null?<IndentedTreeGraph {...columnConfig} />:<Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />}
         </div>
-      </TabPane>
+      </TabPane>*/}
       {/*<TabPane
         tab={
           <span>

dlink-web/src/components/Studio/StudioMenu/index.tsx

@@ -174,18 +174,11 @@ const StudioMenu = (props: any) => {
     }
     let useSession = !!currentSession.session;
     let param = {
+      ...current.task,
       useSession: useSession,
       session: currentSession.session,
-      useRemote: current.task.useRemote,
-      clusterId: current.task.clusterId,
-      useResult: current.task.useResult,
-      maxRowNum: current.task.maxRowNum,
+      configJson: JSON.stringify(current.task.config),
       statement: selectsql,
-      fragment: current.task.fragment,
-      jobName: current.task.jobName,
-      parallelism: current.task.parallelism,
-      checkPoint: current.task.checkPoint,
-      savePointPath: current.task.savePointPath,
     };
     const res = getStreamGraph(param);
     handleGraphModalVisible(true);

dlink-web/src/pages/Welcome.tsx

@@ -441,6 +441,9 @@ export default (): React.ReactNode => {
                 <li>
                   <Link>优化打包及扩展方式</Link>
                 </li>
+                <li>
+                  <Link>解决血缘分析与执行图分析异常</Link>
+                </li>
               </ul>
             </Paragraph>
           </Timeline.Item>