Fix session auth reset handling.

kelvich · kelvich · commit e780704dbc5e · 2016-09-30T15:46:39.000+03:00
Fixes rowsecurity test.
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -3647,6 +3647,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);
 			}
@@ -3675,11 +3679,6 @@ static void MtmGucDiscard(DiscardStmt *stmt)
 	}
 }
 
-static void MtmGucClear(void)
-{
-
-}
-
 static char * MtmGucSerialize(void)
 {
 	HASH_SEQ_STATUS status;
@@ -3869,9 +3868,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;
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
@@ -50,7 +50,7 @@ test: oidjoins
 test: type_sanity
 test: opr_sanity
 test: insert
-# test: insert_conflict
+test: insert_conflict
 test: create_function_1
 test: create_type
 test: create_table
@@ -111,7 +111,7 @@ test: collate
 test: matview
 test: lock
 test: replica_identity
-# test: rowsecurity  # issue#20
+test: rowsecurity
 test: object_address
 test: tablesample
 test: groupingsets

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