logical messages for UtilityStmts; GUC context

kelvich · kelvich · commit de5e166d68e4 · 2016-08-03T11:50:29.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -49,6 +49,7 @@
 #include "replication/walsender.h"
 #include "replication/walsender_private.h"
 #include "replication/slot.h"
+#include "replication/message.h"
 #include "port/atomics.h"
 #include "tcop/utility.h"
 #include "nodes/makefuncs.h"
@@ -235,8 +236,8 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 							 ProcessUtilityContext context, ParamListInfo params,
 							 DestReceiver *dest, char *completionTag);
 
-// static StringInfo	MtmGUCBuffer;
-// static bool			MtmGUCBufferAllocated = false;
+static StringInfo	MtmGUCBuffer;
+static bool			MtmGUCBufferAllocated = false;
 
 /*
  * -------------------------------------------
@@ -2979,53 +2980,55 @@ static void MtmBroadcastUtilityStmt(char const* sql, bool ignoreError)
 	}
 }
 
-static bool MtmProcessDDLCommand(char const* queryString)
-{
-	RangeVar   *rv;
-	Relation	rel;
-	TupleDesc	tupDesc;
-	HeapTuple	tup;
-	Datum		values[Natts_mtm_ddl_log];
-	bool		nulls[Natts_mtm_ddl_log];
-	TimestampTz ts = GetCurrentTimestamp();
-
-	rv = makeRangeVar("public", MULTIMASTER_DDL_TABLE, -1);
-	rel = heap_openrv_extended(rv, RowExclusiveLock, true);
+static void MtmGUCBufferAppend(const char *gucQueryString){
 
-	if (rel == NULL) {
-		if (!MtmIsBroadcast()) {
-			MtmBroadcastUtilityStmt(queryString, false);
-			return true;
-		}
-		return false;
+	if (!MtmGUCBufferAllocated)
+	{
+		MemoryContext oldcontext;
+		oldcontext = MemoryContextSwitchTo(TopMemoryContext);
+		MtmGUCBuffer = makeStringInfo();
+		MemoryContextSwitchTo(oldcontext);
+		MtmGUCBufferAllocated = true;
+		appendStringInfoString(MtmGUCBuffer, "RESET SESSION AUTHORIZATION; reset all;");
 	}
-		
-	tupDesc = RelationGetDescr(rel);
 
-	/* Form a tuple. */
-	memset(nulls, false, sizeof(nulls));
-
-	values[Anum_mtm_ddl_log_issued - 1] = TimestampTzGetDatum(ts);
-	values[Anum_mtm_ddl_log_query - 1] = CStringGetTextDatum(queryString);
+	appendStringInfoString(MtmGUCBuffer, gucQueryString);
+	/* sometimes there is no ';' char at the end. */
+	// appendStringInfoString(MtmGUCBuffer, ";");
+}
 
-	tup = heap_form_tuple(tupDesc, values, nulls);
+static char * MtmGUCBufferGet(void){
+	if (!MtmGUCBufferAllocated)
+		MtmGUCBufferAppend("");
+	return MtmGUCBuffer->data;
+}
 
-	/* Insert the tuple to the catalog. */
-	simple_heap_insert(rel, tup);
+static bool MtmProcessDDLCommand(char const* queryString)
+{
+	char	   *queryWithContext;
+	char	   *gucContext;
 
-	/* Update the indexes. */
-	CatalogUpdateIndexes(rel, tup);
+	/* Append global GUC to utility stmt. */
+	gucContext = MtmGUCBufferGet();
+	if (gucContext)
+	{
+		queryWithContext = palloc(strlen(gucContext) + strlen(queryString) +  1);
+		strcpy(queryWithContext, gucContext);
+		strcat(queryWithContext, queryString);
+	}
+	else
+	{
+		queryWithContext = (char *) queryString;
+	}
 
-	/* Cleanup. */
-	heap_freetuple(tup);
-	heap_close(rel, RowExclusiveLock);
+	MTM_LOG1("Sending utility: %s", queryWithContext);
+	LogLogicalMessage("MTM:GUC", queryWithContext, strlen(queryWithContext), true);
 
 	MtmTx.containsDML = true;
 	return false;
 }
 
 
-
 /*
  * Genenerate global transaction identifier for two-pahse commit.
  * It should be unique for all nodes
@@ -3129,43 +3132,28 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 				DiscardStmt *stmt = (DiscardStmt *) parsetree;
 				skipCommand = stmt->target == DISCARD_TEMP;
 
-				// skipCommand = true;
-
-				// if (MtmGUCBufferAllocated)
-				// {
-				// 	// XXX: move allocation somewhere to backend startup and check
-				// 	// where buffer is empty in send routines.
-				// 	MtmGUCBufferAllocated = false;
-				// 	pfree(MtmGUCBuffer);
-				// }
-
+				if (!IsTransactionBlock())
+				{
+					skipCommand = true;
+					MtmGUCBufferAppend(queryString);
+				}
 			}
 			break;
 		case T_VariableSetStmt:
 			{
 				VariableSetStmt *stmt = (VariableSetStmt *) parsetree;
 
-				skipCommand = true;
+				// skipCommand = true;
 
 				/* Prevent SET TRANSACTION from replication */
 				if (stmt->kind == VAR_SET_MULTI)
