Merge pull request #1241 from ydb-platform/go1.20

asmyasnikov · web-flow · commit 6c8ca715dcdc · 2024-05-24T21:39:27.000+03:00
* Downgraded minimal version of Go to 1.20
diff --git a/.github/workflows/breaking.yml b/.github/workflows/breaking.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Install gorelease
diff --git a/.github/workflows/check-codegen.yml b/.github/workflows/check-codegen.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        go-version: [1.21.x, 1.22.x]
+        go-version: [1.20.x, 1.21.x, 1.22.x]
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -70,7 +70,7 @@ jobs:
           - 5432:5432
     env:
       OS: ubuntu-latest
-      GO: 1.21.x
+      GO: 1.20.x
       POSTGRES_CONNECTION_STRING: postgres://postgres:postgres@localhost:5432/basic?sslmode=disable
     steps:
       - name: Checkout code
@@ -93,7 +93,7 @@ jobs:
         application: [ gorm, xorm ]
     env:
       OS: ubuntu-latest
-      GO: 1.21.x
+      GO: 1.20.x
       SQLITE_CONNECTION_STRING: ${{ matrix.application }}.db
     steps:
       - name: Checkout code
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -65,7 +65,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.20"
       - name: Install utilities
         run: |
           go install mvdan.cc/gofumpt@v0.3.1
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.21.x, 1.22.x]
+        go-version: [1.20.x, 1.21.x, 1.22.x]
         os: [ubuntu, windows, macOS]
     env:
       OS: ${{ matrix.os }}-latest
@@ -29,7 +29,7 @@ jobs:
           go-version: ${{ matrix.go-version }}
           cache: true
       - name: Test
-        run: go test -race -coverprofile unit.txt -covermode atomic ./...
+        run: go test -race -coverprofile unit.txt -covermode atomic -v ./...
       - name: Upload coverage report to Codecov
         uses: codecov/codecov-action@v4
         with:
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.21.x, 1.22.x]
+        go-version: [1.20.x, 1.21.x, 1.22.x]
         ydb-version: [23.3, 24.1]
     services:
       ydb:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+* Downgraded minimal version of Go to 1.20
 * Refactored internal packages by `ifshort` linter issues
 
 # v3.68.0
diff --git a/README.md b/README.md
@@ -19,8 +19,9 @@ Supports `table`, `query`, `discovery`, `coordination`, `ratelimiter`, `scheme`,
 
 ## Supported Go Versions
 
