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

get rid of {Push/Pop}OverrideSearchPath (#7145)

pull/7170/head
zhjwpku 2023-09-05 23:40:22 +08:00 committed by GitHub
parent 8eb3360017
commit 205b159606
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 80 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/distributed/commands/alter_table.c
View File

@ -53,6 +53,7 @@
#include "distributed/multi_executor.h" #include "distributed/multi_executor.h"
#include "distributed/multi_logical_planner.h" #include "distributed/multi_logical_planner.h"
#include "distributed/multi_partitioning_utils.h" #include "distributed/multi_partitioning_utils.h"
#include "distributed/namespace_utils.h"
#include "distributed/reference_table_utils.h" #include "distributed/reference_table_utils.h"
#include "distributed/relation_access_tracking.h" #include "distributed/relation_access_tracking.h"
#include "distributed/replication_origin_session_utils.h" #include "distributed/replication_origin_session_utils.h"
@ -1764,10 +1765,7 @@ CreateMaterializedViewDDLCommand(Oid matViewOid)
* Set search_path to NIL so that all objects outside of pg_catalog will be * Set search_path to NIL so that all objects outside of pg_catalog will be
* schema-prefixed. * schema-prefixed.
*/ */
OverrideSearchPath *overridePath = GetOverrideSearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
overridePath->schemas = NIL;
overridePath->addCatalog = true;
PushOverrideSearchPath(overridePath);
/* /*
* Push the transaction snapshot to be able to get vief definition with pg_get_viewdef * Push the transaction snapshot to be able to get vief definition with pg_get_viewdef
@ -1779,7 +1777,7 @@ CreateMaterializedViewDDLCommand(Oid matViewOid)
char *viewDefinition = TextDatumGetCString(viewDefinitionDatum); char *viewDefinition = TextDatumGetCString(viewDefinitionDatum);
PopActiveSnapshot(); PopActiveSnapshot();
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
appendStringInfo(query, "AS %s", viewDefinition); appendStringInfo(query, "AS %s", viewDefinition);

8
src/backend/distributed/commands/extension.c
View File

@ -50,7 +50,7 @@ static List * GetAllViews(void);
static bool ShouldPropagateExtensionCommand(Node *parseTree); static bool ShouldPropagateExtensionCommand(Node *parseTree);
static bool IsAlterExtensionSetSchemaCitus(Node *parseTree); static bool IsAlterExtensionSetSchemaCitus(Node *parseTree);
static Node * RecreateExtensionStmt(Oid extensionOid); static Node * RecreateExtensionStmt(Oid extensionOid);
static List * GenerateGrantCommandsOnExtesionDependentFDWs(Oid extensionId); static List * GenerateGrantCommandsOnExtensionDependentFDWs(Oid extensionId);
/* /*
@ -985,7 +985,7 @@ CreateExtensionDDLCommand(const ObjectAddress *extensionAddress)
/* any privilege granted on FDWs that belong to the extension should be included */ /* any privilege granted on FDWs that belong to the extension should be included */
List *FDWGrants = List *FDWGrants =
GenerateGrantCommandsOnExtesionDependentFDWs(extensionAddress->objectId); GenerateGrantCommandsOnExtensionDependentFDWs(extensionAddress->objectId);
ddlCommands = list_concat(ddlCommands, FDWGrants); ddlCommands = list_concat(ddlCommands, FDWGrants);
@ -1048,11 +1048,11 @@ RecreateExtensionStmt(Oid extensionOid)
/* /*
* GenerateGrantCommandsOnExtesionDependentFDWs returns a list of commands that GRANTs * GenerateGrantCommandsOnExtensionDependentFDWs returns a list of commands that GRANTs
* the privileges on FDWs that are depending on the given extension. * the privileges on FDWs that are depending on the given extension.
*/ */
static List * static List *
GenerateGrantCommandsOnExtesionDependentFDWs(Oid extensionId) GenerateGrantCommandsOnExtensionDependentFDWs(Oid extensionId)
{ {
List *commands = NIL; List *commands = NIL;
List *FDWOids = GetDependentFDWsToExtension(extensionId); List *FDWOids = GetDependentFDWsToExtension(extensionId);

4
src/backend/distributed/commands/foreign_constraint.c
View File

@ -895,7 +895,7 @@ GetForeignConstraintCommandsInternal(Oid relationId, int flags)
List *foreignKeyCommands = NIL; List *foreignKeyCommands = NIL;
PushOverrideEmptySearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
Oid foreignKeyOid = InvalidOid; Oid foreignKeyOid = InvalidOid;
foreach_oid(foreignKeyOid, foreignKeyOids) foreach_oid(foreignKeyOid, foreignKeyOids)
@ -906,7 +906,7 @@ GetForeignConstraintCommandsInternal(Oid relationId, int flags)
} }
/* revert back to original search_path */ /* revert back to original search_path */
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
return foreignKeyCommands; return foreignKeyCommands;
} }

