| Revision | 7342e2765e54620424c64b9075b85a1128f9367d (tree) |
|---|---|
| Time | 2014-01-20 16:10:51 |
| Author | Takashi Suzuki <suzuki.takashi@metr...> |
| Commiter | Takashi Suzuki |
pg_stat_statementsから流用している関数を更新した。
normalize_query.h (diff)
pg_stat_statements.c (diff)| @@ -6,7 +6,7 @@ | ||
| 6 | 6 | * This header file is created from pg_stat_statements.c to implement |
| 7 | 7 | * normalization of query string. |
| 8 | 8 | * |
| 9 | - * Portions Copyright (c) 2008-2013, PostgreSQL Global Development Group | |
| 9 | + * Portions Copyright (c) 2008-2014, PostgreSQL Global Development Group | |
| 10 | 10 | */ |
| 11 | 11 | #ifndef NORMALIZE_QUERY_H |
| 12 | 12 | #define NORMALIZE_QUERY_H |
| @@ -34,7 +34,7 @@ | ||
| 34 | 34 | * disappear!) and also take the entry's mutex spinlock. |
| 35 | 35 | * |
| 36 | 36 | * |
| 37 | - * Copyright (c) 2008-2013, PostgreSQL Global Development Group | |
| 37 | + * Copyright (c) 2008-2014, PostgreSQL Global Development Group | |
| 38 | 38 | * |
| 39 | 39 | * IDENTIFICATION |
| 40 | 40 | * contrib/pg_stat_statements/pg_stat_statements.c |
| @@ -245,8 +245,8 @@ static void pgss_ExecutorRun(QueryDesc *queryDesc, | ||
| 245 | 245 | long count); |
| 246 | 246 | static void pgss_ExecutorFinish(QueryDesc *queryDesc); |
| 247 | 247 | static void pgss_ExecutorEnd(QueryDesc *queryDesc); |
| 248 | -static void pgss_ProcessUtility(Node *parsetree, const char *queryString, | |
| 249 | - ProcessUtilityContext context, ParamListInfo params, | |
| 248 | +static void pgss_ProcessUtility(Node *parsetree, | |
| 249 | + const char *queryString, ParamListInfo params, bool isTopLevel, | |
| 250 | 250 | DestReceiver *dest, char *completionTag); |
| 251 | 251 | static uint32 pgss_hash_fn(const void *key, Size keysize); |
| 252 | 252 | static int pgss_match_fn(const void *key1, const void *key2, Size keysize); |
| @@ -797,7 +797,7 @@ pgss_ExecutorEnd(QueryDesc *queryDesc) | ||
| 797 | 797 | */ |
| 798 | 798 | static void |
| 799 | 799 | pgss_ProcessUtility(Node *parsetree, const char *queryString, |
| 800 | - ProcessUtilityContext context, ParamListInfo params, | |
| 800 | + ParamListInfo params, bool isTopLevel, | |
| 801 | 801 | DestReceiver *dest, char *completionTag) |
| 802 | 802 | { |
| 803 | 803 | /* |
| @@ -830,13 +830,11 @@ pgss_ProcessUtility(Node *parsetree, const char *queryString, | ||
| 830 | 830 | PG_TRY(); |
| 831 | 831 | { |
| 832 | 832 | if (prev_ProcessUtility) |
| 833 | - prev_ProcessUtility(parsetree, queryString, | |
| 834 | - context, params, | |
| 835 | - dest, completionTag); | |
| 833 | + prev_ProcessUtility(parsetree, queryString, params, | |
| 834 | + isTopLevel, dest, completionTag); | |
| 836 | 835 | else |
| 837 | - standard_ProcessUtility(parsetree, queryString, | |
| 838 | - context, params, | |
| 839 | - dest, completionTag); | |
| 836 | + standard_ProcessUtility(parsetree, queryString, params, | |
| 837 | + isTopLevel, dest, completionTag); | |
| 840 | 838 | nested_level--; |
| 841 | 839 | } |
| 842 | 840 | PG_CATCH(); |
| @@ -893,13 +891,11 @@ pgss_ProcessUtility(Node *parsetree, const char *queryString, | ||
| 893 | 891 | else |
| 894 | 892 | { |
| 895 | 893 | if (prev_ProcessUtility) |
| 896 | - prev_ProcessUtility(parsetree, queryString, | |
| 897 | - context, params, | |
| 898 | - dest, completionTag); | |
| 894 | + prev_ProcessUtility(parsetree, queryString, params, | |
| 895 | + isTopLevel, dest, completionTag); | |
| 899 | 896 | else |
| 900 | - standard_ProcessUtility(parsetree, queryString, | |
| 901 | - context, params, | |
| 902 | - dest, completionTag); | |
| 897 | + standard_ProcessUtility(parsetree, queryString, params, | |
| 898 | + isTopLevel, dest, completionTag); | |
| 903 | 899 | } |
| 904 | 900 | } |
| 905 | 901 |
| @@ -2143,4 +2139,3 @@ comp_location(const void *a, const void *b) | ||
| 2143 | 2139 | else |
| 2144 | 2140 | return 0; |
| 2145 | 2141 | } |
| 2146 | - |
Fork