database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!1937 【代码回合】interval分区不支持sqlbypass回显适配

Browse Source 
Merge pull request !1937 from zhangzhixian/master
This commit is contained in:
opengauss-bot
2022-07-12 13:01:04 +00:00
committed by Gitee
parent 6ce004b9f3 44e3262d67
commit 73ba974a9e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gausskernel/runtime/opfusion/opfusion_util.cpp
View File

@ -257,8 +257,8 @@ const char* getBypassReason(FusionType result)
case NOBYPASS_PARTITION_BYPASS_NOT_OPEN: {
return "enable_partition_opfusion is in the closed state";
}
case NOBYPASS_PARTITION_NOT_SUPPORT_IN_LIST_OR_HASH_PARTITION: {
return "Bypass not support in list/hash partition currently";
case NOBYPASS_PARTITION_TYPE_NOT_SUPPORT: {
return "Bypass only support in range partition currently";
}
case NOBYPASS_VERSION_SCAN_PLAN: {
@ -826,7 +826,7 @@ FusionType getSelectFusionType(List *stmt_list, ParamListInfo params)
}
if (checkPartitionType(rel)) {
heap_close(rel, AccessShareLock);
return NOBYPASS_PARTITION_NOT_SUPPORT_IN_LIST_OR_HASH_PARTITION;
return NOBYPASS_PARTITION_TYPE_NOT_SUPPORT;
}
heap_close(rel, AccessShareLock);
@ -948,7 +948,7 @@ FusionType getInsertFusionType(List *stmt_list, ParamListInfo params)
}
if (checkPartitionType(rel)) {
heap_close(rel, AccessShareLock);
return NOBYPASS_PARTITION_NOT_SUPPORT_IN_LIST_OR_HASH_PARTITION;
return NOBYPASS_PARTITION_TYPE_NOT_SUPPORT;
}
heap_close(rel, AccessShareLock);
/*
@ -1018,7 +1018,7 @@ FusionType getUpdateFusionType(List *stmt_list, ParamListInfo params)
}
if (checkPartitionType(rel)) {
heap_close(rel, AccessShareLock);
return NOBYPASS_PARTITION_NOT_SUPPORT_IN_LIST_OR_HASH_PARTITION;
return NOBYPASS_PARTITION_TYPE_NOT_SUPPORT;
}
heap_close(rel, AccessShareLock);
@ -1095,7 +1095,7 @@ FusionType getDeleteFusionType(List *stmt_list, ParamListInfo params)
}
if (checkPartitionType(rel)) {
heap_close(rel, AccessShareLock);
return NOBYPASS_PARTITION_NOT_SUPPORT_IN_LIST_OR_HASH_PARTITION;
return NOBYPASS_PARTITION_TYPE_NOT_SUPPORT;
}
heap_close(rel, AccessShareLock);

2
src/include/opfusion/opfusion_util.h
View File

@ -112,7 +112,7 @@ enum FusionType {
NOBYPASS_NO_INCLUDING_PARTITIONKEY,
NOBYPASS_PARTITION_BYPASS_NOT_OPEN,
NOBYPASS_VERSION_SCAN_PLAN,
NOBYPASS_PARTITION_NOT_SUPPORT_IN_LIST_OR_HASH_PARTITION
NOBYPASS_PARTITION_TYPE_NOT_SUPPORT
};
enum FusionDebug {