5
src/backend/distributed/commands/function.c
View File

@ -909,15 +909,14 @@ GetFunctionDDLCommand(const RegProcedure funcOid, bool useCreateOrReplace)
else else
{ {
Datum sqlTextDatum = (Datum) 0; Datum sqlTextDatum = (Datum) 0;
int saveNestLevel = PushEmptySearchPath();
PushOverrideEmptySearchPath(CurrentMemoryContext);
sqlTextDatum = DirectFunctionCall1(pg_get_functiondef, sqlTextDatum = DirectFunctionCall1(pg_get_functiondef,
ObjectIdGetDatum(funcOid)); ObjectIdGetDatum(funcOid));
createFunctionSQL = TextDatumGetCString(sqlTextDatum); createFunctionSQL = TextDatumGetCString(sqlTextDatum);
/* revert back to original search_path */ /* revert back to original search_path */
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
} }
return createFunctionSQL; return createFunctionSQL;

4
src/backend/distributed/commands/statistics.c
View File

@ -530,7 +530,7 @@ GetExplicitStatisticsCommandList(Oid relationId)
RelationClose(relation); RelationClose(relation);
/* generate fully-qualified names */ /* generate fully-qualified names */
PushOverrideEmptySearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
Oid statisticsId = InvalidOid; Oid statisticsId = InvalidOid;
foreach_oid(statisticsId, statisticsIdList) foreach_oid(statisticsId, statisticsIdList)
@ -579,7 +579,7 @@ GetExplicitStatisticsCommandList(Oid relationId)
} }
/* revert back to original search_path */ /* revert back to original search_path */
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
return explicitStatisticsCommandList; return explicitStatisticsCommandList;
} }

4
src/backend/distributed/commands/trigger.c
View File

@ -74,7 +74,7 @@ GetExplicitTriggerCommandList(Oid relationId)
{ {
List *createTriggerCommandList = NIL; List *createTriggerCommandList = NIL;
PushOverrideEmptySearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
List *triggerIdList = GetExplicitTriggerIdList(relationId); List *triggerIdList = GetExplicitTriggerIdList(relationId);
@ -116,7 +116,7 @@ GetExplicitTriggerCommandList(Oid relationId)
} }
/* revert back to original search_path */ /* revert back to original search_path */
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
return createTriggerCommandList; return createTriggerCommandList;
} }

7
src/backend/distributed/commands/view.c
View File

