bugfix: fix some problem of the sql parser (apache#4352)

dongYES · Jan 28, 2022 · 09fa60c · 09fa60c
1 parent 54b394e
commit 09fa60c
Show file tree

Hide file tree

Showing 25 changed files with 54 additions and 24 deletions.
diff --git a/config/seata-config-custom/pom.xml b/config/seata-config-custom/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-config-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/config/seata-config-etcd3/pom.xml b/config/seata-config-etcd3/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-config-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.etcd</groupId>

diff --git a/config/seata-config-nacos/pom.xml b/config/seata-config-nacos/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-config-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba.nacos</groupId>

diff --git a/config/seata-config-spring-cloud/pom.xml b/config/seata-config-spring-cloud/pom.xml
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-config-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/config/seata-config-zk/pom.xml b/config/seata-config-zk/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-config-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.101tec</groupId>

diff --git a/discovery/seata-discovery-consul/pom.xml b/discovery/seata-discovery-consul/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.ecwid.consul</groupId>

diff --git a/discovery/seata-discovery-custom/pom.xml b/discovery/seata-discovery-custom/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/discovery/seata-discovery-etcd3/pom.xml b/discovery/seata-discovery-etcd3/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.etcd</groupId>

diff --git a/discovery/seata-discovery-eureka/pom.xml b/discovery/seata-discovery-eureka/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.netflix.eureka</groupId>

diff --git a/discovery/seata-discovery-nacos/pom.xml b/discovery/seata-discovery-nacos/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba.nacos</groupId>

diff --git a/discovery/seata-discovery-redis/pom.xml b/discovery/seata-discovery-redis/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>redis.clients</groupId>

diff --git a/discovery/seata-discovery-sofa/pom.xml b/discovery/seata-discovery-sofa/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
          <dependency>
             <groupId>com.alipay.sofa</groupId>

diff --git a/discovery/seata-discovery-zk/pom.xml b/discovery/seata-discovery-zk/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.101tec</groupId>

diff --git a/integration/grpc/pom.xml b/integration/grpc/pom.xml
@@ -52,7 +52,6 @@
             <groupId>io.grpc</groupId>
             <artifactId>grpc-testing</artifactId>
             <scope>test</scope>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>

diff --git a/metrics/seata-metrics-core/pom.xml b/metrics/seata-metrics-core/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-metrics-api</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/metrics/seata-metrics-exporter-prometheus/pom.xml b/metrics/seata-metrics-exporter-prometheus/pom.xml
@@ -35,13 +35,13 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>seata-metrics-api</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>seata-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

diff --git a/metrics/seata-metrics-registry-compact/pom.xml b/metrics/seata-metrics-registry-compact/pom.xml
@@ -31,12 +31,12 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-metrics-api</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-common</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/util/JdbcUtils.java b/rm-datasource/src/main/java/io/seata/rm/datasource/util/JdbcUtils.java
@@ -16,8 +16,6 @@
 package io.seata.rm.datasource.util;
 
 import io.seata.common.loader.EnhancedServiceLoader;
-import io.seata.config.ConfigurationFactory;
-import io.seata.core.constants.ConfigurationKeys;
 import io.seata.rm.BaseDataSourceResource;
 import io.seata.rm.DefaultResourceManager;
 import io.seata.sqlparser.SqlParserType;
@@ -42,8 +40,7 @@ static DbTypeParser getDbTypeParser() {
         if (dbTypeParser == null) {
             synchronized (JdbcUtils.class) {
                 if (dbTypeParser == null) {
-                    String sqlparserType = ConfigurationFactory.getInstance().getConfig(ConfigurationKeys.SQL_PARSER_TYPE, SqlParserType.SQL_PARSER_TYPE_DRUID);
-                    dbTypeParser = EnhancedServiceLoader.load(DbTypeParser.class, sqlparserType);
+                    dbTypeParser = EnhancedServiceLoader.load(DbTypeParser.class, SqlParserType.SQL_PARSER_TYPE_DRUID);
                 }
             }
         }

diff --git a/saga/pom.xml b/saga/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>seata-common</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

diff --git a/script/client/conf/file.conf b/script/client/conf/file.conf
@@ -62,6 +62,7 @@ client {
     sagaRetryPersistModeUpdate = false
     sagaCompensatePersistModeUpdate = false
     tccActionInterceptorOrder = -2147482648 #Ordered.HIGHEST_PRECEDENCE + 1000
+    sqlParserType = "druid"
   }
   tm {
     commitRetryCount = 5

diff --git a/script/client/spring/application.properties b/script/client/spring/application.properties
@@ -32,6 +32,7 @@ seata.client.rm.saga-json-parser=fastjson
 seata.client.rm.saga-retry-persist-mode-update=false
 seata.client.rm.saga-compensate-persist-mode-update=false
 seata.client.rm.tcc-action-interceptor-order=-2147482648 #Ordered.HIGHEST_PRECEDENCE + 1000
+seata.client.rm.sql-parser-type=druid
 seata.client.rm.lock.retry-interval=10
 seata.client.rm.lock.retry-times=30
 seata.client.rm.lock.retry-policy-branch-rollback-on-conflict=true

diff --git a/script/client/spring/application.yml b/script/client/spring/application.yml
@@ -19,6 +19,7 @@ seata:
       saga-retry-persist-mode-update: false
       saga-compensate-persist-mode-update: false
       tcc-action-interceptor-order: -2147482648 #Ordered.HIGHEST_PRECEDENCE + 1000
+      sql-parser-type: druid
       lock:
         retry-interval: 10
         retry-times: 30

diff --git a/script/config-center/config.txt b/script/config-center/config.txt
@@ -42,6 +42,7 @@ client.rm.reportSuccessEnable=false
 client.rm.sagaBranchRegisterEnable=false
 client.rm.sagaJsonParser=fastjson
 client.rm.tccActionInterceptorOrder=-2147482648
+client.rm.sqlParserType=druid
 client.tm.commitRetryCount=5
 client.tm.rollbackRetryCount=5
 client.tm.defaultGlobalTransactionTimeout=60000

diff --git a/...ient/src/main/java/io/seata/spring/boot/autoconfigure/properties/client/RmProperties.java b/...ient/src/main/java/io/seata/spring/boot/autoconfigure/properties/client/RmProperties.java
@@ -15,6 +15,7 @@
  */
 package io.seata.spring.boot.autoconfigure.properties.client;
 
+import io.seata.sqlparser.SqlParserType;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
@@ -46,6 +47,7 @@ public class RmProperties {
     private boolean sagaRetryPersistModeUpdate = DEFAULT_CLIENT_SAGA_RETRY_PERSIST_MODE_UPDATE;
     private boolean sagaCompensatePersistModeUpdate = DEFAULT_CLIENT_SAGA_COMPENSATE_PERSIST_MODE_UPDATE;
     private int tccActionInterceptorOrder = TCC_ACTION_INTERCEPTOR_ORDER;
+    private String sqlParserType = SqlParserType.SQL_PARSER_TYPE_DRUID;
 
     public int getAsyncCommitBufferLimit() {
         return asyncCommitBufferLimit;
@@ -132,4 +134,13 @@ public RmProperties setTccActionInterceptorOrder(int tccActionInterceptorOrder)
         this.tccActionInterceptorOrder = tccActionInterceptorOrder;
         return this;
     }
+
+    public String getSqlParserType() {
+        return sqlParserType;
+    }
+
+    public RmProperties setSqlParserType(String sqlParserType) {
+        this.sqlParserType = sqlParserType;
+        return this;
+    }
 }
diff --git a/...onfigure-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...onfigure-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -96,6 +96,12 @@
       "sourceType": "io.seata.spring.boot.autoconfigure.properties.client.RmProperties",
       "defaultValue": -2147482648
     },
+    {
+      "name": "seata.client.rm.sql-parser-type",
+      "type": "java.lang.String",
+      "sourceType": "io.seata.spring.boot.autoconfigure.properties.client.RmProperties",
+      "defaultValue": "druid"
+    },
     {
       "name": "seata.client.rm.lock.retry-interval",
       "type": "java.lang.Integer",
@@ -368,6 +374,19 @@
         }
       ]
     },
+    {
+      "name": "seata.client.rm.sql-parser-type",
+      "values": [
+        {
+          "value": "druid",
+          "description": "the default type."
+        },
+        {
+          "value": "antlr",
+          "description": "'io.seata:seata-sqlparser-antlr' dependency must be referenced manually."
+        }
+      ]
+    },
     {
       "name": "seata.client.undo.log-serialization",
       "values": [