Global snapshots in postgres_fdw cosmetic improvements.

arssher · arssher · commit bf4902697a3c · 2018-09-20T10:57:58.000+03:00
* s/snaphot/snapshot adapted. * GUC renamed from postgres_fdw.use_tsdtm to postgres_fdw.use_global_snapshots. * Set track_global_snapshots = true in tests everywhere. * Makefile niceties. * 003_bank_shared.pl test is removed. In current shape it is useless, and if we bombard both nodes, deadlock surely appears. In general, global snaphots are not needed for such multimaster-like setup -- either there are no conflicts and we are fine, or there is a conflict, in which case we get a deadlock. (cherry picked from commit e73c9b6)
diff --git a/contrib/postgres_fdw/Makefile b/contrib/postgres_fdw/Makefile
@@ -24,8 +24,11 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
+# Global makefile will do temp-install for 'check'. Since REGRESS is defined,
+# PGXS (included from contrib-global.mk or directly) will care to add
+# postgres_fdw to it as EXTRA_INSTALL and build pg_regress. It will also
+# actually run pg_regress, so the only thing left is tap tests.
 check: tapcheck
 
-tapcheck:
-	env DESTDIR='$(abs_top_builddir)'/tmp_install $(MAKE) install
+tapcheck: temp-install
 	$(prove_check)
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
@@ -505,7 +505,7 @@ begin_remote_xact(ConnCacheEntry *entry)
 				fdwTransState->global_csn = ExportGlobalSnapshot();
 
 			snprintf(import_sql, sizeof(import_sql),
-				"SELECT pg_global_snaphot_import("UINT64_FORMAT")",
+				"SELECT pg_global_snapshot_import("UINT64_FORMAT")",
 				fdwTransState->global_csn);
 
 			do_sql_command(entry, import_sql);
@@ -857,11 +857,11 @@ pgfdw_xact_callback(XactEvent event, void *arg)
 			if (!res)
 				goto error;
 
-			/* Broadcast pg_global_snaphot_prepare() */
+			/* Broadcast pg_global_snapshot_prepare() */
 			if (include_local_tx)
 				my_csn = GlobalSnapshotPrepareCurrent();
 
-			sql = psprintf("SELECT pg_global_snaphot_prepare('%s')",
+			sql = psprintf("SELECT pg_global_snapshot_prepare('%s')",
 														fdwTransState->gid);
 			res = BroadcastStmt(sql, PGRES_TUPLES_OK, MaxCsnCB, &max_csn);
 			if (!res)
@@ -871,10 +871,10 @@ pgfdw_xact_callback(XactEvent event, void *arg)
 			if (include_local_tx && my_csn > max_csn)
 				max_csn = my_csn;
 
-			/* Broadcast pg_global_snaphot_assign() */
+			/* Broadcast pg_global_snapshot_assign() */
 			if (include_local_tx)
 				GlobalSnapshotAssignCsnCurrent(max_csn);
-			sql = psprintf("SELECT pg_global_snaphot_assign('%s',"UINT64_FORMAT")",
+			sql = psprintf("SELECT pg_global_snapshot_assign('%s',"UINT64_FORMAT")",
 							fdwTransState->gid, max_csn);
 			res = BroadcastFunc(sql);
 
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
@@ -5825,7 +5825,7 @@ find_em_expr_for_rel(EquivalenceClass *ec, RelOptInfo *rel)
 void
 _PG_init(void)
 {
-	DefineCustomBoolVariable("postgres_fdw.use_tsdtm",
+	DefineCustomBoolVariable("postgres_fdw.use_global_snapshots",
 							 "Use global snapshots for FDW transactions", NULL,
 							 &UseGlobalSnapshots, false, PGC_USERSET, 0, NULL,
 							 NULL, NULL);
diff --git a/contrib/postgres_fdw/t/001_bank_coordinator.pl b/contrib/postgres_fdw/t/001_bank_coordinator.pl
@@ -10,7 +10,8 @@
 $master->append_conf('postgresql.conf', qq(
 	max_prepared_transactions = 30
 	log_checkpoints = true
-	postgres_fdw.use_tsdtm = on
+	postgres_fdw.use_global_snapshots = on
+	track_global_snapshots = on
 ));
 $master->start;
 
diff --git a/contrib/postgres_fdw/t/002_bank_participant.pl b/contrib/postgres_fdw/t/002_bank_participant.pl
@@ -9,7 +9,7 @@
 $shard1->init;
 $shard1->append_conf('postgresql.conf', qq(
 	max_prepared_transactions = 30
-	postgres_fdw.use_tsdtm = on
+	postgres_fdw.use_global_snapshots = on
 	global_snapshot_defer_time = 15
 	track_global_snapshots = on
 ));
@@ -19,7 +19,7 @@
 $shard2->init;
 $shard2->append_conf('postgresql.conf', qq(
 	max_prepared_transactions = 30
-	postgres_fdw.use_tsdtm = on
+	postgres_fdw.use_global_snapshots = on
 	global_snapshot_defer_time = 15
 	track_global_snapshots = on
 ));
diff --git a/contrib/postgres_fdw/t/003_bank_shared.pl b/contrib/postgres_fdw/t/003_bank_shared.pl

Original file line number	Diff line number	Diff line change
`@@ -5825,7 +5825,7 @@ find_em_expr_for_rel(EquivalenceClass ec, RelOptInfo rel)`
`5825`	`5825`	`void`
`5826`	`5826`	`_PG_init(void)`
`5827`	`5827`	`{`
`5828`		`- DefineCustomBoolVariable("postgres_fdw.use_tsdtm",`
	`5828`	`+ DefineCustomBoolVariable("postgres_fdw.use_global_snapshots",`
`5829`	`5829`	`"Use global snapshots for FDW transactions", NULL,`
`5830`	`5830`	`&UseGlobalSnapshots, false, PGC_USERSET, 0, NULL,`
`5831`	`5831`	`NULL, NULL);`