Commit34f64ad

authored and

committed

Fix PGPPRO-717 correctly restore name/schema of local tables

1 parent1939014 commit34f64adCopy full SHA for 34f64ad

File tree

-8

lines changed

-8

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -2523,7 +2523,7 @@ MtmCreateLocalTableMap(void)`
`2523`	`2523`	`returnhtab;`
`2524`	`2524`	`}`
`2525`	`2525`
`2526`		`-voidMtmMakeRelationLocal(Oidrelid)`
	`2526`	`+staticvoidMtmMakeRelationLocal(Oidrelid)`
`2527`	`2527`	`{`
`2528`	`2528`	`if (OidIsValid(relid)) {`
`2529`	`2529`	`MtmLock(LW_EXCLUSIVE);`
`@@ -2533,17 +2533,17 @@ void MtmMakeRelationLocal(Oid relid)`
`2533`	`2533`	`}`
`2534`	`2534`
`2535`	`2535`
`2536`		`-staticvoidMtmMakeTableLocal(charschema,charname)`
	`2536`	`+voidMtmMakeTableLocal(charconstschema,charconstname)`
`2537`	`2537`	`{`
`2538`		`-RangeVar*rv=makeRangeVar(schema,name,-1);`
	`2538`	`+RangeVarrv=makeRangeVar((char)schema,(char*)name,-1);`
`2539`	`2539`	`Oidrelid=RangeVarGetRelid(rv,NoLock, true);`
`2540`	`2540`	`MtmMakeRelationLocal(relid);`
`2541`	`2541`	`}`
`2542`	`2542`
`2543`	`2543`
`2544`	`2544`	`typedefstruct {`
`2545`		`-NameDataschema;`
`2546`		`-NameDataname;`
	`2545`	`+textschema;`
	`2546`	`+textname;`
`2547`	`2547`	`}MtmLocalTablesTuple;`
`2548`	`2548`
`2549`	`2549`	`staticvoidMtmLoadLocalTables(void)`
`@@ -2563,7 +2563,7 @@ static void MtmLoadLocalTables(void)`
`2563`	`2563`	`while (HeapTupleIsValid(tuple=systable_getnext(scan)))`
`2564`	`2564`	`{`
`2565`	`2565`	`MtmLocalTablesTuplet= (MtmLocalTablesTuple)GETSTRUCT(tuple);`
`2566`		`-MtmMakeTableLocal(NameStr(t->schema),NameStr(t->name));`
	`2566`	`+MtmMakeTableLocal(text_to_cstring(&t->schema),text_to_cstring(&t->name));`
`2567`	`2567`	`}`
`2568`	`2568`
`2569`	`2569`	`systable_endscan(scan);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ extern void MtmCheckQuorum(void);`
`404`	`404`	`externboolMtmRecoveryCaughtUp(intnodeId,lsn_twalEndPtr);`
`405`	`405`	`externvoidMtmCheckRecoveryCaughtUp(intnodeId,lsn_tslotLSN);`
`406`	`406`	`externvoidMtmRecoveryCompleted(void);`
`407`		`-externvoidMtmMakeRelationLocal(Oidrelid);`
	`407`	`+externvoidMtmMakeTableLocal(charconstschema,charconstname);`
`408`	`408`	`externvoidMtmHandleApplyError(void);`
`409`	`409`	`externvoidMtmUpdateLsnMapping(intnodeId,lsn_tendLsn);`
`410`	`410`	`externlsn_tMtmGetFlushPosition(intnodeId);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -860,7 +860,7 @@ process_remote_insert(StringInfo s, Relation rel)`
`860`	`860`	`if (strcmp(RelationGetRelationName(rel),MULTIMASTER_LOCAL_TABLES_TABLE)==0&&`
`861`	`861`	`strcmp(get_namespace_name(RelationGetNamespace(rel)),MULTIMASTER_SCHEMA_NAME)==0)`
`862`	`862`	`{`
`863`		`-MtmMakeRelationLocal(RelationGetRelid(rel));`
	`863`	`+MtmMakeTableLocal(TextDatumGetCString(new_tuple.values[0]),TextDatumGetCString(new_tuple.values[1]));`
`864`	`864`	`}`
`865`	`865`
`866`	`866`	`ExecResetTupleTable(estate->es_tupleTable, true);`

Comments

(0)