Prevent integer overflow with --progress >= 2148

If --progress=2148 or higher was given, the calculation of the next time
to report overflowed, and pgbench would print a progress report very
frequently.

Kingter Wang

diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
index 8f125830965119a9b064a93be0de8478a374d039..16b7ab5ddc7f93d63c5636b3bedae16ee75850a7 100644 (file)
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -2974,7 +2974,7 @@ threadRun(void *arg)
        /* for reporting progress: */
        int64       thread_start = INSTR_TIME_GET_MICROSEC(thread->start_time);
        int64           last_report = thread_start;
-       int64           next_report = last_report + progress * 1000000;
+       int64           next_report = last_report + (int64) progress * 1000000;
        int64           last_count = 0, last_lats = 0, last_sqlats = 0, last_lags = 0;
 
        AggVals         aggs;
@@ -3210,7 +3210,7 @@ threadRun(void *arg)
                                last_sqlats = sqlats;
                                last_lags = lags;
                                last_report = now;
-                               next_report += progress * 1000000;
+                               next_report += (int64) progress * 1000000;
                        }
                }
 #else
@@ -3261,7 +3261,7 @@ threadRun(void *arg)
                                last_sqlats = sqlats;
                                last_lags = lags;
                                last_report = now;
-                               next_report += progress * 1000000;
+                               next_report += (int64) progress * 1000000;
                        }
                }
 #endif /* PTHREAD_FORK_EMULATION */