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_pretty
#ifndef OCEANBASE_SQL_OB_EXPR_JSON_PRETTY_H_
#define OCEANBASE_SQL_OB_EXPR_JSON_PRETTY_H_
@ -31,7 +30,6 @@ public:
template <typename T>
static int calc(const T &data, ObObjType type, ObCollationType cs_type,
ObIAllocator *allocator, ObJsonBuffer &j_buf, bool &is_null);
int calc_result1(common::ObObj &result, const common::ObObj &obj, common::ObExprCtx &expr_ctx) const override;
int calc_result_type1(ObExprResType &type,
ObExprResType &type1,
common::ObExprTypeCtx &type_ctx) const override;