Revert "Built-in support of local table"

This reverts commit 3e4fed0.

Author: kelvich

contrib/mmts/multimaster--1.0.sql

@@ -112,9 +112,9 @@ CREATE FUNCTION mtm.referee_poll(xid bigint) RETURNS bigint
 AS 'MODULE_PATHNAME','mtm_referee_poll'
 LANGUAGE C;
 
-CREATE LOCAL TABLE IF NOT EXISTS mtm.local_tables(rel_schema name, rel_name name, primary key(rel_schema, rel_name));
+CREATE TABLE IF NOT EXISTS mtm.local_tables(rel_schema name, rel_name name, primary key(rel_schema, rel_name));
 
-CREATE LOCAL TABLE mtm.referee_decision(key text primary key not null, node_id int);
+CREATE TABLE mtm.referee_decision(key text primary key not null, node_id int);
 
 CREATE OR REPLACE FUNCTION mtm.alter_sequences() RETURNS boolean AS
 $$

contrib/mmts/multimaster.c

@@ -3860,7 +3860,12 @@ MtmReplicationRowFilterHook(struct PGLogicalRowFilterArgs* args)
 {
 	bool isDistributed;
 
-	if (args->changed_rel->rd_islocal)
+	/*
+	 * We have several built-in local tables that shouldn't be replicated.
+	 * It is hard to insert them into MtmLocalTables properly on extension
+	 * creation so we just list them here.
+	 */
+	if (strcmp(args->changed_rel->rd_rel->relname.data, "referee_decision") == 0)
 		return false;
 
 	/*

contrib/mmts/pglogical_apply.c

@@ -1040,6 +1040,12 @@ process_remote_insert(StringInfo s, Relation rel)
 	if (ActiveSnapshotSet())
 		PopActiveSnapshot();
 
+	if (strcmp(RelationGetRelationName(rel), MULTIMASTER_LOCAL_TABLES_TABLE) == 0 &&
+		strcmp(get_namespace_name(RelationGetNamespace(rel)), MULTIMASTER_SCHEMA_NAME) == 0)
+	{
+		MtmMakeTableLocal((char*)DatumGetPointer(new_tuple.values[0]), (char*)DatumGetPointer(new_tuple.values[1]));
+	}
+
     ExecResetTupleTable(estate->es_tupleTable, true);
     FreeExecutorState(estate);
 

src/backend/access/heap/heapam.c

@@ -80,7 +80,6 @@
 /* GUC variable */
 bool		synchronize_seqscans = true;
 
-HeapTrigger* pg_heap_trigger;
 
 static HeapScanDesc heap_beginscan_internal(Relation relation,
 						Snapshot snapshot,
@@ -2565,10 +2564,7 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid,
 	if (vmbuffer != InvalidBuffer)
 		ReleaseBuffer(vmbuffer);
 
-	if (pg_heap_trigger)
-		pg_heap_trigger->on_insert(relation, heaptup);
-
-    /*
+	/*
 	 * If tuple is cachable, mark it for invalidation from the caches in case
 	 * we abort.  Note it is OK to do this after releasing the buffer, because
 	 * the heaptup data structure is all in local memory, not in the shared
@@ -3420,15 +3416,6 @@ heap_multi_insert(Relation relation, HeapTuple *tuples, int ntuples,
 		if (vmbuffer != InvalidBuffer)
 			ReleaseBuffer(vmbuffer);
 
-		if (pg_heap_trigger)
-		{
-			for (i = 0; i < nthispage; i++)
-			{
-				HeapTuple	heaptup = heaptuples[ndone + i];
-				pg_heap_trigger->on_insert(relation, heaptup);
-			}
-		}
-
 		ndone += nthispage;
 	}
 
@@ -3896,9 +3883,6 @@ heap_delete(Relation relation, ItemPointer tid,
 
 	LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
 
-	if (pg_heap_trigger)
-		pg_heap_trigger->on_delete(relation, old_key_tuple);
-
 	if (vmbuffer != InvalidBuffer)
 		ReleaseBuffer(vmbuffer);
 
@@ -4879,9 +4863,6 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
 		LockBuffer(newbuf, BUFFER_LOCK_UNLOCK);
 	LockBuffer(buffer, BUFFER_LOCK_UNLOCK);
 
-	if (pg_heap_trigger)
-		pg_heap_trigger->on_update(relation, use_hot_update ? NULL : &oldtup, heaptup);
-
 	/*
 	 * Mark old tuple for invalidation from system caches at next command
 	 * boundary, and mark the new tuple for invalidation in case we abort. We

src/backend/catalog/catalog.c

@@ -421,7 +421,6 @@ GetNewRelFileNode(Oid reltablespace, Relation pg_class, char relpersistence)
 		case RELPERSISTENCE_UNLOGGED:
 		case RELPERSISTENCE_CONSTANT:
 		case RELPERSISTENCE_PERMANENT:
-		case RELPERSISTENCE_LOCAL:
 			backend = InvalidBackendId;
 			break;
 		default:

src/backend/catalog/namespace.c

@@ -631,7 +631,6 @@ RangeVarAdjustRelationPersistence(RangeVar *newRelation, Oid nspid)
 			}
 			break;
 		case RELPERSISTENCE_PERMANENT:
-		case RELPERSISTENCE_LOCAL:
 			if (isTempOrTempToastNamespace(nspid))
 				newRelation->relpersistence = RELPERSISTENCE_TEMP;
 			else if (isAnyTempNamespace(nspid))

src/backend/catalog/pg_publication.c

@@ -101,7 +101,7 @@ is_publishable_class(Oid relid, Form_pg_class reltuple)
 {
 	return reltuple->relkind == RELKIND_RELATION &&
 		!IsCatalogClass(relid, reltuple) &&
-		(reltuple->relpersistence == RELPERSISTENCE_PERMANENT || reltuple->relpersistence == RELPERSISTENCE_LOCAL) &&
+		reltuple->relpersistence == RELPERSISTENCE_PERMANENT &&
 		relid >= FirstNormalObjectId;
 }
 

src/backend/catalog/storage.c

@@ -94,7 +94,6 @@ RelationCreateStorage(RelFileNode rnode, char relpersistence)
 			break;
 		case RELPERSISTENCE_PERMANENT:
 		case RELPERSISTENCE_CONSTANT:
-		case RELPERSISTENCE_LOCAL:
 			backend = InvalidBackendId;
 			needs_wal = true;
 			break;

src/backend/commands/cluster.c

@@ -1566,7 +1566,7 @@ finish_heap_swap(Oid OIDOldHeap, Oid OIDNewHeap,
 	 */
 	if (newrelpersistence == RELPERSISTENCE_UNLOGGED)
 		reindex_flags |= REINDEX_REL_FORCE_INDEXES_UNLOGGED;
-	else if (newrelpersistence != RELPERSISTENCE_TEMP)
+	else if (newrelpersistence == RELPERSISTENCE_PERMANENT)
 		reindex_flags |= REINDEX_REL_FORCE_INDEXES_PERMANENT;
 	else if (newrelpersistence == RELPERSISTENCE_CONSTANT)
 	{

src/backend/commands/copy.c

@@ -809,7 +809,7 @@ DoCopy(ParseState *pstate, const CopyStmt *stmt,
 		Assert(rel);
 
 		/* check read-only transaction and parallel mode */
-		if (XactReadOnly && !rel->rd_istemp)
+		if (XactReadOnly && !rel->rd_islocaltemp)
 			PreventCommandIfReadOnly("COPY FROM");
 		PreventCommandIfParallelMode("COPY FROM");
 

src/backend/commands/sequence.c

@@ -599,7 +599,7 @@ nextval_internal(Oid relid, bool check_permissions)
 						RelationGetRelationName(seqrel))));
 
 	/* read-only transactions may only modify temp sequences */
-	if (!seqrel->rd_istemp)
+	if (!seqrel->rd_islocaltemp)
 		PreventCommandIfReadOnly("nextval()");
 
 	/*
@@ -935,7 +935,7 @@ AdjustSequence(Oid relid, int64 next)
 	}
 
 	/* read-only transactions may only modify temp sequences */
-	if (!seqrel->rd_istemp)
+	if (!seqrel->rd_islocaltemp)
 		PreventCommandIfReadOnly("setval()");
 
 	/*
@@ -1067,7 +1067,7 @@ do_setval(Oid relid, int64 next, bool iscalled)
 	ReleaseSysCache(pgstuple);
 
 	/* read-only transactions may only modify temp sequences */
-	if (!seqrel->rd_istemp)
+	if (!seqrel->rd_islocaltemp)
 		PreventCommandIfReadOnly("setval()");
 
 	/*

src/backend/commands/tablecmds.c

@@ -1827,7 +1827,7 @@ MergeAttributes(List *schema, List *supers, char relpersistence,
 
 		/* If existing rel is temp, it must belong to this session */
 		if (relation->rd_rel->relpersistence == RELPERSISTENCE_TEMP &&
-			!relation->rd_istemp)
+			!relation->rd_islocaltemp)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 					 errmsg(!is_partition
@@ -3395,7 +3395,6 @@ AlterTableGetLockLevel(List *cmds)
 				cmd_lockmode = ShareUpdateExclusiveLock;
 				break;
 
-			case AT_SetLocal:
 			case AT_SetLogged:
 			case AT_SetUnLogged:
 			case AT_SetConstant:
@@ -3676,17 +3675,6 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
 				tab->newrelpersistence = RELPERSISTENCE_CONSTANT;
 			pass = AT_PASS_MISC;
 			break;
-		case AT_SetLocal:	/* SET LOCAL */
-			ATSimplePermissions(rel, ATT_TABLE);
-			tab->chgPersistence = ATPrepChangePersistence(rel, RELPERSISTENCE_LOCAL);
-			/* force rewrite if necessary; see comment in ATRewriteTables */
-			if (tab->chgPersistence)
-			{
-				tab->rewrite |= AT_REWRITE_ALTER_PERSISTENCE;
-				tab->newrelpersistence = RELPERSISTENCE_LOCAL;
-			}
-			pass = AT_PASS_MISC;
-			break;
 		case AT_AddOids:		/* SET WITH OIDS */
 			ATSimplePermissions(rel, ATT_TABLE | ATT_FOREIGN_TABLE);
 			if (!rel->rd_rel->relhasoids || recursing)
@@ -4017,7 +4005,6 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel,
 		case AT_DropCluster:	/* SET WITHOUT CLUSTER */
 			ATExecDropCluster(rel, lockmode);
 			break;
-		case AT_SetLocal:		/* SET LOCAL */
 		case AT_SetLogged:		/* SET LOGGED */
 		case AT_SetUnLogged:	/* SET UNLOGGED */
 			break;
@@ -7190,17 +7177,14 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
 	 */
 	switch (rel->rd_rel->relpersistence)
 	{
-		case RELPERSISTENCE_LOCAL:
 		case RELPERSISTENCE_PERMANENT:
-			if (pkrel->rd_rel->relpersistence != RELPERSISTENCE_PERMANENT
-				&& pkrel->rd_rel->relpersistence != RELPERSISTENCE_LOCAL)
+			if (pkrel->rd_rel->relpersistence != RELPERSISTENCE_PERMANENT)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
 						 errmsg("constraints on permanent tables may reference only permanent tables")));
 			break;
 		case RELPERSISTENCE_UNLOGGED:
 			if (pkrel->rd_rel->relpersistence != RELPERSISTENCE_PERMANENT
-				&& pkrel->rd_rel->relpersistence != RELPERSISTENCE_LOCAL
 				&& pkrel->rd_rel->relpersistence != RELPERSISTENCE_UNLOGGED)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
