test updates

citusdata · Nov 5, 2024 · 6d63b9c · 6d63b9c
1 parent fd66a7d
commit 6d63b9c
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 19 deletions.
diff --git a/.devcontainer/.psqlrc b/.devcontainer/.psqlrc
@@ -3,5 +3,5 @@
 \pset border 2
 \setenv PAGER 'pspg --no-mouse -bX --no-commandbar --no-topbar'
 \set HISTSIZE 100000
-\set PROMPT1 '\n%[%033[1m%]%M %n@%/:%>-%p%R%[%033[0m%]%# '
+\set PROMPT1 '\n%[%033[1m%]%M %n@%/:%> (PID: %p)%R%[%033[0m%]%# '
 \set PROMPT2 '  '
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -103,18 +103,6 @@ RUN mkdir .pgenv-staging/
 RUN cp -r .pgenv/src .pgenv/pgsql-* .pgenv/config .pgenv-staging/
 RUN rm .pgenv-staging/config/default.conf
 
-FROM base AS pg17
-RUN MAKEFLAGS="-j $(nproc)" pgenv build 17beta2
-RUN rm .pgenv/src/*.tar*
-RUN make -C .pgenv/src/postgresql-*/ clean
-RUN make -C .pgenv/src/postgresql-*/src/include install
-
-# create a staging directory with all files we want to copy from our pgenv build
-# we will copy the contents of the staged folder into the final image at once
-RUN mkdir .pgenv-staging/
-RUN cp -r .pgenv/src .pgenv/pgsql-* .pgenv/config .pgenv-staging/
-RUN rm .pgenv-staging/config/default.conf
-
 FROM base AS uncrustify-builder
 
 RUN sudo apt update && sudo apt install -y cmake tree

diff --git a/.gitignore b/.gitignore
@@ -58,3 +58,6 @@ lib*.pc
 
 # added output when modifying check_gucs_are_alphabetically_sorted.sh
 guc.out
+
+mehmet*
+*_logfile
diff --git a/citus-tools b/citus-tools
diff --git a/src/test/regress/expected/ch_bench_having_mx.out b/src/test/regress/expected/ch_bench_having_mx.out
@@ -1,3 +1,8 @@
+-- Two alternative test outputs:
+-- ch_bench_having_mx.out for PG16 and before
+-- ch_bench_having_mx_0.out for PG17
+-- related commit
+-- https://github.com/postgres/postgres/commit/fd0398fc
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1640000;
 SET citus.shard_replication_factor to 1;
 SET citus.shard_count to 4;

diff --git a/src/test/regress/expected/multi_extension_0.out b/src/test/regress/expected/multi_extension_0.out
@@ -748,6 +748,20 @@ SELECT * FROM multi_extension.print_extension_changes();
                                                                                       | table columnar.chunk_group
                                                                                       | table columnar.options
                                                                                       | table columnar.stripe
+                                                                                      | type citus_shards
+                                                                                      | type citus_shards[]
+                                                                                      | type columnar.chunk
+                                                                                      | type columnar.chunk[]
+                                                                                      | type columnar.chunk_group
+                                                                                      | type columnar.chunk_group[]
+                                                                                      | type columnar.options
+                                                                                      | type columnar.options[]
+                                                                                      | type columnar.stripe
+                                                                                      | type columnar.stripe[]
+                                                                                      | type public.citus_tables
+                                                                                      | type public.citus_tables[]
+                                                                                      | type time_partitions
+                                                                                      | type time_partitions[]
                                                                                       | view citus_shards
                                                                                       | view public.citus_tables
                                                                                       | view time_partitions
@@ -765,9 +779,13 @@ ALTER EXTENSION citus UPDATE TO '10.0-4';
 SELECT * FROM multi_extension.print_extension_changes();
       previous_object      |   current_object
 ---------------------------------------------------------------------
- view public.citus_tables  |
-                           | view citus_tables
-(2 rows)
+ type public.citus_tables    |
+ type public.citus_tables[]  |
+ view public.citus_tables    |
+                             | type citus_tables
+                             | type citus_tables[]
+                             | view citus_tables
+(6 rows)
 
 -- recreate public schema, and recreate citus_tables in the public schema by default
 CREATE SCHEMA public;
@@ -785,9 +803,13 @@ ALTER EXTENSION citus UPDATE TO '10.0-4';
 SELECT * FROM multi_extension.print_extension_changes();
   previous_object   |      current_object
 ---------------------------------------------------------------------
- view citus_tables  |
-                    | view public.citus_tables
-(2 rows)
+ type citus_tables    |
+ type citus_tables[]  |
+ view citus_tables    |
+                      | type public.citus_tables
+                      | type public.citus_tables[]
+                      | view public.citus_tables
+(6 rows)
 
 -- not print "HINT: " to hide current lib version
 \set VERBOSITY terse
@@ -1078,6 +1100,10 @@ SELECT * FROM multi_extension.print_extension_changes();
  function master_get_table_metadata(text) record                                                                      |
  function worker_partition_query_result(text,text,integer,citus.distribution_type,text[],text[],boolean) SETOF record |
  table citus.pg_dist_object                                                                                           |
+ type citus.pg_dist_object                                                                                            |
+ type citus.pg_dist_object[]                                                                                          |
+ type citus_worker_stat_activity                                                                                      |
+ type citus_worker_stat_activity[]                                                                                    |
  view citus_worker_stat_activity                                                                                      |
                                                                                                                       | function citus_backend_gpid() bigint
                                                                                                                       | function citus_calculate_gpid(integer,integer) bigint

diff --git a/src/test/regress/expected/multi_mx_router_planner.out b/src/test/regress/expected/multi_mx_router_planner.out
@@ -1,3 +1,6 @@
+-- Two alternative test outputs:
+-- multi_mx_router_planner.out for PG16 and before
+-- multi_mx_router_planner_0.out for PG17
 -- ===================================================================
 -- test router planner functionality for single shard select queries
 -- ===================================================================
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,3 +58,6 @@ lib*.pc @@
     # added output when modifying check_gucs_are_alphabetically_sorted.sh
     guc.out
+    mehmet*
+    *_logfile