From e084a2ea1075d213cbe79f9289f2c186fe71966f Mon Sep 17 00:00:00 2001 From: HuaiyuXu Date: Mon, 22 Apr 2019 23:26:24 +0800 Subject: [PATCH] executor: use EncodeBytes in countOriginDistinct (#10225) --- executor/aggfuncs/func_count.go | 4 +++- executor/aggregate_test.go | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/executor/aggfuncs/func_count.go b/executor/aggfuncs/func_count.go index f04769e564ecc..b644f2a9d5b6d 100644 --- a/executor/aggfuncs/func_count.go +++ b/executor/aggfuncs/func_count.go @@ -10,6 +10,8 @@ import ( "github.com/pingcap/tidb/types" "github.com/pingcap/tidb/types/json" "github.com/pingcap/tidb/util/chunk" + "github.com/pingcap/tidb/util/codec" + "github.com/pingcap/tidb/util/hack" "github.com/pingcap/tidb/util/set" ) @@ -330,7 +332,7 @@ func (e *countOriginalWithDistinct) evalAndEncode( if err != nil || isNull { break } - encodedBytes = appendString(encodedBytes, buf, val) + encodedBytes = codec.EncodeBytes(encodedBytes, hack.Slice(val)) default: return nil, false, errors.Errorf("unsupported column type for encode %d", tp) } diff --git a/executor/aggregate_test.go b/executor/aggregate_test.go index 7172e69e07df6..949c9ed9cfde6 100644 --- a/executor/aggregate_test.go +++ b/executor/aggregate_test.go @@ -693,6 +693,14 @@ func (s *testSuite) TestAggJSON(c *C) { )) } +func (s *testSuite) TestIssue10099(c *C) { + tk := testkit.NewTestKitWithInit(c, s.store) + tk.MustExec("drop table if exists t") + tk.MustExec("create table t(a char(10), b char(10))") + tk.MustExec("insert into t values('1', '222'), ('12', '22')") + tk.MustQuery("select count(distinct a, b) from t").Check(testkit.Rows("2")) +} + func (s *testSuite) TestIssue10098(c *C) { tk := testkit.NewTestKitWithInit(c, s.store) tk.MustExec(`drop table if exists t;`)