From fe8534cfc8ae7c2d131c054debc2838c6779d7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E6=B4=AA=E6=96=8C?= Date: Mon, 28 Sep 2020 15:10:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?clob=E5=8F=AF=E4=BD=9C=E4=B8=BA=E5=88=86?= =?UTF-8?q?=E5=8C=BA=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gausskernel/optimizer/commands/tablecmds.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gausskernel/optimizer/commands/tablecmds.cpp b/src/gausskernel/optimizer/commands/tablecmds.cpp index 006ab17d5..7271c6373 100644 --- a/src/gausskernel/optimizer/commands/tablecmds.cpp +++ b/src/gausskernel/optimizer/commands/tablecmds.cpp @@ -15922,6 +15922,8 @@ static bool CheckRangePartitionKeyType(Oid typoid) break; case TEXTOID: + /* fall through */ + case CLOBOID: result = true; break; From dee1ecfa79939384f7e92a91642b29fc0bf5fdce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E6=B4=AA=E6=96=8C?= Date: Mon, 28 Sep 2020 15:17:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9pt=5Fctl=E5=86=85?= =?UTF-8?q?=E5=AD=98=E6=B3=84=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bin/pg_ctl/pg_ctl.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/pg_ctl/pg_ctl.cpp b/src/bin/pg_ctl/pg_ctl.cpp index a6228eb41..6bc30e0fe 100644 --- a/src/bin/pg_ctl/pg_ctl.cpp +++ b/src/bin/pg_ctl/pg_ctl.cpp @@ -3900,6 +3900,7 @@ static void do_incremental_build(uint32 term) } if (status == BUILD_SUCCESS) { /* pg_ctl start -M standby */ + FREE_AND_RESET(pgha_opt); pgha_opt = (char*)pg_malloc(sizeof(standbymode_str)); tnRet = snprintf_s(pgha_opt, sizeof(standbymode_str), sizeof(standbymode_str) - 1, "%s", standbymode_str); securec_check_ss_c(tnRet, "\0", "\0"); @@ -4013,6 +4014,7 @@ static void do_actual_build(uint32 term) */ if (conn_str == NULL) { /* pg_ctl start -M standby */ + FREE_AND_RESET(pgha_opt); pgha_opt = (char*)pg_malloc(sizeof(standbymode_str)); tnRet = snprintf_s(pgha_opt, sizeof(standbymode_str), sizeof(standbymode_str) - 1, "%s", standbymode_str); securec_check_ss_c(tnRet, "\0", "\0"); From 23e0f4815073427de713c9d785f70153cfd2ffc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E6=B4=AA=E6=96=8C?= Date: Mon, 28 Sep 2020 16:15:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?totaldeadrows=E8=B5=8B=E5=80=BC=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gausskernel/optimizer/commands/analyze.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gausskernel/optimizer/commands/analyze.cpp b/src/gausskernel/optimizer/commands/analyze.cpp index ab44888ed..f0f36e70f 100755 --- a/src/gausskernel/optimizer/commands/analyze.cpp +++ b/src/gausskernel/optimizer/commands/analyze.cpp @@ -926,7 +926,7 @@ HeapTuple* get_total_rows(Relation onerel, VacuumStmt* vacstmt, BlockNumber relp *numrows = (tableFdwRoutine->AcquireSampleRows)( onerel, elevel, rows, target_rows, totalrows, totaldeadrows, 0, estimate_table_rownum); } - totaldeadrows = 0; /* set totaldeadrows to zero. It is no means to foreign table. */ + *totaldeadrows = 0; /* set totaldeadrows to zero. It is no means to foreign table. */ } } else { if (RelationIsColStore(onerel)) {