fix conflict

Signed-off-by: Yang Keao <[email protected]>
pingcap · Oct 30, 2024 · 5f16d16 · 5f16d16
1 parent 0cfd1d3
commit 5f16d16
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/pkg/ttl/ttlworker/BUILD.bazel b/pkg/ttl/ttlworker/BUILD.bazel
@@ -24,6 +24,7 @@ go_library(
         "//pkg/parser/terror",
         "//pkg/sessionctx",
         "//pkg/sessionctx/variable",
+        "//pkg/statistics/handle/util",
         "//pkg/store/driver/error",
         "//pkg/timer/api",
         "//pkg/timer/runtime",

diff --git a/pkg/ttl/ttlworker/session.go b/pkg/ttl/ttlworker/session.go
@@ -25,6 +25,7 @@ import (
 	"github.com/pingcap/tidb/pkg/parser/terror"
 	"github.com/pingcap/tidb/pkg/sessionctx"
 	"github.com/pingcap/tidb/pkg/sessionctx/variable"
+	"github.com/pingcap/tidb/pkg/statistics/handle/util"
 	"github.com/pingcap/tidb/pkg/ttl/cache"
 	"github.com/pingcap/tidb/pkg/ttl/metrics"
 	"github.com/pingcap/tidb/pkg/ttl/session"
@@ -56,22 +57,18 @@ var DetachStatsCollector = func(s sqlexec.SQLExecutor) sqlexec.SQLExecutor {
 	return s
 }
 
-<<<<<<< HEAD
-type sessionPool interface {
-	Get() (pools.Resource, error)
-	Put(pools.Resource)
-}
-
-func getSession(pool sessionPool) (session.Session, error) {
-=======
 var allIsolationReadEngines = map[kv.StoreType]struct{}{
 	kv.TiKV:    {},
 	kv.TiFlash: {},
 	kv.TiDB:    {},
 }
 
+type sessionPool interface {
+	Get() (pools.Resource, error)
+	Put(pools.Resource)
+}
+
 func getSession(pool util.SessionPool) (session.Session, error) {
->>>>>>> 670e970b224 (ttl: always enable all read engines for TTL sessions (#56604))
 	resource, err := pool.Get()
 	if err != nil {
 		return nil, err