From e76d10a88ae630a46c3bab4e4a017220412a58cd Mon Sep 17 00:00:00 2001
From: Zhihong Yu <yuzhihong@gmail.com>
Date: Sun, 10 Sep 2023 21:46:47 -0700
Subject: [PATCH] memory: return memory delta from
 jsonObjectAgg#MergePartialResult (#46807)

close pingcap/tidb#46806
---
 executor/aggfuncs/func_json_objectagg.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/executor/aggfuncs/func_json_objectagg.go b/executor/aggfuncs/func_json_objectagg.go
index 772149246ec86..819744e3a0f3c 100644
--- a/executor/aggfuncs/func_json_objectagg.go
+++ b/executor/aggfuncs/func_json_objectagg.go
@@ -76,7 +76,6 @@ func (e *jsonObjectAgg) UpdatePartialResult(sctx sessionctx.Context, rowsInGroup
 		if err != nil {
 			return 0, errors.Trace(err)
 		}
-		key = strings.Clone(key)
 
 		if keyIsNull {
 			return 0, types.ErrJSONDocumentNULLKey
@@ -86,6 +85,7 @@ func (e *jsonObjectAgg) UpdatePartialResult(sctx sessionctx.Context, rowsInGroup
 			return 0, types.ErrInvalidJSONCharset.GenWithStackByArgs(e.args[0].GetType().GetCharset())
 		}
 
+		key = strings.Clone(key)
 		value, err := e.args[1].Eval(row)
 		if err != nil {
 			return 0, errors.Trace(err)
@@ -203,5 +203,5 @@ func (*jsonObjectAgg) MergePartialResult(_ sessionctx.Context, src, dst PartialR
 			p2.bInMap++
 		}
 	}
-	return 0, nil
+	return memDelta, nil
 }