Support concurrent drop

knizhnik · knizhnik · commit 3f4a13953713 · 2016-10-14T20:15:44.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -162,6 +162,7 @@ MtmState* Mtm;
 
 VacuumStmt* MtmVacuumStmt;
 IndexStmt*  MtmIndexStmt;
+DropStmt*   MtmDropStmt;
 MemoryContext MtmApplyContext;
 
 HTAB* MtmXid2State;
@@ -4052,7 +4053,7 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 					 } else { 
 						 MemoryContext oldContext = MemoryContextSwitchTo(MtmApplyContext);
 						 Assert(oldContext != MtmApplyContext);
-						 MtmIndexStmt = (IndexStmt*)copyObject(parsetree);
+						 MtmIndexStmt = indexStmt;
 						 MemoryContextSwitchTo(oldContext);
 						 return;
 					 }
@@ -4063,11 +4064,19 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 		case T_DropStmt:
 			{
 				DropStmt *stmt = (DropStmt *) parsetree;
-				if (stmt->removeType == OBJECT_INDEX && stmt->concurrent && !IsTransactionBlock() && !MtmTx.isReplicated)
+				if (stmt->removeType == OBJECT_INDEX && stmt->concurrent)
 				{
-					skipCommand = true;
-					MtmProcessDDLCommand(queryString, false, false);
-					MtmTx.isDistributed = false;
+					if (context == PROCESS_UTILITY_TOPLEVEL) {
+						MtmProcessDDLCommand(queryString, false, true);
+						MtmTx.isDistributed = false;
+						skipCommand = true;
+					} else {
+						 MemoryContext oldContext = MemoryContextSwitchTo(MtmApplyContext);
+						 Assert(oldContext != MtmApplyContext);
+						 MtmDropStmt = stmt;
+						 MemoryContextSwitchTo(oldContext);
+						 return;
+					}
 				}
 			}
 			break;
diff --git a/contrib/mmts/multimaster.h b/contrib/mmts/multimaster.h
@@ -304,6 +304,7 @@ extern HTAB* MtmXid2State;
 extern HTAB* MtmGid2State;
 extern VacuumStmt* MtmVacuumStmt;
 extern IndexStmt*  MtmIndexStmt;
+extern DropStmt*   MtmDropStmt;
 extern MemoryContext MtmApplyContext;
 
 extern void  MtmArbiterInitialize(void);
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/pglogical_apply.c
@@ -79,6 +79,8 @@ static void process_remote_insert(StringInfo s, Relation rel);
 static void process_remote_update(StringInfo s, Relation rel);
 static void process_remote_delete(StringInfo s, Relation rel);
 
+static MemoryContext TopContext;
+
 /*
  * Search the index 'idxrel' for a tuple identified by 'skey' in 'rel'.
  *
@@ -377,34 +379,31 @@ process_remote_message(StringInfo s)
 		case 'D':
 		{
 			int rc;
-
 			MTM_LOG1("%d: Executing utility statement %s", MyProcPid, messageBody);
 			SPI_connect();
 			ActivePortal->sourceText = messageBody;
 			MtmVacuumStmt = NULL;
 			MtmIndexStmt = NULL;
+			MtmDropStmt = NULL;
 			rc = SPI_execute(messageBody, false, 0);
 			SPI_finish();
 			if (rc < 0) { 
 				elog(ERROR, "Failed to execute utility statement %s", messageBody);
 			} else { 
 				if (MtmVacuumStmt != NULL) { 
 					ExecVacuum(MtmVacuumStmt, 1);
-				} else if (MtmIndexStmt != NULL) { 
-					MemoryContext saveCtx = TopTransactionContext;
-					Oid relid;
-
-					TopTransactionContext = MtmApplyContext;
-					relid =	RangeVarGetRelidExtended(MtmIndexStmt->relation, ShareUpdateExclusiveLock,
-													 false, false,
-													 NULL,
-													 NULL);
+				} else if (MtmIndexStmt != NULL) {
+					Oid relid =	RangeVarGetRelidExtended(MtmIndexStmt->relation, ShareUpdateExclusiveLock,
+														 false, false,
+														 NULL,
+														 NULL);
 					
 					/* Run parse analysis ... */
-					MtmIndexStmt = transformIndexStmt(relid, MtmIndexStmt, messageBody);
+					//MtmIndexStmt = transformIndexStmt(relid, MtmIndexStmt, messageBody);
 
 					PushActiveSnapshot(GetTransactionSnapshot());
 
+
 					DefineIndex(relid,		/* OID of heap relation */
 								MtmIndexStmt,
 								InvalidOid, /* no predefined OID */
@@ -413,11 +412,11 @@ process_remote_message(StringInfo s)
 								false,		/* skip_build */
 								false);		/* quiet */
 					
-					TopTransactionContext = saveCtx;
-
 					if (ActiveSnapshotSet())
 						PopActiveSnapshot();
 
+				} else if (MtmDropStmt != NULL) { 
+					RemoveObjects(MtmDropStmt);
 				}
 			}
 			if (standalone) { 
@@ -1025,12 +1024,12 @@ void MtmExecutor(void* work, size_t size)
 
     if (MtmApplyContext == NULL) {
         MtmApplyContext = AllocSetContextCreate(TopMemoryContext,
-										   "MessageContext",
-										   ALLOCSET_DEFAULT_MINSIZE,
-										   ALLOCSET_DEFAULT_INITSIZE,
-										   ALLOCSET_DEFAULT_MAXSIZE);
+												"ApplyContext",
+												ALLOCSET_DEFAULT_MINSIZE,
+												ALLOCSET_DEFAULT_INITSIZE,
+												ALLOCSET_DEFAULT_MAXSIZE);
     }
-    MemoryContextSwitchTo(MtmApplyContext);
+    TopContext = MemoryContextSwitchTo(MtmApplyContext);
 	replorigin_session_origin = InvalidRepOriginId;
     PG_TRY();
     {    
