Merge branch 'master' into master_25_09_24_03

Author: Code-Fight

.github/workflows/integrate-test.yml

@@ -44,7 +44,7 @@ jobs:
     - name: "set up go"
       uses: actions/setup-go@v3
       with:
-        go-version: 1.20.0
+        go-version: 1.20.14
 
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - name: "checkout ${{ github.ref }}"

VERSION

@@ -0,0 +1,17 @@
+#
+# 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.
+#
+v2.0.0-rc01

cmd/start.go

@@ -17,6 +17,67 @@
 
 package main
 
+import (
+	"flag"
+	"fmt"
+	"os"
+)
+
+var (
+	// Version information set by build flags
+	Version     string
+	Branch      string
+	Revision    string
+	showVersion bool
+	showHelp    bool
+)
+
+func init() {
+	flag.BoolVar(&showVersion, "version", false, "show version information")
+	flag.BoolVar(&showVersion, "v", false, "show version information")
+	flag.BoolVar(&showHelp, "help", false, "show help information")
+	flag.BoolVar(&showHelp, "h", false, "show help information")
+}
+
 func main() {
+
+	hasV := false
+	hasVersion := false
+
+	for _, arg := range os.Args[1:] {
+		if arg == "-v" {
+			hasV = true
+		}
+		if arg == "-version" || arg == "--version" {
+			hasVersion = true
+		}
+	}
+
+	if hasV && hasVersion {
+		fmt.Fprintf(os.Stderr, "Error: cannot use both -v and --version at the same time\n")
+		os.Exit(1)
+	}
+
+	flag.Parse()
+	if showHelp {
+		flag.Usage()
+		return
+	}
+
+	if showVersion {
+		versionPrint := Version
+		if versionPrint == "" {
+			versionPrint = "unknown"
+		}
+		fmt.Printf("Seata-go version: %s\n", versionPrint)
+		if Branch != "" {
+			fmt.Printf("Branch: %s\n", Branch)
+		}
+		if Revision != "" {
+			fmt.Printf("Revision: %s\n", Revision)
+		}
+		return
+	}
+
 	// start the server
 }

makefile

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-VERSION=$(shell cat "./VERSION" 2> /dev/null)
+VERSION=$(shell tail -n 1 "./VERSION" 2> /dev/null)
 
 GO_FLAGS := -ldflags "-X main.Branch=$(GIT_BRANCH) -X main.Revision=$(GIT_REVISION) -X main.Version=$(VERSION) -extldflags \"-static\" -s -w" -tags netgo
 GO = go

pkg/datasource/sql/datasource/base/meta_cache_test.go