@@ -7211,7 +7195,7 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
 						 errmsg("constraints on temporary tables may reference only temporary tables")));
-			if (!pkrel->rd_istemp || !rel->rd_istemp)
+			if (!pkrel->rd_islocaltemp || !rel->rd_islocaltemp)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
 						 errmsg("constraints on temporary tables must involve temporary tables of this session")));
@@ -10788,7 +10772,6 @@ ATExecSetTableSpace(Oid tableOid, Oid newTableSpace, LOCKMODE lockmode)
 			 * init fork of an unlogged relation.
 			 */
 			if (rel->rd_rel->relpersistence == RELPERSISTENCE_PERMANENT ||
-				rel->rd_rel->relpersistence == RELPERSISTENCE_LOCAL ||
 				(rel->rd_rel->relpersistence == RELPERSISTENCE_UNLOGGED &&
 				 forkNum == INIT_FORKNUM))
 				log_smgrcreate(&newrnode, forkNum);
@@ -11037,7 +11020,7 @@ copy_relation_data(SMgrRelation src, SMgrRelation dst,
 	 * enabled AND it's a permanent relation.
 	 */
 	use_wal = XLogIsNeeded() &&
-		(relpersistence == RELPERSISTENCE_PERMANENT || relpersistence == RELPERSISTENCE_LOCAL || copying_initfork);
+		(relpersistence == RELPERSISTENCE_PERMANENT || copying_initfork);
 
 	nblocks = smgrnblocks(src, forkNum);
 
@@ -11096,7 +11079,7 @@ copy_relation_data(SMgrRelation src, SMgrRelation dst,
 	 * wouldn't replay our earlier WAL entries. If we do not fsync those pages
 	 * here, they might still not be on disk when the crash occurs.
 	 */
-	if (relpersistence == RELPERSISTENCE_PERMANENT || relpersistence == RELPERSISTENCE_LOCAL || copying_initfork)
+	if (relpersistence == RELPERSISTENCE_PERMANENT || copying_initfork)
 		smgrimmedsync(dst, forkNum);
 }
 
@@ -11183,14 +11166,14 @@ ATExecAddInherit(Relation child_rel, RangeVar *parent, LOCKMODE lockmode)
 
 	/* If parent rel is temp, it must belong to this session */
 	if (parent_rel->rd_rel->relpersistence == RELPERSISTENCE_TEMP &&
-		!parent_rel->rd_istemp)
+		!parent_rel->rd_islocaltemp)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("cannot inherit from temporary relation of another session")));
 
 	/* Ditto for the child */
 	if (child_rel->rd_rel->relpersistence == RELPERSISTENCE_TEMP &&
-		!child_rel->rd_istemp)
+		!child_rel->rd_islocaltemp)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("cannot inherit to temporary relation of another session")));
@@ -12542,7 +12525,15 @@ ATPrepChangePersistence(Relation rel, char newrelpersistence)
 	HeapTuple	tuple;
 	SysScanDesc scan;
 	ScanKeyData skey[1];
