Merge branch 'develop' of https://github.com/seata/seata into develop

* 'develop' of https://github.com/seata/seata: (125 commits) optimize: tcc module code style (apache#2103) refactor: change the package path of MySQL recognizer (apache#2125) optimize: fix query typo (apache#2176) refactor: add sql parser type druid as constant (apache#2156) test: enhance test coverage of seata common (apache#2170) optimize: gracefully close resources (apache#2139) Feature: Saga provide a switch to skip branch report on branch success, in order to optimize performance. (apache#2151) chore:use serializer instead of codec (apache#2097) optimize: spring module code style (apache#2159) optimize: Add Dubbo compatibility (apache#2036) optimize : seata-rm-datasource module code style (apache#2062) bugfix: Saga report branch status incorrect when service retried succeed (apache#2145) optimize:optimize log specifications (apache#2146) bugfix: when branchRollback failed, it will trigger retry of multi-tc. (apache#2113) refactor: create sql parser spi and a druid type sql parser (apache#1703) refactor: simplify to make seata-common more readable (apache#2038) feature: support FastThreadLocalContextCore (apache#2106) optimize: some typos (apache#2120) optimize: increase the oracle table meta cache code coverage (apache#2078) optimize: some typos (apache#2115) ... # Conflicts: # pom.xml
dangquocbang · Jan 14, 2020 · 521854e · 521854e
2 parents 49c1e83 + fde2b3c
commit 521854e
Show file tree

Hide file tree

Showing 990 changed files with 29,976 additions and 7,559 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,9 @@ dependency-reduced-pom.xml
 /server/sessionStore/
 /server/db_store/
 /sessionStore/
+/test/sessionStore/
+/distribution/sessionStore/
+/file_store/
 
 # system ignore
 .DS_Store

diff --git a/.travis.yml b/.travis.yml
@@ -11,8 +11,19 @@ cache:
 
 install: true
 
-script:
-  - travis_wait 30 ./mvnw clean install -DskipTests=false
+before_script:
+  - if [ "$TRAVIS_JDK_VERSION" == "openjdk8" ]; then
+    export IMAGE_NAME="openjdk:8u212-jre-alpine";
+    fi
+  - if [ "$TRAVIS_JDK_VERSION" == "openjdk11" ]; then
+    export IMAGE_NAME="openjdk:11-jre-stretch";
+    fi
 