@ -479,10 +479,7 @@ AppendViewDefinitionToCreateViewCommand(StringInfo buf, Oid viewOid)
* Set search_path to NIL so that all objects outside of pg_catalog will be * Set search_path to NIL so that all objects outside of pg_catalog will be
* schema-prefixed. * schema-prefixed.
*/ */
OverrideSearchPath *overridePath = GetOverrideSearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
overridePath->schemas = NIL;
overridePath->addCatalog = true;
PushOverrideSearchPath(overridePath);
/* /*
* Push the transaction snapshot to be able to get vief definition with pg_get_viewdef * Push the transaction snapshot to be able to get vief definition with pg_get_viewdef
@ -494,7 +491,7 @@ AppendViewDefinitionToCreateViewCommand(StringInfo buf, Oid viewOid)
char *viewDefinition = TextDatumGetCString(viewDefinitionDatum); char *viewDefinition = TextDatumGetCString(viewDefinitionDatum);
PopActiveSnapshot(); PopActiveSnapshot();
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
appendStringInfo(buf, "AS %s ", viewDefinition); appendStringInfo(buf, "AS %s ", viewDefinition);
} }

4
src/backend/distributed/deparser/citus_ruleutils.c
View File

@ -818,7 +818,7 @@ deparse_shard_index_statement(IndexStmt *origStmt, Oid distrelid, int64 shardid,
* Switch to empty search_path to deparse_index_columns to produce fully- * Switch to empty search_path to deparse_index_columns to produce fully-
* qualified names in expressions. * qualified names in expressions.
*/ */
PushOverrideEmptySearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
/* index column or expression list begins here */ /* index column or expression list begins here */
appendStringInfoChar(buffer, '('); appendStringInfoChar(buffer, '(');
@ -855,7 +855,7 @@ deparse_shard_index_statement(IndexStmt *origStmt, Oid distrelid, int64 shardid,
} }
/* revert back to original search_path */ /* revert back to original search_path */
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
} }

12
src/backend/distributed/deparser/deparse_domain_stmts.c
View File

@ -345,9 +345,9 @@ AppendAlterDomainStmtSetDefault(StringInfo buf, AlterDomainStmt *stmt)
expr = TransformDefaultExpr(expr, stmt->typeName, baseTypeName); expr = TransformDefaultExpr(expr, stmt->typeName, baseTypeName);
/* deparse while the searchpath is cleared to force qualification of identifiers */ /* deparse while the searchpath is cleared to force qualification of identifiers */
PushOverrideEmptySearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
char *exprSql = deparse_expression(expr, NIL, true, true); char *exprSql = deparse_expression(expr, NIL, true, true);
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
appendStringInfo(buf, "SET DEFAULT %s", exprSql); appendStringInfo(buf, "SET DEFAULT %s", exprSql);
} }
@ -443,9 +443,9 @@ AppendConstraint(StringInfo buf, Constraint *constraint, List *domainName,
elog(ERROR, "missing expression for domain constraint"); elog(ERROR, "missing expression for domain constraint");
} }
PushOverrideEmptySearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
char *exprSql = deparse_expression(expr, NIL, true, true); char *exprSql = deparse_expression(expr, NIL, true, true);
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
appendStringInfo(buf, " CHECK (%s)", exprSql); appendStringInfo(buf, " CHECK (%s)", exprSql);
return; return;
@ -469,9 +469,9 @@ AppendConstraint(StringInfo buf, Constraint *constraint, List *domainName,
elog(ERROR, "missing expression for domain default"); elog(ERROR, "missing expression for domain default");
} }
PushOverrideEmptySearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
char *exprSql = deparse_expression(expr, NIL, true, true); char *exprSql = deparse_expression(expr, NIL, true, true);
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
appendStringInfo(buf, " DEFAULT %s", exprSql); appendStringInfo(buf, " DEFAULT %s", exprSql);
return; return;

4
src/backend/distributed/deparser/deparse_publication_stmts.c
View File

