Merge remote-tracking branch 'upstream/master'

# Conflicts: # pkg/datasource/sql/undo/builder/mysql_insertonduplicate_update_undo_log_builder.go
apache · Jan 14, 2025 · 6cdbb46 · 6cdbb46
2 parents 6358b33 + cf2212a
commit 6cdbb46
Show file tree

Hide file tree

Showing 70 changed files with 3,360 additions and 771 deletions.
diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml
@@ -15,10 +15,11 @@
 # limitations under the License.
 #
 
-name: CI
+name: License checker
 
 on:
   pull_request:
+    branches: [ master ]
   schedule:
     - cron: "0 18 * * *" # TimeZone: UTC 0
 
@@ -33,10 +34,13 @@ jobs:
           submodules: true
       - name: Check license header
         uses: apache/skywalking-eyes@985866ce7e324454f61e22eb2db2e998db09d6f3
+        with:
+          log: info
+          config: .licenserc.yaml
+          mode: check
 
   dependency-license:
     name: Dependency licenses
-    needs: [changes]
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -46,15 +50,16 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.18"
+          go-version: "1.20"
       - name: Check Dependencies Licenses
         run: |
+          mkdir -p ./dist-material/
+          cp  ./licenses/LICENSE.tpl ./dist-material/LICENSE.tpl
           go install github.com/apache/skywalking-eyes/cmd/license-eye@47febf5
-          license-eye dependency resolve --summary ./dist-material/release-docs/LICENSE.tpl || exit 1
-          if [ ! -z "$(git diff -U0 ./dist-material/release-docs/LICENSE)" ]; then
-            echo "LICENSE file is not updated correctly"
-            git diff -U0 ./dist-material/release-docs/LICENSE
-            exit 1
+          license-eye dependency resolve --summary ./dist-material/LICENSE.tpl || exit 1
+          if [ -f "./dist-material/LICENSE)" ]; then
+            echo "echo LICENSE check"
+            cat ./dist-material/LICENSE
           fi
       - name: Check Dependencies Licenses Invalid
         run: |

diff --git a/.golangci.yml b/.golangci.yml
@@ -17,7 +17,7 @@
 
 linters-settings:
   govet:
-    check-shadowing: false
+    shadow: true
   golint:
     min-confidence: 0
   gocyclo:
@@ -56,25 +56,37 @@ linters:
     - staticcheck
     - ineffassign
     - misspell
+    - asciicheck
+    - bodyclose
+    - rowserrcheck
+    - gofmt
+    - durationcheck
+    - sqlclosecheck
 
 run:
-  skip-dirs:
-    - test/testdata_etc
-    - pkg/golinters/goanalysis/(checker|passes)
 
 issues:
+  exclude-dirs:
+    - test/testdata_etc
+    - pkg/golinters/goanalysis/(checker|passes)
   exclude-rules:
     - text: "weak cryptographic primitive"
       linters:
         - gosec
     - linters:
         - staticcheck
       text: "SA1019:"
+    - path: _test\.go
+      linters:
+        - errcheck
+        - gosec
+        - rowserrcheck
+        - govet
 
 # golangci.com configuration
 # https://github.com/golangci/golangci/wiki/Configuration
 service:
-  golangci-lint-version: 1.49.x # use the fixed version to not introduce new linters unexpectedly
+  golangci-lint-version: 1.57.x # use the fixed version to not introduce new linters unexpectedly
   prepare:
     - echo "here I can run custom commands, but no preparation needed for this repo"
 
diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -54,34 +54,20 @@ header: # `header` section is configurations for source codes license header.
     - '**'
 
   paths-ignore: # `paths-ignore` are the path list that will be ignored by license-eye.
-    - 'dist'
+    - 'dist-material/**'
     - 'licenses'
     - '**/*.md'
-    - '**/testdata/**'
     - '**/go.mod'
     - '**/go.sum'
     - 'LICENSE'
     - 'NOTICE'
-    - '**/assets/header-templates/**'
-    - '**/assets/lcs-templates/**'
-    - '**/assets/languages.yaml'
-    - '**/assets/assets.gen.go'
-    - 'docs/**.svg'
-    - '.travis.yml'
     - '.gitignore'
-    - '.gitmodules'
     - 'makefile'
-    - 'justfile'
-    - 'docker'
-    - 'pkg/resolver/mysql/constants.go' # with two license: apache and Vitess
-    - 'pkg/resolver/mysql/encoding.go'
-    - 'pkg/resolver/mysql/sql_error.go'
-    - 'pkg/resolver/mysql/type.go'
     - 'VERSION'
-    - ".errcheck-exclude"
-    - ".golangci.yml"
-    - '.pre-commit-config.yaml'
     - '.github'
