fix pr

Signed-off-by: you06 <you1474600@gmail.com>
pingcap · Nov 27, 2024 · ec23855 · ec23855
1 parent a23f7cb
commit ec23855
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 18 deletions.
diff --git a/errors.toml b/errors.toml
@@ -2136,11 +2136,6 @@ error = '''
 not implemented
 '''
 
-["kv:8178"]
-error = '''
-key is too large, the size of given key is %d
-'''
-
 ["kv:9007"]
 error = '''
 Write conflict, txnStartTS=%d, conflictStartTS=%d, conflictCommitTS=%d, key=%s%s%s%s, reason=%s [try again later]

diff --git a/go.mod b/go.mod
@@ -60,6 +60,7 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/gostaticanalysis/forcetypeassert v0.1.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
+	github.com/hashicorp/go-version v1.6.0
 	github.com/jedib0t/go-pretty/v6 v6.2.2
 	github.com/jellydator/ttlcache/v3 v3.0.1
 	github.com/jfcg/sorty/v2 v2.1.0

diff --git a/pkg/executor/BUILD.bazel b/pkg/executor/BUILD.bazel
@@ -464,6 +464,7 @@ go_test(
         "//pkg/util/tableutil",
         "//pkg/util/topsql/state",
         "@com_github_gorilla_mux//:mux",
+        "@com_github_hashicorp_go_version//:go-version",
         "@com_github_pingcap_errors//:errors",
         "@com_github_pingcap_failpoint//:failpoint",
         "@com_github_pingcap_fn//:fn",

diff --git a/pkg/executor/executor_pkg_test.go b/pkg/executor/executor_pkg_test.go
@@ -23,6 +23,7 @@ import (
 	"time"
 	"unsafe"
 
+	"github.com/hashicorp/go-version"
 	"github.com/pingcap/tidb/pkg/domain"
 	"github.com/pingcap/tidb/pkg/errctx"
 	"github.com/pingcap/tidb/pkg/executor/aggfuncs"

diff --git a/pkg/executor/mem_reader.go b/pkg/executor/mem_reader.go
@@ -374,7 +374,7 @@ func (iter *txnMemBufferIter) Value() []byte {
 	return iter.curr.Value()
 }
 
-func (iter *txnMemBufferIter) Close() {
+func (*txnMemBufferIter) Close() {
 }
 
 func (m *memTableReader) getMemRowsIter(ctx context.Context) (memRowsIter, error) {

diff --git a/tests/integrationtest/r/globalindex/insert.result b/tests/integrationtest/r/globalindex/insert.result