This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new e64672da8a1 Fix some answer files
e64672da8a1 is described below
commit e64672da8a1b160f54e4614e8c851d6828e497be
Author: Jinbao Chen <[email protected]>
AuthorDate: Thu Jan 1 22:20:45 2026 +0800
Fix some answer files
---
GNUmakefile.in | 8 ++++----
src/test/regress/expected/gp_explain.out | 2 +-
src/test/regress/expected/identity.out | 6 +++---
src/test/regress/expected/inherit.out | 2 +-
src/test/regress/expected/partition_prune.out | 2 +-
src/test/regress/expected/privileges.out | 2 +-
src/test/regress/expected/rowsecurity.out | 17 ++++++++---------
src/test/regress/expected/triggers.out | 1 +
src/test/regress/expected/updatable_views.out | 8 ++++----
src/test/regress/expected/update.out | 2 +-
src/test/regress/expected/update_gp.out | 4 ++--
11 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 956bb8bd305..f9955375051 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -12,12 +12,12 @@ $(call recurse,all install,src config)
all:
# $(MAKE) -C contrib/auto_explain all
-# $(MAKE) -C contrib/citext all
+ $(MAKE) -C contrib/citext all
# $(MAKE) -C contrib/file_fdw all
# $(MAKE) -C contrib/formatter all
# $(MAKE) -C contrib/formatter_fixedwidth all
# $(MAKE) -C contrib/fuzzystrmatch all
-# $(MAKE) -C contrib/extprotocol all
+ $(MAKE) -C contrib/extprotocol all
# $(MAKE) -C contrib/dblink all
# $(MAKE) -C contrib/indexscan all
$(MAKE) -C contrib/interconnect all
@@ -59,12 +59,12 @@ html man:
install:
# $(MAKE) -C contrib/auto_explain $@
-# $(MAKE) -C contrib/citext $@
+ $(MAKE) -C contrib/citext $@
# $(MAKE) -C contrib/file_fdw $@
# $(MAKE) -C contrib/formatter $@
# $(MAKE) -C contrib/formatter_fixedwidth $@
# $(MAKE) -C contrib/fuzzystrmatch $@
-# $(MAKE) -C contrib/extprotocol $@
+ $(MAKE) -C contrib/extprotocol $@
# $(MAKE) -C contrib/dblink $@
# $(MAKE) -C contrib/indexscan $@
$(MAKE) -C contrib/interconnect $@
diff --git a/src/test/regress/expected/gp_explain.out
b/src/test/regress/expected/gp_explain.out
index 7a838b69be5..6e4ad00a41f 100644
--- a/src/test/regress/expected/gp_explain.out
+++ b/src/test/regress/expected/gp_explain.out
@@ -545,7 +545,7 @@ EXPLAIN (analyze, costs off, timing off, summary off)
UPDATE explain_subplan.ra
Update on part_a_1_a_10 range_parted_1
Update on part_a_10_a_20 range_parted_2
-> Explicit Redistribute Motion 1:3 (slice1; segments: 1) (actual rows=1
loops=1)
- -> Split (actual rows=2 loops=1)
+ -> Split Update (actual rows=2 loops=1)
-> Append (actual rows=1 loops=1)
-> Seq Scan on part_a_1_a_10 range_parted_1 (actual
rows=0 loops=1)
Filter: ((a = 'a'::text) AND (c = '200'::numeric))
diff --git a/src/test/regress/expected/identity.out
b/src/test/regress/expected/identity.out
index cc54806335a..791f021ac82 100644
--- a/src/test/regress/expected/identity.out
+++ b/src/test/regress/expected/identity.out
@@ -662,16 +662,16 @@ WHEN NOT MATCHED THEN
SELECT * FROM itest15;
a | b
----+-------------------
- 1 | inserted by merge
+ 2 | inserted by merge
30 | inserted by merge
(2 rows)
SELECT * FROM itest16;
a | b
----+-------------------
- 10 | inserted by merge
- 1 | inserted by merge
+ 2 | inserted by merge
30 | inserted by merge
+ 10 | inserted by merge
(3 rows)
DROP TABLE itest15;
diff --git a/src/test/regress/expected/inherit.out
b/src/test/regress/expected/inherit.out
index 08495a0c0f5..fd6b24d7d7e 100644
--- a/src/test/regress/expected/inherit.out
+++ b/src/test/regress/expected/inherit.out
@@ -1966,7 +1966,7 @@ update inhpar i set (f1, f2) = (select i.f1, i.f2 || '-'
from int4_tbl limit 1);
Update on public.inhcld2 i_2
-> Explicit Redistribute Motion 3:3 (slice1; segments: 3)
Output: ($2), (($3)::name), ((SubPlan 1 (returns $2,$3) (copy 2))),
i.tableoid, i.ctid, i.gp_segment_id, (DMLAction)
- -> Split
+ -> Split Update
Output: ($2), (($3)::name), ((SubPlan 1 (returns $2,$3) (copy
2))), i.tableoid, i.ctid, i.gp_segment_id, DMLAction
-> Append
-> Seq Scan on public.inhcld1 i_1
diff --git a/src/test/regress/expected/partition_prune.out
b/src/test/regress/expected/partition_prune.out
index 92bcf151721..e4e3b1e464e 100644
--- a/src/test/regress/expected/partition_prune.out
+++ b/src/test/regress/expected/partition_prune.out
@@ -4811,7 +4811,7 @@ explain (costs off) update listp1 set a = 1 where a = 2;
---------------------------------------------------------------
Update on listp1
-> Explicit Redistribute Motion 1:3 (slice1; segments: 1)
- -> Split
+ -> Split Update
-> Seq Scan on listp1
Filter: (a = 2)
Optimizer: Postgres query optimizer
diff --git a/src/test/regress/expected/privileges.out
b/src/test/regress/expected/privileges.out
index b27050ca1b9..7d4396eceb9 100644
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -1023,7 +1023,7 @@ WHEN MATCHED THEN
UPDATE SET b = s.b, a = t.a + 1
WHEN NOT MATCHED THEN
INSERT VALUES (a, b);
-ERROR: permission denied for table mtarget
+ERROR: cannot update column in merge with distributed column
-- fail (no SELECT on t.b)
MERGE INTO mtarget t USING msource s ON t.a = s.a
WHEN MATCHED AND t.b IS NOT NULL THEN
diff --git a/src/test/regress/expected/rowsecurity.out
b/src/test/regress/expected/rowsecurity.out
index 816c3d15c09..03fc362557b 100644
--- a/src/test/regress/expected/rowsecurity.out
+++ b/src/test/regress/expected/rowsecurity.out
@@ -2380,6 +2380,7 @@ WHEN MATCHED THEN
UPDATE SET dnotes = dnotes || ' notes added by merge5 '
WHEN NOT MATCHED THEN
INSERT VALUES (12, 11, 1, 'regress_rls_bob', 'another novel');
+ERROR: duplicate key value violates unique constraint "document_pkey"
-- UPDATE action fails if new row is not visible
MERGE INTO document d
USING (SELECT 1 as sdid) s
@@ -2395,7 +2396,6 @@ ON did = s.sdid
WHEN MATCHED THEN
UPDATE SET dnotes = dnotes || ' notes added by merge7 ',
cid = (SELECT cid from category WHERE cname =
'novel');
-ERROR: new row violates row-level security policy for table "document"
-- OK to insert a new row that is not visible
MERGE INTO document d
USING (SELECT 13 as sdid) s
@@ -2410,8 +2410,8 @@ RESET SESSION AUTHORIZATION;
DROP POLICY p1 ON document;
-- Just check everything went per plan
SELECT * FROM document;
- did | cid | dlevel | dauthor | dtitle |
dnotes
------+-----+--------+-------------------+----------------------------------+-----------------------------------------------------------------------
+ did | cid | dlevel | dauthor | dtitle |
dnotes
+-----+-----+--------+-------------------+----------------------------------+----------------------------------------------------------------------------------------------
5 | 44 | 2 | regress_rls_bob | my second manga |
6 | 22 | 1 | regress_rls_carol | great science fiction |
9 | 22 | 1 | regress_rls_dave | awesome science fiction |
@@ -2419,16 +2419,15 @@ SELECT * FROM document;
11 | 33 | 1 | regress_rls_carol | hoge |
33 | 22 | 1 | regress_rls_bob | okay science fiction |
13 | 44 | 1 | regress_rls_bob | new manga |
+ 78 | 33 | 1 | regress_rls_bob | some technology novel |
+ 79 | 33 | 1 | regress_rls_bob | technology book, can only insert |
+ 12 | 11 | 1 | regress_rls_bob | another novel |
+ 1 | 11 | 1 | regress_rls_bob | my first novel |
notes added by merge2 notes added by merge3 notes added by merge4 notes
added by merge7
3 | 22 | 2 | regress_rls_bob | my science fiction |
7 | 33 | 2 | regress_rls_carol | great technology book |
8 | 44 | 1 | regress_rls_carol | great manga |
2 | 11 | 2 | regress_rls_bob | my first novel |
- 12 | 11 | 1 | regress_rls_bob | another novel |
- 78 | 33 | 1 | regress_rls_bob | some technology novel |
- 79 | 33 | 1 | regress_rls_bob | technology book, can only insert |
- 12 | 11 | 1 | regress_rls_bob | another novel |
- 1 | 11 | 1 | regress_rls_bob | my first novel |
notes added by merge2 notes added by merge3 notes added by merge4
-(16 rows)
+(15 rows)
--
-- ROLE/GROUP
diff --git a/src/test/regress/expected/triggers.out
b/src/test/regress/expected/triggers.out
index e935a29b17a..dceeca83b42 100644
--- a/src/test/regress/expected/triggers.out
+++ b/src/test/regress/expected/triggers.out
@@ -2217,6 +2217,7 @@ ERROR: UPDATE on distributed key column not allowed on
relation with update tri
-- update action in merge should behave the same
merge into parted_trig using (select 1) as ss on true
when matched and a = 2 then update set a = 1;
+ERROR: cannot update column in merge with distributed column
drop table parted_trig;
-- Verify propagation of trigger arguments to partitions
create table parted_trig (a int) partition by list (a);
diff --git a/src/test/regress/expected/updatable_views.out
b/src/test/regress/expected/updatable_views.out
index c49396d0545..d1fb5a61842 100644
--- a/src/test/regress/expected/updatable_views.out
+++ b/src/test/regress/expected/updatable_views.out
@@ -427,7 +427,7 @@ EXPLAIN (costs off) UPDATE rw_view1 SET a=6 WHERE a=5;
---------------------------------------------------------------
Update on base_tbl
-> Explicit Redistribute Motion 1:3 (slice1; segments: 1)
- -> Split
+ -> Split Update
-> Seq Scan on base_tbl
Filter: ((a > 0) AND (a = 5))
Optimizer: Postgres query optimizer
@@ -524,7 +524,7 @@ EXPLAIN (costs off) UPDATE rw_view2 SET aaa=5 WHERE aaa=4;
----------------------------------------------------------------
Update on base_tbl
-> Explicit Redistribute Motion 1:3 (slice1; segments: 1)
- -> Split
+ -> Split Update
-> Seq Scan on base_tbl
Filter: ((a < 10) AND (a > 0) AND (a = 4))
Optimizer: Postgres query optimizer
@@ -2169,7 +2169,7 @@ EXPLAIN (costs off) UPDATE rw_view1 SET a = a + 5;
-----------------------------------------------------------------
Update on base_tbl b
-> Explicit Redistribute Motion 3:3 (slice1; segments: 3)
- -> Split
+ -> Split Update
-> Nested Loop
Join Filter: (b.a = r.a)
-> Seq Scan on base_tbl b
@@ -2839,7 +2839,7 @@ EXPLAIN (COSTS OFF) UPDATE v2 SET a = 1;
InitPlan 1 (returns $0) (slice2)
-> Result
-> Explicit Redistribute Motion 3:3 (slice1; segments: 3)
- -> Split
+ -> Split Update
-> Merge Join
Merge Cond: (t1.a = v1.a)
-> Sort
diff --git a/src/test/regress/expected/update.out
b/src/test/regress/expected/update.out
index ff703938885..b53e3593880 100644
--- a/src/test/regress/expected/update.out
+++ b/src/test/regress/expected/update.out
@@ -177,7 +177,7 @@ UPDATE update_test t
Update on public.update_test t
-> Explicit Redistribute Motion 3:3 (slice1; segments: 3)
Output: ($1), ($2), t.c, ((SubPlan 1 (returns $1,$2))), t.ctid,
t.gp_segment_id, (DMLAction)
- -> Split
+ -> Split Update
Output: ($1), ($2), t.c, ((SubPlan 1 (returns $1,$2))), t.ctid,
t.gp_segment_id, DMLAction
-> Seq Scan on public.update_test t
Output: $1, $2, t.c, (SubPlan 1 (returns $1,$2)), t.ctid,
t.gp_segment_id
diff --git a/src/test/regress/expected/update_gp.out
b/src/test/regress/expected/update_gp.out
index 48e38bc8420..8694dcaa101 100644
--- a/src/test/regress/expected/update_gp.out
+++ b/src/test/regress/expected/update_gp.out
@@ -418,7 +418,7 @@ EXPLAIN (COSTS OFF ) UPDATE tab3 SET C1 = C1 + 1, C5 = C5+1;
---------------------------------------------------------------
Update on tab3
-> Explicit Redistribute Motion 3:3 (slice1; segments: 3)
- -> Split
+ -> Split Update
-> Seq Scan on tab3
Optimizer: Postgres query optimizer
(5 rows)
@@ -676,7 +676,7 @@ explain update nosplitupdate set a=0 where a=1 and a<1;
-----------------------------------------------------------------------------------------------------
Update on nosplitupdate (cost=0.00..516.24 rows=0 width=0)
-> Explicit Redistribute Motion 1:3 (slice1; segments: 1)
(cost=0.00..516.24 rows=37 width=14)
- -> Split (cost=0.00..515.50 rows=37 width=14)
+ -> Split Update (cost=0.00..515.50 rows=37 width=14)
-> Seq Scan on nosplitupdate (cost=0.00..515.50 rows=19
width=14)
Filter: ((a < 1) AND (a = 1))
Optimizer: Postgres query optimizer
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
