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

!4774 修复 【资源池化】段页式存储不允许使用有限表空间建表存在相关语法无法被检测

Browse Source 
Merge pull request !4774 from songlinxuan/master
This commit is contained in:
opengauss_bot
2024-01-23 12:17:14 +00:00
committed by Gitee
parent 1fe4d51111 d683bcb5b4
commit 84d3e26c20
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2919,6 +2919,7 @@ ObjectAddress DefineRelation(CreateStmt* stmt, char relkind, Oid ownerId, Object
Oid partTablespaceId = InvalidOid; Oid partTablespaceId = InvalidOid;
char* partitionName = NULL; char* partitionName = NULL;
char* tableSpaceName = NULL; char* tableSpaceName = NULL;
IntervalPartitionDefState* interValPartDef = stmt->partTableState->intervalPartDef;
foreach (cell, stmt->partTableState->partitionList) { foreach (cell, stmt->partTableState->partitionList) {
if (IsA((lfirst(cell)), IntervalPartitionDefState)) { if (IsA((lfirst(cell)), IntervalPartitionDefState)) {
IntervalPartitionDefState* partition = (IntervalPartitionDefState*)lfirst(cell); IntervalPartitionDefState* partition = (IntervalPartitionDefState*)lfirst(cell);
@ -2945,6 +2946,14 @@ ObjectAddress DefineRelation(CreateStmt* stmt, char relkind, Oid ownerId, Object
} }
CheckSegmentIsInLimitTablespace(tableSpaceName, partitionName); CheckSegmentIsInLimitTablespace(tableSpaceName, partitionName);
} }
/* check for interval limited table for segment */
if (interValPartDef && interValPartDef->intervalTablespaces && interValPartDef->intervalTablespaces->length != 0) {
foreach (cell, interValPartDef->intervalTablespaces) {
tableSpaceName = ((Value*)lfirst(cell))->val.str;
CheckSegmentIsInLimitTablespace(tableSpaceName, partitionName);
}
}
} }
} }
@ -19310,7 +19319,16 @@ static void atexecset_table_space_internal(Relation rel, RelFileNode& newrnode,
/* open rel storage avoid relcache invalided*/ /* open rel storage avoid relcache invalided*/
RelationOpenSmgr(rel); RelationOpenSmgr(rel);
/* we should not copy relation to the limited space tablespace */
RelFileNode newFileNode = dstrel->smgr_rnode.node;
uint64 tablespaceMaxSize = 0;
if (IsSegmentFileNode(newFileNode) && TableSpaceUsageManager::IsLimited(newFileNode.spcNode, &tablespaceMaxSize)) {
ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmodule(MOD_SEGMENT_PAGE),
errmsg("Dont support relation movement to limited tablespace segment-page storage!"),
errdetail("Segment-page storage doest not support limited tablespace \"%s\"", get_tablespace_name(newFileNode.spcNode)),
errhint("use default or unlimited user defined tablespace before using segment-page storage.")));
}
/* copy main fork */ /* copy main fork */
copy_relation_data(rel, &dstrel, MAIN_FORKNUM, rel->rd_rel->relpersistence); copy_relation_data(rel, &dstrel, MAIN_FORKNUM, rel->rd_rel->relpersistence);