Bump Citus into 13.1devel

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Citus 13.0.1.
+# Generated by GNU Autoconf 2.69 for Citus 13.1devel.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Citus'
 PACKAGE_TARNAME='citus'
-PACKAGE_VERSION='13.0.1'
-PACKAGE_STRING='Citus 13.0.1'
+PACKAGE_VERSION='13.1devel'
+PACKAGE_STRING='Citus 13.1devel'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1262,7 +1262,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Citus 13.0.1 to adapt to many kinds of systems.
+\`configure' configures Citus 13.1devel to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1324,7 +1324,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Citus 13.0.1:";;
+     short | recursive ) echo "Configuration of Citus 13.1devel:";;
    esac
   cat <<\_ACEOF
 
@@ -1429,7 +1429,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Citus configure 13.0.1
+Citus configure 13.1devel
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1912,7 +1912,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Citus $as_me 13.0.1, which was
+It was created by Citus $as_me 13.1devel, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -5393,7 +5393,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Citus $as_me 13.0.1, which was
+This file was extended by Citus $as_me 13.1devel, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5455,7 +5455,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Citus config.status 13.0.1
+Citus config.status 13.1devel
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -5,7 +5,7 @@
 # everyone needing autoconf installed, the resulting files are checked
 # into the SCM.
 
-AC_INIT([Citus], [13.0.1])
+AC_INIT([Citus], [13.1devel])
 AC_COPYRIGHT([Copyright (c) Citus Data, Inc.])
 
 # we'll need sed and awk for some of the version commands

src/backend/distributed/citus.control

@@ -1,6 +1,6 @@
 # Citus extension
 comment = 'Citus distributed database'
-default_version = '13.0-1'
+default_version = '13.1-1'
 module_pathname = '$libdir/citus'
 relocatable = false
 schema = pg_catalog

src/backend/distributed/sql/citus--12.1-1--12.2-1.sql

@@ -1,49 +0,0 @@
--- citus--12.1-1--12.2-1
--- bump version to 12.2-1
-
-#include "udfs/citus_internal_database_command/12.2-1.sql"
-#include "udfs/citus_add_rebalance_strategy/12.2-1.sql"
-
-DROP FUNCTION pg_catalog.citus_unmark_object_distributed(oid, oid, int);
-#include "udfs/citus_unmark_object_distributed/12.2-1.sql"
-
-ALTER TABLE pg_catalog.pg_dist_transaction ADD COLUMN outer_xid xid8;
-
-#include "udfs/citus_internal_acquire_citus_advisory_object_class_lock/12.2-1.sql"
-
-GRANT USAGE ON SCHEMA citus_internal TO PUBLIC;
-REVOKE ALL ON FUNCTION citus_internal.find_groupid_for_node FROM PUBLIC;
-REVOKE ALL ON FUNCTION citus_internal.pg_dist_node_trigger_func FROM PUBLIC;
-REVOKE ALL ON FUNCTION citus_internal.pg_dist_rebalance_strategy_trigger_func FROM PUBLIC;
-REVOKE ALL ON FUNCTION citus_internal.pg_dist_shard_placement_trigger_func FROM PUBLIC;
-REVOKE ALL ON FUNCTION citus_internal.refresh_isolation_tester_prepared_statement FROM PUBLIC;
-REVOKE ALL ON FUNCTION citus_internal.replace_isolation_tester_func FROM PUBLIC;
-REVOKE ALL ON FUNCTION citus_internal.restore_isolation_tester_func FROM PUBLIC;
-
-#include "udfs/citus_internal_add_colocation_metadata/12.2-1.sql"
-#include "udfs/citus_internal_add_object_metadata/12.2-1.sql"
-#include "udfs/citus_internal_add_partition_metadata/12.2-1.sql"
-#include "udfs/citus_internal_add_placement_metadata/12.2-1.sql"
-#include "udfs/citus_internal_add_shard_metadata/12.2-1.sql"
-#include "udfs/citus_internal_add_tenant_schema/12.2-1.sql"
-#include "udfs/citus_internal_adjust_local_clock_to_remote/12.2-1.sql"
-#include "udfs/citus_internal_delete_colocation_metadata/12.2-1.sql"
-#include "udfs/citus_internal_delete_partition_metadata/12.2-1.sql"
-#include "udfs/citus_internal_delete_placement_metadata/12.2-1.sql"
-#include "udfs/citus_internal_delete_shard_metadata/12.2-1.sql"
-#include "udfs/citus_internal_delete_tenant_schema/12.2-1.sql"
-#include "udfs/citus_internal_local_blocked_processes/12.2-1.sql"
-#include "udfs/citus_internal_global_blocked_processes/12.2-1.sql"
-#include "udfs/citus_blocking_pids/12.2-1.sql"
-#include "udfs/citus_isolation_test_session_is_blocked/12.2-1.sql"
-DROP VIEW IF EXISTS pg_catalog.citus_lock_waits;
-#include "udfs/citus_lock_waits/12.2-1.sql"
-
-#include "udfs/citus_internal_mark_node_not_synced/12.2-1.sql"
-#include "udfs/citus_internal_unregister_tenant_schema_globally/12.2-1.sql"
-#include "udfs/citus_drop_trigger/12.2-1.sql"
-#include "udfs/citus_internal_update_none_dist_table_metadata/12.2-1.sql"
-#include "udfs/citus_internal_update_placement_metadata/12.2-1.sql"
-#include "udfs/citus_internal_update_relation_colocation/12.2-1.sql"
-#include "udfs/repl_origin_helper/12.2-1.sql"
-#include "udfs/citus_finish_pg_upgrade/12.2-1.sql"

src/backend/distributed/sql/citus--13.0-1--13.1-1.sql

@@ -0,0 +1,49 @@
+-- citus--13.0-1--13.1-1
+-- bump version to 13.1-1
+
+#include "udfs/citus_internal_database_command/13.1-1.sql"
+#include "udfs/citus_add_rebalance_strategy/13.1-1.sql"
+
+DROP FUNCTION pg_catalog.citus_unmark_object_distributed(oid, oid, int);
+#include "udfs/citus_unmark_object_distributed/13.1-1.sql"
+
+ALTER TABLE pg_catalog.pg_dist_transaction ADD COLUMN outer_xid xid8;
+
+#include "udfs/citus_internal_acquire_citus_advisory_object_class_lock/13.1-1.sql"
+
+GRANT USAGE ON SCHEMA citus_internal TO PUBLIC;
+REVOKE ALL ON FUNCTION citus_internal.find_groupid_for_node FROM PUBLIC;
+REVOKE ALL ON FUNCTION citus_internal.pg_dist_node_trigger_func FROM PUBLIC;
+REVOKE ALL ON FUNCTION citus_internal.pg_dist_rebalance_strategy_trigger_func FROM PUBLIC;
+REVOKE ALL ON FUNCTION citus_internal.pg_dist_shard_placement_trigger_func FROM PUBLIC;
+REVOKE ALL ON FUNCTION citus_internal.refresh_isolation_tester_prepared_statement FROM PUBLIC;
+REVOKE ALL ON FUNCTION citus_internal.replace_isolation_tester_func FROM PUBLIC;
+REVOKE ALL ON FUNCTION citus_internal.restore_isolation_tester_func FROM PUBLIC;
+
+#include "udfs/citus_internal_add_colocation_metadata/13.1-1.sql"
+#include "udfs/citus_internal_add_object_metadata/13.1-1.sql"
+#include "udfs/citus_internal_add_partition_metadata/13.1-1.sql"
+#include "udfs/citus_internal_add_placement_metadata/13.1-1.sql"
+#include "udfs/citus_internal_add_shard_metadata/13.1-1.sql"
+#include "udfs/citus_internal_add_tenant_schema/13.1-1.sql"
+#include "udfs/citus_internal_adjust_local_clock_to_remote/13.1-1.sql"
+#include "udfs/citus_internal_delete_colocation_metadata/13.1-1.sql"
+#include "udfs/citus_internal_delete_partition_metadata/13.1-1.sql"
+#include "udfs/citus_internal_delete_placement_metadata/13.1-1.sql"
+#include "udfs/citus_internal_delete_shard_metadata/13.1-1.sql"
+#include "udfs/citus_internal_delete_tenant_schema/13.1-1.sql"
+#include "udfs/citus_internal_local_blocked_processes/13.1-1.sql"
+#include "udfs/citus_internal_global_blocked_processes/13.1-1.sql"
+#include "udfs/citus_blocking_pids/13.1-1.sql"
+#include "udfs/citus_isolation_test_session_is_blocked/13.1-1.sql"
+DROP VIEW IF EXISTS pg_catalog.citus_lock_waits;
+#include "udfs/citus_lock_waits/13.1-1.sql"
+
+#include "udfs/citus_internal_mark_node_not_synced/13.1-1.sql"
+#include "udfs/citus_internal_unregister_tenant_schema_globally/13.1-1.sql"
+#include "udfs/citus_drop_trigger/13.1-1.sql"
+#include "udfs/citus_internal_update_none_dist_table_metadata/13.1-1.sql"
+#include "udfs/citus_internal_update_placement_metadata/13.1-1.sql"
+#include "udfs/citus_internal_update_relation_colocation/13.1-1.sql"
+#include "udfs/repl_origin_helper/13.1-1.sql"
+#include "udfs/citus_finish_pg_upgrade/13.1-1.sql"

src/backend/distributed/sql/downgrades/citus--13.1-1--13.0-1.sql

@@ -1,4 +1,4 @@
--- citus--12.2-1--12.1-1
+-- citus--13.1-1--13.0-1
 
 DROP FUNCTION citus_internal.database_command(text);
 DROP FUNCTION citus_internal.acquire_citus_advisory_object_class_lock(int, cstring);

src/include/citus_config.h.in

@@ -46,12 +46,12 @@
 /* Define to 1 if you have the `zstd' library (-lzstd). */
 #undef HAVE_LIBZSTD
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -94,5 +94,7 @@
 /* The size of `void *', as computed by sizeof. */
 #undef SIZEOF_VOID_P
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS

