From 722435ec984f2a3ab770c3fb30ecdfc52094b532 Mon Sep 17 00:00:00 2001
From: Ibrar Ahmed <ibrar.ahmad@gmail.com>
Date: Tue, 12 Jan 2021 15:51:34 +0000
Subject: [PATCH] PG-161: Miscellaneous small issues.

---
 pg_stat_monitor.c | 2 ++
 pg_stat_monitor.h | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pg_stat_monitor.c b/pg_stat_monitor.c
index 394b467..b54812b 100644
--- a/pg_stat_monitor.c
+++ b/pg_stat_monitor.c
@@ -996,6 +996,8 @@ static void pgss_store(uint64 queryId,
 		e->counters.info.host = pg_get_client_addr();
 		e->counters.sysinfo.utime = utime;
 		e->counters.sysinfo.stime = stime;
+		if (sqlcode != 0)
+			memset(&entry->counters.blocks, 0, sizeof(entry->counters.blocks));
 		SpinLockRelease(&e->mutex);
 		}
 	}
diff --git a/pg_stat_monitor.h b/pg_stat_monitor.h
index 371d3a5..f8e3c60 100644
--- a/pg_stat_monitor.h
+++ b/pg_stat_monitor.h
@@ -171,8 +171,8 @@ typedef struct QueryInfo
 
 typedef struct ErrorInfo
 {
-	unsigned char	elevel;							/* error elevel */
-	unsigned char	sqlcode;						/* error sqlcode  */
+	int64	elevel;							/* error elevel */
+	int64	sqlcode;						/* error sqlcode  */
 	char			message[ERROR_MESSAGE_LEN];   	/* error message text */
 } ErrorInfo;