@@ -73,7 +73,6 @@ func (m *mockTrigger) LoadAll(ctx context.Context, dbName string, conn *sql.Conn
 
 func TestBaseTableMetaCache_refresh(t *testing.T) {
 	type fields struct {
-		lock           sync.RWMutex
 		expireDuration time.Duration
 		capity         int32
 		size           int32
@@ -96,7 +95,6 @@ func TestBaseTableMetaCache_refresh(t *testing.T) {
 		{
 			name: "test1",
 			fields: fields{
-				lock:           sync.RWMutex{},
 				capity:         capacity,
 				size:           0,
 				expireDuration: EexpireTime,
@@ -117,7 +115,6 @@ func TestBaseTableMetaCache_refresh(t *testing.T) {
 		{
 			name: "test2",
 			fields: fields{
-				lock:           sync.RWMutex{},
 				capity:         capacity,
 				size:           0,
 				expireDuration: EexpireTime,
@@ -154,7 +151,6 @@ func TestBaseTableMetaCache_refresh(t *testing.T) {
 			defer loadAllStub.Reset()
 
 			c := &BaseTableMetaCache{
-				lock:           tt.fields.lock,
 				expireDuration: tt.fields.expireDuration,
 				capity:         tt.fields.capity,
 				size:           tt.fields.size,

pkg/datasource/sql/exec/at/base_executor_test.go

@@ -67,8 +67,8 @@ func TestBaseExecBuildLockKey(t *testing.T) {
 			types.RecordImage{
 				TableName: "test_name",
 				Rows: []types.RowImage{
-					{[]types.ColumnImage{getColumnImage("id", 1), getColumnImage("userId", "user1")}},
-					{[]types.ColumnImage{getColumnImage("id", 2), getColumnImage("userId", "user2")}},
+					{Columns: []types.ColumnImage{getColumnImage("id", 1), getColumnImage("userId", "user1")}},
+					{Columns: []types.ColumnImage{getColumnImage("id", 2), getColumnImage("userId", "user2")}},
 				},
 			},
 			"TEST_NAME:1_user1,2_user2",
@@ -84,9 +84,9 @@ func TestBaseExecBuildLockKey(t *testing.T) {
 			types.RecordImage{
 				TableName: "test2_name",
 				Rows: []types.RowImage{
-					{[]types.ColumnImage{getColumnImage("id", 1), getColumnImage("userId", "one"), getColumnImage("age", "11")}},
-					{[]types.ColumnImage{getColumnImage("id", 2), getColumnImage("userId", "two"), getColumnImage("age", "22")}},
-					{[]types.ColumnImage{getColumnImage("id", 3), getColumnImage("userId", "three"), getColumnImage("age", "33")}},
+					{Columns: []types.ColumnImage{getColumnImage("id", 1), getColumnImage("userId", "one"), getColumnImage("age", "11")}},
+					{Columns: []types.ColumnImage{getColumnImage("id", 2), getColumnImage("userId", "two"), getColumnImage("age", "22")}},
+					{Columns: []types.ColumnImage{getColumnImage("id", 3), getColumnImage("userId", "three"), getColumnImage("age", "33")}},
 				},
 			},
 			"TEST2_NAME:1_one_11,2_two_22,3_three_33",

pkg/datasource/sql/undo/builder/basic_undo_log_builder_test.go

@@ -93,8 +93,8 @@ func TestBuildLockKey(t *testing.T) {
 			types.RecordImage{
 				TableName: "test_name",
 				Rows: []types.RowImage{
-					{[]types.ColumnImage{getColumnImage("id", 1), getColumnImage("userId", "one")}},
-					{[]types.ColumnImage{getColumnImage("id", 2), getColumnImage("userId", "two")}},
+					{Columns: []types.ColumnImage{getColumnImage("id", 1), getColumnImage("userId", "one")}},
+					{Columns: []types.ColumnImage{getColumnImage("id", 2), getColumnImage("userId", "two")}},
 				},
 			},
 			"TEST_NAME:1_one,2_two",
@@ -110,9 +110,9 @@ func TestBuildLockKey(t *testing.T) {
 			types.RecordImage{
 				TableName: "test2_name",
 				Rows: []types.RowImage{
-					{[]types.ColumnImage{getColumnImage("id", 1), getColumnImage("userId", "one"), getColumnImage("age", "11")}},
-					{[]types.ColumnImage{getColumnImage("id", 2), getColumnImage("userId", "two"), getColumnImage("age", "22")}},
-					{[]types.ColumnImage{getColumnImage("id", 3), getColumnImage("userId", "three"), getColumnImage("age", "33")}},
+					{Columns: []types.ColumnImage{getColumnImage("id", 1), getColumnImage("userId", "one"), getColumnImage("age", "11")}},
+					{Columns: []types.ColumnImage{getColumnImage("id", 2), getColumnImage("userId", "two"), getColumnImage("age", "22")}},
+					{Columns: []types.ColumnImage{getColumnImage("id", 3), getColumnImage("userId", "three"), getColumnImage("age", "33")}},
 				},
 			},
 			"TEST2_NAME:1_one_11,2_two_22,3_three_33",

pkg/integration/gin/gin_transaction_middleware.go

@@ -37,7 +37,7 @@ func TransactionMiddleware() gin.HandlerFunc {
 		}
 
 		if len(xid) == 0 {
-			log.Errorf("Gin: header not contain header: %s, global transaction xid", constant.XidKey)
+			log.Errorf("Gin: header does not contain: %s or %s, global transaction xid is missing", constant.XidKey, constant.XidKeyLowercase)
 			ctx.AbortWithStatus(http.StatusBadRequest)
 			return
 		}