From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Fri, 30 Nov 2018 13:20:49 +0000 (-0300)
Subject: Silence compiler warning
X-Git-Tag: REL_12_BETA1~1117
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9dc122585551516309c9362e673effdbf3bd79bd;p=thirdparty%2Fpostgresql.git

Silence compiler warning

My original coding was questionable anyway.

Reported-by: Sergei Kornilov
Discussion: https://postgr.es/m/9645101543575886@myt6-27270b78ac4f.qloud-c.yandex.net
---

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 9a948f825df..5ab7d3cd8de 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -2244,12 +2244,13 @@ check_log_duration(char *msec_str, bool was_logged)
 		/*
 		 * 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 log_statement_sample_rate = 1.  But don't compute any of this
+		 * unless needed.
 		 */
-		if (exceeded)
-			in_sample = log_statement_sample_rate != 0 &&
-				(log_statement_sample_rate == 1 ||
-				 random() <= log_statement_sample_rate * MAX_RANDOM_VALUE);
+		in_sample = exceeded &&
+			log_statement_sample_rate != 0 &&
+			(log_statement_sample_rate == 1 ||
+			 random() <= log_statement_sample_rate * MAX_RANDOM_VALUE);
 
 		if ((exceeded && in_sample) || log_duration)
 		{