fixup

pingcap · Nov 24, 2023 · eb06323 · eb06323
1 parent 835805d
commit eb06323
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/pkg/bindinfo/capture_test.go b/pkg/bindinfo/capture_test.go
@@ -328,8 +328,8 @@ func TestBindingSource(t *testing.T) {
 	// Test Source for SQL created sql
 	tk.MustExec("create global binding for select * from t where a > 10 using select * from t ignore index(idx_a) where a > 10")
 	bindHandle := dom.BindHandle()
-	sql, hash := internal.UtilNormalizeWithDefaultDB(t, "select * from t where a > ?")
-	bindData := bindHandle.GetBindRecord(hash, sql, "test")
+	sql, sqlDigest := internal.UtilNormalizeWithDefaultDB(t, "select * from t where a > ?")
+	bindData := bindHandle.GetBindRecord(sqlDigest, sql, "test")
 	require.NotNil(t, bindData)
 	require.Equal(t, "select * from `test` . `t` where `a` > ?", bindData.OriginalSQL)
 	require.Len(t, bindData.Bindings, 1)
@@ -340,8 +340,8 @@ func TestBindingSource(t *testing.T) {
 	tk.MustExec("set @@tidb_evolve_plan_baselines=1")
 	tk.MustQuery("select * from t where a > 10")
 	bindHandle.SaveEvolveTasksToStore()
-	sql, hash = internal.UtilNormalizeWithDefaultDB(t, "select * from t where a > ?")
-	bindData = bindHandle.GetBindRecord(hash, sql, "test")
+	sql, sqlDigest = internal.UtilNormalizeWithDefaultDB(t, "select * from t where a > ?")
+	bindData = bindHandle.GetBindRecord(sqlDigest, sql, "test")
 	require.NotNil(t, bindData)
 	require.Equal(t, "select * from `test` . `t` where `a` > ?", bindData.OriginalSQL)
 	require.Len(t, bindData.Bindings, 2)
@@ -361,8 +361,8 @@ func TestBindingSource(t *testing.T) {
 	tk.MustExec("select * from t ignore index(idx_a) where a < 10")
 	tk.MustExec("admin capture bindings")
 	bindHandle.CaptureBaselines()
-	sql, hash = internal.UtilNormalizeWithDefaultDB(t, "select * from t where a < ?")
-	bindData = bindHandle.GetBindRecord(hash, sql, "test")
+	sql, sqlDigest = internal.UtilNormalizeWithDefaultDB(t, "select * from t where a < ?")
+	bindData = bindHandle.GetBindRecord(sqlDigest, sql, "test")
 	require.NotNil(t, bindData)
 	require.Equal(t, "select * from `test` . `t` where `a` < ?", bindData.OriginalSQL)
 	require.Len(t, bindData.Bindings, 1)

diff --git a/pkg/bindinfo/handle_test.go b/pkg/bindinfo/handle_test.go
@@ -67,8 +67,8 @@ func TestBindingLastUpdateTime(t *testing.T) {
 	bindHandle := bindinfo.NewBindHandle(tk.Session())
 	err := bindHandle.Update(true)
 	require.NoError(t, err)
-	sql, hash := parser.NormalizeDigest("select * from test . t0")
-	bindData := bindHandle.GetBindRecord(hash.String(), sql, "test")
+	sql, sqlDigest := parser.NormalizeDigest("select * from test . t0")
+	bindData := bindHandle.GetBindRecord(sqlDigest.String(), sql, "test")
 	require.Equal(t, 1, len(bindData.Bindings))
 	bind := bindData.Bindings[0]
 	updateTime := bind.UpdateTime.String()
@@ -132,8 +132,8 @@ func TestBindParse(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, 1, bindHandle.Size())
 
-	sql, hash := parser.NormalizeDigest("select * from test . t")
-	bindData := bindHandle.GetBindRecord(hash.String(), sql, "test")
+	sql, sqlDigest := parser.NormalizeDigest("select * from test . t")
+	bindData := bindHandle.GetBindRecord(sqlDigest.String(), sql, "test")
 	require.NotNil(t, bindData)
 	require.Equal(t, "select * from `test` . `t`", bindData.OriginalSQL)
 	bind := bindData.Bindings[0]
@@ -488,9 +488,9 @@ func TestGlobalBinding(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, testSQL.memoryUsage, pb.GetGauge().GetValue())
 
-		sql, hash := internal.UtilNormalizeWithDefaultDB(t, testSQL.querySQL)
+		sql, sqlDigest := internal.UtilNormalizeWithDefaultDB(t, testSQL.querySQL)
 
-		bindData := dom.BindHandle().GetBindRecord(hash, sql, "test")
+		bindData := dom.BindHandle().GetBindRecord(sqlDigest, sql, "test")
 		require.NotNil(t, bindData)
 		require.Equal(t, testSQL.originSQL, bindData.OriginalSQL)
 		bind := bindData.Bindings[0]
@@ -523,7 +523,7 @@ func TestGlobalBinding(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, 1, bindHandle.Size())
 
-		bindData = bindHandle.GetBindRecord(hash, sql, "test")
+		bindData = bindHandle.GetBindRecord(sqlDigest, sql, "test")
 		require.NotNil(t, bindData)
 		require.Equal(t, testSQL.originSQL, bindData.OriginalSQL)
 		bind = bindData.Bindings[0]
@@ -538,7 +538,7 @@ func TestGlobalBinding(t *testing.T) {
 		_, err = tk.Exec("drop global " + testSQL.dropSQL)
 		require.Equal(t, uint64(1), tk.Session().AffectedRows())
 		require.NoError(t, err)
-		bindData = dom.BindHandle().GetBindRecord(hash, sql, "test")
+		bindData = dom.BindHandle().GetBindRecord(sqlDigest, sql, "test")
 		require.Nil(t, bindData)
 
 		err = metrics.BindTotalGauge.WithLabelValues(metrics.ScopeGlobal, bindinfo.Enabled).Write(pb)
@@ -554,7 +554,7 @@ func TestGlobalBinding(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, 0, bindHandle.Size())
 
-		bindData = bindHandle.GetBindRecord(hash, sql, "test")
+		bindData = bindHandle.GetBindRecord(sqlDigest, sql, "test")
 		require.Nil(t, bindData)
 
 		rs, err = tk.Exec("show global bindings")