+    - 'DISCLAIMER'
+    - 'pkg/discovery/mock/mock_etcd_client.go'
+    - 'pkg/datasource/sql/undo/parser/branch_undo_log.pb.go'
   comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`.
 
   language:

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ The principle of seata-go is consistent with that of Seata-java, which is compos
 ## TODO list
 
 - [x] TCC
-- [ ] XA
+- [x] XA
 - [x] AT
   - [x] Insert SQL
   - [x] Delete SQL
@@ -33,9 +33,9 @@ The principle of seata-go is consistent with that of Seata-java, which is compos
   - [x] Manually way
   - [x] Proxy datasource way 
 - [x] Null compensation
-- [ ] Configuration center
+- [x] Configuration center
   - [x] Configuration file
-- [ ] Registration Center
+- [x] Registration Center
 - [ ] Metric monitoring
 - [x] Compressor algorithm
 - [x] Examples

diff --git a/README_ZH.md b/README_ZH.md
@@ -17,7 +17,7 @@ Seata-go 的原理和 Seata-java 保持一致，都是由 TM、RM 和 TC 组成
 ## 待办事项
 
 - [x] TCC
-- [ ] XA
+- [x] XA
 - [x] AT
   - [x] Insert SQL
   - [x] Delete SQL
@@ -35,9 +35,9 @@ Seata-go 的原理和 Seata-java 保持一致，都是由 TM、RM 和 TC 组成
 - [x] 空补偿
   - [x] 手动方式
   - [x] 代理数据源方式
-- [ ] 配置中心
+- [x] 配置中心
   - [x] 配置文件
-- [ ] 注册中心
+- [x] 注册中心
 - [ ] Metric 监控
 - [x] 压缩算法
 - [x] Sample 例子

diff --git a/VERSION b/VERSION
diff --git a/changes/2.0.0.md b/changes/2.0.0.md
@@ -0,0 +1,134 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+### 2.0.0
+
+<details>	
+  <summary><mark>Release notes</mark></summary>
+
+### Seata-go 2.0.0
+
+Seata-go 2.0.0 Released.
+
+Seata-go is an easy-to-use, high-performance, open source distributed transaction solution.
+
+The version is updated as follows:
+
+### feature：
+
+- [[#659](https://github.com/apache/incubator-seata-go/pull/659)] support compress for AT undo log
+- [[#574](https://github.com/apache/incubator-seata-go/pull/574)] support file and nacos service registry
+- [[#584](https://github.com/apache/incubator-seata-go/pull/584)] support the ConsistentHash load balancing strategy in the remoting module
+- [[#585](https://github.com/apache/incubator-seata-go/pull/585)] support the LeastActive load balancing strategy in the remoting module
+- [[#605](https://github.com/apache/incubator-seata-go/pull/605)] support the discovery service of Etcd
+- [[#622](https://github.com/apache/incubator-seata-go/pull/622)] add round robin strategy of remote call
+- [[#691](https://github.com/apache/incubator-seata-go/pull/691)] support protobuf undo log parser
+- [[#738](https://github.com/apache/incubator-seata-go/pull/738)] remove session when send heart beat message failed
+- [[#739](https://github.com/apache/incubator-seata-go/pull/739)] support automatic refresh functionality for table meta cache
+
+### bugfix：
+
+- [[#540](https://github.com/apache/incubator-seata-go/pull/540)] fix init XA panic bug
+- [[#590](https://github.com/apache/incubator-seata-go/pull/590)] fix some repo error
+- [[#595](https://github.com/apache/incubator-seata-go/pull/595)] check the response error is nil for commit or rollback
+- [[#607](https://github.com/apache/incubator-seata-go/pull/607)] fix the bug of jackson serialize
+- [[#665](https://github.com/apache/incubator-seata-go/pull/665)] reclaim the heartbeat response message to avoid memory leakage of GettyRemoting.future
+- [[#672](https://github.com/apache/incubator-seata-go/pull/672)] fix AT rollback bug
+- [[#674](https://github.com/apache/incubator-seata-go/pull/674)] fix XA rollback bug
+- [[#690](https://github.com/apache/incubator-seata-go/pull/690)] fix AT undo log jackson parser not found bug
+- [[#701](https://github.com/apache/incubator-seata-go/pull/701)] fix the InsertOnDuplicateUpdate is an issue with bypassing modifying the primary key
+- [[#717](https://github.com/apache/incubator-seata-go/pull/717)] support XA report state to TC
+- [[#724](https://github.com/apache/incubator-seata-go/pull/724)] support ParenthesesExpr for SQL parser
+- [[#736](https://github.com/apache/incubator-seata-go/pull/736)] fix SQL statement not closed's bug
+- [[#743](https://github.com/apache/incubator-seata-go/pull/743)] fix bug of gomonkey
+- [[#749](https://github.com/apache/incubator-seata-go/pull/749)] fix bug of heart beat
+
+
+### optimize:
+
+- [[#576](https://github.com/apache/incubator-seata-go/pull/576)]  use mirromutth/mysql-action instead of icomponent/mysql-action
+- [[#594](https://github.com/apache/incubator-seata-go/pull/594)] optimize the log of branch commit procesor
+- [[#621](https://github.com/apache/incubator-seata-go/pull/621)] add codeql for ci
+- [[#631](https://github.com/apache/incubator-seata-go/pull/631)] upgrade crypto version from 0.9.0 to 0.17.0
+- [[#652](https://github.com/apache/incubator-seata-go/pull/652)] upgrade gRPC version from 1.51.0 ro 1.56.3
+- [[#667](https://github.com/apache/incubator-seata-go/pull/667)] change mailbox of issues and pull requests from dev to notifications
+- [[#678](https://github.com/apache/incubator-seata-go/pull/678)] rename module name to seata.apache.org/seata-go
+- [[#679](https://github.com/apache/incubator-seata-go/pull/679)] upgrade getty version from 1.4.9 to 1.4.10
+- [[#714](https://github.com/apache/incubator-seata-go/pull/714)] optimize the speed of build lock key
+- [[#719](https://github.com/apache/incubator-seata-go/pull/719)] only save insertd filed when execute insert SQL in AT
+- [[#721](https://github.com/apache/incubator-seata-go/pull/721)] fix the issue where the translation bot is not working
+- [[#758](https://github.com/apache/incubator-seata-go/pull/758)] remove unusen files
+
+### test:
+
+- [[#570](https://github.com/apache/incubator-seata-go/pull/570)] add collection unit test
+- [[#571](https://github.com/apache/incubator-seata-go/pull/571)] add convert unit test
+- [[#572](https://github.com/apache/incubator-seata-go/pull/572)] add reflectx unit test
+- [[#5835f0](https://github.com/apache/incubator-seata-go/commit/5835f09ecfd6edeb04c2961163bc4460f578e942)] add random loadbalance unit test
+- [[#599](https://github.com/apache/incubator-seata-go/pull/599)] add xid loadbalance unit test
+
+
+### doc:
+- [[#614](https://github.com/apache/incubator-seata-go/pull/614)] upgrade the unknown license dependency
+- [[#632](https://github.com/apache/incubator-seata-go/pull/632)] add ASF basic config
+- [[#633](https://github.com/apache/incubator-seata-go/pull/633)] optimize ASF basic config to remove th context check
+- [[#644](https://github.com/apache/incubator-seata-go/pull/644)] optimize readme file
+- [[#686](https://github.com/apache/incubator-seata-go/pull/686)] add more linter in ci
+- [[#737](https://github.com/apache/incubator-seata-go/pull/737)] modify the readme file and update the currently completed work
+- [[#756](https://github.com/apache/incubator-seata-go/pull/756)] update license checker
+
+
+### contributors:
+
+Thanks to these contributors for their code commits. Please report an unintended omission.
+
+- [luky116](https://github.com/luky116)
+- [Code-Fight](https://github.com/Code-Fight)
+- [wt-better](https://github.com/wt-better)
+- [luweiqianyi](https://github.com/luweiqianyi)
+- [wang1309](https://github.com/wang1309)
+- [576470954](https://github.com/576470954)
+- [No-SilverBullet](https://github.com/No-SilverBullet)
+- [solisamicus](https://github.com/solisamicus)
+- [marsevilspirit](https://github.com/marsevilspirit)
+- [lxfeng1997](https://github.com/lxfeng1997)
+- [AlexStocks](https://github.com/AlexStocks)
+- [smiletrl](https://github.com/smiletrl)
+- [ptyin](https://github.com/ptyin)
+- [yizhibian](https://github.com/yizhibian)
+- [oldmee](https://github.com/oldmee)
+- [air-3](https://github.com/air-3)
+- [slievrly](https://github.com/slievrly)
+- [xjlgod](https://github.com/xjlgod)
+- [baerwang](https://github.com/baerwang)
+- [xyombo](https://github.com/xyombo)
+- [testwill](https://github.com/testwill)
+- [jasondeng1997](https://github.com/jasondeng1997)
+- [jsbxyyx](https://github.com/jsbxyyx)
+- [iSuperCoder](https://github.com/iSuperCoder)
+- [georgehao](https://github.com/georgehao)
+- [liuyuecai](https://github.com/liuyuecai)
+- [106umao](https://github.com/106umao)
+- [FinnTew](https://github.com/FinnTew)
+- [funky-eyes](https://github.com/funky-eyes)
+- [tanzegen](https://github.com/tanzegen)
+- [lovepoem](https://github.com/lovepoem)
+
+
+Also, we receive many valuable issues, questions and advices from our community. Thanks all.
+
+</detail>