@ -307,11 +307,11 @@ AppendWhereClauseExpression(StringInfo buf, RangeVar *tableName,
List *relationContext = deparse_context_for(tableName->relname, relation->rd_id); List *relationContext = deparse_context_for(tableName->relname, relation->rd_id);
PushOverrideEmptySearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
char *whereClauseString = deparse_expression(whereClause, char *whereClauseString = deparse_expression(whereClause,
relationContext, relationContext,
true, true); true, true);
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
appendStringInfoString(buf, whereClauseString); appendStringInfoString(buf, whereClauseString);

4
src/backend/distributed/deparser/deparse_table_stmts.c
View File

@ -562,9 +562,9 @@ DeparseRawExprForColumnDefault(Oid relationId, Oid columnTypeId, int32 columnTyp
List *deparseContext = deparse_context_for(get_rel_name(relationId), relationId); List *deparseContext = deparse_context_for(get_rel_name(relationId), relationId);
PushOverrideEmptySearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
char *defaultExprStr = deparse_expression(defaultExpr, deparseContext, false, false); char *defaultExprStr = deparse_expression(defaultExpr, deparseContext, false, false);
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
RelationClose(relation); RelationClose(relation);

22
src/backend/distributed/deparser/ruleutils_14.c
View File

@ -53,6 +53,7 @@
#include "common/keywords.h" #include "common/keywords.h"
#include "distributed/citus_nodefuncs.h" #include "distributed/citus_nodefuncs.h"
#include "distributed/citus_ruleutils.h" #include "distributed/citus_ruleutils.h"
#include "distributed/namespace_utils.h"
#include "executor/spi.h" #include "executor/spi.h"
#include "foreign/foreign.h" #include "foreign/foreign.h"
#include "funcapi.h" #include "funcapi.h"
@ -610,18 +611,14 @@ pg_get_rule_expr(Node *expression)
{ {
bool showImplicitCasts = true; bool showImplicitCasts = true;
deparse_context context; deparse_context context;
OverrideSearchPath *overridePath = NULL;
StringInfo buffer = makeStringInfo(); StringInfo buffer = makeStringInfo();
/* /*
* Set search_path to NIL so that all objects outside of pg_catalog will be * Set search_path to NIL so that all objects outside of pg_catalog will be
* schema-prefixed. pg_catalog will be added automatically when we call * schema-prefixed. pg_catalog will be added automatically when we call
* PushOverrideSearchPath(), since we set addCatalog to true; * PushEmptySearchPath().
*/ */
overridePath = GetOverrideSearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
overridePath->schemas = NIL;
overridePath->addCatalog = true;
PushOverrideSearchPath(overridePath);
context.buf = buffer; context.buf = buffer;
context.namespaces = NIL; context.namespaces = NIL;
@ -638,7 +635,7 @@ pg_get_rule_expr(Node *expression)
get_rule_expr(expression, &context, showImplicitCasts); get_rule_expr(expression, &context, showImplicitCasts);
/* revert back to original search_path */ /* revert back to original search_path */
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
return buffer->data; return buffer->data;
} }
@ -1955,8 +1952,6 @@ get_query_def_extended(Query *query, StringInfo buf, List *parentnamespace,
deparse_context context; deparse_context context;
deparse_namespace dpns; deparse_namespace dpns;
OverrideSearchPath *overridePath = NULL;
/* Guard against excessively long or deeply-nested queries */ /* Guard against excessively long or deeply-nested queries */
CHECK_FOR_INTERRUPTS(); CHECK_FOR_INTERRUPTS();
check_stack_depth(); check_stack_depth();
@ -1975,12 +1970,9 @@ get_query_def_extended(Query *query, StringInfo buf, List *parentnamespace,
/* /*
* Set search_path to NIL so that all objects outside of pg_catalog will be * Set search_path to NIL so that all objects outside of pg_catalog will be
* schema-prefixed. pg_catalog will be added automatically when we call * schema-prefixed. pg_catalog will be added automatically when we call
* PushOverrideSearchPath(), since we set addCatalog to true; * PushEmptySearchPath().
*/ */
overridePath = GetOverrideSearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
overridePath->schemas = NIL;
overridePath->addCatalog = true;
PushOverrideSearchPath(overridePath);
context.buf = buf; context.buf = buf;
context.namespaces = lcons(&dpns, list_copy(parentnamespace)); context.namespaces = lcons(&dpns, list_copy(parentnamespace));
@ -2031,7 +2023,7 @@ get_query_def_extended(Query *query, StringInfo buf, List *parentnamespace,
} }
/* revert back to original search_path */ /* revert back to original search_path */
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
} }
/* ---------- /* ----------

22
src/backend/distributed/deparser/ruleutils_15.c
View File

@ -54,6 +54,7 @@
#include "distributed/citus_nodefuncs.h" #include "distributed/citus_nodefuncs.h"
#include "distributed/citus_ruleutils.h" #include "distributed/citus_ruleutils.h"
#include "distributed/multi_router_planner.h" #include "distributed/multi_router_planner.h"
#include "distributed/namespace_utils.h"
#include "executor/spi.h" #include "executor/spi.h"
#include "foreign/foreign.h" #include "foreign/foreign.h"
#include "funcapi.h" #include "funcapi.h"
@ -624,18 +625,14 @@ pg_get_rule_expr(Node *expression)
{ {
bool showImplicitCasts = true; bool showImplicitCasts = true;
deparse_context context; deparse_context context;
OverrideSearchPath *overridePath = NULL;
StringInfo buffer = makeStringInfo(); StringInfo buffer = makeStringInfo();
/* /*
* Set search_path to NIL so that all objects outside of pg_catalog will be * Set search_path to NIL so that all objects outside of pg_catalog will be
* schema-prefixed. pg_catalog will be added automatically when we call * schema-prefixed. pg_catalog will be added automatically when we call
* PushOverrideSearchPath(), since we set addCatalog to true; * PushEmptySearchPath(), since we set addCatalog to true;
*/ */
overridePath = GetOverrideSearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
overridePath->schemas = NIL;
overridePath->addCatalog = true;
PushOverrideSearchPath(overridePath);
context.buf = buffer; context.buf = buffer;
context.namespaces = NIL; context.namespaces = NIL;
@ -652,7 +649,7 @@ pg_get_rule_expr(Node *expression)
get_rule_expr(expression, &context, showImplicitCasts); get_rule_expr(expression, &context, showImplicitCasts);
/* revert back to original search_path */ /* revert back to original search_path */
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
return buffer->data; return buffer->data;
} }
@ -2038,8 +2035,6 @@ get_query_def_extended(Query *query, StringInfo buf, List *parentnamespace,
deparse_context context; deparse_context context;
deparse_namespace dpns; deparse_namespace dpns;
OverrideSearchPath *overridePath = NULL;
/* Guard against excessively long or deeply-nested queries */ /* Guard against excessively long or deeply-nested queries */
CHECK_FOR_INTERRUPTS(); CHECK_FOR_INTERRUPTS();
check_stack_depth(); check_stack_depth();
@ -2058,12 +2053,9 @@ get_query_def_extended(Query *query, StringInfo buf, List *parentnamespace,
/* /*
* Set search_path to NIL so that all objects outside of pg_catalog will be * Set search_path to NIL so that all objects outside of pg_catalog will be
* schema-prefixed. pg_catalog will be added automatically when we call * schema-prefixed. pg_catalog will be added automatically when we call
* PushOverrideSearchPath(), since we set addCatalog to true; * PushEmptySearchPath().
*/ */
overridePath = GetOverrideSearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
overridePath->schemas = NIL;
overridePath->addCatalog = true;
PushOverrideSearchPath(overridePath);
context.buf = buf; context.buf = buf;
context.namespaces = lcons(&dpns, list_copy(parentnamespace)); context.namespaces = lcons(&dpns, list_copy(parentnamespace));
@ -2118,7 +2110,7 @@ get_query_def_extended(Query *query, StringInfo buf, List *parentnamespace,
} }
/* revert back to original search_path */ /* revert back to original search_path */
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
} }
/* ---------- /* ----------

22
src/backend/distributed/deparser/ruleutils_16.c
View File

@ -54,6 +54,7 @@
#include "distributed/citus_nodefuncs.h" #include "distributed/citus_nodefuncs.h"
#include "distributed/citus_ruleutils.h" #include "distributed/citus_ruleutils.h"
#include "distributed/multi_router_planner.h" #include "distributed/multi_router_planner.h"
#include "distributed/namespace_utils.h"
#include "executor/spi.h" #include "executor/spi.h"
#include "foreign/foreign.h" #include "foreign/foreign.h"
#include "funcapi.h" #include "funcapi.h"
@ -641,18 +642,14 @@ pg_get_rule_expr(Node *expression)
{ {
bool showImplicitCasts = true; bool showImplicitCasts = true;
deparse_context context; deparse_context context;
OverrideSearchPath *overridePath = NULL;
StringInfo buffer = makeStringInfo(); StringInfo buffer = makeStringInfo();
/* /*
* Set search_path to NIL so that all objects outside of pg_catalog will be * Set search_path to NIL so that all objects outside of pg_catalog will be
* schema-prefixed. pg_catalog will be added automatically when we call * schema-prefixed. pg_catalog will be added automatically when we call
* PushOverrideSearchPath(), since we set addCatalog to true; * PushEmptySearchPath().
*/ */
overridePath = GetOverrideSearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
overridePath->schemas = NIL;
overridePath->addCatalog = true;
PushOverrideSearchPath(overridePath);
context.buf = buffer; context.buf = buffer;
context.namespaces = NIL; context.namespaces = NIL;
@ -669,7 +666,7 @@ pg_get_rule_expr(Node *expression)
get_rule_expr(expression, &context, showImplicitCasts); get_rule_expr(expression, &context, showImplicitCasts);
/* revert back to original search_path */ /* revert back to original search_path */
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
return buffer->data; return buffer->data;
} }
@ -2052,8 +2049,6 @@ get_query_def_extended(Query *query, StringInfo buf, List *parentnamespace,
deparse_context context; deparse_context context;
deparse_namespace dpns; deparse_namespace dpns;
OverrideSearchPath *overridePath = NULL;
/* Guard against excessively long or deeply-nested queries */ /* Guard against excessively long or deeply-nested queries */
CHECK_FOR_INTERRUPTS(); CHECK_FOR_INTERRUPTS();
check_stack_depth(); check_stack_depth();
@ -2072,12 +2067,9 @@ get_query_def_extended(Query *query, StringInfo buf, List *parentnamespace,
/* /*
* Set search_path to NIL so that all objects outside of pg_catalog will be * Set search_path to NIL so that all objects outside of pg_catalog will be
* schema-prefixed. pg_catalog will be added automatically when we call * schema-prefixed. pg_catalog will be added automatically when we call
* PushOverrideSearchPath(), since we set addCatalog to true; * PushEmptySearchPath().
*/ */
overridePath = GetOverrideSearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
overridePath->schemas = NIL;
overridePath->addCatalog = true;
PushOverrideSearchPath(overridePath);
context.buf = buf; context.buf = buf;
context.namespaces = lcons(&dpns, list_copy(parentnamespace)); context.namespaces = lcons(&dpns, list_copy(parentnamespace));
@ -2132,7 +2124,7 @@ get_query_def_extended(Query *query, StringInfo buf, List *parentnamespace,
} }
/* revert back to original search_path */ /* revert back to original search_path */
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
} }
/* ---------- /* ----------

8
src/backend/distributed/operations/node_protocol.c
View File

@ -612,7 +612,7 @@ GetPreLoadTableCreationCommands(Oid relationId,
{ {
List *tableDDLEventList = NIL; List *tableDDLEventList = NIL;
PushOverrideEmptySearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
/* fetch table schema and column option definitions */ /* fetch table schema and column option definitions */
char *tableSchemaDef = pg_get_tableschemadef_string(relationId, char *tableSchemaDef = pg_get_tableschemadef_string(relationId,
@ -665,7 +665,7 @@ GetPreLoadTableCreationCommands(Oid relationId,
tableDDLEventList = list_concat(tableDDLEventList, policyCommands); tableDDLEventList = list_concat(tableDDLEventList, policyCommands);
/* revert back to original search_path */ /* revert back to original search_path */
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
return tableDDLEventList; return tableDDLEventList;
} }
@ -754,7 +754,7 @@ GatherIndexAndConstraintDefinitionList(Form_pg_index indexForm, List **indexDDLE
int indexFlags) int indexFlags)
{ {
/* generate fully-qualified names */ /* generate fully-qualified names */
PushOverrideEmptySearchPath(CurrentMemoryContext); int saveNestLevel = PushEmptySearchPath();
Oid indexId = indexForm->indexrelid; Oid indexId = indexForm->indexrelid;
bool indexImpliedByConstraint = IndexImpliedByAConstraint(indexForm); bool indexImpliedByConstraint = IndexImpliedByAConstraint(indexForm);
@ -805,7 +805,7 @@ GatherIndexAndConstraintDefinitionList(Form_pg_index indexForm, List **indexDDLE
} }
/* revert back to original search_path */ /* revert back to original search_path */
PopOverrideSearchPath(); PopEmptySearchPath(saveNestLevel);
} }

