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 75e383d8386 Fix answer file for type_sanity/opr_sanity
75e383d8386 is described below
commit 75e383d8386b701d5ff5410a092e4f77ad380f4f
Author: Jinbao Chen <[email protected]>
AuthorDate: Mon Nov 3 11:29:19 2025 +0800
Fix answer file for type_sanity/opr_sanity
---
src/test/regress/expected/opr_sanity.out | 12 +++----
src/test/regress/expected/type_sanity.out | 55 -------------------------------
src/test/regress/sql/type_sanity.sql | 47 --------------------------
3 files changed, 6 insertions(+), 108 deletions(-)
diff --git a/src/test/regress/expected/opr_sanity.out
b/src/test/regress/expected/opr_sanity.out
index f9391af7d87..51aba92a6de 100644
--- a/src/test/regress/expected/opr_sanity.out
+++ b/src/test/regress/expected/opr_sanity.out
@@ -131,10 +131,10 @@ WHERE p1.oid < p2.oid AND
oid | proname | oid | proname
------+--------------------------------+------+--------------------------------
7203 | gp_log_backend_memory_contexts | 7204 | gp_log_backend_memory_contexts
- 6212 | int2_matrix_accum | 6215 | float8_matrix_accum
- 6212 | int2_matrix_accum | 6214 | int8_matrix_accum
- 6213 | int4_matrix_accum | 6215 | float8_matrix_accum
- 6213 | int4_matrix_accum | 6214 | int8_matrix_accum
+ 6405 | int2_matrix_accum | 6414 | float8_matrix_accum
+ 6405 | int2_matrix_accum | 6406 | int8_matrix_accum
+ 6407 | int4_matrix_accum | 6414 | float8_matrix_accum
+ 6406 | int8_matrix_accum | 6407 | int4_matrix_accum
(5 rows)
-- Look for uses of different type OIDs in the argument/result type fields
@@ -886,7 +886,6 @@ macaddr8_ge(macaddr8,macaddr8)
macaddr8_ne(macaddr8,macaddr8)
macaddr8_cmp(macaddr8,macaddr8)
macaddr8(macaddr)
-sm3(bytea)
xid8lt(xid8,xid8)
xid8gt(xid8,xid8)
xid8le(xid8,xid8)
@@ -894,6 +893,7 @@ xid8ge(xid8,xid8)
xid8eq(xid8,xid8)
xid8ne(xid8,xid8)
xid8cmp(xid8,xid8)
+sm3(bytea)
-- restore normal output mode
\a\t
-- List of functions used by libpq's fe-lobj.c
@@ -2274,7 +2274,7 @@ ORDER BY 1, 2, 3;
| record_ops | record_ops | record
| tsquery_ops | tsquery_ops | tsquery
| tsvector_ops | tsvector_ops | tsvector
-(16 rows)
+(17 rows)
-- **************** pg_index ****************
-- Look for illegal values in pg_index fields.
diff --git a/src/test/regress/expected/type_sanity.out
b/src/test/regress/expected/type_sanity.out
index a33ea927779..46ca0d3b3f2 100644
--- a/src/test/regress/expected/type_sanity.out
+++ b/src/test/regress/expected/type_sanity.out
@@ -59,7 +59,6 @@ WHERE (t1.typtype = 'c' AND t1.typrelid = 0) OR
-- Look for types that should have an array type but don't.
-- Generally anything that's not a pseudotype should have an array type.
-- However, we do have a small number of exceptions.
-<<<<<<< HEAD
SELECT p1.oid, p1.typname
FROM pg_type as p1
WHERE p1.typtype not in ('c','d','p') AND p1.typname NOT LIKE E'\\_%'
@@ -69,16 +68,6 @@ WHERE p1.typtype not in ('c','d','p') AND p1.typname NOT
LIKE E'\\_%'
p2.typelem = p1.oid and p1.typarray = p2.oid)
AND typnamespace != (select oid from pg_namespace where
nspname='pg_ext_aux')
ORDER BY p1.oid;
-=======
-SELECT t1.oid, t1.typname
-FROM pg_type as t1
-WHERE t1.typtype not in ('p') AND t1.typname NOT LIKE E'\\_%'
- AND NOT EXISTS
- (SELECT 1 FROM pg_type as t2
- WHERE t2.typname = ('_' || t1.typname)::name AND
- t2.typelem = t1.oid and t1.typarray = t2.oid)
-ORDER BY t1.oid;
->>>>>>> REL_16_9
oid | typname
------+------------------------------
194 | pg_node_tree
@@ -606,7 +595,6 @@ WHERE c1.relnatts != (SELECT count(*) FROM pg_attribute AS
a1
-- Cross-check against pg_type entry
-- NOTE: we allow attstorage to be 'plain' even when typstorage is not;
-- this is mainly for toast tables.
-<<<<<<< HEAD
-- UNDONE: Turn this off until we can figure out why the new system columns
cause a bunch of rows to be generated here???
-- SELECT p1.attrelid, p1.attname, p2.oid, p2.typname
-- FROM pg_attribute AS p1, pg_type AS p2
@@ -615,14 +603,6 @@ WHERE c1.relnatts != (SELECT count(*) FROM pg_attribute AS
a1
-- p1.attalign != p2.typalign OR
-- p1.attbyval != p2.typbyval OR
-- (p1.attstorage != p2.typstorage AND p1.attstorage != 'p'));
-SELECT p1.attrelid, p1.attname, p2.oid, p2.typname
-FROM pg_attribute AS p1, pg_type AS p2
-WHERE p1.atttypid = p2.oid AND
- (p1.attlen != p2.typlen OR
- p1.attalign != p2.typalign OR
- p1.attbyval != p2.typbyval OR
- (p1.attstorage != p2.typstorage AND p1.attstorage != 'p'));
-=======
SELECT a1.attrelid, a1.attname, t1.oid, t1.typname
FROM pg_attribute AS a1, pg_type AS t1
WHERE a1.atttypid = t1.oid AND
@@ -630,7 +610,6 @@ WHERE a1.atttypid = t1.oid AND
a1.attalign != t1.typalign OR
a1.attbyval != t1.typbyval OR
(a1.attstorage != t1.typstorage AND a1.attstorage != 'p'));
->>>>>>> REL_16_9
attrelid | attname | oid | typname
----------+---------+-----+---------
(0 rows)
@@ -695,10 +674,7 @@ WHERE r.rngmultitypid IS NULL OR r.rngmultitypid = 0;
-- Create a table that holds all the known in-core data types and leave it
-- around so as pg_upgrade is able to test their binary compatibility.
CREATE TABLE tab_core_types AS SELECT
-<<<<<<< HEAD
'1 + 2i'::complex,
-=======
->>>>>>> REL_16_9
'(11,12)'::point,
'(1,1),(2,2)'::line,
'((11,11),(12,12))'::lseg,
@@ -753,36 +729,14 @@ CREATE TABLE tab_core_types AS SELECT
'n'::information_schema.sql_identifier,
'now'::information_schema.time_stamp,
'YES'::information_schema.yes_or_no,
-<<<<<<< HEAD
- 'venus'::planets,
- 'i16'::insenum,
'(1,2)'::int4range, '{(1,2)}'::int4multirange,
'(3,4)'::int8range, '{(3,4)}'::int8multirange,
- '(1,2)'::float8range, '{(1,2)}'::float8multirange,
'(3,4)'::numrange, '{(3,4)}'::nummultirange,
- '(a,b)'::textrange, '{(a,b)}'::textmultirange,
- '(12.34, 56.78)'::cashrange, '{(12.34, 56.78)}'::cashmultirange,
-=======
- '(1,2)'::int4range, '{(1,2)}'::int4multirange,
- '(3,4)'::int8range, '{(3,4)}'::int8multirange,
- '(3,4)'::numrange, '{(3,4)}'::nummultirange,
->>>>>>> REL_16_9
'(2020-01-02, 2021-02-03)'::daterange,
'{(2020-01-02, 2021-02-03)}'::datemultirange,
'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tsrange,
'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tsmultirange,
'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tstzrange,
-<<<<<<< HEAD
- '{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tstzmultirange,
- arrayrange(ARRAY[1,2], ARRAY[2,1]),
- arraymultirange(arrayrange(ARRAY[1,2], ARRAY[2,1]));
--- Sanity check on the previous table, checking that all core types are
--- included in this table.
-SELECT oid, typname, typtype, typelem, typarray, typarray
- FROM pg_type t
- WHERE typtype NOT IN ('p', 'c') AND
- -- reg* types cannot be pg_upgraded, so discard them.
-=======
'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tstzmultirange;
-- Sanity check on the previous table, checking that all core types are
-- included in this table.
@@ -792,7 +746,6 @@ SELECT oid, typname, typtype, typelem, typarray
-- Exclude pseudotypes and composite types.
typtype NOT IN ('p', 'c') AND
-- These reg* types cannot be pg_upgraded, so discard them.
->>>>>>> REL_16_9
oid != ALL(ARRAY['regproc', 'regprocedure', 'regoper',
'regoperator', 'regconfig', 'regdictionary',
'regnamespace', 'regcollation']::regtype[]) AND
@@ -803,13 +756,10 @@ SELECT oid, typname, typtype, typelem, typarray
'pg_ndistinct', 'pg_dependencies', 'pg_mcv_list',
'pg_brin_bloom_summary',
'pg_brin_minmax_multi_summary', 'xml']::regtype[]) AND
-<<<<<<< HEAD
-- GPDB_14_MERGE_FIXME: Discard the GP-specific type
gp_hyperloglog_estimator?
oid != 'gp_hyperloglog_estimator'::regtype AND
-- CBDB: ignore types defined in extension namespace
typnamespace != (select oid from pg_namespace where nspname='pg_ext_aux')
AND
-=======
->>>>>>> REL_16_9
-- Discard arrays.
NOT EXISTS (SELECT 1 FROM pg_type u WHERE u.typarray = t.oid)
-- Exclude everything from the table created above. This checks
@@ -819,12 +769,7 @@ SELECT oid, typname, typtype, typelem, typarray
WHERE a.atttypid=t.oid AND
a.attnum > 0 AND
a.attrelid='tab_core_types'::regclass);
-<<<<<<< HEAD
- oid | typname | typtype | typelem | typarray | typarray
------+---------+---------+---------+----------+----------
-=======
oid | typname | typtype | typelem | typarray
-----+---------+---------+---------+----------
->>>>>>> REL_16_9
(0 rows)
diff --git a/src/test/regress/sql/type_sanity.sql
b/src/test/regress/sql/type_sanity.sql
index e107268c590..bce5d0cdb67 100644
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -54,7 +54,6 @@ WHERE (t1.typtype = 'c' AND t1.typrelid = 0) OR
-- Generally anything that's not a pseudotype should have an array type.
-- However, we do have a small number of exceptions.
-<<<<<<< HEAD
SELECT p1.oid, p1.typname
FROM pg_type as p1
WHERE p1.typtype not in ('c','d','p') AND p1.typname NOT LIKE E'\\_%'
@@ -64,16 +63,6 @@ WHERE p1.typtype not in ('c','d','p') AND p1.typname NOT
LIKE E'\\_%'
p2.typelem = p1.oid and p1.typarray = p2.oid)
AND typnamespace != (select oid from pg_namespace where
nspname='pg_ext_aux')
ORDER BY p1.oid;
-=======
-SELECT t1.oid, t1.typname
-FROM pg_type as t1
-WHERE t1.typtype not in ('p') AND t1.typname NOT LIKE E'\\_%'
- AND NOT EXISTS
- (SELECT 1 FROM pg_type as t2
- WHERE t2.typname = ('_' || t1.typname)::name AND
- t2.typelem = t1.oid and t1.typarray = t2.oid)
-ORDER BY t1.oid;
->>>>>>> REL_16_9
-- Make sure typarray points to a "true" array type of our own base
SELECT t1.oid, t1.typname as basetype, t2.typname as arraytype,
@@ -500,23 +489,14 @@ WHERE pronargs != 2
-- every range should have a valid multirange
-<<<<<<< HEAD
-SELECT p1.rngtypid, p1.rngsubtype, p1.rngmultitypid
-FROM pg_range p1
-WHERE p1.rngmultitypid IS NULL OR p1.rngmultitypid = 0;
-=======
SELECT r.rngtypid, r.rngsubtype, r.rngmultitypid
FROM pg_range r
WHERE r.rngmultitypid IS NULL OR r.rngmultitypid = 0;
->>>>>>> REL_16_9
-- Create a table that holds all the known in-core data types and leave it
-- around so as pg_upgrade is able to test their binary compatibility.
CREATE TABLE tab_core_types AS SELECT
-<<<<<<< HEAD
'1 + 2i'::complex,
-=======
->>>>>>> REL_16_9
'(11,12)'::point,
'(1,1),(2,2)'::line,
'((11,11),(12,12))'::lseg,
@@ -571,37 +551,14 @@ CREATE TABLE tab_core_types AS SELECT
'n'::information_schema.sql_identifier,
'now'::information_schema.time_stamp,
'YES'::information_schema.yes_or_no,
-<<<<<<< HEAD
- 'venus'::planets,
- 'i16'::insenum,
- '(1,2)'::int4range, '{(1,2)}'::int4multirange,
- '(3,4)'::int8range, '{(3,4)}'::int8multirange,
- '(1,2)'::float8range, '{(1,2)}'::float8multirange,
- '(3,4)'::numrange, '{(3,4)}'::nummultirange,
- '(a,b)'::textrange, '{(a,b)}'::textmultirange,
- '(12.34, 56.78)'::cashrange, '{(12.34, 56.78)}'::cashmultirange,
-=======
'(1,2)'::int4range, '{(1,2)}'::int4multirange,
'(3,4)'::int8range, '{(3,4)}'::int8multirange,
'(3,4)'::numrange, '{(3,4)}'::nummultirange,
->>>>>>> REL_16_9
'(2020-01-02, 2021-02-03)'::daterange,
'{(2020-01-02, 2021-02-03)}'::datemultirange,
'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tsrange,
'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tsmultirange,
'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tstzrange,
-<<<<<<< HEAD
- '{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tstzmultirange,
- arrayrange(ARRAY[1,2], ARRAY[2,1]),
- arraymultirange(arrayrange(ARRAY[1,2], ARRAY[2,1]));
-
--- Sanity check on the previous table, checking that all core types are
--- included in this table.
-SELECT oid, typname, typtype, typelem, typarray, typarray
- FROM pg_type t
- WHERE typtype NOT IN ('p', 'c') AND
- -- reg* types cannot be pg_upgraded, so discard them.
-=======
'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tstzmultirange;
-- Sanity check on the previous table, checking that all core types are
@@ -612,7 +569,6 @@ SELECT oid, typname, typtype, typelem, typarray
-- Exclude pseudotypes and composite types.
typtype NOT IN ('p', 'c') AND
-- These reg* types cannot be pg_upgraded, so discard them.
->>>>>>> REL_16_9
oid != ALL(ARRAY['regproc', 'regprocedure', 'regoper',
'regoperator', 'regconfig', 'regdictionary',
'regnamespace', 'regcollation']::regtype[]) AND
@@ -623,13 +579,10 @@ SELECT oid, typname, typtype, typelem, typarray
'pg_ndistinct', 'pg_dependencies', 'pg_mcv_list',
'pg_brin_bloom_summary',
'pg_brin_minmax_multi_summary', 'xml']::regtype[]) AND
-<<<<<<< HEAD
-- GPDB_14_MERGE_FIXME: Discard the GP-specific type
gp_hyperloglog_estimator?
oid != 'gp_hyperloglog_estimator'::regtype AND
-- CBDB: ignore types defined in extension namespace
typnamespace != (select oid from pg_namespace where nspname='pg_ext_aux')
AND
-=======
->>>>>>> REL_16_9
-- Discard arrays.
NOT EXISTS (SELECT 1 FROM pg_type u WHERE u.typarray = t.oid)
-- Exclude everything from the table created above. This checks
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
