multidb refactor: change ddl handling to be a separate file with it own private data structures

Author: kelvich

Dockerfile

@@ -13,7 +13,7 @@ RUN export USE_PGXS=1 && \
 RUN cp /pg/src/src/test/regress/*.so /pg/install/lib/postgresql/
 USER postgres
 ENV PGDATA /pg/data
-ENTRYPOINT ["/pg/mmts/tests2/docker-entrypoint.sh"]
+ENTRYPOINT ["/pg/mmts/tests/docker-entrypoint.sh"]
 
 EXPOSE 5432
 CMD ["postgres"]

Makefile

@@ -5,7 +5,7 @@ OBJS = src/multimaster.o src/dmq.o src/commit.o src/bytebuf.o src/bgwpool.o \
 src/pglogical_output.o src/pglogical_proto.o src/pglogical_receiver.o \
 src/pglogical_apply.o src/pglogical_hooks.o src/pglogical_config.o \
 src/pglogical_relid_map.o src/ddd.o src/bkb.o src/spill.o src/state.o \
-src/resolver.o
+src/resolver.o src/ddl.o
 MODULE_big = multimaster
 
 ifdef USE_PGXS

multimaster--1.0.sql

@@ -117,13 +117,13 @@ CREATE FUNCTION mtm.make_table_local(relation regclass) RETURNS void
 AS 'MODULE_PATHNAME','mtm_make_table_local'
 LANGUAGE C;
 
-CREATE FUNCTION mtm.broadcast_table(source_table regclass) RETURNS void
-AS 'MODULE_PATHNAME','mtm_broadcast_table'
-LANGUAGE C;
+-- CREATE FUNCTION mtm.broadcast_table(source_table regclass) RETURNS void
+-- AS 'MODULE_PATHNAME','mtm_broadcast_table'
+-- LANGUAGE C;
 
-CREATE FUNCTION mtm.copy_table(source_table regclass, target_node_id integer) RETURNS void
-AS 'MODULE_PATHNAME','mtm_copy_table'
-LANGUAGE C;
+-- CREATE FUNCTION mtm.copy_table(source_table regclass, target_node_id integer) RETURNS void
+-- AS 'MODULE_PATHNAME','mtm_copy_table'
+-- LANGUAGE C;
 
 CREATE FUNCTION mtm.dump_lock_graph() RETURNS text
 AS 'MODULE_PATHNAME','mtm_dump_lock_graph'

reinit-mm.sh

@@ -11,8 +11,8 @@ n_nodes=3
 ulimit -c unlimited
 pkill -9 postgres
 
-cd $BASEDIR
-make install
+# cd $BASEDIR
+# make install
 
 cd $BASEDIR/contrib/mmts
 make clean && make install

src/bkb.c

@@ -10,12 +10,14 @@ typedef struct {
 	int nodes[MAX_NODES];
 } NodeList;
 
-static void list_append(NodeList* list, int n)
+static void
+_list_append(NodeList* list, int n)
 {
 	list->nodes[list->size++] = n;
 }
 
-static void list_copy(NodeList* dst, NodeList const* src)
+static void
+_list_copy(NodeList* dst, NodeList const* src)
 {
 	int i;
 	int n = src->size;
@@ -80,10 +82,10 @@ static void findMaximumIndependentSet(NodeList* cur, NodeList* result, nodemask_
 				newSet[newce++] = oldSet[i];
 			}
 		}
-		list_append(cur, sel);
+		_list_append(cur, sel);
 		if (newce == 0) {
 			if (result->size < cur->size) {
-				list_copy(result, cur);
+				_list_copy(result, cur);
 			}
 		} else if (newne < newce) {
 			if (cur->size + newce - newne > result->size)  {

src/commit.c

@@ -10,14 +10,15 @@
  */
 
 #include "postgres.h"
-#include "multimaster.h"
 #include "storage/proc.h"
 #include "utils/guc.h"
 #include "miscadmin.h"
 #include "commands/dbcommands.h"
 #include "tcop/tcopprot.h"
 
+#include "multimaster.h"
 #include "logger.h"
+#include "ddl.h"
 
 static Oid		MtmDatabaseId;
 static bool		DmqSubscribed;
@@ -64,6 +65,7 @@ MtmBeginTransaction(MtmCurrentTrans* x)
 	x->containsDML = false; // will be set by executor hook
 	x->isTransactionBlock = IsTransactionBlock();
 
+	MtmDDLResetStatement();
 
 	/* XXX: ugly hack with debug_query_string */