From d6f46a344cad1dc09c358e28c095a131334f7fce Mon Sep 17 00:00:00 2001 From: TotaJ Date: Tue, 28 Jul 2020 16:03:05 +0800 Subject: [PATCH] Fix explain(verbose) bug on foreign table. Support drop mysql_fdw and oracle_fdw. --- src/gausskernel/optimizer/plan/createplan.cpp | 2 ++ src/gausskernel/process/tcop/utility.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gausskernel/optimizer/plan/createplan.cpp b/src/gausskernel/optimizer/plan/createplan.cpp index 9678c6c392..186cfb588d 100644 --- a/src/gausskernel/optimizer/plan/createplan.cpp +++ b/src/gausskernel/optimizer/plan/createplan.cpp @@ -5859,8 +5859,10 @@ ForeignScan* make_foreignscan( plan->righttree = NULL; plan->exec_type = type; plan->distributed_keys = NIL; +#ifdef ENABLE_MULTIPLE_NODES plan->distributed_keys = lappend(plan->distributed_keys, makeVar(0, InvalidAttrNumber, InvalidOid, -1, InvalidOid, 0)); +#endif node->scan.scanrelid = scanrelid; node->fdw_exprs = fdw_exprs; node->fdw_private = fdw_private; diff --git a/src/gausskernel/process/tcop/utility.cpp b/src/gausskernel/process/tcop/utility.cpp index 0524a4d465..9bff438869 100755 --- a/src/gausskernel/process/tcop/utility.cpp +++ b/src/gausskernel/process/tcop/utility.cpp @@ -8504,7 +8504,8 @@ bool DropExtensionIsSupported(const char* query_string) { char* lower_string = lowerstr(query_string); - if (strstr(lower_string, "drop") && (strstr(lower_string, "postgis") || strstr(lower_string, "packages"))) { + if (strstr(lower_string, "drop") && (strstr(lower_string, "postgis") || strstr(lower_string, "packages") || + strstr(lower_string, "mysql_fdw") || strstr(lower_string, "oracle_fdw"))) { pfree_ext(lower_string); return true; } else { -- Gitee