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

!2440 修复memcheck问题

Browse Source 
Merge pull request !2440 from 魏文韬/master
This commit is contained in:
opengauss-bot
2022-11-16 06:23:35 +00:00
committed by Gitee
parent d9fc59a454 d9b7152231
commit 0e2086be3e
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/backend/parser/analyze.cpp
View File

@ -899,6 +899,10 @@ static void transformLimitSortClause(ParseState* pstate, void* stmt, Query* qry,
rlist = forDel ? transformSortClause(pstate, ((DeleteStmt*)stmt)->sortClause, &qry->targetList, true, false) :
transformUpdateSortClause(pstate, (UpdateStmt*)stmt, qry);
/*
* For update statement, the effective range of sort clause is not optimized. For delete statement,
* sorting is performed only when limit or returning clause takes effect.
*/
if (qry->limitCount != NULL) {
/* flag for discriminating rownum */
Const *flag = makeNode(Const);
@ -907,8 +911,10 @@ static void transformLimitSortClause(ParseState* pstate, void* stmt, Query* qry,
flag->consttype = INT8OID;
flag->consttypmod = -1;
qry->limitOffset = (Node*)flag;
qry->sortClause = rlist;
} else if (!forDel || qry->returningList != NULL) {
qry->sortClause = rlist;
}
qry->sortClause = rlist;
}
static void CheckUDRelations(ParseState* pstate, List* sortClause, Node* limitClause, List* returningList,
@ -3662,18 +3668,15 @@ static void MergeTargetList(List** targetLists, RangeTblEntry* rte1, int rtindex
RangeTblEntry* rte2, int rtindex2)
{
ListCell* l = NULL;
ListCell* l_pre = NULL;
foreach (l, targetLists[rtindex2 - 1]) {
TargetEntry* tle = (TargetEntry*)lfirst(l);
tle->rtindex = (Index)rtindex1;
rte1->updatedCols = bms_add_member(rte1->updatedCols, tle->resno - FirstLowInvalidHeapAttributeNumber);
rte2->updatedCols = bms_del_member(rte2->updatedCols, tle->resno - FirstLowInvalidHeapAttributeNumber);
targetLists[rtindex1 - 1] = lappend(targetLists[rtindex1 - 1], tle);
targetLists[rtindex2 - 1] = list_delete_cell(targetLists[rtindex2 - 1], l, l_pre);
l_pre = l;
}
targetLists[rtindex1 - 1] = list_concat(targetLists[rtindex1 - 1], targetLists[rtindex2 - 1]);
targetLists[rtindex2 - 1] = NULL;
}
static void transformMultiTargetList(List* target_rangetblentry, List** targetLists)
@ -4135,6 +4138,7 @@ static List* transformUpdateTargetList(ParseState* pstate, List* qryTlist, List*
tlist = list_concat(tlist, new_tle[i]);
}
}
pfree(new_tle);
return tlist;
}

6
src/test/regress/expected/multi_update.out
View File

@ -1241,6 +1241,12 @@ select * from t_t_mutil_t1;
2 | 1
(2 rows)
rollback;
begin;
update t_t_mutil_t1 t1, t_t_mutil_t1 t2, t_t_mutil_t1 t3 set t2.col2 = 3, t3.col1 = 2;
rollback;
begin;
update t_t_mutil_t2 t1, t_t_mutil_t2 t2, t_t_mutil_t2 t3 set t1.col1 = 3, t3.col2 = 2, t2.col3 = 3;
rollback;
CREATE SYNONYM s_t_mutil_t1 FOR t_t_mutil_t1;
CREATE SYNONYM s_t_mutil_t2 FOR t_t_mutil_t1;

7
src/test/regress/sql/multi_update.sql
View File

@ -559,6 +559,13 @@ begin;
update t_t_mutil_t1 t1,t_t_mutil_t2 t2 set t2.col2 = 3, t1.col1 = 2;
select * from t_t_mutil_t1;
rollback;
begin;
update t_t_mutil_t1 t1, t_t_mutil_t1 t2, t_t_mutil_t1 t3 set t2.col2 = 3, t3.col1 = 2;
rollback;
begin;
update t_t_mutil_t2 t1, t_t_mutil_t2 t2, t_t_mutil_t2 t3 set t1.col1 = 3, t3.col2 = 2, t2.col3 = 3;
rollback;
CREATE SYNONYM s_t_mutil_t1 FOR t_t_mutil_t1;
CREATE SYNONYM s_t_mutil_t2 FOR t_t_mutil_t1;
begin;