external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix invalid read issue in deprecated create_citus_local_table udf (#4611) 

Since create_citus_local_table doesn't specify cascadeViaForeignKeys
option, we can't directly call citus_add_local_table_to_metadata
from create_citus_local_table.
Instead, implement an internal method and call it from deprecated udf
too.
pull/4625/head
Onur Tirtir 2021-02-02 12:53:27 +03:00 committed by GitHub
parent e38c6ebb39
commit c5d4e7081b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/backend/distributed/commands/citus_add_local_table_to_metadata.c
View File

@ -45,6 +45,8 @@
#include "utils/syscache.h" #include "utils/syscache.h"
static void citus_add_local_table_to_metadata_internal(Oid relationId,
bool cascadeViaForeignKeys);
static void ErrorIfUnsupportedCreateCitusLocalTable(Relation relation); static void ErrorIfUnsupportedCreateCitusLocalTable(Relation relation);
static void ErrorIfUnsupportedCitusLocalTableKind(Oid relationId); static void ErrorIfUnsupportedCitusLocalTableKind(Oid relationId);
static List * GetShellTableDDLEventsForCitusLocalTable(Oid relationId); static List * GetShellTableDDLEventsForCitusLocalTable(Oid relationId);
@ -87,6 +89,22 @@ PG_FUNCTION_INFO_V1(remove_local_tables_from_metadata);
*/ */
Datum Datum
citus_add_local_table_to_metadata(PG_FUNCTION_ARGS) citus_add_local_table_to_metadata(PG_FUNCTION_ARGS)
{
Oid relationId = PG_GETARG_OID(0);
bool cascadeViaForeignKeys = PG_GETARG_BOOL(1);
citus_add_local_table_to_metadata_internal(relationId, cascadeViaForeignKeys);
PG_RETURN_VOID();
}
/*
* citus_add_local_table_to_metadata_internal is the internal method for
* citus_add_local_table_to_metadata udf.
*/
static void
citus_add_local_table_to_metadata_internal(Oid relationId, bool cascadeViaForeignKeys)
{ {
CheckCitusVersion(ERROR); CheckCitusVersion(ERROR);
@ -106,12 +124,7 @@ citus_add_local_table_to_metadata(PG_FUNCTION_ARGS)
"to 'off' to disable this behavior"))); "to 'off' to disable this behavior")));
} }
Oid relationId = PG_GETARG_OID(0);
bool cascadeViaForeignKeys = PG_GETARG_BOOL(1);
CreateCitusLocalTable(relationId, cascadeViaForeignKeys); CreateCitusLocalTable(relationId, cascadeViaForeignKeys);
PG_RETURN_VOID();
} }
@ -128,7 +141,18 @@ create_citus_local_table(PG_FUNCTION_ARGS)
{ {
ereport(NOTICE, (errmsg("create_citus_local_table is deprecated in favour of " ereport(NOTICE, (errmsg("create_citus_local_table is deprecated in favour of "
"citus_add_local_table_to_metadata"))); "citus_add_local_table_to_metadata")));
return citus_add_local_table_to_metadata(fcinfo);
Oid relationId = PG_GETARG_OID(0);
/*
* create_citus_local_table doesn't have cascadeViaForeignKeys option,
* so we can't directly call citus_add_local_table_to_metadata udf itself
* since create_citus_local_table doesn't specify cascadeViaForeignKeys.
*/
bool cascadeViaForeignKeys = false;
citus_add_local_table_to_metadata_internal(relationId, cascadeViaForeignKeys);
PG_RETURN_VOID();
} }