-					// break;
 					skipCommand = true;
 
-				// if (!MtmGUCBufferAllocated)
-				// {
-				// 	MemoryContext oldcontext;
-
-				// 	oldcontext = MemoryContextSwitchTo(TopMemoryContext);
-				// 	MtmGUCBuffer = makeStringInfo();
-				// 	MemoryContextSwitchTo(oldcontext);
-				// 	MtmGUCBufferAllocated = true;
-				// }
-
-				// appendStringInfoString(MtmGUCBuffer, queryString);
-
-				// sometimes there is no ';' char at the end.
-				// appendStringInfoString(MtmGUCBuffer, ";");
+				if (!IsTransactionBlock())
+				{
+					skipCommand = true;
+					MtmGUCBufferAppend(queryString);
+				}
 			}
 			break;
 		case T_CreateTableAsStmt:
@@ -3191,7 +3179,8 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 
 				viewParse = parse_analyze((Node *) copyObject(stmt->query),
 										queryString, NULL, 0);
-				skipCommand = isQueryUsingTempRelation(viewParse);
+				skipCommand = isQueryUsingTempRelation(viewParse) ||
+					stmt->view->relpersistence == RELPERSISTENCE_TEMP;
 				// ||
 					// (stmt->relation->schemaname && strcmp(stmt->relation->schemaname, "pg_temp") == 0);
 			}
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/pglogical_apply.c
@@ -70,6 +70,7 @@ static void UserTableUpdateOpenIndexes(EState *estate, TupleTableSlot *slot);
 static void UserTableUpdateIndexes(EState *estate, TupleTableSlot *slot);
 
 static void process_remote_begin(StringInfo s);
+static void process_remote_message(StringInfo s);
 static void process_remote_commit(StringInfo s);
 static void process_remote_insert(StringInfo s, Relation rel);
 static void process_remote_update(StringInfo s, Relation rel);
@@ -338,7 +339,31 @@ process_remote_begin(StringInfo s)
 	StartTransactionCommand();
     MtmJoinTransaction(&gtid, snapshot);
 
-	MTM_LOG3("REMOTE begin node=%d xid=%d snapshot=%ld", gtid.node, gtid.xid, snapshot);
+	MTM_LOG1("REMOTE begin node=%d xid=%d snapshot=%ld", gtid.node, gtid.xid, snapshot);
+}
+
+static void
+process_remote_message(StringInfo s)
+{
+	const char *stmt;
+	int rc;
+
+	stmt = pq_getmsgstring(s);
+	MTM_LOG1("utility: %s", stmt);
+	MTM_LOG3("%d: Execute utility statement %s", MyProcPid, stmt);
+
+	SPI_connect();
+	rc = SPI_execute(stmt, false, 0);
+	SPI_finish();
+	if (rc < 0)
+		elog(ERROR, "Failed to execute utility statement %s", stmt);
+
+	//XXX: create messages for tables localization too.
+	// if (strcmp(relname, MULTIMASTER_LOCAL_TABLES_TABLE) == 0) { 
+	// 	char* schema = TextDatumGetCString(new_tuple.values[Anum_mtm_local_tables_rel_schema-1]);
+	// 	char* name = TextDatumGetCString(new_tuple.values[Anum_mtm_local_tables_rel_name-1]);
+	// 	MtmMakeTableLocal(schema, name);
+	// }
 }
 
 static void
@@ -610,7 +635,6 @@ process_remote_insert(StringInfo s, Relation rel)
 	TupleTableSlot *oldslot;
 	ResultRelInfo *relinfo;
 	ScanKey	*index_keys;
-	char* relname = RelationGetRelationName(rel);
 	int	i;
 
 	estate = create_rel_estate(rel);
@@ -693,22 +717,6 @@ process_remote_insert(StringInfo s, Relation rel)
     FreeExecutorState(estate);
 
 	CommandCounterIncrement();
-
-	if (strcmp(relname, MULTIMASTER_DDL_TABLE) == 0) { 
-		char* ddl = TextDatumGetCString(new_tuple.values[Anum_mtm_ddl_log_query-1]);
-		int rc;
-		SPI_connect();
-		MTM_LOG3("%d: Execute utility statement %s", MyProcPid, ddl);
-		rc = SPI_execute(ddl, false, 0);
-        SPI_finish();
-		if (rc < 0)
-			elog(ERROR, "Failed to execute utility statement %s", ddl);
-	} else if (strcmp(relname, MULTIMASTER_LOCAL_TABLES_TABLE) == 0) { 
-		char* schema = TextDatumGetCString(new_tuple.values[Anum_mtm_local_tables_rel_schema-1]);
-		char* name = TextDatumGetCString(new_tuple.values[Anum_mtm_local_tables_rel_name-1]);
-		MtmMakeTableLocal(schema, name);
-	}
-
 }
 
 static void
