Merge branch 'xtm' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into xtm

Author: kvap

contrib/multimaster/Makefile

@@ -1,10 +1,10 @@
 MODULE_big = multimaster
-OBJS = multimaster.o receiver_raw.o decoder_raw.o libdtm.o bytebuf.o bgwpool.o sockhub/sockhub.o
-
+OBJS = multimaster.o libdtm.o bytebuf.o bgwpool.o sockhub/sockhub.o pglogical_output.o pglogical_proto.o pglogical_receiver.o pglogical_apply.o pglogical_hooks.o pglogical_config.o
+#OBJS = multimaster.o pglogical_receiver.o decoder_raw.o libdtm.o bytebuf.o bgwpool.o sockhub/sockhub.o
 EXTENSION = multimaster
 DATA = multimaster--1.0.sql
 
-PG_CPPFLAGS = -I$(libpq_srcdir)
+PG_CPPFLAGS = -I$(libpq_srcdir) -DUSE_PGLOGICAL_OUTPUT
 SHLIB_LINK = $(libpq)
 
 ifdef USE_PGXS

contrib/multimaster/Makefile.old

@@ -0,0 +1,19 @@
+MODULE_big = multimaster
+OBJS = multimaster.o pglogical_receiver.o decoder_raw.o libdtm.o bytebuf.o bgwpool.o sockhub/sockhub.o
+EXTENSION = multimaster
+DATA = multimaster--1.0.sql
+
+PG_CPPFLAGS = -I$(libpq_srcdir)
+SHLIB_LINK = $(libpq)
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = contrib/multimaster
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
+

contrib/multimaster/multimaster.c

@@ -28,7 +28,6 @@
 #include "access/xlog.h"
 #include "storage/proc.h"
 #include "storage/procarray.h"
-#include "executor/spi.h"
 #include "executor/executor.h"
 #include "access/twophase.h"
 #include "utils/guc.h"
@@ -104,7 +103,6 @@ static void DtmShmemStartup(void);
 static void DtmBackgroundWorker(Datum arg);
 
 static void MMMarkTransAsLocal(TransactionId xid);
-static void MMExecutor(int id, void* work, size_t size);
 static BgwPool* MMPoolConstructor(void);
 
 static shmem_startup_hook_type prev_shmem_startup_hook;
@@ -1185,48 +1183,7 @@ MMExecutorFinish(QueryDesc *queryDesc)
     {
         standard_ExecutorFinish(queryDesc);
     }
-}
-        
-static void MMExecutor(int id, void* work, size_t size)
-{
-    TransactionId xid = *(TransactionId*)work;
-    char* stmts = (char*)work + 4;
-    bool finished = false;
-
-    MMJoinTransaction(xid);
-
-    SetCurrentStatementStartTimestamp();               
-    StartTransactionCommand();
-    SPI_connect();
-    PushActiveSnapshot(GetTransactionSnapshot());
-
-    PG_TRY();
-    {
-        int rc = SPI_execute(stmts, false, 0);
-        SPI_finish();
-        PopActiveSnapshot();
-        finished = true;
-        if (rc != SPI_OK_INSERT && rc != SPI_OK_UPDATE && rc != SPI_OK_DELETE) {
-            ereport(LOG, (errmsg("Executor %d: failed to apply transaction %u",
-                                 id, xid)));
-            AbortCurrentTransaction();
-        } else { 
-            CommitTransactionCommand();
-        }
-    }
-    PG_CATCH();
-    {
-        FlushErrorState();
-        if (!finished) {
-            SPI_finish();
-            if (ActiveSnapshotSet()) { 
-                PopActiveSnapshot();
-            }
-        }
-        AbortCurrentTransaction();
-    }
-    PG_END_TRY();
-}
+}        
 
 extern void MMExecute(void* work, int size)
 {

contrib/multimaster/multimaster.h

@@ -13,6 +13,7 @@ extern void MMJoinTransaction(TransactionId xid);
 extern bool MMIsLocalTransaction(TransactionId xid);
 extern void MMReceiverStarted(void);
 extern void MMExecute(void* work, int size);
+extern void MMExecutor(int id, void* work, size_t size);
 
 extern char* MMDatabaseName;