rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Heikki Linnakangas 2014-01-17 10:10:43 +02:00
parent d8a0b96c50
commit 277279981f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/pgbench/pgbench.c
View File

@ -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 */