src/test/regress/citus_tests/config.py

@@ -43,7 +43,7 @@ CITUS_ARBITRARY_TEST_DIR = "./tmp_citus_test"
 
 MASTER = "master"
 # This should be updated when citus version changes
-MASTER_VERSION = "13.0"
+MASTER_VERSION = "13.1"
 
 HOME = expanduser("~")
 

src/test/regress/expected/multi_extension.out

@@ -81,7 +81,7 @@ BEGIN
 	FROM current_objects c FULL JOIN prev_objects p
 	ON p.description = c.description
 	WHERE (p.description is null OR c.description is null)
-		  AND c.description IS DISTINCT FROM 'function any_value(anyelement) anyelement'
+          AND c.description IS DISTINCT FROM 'function any_value(anyelement) anyelement'
           AND c.description IS DISTINCT FROM 'function any_value_agg(anyelement,anyelement) anyelement';
 
 	DROP TABLE prev_objects;
@@ -1440,12 +1440,54 @@ SELECT * FROM multi_extension.print_extension_changes();
 ---------------------------------------------------------------------
 (0 rows)
 
+-- Test downgrade to 13.0-1 from 13.1-1
+ALTER EXTENSION citus UPDATE TO '13.1-1';
+ALTER EXTENSION citus UPDATE TO '13.0-1';
+-- Should be empty result since upgrade+downgrade should be a no-op
+SELECT * FROM multi_extension.print_extension_changes();
+ previous_object | current_object
+---------------------------------------------------------------------
+(0 rows)
+
+-- Snapshot of state at 13.1-1
+ALTER EXTENSION citus UPDATE TO '13.1-1';
+SELECT * FROM multi_extension.print_extension_changes();
+                        previous_object                         |                                        current_object
+---------------------------------------------------------------------
+ function citus_unmark_object_distributed(oid,oid,integer) void |
+                                                                | function citus_internal.acquire_citus_advisory_object_class_lock(integer,cstring) void
+                                                                | function citus_internal.add_colocation_metadata(integer,integer,integer,regtype,oid) void
+                                                                | function citus_internal.add_object_metadata(text,text[],text[],integer,integer,boolean) void
+                                                                | function citus_internal.add_partition_metadata(regclass,"char",text,integer,"char") void
+                                                                | function citus_internal.add_placement_metadata(bigint,bigint,integer,bigint) void
+                                                                | function citus_internal.add_shard_metadata(regclass,bigint,"char",text,text) void
+                                                                | function citus_internal.add_tenant_schema(oid,integer) void
+                                                                | function citus_internal.adjust_local_clock_to_remote(cluster_clock) void
+                                                                | function citus_internal.database_command(text) void
+                                                                | function citus_internal.delete_colocation_metadata(integer) void
+                                                                | function citus_internal.delete_partition_metadata(regclass) void
+                                                                | function citus_internal.delete_placement_metadata(bigint) void
+                                                                | function citus_internal.delete_shard_metadata(bigint) void
+                                                                | function citus_internal.delete_tenant_schema(oid) void
+                                                                | function citus_internal.global_blocked_processes() SETOF record
+                                                                | function citus_internal.is_replication_origin_tracking_active() boolean
+                                                                | function citus_internal.local_blocked_processes() SETOF record
+                                                                | function citus_internal.mark_node_not_synced(integer,integer) void
+                                                                | function citus_internal.start_replication_origin_tracking() void
+                                                                | function citus_internal.stop_replication_origin_tracking() void
+                                                                | function citus_internal.unregister_tenant_schema_globally(oid,text) void
+                                                                | function citus_internal.update_none_dist_table_metadata(oid,"char",bigint,boolean) void
+                                                                | function citus_internal.update_placement_metadata(bigint,integer,integer) void
+                                                                | function citus_internal.update_relation_colocation(oid,integer) void
+                                                                | function citus_unmark_object_distributed(oid,oid,integer,boolean) void
+(26 rows)
+
 DROP TABLE multi_extension.prev_objects, multi_extension.extension_diff;
 -- show running version
 SHOW citus.version;
  citus.version
 ---------------------------------------------------------------------
