#IB0SJ1 调优代码

liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java

@@ -20,8 +20,8 @@ import com.yomahub.liteflow.flow.element.Executable;
 import com.yomahub.liteflow.flow.element.Node;
 import com.yomahub.liteflow.flow.element.condition.AndOrCondition;
 import com.yomahub.liteflow.flow.element.condition.NotCondition;
-import com.yomahub.liteflow.flow.instanceId.InstanceIdGeneratorSpi;
 import com.yomahub.liteflow.flow.instanceId.NodeInstanceIdManageSpi;
+import com.yomahub.liteflow.flow.instanceId.NodeInstanceIdManageSpiHolder;
 import com.yomahub.liteflow.log.LFLog;
 import com.yomahub.liteflow.log.LFLoggerManager;
 import com.yomahub.liteflow.property.LiteflowConfig;
@@ -241,9 +241,9 @@ public class LiteFlowChainELBuilder {
 
 	// 往condition里设置instanceId
     private void setNodesInstanceId(Condition condition) {
-		InstanceIdGeneratorSpi instanceIdGenerator = NodeInstanceIdManageSpi.getInstance().getInstanceIdGenerator();
+		NodeInstanceIdManageSpi nodeInstanceIdManageSpi = NodeInstanceIdManageSpiHolder.getInstance().getNodeInstanceIdManageSpi();
 
-		instanceIdGenerator.setNodesInstanceId(condition, chain);
+		nodeInstanceIdManageSpi.setNodesInstanceId(condition, chain);
     }
 
 

liteflow-core/src/main/java/com/yomahub/liteflow/flow/instanceId/BaseInstanceIdGeneratorSpi.java → liteflow-core/src/main/java/com/yomahub/liteflow/flow/instanceId/BaseNodeInstanceIdManageSpi.java

@@ -19,11 +19,11 @@ import static com.yomahub.liteflow.util.SerialsUtil.generateShortUUID;
  * @author lhh
  * @since 2.13.0
  */
-public abstract class BaseInstanceIdGeneratorSpi implements InstanceIdGeneratorSpi {
+public abstract class BaseNodeInstanceIdManageSpi implements NodeInstanceIdManageSpi {
 
     // 根据实例id获取 节点实例定位
     @Override
-    public String getNodeInstanceId(String chainId, String instanceId) {
+    public String getNodeInstanceLocationById(String chainId, String instanceId) {
         if (StringUtils.isBlank(chainId) || StringUtils.isBlank(instanceId)) {
             return "";
         }
@@ -60,14 +60,14 @@ public abstract class BaseInstanceIdGeneratorSpi implements InstanceIdGeneratorS
     // 往condition里设置instanceId
     @Override
     public void setNodesInstanceId(Condition condition, Chain chain) {
-        InstanceIdGeneratorSpi instanceIdGenerator = NodeInstanceIdManageSpi.getInstance().getInstanceIdGenerator();
+        NodeInstanceIdManageSpi nodeInstanceIdManageSpi = NodeInstanceIdManageSpiHolder.getInstance().getNodeInstanceIdManageSpi();
 
         String elMd5 = MD5.create().digestHex(chain.getEl());
-        List<String> instanceIdFile = instanceIdGenerator.readInstanceIdFile(chain.getChainId());
+        List<String> instanceIdFile = nodeInstanceIdManageSpi.readInstanceIdFile(chain.getChainId());
 
         // 如果文件不存在，或者文件内容不是当前el，则写入
         if (CollUtil.isEmpty(instanceIdFile) || !instanceIdFile.get(0).equals(elMd5)) {
-            instanceIdGenerator.writeInstanceIdFile(writeNodeInstanceId(condition, elMd5), chain.getChainId());
+            nodeInstanceIdManageSpi.writeInstanceIdFile(writeNodeInstanceId(condition, elMd5), chain.getChainId());
         } else {
             // 文件存在，则直接读取
             Map<String, List<String>> executableMap = new HashMap<>();

liteflow-core/src/main/java/com/yomahub/liteflow/flow/instanceId/DefaultInstanceIdGeneratorSpi.java → liteflow-core/src/main/java/com/yomahub/liteflow/flow/instanceId/DefaultNodeInstanceIdManageSpiImpl.java

@@ -15,7 +15,7 @@ import static com.yomahub.liteflow.common.ChainConstant.USER_DIR;
  * @author Jay li
  * @since 2.13.0
  */
-public class DefaultInstanceIdGeneratorSpi extends BaseInstanceIdGeneratorSpi {
+public class DefaultNodeInstanceIdManageSpiImpl extends BaseNodeInstanceIdManageSpi {
 
     private final String basePath = System.getProperty(USER_DIR) + File.separator + NODE_INSTANCE_PATH + File.separator;
 

liteflow-core/src/main/java/com/yomahub/liteflow/flow/instanceId/InstanceIdGeneratorSpi.java

@@ -1,27 +0,0 @@
-package com.yomahub.liteflow.flow.instanceId;
-
-import com.yomahub.liteflow.flow.element.Chain;
-import com.yomahub.liteflow.flow.element.Condition;
-
-import java.util.List;
-
-
-/**
- * @author Jay li
- * @since 2.13.0
- */
-public interface InstanceIdGeneratorSpi {
-    // 拿文件保存路径， 不同插件不同实现
-    // 读取文件内容 核对数据
-    List<String> readInstanceIdFile(String chainId);
-
-    // 写入文件保存
-    void writeInstanceIdFile(List<String> instanceIdList, String chainId);
-
-    // 根据实例id获取 节点实例定位
-    String getNodeInstanceId(String chainId, String instanceId);
-
-    // 设置node节点的实例id
-    void setNodesInstanceId(Condition condition, Chain chain);
-
-}

liteflow-core/src/main/java/com/yomahub/liteflow/flow/instanceId/NodeInstanceIdManageSpi.java

@@ -1,42 +1,28 @@
 package com.yomahub.liteflow.flow.instanceId;
 
-import cn.hutool.core.util.ObjectUtil;
+import com.yomahub.liteflow.flow.element.Chain;
+import com.yomahub.liteflow.flow.element.Condition;
+
+import java.util.List;
 
-import java.util.Iterator;
-import java.util.ServiceLoader;
 
 /**
  * @author Jay li
  * @since 2.13.0
  */
-public class NodeInstanceIdManageSpi {
-    private InstanceIdGeneratorSpi instanceIdGenerator;
-
-    private static final NodeInstanceIdManageSpi INSTANCE = new NodeInstanceIdManageSpi();
-
-    public static void init() {
-        ServiceLoader<InstanceIdGeneratorSpi> loader = ServiceLoader.load(InstanceIdGeneratorSpi.class);
-        Iterator<InstanceIdGeneratorSpi> iterator = loader.iterator();
-        if (iterator.hasNext()) {
-            INSTANCE.setInstanceIdGenerator(iterator.next());
-        } else {
-            INSTANCE.setInstanceIdGenerator(new DefaultInstanceIdGeneratorSpi());
-        }
-    }
-
-    public static NodeInstanceIdManageSpi getInstance() {
-        return INSTANCE;
-    }
-
-    public InstanceIdGeneratorSpi getInstanceIdGenerator() {
-        if (ObjectUtil.isNull(instanceIdGenerator)) {
-            init();
-        }
-        return instanceIdGenerator;
-    }
-
-    public void setInstanceIdGenerator(InstanceIdGeneratorSpi instanceIdGenerator) {
-        this.instanceIdGenerator = instanceIdGenerator;
-    }
-
-}
+public interface NodeInstanceIdManageSpi {
+
+    // 拿文件保存路径， 不同插件不同实现
+    // 读取文件内容 核对数据
+    List<String> readInstanceIdFile(String chainId);
+
+    // 写入文件保存
+    void writeInstanceIdFile(List<String> instanceIdList, String chainId);
+
+    // 根据实例id获取 节点实例定位
+    String getNodeInstanceLocationById(String chainId, String instanceId);
+
+    // 设置node节点的实例id
+    void setNodesInstanceId(Condition condition, Chain chain);
+
+}

liteflow-core/src/main/java/com/yomahub/liteflow/flow/instanceId/NodeInstanceIdManageSpiHolder.java

@@ -0,0 +1,42 @@
+package com.yomahub.liteflow.flow.instanceId;
+
+import cn.hutool.core.util.ObjectUtil;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+/**
+ * @author Jay li
+ * @since 2.13.0
+ */
+public class NodeInstanceIdManageSpiHolder {
+    private NodeInstanceIdManageSpi nodeInstanceIdManageSpi;
+
+    private static final NodeInstanceIdManageSpiHolder INSTANCE = new NodeInstanceIdManageSpiHolder();
+
+    public static void init() {
+        ServiceLoader<NodeInstanceIdManageSpi> loader = ServiceLoader.load(NodeInstanceIdManageSpi.class);
+        Iterator<NodeInstanceIdManageSpi> iterator = loader.iterator();
+        if (iterator.hasNext()) {
+            INSTANCE.setNodeInstanceIdManageSpi(iterator.next());
+        } else {
+            INSTANCE.setNodeInstanceIdManageSpi(new DefaultNodeInstanceIdManageSpiImpl());
+        }
+    }
+
+    public static NodeInstanceIdManageSpiHolder getInstance() {
+        return INSTANCE;
+    }
+
+    public NodeInstanceIdManageSpi getNodeInstanceIdManageSpi() {
+        if (ObjectUtil.isNull(nodeInstanceIdManageSpi)) {
+            init();
+        }
+        return nodeInstanceIdManageSpi;
+    }
+
+    public void setNodeInstanceIdManageSpi(NodeInstanceIdManageSpi nodeInstanceIdManageSpi) {
+        this.nodeInstanceIdManageSpi = nodeInstanceIdManageSpi;
+    }
+
+}

liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/constant/SqlReadConstant.java

@@ -16,6 +16,16 @@ public class SqlReadConstant {
 
     public static final String INSTANT_INSERT_SQL = "INSERT INTO {} ({},{},{},{}) VALUES ('{}','{}','{}','{}')";
 
+    public static final String INSTANT_CREATE_TABLE_SQL = "create table IF NOT EXISTS `node_instance_id_table`\n" +
+            "(\n" +
+            "    `id`                   bigint        NOT NULL GENERATED BY DEFAULT AS IDENTITY,\n" +
+            "    `application_name`     varchar(32)   NOT NULL,\n" +
+            "    `chain_id`           varchar(32)   NOT NULL,\n" +
+            "    `el_data_md5`          varchar(128)   NOT NULL,\n" +
+            "    `group_key_instance_id`     varchar(1024)   NOT NULL,\n" +
+            "    PRIMARY KEY (`id`)\n" +
+            ");";
+
     public static final String SQL_PATTERN = "SELECT * FROM {} WHERE {}='{}'";
 
     public static final String SCRIPT_SQL_CHECK_PATTERN = "SELECT 1 FROM {} ";

liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/spi/instanceId/SqlInstanceIdGeneratorSpi.java → liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/spi/instanceId/SqlNodeInstanceIdManageSpiImpl.java

@@ -2,7 +2,7 @@ package com.yomahub.liteflow.parser.spi.instanceId;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
-import com.yomahub.liteflow.flow.instanceId.BaseInstanceIdGeneratorSpi;
+import com.yomahub.liteflow.flow.instanceId.BaseNodeInstanceIdManageSpi;
 import com.yomahub.liteflow.parser.constant.ReadType;
 import com.yomahub.liteflow.parser.constant.SqlReadConstant;
 import com.yomahub.liteflow.parser.sql.read.SqlRead;
@@ -22,7 +22,7 @@ import java.util.List;
  * @since 2.12.4
  */
 
-public class SqlInstanceIdGeneratorSpi extends BaseInstanceIdGeneratorSpi {
+public class SqlNodeInstanceIdManageSpiImpl extends BaseNodeInstanceIdManageSpi {
 
     @Override
     public List<String> readInstanceIdFile(String chainId) {

liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/SQLXmlELParser.java

@@ -65,6 +65,12 @@ public class SQLXmlELParser extends ClassXmlFlowELParser {
             // 注册轮询任务
             SqlReadFactory.registerSqlReadPollTask(ReadType.CHAIN);
             SqlReadFactory.registerSqlReadPollTask(ReadType.SCRIPT);
+
+
+            // enable-node-instance-id=true 创建节点实例ID表 如果不存在
+            if (liteflowConfig.getEnableNodeInstanceId()) {
+                JDBCHelper.getInstance().createNodeInstanceIdTable();
+            }
         } catch (ELSQLException elsqlException) {
             throw elsqlException;
         } catch (Exception ex) {

liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/JDBCHelper.java

@@ -207,4 +207,24 @@ public class JDBCHelper {
             LiteFlowJdbcUtil.close(conn, stmt, resultSet);
         }
     }
+
+    /**
+     * 创建node_instance_id表，如果不存在
+     */
+    public void createNodeInstanceIdTable()  {
+        Connection conn = null;
+        Statement stmt = null;
+
+        try {
+            conn = LiteFlowJdbcUtil.getConn(sqlParserVO);
+
+            stmt = conn.createStatement();
+            stmt.executeUpdate(INSTANT_CREATE_TABLE_SQL);
+        } catch (SQLException e) {
+            throw new ELSQLException(e);
+        } finally {
+            LiteFlowJdbcUtil.close(conn, stmt);
+        }
+    }
+
 }

liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/LiteFlowJdbcUtil.java

@@ -117,6 +117,30 @@ public class LiteFlowJdbcUtil {
         return StrUtil.format(CHECK_SQL_PATTERN, chainNameField, elDataField, chainTableName);
     }
 
+    /**
+     * 关闭
+     * @param conn
+     * @param stmt
+     */
+    public static void close(Connection conn, Statement stmt) {
+        // 关闭 statement
+        if (stmt != null) {
+            try {
+                stmt.close();
+            } catch (SQLException e) {
+                throw new ELSQLException(e);
+            }
+        }
+        // 关闭连接
+        if (conn != null) {
+            try {
+                conn.close();
+            } catch (SQLException e) {
+                throw new ELSQLException(e);
+            }
+        }
+    }
+
     public static class DataSourceBeanNameHolder {
         private static String DATA_SOURCE_NAME = null;
 

liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/vo/SQLParserVO.java

@@ -60,7 +60,7 @@ public class SQLParserVO {
     /**
      * instanceId 表名
      */
-    private String instanceIdTableName;
+    private String instanceIdTableName = "node_instance_id_table";
 
     /**
      * instanceId 里的应用名字段

liteflow-rule-plugin/liteflow-rule-sql/src/main/resources/META-INF/services/com.yomahub.liteflow.flow.instanceId.InstanceIdGeneratorSpi

@@ -1 +0,0 @@
-com.yomahub.liteflow.parser.spi.instanceId.SqlInstanceIdGeneratorSpi

liteflow-rule-plugin/liteflow-rule-sql/src/main/resources/META-INF/services/com.yomahub.liteflow.flow.instanceId.NodeInstanceIdManageSpi

@@ -0,0 +1 @@
+com.yomahub.liteflow.parser.spi.instanceId.SqlNodeInstanceIdManageSpiImpl

liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/instanceIds/InstanceIdELSpringTest.java

@@ -2,8 +2,8 @@ package com.yomahub.liteflow.test.instanceIds;
 
 import com.yomahub.liteflow.core.FlowExecutor;
 import com.yomahub.liteflow.flow.LiteflowResponse;
-import com.yomahub.liteflow.flow.instanceId.InstanceIdGeneratorSpi;
 import com.yomahub.liteflow.flow.instanceId.NodeInstanceIdManageSpi;
+import com.yomahub.liteflow.flow.instanceId.NodeInstanceIdManageSpiHolder;
 import com.yomahub.liteflow.test.BaseTest;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -80,10 +80,10 @@ public class InstanceIdELSpringTest extends BaseTest {
 
 		String executeStepStrWithInstanceId = response.getExecuteStepStrWithInstanceId();
 		List<String> strings = extractValuesList(executeStepStrWithInstanceId);
-		InstanceIdGeneratorSpi instanceIdGenerator = NodeInstanceIdManageSpi.getInstance().getInstanceIdGenerator();
+		NodeInstanceIdManageSpi nodeInstanceIdManageSpi = NodeInstanceIdManageSpiHolder.getInstance().getNodeInstanceIdManageSpi();
 
 		for (int i = 0; i < strings.size(); i++) {
-			Assertions.assertEquals(instanceIdGenerator.getNodeInstanceId("chain2", strings.get(i)), "a(" + i + ")");
+			Assertions.assertEquals(nodeInstanceIdManageSpi.getNodeInstanceLocationById("chain2", strings.get(i)), "a(" + i + ")");
 		}
 
 		System.out.println(executeStepStrWithInstanceId);

liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/java/com/yomahub/liteflow/test/sqlInstanceId/SQLWithXmlELInstanceIdSpringbootTest.java

@@ -2,8 +2,8 @@ package com.yomahub.liteflow.test.sqlInstanceId;
 
 import com.yomahub.liteflow.core.FlowExecutor;
 import com.yomahub.liteflow.flow.LiteflowResponse;
-import com.yomahub.liteflow.flow.instanceId.InstanceIdGeneratorSpi;
 import com.yomahub.liteflow.flow.instanceId.NodeInstanceIdManageSpi;
+import com.yomahub.liteflow.flow.instanceId.NodeInstanceIdManageSpiHolder;
 import com.yomahub.liteflow.parser.sql.exception.ELSQLException;
 import com.yomahub.liteflow.parser.sql.vo.SQLParserVO;
 import com.yomahub.liteflow.property.LiteflowConfig;
@@ -82,11 +82,11 @@ public class SQLWithXmlELInstanceIdSpringbootTest extends BaseTest {
 
         String executeStepStrWithInstanceId = response.getExecuteStepStrWithInstanceId();
         List<String> strings = extractValuesList(executeStepStrWithInstanceId);
-        InstanceIdGeneratorSpi instanceIdGenerator = NodeInstanceIdManageSpi.getInstance().getInstanceIdGenerator();
+        NodeInstanceIdManageSpi nodeInstanceIdManageSpi = NodeInstanceIdManageSpiHolder.getInstance().getNodeInstanceIdManageSpi();
 
         String[] nodes = new String[]{"c", "b", "a"};
         for (int i = 0; i < strings.size(); i++) {
-            Assertions.assertEquals(instanceIdGenerator.getNodeInstanceId("r_chain4", strings.get(i)), nodes[i] + "(0)");
+            Assertions.assertEquals(nodeInstanceIdManageSpi.getNodeInstanceLocationById("r_chain4", strings.get(i)), nodes[i] + "(0)");
         }
         System.out.println(strings);
         HashSet<String> hashSet = Sets.newHashSet(strings);

liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/application-instanceId-xml.properties

@@ -14,8 +14,7 @@ liteflow.rule-source-ext-data={\
   "scriptNameField":"script_node_name",\
   "scriptDataField":"script_node_data",\
   "scriptLanguageField":"script_language",\
-  "scriptTypeField":"script_node_type",\
-  "instanceIdTableName":"node_instance_id_table"\
+  "scriptTypeField":"script_node_type"\
   }
 liteflow.enable-node-instance-id=true
 spring.datasource.driver-class-name=org.h2.Driver

liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/sql/data.sql

@@ -16,6 +16,3 @@ INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,
 INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x1','if 脚本','boolean_script','return true','groovy');
 
 INSERT INTO SCRIPT_NODE_TABLE (APPLICATION_NAME,SCRIPT_NODE_ID,SCRIPT_NODE_NAME,SCRIPT_NODE_TYPE,SCRIPT_NODE_DATA,SCRIPT_LANGUAGE) values ('demo','x2','python脚本','boolean_script','return true','js');
-
-
-DELETE FROM NODE_INSTANCE_ID_TABLE;

liteflow-testcase-el/liteflow-testcase-el-sql-springboot/src/test/resources/sql/schema.sql

@@ -21,13 +21,3 @@ create table IF NOT EXISTS `script_node_table`
     `script_language`     varchar(1024) NOT NULL,
     PRIMARY KEY (`id`)
 );
-
-create table IF NOT EXISTS `node_instance_id_table`
-(
-    `id`                   bigint        NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    `application_name`     varchar(32)   NOT NULL,
-    `chain_id`           varchar(32)   NOT NULL,
-    `el_data_md5`          varchar(128)   NOT NULL,
-    `group_key_instance_id`     varchar(1024)   NOT NULL,
-    PRIMARY KEY (`id`)
-);