From 8ff128438fe4675a98c290626f0b4e217b535b02 Mon Sep 17 00:00:00 2001
From: totaj <totaj@qq.com>
Date: Tue, 21 Nov 2023 17:35:09 +0800
Subject: [PATCH] Fix fulljoin rewrite bug.

---
 src/gausskernel/optimizer/prep/prepjointree.cpp |  1 +
 src/test/regress/expected/fulljoin_rewrite.out  | 14 ++++++++++++++
 src/test/regress/sql/fulljoin_rewrite.sql       | 10 ++++++++++
 3 files changed, 25 insertions(+)

diff --git a/src/gausskernel/optimizer/prep/prepjointree.cpp b/src/gausskernel/optimizer/prep/prepjointree.cpp
index 9ec5043e9..f6482111c 100755
--- a/src/gausskernel/optimizer/prep/prepjointree.cpp
+++ b/src/gausskernel/optimizer/prep/prepjointree.cpp
@@ -3587,6 +3587,7 @@ static Node* reduce_inequality_fulljoins_jointree_recurse(PlannerInfo* root, Nod
                                 varno, varattno, exprType(node), exprTypmod(node), exprCollation(node), 0);
                         } else {
                             oldvar = (Node*)copyObject(retnode);
+                            oldvar = eval_const_expressions(root, oldvar);
                         }
                     } break;
                     default:
diff --git a/src/test/regress/expected/fulljoin_rewrite.out b/src/test/regress/expected/fulljoin_rewrite.out
index be1133f1a..b1ea1b9de 100644
--- a/src/test/regress/expected/fulljoin_rewrite.out
+++ b/src/test/regress/expected/fulljoin_rewrite.out
@@ -100,6 +100,20 @@ drop table fulljoin_test;
 drop table fulljoin_test2;
 drop table fulljoin_test3;
 drop table fulljoin_test4;
+CREATE TABLE IF NOT EXISTS fj_t0(c0 int4range , c1 REAL PRIMARY KEY, CHECK(((upper_inf(fj_t0.c0))OR((((reverse(')<'))LIKE(md5(')]/fK')))) IS TRUE))), UNIQUE(c1));
+NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "fj_t0_pkey" for table "fj_t0"
+CREATE UNLOGGED TABLE IF NOT EXISTS fj_t1(LIKE fj_t0);
+CREATE TABLE IF NOT EXISTS fj_t2(LIKE fj_t0);
+CREATE UNLOGGED TABLE fj_t3(LIKE fj_t1);
+SELECT 1 FROM (SELECT  1  FROM fj_t3 LEFT OUTER JOIN (SELECT  (((upper(fj_t0.c0))+(length('1')))) FROM fj_t0)  ON (TRUE)  FULL OUTER JOIN (SELECT 1 FROM fj_t1 ) AS sub1 ON 1 FULL OUTER JOIN (SELECT 1 FROM fj_t2) AS sub2 ON 1) as res;
+ ?column? 
+----------
+(0 rows)
+
+drop table fj_t3;
+drop table fj_t2;
+drop table fj_t1;
+drop table fj_t0;
 create table fulltest(col int4 primary key ,w_col numeric(6,2));
 NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "fulltest_pkey" for table "fulltest"
 create table fulltest2(w_id int4 primary key,w_ytd numeric(6,2),w_zip bpchar(27));
diff --git a/src/test/regress/sql/fulljoin_rewrite.sql b/src/test/regress/sql/fulljoin_rewrite.sql
index fba4fc22d..7acfe45c5 100644
--- a/src/test/regress/sql/fulljoin_rewrite.sql
+++ b/src/test/regress/sql/fulljoin_rewrite.sql
@@ -42,6 +42,16 @@ drop table fulljoin_test3;
 
 drop table fulljoin_test4;
 
+CREATE TABLE IF NOT EXISTS fj_t0(c0 int4range , c1 REAL PRIMARY KEY, CHECK(((upper_inf(fj_t0.c0))OR((((reverse(')<'))LIKE(md5(')]/fK')))) IS TRUE))), UNIQUE(c1));
+CREATE UNLOGGED TABLE IF NOT EXISTS fj_t1(LIKE fj_t0);
+CREATE TABLE IF NOT EXISTS fj_t2(LIKE fj_t0);
+CREATE UNLOGGED TABLE fj_t3(LIKE fj_t1);
+SELECT 1 FROM (SELECT  1  FROM fj_t3 LEFT OUTER JOIN (SELECT  (((upper(fj_t0.c0))+(length('1')))) FROM fj_t0)  ON (TRUE)  FULL OUTER JOIN (SELECT 1 FROM fj_t1 ) AS sub1 ON 1 FULL OUTER JOIN (SELECT 1 FROM fj_t2) AS sub2 ON 1) as res;
+drop table fj_t3;
+drop table fj_t2;
+drop table fj_t1;
+drop table fj_t0;
+
 create table fulltest(col int4 primary key ,w_col numeric(6,2));
 create table fulltest2(w_id int4 primary key,w_ytd numeric(6,2),w_zip bpchar(27));
 explain (verbose, costs off) select left(alias8.w_zip ,alias8.w_id) as alias10,true alias11,dense_rank() over(order by 1) alias12 from fulltest alias7 full join fulltest2 as alias8  on alias7.col!=alias8.w_ytd group by alias7.col,alias7.w_col ,alias8.w_id;