moving tsdtm in core

Author: kelvich

contrib/pg_tsdtm/pg_tsdtm.c

@@ -12,7 +12,7 @@ DATA = postgres_fdw--1.0.sql
 
 REGRESS = postgres_fdw
 
-EXTRA_INSTALL += contrib/pg_tsdtm
+# EXTRA_INSTALL += contrib/pg_tsdtm
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config

contrib/postgres_fdw/Makefile

@@ -450,13 +450,15 @@ begin_remote_xact(ConnCacheEntry *entry)
 		elog(DEBUG3, "starting remote transaction on connection %p",
 			 entry->conn);
 
-		if (UseTsDtmTransactions && TransactionIdIsValid(gxid))
-		{
-			char	stmt[64];
-			snprintf(stmt, sizeof(stmt), "select public.dtm_join_transaction(%d)", gxid);
-			res = PQexec(entry->conn, stmt);
-			PQclear(res);
-		}
+		// XXXX?
+		//
+		// if (UseTsDtmTransactions && TransactionIdIsValid(gxid))
+		// {
+		// 	char	stmt[64];
+		// 	snprintf(stmt, sizeof(stmt), "select public.dtm_join_transaction(%d)", gxid);
+		// 	res = PQexec(entry->conn, stmt);
+		// 	PQclear(res);
+		// }
 
 		if (IsolationIsSerializable())
 			sql = "START TRANSACTION ISOLATION LEVEL SERIALIZABLE";
@@ -478,7 +480,7 @@ begin_remote_xact(ConnCacheEntry *entry)
 				if (!currentGlobalTransactionId)
 				{
 					char	   *resp;
-					res = PQexec(currentConnection, psprintf("SELECT public.dtm_extend('%d.%d')",
+					res = PQexec(currentConnection, psprintf("SELECT public.pg_global_snaphot_create('%d.%d')",
 															 MyProcPid, ++currentLocalTransactionId));
 
 					if (PQresultStatus(res) != PGRES_TUPLES_OK)
@@ -492,7 +494,7 @@ begin_remote_xact(ConnCacheEntry *entry)
 					}
 					PQclear(res);
 				}
-				res = PQexec(entry->conn, psprintf("SELECT public.dtm_access(%llu, '%d.%d')", currentGlobalTransactionId, MyProcPid, currentLocalTransactionId));
+				res = PQexec(entry->conn, psprintf("SELECT public.pg_global_snaphot_join(%llu, '%d.%d')", currentGlobalTransactionId, MyProcPid, currentLocalTransactionId));
 
 				if (PQresultStatus(res) != PGRES_TUPLES_OK)
 				{
@@ -817,11 +819,11 @@ pgfdw_xact_callback(XactEvent event, void *arg)
 
 					if (!RunDtmCommand(psprintf("PREPARE TRANSACTION '%d.%d'",
 									MyProcPid, currentLocalTransactionId)) ||
-						!RunDtmFunction(psprintf("SELECT public.dtm_begin_prepare('%d.%d')",
+						!RunDtmFunction(psprintf("SELECT public.pg_global_snaphot_begin_prepare('%d.%d')",
 									MyProcPid, currentLocalTransactionId)) ||
-						!RunDtmStatement(psprintf("SELECT public.dtm_prepare('%d.%d',0)",
+						!RunDtmStatement(psprintf("SELECT public.pg_global_snaphot_prepare('%d.%d',0)",
 												  MyProcPid, currentLocalTransactionId), PGRES_TUPLES_OK, DtmMaxCSN, &maxCSN) ||
-						!RunDtmFunction(psprintf("SELECT public.dtm_end_prepare('%d.%d',%lld)",
+						!RunDtmFunction(psprintf("SELECT public.pg_global_snaphot_end_prepare('%d.%d',%lld)",
 							MyProcPid, currentLocalTransactionId, maxCSN)) ||
 						!RunDtmCommand(psprintf("COMMIT PREPARED '%d.%d'",
 									  MyProcPid, currentLocalTransactionId)))

contrib/postgres_fdw/connection.c

@@ -49,13 +49,13 @@
 	$master->psql('postgres', "CREATE FOREIGN TABLE accounts_fdw_$port() inherits (accounts) server shard_$port options(table_name 'accounts')");
 	$master->psql('postgres', "CREATE USER MAPPING for stas SERVER shard_$port options (user 'stas')");
 
-	diag("done $host $port");
+	# diag("done $host $port");
 }
 
 $shard1->psql('postgres', "insert into accounts select 2*id-1, 0 from generate_series(1, 10010) as id;");
 $shard2->psql('postgres', "insert into accounts select 2*id, 0 from generate_series(1, 10010) as id;");
 
-diag( $master->connstr() );
+# diag( $master->connstr() );
 # sleep(3600);
 
 ###############################################################################
@@ -81,7 +81,7 @@
 		$oldtotal = $total;
 		diag("Isolation error. Total = $total");
 	}
-	diag("Total = $total");
+	# diag("Total = $total");
 }
 
 $master->pgbench_await($pgb_handle);

contrib/postgres_fdw/t/001_bank_check.pl

@@ -15,7 +15,7 @@ include $(top_builddir)/src/Makefile.global
 OBJS = clog.o commit_ts.o generic_xlog.o multixact.o parallel.o rmgr.o slru.o \
 	subtrans.o timeline.o transam.o twophase.o twophase_rmgr.o varsup.o \
 	xact.o xlog.o xlogarchive.o xlogfuncs.o \
-	xloginsert.o xlogreader.o xlogutils.o xtm.o
+	xloginsert.o xlogreader.o xlogutils.o xtm.o global_snapshot.o
 
 include $(top_srcdir)/src/backend/common.mk