Merge pull request #2266 from citusdata/landlord_base

Make citus_stat_statements_reset() super user function

citus.control

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

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-5
+	7.5-1 7.5-2 7.5-3 7.5-4 7.5-5 7.5-6
 
 # All citus--*.sql files in the source directory
 DATA = $(patsubst $(citus_abs_srcdir)/%.sql,%.sql,$(wildcard $(citus_abs_srcdir)/$(EXTENSION)--*--*.sql))
@@ -210,6 +210,8 @@ $(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 $^ > $@
+$(EXTENSION)--7.5-6.sql: $(EXTENSION)--7.5-5.sql $(EXTENSION)--7.5-5--7.5-6.sql
+	cat $^ > $@
 
 NO_PGXS = 1
 

src/backend/distributed/citus--7.5-5--7.5-6.sql

@@ -0,0 +1,4 @@
+/* citus--7.5-5--7.5-6 */
+
+-- Don't want this to be available to non-superusers.
+REVOKE ALL ON FUNCTION pg_catalog.citus_stat_statements_reset() FROM PUBLIC;

src/backend/distributed/citus.control

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

src/test/regress/expected/multi_extension.out

@@ -141,6 +141,7 @@ 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';
+ALTER EXTENSION citus UPDATE TO '7.5-6';
 -- show running version
 SHOW citus.version;
  citus.version 

src/test/regress/expected/multi_multiuser.out

@@ -210,6 +210,8 @@ BEGIN;
 SELECT create_intermediate_result('topten', 'SELECT count(*) FROM test');
 ERROR:  permission denied for table test
 ABORT;
+SELECT * FROM citus_stat_statements_reset();
+ERROR:  permission denied for function citus_stat_statements_reset
 RESET ROLE;
 DROP TABLE test;
 DROP USER full_access;

src/test/regress/expected/multi_multiuser_0.out

@@ -210,6 +210,8 @@ BEGIN;
 SELECT create_intermediate_result('topten', 'SELECT count(*) FROM test');
 ERROR:  permission denied for relation test
 ABORT;
+SELECT * FROM citus_stat_statements_reset();
+ERROR:  permission denied for function citus_stat_statements_reset
 RESET ROLE;
 DROP TABLE test;
 DROP USER full_access;

src/test/regress/sql/multi_extension.sql

@@ -141,6 +141,7 @@ 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';
+ALTER EXTENSION citus UPDATE TO '7.5-6';
 
 -- show running version
 SHOW citus.version;

src/test/regress/sql/multi_multiuser.sql

@@ -136,6 +136,8 @@ BEGIN;
 SELECT create_intermediate_result('topten', 'SELECT count(*) FROM test');
 ABORT;
 
+SELECT * FROM citus_stat_statements_reset();
+
 RESET ROLE;
 
 DROP TABLE test;