@@ -987,6 +995,11 @@ void MtmExecutor(int id, void* work, size_t size)
 				s.len = save_len;
 				continue;
 			}
+			case 'G':
+			{
+				process_remote_message(&s);
+				continue;
+			}
             default:
                 elog(ERROR, "unknown action of type %c", action);
             }        
diff --git a/contrib/mmts/pglogical_output.c b/contrib/mmts/pglogical_output.c
@@ -33,6 +33,7 @@
 
 #include "replication/output_plugin.h"
 #include "replication/logical.h"
+#include "replication/message.h"
 #include "replication/origin.h"
 
 #include "utils/builtins.h"
@@ -64,6 +65,11 @@ static void pg_decode_change(LogicalDecodingContext *ctx,
 static bool pg_decode_origin_filter(LogicalDecodingContext *ctx,
 						RepOriginId origin_id);
 
+static void pg_decode_message(LogicalDecodingContext *ctx,
+							  ReorderBufferTXN *txn, XLogRecPtr message_lsn,
+							  bool transactional, const char *prefix,
+							  Size sz, const char *message);
+
 static void send_startup_message(LogicalDecodingContext *ctx,
 		PGLogicalOutputData *data, bool last_message);
 
@@ -81,6 +87,7 @@ _PG_output_plugin_init(OutputPluginCallbacks *cb)
 	cb->commit_cb = pg_decode_commit_txn;
 	cb->filter_by_origin_cb = pg_decode_origin_filter;
 	cb->shutdown_cb = pg_decode_shutdown;
+	cb->message_cb = pg_decode_message;
 }
 
 static bool
@@ -499,6 +506,18 @@ pg_decode_origin_filter(LogicalDecodingContext *ctx,
 	return false;
 }
 
+static void
+pg_decode_message(LogicalDecodingContext *ctx,
+				  ReorderBufferTXN *txn, XLogRecPtr lsn, bool transactional,
+				  const char *prefix, Size sz, const char *message)
+{
+	PGLogicalOutputData* data = (PGLogicalOutputData*)ctx->output_plugin_private;
+
+	OutputPluginPrepareWrite(ctx, true);
+	data->api->write_message(ctx->out, prefix, sz, message);
+	OutputPluginWrite(ctx, true);
+}
+
 static void
 send_startup_message(LogicalDecodingContext *ctx,
 		PGLogicalOutputData *data, bool last_message)
diff --git a/contrib/mmts/pglogical_proto.c b/contrib/mmts/pglogical_proto.c
@@ -119,6 +119,15 @@ pglogical_write_begin(StringInfo out, PGLogicalOutputData *data,
 	}
 }
 
+static void
+pglogical_write_message(StringInfo out,
+					const char *prefix, Size sz, const char *message)
+{
+	pq_sendbyte(out, 'G');
+	pq_sendbytes(out, message, sz);
+	pq_sendbyte(out, '\0');
+}
+
 /*
  * Write COMMIT to the output stream.
  */
@@ -429,6 +438,7 @@ pglogical_init_api(PGLogicalProtoType typ)
 	MTM_LOG1("%d: PRGLOGICAL init API for slot %s node %d", MyProcPid, MyReplicationSlot->data.name.data, MtmReplicationNodeId);
     res->write_rel = pglogical_write_rel;
     res->write_begin = pglogical_write_begin;
+	res->write_message = pglogical_write_message;
     res->write_commit = pglogical_write_commit;
     res->write_insert = pglogical_write_insert;
     res->write_update = pglogical_write_update;
diff --git a/contrib/mmts/pglogical_proto.h b/contrib/mmts/pglogical_proto.h
@@ -21,6 +21,8 @@ typedef void (*pglogical_write_rel_fn)(StringInfo out, struct PGLogicalOutputDat
 
 typedef void (*pglogical_write_begin_fn)(StringInfo out, struct PGLogicalOutputData *data,
 							 ReorderBufferTXN *txn);
+typedef void (*pglogical_write_message_fn)(StringInfo out,
+					const char *prefix, Size sz, const char *message);
 typedef void (*pglogical_write_commit_fn)(StringInfo out, struct PGLogicalOutputData *data,
 							 ReorderBufferTXN *txn, XLogRecPtr commit_lsn);
 
@@ -43,6 +45,7 @@ typedef struct PGLogicalProtoAPI
 {
 	pglogical_write_rel_fn		write_rel;
 	pglogical_write_begin_fn	write_begin;
+	pglogical_write_message_fn	write_message;
 	pglogical_write_commit_fn	write_commit;
 	pglogical_write_origin_fn	write_origin;
 	pglogical_write_insert_fn	write_insert;
