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

!2933 修复当为带有表达式分区键得分区表添加主键时报错的问题

Browse Source 
Merge pull request !2933 from 王修强/og_master_bug
This commit is contained in:
opengauss-bot
2023-02-22 01:40:46 +00:00
committed by Gitee
parent 5761b22869 707b72e2ce
commit 04aba45854
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5412,6 +5412,8 @@ static void CheckIndexParamsNumber(IndexStmt* stmt) {
static bool CheckIdxParamsOwnPartKey(Relation rel, const List* indexParams)
{
if (!PartExprKeyIsNull(rel, NULL))
return false;
int2vector* partKey = ((RangePartitionMap*)rel->partMap)->partitionKey;
for (int i = 0; i < partKey->dim1; i++) {
int2 attNum = partKey->values[i];

13
src/test/regress/input/partition_expr_key.source
View File

@ -290,6 +290,17 @@ select pg_get_tabledef('testrangesubpart');
select pg_get_tabledef('testlistsubpart');
select pg_get_tabledef('testhashsubpart');
select pg_get_tabledef('testnormalsubpart');
create database part_expr_key_db1 dbcompatibility 'B';
\c part_expr_key_db1;
create table t1(c1 int not null, c2 int)
partition by range(c1 + 100) (
partition p1 values less than(200),
partition p2 values less than(300),
partition p3 values less than(400)
);
CREATE INDEX t1_c2_idx ON t1 USING btree (c2) LOCAL(PARTITION p1_c2_idx, PARTITION p2_c2_idx, PARTITION p3_c2_idx);
ALTER TABLE t1 ADD CONSTRAINT t3_pkey PRIMARY KEY USING btree (c1) INCLUDE (tableoid);
\c regression
drop database if exists part_expr_key_db;
drop database if exists part_expr_key_db;
drop database if exists part_expr_key_db1;

12
src/test/regress/output/partition_expr_key.source
View File

@ -954,5 +954,17 @@ select pg_get_tabledef('testnormalsubpart');
ENABLE ROW MOVEMENT;
(1 row)
create database part_expr_key_db1 dbcompatibility 'B';
\c part_expr_key_db1;
create table t1(c1 int not null, c2 int)
partition by range(c1 + 100) (
partition p1 values less than(200),
partition p2 values less than(300),
partition p3 values less than(400)
);
CREATE INDEX t1_c2_idx ON t1 USING btree (c2) LOCAL(PARTITION p1_c2_idx, PARTITION p2_c2_idx, PARTITION p3_c2_idx);
ALTER TABLE t1 ADD CONSTRAINT t3_pkey PRIMARY KEY USING btree (c1) INCLUDE (tableoid);
NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "t3_pkey" for table "t1"
\c regression
drop database if exists part_expr_key_db;
drop database if exists part_expr_key_db1;