Fix session auth reset handling.

kelvich · kelvich · commit 2cfd6244f2c4 · 2017-11-13T02:17:32.000+03:00
Fixes rowsecurity test.
diff --git a/multimaster.c b/multimaster.c
@@ -3646,6 +3646,10 @@ static void MtmGucSet(VariableSetStmt *stmt, const char *queryStr)
 
 		case VAR_RESET:
 			{
+				if (strcmp(stmt->name, "session_authorization") == 0)
+				{
+					hash_search(MtmGucHash, "role", HASH_REMOVE, NULL);
+				}
 				key = pstrdup(stmt->name);
 				hash_search(MtmGucHash, key, HASH_REMOVE, NULL);
 			}
@@ -3674,11 +3678,6 @@ static void MtmGucDiscard(DiscardStmt *stmt)
 	}
 }
 
-static void MtmGucClear(void)
-{
-
-}
-
 static char * MtmGucSerialize(void)
 {
 	HASH_SEQ_STATUS status;
@@ -3868,9 +3867,6 @@ static void MtmProcessUtility(Node *parsetree, const char *queryString,
 				if (stmt->kind == VAR_SET_MULTI)
 					skipCommand = true;
 
-				if (stmt->kind == VAR_RESET && strcmp(stmt->name, "session_authorization") == 0)
-					MtmGucClear();
-
 				if (!IsTransactionBlock())
 				{
 					skipCommand = true;

Original file line number	Diff line number	Diff line change
`@@ -3646,6 +3646,10 @@ static void MtmGucSet(VariableSetStmt stmt, const char queryStr)`
`3646`	`3646`
`3647`	`3647`	`case VAR_RESET:`
`3648`	`3648`	`{`
	`3649`	`+ if (strcmp(stmt->name, "session_authorization") == 0)`
	`3650`	`+ {`
	`3651`	`+ hash_search(MtmGucHash, "role", HASH_REMOVE, NULL);`
	`3652`	`+ }`
`3649`	`3653`	`key = pstrdup(stmt->name);`
`3650`	`3654`	`hash_search(MtmGucHash, key, HASH_REMOVE, NULL);`
`3651`	`3655`	`}`
`@@ -3674,11 +3678,6 @@ static void MtmGucDiscard(DiscardStmt *stmt)`
`3674`	`3678`	`}`
`3675`	`3679`	`}`
`3676`	`3680`
`3677`		`-static void MtmGucClear(void)`
`3678`		`-{`
`3679`		`-`
`3680`		`-}`
`3681`		`-`
`3682`	`3681`	`static char * MtmGucSerialize(void)`
`3683`	`3682`	`{`
`3684`	`3683`	`HASH_SEQ_STATUS status;`
`@@ -3868,9 +3867,6 @@ static void MtmProcessUtility(Node parsetree, const char queryString,`
`3868`	`3867`	`if (stmt->kind == VAR_SET_MULTI)`
`3869`	`3868`	`skipCommand = true;`
`3870`	`3869`
`3871`		`- if (stmt->kind == VAR_RESET && strcmp(stmt->name, "session_authorization") == 0)`
`3872`		`- MtmGucClear();`
`3873`		`-`
`3874`	`3870`	`if (!IsTransactionBlock())`
`3875`	`3871`	`{`
`3876`	`3872`	`skipCommand = true;`