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/[email protected]

diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index 15f9bddcdf3fa751973183b7ece5c766ae32e249..8570b14f6217bc1e8f193578f433d8aa2a7b4eaa 100644 (file)
--- 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 d7fd72d70f202daffa3b7896d79b90a57a27df3d..281907a4d83d3f3fff51b1f821dca6ee6ac3040a 100644 (file)
--- 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 70932dba617d6b9b7a1f03122be9071f52438675..40066320927867d8e96014a5bba3537b87083aa9 100644 (file)
--- 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 3499bfd4a098c31efcd7d5cbb19c5a6969400dd1..7649e095aa57239a3791fedd96d6b51217686ee9 100644 (file)
--- 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;