Commit849314b

committed

Set application_name to make shardman deadlock detector happy.

Also port postgres_fdw.use_repeatable_read guc.

1 parent28efdaa commit849314bCopy full SHA for 849314b

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -451,19 +451,19 @@ static void`
`451`	`451`	`begin_remote_xact(ConnCacheEntry*entry)`
`452`	`452`	`{`
`453`	`453`	`intcurlevel=GetCurrentTransactionNestLevel();`
	`454`	`+charsql[128];`
	`455`	`+`
`454`	`456`
`455`	`457`	`/* Start main transaction if we haven't yet */`
`456`	`458`	`if (entry->xact_depth <=0)`
`457`	`459`	`{`
`458`		`-constchar*sql;`
`459`		`-`
`460`	`460`	`elog(DEBUG3,"starting remote transaction on connection %p",`
`461`	`461`	`entry->conn);`
`462`	`462`
`463`		`-if (IsolationIsSerializable())`
`464`		`-sql="START TRANSACTIONISOLATION LEVEL SERIALIZABLE";`
`465`		`-else`
`466`		`-sql="START TRANSACTION ISOLATION LEVEL REPEATABLE READ";`
	`463`	`+sprintf(sql,"START TRANSACTION %s; set application_name='pgfdw:%lld:%d';",`
	`464`	`+IsolationIsSerializable() ?"ISOLATION LEVEL SERIALIZABLE" :`
	`465`	`+UseRepeatableRead ?"ISOLATION LEVEL REPEATABLE READ" :"",`
	`466`	`+(long long)GetSystemIdentifier(),MyProcPid);`
`467`	`467`	`entry->changing_xact_state= true;`
`468`	`468`	`do_sql_command(entry->conn,sql);`
`469`	`469`	`entry->xact_depth=1;`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,7 @@ typedef struct`
`269`	`269`	`}ec_member_foreign_arg;`
`270`	`270`
`271`	`271`	`boolUseGlobalSnapshots;`
	`272`	`+boolUseRepeatableRead;`
`272`	`273`	`void_PG_init(void);`
`273`	`274`
`274`	`275`	`/*`
`@@ -5806,4 +5807,8 @@ _PG_init(void)`
`5806`	`5807`	`"Use global snapshots for FDW transactions",NULL,`
`5807`	`5808`	`&UseGlobalSnapshots, false,PGC_USERSET,0,NULL,`
`5808`	`5809`	`NULL,NULL);`
	`5810`	`+DefineCustomBoolVariable("postgres_fdw.use_repeatable_read",`
	`5811`	`+"Use repeatable read isilation error for remote transactions",NULL,`
	`5812`	`+&UseRepeatableRead, true,PGC_USERSET,0,NULL,`
	`5813`	`+NULL,NULL);`
`5809`	`5814`	`}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,7 @@ extern const char *get_jointype_name(JoinType jointype);`
`184`	`184`	`externboolis_builtin(OidobjectId);`
`185`	`185`	`externboolis_shippable(OidobjectId,OidclassId,PgFdwRelationInfo*fpinfo);`
`186`	`186`
	`187`	`+externboolUseRepeatableRead;`
`187`	`188`	`externboolUseGlobalSnapshots;`
`188`	`189`
`189`	`190`	`#endif/* POSTGRES_FDW_H */`

Comments

(0)