Commit863471e

committed

Set application_name to make shardman deadlock detector happy.

Also port postgres_fdw.use_repeatable_read guc.

1 parent50caa58 commit863471eCopy full SHA for 863471e

File tree

+13

-6

lines changed

+13

-6

lines changed

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -451,23 +451,24 @@ 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`	`463`	`if (UseGlobalSnapshots&& (!IsolationUsesXactSnapshot()\|\|`
`464`	`464`	`IsolationIsSerializable()))`
`465`	`465`	`elog(ERROR,"Global snapshots support only REPEATABLE READ");`
`466`	`466`
`467`		`-if (IsolationIsSerializable())`
`468`		`-sql="START TRANSACTION ISOLATION LEVEL SERIALIZABLE";`
`469`		`-else`
`470`		`-sql="START TRANSACTION ISOLATION LEVEL REPEATABLE READ";`
	`467`	`+`
	`468`	`+sprintf(sql,"START TRANSACTION %s; set application_name='pgfdw:%lld:%d';",`
	`469`	`+IsolationIsSerializable() ?"ISOLATION LEVEL SERIALIZABLE" :`
	`470`	`+UseRepeatableRead ?"ISOLATION LEVEL REPEATABLE READ" :"",`
	`471`	`+(long long)GetSystemIdentifier(),MyProcPid);`
`471`	`472`
`472`	`473`	`entry->changing_xact_state= true;`
`473`	`474`	`do_sql_command(entry->conn,sql);`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -273,6 +273,7 @@ typedef struct`
`273`	`273`	`}ec_member_foreign_arg;`
`274`	`274`
`275`	`275`	`boolUseGlobalSnapshots;`
	`276`	`+boolUseRepeatableRead;`
`276`	`277`	`void_PG_init(void);`
`277`	`278`
`278`	`279`	`/*`
`@@ -5911,4 +5912,8 @@ _PG_init(void)`
`5911`	`5912`	`"Use global snapshots for FDW transactions",NULL,`
`5912`	`5913`	`&UseGlobalSnapshots, false,PGC_USERSET,0,NULL,`
`5913`	`5914`	`NULL,NULL);`
	`5915`	`+DefineCustomBoolVariable("postgres_fdw.use_repeatable_read",`
	`5916`	`+"Use repeatable read isilation error for remote transactions",NULL,`
	`5917`	`+&UseRepeatableRead, true,PGC_USERSET,0,NULL,`
	`5918`	`+NULL,NULL);`
`5914`	`5919`	`}`

Lines changed: 1 addition & 0 deletions

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

Comments

(0)