FIX

Fenimorkin · dmpgpro · commit a397aa488547 · 2016-12-14T17:57:54.000+03:00
diff --git a/src/backend/commands/waitlsn.c b/src/backend/commands/waitlsn.c
@@ -142,14 +142,18 @@ WaitLSNSetLatch(void)
 void
 WaitLSNUtility(const char *lsn, const int delay)
 {
-	XLogRecPtr	trg_lsn;
-	XLogRecPtr	cur_lsn;
-	int			latch_events;
-	int			tdelay = delay;
-	TimestampTz	timer = GetCurrentTimestamp();
+	XLogRecPtr		trg_lsn;
+	XLogRecPtr		cur_lsn;
+	int				latch_events;
+	uint_fast64_t	tdelay = delay;
+	long			secs;
+	int				microsecs;
+	TimestampTz		timer = GetCurrentTimestamp();
+
 	trg_lsn = DatumGetLSN(DirectFunctionCall1(pg_lsn_in, CStringGetDatum(lsn)));
+//	tdelay *= 1000;
 
-	tdelay *= 1000;
+	elog(LOG,"ACHTUNG  tdelay %u",tdelay);
 
 	if (delay > 0)
 		latch_events = WL_LATCH_SET | WL_TIMEOUT | WL_POSTMASTER_DEATH;
@@ -174,9 +178,11 @@ WaitLSNUtility(const char *lsn, const int delay)
 		/* If Delay time is over */
 		if (latch_events & WL_TIMEOUT)
 		{
-			tdelay -= (GetCurrentTimestamp() - timer);
-			if (tdelay <= 0)
+			if (TimestampDifferenceExceeds(timer,GetCurrentTimestamp(),tdelay))
 				break;
+			TimestampDifference(timer,GetCurrentTimestamp(),&secs, &microsecs);
+			tdelay -= (secs*1000 + microsecs/1000);
+			elog(LOG,"ACHTUNG  tdelay %u, %d",tdelay, TimestampDifferenceExceeds(timer,GetCurrentTimestamp(),tdelay));
 			timer = GetCurrentTimestamp();
 		}
 
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
@@ -913,7 +913,7 @@ standard_ProcessUtility(Node *parsetree,
 							"WaitLSN")));
 				}
 				else
-					WaitLSNUtility(stmt->lsn, *stmt->delay);
+					WaitLSNUtility(stmt->lsn, stmt->delay);
 			}
 			break;
 
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
@@ -3112,7 +3112,7 @@ typedef struct WaitLSNStmt
 {
 	NodeTag		type;
 	char	   *lsn;			/* Taraget LSN to wait for */
-	int		   *delay;			/* Delay to wait for LSN*/
+	int			delay;			/* Delay to wait for LSN*/
 } WaitLSNStmt;
 
 #endif   /* PARSENODES_H */

Original file line number	Diff line number	Diff line change
`@@ -913,7 +913,7 @@ standard_ProcessUtility(Node *parsetree,`
`913`	`913`	`"WaitLSN")));`
`914`	`914`	`}`
`915`	`915`	`else`
`916`		`- WaitLSNUtility(stmt->lsn, *stmt->delay);`
	`916`	`+ WaitLSNUtility(stmt->lsn, stmt->delay);`
`917`	`917`	`}`
`918`	`918`	`break;`
`919`	`919`
Original file line number	Diff line number	Diff line change
`@@ -3112,7 +3112,7 @@ typedef struct WaitLSNStmt`
`3112`	`3112`	`{`
`3113`	`3113`	`NodeTag type;`
`3114`	`3114`	`char lsn; / Taraget LSN to wait for */`
`3115`		`- int delay; / Delay to wait for LSN*/`
	`3115`	`+ int delay; /* Delay to wait for LSN*/`
`3116`	`3116`	`} WaitLSNStmt;`
`3117`	`3117`
`3118`	`3118`	`#endif /* PARSENODES_H */`