-	bool		toLogged = newrelpersistence != RELPERSISTENCE_UNLOGGED;
+	bool		toLogged = false;
+
+	/*
+	 * When we track constraints, constant tables behaves just like
+	 * permanent ones.
+	 */
+	if (newrelpersistence == RELPERSISTENCE_PERMANENT
+		|| newrelpersistence == RELPERSISTENCE_CONSTANT)
+		toLogged = true;
 
 	/* Nothing to do */
 	if (rel->rd_rel->relpersistence == newrelpersistence)
@@ -12629,8 +12620,7 @@ ATPrepChangePersistence(Relation rel, char newrelpersistence)
 
 			if (newrelpersistence == RELPERSISTENCE_PERMANENT)
 			{
-				if (foreignrel->rd_rel->relpersistence != RELPERSISTENCE_PERMANENT &&
-					foreignrel->rd_rel->relpersistence != RELPERSISTENCE_LOCAL)
+				if (foreignrel->rd_rel->relpersistence != RELPERSISTENCE_PERMANENT)
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
 							 errmsg("could not change table \"%s\" to logged because it references unlogged table \"%s\"",
@@ -12640,8 +12630,7 @@ ATPrepChangePersistence(Relation rel, char newrelpersistence)
 			}
 			if (newrelpersistence == RELPERSISTENCE_UNLOGGED)
 			{
-				if (foreignrel->rd_rel->relpersistence == RELPERSISTENCE_PERMANENT ||
-					foreignrel->rd_rel->relpersistence == RELPERSISTENCE_LOCAL)
+				if (foreignrel->rd_rel->relpersistence == RELPERSISTENCE_PERMANENT)
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
 							 errmsg("could not change table \"%s\" to unlogged because it references logged table \"%s\"",
@@ -13761,14 +13750,14 @@ ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd)
 
 	/* If the parent is temp, it must belong to this session */
 	if (rel->rd_rel->relpersistence == RELPERSISTENCE_TEMP &&
-		!rel->rd_istemp)
+		!rel->rd_islocaltemp)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("cannot attach as partition of temporary relation of another session")));
 
 	/* Ditto for the partition */
 	if (attachrel->rd_rel->relpersistence == RELPERSISTENCE_TEMP &&
-		!attachrel->rd_istemp)
+		!attachrel->rd_islocaltemp)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("cannot attach temporary relation of another session as partition")));

