From efbb94ce446df53d3eded86e5ea81c50412c6bf9 Mon Sep 17 00:00:00 2001 From: lvhui Date: Mon, 29 Aug 2022 19:18:46 -0700 Subject: [PATCH] fix some error --- src/gausskernel/optimizer/commands/tablecmds.cpp | 2 +- src/gausskernel/runtime/executor/nodeModifyTable.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gausskernel/optimizer/commands/tablecmds.cpp b/src/gausskernel/optimizer/commands/tablecmds.cpp index 6321b2234..677932f75 100644 --- a/src/gausskernel/optimizer/commands/tablecmds.cpp +++ b/src/gausskernel/optimizer/commands/tablecmds.cpp @@ -10046,7 +10046,7 @@ static void ATExecSetNotNull(AlteredTableInfo* tab, Relation rel, const char* co heap_close(attr_rel, RowExclusiveLock); } -bool FetchOnUpdateExpress(Relation rel, char* colName) +bool FetchOnUpdateExpress(Relation rel, const char* colName) { HeapTuple htup = NULL; bool isnull = false; diff --git a/src/gausskernel/runtime/executor/nodeModifyTable.cpp b/src/gausskernel/runtime/executor/nodeModifyTable.cpp index 7c4452d0c..f7218ae85 100644 --- a/src/gausskernel/runtime/executor/nodeModifyTable.cpp +++ b/src/gausskernel/runtime/executor/nodeModifyTable.cpp @@ -443,10 +443,10 @@ static void RecoredUpdateExpr(ResultRelInfo *resultRelInfo, EState *estate, CmdT if (GetUpdateExprCol(tupdesc, i)) { Expr *expr; - expr = (Expr *)build_column_default(rel, i + 1, false, true); + expr = (Expr *)build_column_default(resultRelInfo->ri_RelationDesc, i + 1, false, true); if (expr == NULL) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("no update expression found for column number %d of table \"%s\"", i + 1, - RelationGetRelationName(rel)))); + RelationGetRelationName(resultRelInfo->ri_RelationDesc)))); resultRelInfo->ri_UpdatedExprs[i] = ExecPrepareExpr(expr, estate); resultRelInfo->ri_NumUpdatedNeeded++;