Merge branch 'broadcast' of https://git.postgrespro.ru/a.sher/pg_shardman into broadcast

Author: knizhnik

.gitignore

@@ -1,7 +1,6 @@
 *.o
 *.so
 .dir-locals.el
-pg_shardman*.sql
 bin/setup.sh
 
 *.pyc

Makefile

@@ -1,32 +1,44 @@
 # the extension name
 EXTENSION = pg_shardman
-EXTVERSION = 1.0
+EXTVERSION = 0.0.2
 # This file will be executed by CREATE EXTENSION, so let pgxs install it.
 DATA = $(EXTENSION)--$(EXTVERSION).sql
 
+REGRESS = shardman_installation
+
 MODULE_big = pg_shardman
 OBJS = pg_shardman.o
 PGFILEDESC = "pg_shardman - sharding for Postgres"
 
-ifdef USE_SOURCETREE # assume the extension is in contrib/ dir of pg distribution
-PG_CPPFLAGS = -I$(libpq_srcdir)
-SHLIB_LINK = $(libpq)
-SHLIB_PREREQS = submake-libpq
-subdir = contrib/pg_shardman
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-else # use pgxs
+mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) # abs path to this makefile
+mkfile_dir := $(shell basename $(dir $(mkfile_path))) # parent dir of the project
+ifndef USE_PGXS # hmm, user didn't requested to use pgxs
+ifneq ($(mkfile_dir),contrib) # a-ha, but we are not inside 'contrib' dir
+USE_PGXS := 1 # so use it anyway, most probably that's use user wants
+endif
+endif
+
+ifdef USE_PGXS # use pgxs
 # You can specify path to pg_config in PG_CONFIG var
 ifndef PG_CONFIG
 	PG_CONFIG := pg_config
 endif
 PG_CONFIG = pg_config
-
 INCLUDEDIR := $(shell $(PG_CONFIG) --includedir)
 PG_CPPFLAGS += -I$(INCLUDEDIR) # add server's include directory for libpq-fe.h
 SHLIB_LINK += -lpq # add libpq
-
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
+
+else # assume the extension is in contrib/ dir of pg distribution
+PG_CPPFLAGS = -I$(libpq_srcdir) # include libpq-fe, defined in Makefile.global.in
+SHLIB_LINK = $(libpq) # defined in Makefile.global.in
+SHLIB_PREREQS = submake-libpq
+subdir = contrib/pg_shardman
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
 endif
+
+python_tests:
+	$(MAKE) -C tests/python

expected/shardman_installation.out

@@ -0,0 +1,5 @@
+\set VERBOSITY terse
+CREATE EXTENSION pg_shardman CASCADE;
+NOTICE:  installing required extension "pg_pathman"
+NOTICE:  installing required extension "postgres_fdw"
+DROP EXTENSION pg_shardman CASCADE;

pg_shardman--1.0.sql renamed to pg_shardman--0.0.2.sql

@@ -59,7 +59,7 @@ CREATE TABLE replicas (
 -- * It allows to set up pgbouncer, as replication can't go through it.
 -- If conn_string is null, super_conn_string is used everywhere.
 CREATE FUNCTION add_node(super_conn_string text, conn_string text = NULL,
-						 repl_group text = 'default') RETURNS void AS $$
+						 repl_group text = 'default') RETURNS int AS $$
 DECLARE
 	new_node_id int;
 	system_id bigint;
@@ -90,11 +90,14 @@ DECLARE
 	master_node_id int;
 	sys_id bigint;
 	conn_string_effective text = COALESCE(conn_string, super_conn_string);
+	redirected bool;
 BEGIN