src/backend/commands/view.c

@@ -553,7 +553,7 @@ DefineView(ViewStmt *stmt, const char *queryString,
 	 * schema name.
 	 */
 	view = copyObject(stmt->view);	/* don't corrupt original command */
-	if ((view->relpersistence == RELPERSISTENCE_PERMANENT || view->relpersistence == RELPERSISTENCE_LOCAL)
+	if (view->relpersistence == RELPERSISTENCE_PERMANENT
 		&& isQueryUsingTempRelation(viewParse))
 	{
 		view->relpersistence = RELPERSISTENCE_TEMP;

src/backend/parser/gram.y

@@ -2301,13 +2301,6 @@ alter_table_cmd:
 					n->name = NULL;
 					$$ = (Node *)n;
 				}
-			/* ALTER TABLE <name> SET LOCAL */
-			| SET LOCAL
-				{
-					AlterTableCmd *n = makeNode(AlterTableCmd);
-					n->subtype = AT_SetLocal;
-					$$ = (Node *)n;
-				}
 			/* ALTER TABLE <name> SET LOGGED  */
 			| SET LOGGED
 				{
@@ -3405,7 +3398,6 @@ OptTemp:	TEMPORARY					{ $$ = RELPERSISTENCE_TEMP; }
 							 parser_errposition(@1)));
 					$$ = RELPERSISTENCE_TEMP;
 				}
