diff options
| author | Michael Paquier <michael@paquier.xyz> | 2023-06-28 08:59:36 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2023-06-28 08:59:36 +0900 |
| commit | 2ecbb0a49359759b46dd82df4ac3a083c36b1db4 (patch) | |
| tree | 73bb27d6a41a51e040c08827085774991198f23e | |
| parent | 876d17d62fe84d706058f2458f067f0e9049a230 (diff) | |
| download | postgresql-2ecbb0a49359759b46dd82df4ac3a083c36b1db4.tar.gz postgresql-2ecbb0a49359759b46dd82df4ac3a083c36b1db4.zip | |
Remove dependency to query text in JumbleQuery()
Since 3db72eb, the query ID of utilities is generated using the Query
structure, making the use of the query string in JumbleQuery()
unnecessary. This commit removes the argument "querytext" from
JumbleQuery().
Reported-by: Joe Conway
Reviewed-by: Nathan Bossart
Discussion: https://postgr.es/m/ZJlQAWE4COFqHuAV@paquier.xyz
| -rw-r--r-- | src/backend/commands/explain.c | 2 | ||||
| -rw-r--r-- | src/backend/nodes/queryjumblefuncs.c | 2 | ||||
| -rw-r--r-- | src/backend/parser/analyze.c | 6 | ||||
| -rw-r--r-- | src/include/nodes/queryjumble.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 15f9bddcdf3..8570b14f621 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -255,7 +255,7 @@ ExplainQuery(ParseState *pstate, ExplainStmt *stmt, query = castNode(Query, stmt->query); if (IsQueryIdEnabled()) - jstate = JumbleQuery(query, pstate->p_sourcetext); + jstate = JumbleQuery(query); if (post_parse_analyze_hook) (*post_parse_analyze_hook) (pstate, query, jstate); diff --git a/src/backend/nodes/queryjumblefuncs.c b/src/backend/nodes/queryjumblefuncs.c index d7fd72d70f2..281907a4d83 100644 --- a/src/backend/nodes/queryjumblefuncs.c +++ b/src/backend/nodes/queryjumblefuncs.c @@ -97,7 +97,7 @@ CleanQuerytext(const char *query, int *location, int *len) } JumbleState * -JumbleQuery(Query *query, const char *querytext) +JumbleQuery(Query *query) { JumbleState *jstate = NULL; diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 70932dba617..40066320927 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -124,7 +124,7 @@ parse_analyze_fixedparams(RawStmt *parseTree, const char *sourceText, query = transformTopLevelStmt(pstate, parseTree); if (IsQueryIdEnabled()) - jstate = JumbleQuery(query, sourceText); + jstate = JumbleQuery(query); if (post_parse_analyze_hook) (*post_parse_analyze_hook) (pstate, query, jstate); @@ -166,7 +166,7 @@ parse_analyze_varparams(RawStmt *parseTree, const char *sourceText, check_variable_parameters(pstate, query); if (IsQueryIdEnabled()) - jstate = JumbleQuery(query, sourceText); + jstate = JumbleQuery(query); if (post_parse_analyze_hook) (*post_parse_analyze_hook) (pstate, query, jstate); @@ -203,7 +203,7 @@ parse_analyze_withcb(RawStmt *parseTree, const char *sourceText, query = transformTopLevelStmt(pstate, parseTree); if (IsQueryIdEnabled()) - jstate = JumbleQuery(query, sourceText); + jstate = JumbleQuery(query); if (post_parse_analyze_hook) (*post_parse_analyze_hook) (pstate, query, jstate); diff --git a/src/include/nodes/queryjumble.h b/src/include/nodes/queryjumble.h index 3499bfd4a09..7649e095aa5 100644 --- a/src/include/nodes/queryjumble.h +++ b/src/include/nodes/queryjumble.h @@ -64,7 +64,7 @@ extern PGDLLIMPORT int compute_query_id; extern const char *CleanQuerytext(const char *query, int *location, int *len); -extern JumbleState *JumbleQuery(Query *query, const char *querytext); +extern JumbleState *JumbleQuery(Query *query); extern void EnableQueryId(void); extern PGDLLIMPORT bool query_id_enabled; |