diff --git a/citus.control b/citus.control index 23d7b6735..4cd20fec5 100644 --- a/citus.control +++ b/citus.control @@ -1,6 +1,6 @@ # Citus extension comment = 'Citus distributed database' -default_version = '7.5-4' +default_version = '7.5-5' module_pathname = '$libdir/citus' relocatable = false schema = pg_catalog diff --git a/src/backend/distributed/Makefile b/src/backend/distributed/Makefile index 9af4c21d4..36ae6baa6 100644 --- a/src/backend/distributed/Makefile +++ b/src/backend/distributed/Makefile @@ -16,7 +16,7 @@ EXTVERSIONS = 5.0 5.0-1 5.0-2 \ 7.2-1 7.2-2 7.2-3 \ 7.3-1 7.3-2 7.3-3 \ 7.4-1 7.4-2 7.4-3 \ - 7.5-1 7.5-2 7.5-3 7.5-4 + 7.5-1 7.5-2 7.5-3 7.5-4 7.5-5 # All citus--*.sql files in the source directory DATA = $(patsubst $(citus_abs_srcdir)/%.sql,%.sql,$(wildcard $(citus_abs_srcdir)/$(EXTENSION)--*--*.sql)) @@ -208,6 +208,8 @@ $(EXTENSION)--7.5-3.sql: $(EXTENSION)--7.5-2.sql $(EXTENSION)--7.5-2--7.5-3.sql cat $^ > $@ $(EXTENSION)--7.5-4.sql: $(EXTENSION)--7.5-3.sql $(EXTENSION)--7.5-3--7.5-4.sql cat $^ > $@ +$(EXTENSION)--7.5-5.sql: $(EXTENSION)--7.5-4.sql $(EXTENSION)--7.5-4--7.5-5.sql + cat $^ > $@ NO_PGXS = 1 diff --git a/src/backend/distributed/citus--7.5-4--7.5-5.sql b/src/backend/distributed/citus--7.5-4--7.5-5.sql new file mode 100644 index 000000000..f76a4165f --- /dev/null +++ b/src/backend/distributed/citus--7.5-4--7.5-5.sql @@ -0,0 +1,34 @@ +/* citus--7.5-4--7.5-5 */ +CREATE FUNCTION pg_catalog.citus_executor_name(executor_type int) +RETURNS TEXT +LANGUAGE plpgsql +AS $function$ +BEGIN + IF (executor_type = 1) THEN + RETURN 'real-time'; + ELSIF (executor_type = 2) THEN + RETURN 'task-tracker'; + ELSIF (executor_type = 3) THEN + RETURN 'router'; + ELSIF (executor_type = 4) THEN + RETURN 'insert-select'; + ELSE + RETURN 'unknown'; + END IF; +END; +$function$; + +DROP VIEW pg_catalog.citus_stat_statements; + +CREATE VIEW citus.citus_stat_statements AS +SELECT + queryid, + userid, + dbid, + query, + pg_catalog.citus_executor_name(executor::int) AS executor, + partition_key, + calls +FROM pg_catalog.citus_stat_statements(); +ALTER VIEW citus.citus_stat_statements SET SCHEMA pg_catalog; +GRANT SELECT ON pg_catalog.citus_stat_statements TO public; diff --git a/src/backend/distributed/citus.control b/src/backend/distributed/citus.control index 23d7b6735..4cd20fec5 100644 --- a/src/backend/distributed/citus.control +++ b/src/backend/distributed/citus.control @@ -1,6 +1,6 @@ # Citus extension comment = 'Citus distributed database' -default_version = '7.5-4' +default_version = '7.5-5' module_pathname = '$libdir/citus' relocatable = false schema = pg_catalog diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index a023f1b71..4b2a35c4a 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -139,6 +139,8 @@ ALTER EXTENSION citus UPDATE TO '7.4-3'; ALTER EXTENSION citus UPDATE TO '7.5-1'; ALTER EXTENSION citus UPDATE TO '7.5-2'; ALTER EXTENSION citus UPDATE TO '7.5-3'; +ALTER EXTENSION citus UPDATE TO '7.5-4'; +ALTER EXTENSION citus UPDATE TO '7.5-5'; -- show running version SHOW citus.version; citus.version diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql index a427a1926..6c9ee33ea 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -139,6 +139,8 @@ ALTER EXTENSION citus UPDATE TO '7.4-3'; ALTER EXTENSION citus UPDATE TO '7.5-1'; ALTER EXTENSION citus UPDATE TO '7.5-2'; ALTER EXTENSION citus UPDATE TO '7.5-3'; +ALTER EXTENSION citus UPDATE TO '7.5-4'; +ALTER EXTENSION citus UPDATE TO '7.5-5'; -- show running version SHOW citus.version;