Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

simplify nested condition #1206

Closed
wants to merge 5 commits into from
Closed

simplify nested condition #1206

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e385cc3
simplify nested condition
cmucheru Sep 1, 2023
ca502f4
reedit condition
cmucheru Sep 9, 2023
e52b16b
solve merge conflict
cmucheru Sep 9, 2023
f720e03
removed bc files
cmucheru Sep 9, 2023
86623ae
Remove bc files
cmucheru Sep 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 11 additions & 16 deletions src/backend/catalog/ag_catalog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ void object_access_hook_fini(void)
prev_object_access_hook = NULL;
prev_object_hook_is_set = false;
}

}

void process_utility_hook_init(void)
Expand All @@ -87,15 +86,15 @@ void process_utility_hook_fini(void)
* the extension.
*/
void ag_ProcessUtility_hook(PlannedStmt *pstmt, const char *queryString,
ProcessUtilityContext context, ParamListInfo params,
QueryEnvironment *queryEnv, DestReceiver *dest,
char *completionTag)
ProcessUtilityContext context, ParamListInfo params,
QueryEnvironment *queryEnv, DestReceiver *dest,
char *completionTag)
{
if (is_age_drop(pstmt))
drop_age_extension((DropStmt *)pstmt->utilityStmt);
else if (prev_process_utility_hook)
(*prev_process_utility_hook) (pstmt, queryString, context, params,
queryEnv, dest, completionTag);
(*prev_process_utility_hook)(pstmt, queryString, context, params,
queryEnv, dest, completionTag);
else
standard_ProcessUtility(pstmt, queryString, context, params, queryEnv,
dest, completionTag);
Expand Down Expand Up @@ -131,7 +130,7 @@ static bool is_age_drop(PlannedStmt *pstmt)

drop_stmt = (DropStmt *)pstmt->utilityStmt;

foreach(lc, drop_stmt->objects)
foreach (lc, drop_stmt->objects)
{
Node *obj = lfirst(lc);

Expand Down Expand Up @@ -178,26 +177,22 @@ static void object_access(ObjectAccessType access, Oid class_id, Oid object_id,
* The above applies to DROP TABLE command too.
*/

if (drop_arg->dropflags & PERFORM_DELETION_INTERNAL)
return;

if (class_id == NamespaceRelationId)
{
graph_cache_data *cache_data;

if (drop_arg->dropflags & PERFORM_DELETION_INTERNAL)
return;

cache_data = search_graph_namespace_cache(object_id);
graph_cache_data *cache_data = search_graph_namespace_cache(object_id);
if (cache_data)
{
char *nspname = get_namespace_name(object_id);

ereport(ERROR, (errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
errmsg("schema \"%s\" is for graph \"%s\"",
nspname, NameStr(cache_data->name))));
}

return;
}


if (class_id == RelationRelationId)
{
label_cache_data *cache_data;
Expand Down