merge devleop into master 20231212

2023-12-19 08:46:14 +00:00
parent 79fa3a931e
commit f5f3fd0173
5 changed files with 8 additions and 9 deletions
--- a/src/sql/executor/ob_shuffle_service.h
+++ b/src/sql/executor/ob_shuffle_service.h
@ -63,7 +63,7 @@ public:
                        const ObIArray<ObTransmitRepartColumn> &repart_sub_columns,
                        int64_t &part_idx,
                        int64_t &subpart_idx,
-                        bool &no_match_partition);
+                        bool &no_match_partiton);

  // 这个接口仅在px框架下使用, 非px请使用上面接口.
  int get_partition_ids(ObExecContext &exec_ctx,
@ -76,7 +76,7 @@ public:
                        const ObPxPartChMap &ch_map,
                        int64_t &part_id,
                        int64_t &subpart_id,
-                        bool &no_match_partition,
+                        bool &no_match_partiton,
                        ObRepartitionType part_type);
 private:
  int init_expr_ctx(ObExecContext &exec_ctx);