huawei
/
openGauss-server
0
0
Fork 77
Code Issues Pull Requests 24 Projects Releases Wiki Activity

!267 clob可作为分区列 

Merge pull request !267 from 骆洪斌/master
This commit is contained in:
opengauss-bot 2020-09-28 17:30:45 +08:00 committed by Gitee
parent 1bc0eaedd6 23e0f48150
commit 62bf5cfc71
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/pg_ctl/pg_ctl.cpp
View File

@ -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");

2
src/gausskernel/optimizer/commands/analyze.cpp
View File

@ -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)) {

2
src/gausskernel/optimizer/commands/tablecmds.cpp
View File

@ -15922,6 +15922,8 @@ static bool CheckRangePartitionKeyType(Oid typoid)
break;
case TEXTOID:
/* fall through */
case CLOBOID:
result = true;
break;