diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/tcop/postgres.c | 16 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 15 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 12 | ||||
| -rw-r--r-- | src/include/utils/guc.h | 1 |
4 files changed, 7 insertions, 37 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 1679cce1f17..e8d8e6f8285 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -2212,8 +2212,7 @@ check_log_statement(List *stmt_list) /* * check_log_duration - * Determine whether current command's duration should be logged. - * If log_statement_sample_rate < 1.0, log only a sample. + * Determine whether current command's duration should be logged * We also check if this statement in this transaction must be logged * (regardless of its duration). * @@ -2237,7 +2236,6 @@ check_log_duration(char *msec_str, bool was_logged) int usecs; int msecs; bool exceeded; - bool in_sample; TimestampDifference(GetCurrentStatementStartTimestamp(), GetCurrentTimestamp(), @@ -2254,17 +2252,7 @@ check_log_duration(char *msec_str, bool was_logged) (secs > log_min_duration_statement / 1000 || secs * 1000 + msecs >= log_min_duration_statement))); - /* - * Do not log if log_statement_sample_rate = 0. Log a sample if - * log_statement_sample_rate <= 1 and avoid unecessary random() call - * if log_statement_sample_rate = 1. - */ - if (exceeded) - in_sample = log_statement_sample_rate != 0 && - (log_statement_sample_rate == 1 || - random() <= log_statement_sample_rate * MAX_RANDOM_VALUE); - - if ((exceeded && in_sample) || log_duration || xact_is_sampled) + if (exceeded || log_duration || xact_is_sampled) { snprintf(msec_str, 32, "%ld.%03d", secs * 1000 + msecs, usecs % 1000); diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index fc463601ff3..eb785220539 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -511,7 +511,6 @@ int log_min_messages = WARNING; int client_min_messages = NOTICE; int log_min_duration_statement = -1; int log_temp_files = -1; -double log_statement_sample_rate = 1.0; double log_xact_sample_rate = 0; int trace_recovery_messages = LOG; @@ -2705,8 +2704,7 @@ static struct config_int ConfigureNamesInt[] = {"log_min_duration_statement", PGC_SUSET, LOGGING_WHEN, gettext_noop("Sets the minimum execution time above which " "statements will be logged."), - gettext_noop("Zero prints all queries, subject to log_statement_sample_rate. " - "-1 turns this feature off."), + gettext_noop("Zero prints all queries. -1 turns this feature off."), GUC_UNIT_MS }, &log_min_duration_statement, @@ -3433,17 +3431,6 @@ static struct config_real ConfigureNamesReal[] = }, { - {"log_statement_sample_rate", PGC_SUSET, LOGGING_WHEN, - gettext_noop("Fraction of statements exceeding log_min_duration_statement to be logged."), - gettext_noop("If you only want a sample, use a value between 0.0 (never " - "log) and 1.0 (always log).") - }, - &log_statement_sample_rate, - 1.0, 0.0, 1.0, - NULL, NULL, NULL - }, - - { {"log_transaction_sample_rate", PGC_SUSET, LOGGING_WHEN, gettext_noop("Set the fraction of transactions to log for new transactions."), gettext_noop("Logs all statements from a fraction of transactions. " diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index cfad86c02a0..65a6da18b35 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -488,14 +488,10 @@ # fatal # panic (effectively off) -#log_min_duration_statement = -1 # logs statements and their durations - # according to log_statement_sample_rate. -1 is disabled, - # 0 logs all statements, > 0 logs only statements running - # at least this number of milliseconds. - -#log_statement_sample_rate = 1.0 # Fraction of logged statements exceeding - # log_min_duration_statement to be logged. - # 1.0 logs all such statements, 0.0 never logs. +#log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements + # and their durations, > 0 logs only + # statements running at least this number + # of milliseconds #log_transaction_sample_rate = 0.0 # Fraction of transactions whose statements # are logged regardless of their duration. 1.0 logs all diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index e800230ed94..a93ed77c9c3 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -253,7 +253,6 @@ extern PGDLLIMPORT int log_min_messages; extern PGDLLIMPORT int client_min_messages; extern int log_min_duration_statement; extern int log_temp_files; -extern double log_statement_sample_rate; extern double log_xact_sample_rate; extern int temp_file_limit; |