*: remove useless parameter (pingcap#29392)

jackysp · Nov 4, 2021 · 8368eee · 8368eee
1 parent 9bbc7ad
commit 8368eee
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 25 deletions.
diff --git a/br/pkg/lightning/mydump/parquet_parser_test.go b/br/pkg/lightning/mydump/parquet_parser_test.go
@@ -55,7 +55,7 @@ func (s testParquetParserSuite) TestParquetParser(c *C) {
 	verifyRow := func(i int) {
 		c.Assert(reader.lastRow.RowID, Equals, int64(i+1))
 		c.Assert(len(reader.lastRow.Row), Equals, 2)
-		c.Assert(reader.lastRow.Row[0], DeepEquals, types.NewCollationStringDatum(strconv.Itoa(i), "", 0))
+		c.Assert(reader.lastRow.Row[0], DeepEquals, types.NewCollationStringDatum(strconv.Itoa(i), ""))
 		c.Assert(reader.lastRow.Row[1], DeepEquals, types.NewIntDatum(int64(i)))
 	}
 
@@ -184,7 +184,7 @@ func (s testParquetParserSuite) TestParquetVariousTypes(c *C) {
 
 	for i, testCase := range cases {
 		c.Assert(reader.ReadRow(), IsNil)
-		vals := []types.Datum{types.NewCollationStringDatum(testCase[1].(string), "", 0)}
+		vals := []types.Datum{types.NewCollationStringDatum(testCase[1].(string), "")}
 		if i%2 == 0 {
 			vals = append(vals, vals[0])
 		} else {

diff --git a/expression/builtin_encryption_test.go b/expression/builtin_encryption_test.go
@@ -27,7 +27,6 @@ import (
 	"github.com/pingcap/tidb/sessionctx/variable"
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/chunk"
-	"github.com/pingcap/tidb/util/collate"
 	"github.com/pingcap/tidb/util/hack"
 	"github.com/stretchr/testify/require"
 )
@@ -96,7 +95,7 @@ func TestSQLEncode(t *testing.T) {
 		if test.origin != nil {
 			result, err := charset.NewEncoding(test.chs).EncodeString(test.origin.(string))
 			require.NoError(t, err)
-			require.Equal(t, types.NewCollationStringDatum(result, test.chs, 1), d)
+			require.Equal(t, types.NewCollationStringDatum(result, test.chs), d)
 		} else {
 			result := types.NewDatum(test.origin)
 			require.Equal(t, result.GetBytes(), d.GetBytes())
@@ -187,7 +186,7 @@ func TestAESDecrypt(t *testing.T) {
 			require.True(t, str.IsNull())
 			continue
 		}
-		require.Equal(t, types.NewCollationStringDatum(tt.origin.(string), charset.CollationBin, collate.DefaultLen), str)
+		require.Equal(t, types.NewCollationStringDatum(tt.origin.(string), charset.CollationBin), str)
 	}
 	err := variable.SetSessionSystemVar(ctx.GetSessionVars(), variable.BlockEncryptionMode, "aes-128-ecb")
 	require.NoError(t, err)
@@ -445,7 +444,7 @@ func TestCompress(t *testing.T) {
 			require.Truef(t, out.IsNull(), "%v", test)
 			continue
 		}
-		require.Equalf(t, types.NewCollationStringDatum(test.expect.(string), charset.CollationBin, collate.DefaultLen), out, "%v", test)
+		require.Equalf(t, types.NewCollationStringDatum(test.expect.(string), charset.CollationBin), out, "%v", test)
 	}
 }
 
@@ -481,7 +480,7 @@ func TestUncompress(t *testing.T) {
 			require.Truef(t, out.IsNull(), "%v", test)
 			continue
 		}
-		require.Equalf(t, types.NewCollationStringDatum(test.expect.(string), charset.CollationBin, collate.DefaultLen), out, "%v", test)
+		require.Equalf(t, types.NewCollationStringDatum(test.expect.(string), charset.CollationBin), out, "%v", test)
 	}
 }
 

diff --git a/expression/builtin_other_serial_test.go b/expression/builtin_other_serial_test.go
@@ -84,8 +84,8 @@ func TestInFunc(t *testing.T) {
 	}
 	collate.SetNewCollationEnabledForTest(true)
 	defer collate.SetNewCollationEnabledForTest(false)
-	strD1 := types.NewCollationStringDatum("a", "utf8_general_ci", 0)
-	strD2 := types.NewCollationStringDatum("Á", "utf8_general_ci", 0)
+	strD1 := types.NewCollationStringDatum("a", "utf8_general_ci")
+	strD2 := types.NewCollationStringDatum("Á", "utf8_general_ci")
 	fn, err := fc.getFunction(ctx, datumsToConstants([]types.Datum{strD1, strD2}))
 	require.NoError(t, err)
 	d, isNull, err := fn.evalInt(chunk.Row{})

diff --git a/expression/builtin_other_vec.go b/expression/builtin_other_vec.go
@@ -20,7 +20,6 @@ import (
 	"github.com/pingcap/errors"
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/chunk"
-	"github.com/pingcap/tidb/util/collate"
 	"github.com/pingcap/tidb/util/stringutil"
 )
 
@@ -190,7 +189,7 @@ func (b *builtinSetStringVarSig) vecEvalString(input *chunk.Chunk, result *chunk
 		}
 		varName := strings.ToLower(buf0.GetString(i))
 		res := buf1.GetString(i)
-		sessionVars.Users[varName] = types.NewCollationStringDatum(stringutil.Copy(res), collation, collate.DefaultLen)
+		sessionVars.Users[varName] = types.NewCollationStringDatum(stringutil.Copy(res), collation)
 		result.AppendString(res)
 	}
 	return nil

diff --git a/expression/builtin_string_serial_test.go b/expression/builtin_string_serial_test.go
@@ -16,7 +16,6 @@ package expression
 
 import (
 	"testing"
-	"unicode/utf8"
 
 	"github.com/pingcap/tidb/parser/ast"
 	"github.com/pingcap/tidb/types"
@@ -40,7 +39,7 @@ func TestCIWeightString(t *testing.T) {
 	checkResult := func(collation string, tests []weightStringTest) {
 		fc := funcs[ast.WeightString]
 		for _, test := range tests {
-			str := types.NewCollationStringDatum(test.str, collation, utf8.RuneCountInString(test.str))
+			str := types.NewCollationStringDatum(test.str, collation)
 			var f builtinFunc
 			var err error
 			if test.padding == "NONE" {

diff --git a/sessionctx/binloginfo/binloginfo_test.go b/sessionctx/binloginfo/binloginfo_test.go
@@ -158,19 +158,19 @@ func TestBinlog(t *testing.T) {
 	require.Greater(t, prewriteVal.SchemaVersion, int64(0))
 	require.Greater(t, prewriteVal.Mutations[0].TableId, int64(0))
 	expected := [][]types.Datum{
-		{types.NewIntDatum(1), types.NewCollationStringDatum("abc", mysql.DefaultCollationName, collate.DefaultLen)},
-		{types.NewIntDatum(2), types.NewCollationStringDatum("cde", mysql.DefaultCollationName, collate.DefaultLen)},
+		{types.NewIntDatum(1), types.NewCollationStringDatum("abc", mysql.DefaultCollationName)},
+		{types.NewIntDatum(2), types.NewCollationStringDatum("cde", mysql.DefaultCollationName)},
 	}
 	gotRows := mutationRowsToRows(t, prewriteVal.Mutations[0].InsertedRows, 2, 4)
 	require.Equal(t, expected, gotRows)
 
 	tk.MustExec("update local_binlog set name = 'xyz' where id = 2")
 	prewriteVal = getLatestBinlogPrewriteValue(t, pump)
 	oldRow := [][]types.Datum{
-		{types.NewIntDatum(2), types.NewCollationStringDatum("cde", mysql.DefaultCollationName, collate.DefaultLen)},
+		{types.NewIntDatum(2), types.NewCollationStringDatum("cde", mysql.DefaultCollationName)},
 	}
 	newRow := [][]types.Datum{
-		{types.NewIntDatum(2), types.NewCollationStringDatum("xyz", mysql.DefaultCollationName, collate.DefaultLen)},
+		{types.NewIntDatum(2), types.NewCollationStringDatum("xyz", mysql.DefaultCollationName)},
 	}
 	gotRows = mutationRowsToRows(t, prewriteVal.Mutations[0].UpdatedRows, 1, 3)
 	require.Equal(t, oldRow, gotRows)
@@ -182,7 +182,7 @@ func TestBinlog(t *testing.T) {
 	prewriteVal = getLatestBinlogPrewriteValue(t, pump)
 	gotRows = mutationRowsToRows(t, prewriteVal.Mutations[0].DeletedRows, 1, 3)
 	expected = [][]types.Datum{
-		{types.NewIntDatum(1), types.NewCollationStringDatum("abc", mysql.DefaultCollationName, collate.DefaultLen)},
+		{types.NewIntDatum(1), types.NewCollationStringDatum("abc", mysql.DefaultCollationName)},
 	}
 	require.Equal(t, expected, gotRows)
 

diff --git a/sessionctx/variable/session.go b/sessionctx/variable/session.go
@@ -44,7 +44,6 @@ import (
 	"github.com/pingcap/tidb/sessionctx/stmtctx"
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/chunk"
-	"github.com/pingcap/tidb/util/collate"
 	"github.com/pingcap/tidb/util/execdetails"
 	"github.com/pingcap/tidb/util/rowcodec"
 	"github.com/pingcap/tidb/util/stringutil"
@@ -1389,10 +1388,10 @@ func (s *SessionVars) GetParseParams() []parser.ParseParam {
 // SetUserVar set the value and collation for user defined variable.
 func (s *SessionVars) SetUserVar(varName string, svalue string, collation string) {
 	if len(collation) > 0 {
-		s.Users[varName] = types.NewCollationStringDatum(stringutil.Copy(svalue), collation, collate.DefaultLen)
+		s.Users[varName] = types.NewCollationStringDatum(stringutil.Copy(svalue), collation)
 	} else {
 		_, collation = s.GetCharsetInfo()
-		s.Users[varName] = types.NewCollationStringDatum(stringutil.Copy(svalue), collation, collate.DefaultLen)
+		s.Users[varName] = types.NewCollationStringDatum(stringutil.Copy(svalue), collation)
 	}
 }
 

diff --git a/tablecodec/tablecodec_test.go b/tablecodec/tablecodec_test.go
@@ -216,7 +216,7 @@ func TestUnflattenDatums(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, 0, cmp)
 
-	input = []types.Datum{types.NewCollationStringDatum("aaa", "utf8mb4_unicode_ci", 0)}
+	input = []types.Datum{types.NewCollationStringDatum("aaa", "utf8mb4_unicode_ci")}
 	tps = []*types.FieldType{types.NewFieldType(mysql.TypeBlob)}
 	tps[0].Collate = "utf8mb4_unicode_ci"
 	output, err = UnflattenDatums(input, tps, sc.TimeZone)

diff --git a/types/datum.go b/types/datum.go
@@ -1924,8 +1924,8 @@ func NewStringDatum(s string) (d Datum) {
 	return d
 }
 
-// NewCollationStringDatum creates a new Datum from a string with collation and length info.
-func NewCollationStringDatum(s string, collation string, length int) (d Datum) {
+// NewCollationStringDatum creates a new Datum from a string with collation.
+func NewCollationStringDatum(s string, collation string) (d Datum) {
 	d.SetString(s, collation)
 	return d
 }

diff --git a/util/ranger/points.go b/util/ranger/points.go
@@ -684,7 +684,7 @@ func (r *builder) newBuildFromPatternLike(expr *expression.ScalarFunction) []*po
 		return []*point{{value: types.MinNotNullDatum(), start: true}, {value: types.MaxValueDatum()}}
 	}
 	if isExactMatch {
-		val := types.NewCollationStringDatum(string(lowValue), tpOfPattern.Collate, tpOfPattern.Flen)
+		val := types.NewCollationStringDatum(string(lowValue), tpOfPattern.Collate)
 		return []*point{{value: val, start: true}, {value: val}}
 	}
 	startPoint := &point{start: true, excl: exclude}