update

pingcap · Mar 7, 2024 · c5aa2db · c5aa2db
1 parent 5be0588
commit c5aa2db
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/pkg/bindinfo/binding_cache.go b/pkg/bindinfo/binding_cache.go
@@ -36,7 +36,7 @@ import (
 // fuzzy matching, loading binding if cache miss automatically (TODO).
 type FuzzyBindingCache interface {
 	// FuzzyMatchingBinding supports fuzzy matching on bindings.
-	FuzzyMatchingBinding(sctx sessionctx.Context, fuzzyDigest string, tableNames []*ast.TableName) (bindings Binding, isMatched bool)
+	FuzzyMatchingBinding(sctx sessionctx.Context, fuzzyDigest string, tableNames []*ast.TableName) (bindings Binding, isMatched bool, isMissed bool)
 
 	// Copy copies this cache.
 	Copy() (c FuzzyBindingCache, err error)
@@ -69,7 +69,7 @@ func newFuzzyBindingCache(loadBindingFromStorageFunc func(string) (Bindings, err
 	}
 }
 
-func (fbc *fuzzyBindingCache) FuzzyMatchingBinding(sctx sessionctx.Context, fuzzyDigest string, tableNames []*ast.TableName) (matchedBinding Binding, isMatched bool) {
+func (fbc *fuzzyBindingCache) FuzzyMatchingBinding(sctx sessionctx.Context, fuzzyDigest string, tableNames []*ast.TableName) (matchedBinding Binding, isMatched bool, isMissed bool) {
 	matchedBinding, isMatched, missingSQLDigest := fbc.getFromMemory(sctx, fuzzyDigest, tableNames)
 	if len(missingSQLDigest) == 0 {
 		return
@@ -80,7 +80,7 @@ func (fbc *fuzzyBindingCache) FuzzyMatchingBinding(sctx sessionctx.Context, fuzz
 	fbc.loadFromStore(missingSQLDigest) // loadFromStore's SetBinding has a Mutex inside, so it's safe to call it without lock
 	matchedBinding, isMatched, _ = fbc.getFromMemory(sctx, fuzzyDigest, tableNames)
 	if !isMatched {
-		sctx.GetSessionVars().StmtCtx.AppendWarning(errors.New("failed to load bindings, optimization process without bindings"))
+		isMissed = true
 	}
 	return
 }

diff --git a/pkg/bindinfo/binding_match.go b/pkg/bindinfo/binding_match.go
@@ -15,6 +15,7 @@
 package bindinfo
 
 import (
+	"errors"
 	"strings"
 	"sync"
 
@@ -86,8 +87,11 @@ func matchSQLBinding(sctx sessionctx.Context, stmtNode ast.StmtNode, info *Bindi
 	if globalHandle == nil {
 		return
 	}
-	if binding, matched := globalHandle.MatchGlobalBinding(sctx, fuzzyDigest, tableNames); matched {
+	binding, matched, isMissed := globalHandle.MatchGlobalBinding(sctx, fuzzyDigest, tableNames)
+	if matched {
 		return binding, matched, metrics.ScopeGlobal
+	} else if isMissed {
+		sctx.GetSessionVars().StmtCtx.AppendWarning(errors.New("failed to load bindings, optimization process without bindings"))
 	}
 	return
 }

diff --git a/pkg/bindinfo/global_handle.go b/pkg/bindinfo/global_handle.go
@@ -46,7 +46,7 @@ type GlobalBindingHandle interface {
 	// Methods for create, get, drop global sql bindings.
 
 	// MatchGlobalBinding returns the matched binding for this statement.
-	MatchGlobalBinding(sctx sessionctx.Context, fuzzyDigest string, tableNames []*ast.TableName) (matchedBinding Binding, isMatched bool)
+	MatchGlobalBinding(sctx sessionctx.Context, fuzzyDigest string, tableNames []*ast.TableName) (matchedBinding Binding, isMatched bool, isMissed bool)
 
 	// GetAllGlobalBindings returns all bind records in cache.
 	GetAllGlobalBindings() (bindings Bindings)
@@ -465,7 +465,7 @@ func (h *globalBindingHandle) Size() int {
 }
 
 // MatchGlobalBinding returns the matched binding for this statement.
-func (h *globalBindingHandle) MatchGlobalBinding(sctx sessionctx.Context, fuzzyDigest string, tableNames []*ast.TableName) (matchedBinding Binding, isMatched bool) {
+func (h *globalBindingHandle) MatchGlobalBinding(sctx sessionctx.Context, fuzzyDigest string, tableNames []*ast.TableName) (matchedBinding Binding, isMatched bool, isMissed bool) {
 	return h.getCache().FuzzyMatchingBinding(sctx, fuzzyDigest, tableNames)
 }
 

diff --git a/pkg/bindinfo/session_handle.go b/pkg/bindinfo/session_handle.go
@@ -103,7 +103,8 @@ func (h *sessionBindingHandle) DropSessionBinding(sqlDigest string) error {
 
 // MatchSessionBinding returns the matched binding for this statement.
 func (h *sessionBindingHandle) MatchSessionBinding(sctx sessionctx.Context, fuzzyDigest string, tableNames []*ast.TableName) (matchedBinding Binding, isMatched bool) {
-	return h.ch.FuzzyMatchingBinding(sctx, fuzzyDigest, tableNames)
+	matchedBinding, isMatched, _ = h.ch.FuzzyMatchingBinding(sctx, fuzzyDigest, tableNames)
+	return
 }
 
 // GetAllSessionBindings return all session bind info.