From 8df25dce8e57edd10a56c6befd8861ddfe424efd Mon Sep 17 00:00:00 2001
From: 08ming <754041231@qq.com>
Date: Sun, 20 Oct 2024 15:56:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20timescaledb=E6=97=B6?=
 =?UTF-8?q?=E5=BA=8F=E8=A1=A8=E6=9F=A5=E7=9C=8BSQL=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=95=B0=E6=8D=AE=E5=BA=93=E6=8C=82=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/backend/utils/adt/ruleutils.cpp    | 7 +++++--
 src/gausskernel/optimizer/plan/createplan.cpp | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/common/backend/utils/adt/ruleutils.cpp b/src/common/backend/utils/adt/ruleutils.cpp
index bc3cd0f76..d765e4761 100644
--- a/src/common/backend/utils/adt/ruleutils.cpp
+++ b/src/common/backend/utils/adt/ruleutils.cpp
@@ -8915,8 +8915,11 @@ static char* get_variable(
     schemaname = NULL; /* default assumptions */
 
     if (NULL != rte->relname && u_sess->hook_cxt.forTsdbHook) {
-        rte->relname = get_rel_name(rte->relid);
-        rte->eref->aliasname = rte->relname;
+        char *relname = get_rel_name(rte->relid);
+        if (relname != NULL) {
+            rte->relname = pstrdup(relname);
+            rte->eref->aliasname = pstrdup(rte->relname);
+        }
     }
 
     refname = rte->eref->aliasname;
diff --git a/src/gausskernel/optimizer/plan/createplan.cpp b/src/gausskernel/optimizer/plan/createplan.cpp
index 5c63dc03d..d30577617 100755
--- a/src/gausskernel/optimizer/plan/createplan.cpp
+++ b/src/gausskernel/optimizer/plan/createplan.cpp
@@ -338,6 +338,10 @@ Plan* create_plan(PlannerInfo* root, Path* best_path)
         find_inlist2join_path(root, best_path);
     }
 
+    if (u_sess->hook_cxt.forTsdbHook && DB_IS_CMPT(PG_FORMAT) && root->minmax_aggs == NIL) {
+        plan->exec_nodes = ng_get_default_computing_group_exec_node();
+    }
+
     return plan;
 }