Port multimaster sequence AM to pg-10

Author: kelvich

multimaster.c

@@ -290,7 +290,7 @@ static ExecutorStart_hook_type PreviousExecutorStartHook;
 static ExecutorFinish_hook_type PreviousExecutorFinishHook;
 static ProcessUtility_hook_type PreviousProcessUtilityHook;
 static shmem_startup_hook_type PreviousShmemStartupHook;
-// static seq_nextval_hook_t PreviousSeqNextvalHook;
+static seq_nextval_hook_t PreviousSeqNextvalHook;
 
 static void MtmExecutorStart(QueryDesc *queryDesc, int eflags);
 static void MtmExecutorFinish(QueryDesc *queryDesc);
@@ -3390,8 +3390,8 @@ _PG_init(void)
 	PreviousProcessUtilityHook = ProcessUtility_hook;
 	ProcessUtility_hook = MtmProcessUtility;
 
-	// PreviousSeqNextvalHook = SeqNextvalHook;
-	// SeqNextvalHook = MtmSeqNextvalHook;
+	PreviousSeqNextvalHook = SeqNextvalHook;
+	SeqNextvalHook = MtmSeqNextvalHook;
 }
 
 /*
@@ -3403,7 +3403,7 @@ _PG_fini(void)
 	shmem_startup_hook = PreviousShmemStartupHook;
 	ExecutorFinish_hook = PreviousExecutorFinishHook;
 	ProcessUtility_hook = PreviousProcessUtilityHook;
-	// SeqNextvalHook = PreviousSeqNextvalHook;
+	SeqNextvalHook = PreviousSeqNextvalHook;
 }
 
 
@@ -5089,7 +5089,33 @@ static bool MtmFunctionProfileDependsOnTempTable(CreateFunctionStmt* func)
 	return false;
 }
 
+static void
+AdjustCreateSequence(List *options)
+{
+	bool has_increment = false, has_start = false;
+	ListCell   *option;
+
+	foreach(option, options)
+	{
+		DefElem    *defel = (DefElem *) lfirst(option);
+		if (strcmp(defel->defname, "increment") == 0)
+			has_increment = true;
+		else if (strcmp(defel->defname, "start") == 0)
+			has_start = true;
+	}
 
+	if (!has_increment)
+	{
+		DefElem *defel = makeDefElem("increment", (Node *) makeInteger(MtmMaxNodes), -1);
+		options = lappend(options, defel);
+	}
+
+	if (!has_start)
+	{
+		DefElem *defel = makeDefElem("start", (Node *) makeInteger(MtmNodeId), -1);
+		options = lappend(options, defel);
+	}
+}
 
 static void MtmProcessUtility(PlannedStmt *pstmt,
 										  const char *queryString, ProcessUtilityContext context,
@@ -5162,6 +5188,13 @@ static void MtmProcessUtility(PlannedStmt *pstmt,
 			elog(ERROR, "Multimaster doesn't support creating and dropping databases");
 			break;
 
+		case T_CreateSeqStmt:
+			{
+				CreateSeqStmt *stmt = (CreateSeqStmt *) parsetree;
+				AdjustCreateSequence(stmt->options);
+			}
+			break;
+
 		case T_CreateTableSpaceStmt:
 		case T_DropTableSpaceStmt:
 			{

pglogical_apply.c

@@ -1274,18 +1274,18 @@ void MtmExecutor(void* work, size_t size)
 				s.len = save_len;
 				break;
 			}
-			// case 'N':
-			// {
-			// 	int64 next;
-			// 	Oid relid;
-			// 	Assert(rel != NULL);
-			// 	relid = RelationGetRelid(rel);
-			// 	close_rel(rel);
-			// 	rel = NULL;
-			// 	next = pq_getmsgint64(&s);
-			// 	AdjustSequence(relid, next);
-			// 	break;
-			// }
+			case 'N':
+			{
+				int64 next;
+				Oid relid;
+				Assert(rel != NULL);
+				relid = RelationGetRelid(rel);
+				close_rel(rel);
+				rel = NULL;
+				next = pq_getmsgint64(&s);
+				AdjustSequence(relid, next);
+				break;
+			}
 		    case '0':
 			    Assert(rel != NULL);
 			    heap_truncate_one_rel(rel);

tests/reinit-mm.sh

@@ -77,6 +77,7 @@ do
         multimaster.arbiter_port = $arbiter_port
         multimaster.max_recovery_lag = 30GB
         multimaster.referee_connstring = 'dbname=$USER host=127.0.0.1 port=5440 sslmode=disable'
+        multimaster.monotonic_sequences = on
 SQL
 
     cat <<CONF >> tmp_check/node$i/pg_hba.conf