-`ydb-go-sdk` supports all Go versions supported by the official [Go Release Policy](https://go.dev/doc/devel/release#policy). 
-That is, the two most recent releases of Go.
+`ydb-go-sdk` supports all Go versions supported by the official [Go Release Policy](https://go.dev/doc/devel/release#policy).
+That is, the latest two versions of Go (or more, but with no guarantees for extra versions).
+
 
 ## Versioning Policy
 
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/ydb-platform/ydb-go-sdk/v3
 
-go 1.21
+go 1.20
 
 require (
 	github.com/golang-jwt/jwt/v4 v4.4.1
diff --git a/go.sum b/go.sum
@@ -47,7 +47,6 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
diff --git a/internal/pool/pool_test.go b/internal/pool/pool_test.go
@@ -297,8 +297,8 @@ func TestSafeStatsRace(t *testing.T) {
 			wg sync.WaitGroup
 			s  = &safeStats{}
 		)
-		wg.Add(10000)
-		for range make([]struct{}, 10000) {
+		wg.Add(1000)
+		for range make([]struct{}, 1000) {
 			go func() {
 				defer wg.Done()
 				require.NotPanics(t, func() {
diff --git a/internal/topic/topicreaderinternal/stream_reconnector.go b/internal/topic/topicreaderinternal/stream_reconnector.go
@@ -15,6 +15,7 @@ import (
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/empty"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/topic"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/value"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xsync"
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
@@ -313,7 +314,7 @@ func (r *readerReconnector) connectWithTimeout() (_ batchedStreamReader, _ conte
 		return nil, nil, err
 	}
 
-	connectionContext, cancel := context.WithCancelCause(context.WithoutCancel(bgContext))
+	connectionContext, cancel := context.WithCancelCause(xcontext.ValueOnly(bgContext))
 
 	type connectResult struct {
 		stream batchedStreamReader
diff --git a/internal/xcontext/done.go b/internal/xcontext/done.go
@@ -1,3 +1,6 @@
+//go:build go1.21
+// +build go1.21
+
 package xcontext
 
 import (
diff --git a/internal/xcontext/done_test.go b/internal/xcontext/done_test.go
@@ -1,3 +1,6 @@
+//go:build go1.21
+// +build go1.21
+
 package xcontext
 
 import (
diff --git a/internal/xcontext/without_deadline.go b/internal/xcontext/without_deadline.go
@@ -1,3 +1,6 @@
+//go:build go1.21
+// +build go1.21
+
 package xcontext
 
 import (
diff --git a/internal/xcontext/without_deadline_go1.20.go b/internal/xcontext/without_deadline_go1.20.go
@@ -0,0 +1,30 @@
+//go:build !go1.21
+// +build !go1.21
+
+package xcontext
+
+import (
+	"context"
+	"time"
+)
+
+type withoutCancelCtx struct {
+	context.Context
+}
+
+func (withoutCancelCtx) Deadline() (deadline time.Time, ok bool) {
+	return
+}
+
+func (withoutCancelCtx) Done() <-chan struct{} {
+	return nil
+}
+
+func (withoutCancelCtx) Err() error {
+	return nil
+}
+
+// ValueOnly helps to clear parent context from deadlines/cancels
+func ValueOnly(parent context.Context) context.Context {
+	return withoutCancelCtx{parent}
+}
diff --git a/internal/xsync/last_usage_guard.go b/internal/xsync/last_usage_guard.go
@@ -1,7 +1,6 @@
 package xsync
 
 import (
-	"sync"
 	"sync/atomic"
 	"time"
 
@@ -42,21 +41,10 @@ func NewLastUsage(opts ...lastUsageOption) *lastUsage {
 	return lastUsage
 }
 
-func (g *lastUsage) Get() time.Time {
-	if g.locks.Load() == 0 {
-		return *g.t.Load()
+func (guard *lastUsage) Get() time.Time {
+	if guard.locks.Load() == 0 {
+		return *guard.t.Load()
 	}
 
-	return g.clock.Now()
-}
-
-func (g *lastUsage) Start() (stop func()) {
-	g.locks.Add(1)
-
-	return sync.OnceFunc(func() {
-		if g.locks.Add(-1) == 0 {
-			now := g.clock.Now()
-			g.t.Store(&now)
-		}
-	})
+	return guard.clock.Now()
 }
diff --git a/internal/xsync/last_usage_guard_start.go b/internal/xsync/last_usage_guard_start.go
@@ -0,0 +1,19 @@
+//go:build go1.21
+// +build go1.21
+
+package xsync
+
+import (
+	"sync"
+)
+
+func (guard *lastUsage) Start() (stop func()) {
+	guard.locks.Add(1)
+
+	return sync.OnceFunc(func() {
+		if guard.locks.Add(-1) == 0 {
+			now := guard.clock.Now()
+			guard.t.Store(&now)
+		}
+	})
+}
diff --git a/internal/xsync/last_usage_guard_start_go1.20.go b/internal/xsync/last_usage_guard_start_go1.20.go
@@ -0,0 +1,44 @@
+//go:build !go1.21
+// +build !go1.21
+
+package xsync
+
+import (
+	"sync"
+)
+
+func (guard *lastUsage) Start() (stop func()) {
+	guard.locks.Add(1)
+
+	var (
+		once  sync.Once
+		valid bool
+		p     any
+	)
+	f := func() {
+		if guard.locks.Add(-1) == 0 {
+			now := guard.clock.Now()
+			guard.t.Store(&now)
+		}
+	}
+	// Construct the inner closure just once to reduce costs on the fast path.
+	g := func() {
+		defer func() {
+			p = recover()
+			if !valid {
+				// Re-panic immediately so on the first call the user gets a
+				// complete stack trace into f.
+				panic(p)
+			}
+		}()
+		f()
+		f = nil      // Do not keep f alive after invoking it.
+		valid = true // Set only if f does not panic.
+	}
+	return func() {
+		once.Do(g)
+		if !valid {
+			panic(p)
+		}
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+* Downgraded minimal version of Go to 1.20`
`1`	`2`	* Refactored internal packages by `ifshort` linter issues
`2`	`3`
`3`	`4`	`# v3.68.0`