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 a7158947eab Fix some answer files
a7158947eab is described below
commit a7158947eab326f4f7aa7beeae76d6ef23782f55
Author: Jinbao Chen <[email protected]>
AuthorDate: Sun Jan 25 23:03:30 2026 +0800
Fix some answer files
---
src/test/regress/expected/bfv_aggregate.out | 4 ++--
src/test/regress/expected/gpsd.out | 20 ++++++--------------
src/test/regress/expected/oid_wraparound.out | 10 ++++++----
src/test/regress/sql/oid_wraparound.sql | 10 ++++++----
4 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/src/test/regress/expected/bfv_aggregate.out
b/src/test/regress/expected/bfv_aggregate.out
index b38871afb89..c21b74f86bf 100644
--- a/src/test/regress/expected/bfv_aggregate.out
+++ b/src/test/regress/expected/bfv_aggregate.out
@@ -1777,9 +1777,9 @@ explain (costs off)
select 1, sum(col1) from group_by_const group by 1;
QUERY PLAN
------------------------------------------------
- Finalize Aggregate
+ Finalize GroupAggregate
-> Gather Motion 3:1 (slice1; segments: 3)
- -> Partial Aggregate
+ -> Partial GroupAggregate
-> Seq Scan on group_by_const
Optimizer: Postgres query optimizer
(5 rows)
diff --git a/src/test/regress/expected/gpsd.out
b/src/test/regress/expected/gpsd.out
index 71ee193381e..3d3cbe0fa4f 100644
--- a/src/test/regress/expected/gpsd.out
+++ b/src/test/regress/expected/gpsd.out
@@ -101,13 +101,9 @@ select
stavalues4,
stavalues5
from pg_statistic where starelid IN ('gpsd_foo'::regclass,
'gpsd_foo_1'::regclass);
- staattnum | stainherit | stanullfrac | stawidth | stadistinct | stakind1 |
stakind2 | stakind3 | stakind4 | stakind5 | staop1 | staop2 | staop3 | staop4 |
staop5 | stacoll1 | stacoll2 | stacoll3 | stacoll4 | stacoll5 | stanumbers1 |
stanumbers2 | stanumbers3 | stanumbers4 | stanumbers5 |
stavalues1 | stavalues2 | stavalues3 | stavalues4 | stavalues5
------------+------------+-------------+----------+-------------+----------+----------+----------+----------+----------+--------+--------+--------+--------+--------+----------+----------+----------+----------+----------+-------------+-------------+-------------+-------------+-------------+------------------------------------------+------------+------------+------------+------------
- 1 | t | 0 | 4 | -1 | 2 |
0 | 0 | 0 | 0 | 97 | 0 | 0 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | |
| | | | {1,2,3,4,5}
| | | |
- 2 | t | 0 | 7 | -1 | 2 |
0 | 0 | 0 | 0 | 664 | 0 | 0 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | |
| | | | {"a \\ and a
\"",i,something,z'world',Ϩ} | | | |
- 1 | f | 0 | 4 | -1 | 2 |
3 | 0 | 0 | 0 | 97 | 97 | 0 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | | {1}
| | | | {1,2,3,4,5}
| | | |
- 2 | f | 0 | 7 | -1 | 2 |
3 | 0 | 0 | 0 | 664 | 664 | 0 | 0 |
0 | 100 | 100 | 0 | 0 | 0 | | {-1}
| | | | {"a \\ and a
\"",i,something,z'world',Ϩ} | | | |
-(4 rows)
+ staattnum | stainherit | stanullfrac | stawidth | stadistinct | stakind1 |
stakind2 | stakind3 | stakind4 | stakind5 | staop1 | staop2 | staop3 | staop4 |
staop5 | stacoll1 | stacoll2 | stacoll3 | stacoll4 | stacoll5 | stanumbers1 |
stanumbers2 | stanumbers3 | stanumbers4 | stanumbers5 | stavalues1 | stavalues2
| stavalues3 | stavalues4 | stavalues5
+-----------+------------+-------------+----------+-------------+----------+----------+----------+----------+----------+--------+--------+--------+--------+--------+----------+----------+----------+----------+----------+-------------+-------------+-------------+-------------+-------------+------------+------------+------------+------------+------------
+(0 rows)
--------------------------------------------------------------------------------
-- Scenario: Table with hll flag
@@ -168,11 +164,7 @@ select
stavalues4,
stavalues5
from pg_statistic where starelid IN ('gpsd_foo'::regclass,
'gpsd_foo_1'::regclass);
- staattnum | stainherit | stanullfrac | stawidth | stadistinct | stakind1 |
stakind2 | stakind3 | stakind4 | stakind5 | staop1 | staop2 | staop3 | staop4 |
staop5 | stacoll1 | stacoll2 | stacoll3 | stacoll4 | stacoll5 | stanumbers1 |
stanumbers2 | stanumbers3 | stanumbers4 | stanumbers5 | stavalues1 | stavalues2
| stavalues3 | stavalues4 |
[...]
------------+------------+-------------+----------+-------------+----------+----------+----------+----------+----------+--------+--------+--------+--------+--------+----------+----------+----------+----------+----------+-------------+-------------+-------------+-------------+-------------+------------+------------+-----------------+------------+--------------------------------------------------------------------------------------------------------------------------------------------------
[...]
- 1 | t | 0 | 4 | -1 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | |
| | | | | |
| |
- 2 | t | 0 | 10 | -1 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | |
| | | | | |
{hello,'world'} | |
- 1 | f | 0 | 4 | -1 | 0 |
0 | 0 | 0 | 99 | 0 | 0 | 0 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | |
| | | | | |
| |
{"\\x0e060200ffffffff0000000001000000010000000000803f0000803f000000000000000000000000000000000000000000000000000000000000000000000000000000000000
[...]
- 2 | f | 0 | 10 | -1 | 0 |
0 | 0 | 0 | 99 | 0 | 0 | 0 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | |
| | | | | |
| |
{"\\x0e060200ffffffff0000000001000000010000000000803f0000803f000000000000000000000000000000000000000000000000000000000000000000000000000000000000
[...]
-(4 rows)
+ staattnum | stainherit | stanullfrac | stawidth | stadistinct | stakind1 |
stakind2 | stakind3 | stakind4 | stakind5 | staop1 | staop2 | staop3 | staop4 |
staop5 | stacoll1 | stacoll2 | stacoll3 | stacoll4 | stacoll5 | stanumbers1 |
stanumbers2 | stanumbers3 | stanumbers4 | stanumbers5 | stavalues1 | stavalues2
| stavalues3 | stavalues4 | stavalues5
+-----------+------------+-------------+----------+-------------+----------+----------+----------+----------+----------+--------+--------+--------+--------+--------+----------+----------+----------+----------+----------+-------------+-------------+-------------+-------------+-------------+------------+------------+------------+------------+------------
+(0 rows)
diff --git a/src/test/regress/expected/oid_wraparound.out
b/src/test/regress/expected/oid_wraparound.out
index b50d3d1eee0..380a17110e0 100644
--- a/src/test/regress/expected/oid_wraparound.out
+++ b/src/test/regress/expected/oid_wraparound.out
@@ -6,21 +6,23 @@ CREATE DATABASE oid_wraparound;
\c oid_wraparound
-- Create the functions that we will be using to set and observe the Oid
counter
-- on the master and the segments.
+\getenv abs_builddir PG_ABS_BUILDDIR
+\set regress_dll :abs_builddir '/regress.so'
CREATE OR REPLACE FUNCTION gp_set_next_oid_master(new_oid Oid)
RETURNS SETOF VOID
- AS '@abs_builddir@/regress.so', 'gp_set_next_oid'
+ AS :'regress_dll', 'gp_set_next_oid'
LANGUAGE C EXECUTE ON COORDINATOR;
CREATE OR REPLACE FUNCTION gp_set_next_oid_segments(new_oid Oid)
RETURNS SETOF VOID
- AS '@abs_builddir@/regress.so', 'gp_set_next_oid'
+ AS :'regress_dll', 'gp_set_next_oid'
LANGUAGE C EXECUTE ON ALL SEGMENTS;
CREATE OR REPLACE FUNCTION gp_get_next_oid_master()
RETURNS SETOF OID
- AS '@abs_builddir@/regress.so', 'gp_get_next_oid'
+ AS :'regress_dll', 'gp_get_next_oid'
LANGUAGE C EXECUTE ON COORDINATOR;
CREATE OR REPLACE FUNCTION gp_get_next_oid_segments()
RETURNS SETOF OID
- AS '@abs_builddir@/regress.so', 'gp_get_next_oid'
+ AS :'regress_dll', 'gp_get_next_oid'
LANGUAGE C EXECUTE ON ALL SEGMENTS;
-- Scenario 1: QD is at 16384 while QE is at 4 billion
SELECT gp_set_next_oid_master(16384);
diff --git a/src/test/regress/sql/oid_wraparound.sql
b/src/test/regress/sql/oid_wraparound.sql
index a4d3f38336e..9f4bc728172 100644
--- a/src/test/regress/sql/oid_wraparound.sql
+++ b/src/test/regress/sql/oid_wraparound.sql
@@ -7,24 +7,26 @@ CREATE DATABASE oid_wraparound;
-- Create the functions that we will be using to set and observe the Oid
counter
-- on the master and the segments.
+\getenv abs_builddir PG_ABS_BUILDDIR
+\set regress_dll :abs_builddir '/regress.so'
CREATE OR REPLACE FUNCTION gp_set_next_oid_master(new_oid Oid)
RETURNS SETOF VOID
- AS '@abs_builddir@/regress.so', 'gp_set_next_oid'
+ AS :'regress_dll', 'gp_set_next_oid'
LANGUAGE C EXECUTE ON COORDINATOR;
CREATE OR REPLACE FUNCTION gp_set_next_oid_segments(new_oid Oid)
RETURNS SETOF VOID
- AS '@abs_builddir@/regress.so', 'gp_set_next_oid'
+ AS :'regress_dll', 'gp_set_next_oid'
LANGUAGE C EXECUTE ON ALL SEGMENTS;
CREATE OR REPLACE FUNCTION gp_get_next_oid_master()
RETURNS SETOF OID
- AS '@abs_builddir@/regress.so', 'gp_get_next_oid'
+ AS :'regress_dll', 'gp_get_next_oid'
LANGUAGE C EXECUTE ON COORDINATOR;
CREATE OR REPLACE FUNCTION gp_get_next_oid_segments()
RETURNS SETOF OID
- AS '@abs_builddir@/regress.so', 'gp_get_next_oid'
+ AS :'regress_dll', 'gp_get_next_oid'
LANGUAGE C EXECUTE ON ALL SEGMENTS;
-- Scenario 1: QD is at 16384 while QE is at 4 billion
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
