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

!5868 shrink语句操作不存在的表时需要报错

Browse Source 
Merge pull request !5868 from 胡正超/shrink
This commit is contained in:
opengauss_bot
2024-07-26 03:05:00 +00:00
committed by Gitee
parent 7d80255ab2 b372df81e4
commit 0e9673de81
5 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32539,7 +32539,7 @@ void ShrinkCfsChunkRestore(Oid relationId, LOCKMODE lockmode, bool nowait)
relation_close(relation, lockmode);
}
void ShrinkRealtionChunk(ShrinkStmt* shrink)
void ShrinkRelationChunk(ShrinkStmt* shrink)
{
ListCell* cell = NULL;
foreach (cell, shrink->relations) {
@ -32553,9 +32553,11 @@ void ShrinkRealtionChunk(ShrinkStmt* shrink)
reloid = RangeVarGetRelid(r, AccessShareLock, true);
if (!OidIsValid(reloid)) {
continue;
ereport(ERROR, (errmsg("[shrink] relation %s%s%s does not exist.",
r->schemaname == NULL ? "" : r->schemaname,
r->schemaname == NULL ? "" : ".",
r->relname)));
}
ShrinkCfsChunkRestore(reloid, AccessShareLock, shrink->nowait);
}
}

12
src/gausskernel/process/tcop/utility.cpp
View File

@ -2527,7 +2527,7 @@ ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
#endif
}
void ExecShrinkRealtionChunkStmt(Node* parse_tree, const char* query_string, bool sent_to_remote)
void ExecShrinkRelationChunkStmt(Node* parse_tree, const char* query_string, bool sent_to_remote)
{
#ifdef PGXC
if (IS_PGXC_COORDINATOR) {
@ -2537,18 +2537,18 @@ void ExecShrinkRealtionChunkStmt(Node* parse_tree, const char* query_string, boo
if (u_sess->attr.attr_sql.enable_parallel_ddl && !is_first_node) {
ExecUtilityStmtOnNodes_ParallelDDLMode(
query_string, NULL, sent_to_remote, false, EXEC_ON_COORDS, false, first_exec_node);
ShrinkRealtionChunk((ShrinkStmt*)(void *)parse_tree);
ShrinkRelationChunk((ShrinkStmt*)(void *)parse_tree);
ExecUtilityStmtOnNodes_ParallelDDLMode(
query_string, NULL, sent_to_remote, false, EXEC_ON_DATANODES, false, first_exec_node);
} else {
ShrinkRealtionChunk((ShrinkStmt*)(void *)parse_tree);
ShrinkRelationChunk((ShrinkStmt*)(void *)parse_tree);
ExecUtilityStmtOnNodes(query_string, NULL, sent_to_remote, false, EXEC_ON_ALL_NODES, false);
}
} else {
ShrinkRealtionChunk((ShrinkStmt*)(void *)parse_tree);
ShrinkRelationChunk((ShrinkStmt*)(void *)parse_tree);
}
#else
ShrinkRealtionChunk((ShrinkStmt*)(void *)parse_tree);
ShrinkRelationChunk((ShrinkStmt*)(void *)parse_tree);
#endif
}
@ -4932,7 +4932,7 @@ void standard_ProcessUtility(processutility_context* processutility_cxt,
break;
#endif
case T_ShrinkStmt: {
ExecShrinkRealtionChunkStmt(parse_tree, query_string, sent_to_remote);
ExecShrinkRelationChunkStmt(parse_tree, query_string, sent_to_remote);
break;
}
case T_ReindexStmt: {

2
src/include/commands/tablecmds.h
View File

@ -114,7 +114,7 @@ extern void RemoveRelationsonMainExecCN(DropStmt* drop, ObjectAddresses* objects
extern void RemoveRelations(DropStmt* drop, StringInfo tmp_queryString, RemoteQueryExecType* exec_type);
extern void ShrinkRealtionChunk(ShrinkStmt *shrink);
extern void ShrinkRelationChunk(ShrinkStmt *shrink);
extern void RemoveObjectsonMainExecCN(DropStmt* drop, ObjectAddresses* objects, bool isFirstNode);

6
src/test/regress/expected/row_compression/row_compress_feature.out
View File

@ -408,6 +408,10 @@ shrink table row_compression_test_tbl1_kkk;
shrink table row_compression_test_tbl1_kkk nowait;
shrink table row_compression_test_tbl1_kkk_idx;
shrink table row_compression_test_tbl1_kkk_idx nowait;
shrink table row_compression_test_not_exist;
ERROR: [shrink] relation row_compression_test_not_exist does not exist.
shrink table row_compression_test_not_exist nowait;
ERROR: [shrink] relation row_compression_test_not_exist does not exist.
-- test truncate
truncate table row_compression_test_tbl1_kkk;
checkpoint;
@ -889,4 +893,4 @@ select * from compress_normal_user.hash_range order by month_code, dept_code;
(6 rows)
drop table if exists compress_normal_user.hash_range cascade;
drop schema if exists compress_normal_user cascade;
drop schema if exists compress_normal_user cascade;

2
src/test/regress/sql/row_compression/row_compress_feature.sql
View File

@ -229,6 +229,8 @@ shrink table row_compression_test_tbl1_kkk;
shrink table row_compression_test_tbl1_kkk nowait;
shrink table row_compression_test_tbl1_kkk_idx;
shrink table row_compression_test_tbl1_kkk_idx nowait;
shrink table row_compression_test_not_exist;
shrink table row_compression_test_not_exist nowait;
-- test truncate
truncate table row_compression_test_tbl1_kkk;