• Tom Lane's avatar
    Improve handling of utility statements containing plannable statements. · e0e4ebe3
    Tom Lane authored
    When tracking nested statements, contrib/pg_stat_statements formerly
    double-counted the execution costs of utility statements that directly
    contain an executable statement, such as EXPLAIN and DECLARE CURSOR.
    This was not obvious since the ProcessUtility and Executor hooks
    would each add their measured costs to the same stats table entry.
    However, with the new implementation that hashes utility and plannable
    statements differently, this showed up as seemingly-duplicate stats
    entries.  Fix that by disabling the Executor hooks when the query has a
    queryId of zero, which was the case already for such statements but is now
    more clearly specified in the code.  (The zero queryId was causing problems
    anyway because all such statements would add to a single bogus entry.)
    
    The PREPARE/EXECUTE case still results in counting the same execution
    in two different stats table entries, but it should be much less surprising
    to users that there are two entries in such cases.
    
    In passing, include a CommonTableExpr's ctename in the query hash.
    I had left it out originally on the grounds that we wanted to omit all
    inessential aliases, but since RTE_CTE RTEs are hashing their referenced
    names, we'd better hash the CTE names too to make sure we don't hash
    semantically different queries the same.
    e0e4ebe3
pg_stat_statements.c 56.1 KB