From d4c4eaa9ff9a287985e55924af82471a374f708e Mon Sep 17 00:00:00 2001
From: Metin Doslu <metin@citusdata.com>
Date: Wed, 1 Jun 2016 16:07:25 +0300
Subject: [PATCH] Move master_update_shard_statistics() to pg_catalog

Fixes #546
---
 src/backend/distributed/Makefile                | 4 +++-
 src/backend/distributed/citus--5.1-2--5.1-3.sql | 8 ++++++++
 src/backend/distributed/citus.control           | 2 +-
 src/test/regress/expected/multi_extension.out   | 1 +
 src/test/regress/sql/multi_extension.sql        | 1 +
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 src/backend/distributed/citus--5.1-2--5.1-3.sql

diff --git a/src/backend/distributed/Makefile b/src/backend/distributed/Makefile
index e2f9b578a..f946adadd 100644
--- a/src/backend/distributed/Makefile
+++ b/src/backend/distributed/Makefile
@@ -6,7 +6,7 @@ citus_top_builddir = ../../..
 MODULE_big = citus
 EXTENSION = citus
 EXTVERSIONS = 5.0 5.0-1 5.0-2  \
-	5.1-1 5.1-2
+	5.1-1 5.1-2 5.1-3
 
 # All citus--*.sql files in the source directory
 DATA = $(patsubst $(citus_abs_srcdir)/%.sql,%.sql,$(wildcard $(citus_abs_srcdir)/$(EXTENSION)--*--*.sql))
@@ -37,6 +37,8 @@ $(EXTENSION)--5.1-1.sql: $(EXTENSION)--5.0-2.sql $(EXTENSION)--5.0-2--5.1-1.sql
 	cat $^ > $@
 $(EXTENSION)--5.1-2.sql: $(EXTENSION)--5.1-1.sql $(EXTENSION)--5.1-1--5.1-2.sql
 	cat $^ > $@
+$(EXTENSION)--5.1-3.sql: $(EXTENSION)--5.1-2.sql $(EXTENSION)--5.1-2--5.1-3.sql
+	cat $^ > $@
 	
 NO_PGXS = 1
 
diff --git a/src/backend/distributed/citus--5.1-2--5.1-3.sql b/src/backend/distributed/citus--5.1-2--5.1-3.sql
new file mode 100644
index 000000000..2a6a8bdce
--- /dev/null
+++ b/src/backend/distributed/citus--5.1-2--5.1-3.sql
@@ -0,0 +1,8 @@
+DROP FUNCTION master_update_shard_statistics(shard_id bigint);
+
+CREATE FUNCTION pg_catalog.master_update_shard_statistics(shard_id bigint)
+    RETURNS bigint
+    LANGUAGE C STRICT
+    AS 'MODULE_PATHNAME', $$master_update_shard_statistics$$;
+COMMENT ON FUNCTION master_update_shard_statistics(bigint)
+    IS 'updates shard statistics and returns the updated shard size';
diff --git a/src/backend/distributed/citus.control b/src/backend/distributed/citus.control
index 76ff52de4..f85970f23 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 = '5.1-2'
+default_version = '5.1-3'
 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 15ae05798..4983208f6 100644
--- a/src/test/regress/expected/multi_extension.out
+++ b/src/test/regress/expected/multi_extension.out
@@ -14,6 +14,7 @@ ALTER EXTENSION citus UPDATE TO '5.0-1';
 ALTER EXTENSION citus UPDATE TO '5.0-2';
 ALTER EXTENSION citus UPDATE TO '5.1-1';
 ALTER EXTENSION citus UPDATE TO '5.1-2';
+ALTER EXTENSION citus UPDATE TO '5.1-3';
 -- drop extension an re-create in newest version
 DROP EXTENSION citus;
 \c
diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql
index dc3030a55..0d33a0b82 100644
--- a/src/test/regress/sql/multi_extension.sql
+++ b/src/test/regress/sql/multi_extension.sql
@@ -16,6 +16,7 @@ ALTER EXTENSION citus UPDATE TO '5.0-1';
 ALTER EXTENSION citus UPDATE TO '5.0-2';
 ALTER EXTENSION citus UPDATE TO '5.1-1';
 ALTER EXTENSION citus UPDATE TO '5.1-2';
+ALTER EXTENSION citus UPDATE TO '5.1-3';
 
 -- drop extension an re-create in newest version
 DROP EXTENSION citus;