- 13.0.1
+ 13.1devel
 (1 row)
 
 -- ensure no unexpected objects were created outside pg_catalog
@@ -1480,7 +1522,7 @@ DROP EXTENSION citus;
 DROP EXTENSION citus_columnar;
 CREATE EXTENSION citus VERSION '8.0-1';
 ERROR:  specified version incompatible with loaded Citus library
-DETAIL:  Loaded library requires 13.0, but 8.0-1 was specified.
+DETAIL:  Loaded library requires 13.1, but 8.0-1 was specified.
 HINT:  If a newer library is present, restart the database and try the command again.
 -- Test non-distributed queries work even in version mismatch
 SET citus.enable_version_checks TO 'false';
@@ -1525,7 +1567,7 @@ ORDER BY 1;
 -- We should not distribute table in version mistmatch
 SELECT create_distributed_table('version_mismatch_table', 'column1');
 ERROR:  loaded Citus library version differs from installed extension version
-DETAIL:  Loaded library requires 13.0, but the installed extension version is 8.1-1.
+DETAIL:  Loaded library requires 13.1, but the installed extension version is 8.1-1.
 HINT:  Run ALTER EXTENSION citus UPDATE and try again.
 -- This function will cause fail in next ALTER EXTENSION
 CREATE OR REPLACE FUNCTION pg_catalog.relation_is_a_known_shard(regclass)

src/test/regress/sql/multi_extension.sql

@@ -661,6 +661,16 @@ SELECT * FROM multi_extension.print_extension_changes();
 ALTER EXTENSION citus UPDATE TO '13.0-1';
 SELECT * FROM multi_extension.print_extension_changes();
 
+-- Test downgrade to 13.0-1 from 13.1-1
+ALTER EXTENSION citus UPDATE TO '13.1-1';
+ALTER EXTENSION citus UPDATE TO '13.0-1';
+-- Should be empty result since upgrade+downgrade should be a no-op
+SELECT * FROM multi_extension.print_extension_changes();
+
+-- Snapshot of state at 13.1-1
+ALTER EXTENSION citus UPDATE TO '13.1-1';
+SELECT * FROM multi_extension.print_extension_changes();
+
 DROP TABLE multi_extension.prev_objects, multi_extension.extension_diff;
 
 -- show running version