-	IF shardman.redirect_to_shardlord(
+	SELECT * FROM shardman.redirect_to_shardlord_with_res(
 		format('add_node(%L, %L, %L)', super_conn_string, conn_string, repl_group))
+					  INTO new_node_id, redirected;
+	IF redirected
 	THEN
-		RETURN;
+		RETURN new_node_id;
 	END IF;
 
 	-- Insert new node in nodes table
@@ -237,6 +240,8 @@ BEGIN
 	PERFORM shardman.broadcast(create_rules);
 	-- Broadcast create subscriptions for shared tables
 	PERFORM shardman.broadcast(subs, super_connstr => true);
+
+	RETURN new_node_id;
 END
 $$ LANGUAGE plpgsql;
 
@@ -353,7 +358,7 @@ BEGIN
 	    PERFORM shardman.broadcast(conf, ignore_errors:=true, super_connstr => true);
 	END IF;
 /* To correctly remove foreign servers we need to update pf_depend table, otherwise
- * our hack with direct update pg_foreign_table leaves deteriorated dependencies 
+ * our hack with direct update pg_foreign_table leaves deteriorated dependencies
 	-- Remove foreign servers at all nodes for the removed node
     FOR node IN SELECT * FROM shardman.nodes WHERE id<>rm_node_id
 	LOOP
@@ -467,6 +472,10 @@ BEGIN
 		RAISE EXCEPTION 'Table % is already sharded', rel_name;
 	END IF;
 
+	IF (SELECT count(*) FROM shardman.nodes) = 0 THEN
+		RAISE EXCEPTION 'Please add some nodes first';
+	END IF;
+
 	-- Generate SQL statement creating this table
 	SELECT shardman.gen_create_table_sql(rel_name) INTO create_table;
 
@@ -1005,7 +1014,7 @@ $$ LANGUAGE plpgsql;
 
 
 -- Move replica to other node. This function is able to move replica only within replication group.
--- It initiates copying data to new replica, disables logical replication to original replica, 
+-- It initiates copying data to new replica, disables logical replication to original replica,
 -- waits completion of initial table sync and then removes old replica.
 CREATE FUNCTION mv_replica(mv_part_name text, src_node_id int, dst_node_id int)
 RETURNS void AS $$
@@ -1243,7 +1252,7 @@ BEGIN
 					PERFORM shardman.broadcast(format('%s:CREATE FOREIGN TABLE %I %s SERVER %s OPTIONS (table_name %L);',
 						src_node.id, fdw_part_name, table_attrs, srv_name, part.part_name));
 				ELSIF shardman.not_exists(src_node.id, format('pg_class c,pg_foreign_table f,pg_foreign_server s WHERE c.oid=f.ftrelid AND c.relname=%L AND f.ftserver=s.oid AND s.srvname = %L', fdw_part_name, srv_name))
-				THEN 
+				THEN
 					RAISE NOTICE 'Bind foreign table % to server % at node %', fdw_part_name, srv_name, src_node.id;
 					PERFORM shardman.broadcast(format('%s:UPDATE pg_foreign_table SET ftserver = (SELECT oid FROM pg_foreign_server WHERE srvname = %L) WHERE ftrelid = (SELECT oid FROM pg_class WHERE relname=%L);',
 						src_node.id, srv_name, fdw_part_name));
@@ -1550,17 +1559,26 @@ END
 $$ LANGUAGE plpgsql;
 
 -- Execute command at shardlord
-CREATE FUNCTION redirect_to_shardlord(cmd text) RETURNS bool AS $$
+CREATE FUNCTION redirect_to_shardlord_with_res(cmd text, out res int,
+											   out redirected bool) AS $$
 BEGIN
 	IF NOT shardman.is_shardlord() THEN
 	    RAISE NOTICE 'Redirect command "%" to shardlord',cmd;
-		PERFORM shardman.broadcast(format('0:SELECT shardman.%s;', cmd));
-		RETURN true;
+		res = (shardman.broadcast(format('0:SELECT shardman.%s;', cmd)))::int;
+		redirected = true;
 	ELSE
-		RETURN false;
+		redirected = false;
 	END IF;
 END
 $$ LANGUAGE plpgsql;
+-- same, but don't care for the result -- to avoid changing all calls to
+-- redirect_to_shardlord to '.redirected'
+CREATE FUNCTION redirect_to_shardlord(cmd text) RETURNS bool AS $$
+DECLARE
+BEGIN
+	RETURN redirected FROM shardman.redirect_to_shardlord_with_res(cmd);
+END
+$$ LANGUAGE plpgsql;
 
 
 -- Generate based on information from catalog SQL statement creating this table

pg_shardman.c

@@ -104,6 +104,9 @@ wait_command_completion(PGconn* conn)
 		int wc = WaitLatchOrSocket(MyLatch,
 								   WL_LATCH_SET | WL_SOCKET_READABLE,
 								   PQsocket(conn),
+#if defined (PGPRO_EE)
+								   false,
+#endif
 								   -1L, PG_WAIT_EXTENSION);
 		ResetLatch(MyLatch);
 

pg_shardman.control

@@ -1,6 +1,6 @@
 comment = 'Postgresql sharding via pg_pathman, postgres_fdw, LR and others'
 # CREATE EXTENSION will run extname--version.sql file
-default_version = '1.0'
+default_version = '0.0.2'
 # TODO: make ext relocatable at least during installation. For that, we need to
 # * learn the scheme when connecting from another node
 # * add @extschema@ to search path where needed, e.g. in all trigger funcs

postgresql.conf.common

@@ -1,5 +1,7 @@
 shared_preload_libraries = 'pg_pathman'
 
+shardman.shardlord_connstring = 'port=5432' # shardlord's connstring
+
 # a bit usual performance-related settings
 shared_buffers = 512MB
 effective_cache_size = 512MB

postgresql.conf.worker

@@ -22,9 +22,8 @@ synchronous_commit = on
 # for 2pc
 max_prepared_transactions = 1000
 postgres_fdw.use_2pc = on
-# only for testing performace; setting this to 'on' violates visibilitys
+# only for testing performace; setting this to 'on' violates visibility
 postgres_fdw.use_repeatable_read = off
 
-shardman.shardlord_connstring = 'port=5432' # shardlord's connstring
 # This node is shardlord?
 shardman.shardlord = off

readme.md

@@ -321,7 +321,7 @@ Below goes full list of commands.
 ### Membership
 
 ```plpgsql
-add_node(super_conn_string text, conn_string text = NULL, repl_group text = 'default')
+add_node(super_conn_string text, conn_string text = NULL, repl_group text = 'default') returns int
 ```
 Add node with given libpq connstring(s) to the cluster. Node is assigned unique
 id. If node previously contained shardman state from old cluster (not one
@@ -343,6 +343,8 @@ We don't move any parts and replicas to newly added node, see `rebalance_*`
 commands for that below. However, freshly added node instantly becomes aware
 of sharded tables and can accept queries to them.
 
+Returns id of the new node.
+
 ```plpgsql
 get_my_id()
 ```

run_shardlord.py

@@ -0,0 +1,4 @@
+\set VERBOSITY terse
+
+CREATE EXTENSION pg_shardman CASCADE;
+DROP EXTENSION pg_shardman CASCADE;

sql/shardman_installation.sql

@@ -0,0 +1,2 @@
+all:
+	python3 -m unittest tests.py -v -f