improve

src/test/regress/expected/upgrade_basic_after.out

@@ -9,36 +9,6 @@ SELECT * FROM pg_indexes WHERE schemaname = 'upgrade_basic' and tablename NOT LI
  upgrade_basic | tp        | tp_pkey   |            | CREATE UNIQUE INDEX tp_pkey ON upgrade_basic.tp USING btree (a)
 (3 rows)
 
-SELECT nextval('pg_dist_shardid_seq') > MAX(shardid) FROM pg_dist_shard;
- ?column?
----------------------------------------------------------------------
- t
-(1 row)
-
-SELECT nextval('pg_dist_placement_placementid_seq') > MAX(placementid) FROM pg_dist_placement;
- ?column?
----------------------------------------------------------------------
- t
-(1 row)
-
-SELECT nextval('pg_dist_groupid_seq') > MAX(groupid) FROM pg_dist_node;
- ?column?
----------------------------------------------------------------------
- t
-(1 row)
-
-SELECT nextval('pg_dist_node_nodeid_seq') > MAX(nodeid) FROM pg_dist_node;
- ?column?
----------------------------------------------------------------------
- t
-(1 row)
-
-SELECT nextval('pg_dist_colocationid_seq') > MAX(colocationid) FROM pg_dist_colocation;
- ?column?
----------------------------------------------------------------------
- t
-(1 row)
-
 SELECT logicalrelid FROM pg_dist_partition
   JOIN pg_depend ON logicalrelid=objid
   JOIN pg_catalog.pg_class ON logicalrelid=oid
@@ -344,4 +314,3 @@ FROM pg_dist_partition WHERE partkey IS NOT NULL ORDER BY 1 LIMIT 1;
 ---------------------------------------------------------------------
  a
 (1 row)
-

src/test/regress/expected/upgrade_basic_after_non_mixed.out

@@ -1,3 +1,33 @@
+SELECT nextval('pg_dist_shardid_seq') > MAX(shardid) FROM pg_dist_shard;
+ ?column?
+---------------------------------------------------------------------
+ t
+(1 row)
+
+SELECT nextval('pg_dist_placement_placementid_seq') > MAX(placementid) FROM pg_dist_placement;
+ ?column?
+---------------------------------------------------------------------
+ t
+(1 row)
+
+SELECT nextval('pg_dist_groupid_seq') > MAX(groupid) FROM pg_dist_node;
+ ?column?
+---------------------------------------------------------------------
+ t
+(1 row)
+
+SELECT nextval('pg_dist_node_nodeid_seq') > MAX(nodeid) FROM pg_dist_node;
+ ?column?
+---------------------------------------------------------------------
+ t
+(1 row)
+
+SELECT nextval('pg_dist_colocationid_seq') > MAX(colocationid) FROM pg_dist_colocation;
+ ?column?
+---------------------------------------------------------------------
+ t
+(1 row)
+
 -- while testing sequences on pg_dist_cleanup, they return null in pg upgrade schedule
 -- but return a valid value in citus upgrade schedule
 -- that's why we accept both NULL and MAX()+1 here
@@ -61,4 +91,3 @@ SELECT sequence_name FROM information_schema.sequences
  sequence_name
 ---------------------------------------------------------------------
 (0 rows)
-

src/test/regress/sql/upgrade_basic_after.sql

@@ -3,12 +3,6 @@ BEGIN;
 -- We have the tablename filter to avoid adding an alternative output for when the coordinator is in metadata vs when not
 SELECT * FROM pg_indexes WHERE schemaname = 'upgrade_basic' and tablename NOT LIKE 'r_%' ORDER BY tablename;
 
-SELECT nextval('pg_dist_shardid_seq') > MAX(shardid) FROM pg_dist_shard;
-SELECT nextval('pg_dist_placement_placementid_seq') > MAX(placementid) FROM pg_dist_placement;
-SELECT nextval('pg_dist_groupid_seq') > MAX(groupid) FROM pg_dist_node;
-SELECT nextval('pg_dist_node_nodeid_seq') > MAX(nodeid) FROM pg_dist_node;
-SELECT nextval('pg_dist_colocationid_seq') > MAX(colocationid) FROM pg_dist_colocation;
-
 SELECT logicalrelid FROM pg_dist_partition
   JOIN pg_depend ON logicalrelid=objid
   JOIN pg_catalog.pg_class ON logicalrelid=oid

src/test/regress/sql/upgrade_basic_after_non_mixed.sql

@@ -1,3 +1,9 @@
+SELECT nextval('pg_dist_shardid_seq') > MAX(shardid) FROM pg_dist_shard;
+SELECT nextval('pg_dist_placement_placementid_seq') > MAX(placementid) FROM pg_dist_placement;
+SELECT nextval('pg_dist_groupid_seq') > MAX(groupid) FROM pg_dist_node;
+SELECT nextval('pg_dist_node_nodeid_seq') > MAX(nodeid) FROM pg_dist_node;
+SELECT nextval('pg_dist_colocationid_seq') > MAX(colocationid) FROM pg_dist_colocation;
+
 -- while testing sequences on pg_dist_cleanup, they return null in pg upgrade schedule
 -- but return a valid value in citus upgrade schedule
 -- that's why we accept both NULL and MAX()+1 here