From 497fd660ee546afb2083c77ddcec8e8a90d7d8a4 Mon Sep 17 00:00:00 2001 From: yupeng Date: Thu, 13 Aug 2020 15:19:23 +0800 Subject: [PATCH 1/2] fix bugs --- src/gausskernel/cbb/instruments/wdr/snapshot.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gausskernel/cbb/instruments/wdr/snapshot.cpp b/src/gausskernel/cbb/instruments/wdr/snapshot.cpp index 67a30616b6..fb92233910 100644 --- a/src/gausskernel/cbb/instruments/wdr/snapshot.cpp +++ b/src/gausskernel/cbb/instruments/wdr/snapshot.cpp @@ -155,6 +155,7 @@ static void check_snapshot_thd_exit() char* redis_group = PgxcGroupGetInRedistributionGroup(); if (redis_group != NULL) { need_exit = true; + u_sess->attr.attr_common.ExitOnAnyError = true; } CommitTransactionCommand(); @@ -1451,6 +1452,7 @@ void SnapshotNameSpace::SubSnapshotMain(void) TablesList tablesList; const int SLEEP_GAP_AFTER_ERROR = 1; InitSnapshot(tablesList); + u_sess->attr.attr_common.ExitOnAnyError = false; while (!t_thrd.perf_snap_cxt.need_exit && (PgxcIsCentralCoordinator(g_instance.attr.attr_common.PGXCNodeName) || IS_SINGLE_NODE) && -- Gitee From 18814f47dd0e8808e05c8bb7f67c063491a54303 Mon Sep 17 00:00:00 2001 From: yupeng Date: Tue, 18 Aug 2020 17:51:40 +0800 Subject: [PATCH 2/2] add pgbench --- contrib/pgbench/pgbench.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/pgbench/pgbench.cpp b/contrib/pgbench/pgbench.cpp index 590dcfe290..5064e0ea15 100644 --- a/contrib/pgbench/pgbench.cpp +++ b/contrib/pgbench/pgbench.cpp @@ -34,7 +34,7 @@ #include "postgres_fe.h" #include "getopt_long.h" -#include "libpq-fe.h" +#include "libpq/libpq-fe.h" #include "libpq/pqsignal.h" #include "portability/instr_time.h" -- Gitee