4
src/backend/distributed/operations/replicate_none_dist_table_shard.c
View File

@ -158,7 +158,7 @@ NoneDistTableDropCoordinatorPlacementTable(Oid noneDistTableId)
* local session because changes made to shards are allowed for Citus internal * local session because changes made to shards are allowed for Citus internal
* backends anyway. * backends anyway.
*/ */
int save_nestlevel = NewGUCNestLevel(); int saveNestLevel = NewGUCNestLevel();
SetLocalEnableLocalReferenceForeignKeys(false); SetLocalEnableLocalReferenceForeignKeys(false);
SetLocalEnableManualChangesToShard(true); SetLocalEnableManualChangesToShard(true);
@ -184,7 +184,7 @@ NoneDistTableDropCoordinatorPlacementTable(Oid noneDistTableId)
bool localExecutionSupported = true; bool localExecutionSupported = true;
ExecuteUtilityTaskList(list_make1(task), localExecutionSupported); ExecuteUtilityTaskList(list_make1(task), localExecutionSupported);
AtEOXact_GUC(true, save_nestlevel); AtEOXact_GUC(true, saveNestLevel);
} }

33
src/backend/distributed/utils/namespace_utils.c
View File

@ -11,22 +11,33 @@
#include "postgres.h" #include "postgres.h"
#include "catalog/namespace.h"
#include "distributed/citus_ruleutils.h"
#include "distributed/namespace_utils.h" #include "distributed/namespace_utils.h"
#include "utils/guc.h"
#include "utils/regproc.h" #include "utils/regproc.h"
/* /*
* PushOverrideEmptySearchPath pushes search_path to be NIL and sets addCatalog to * We use the equivalent of a function SET option to allow the setting to
* true so that all objects outside of pg_catalog will be schema-prefixed. * persist for the exact duration of the transaction, guc.c takes care of
* Afterwards, PopOverrideSearchPath can be used to revert the search_path back. * undoing the setting on error.
*
* We set search_path to "pg_catalog" instead of "" to expose useful utilities.
*/
int
PushEmptySearchPath()
{
int saveNestLevel = NewGUCNestLevel();
(void) set_config_option("search_path", "pg_catalog",
PGC_USERSET, PGC_S_SESSION,
GUC_ACTION_SAVE, true, 0, false);
return saveNestLevel;
}
/*
* Restore the GUC variable search_path we set in PushEmptySearchPath
*/ */
void void
PushOverrideEmptySearchPath(MemoryContext memoryContext) PopEmptySearchPath(int saveNestLevel)
{ {
OverrideSearchPath *overridePath = GetOverrideSearchPath(memoryContext); AtEOXact_GUC(true, saveNestLevel);
overridePath->schemas = NIL;
overridePath->addCatalog = true;
PushOverrideSearchPath(overridePath);
} }

3
src/include/distributed/namespace_utils.h
View File

@ -10,6 +10,7 @@
#ifndef NAMESPACE_UTILS_H #ifndef NAMESPACE_UTILS_H
#define NAMESPACE_UTILS_H #define NAMESPACE_UTILS_H
extern void PushOverrideEmptySearchPath(MemoryContext memoryContext); extern int PushEmptySearchPath(void);
extern void PopEmptySearchPath(int saveNestLevel);
#endif /* NAMESPACE_UTILS_H */ #endif /* NAMESPACE_UTILS_H */