+script:
+  - if [ "$TRAVIS_BRANCH" == "develop" ] && [ "$TRAVIS_PULL_REQUEST" == false ]; then
+    travis_wait 30 ./mvnw clean install -DskipTests=false -P image -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+    else
+    travis_wait 30 ./mvnw clean install -DskipTests=false -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+    fi
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/README.md b/README.md
@@ -81,7 +81,7 @@ For more details about principle and design, please go to [Seata wiki page](http
 
 ## Maven dependency
 ```xml
-<seata.version>0.9.0</seata.version>
+<seata.version>1.0.0</seata.version>
 
 <dependency>
     <groupId>io.seata</groupId>
@@ -115,9 +115,7 @@ Contributors are welcomed to join the Seata project. Please check [CONTRIBUTING]
 * Mailing list: 
   * dev-seata@googlegroups.com , for dev/user discussion. [subscribe](mailto:dev-seata+subscribe@googlegroups.com), [unsubscribe](mailto:dev-seata+unsubscribe@googlegroups.com), [archive](https://groups.google.com/forum/#!forum/dev-seata)
 
-**Dingtalk**
-
-<img src="https://upload-images.jianshu.io/upload_images/4420767-4e95b186a1a1bfba.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240"  height="300" width="300">
+<img src="https://img.alicdn.com/tfs/TB1CR2orKT2gK0jSZFvXXXnFXXa-1798-588.jpg"  height="200" width="630">
 
 
 ## Seata ecosystem
@@ -126,7 +124,7 @@ Contributors are welcomed to join the Seata project. Please check [CONTRIBUTING]
 * [Seata Samples](https://github.com/seata/seata-samples) - Samples for Seata
 * [Seata Docker](https://github.com/seata/seata-docker) - Seata integration with docker
 * [Seata K8s](https://github.com/seata/seata-k8s) - Seata integration with k8s
-* [Awesome Seata](https://github.com/seata/awesome-seata) - Description of Seata related projects 
+* [Awesome Seata](https://github.com/seata/awesome-seata) - Seata's slides and videa address in meetup
 * [Seata Website](https://github.com/seata/seata.github.io) - Seata official website
 
 ## Contributors
@@ -136,3 +134,66 @@ This project exists thanks to all the people who contribute. [[Contributors](htt
 ## License
 
 Seata is under the Apache 2.0 license. See the [LICENSE](https://github.com/seata/seata/blob/master/LICENSE) file for details.
+
+## Who is using
+
+These are only part of the companies using Seata, for reference only. If you are using Seata, please [add your company 
+here](https://github.com/seata/seata/issues/1246) to tell us your scenario to make Seata better.
+
+<div style='vertical-align: middle'>
+    <img alt='Alibaba Group' height='40'  src='https://docs.alibabagroup.com/assets2/images/en/global/logo_header.png'  /img>
+    <img alt='蚂蚁金服' height='40'  src='https://img.alicdn.com/tfs/TB1wuuCoET1gK0jSZFhXXaAtVXa-496-202.jpg'  /img>
+    <img alt='阿里云' height='40'  src='https://img.alicdn.com/tfs/TB1Ly5oS3HqK1RjSZFPXXcwapXa-238-54.png'  /img>
+    <img alt='中航信' height='40'  src='http://www.travelsky.net/publish/main/images/logo.gif'  /img>
+    <img alt='中国铁塔' height='40'  src='https://www.china-tower.com/static/web/images/tower-logo.png'  /img>
+    <img alt='滴滴' height='40'  src='https://website.didiglobal.com/dist/media/logo-zh.a7abd90d.svg'  /img>
+    <img alt='中国邮政' height='40'  src='http://www.chinapost.com.cn/res/chinapostplan/structure/181041269.png'  /img>
+    <img alt='太极计算机' height='40'  src='https://img.alicdn.com/tfs/TB1.zqEoAL0gK0jSZFAXXcA9pXa-245-38.png'  /img>
+    <img alt='政采云' height='40'  src='https://img.alicdn.com/tfs/TB1DDiCorY1gK0jSZTEXXXDQVXa-440-114.jpg'  /img>
+    <img alt='浙江公安厅' height='40'  src='https://img.alicdn.com/tfs/TB1SXGzoxn1gK0jSZKPXXXvUXXa-426-180.jpg'  /img>
+    <img alt='特步' height='40'  src='https://www.xtep.com/images/logo.png'  /img>
+    <img alt='中通快递' height='40'  src='https://www.zto.com/imgs/logo.png'  /img>
+    <img alt='浙江烟草' height='40'  src='https://img.alicdn.com/tfs/TB1e7Wiovb2gK0jSZK9XXaEgFXa-1028-160.jpg'  /img>
+    <img alt='波司登' height='40'  src='https://img.alicdn.com/tfs/TB12cmCouL2gK0jSZFmXXc7iXXa-310-110.jpg'  /img>
+    <img alt='凯京科技' height='40'  src='https://img.alicdn.com/tfs/TB1j0dEop67gK0jSZPfXXahhFXa-400-208.jpg'  /img>
+    <img alt='点购集团' height='40'  src='https://dgmall-1258058953.cos.ap-chengdu.myqcloud.com/img/logo_t.png'  /img>
+    <img alt='求是创新健康' height='40'  src='http://www.truthai.cn/static/logo800.png'  /img>
+    <img alt='科蓝' height='40'  src='https://img.alicdn.com/tfs/TB1tuSyouT2gK0jSZFvXXXnFXXa-304-94.jpg'  /img>
+    <img alt='康美药业' height='40'  src='https://www.kanghehealth.com/images/logo.png'  /img>
+    <img alt='雁联' height='40'  src='https://img.alicdn.com/tfs/TB1c8iCouL2gK0jSZFmXXc7iXXa-428-102.jpg'  /img>
+    <img alt='学两手' height='40'  src='https://img.xue2shou.com/g-xue2shou/website/0.8.2/static/logo.png'  /img>
+    <img alt='衣二三' height='40'  src='https://img.alicdn.com/tfs/TB1OCGioCf2gK0jSZFPXXXsopXa-500-179.jpg'  /img>
+    <img alt='悦途出行' height='40'  src='http://yuetu365.com/uploads/allimg/20191016/d456dbbee0c54274a70d588af4ce6116.png'  /img>
+    <img alt='睿颐软件' height='40'  src='https://img.alicdn.com/tfs/TB143R4op67gK0jSZPfXXahhFXa-148-42.png'  /img>
+    <img alt='赛维' height='40'  src='http://www.savor.com.cn/common/img/logo.png'  /img>
+    <img alt='有利网' height='40'  src='https://www.yooli.com/v2/local/img/common/logo.png?version=20191126190304'  /img>
+    <img alt='安心保险' height='40'  src='https://query.95303.com/webins/images/logo.png'  /img>
+    <img alt='科达科技' height='40'  src='https://img.alicdn.com/tfs/TB1JvOjouT2gK0jSZFvXXXnFXXa-386-146.jpg'  /img>
+    <img alt='会分期' height='40'  src='https://img.alicdn.com/tfs/TB1ChKFoBr0gK0jSZFnXXbRRXXa-402-166.jpg'  /img>
+    <img alt='会找房' height='40'  src='https://img.alicdn.com/tfs/TB1bNWFoBr0gK0jSZFnXXbRRXXa-398-336.jpg'  /img>
+    <img alt='全房通' height='40'  src='https://img.alicdn.com/tfs/TB1iMSAopP7gK0jSZFjXXc5aXXa-398-182.jpg'  /img>
+    <img alt='会通教育' height='40'  src='https://img.alicdn.com/tfs/TB1_D9Boxn1gK0jSZKPXXXvUXXa-580-218.jpg'  /img>
+    <img alt='享住智慧' height='40'  src='http://image.xiangzhuzhihui.com/images/logo/logo_02.png'  /img>
+    <img alt='兰亮网络' height='40'  src='https://img.alicdn.com/tfs/TB1_miroq61gK0jSZFlXXXDKFXa-283-70.png'  /img>
+    <img alt='蓝天教育' height='40'  src='https://img.alicdn.com/tfs/TB1CaSroAT2gK0jSZPcXXcKkpXa-492-176.jpg'  /img>
+    <img alt='烟台欣合' height='40'  src='https://shinhoglobal.com/img/logo-shinho.svg'  /img>
+    <img alt='阿康健康' height='40'  src='https://img.alicdn.com/tfs/TB1JNSqouH2gK0jSZFEXXcqMpXa-450-182.jpg'  /img>
+    <img alt='新脉远' height='40'  src='https://img.alicdn.com/tfs/TB1NV1uouH2gK0jSZJnXXaT1FXa-462-172.jpg'  /img>
+    <img alt='乾动新能源' height='40'  src='http://www.cangowin.com/images/logo.png'  /img>
+    <img alt='路客精品民宿' height='40'  src='https://img.alicdn.com/tfs/TB1CCavoBr0gK0jSZFnXXbRRXXa-240-100.png'  /img>
+    <img alt='深圳好尔美' height='40'  src='https://img.alicdn.com/tfs/TB1IIivoxD1gK0jSZFyXXciOVXa-200-130.png'  /img>
+    <img alt='浙大睿医' height='40'  src='https://img.alicdn.com/tfs/TB1kQThrFY7gK0jSZKzXXaikpXa-220-110.jpg'  /img>
+    <img alt='居然之家' height='40'  src='https://img.alicdn.com/tfs/TB1LK6jrUT1gK0jSZFrXXcNCXXa-180-54.png'  /img>
+    <img alt='臻善科技' height='40'  src='http://www.gisquest.com/static/web/img/img-1.png?v=v3'  /img>
+    <img alt='中国支付通' height='40'  src='http://www.chinasmartpay.com/img/index_logo.png'  /img>
+    <img alt='众网小贷' height='40'  src='http://imassbank.com/images/zw_logo.png'  /img>
+    <img alt='谐云科技' height='40'  src='https://img.alicdn.com/tfs/TB1V1YlrRv0gK0jSZKbXXbK2FXa-514-160.png'  /img>
+    <img alt='浙江甄品' height='40'  src='https://img.alicdn.com/tfs/TB1oC2prND1gK0jSZFyXXciOVXa-246-124.jpg'  /img>
+    <img alt='深圳海豚网' height='40'  src='https://img.alicdn.com/tfs/TB1defkrLb2gK0jSZK9XXaEgFXa-434-146.jpg'  /img>
+    <img alt='汇通天下' height='40'  src='https://img.alicdn.com/tfs/TB1uIHmrHr1gK0jSZR0XXbP8XXa-1024-568.png'  /img>
+    <img alt='九机网' height='40'  src='https://img.alicdn.com/tfs/TB1ERHlrUY1gK0jSZFMXXaWcVXa-120-60.png'  /img>
+    <img alt='有好东西' height='40'  src='https://img.alicdn.com/tfs/TB1LT2lrNn1gK0jSZKPXXXvUXXa-300-300.jpg'  /img>
+    <img alt='南京智慧盾' height='40'  src='https://img.alicdn.com/tfs/TB1s2LprUY1gK0jSZFCXXcwqXXa-618-148.jpg'  /img>
+</div>
+
+
diff --git a/all/pom.xml b/all/pom.xml
@@ -21,7 +21,7 @@
 
     <groupId>io.seata</groupId>
     <artifactId>seata-all</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
 
     <name>Seata All-in-one ${project.version}</name>
     <url>http://seata.io</url>
@@ -207,6 +207,16 @@
             <artifactId>seata-rm-datasource</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.seata</groupId>
+            <artifactId>seata-sqlparser-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.seata</groupId>
+            <artifactId>seata-sqlparser-druid</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-spring</artifactId>
@@ -224,22 +234,27 @@
         </dependency>
         <dependency>
             <groupId>io.seata</groupId>
-            <artifactId>seata-codec-seata</artifactId>
+            <artifactId>seata-serializer-seata</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.seata</groupId>
-            <artifactId>seata-codec-protobuf</artifactId>
+            <artifactId>seata-serializer-protobuf</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-grpc</artifactId>
             <version>${project.version}</version>
         </dependency>
-      <dependency>
+        <dependency>
             <groupId>io.seata</groupId>
-            <artifactId>seata-codec-kryo</artifactId>
+            <artifactId>seata-serializer-kryo</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.seata</groupId>
+            <artifactId>seata-serializer-hessian</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -493,6 +508,11 @@
             <artifactId>kryo</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.caucho</groupId>
+            <artifactId>hessian</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>de.javakaffee</groupId>
             <artifactId>kryo-serializers</artifactId>
@@ -598,21 +618,23 @@
                                     <include>io.seata:seata-grpc</include>
                                     <include>io.seata:seata-rm</include>
                                     <include>io.seata:seata-rm-datasource</include>
+                                    <include>io.seata:seata-sqlparser-core</include>
+                                    <include>io.seata:seata-sqlparser-druid</include>
                                     <include>io.seata:seata-sofa-rpc</include>
                                     <include>io.seata:seata-spring</include>
                                     <include>io.seata:seata-tcc</include>
                                     <include>io.seata:seata-tm</include>
-                                    <include>io.seata:seata-codec-seata</include>
-                                    <include>io.seata:seata-codec-protobuf</include>
+                                    <include>io.seata:seata-serializer-seata</include>
+                                    <include>io.seata:seata-serializer-protobuf</include>
+                                    <include>io.seata:seata-serializer-kryo</include>
+                                    <include>io.seata:seata-serializer-hessian</include>
                                     <!-- saga -->
                                     <include>io.seata:seata-saga-processctrl</include>
                                     <include>io.seata:seata-saga-statelang</include>
                                     <include>io.seata:seata-saga-engine</include>
                                     <include>io.seata:seata-saga-rm</include>
                                     <include>io.seata:seata-saga-tm</include>
                                     <include>io.seata:seata-saga-engine-store</include>
-
-                                    <include>io.seata:seata-codec-kryo</include>
                                     <include>io.seata:seata-compressor-gzip</include>
                                 </includes>
                             </artifactSet>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>io.seata</groupId>
     <artifactId>seata-bom</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
@@ -117,6 +117,7 @@
         <junit.version>4.12</junit.version>
         <kryo.version>4.0.2</kryo.version>
         <kryo-serializers.version>0.42</kryo-serializers.version>
+        <hessian.version>4.0.63</hessian.version>
     </properties>
 
     <dependencyManagement>
@@ -442,6 +443,11 @@
                 <artifactId>kryo-serializers</artifactId>
                 <version>${kryo-serializers.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.caucho</groupId>
+                <artifactId>hessian</artifactId>
+                <version>${hessian.version}</version>
+            </dependency>
             <dependency>
                 <groupId>commons-dbcp</groupId>
                 <artifactId>commons-dbcp</artifactId>

diff --git a/codec/seata-codec-kryo/src/main/resources/META-INF/services/io.seata.core.codec.Codec b/codec/seata-codec-kryo/src/main/resources/META-INF/services/io.seata.core.codec.Codec
diff --git a/codec/seata-codec-protobuf/src/main/resources/META-INF/services/io.seata.core.codec.Codec b/codec/seata-codec-protobuf/src/main/resources/META-INF/services/io.seata.core.codec.Codec
diff --git a/codec/seata-codec-seata/src/main/resources/META-INF/services/io.seata.core.codec.Codec b/codec/seata-codec-seata/src/main/resources/META-INF/services/io.seata.core.codec.Codec
diff --git a/codecov.yml b/codecov.yml
@@ -11,7 +11,7 @@ coverage:
   precision: 2
   range: "50...100"
 ignore:
- - "codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/generated"
+ - "codec/seata-serializer-protobuf/src/main/java/io/seata/serializer/protobuf/generated"
  - "test/.*"
  - ".github/.*"
  - ".mvn/.*"

diff --git a/common/src/main/java/io/seata/common/Constants.java b/common/src/main/java/io/seata/common/Constants.java
@@ -20,8 +20,7 @@
 /**
  * The type Constants.
  *
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/9 17:14
+ * @author slievrly
  */
 public class Constants {
     /**

diff --git a/common/src/main/java/io/seata/common/XID.java b/common/src/main/java/io/seata/common/XID.java
@@ -18,8 +18,7 @@
 /**
  * The type Xid.
  *
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/10
+ * @author slievrly
  */
 public class XID {
 

diff --git a/common/src/main/java/io/seata/common/exception/EurekaRegistryException.java b/common/src/main/java/io/seata/common/exception/EurekaRegistryException.java
@@ -19,7 +19,6 @@
  * eureka registry exception
  *
  * @author: rui_849217@163.com
- * @date: 2018/2/18
  */
 public class EurekaRegistryException extends RuntimeException {
     /**

diff --git a/common/src/main/java/io/seata/common/exception/FrameworkErrorCode.java b/common/src/main/java/io/seata/common/exception/FrameworkErrorCode.java
@@ -18,8 +18,7 @@
 /**
  * The enum Framework error code.
  *
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/9
+ * @author slievrly
  */
 public enum FrameworkErrorCode {
     /**

diff --git a/common/src/main/java/io/seata/common/exception/FrameworkException.java b/common/src/main/java/io/seata/common/exception/FrameworkException.java
@@ -23,8 +23,7 @@
 /**
  * The type Framework exception.
  *
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/9
+ * @author slievrly
  */
 public class FrameworkException extends RuntimeException {
     private static final Logger LOGGER = LoggerFactory.getLogger(FrameworkException.class);

diff --git a/common/src/main/java/io/seata/common/exception/NotSupportYetException.java b/common/src/main/java/io/seata/common/exception/NotSupportYetException.java
@@ -18,7 +18,7 @@
 /**
  * The type Not support yet exception.
  *
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
  */
 public class NotSupportYetException extends RuntimeException {
 

diff --git a/common/src/main/java/io/seata/common/exception/ShouldNeverHappenException.java b/common/src/main/java/io/seata/common/exception/ShouldNeverHappenException.java
@@ -18,7 +18,7 @@
 /**
  * The type Should never happen exception.
  *
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
  */
 public class ShouldNeverHappenException extends RuntimeException {
 

diff --git a/common/src/main/java/io/seata/common/exception/StoreException.java b/common/src/main/java/io/seata/common/exception/StoreException.java
@@ -19,7 +19,6 @@
  * the store exception
  *
  * @author zhangsen
- * @data 2019 /4/2
  */
 public class StoreException extends FrameworkException {
 

diff --git a/common/src/main/java/io/seata/common/executor/Callback.java b/common/src/main/java/io/seata/common/executor/Callback.java
@@ -30,6 +30,6 @@ public interface Callback<T> {
      * @return the t
      * @throws Throwable the throwable
      */
-    public T execute() throws Throwable;
+    T execute() throws Throwable;
 }
 
diff --git a/common/src/main/java/io/seata/common/executor/Initialize.java b/common/src/main/java/io/seata/common/executor/Initialize.java
@@ -25,6 +25,6 @@ public interface Initialize {
     /**
      * init method
      */
-    public void init();
+    void init();
 
 }