refactor: remove meta-dal module

traas-stack · Apr 23, 2024 · af4e0be · af4e0be
1 parent 0c407e2
commit af4e0be
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 362 deletions.
diff --git a/.../home-service/src/main/java/io/holoinsight/server/home/biz/plugin/core/LogPluginUtil.java b/.../home-service/src/main/java/io/holoinsight/server/home/biz/plugin/core/LogPluginUtil.java
@@ -18,7 +18,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * @author jsy1001de
@@ -30,15 +32,15 @@ public class LogPluginUtil {
   public static void addSpmCols(CustomPluginConf conf) {
 
     Boolean spm = checkSpmConditions(conf);
+    Set<String> spmSets =
+        new HashSet<>(Arrays.asList("total", "success", "fail", "cost", "successPercent"));
 
     List<CollectMetric> newCollectMetrics = new ArrayList<>();
-    int cols = 0;
     if (!CollectionUtils.isEmpty(conf.collectMetrics)) {
       for (CollectMetric collectMetric : conf.collectMetrics) {
         if (null == collectMetric.spm || Boolean.FALSE == collectMetric.spm) {
-          if (spm == Boolean.TRUE
-              && Arrays.asList("total", "success", "fail", "cost", "successPercent")
-                  .contains(collectMetric.tableName)) {
+          if (spm == Boolean.TRUE && spmSets.contains(collectMetric.tableName)) {
+            spmSets.remove(collectMetric.tableName);
             continue;
           }
           newCollectMetrics.add(collectMetric);
@@ -49,12 +51,11 @@ public static void addSpmCols(CustomPluginConf conf) {
           continue;
         }
         newCollectMetrics.add(collectMetric);
-        cols++;
       }
     }
 
     // add spm metrics
-    if (spm == Boolean.TRUE && cols == 0) {
+    if (spm == Boolean.TRUE && !spmSets.isEmpty()) {
       SpmCols spmCols = conf.spmCols;
 
       List<String> tags = new ArrayList<>();
@@ -67,15 +68,27 @@ public static void addSpmCols(CustomPluginConf conf) {
         });
       }
 
-      newCollectMetrics.add(genTotalCollectMetric(spmCols, tags));
-      newCollectMetrics.add(genSuccessCollectMetric(spmCols, tags));
-      newCollectMetrics.add(genFailCollectMetric(spmCols, tags));
-      newCollectMetrics.add(genCostCollectMetric(spmCols, tags));
-      newCollectMetrics.add(genSuccessPercentCollectMetric(tags));
+      for (String apmMetric : spmSets) {
+        switch (apmMetric) {
+          case "total":
+            newCollectMetrics.add(genTotalCollectMetric(spmCols, tags));
+            break;
+          case "success":
+            newCollectMetrics.add(genSuccessCollectMetric(spmCols, tags));
+            break;
+          case "fail":
+            newCollectMetrics.add(genFailCollectMetric(spmCols, tags));
+            break;
+          case "cost":
+            newCollectMetrics.add(genCostCollectMetric(spmCols, tags));
+            break;
+          case "successPercent":
+            newCollectMetrics.add(genSuccessPercentCollectMetric(tags));
+            break;
+        }
+      }
     }
-
     conf.setCollectMetrics(newCollectMetrics);
-
   }
 
 

diff --git a/server/home/home-web/src/main/java/io/holoinsight/server/home/web/common/ParaCheckUtil.java b/server/home/home-web/src/main/java/io/holoinsight/server/home/web/common/ParaCheckUtil.java
@@ -32,8 +32,9 @@ public class ParaCheckUtil {
   private static final Pattern PATTERN_CLUSTER = Pattern.compile("^[a-z][a-z0-9\\-]{1,20}");
 
   private static final Pattern PATTERN_APPLICATION = Pattern.compile("^[a-z]{1,20}");
-  private static Pattern PATTERN_CN_SQL =
-      Pattern.compile("^[\\u00b7A-Za-z0-9\\u4e00-\\u9fa5\\u3000-\\u303f\\uFF0C\\-_ ,|:\\.]*$");
+
+  private static Pattern PATTERN_CN_SQL = Pattern.compile(
+      "^[\\u00b7A-Za-z0-9\\u4e00-\\u9fa5\\u3000-\\u303f\\uFF0C\\-_ （：。&）()@《》<>“”‘’\\[\\]{}【】/%,|:.]*$");
   private static Pattern PATTERN_SQL =
       Pattern.compile("^[\\u00b7A-Za-z0-9\\u4e00-\\u9fa5\\-_ ,|:\\.]*$");
   private static Pattern PATTERN_STRICT_SQL =

diff --git a/server/meta/meta-core/pom.xml b/server/meta/meta-core/pom.xml
@@ -23,11 +23,6 @@
 			<artifactId>meta-proto</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>io.holoinsight.server</groupId>-->
-<!--			<artifactId>meta-dal</artifactId>-->
-<!--			<version>${project.version}</version>-->
-<!--		</dependency>-->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>

diff --git a/...ta-core/src/main/java/io/holoinsight/server/meta/core/web/controller/AdminController.java b/...ta-core/src/main/java/io/holoinsight/server/meta/core/web/controller/AdminController.java
diff --git a/server/meta/meta-dal/pom.xml b/server/meta/meta-dal/pom.xml
diff --git a/.../meta/meta-dal/src/main/java/io/holoinsight/server/meta/dal/service/MetaTableService.java b/.../meta/meta-dal/src/main/java/io/holoinsight/server/meta/dal/service/MetaTableService.java
diff --git a/.../meta-dal/src/main/java/io/holoinsight/server/meta/dal/service/mapper/MetaDataMapper.java b/.../meta-dal/src/main/java/io/holoinsight/server/meta/dal/service/mapper/MetaDataMapper.java
diff --git a/.../meta/meta-dal/src/main/java/io/holoinsight/server/meta/dal/service/model/MetaDataDO.java b/.../meta/meta-dal/src/main/java/io/holoinsight/server/meta/dal/service/model/MetaDataDO.java
diff --git a/server/meta/meta-dal/src/main/resources/mybatis/mybatis-config.xml b/server/meta/meta-dal/src/main/resources/mybatis/mybatis-config.xml