Commit4dd3fd5

CherkashinSergey

authored and

za-arthur

committed

Remove redundant argument from getVariableInternal()

1 parent51f3ace commit4dd3fd5Copy full SHA for 4dd3fd5

File tree

1 file changed

+11

-12

lines changed

pg_variables.c

1 file changed

+11

-12

lines changed

`‎pg_variables.c`

Lines changed: 11 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ static void getKeyFromName(text name, char key);`
`52`	`52`	`staticPackagegetPackageByName(textname,boolcreate,boolstrict);`
`53`	`53`	`staticVariablegetVariableInternal(Packagepackage,`
`54`	`54`	`text*name,Oidtypid,`
`55`		`-boolstrict,booltype_strict);`
	`55`	`+boolstrict);`
`56`	`56`	`staticVariablecreateVariableInternal(Packagepackage,`
`57`	`57`	`text*name,Oidtypid,`
`58`	`58`	`boolis_transactional);`
`@@ -197,7 +197,7 @@ variable_get(text package_name, text var_name,`
`197`	`197`	`return0;`
`198`	`198`	`}`
`199`	`199`
`200`		`-variable=getVariableInternal(package,var_name,typid,strict, true);`
	`200`	`+variable=getVariableInternal(package,var_name,typid,strict);`
`201`	`201`
`202`	`202`	`if (variable==NULL)`
`203`	`203`	`{`
`@@ -455,7 +455,7 @@ variable_update(PG_FUNCTION_ARGS)`
`455`	`455`	`strncmp(VARDATA_ANY(var_name),GetName(LastVariable),`
`456`	`456`	`VARSIZE_ANY_EXHDR(var_name))!=0)`
`457`	`457`	`{`
`458`		`-variable=getVariableInternal(package,var_name,RECORDOID, true, true);`
	`458`	`+variable=getVariableInternal(package,var_name,RECORDOID, true);`
`459`	`459`	`LastVariable=variable;`
`460`	`460`	`}`
`461`	`461`	`else`
`@@ -543,7 +543,7 @@ variable_delete(PG_FUNCTION_ARGS)`
`543`	`543`	`strncmp(VARDATA_ANY(var_name),GetName(LastVariable),`
`544`	`544`	`VARSIZE_ANY_EXHDR(var_name))!=0)`
`545`	`545`	`{`
`546`		`-variable=getVariableInternal(package,var_name,RECORDOID, true, true);`
	`546`	`+variable=getVariableInternal(package,var_name,RECORDOID, true);`
`547`	`547`	`LastVariable=variable;`
`548`	`548`	`}`
`549`	`549`	`else`
`@@ -592,7 +592,7 @@ variable_select(PG_FUNCTION_ARGS)`
`592`	`592`	`var_name=PG_GETARG_TEXT_PP(1);`
`593`	`593`
`594`	`594`	`package=getPackageByName(package_name, false, true);`
`595`		`-variable=getVariableInternal(package,var_name,RECORDOID, true, true);`
	`595`	`+variable=getVariableInternal(package,var_name,RECORDOID, true);`
`596`	`596`
`597`	`597`	`record=&(GetActualValue(variable).record);`
`598`	`598`
`@@ -667,7 +667,7 @@ variable_select_by_value(PG_FUNCTION_ARGS)`
`667`	`667`	`}`
`668`	`668`
`669`	`669`	`package=getPackageByName(package_name, false, true);`
`670`		`-variable=getVariableInternal(package,var_name,RECORDOID, true, true);`
	`670`	`+variable=getVariableInternal(package,var_name,RECORDOID, true);`
`671`	`671`
`672`	`672`	`if (!value_is_null)`
`673`	`673`	`check_record_key(variable,value_type);`
`@@ -736,7 +736,7 @@ variable_select_by_values(PG_FUNCTION_ARGS)`
`736`	`736`	`var_name=PG_GETARG_TEXT_PP(1);`
`737`	`737`
`738`	`738`	`package=getPackageByName(package_name, false, true);`
`739`		`-variable=getVariableInternal(package,var_name,RECORDOID, true, true);`
	`739`	`+variable=getVariableInternal(package,var_name,RECORDOID, true);`
`740`	`740`
`741`	`741`	`check_record_key(variable,ARR_ELEMTYPE(values));`
`742`	`742`
`@@ -870,9 +870,9 @@ remove_variable(PG_FUNCTION_ARGS)`
`870`	`870`	`var_name=PG_GETARG_TEXT_PP(1);`
`871`	`871`
`872`	`872`	`package=getPackageByName(package_name, false, true);`
`873`		`-variable=getVariableInternal(package,var_name,0, true, false);`
	`873`	`+variable=getVariableInternal(package,var_name,InvalidOid, true);`
`874`	`874`
`875`		`-/* Add package to changes list, so we can remove it if it */`
	`875`	`+/* Add package to changes list, so we can remove it if itis empty */`
`876`	`876`	`if (!isObjectChangedInCurrentTrans(&package->transObject))`
`877`	`877`	`{`
`878`	`878`	`createSavepoint(&package->transObject,TRANS_PACKAGE);`
`@@ -1438,8 +1438,7 @@ getPackageByName(text *name, bool create, bool strict)`
`1438`	`1438`	`* flag 'is_transactional' of this variable is unknown.`
`1439`	`1439`	`*/`
`1440`	`1440`	`staticVariable*`
`1441`		`-getVariableInternal(Packagepackage,textname,Oidtypid,boolstrict,`
`1442`		`-booltype_strict)`
	`1441`	`+getVariableInternal(Packagepackage,textname,Oidtypid,boolstrict)`
`1443`	`1442`	`{`
`1444`	`1443`	`Variable*variable;`
`1445`	`1444`	`charkey[NAMEDATALEN];`
`@@ -1456,7 +1455,7 @@ getVariableInternal(Package package, text name, Oid typid, bool strict,`
`1456`	`1455`	`/* Check variable type */`
`1457`	`1456`	`if (found)`
`1458`	`1457`	`{`
`1459`		`-if (type_strict&&variable->typid!=typid)`
	`1458`	`+if (typid!=InvalidOid&&variable->typid!=typid)`
`1460`	`1459`	`{`
`1461`	`1460`	`char*var_type=DatumGetCString(DirectFunctionCall1(regtypeout,`
`1462`	`1461`	`ObjectIdGetDatum(variable->typid)));`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4dd3fd5

File tree

1 file changed

1 file changed

`‎pg_variables.c`

0 commit comments