patch 4.0

This commit is contained in:
wangzelin.wzl
2022-10-24 10:34:53 +08:00
parent 4ad6e00ec3
commit 93a1074b0c
10533 changed files with 2588271 additions and 2299373 deletions

View File

@ -10,7 +10,6 @@
* See the Mulan PubL v2 for more details.
*/
// This file is for define of func json_merge_preserve
#ifndef OCEANBASE_SQL_OB_EXPR_JSON_MERGE_PRESERVE_H_
#define OCEANBASE_SQL_OB_EXPR_JSON_MERGE_PRESERVE_H_
@ -29,7 +28,6 @@ public:
explicit ObExprJsonMergePreserve(common::ObIAllocator &alloc, ObExprOperatorType type,
const char *name, int32_t param_num, int32_t dimension);
virtual ~ObExprJsonMergePreserve();
int calc_resultN(ObObj &result, const ObObj *objs, int64_t param_num, ObExprCtx &expr_ctx) const;
virtual int calc_result_typeN(ObExprResType& type,
ObExprResType* types,
int64_t param_num,