expression: fix append to result twice when vecEval compress('') (#33523

) close #33397
pingcap · Mar 29, 2022 · 5a54d0d · 5a54d0d
1 parent 5dbd394
commit 5a54d0d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/expression/builtin_encryption_vec.go b/expression/builtin_encryption_vec.go
@@ -567,6 +567,7 @@ func (b *builtinCompressSig) vecEvalString(input *chunk.Chunk, result *chunk.Col
 		// According to doc: Empty strings are stored as empty strings.
 		if len(strBytes) == 0 {
 			result.AppendString("")
+			continue
 		}
 
 		compressed, err := deflate(strBytes)

diff --git a/expression/integration_test.go b/expression/integration_test.go
@@ -7078,3 +7078,16 @@ func TestIssue32488(t *testing.T) {
 	tk.MustQuery("select binary upper(a), lower(a) from t order by upper(a);").Check([][]interface{}{{"İ i"}, {"Ʞ ʞ"}})
 	tk.MustQuery("select distinct upper(a), lower(a) from t order by upper(a);").Check([][]interface{}{{"İ i"}, {"Ʞ ʞ"}})
 }
+
+func TestIssue33397(t *testing.T) {
+	store, clean := testkit.CreateMockStore(t)
+	defer clean()
+
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec("create table t(a varchar(32)) DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;")
+	tk.MustExec("insert into t values(''), ('');")
+	tk.MustExec("set @@tidb_enable_vectorized_expression = true;")
+	result := tk.MustQuery("select compress(a) from t").Rows()
+	require.Equal(t, [][]interface{}{{""}, {""}}, result)
+}