-			| LOCAL					    { $$ = RELPERSISTENCE_LOCAL; }
 			| UNLOGGED					{ $$ = RELPERSISTENCE_UNLOGGED; }
 			| CONSTANT					{ $$ = RELPERSISTENCE_CONSTANT; }
 			| /*EMPTY*/					{ $$ = RELPERSISTENCE_PERMANENT; }

src/backend/storage/buffer/bufmgr.c

@@ -1523,7 +1523,7 @@ BufferAlloc(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
 	buf_state &= ~(BM_VALID | BM_DIRTY | BM_JUST_DIRTIED |
 				   BM_CHECKPOINT_NEEDED | BM_IO_ERROR | BM_PERMANENT |
 				   BUF_USAGECOUNT_MASK);
-	if (relpersistence == RELPERSISTENCE_PERMANENT || relpersistence == RELPERSISTENCE_LOCAL || forkNum == INIT_FORKNUM)
+	if (relpersistence == RELPERSISTENCE_PERMANENT || forkNum == INIT_FORKNUM)
 		buf_state |= BM_TAG_VALID | BM_PERMANENT | BUF_USAGECOUNT_ONE;
 	else
 		buf_state |= BM_TAG_VALID | BUF_USAGECOUNT_ONE;

src/backend/utils/adt/dbsize.c

@@ -1036,7 +1036,6 @@ pg_relation_filepath(PG_FUNCTION_ARGS)
 		case RELPERSISTENCE_UNLOGGED:
 		case RELPERSISTENCE_CONSTANT:
 		case RELPERSISTENCE_PERMANENT:
-		case RELPERSISTENCE_LOCAL:
 			backend = InvalidBackendId;
 			break;
 		case RELPERSISTENCE_TEMP: