Skip to content

Commit 4f9ed8f

Browse files
committed
Revert "Silence compiler warning"
This reverts commit 9dc1225. As committed, statement sampling used the existing duration threshold (log_min_duration_statement) when decide which statements to sample. The issue is that even the longest statements are subject to sampling, and so may not end up logged. An improvement was proposed, introducing a second duration threshold, but it would not be backwards compatible. So we've decided to revert this feature - the separate threshold should be part of the feature itself. Discussion: https://postgr.es/m/CAFj8pRDS8tQ3Wviw9%3DAvODyUciPSrGeMhJi_WPE%2BEB8%2B4gLL-Q%40mail.gmail.com
1 parent e0f5048 commit 4f9ed8f

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/backend/tcop/postgres.c

+6-7
Original file line numberDiff line numberDiff line change
@@ -2256,14 +2256,13 @@ check_log_duration(char *msec_str, bool was_logged)
22562256

22572257
/*
22582258
* Do not log if log_statement_sample_rate = 0. Log a sample if
2259-
* log_statement_sample_rate <= 1 and avoid unnecessary random() call
2260-
* if log_statement_sample_rate = 1. But don't compute any of this
2261-
* unless needed.
2259+
* log_statement_sample_rate <= 1 and avoid unecessary random() call
2260+
* if log_statement_sample_rate = 1.
22622261
*/
2263-
in_sample = exceeded &&
2264-
log_statement_sample_rate != 0 &&
2265-
(log_statement_sample_rate == 1 ||
2266-
random() <= log_statement_sample_rate * MAX_RANDOM_VALUE);
2262+
if (exceeded)
2263+
in_sample = log_statement_sample_rate != 0 &&
2264+
(log_statement_sample_rate == 1 ||
2265+
random() <= log_statement_sample_rate * MAX_RANDOM_VALUE);
22672266

22682267
if ((exceeded && in_sample) || log_duration || xact_is_sampled)
22692268
{

0 commit comments

Comments
 (0)