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

!3485 gcc更换10.3版本需要适配的代码

Browse Source 
Merge pull request !3485 from Cross-罗/comp_upgrade
This commit is contained in:
opengauss-bot
2023-06-05 12:26:09 +00:00
committed by Gitee
parent b338e0080c 43476d6a6b
commit c30dde6cc0
21 changed files with 83 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gausskernel/runtime/executor/execMain.cpp
View File

@ -3063,9 +3063,9 @@ HeapTuple heap_lock_updated(CommandId cid, Relation relation, int lockmode, Item
HeapTuple copyTuple = NULL;
HeapTupleData tuple;
SnapshotData SnapshotDirty;
struct {
union {
HeapTupleHeaderData hdr;
char data[MaxHeapTupleSize];
char data[MaxHeapTupleSize + sizeof(HeapTupleHeaderData)];
} tbuf;
errno_t errorno = EOK;
errorno = memset_s(&tbuf, sizeof(tbuf), 0, sizeof(tbuf));
@ -3523,9 +3523,9 @@ void EvalPlanQualFetchRowMarksUHeap(EPQState *epqstate)
void EvalPlanQualFetchRowMarks(EPQState *epqstate)
{
ListCell *l = NULL;
struct {
union {
HeapTupleHeaderData hdr;
char data[MaxHeapTupleSize];
char data[MaxHeapTupleSize + sizeof(HeapTupleHeaderData)];
} tbuf;
errno_t errorno = EOK;
errorno = memset_s(&tbuf, sizeof(tbuf), 0, sizeof(tbuf));

8
src/gausskernel/runtime/executor/execReplication.cpp
View File

@ -340,9 +340,9 @@ static bool RelationFindReplTupleByIndex(EState *estate, Relation rel, Relation
Tuple locktup;
HeapTupleData heaplocktup;
UHeapTupleData UHeaplocktup;
struct {
union {
UHeapDiskTupleData hdr;
char data[MaxPossibleUHeapTupleSize];
char data[MaxPossibleUHeapTupleSize + sizeof(UHeapDiskTupleData)];
} tbuf;
ItemPointer tid = tableam_tops_get_t_self(targetRel, outslot->tts_tuple);
@ -512,9 +512,9 @@ static bool RelationFindReplTupleSeq(Relation rel, LockTupleMode lockmode, Tuple
Tuple locktup = NULL;
HeapTupleData heaplocktup;
UHeapTupleData UHeaplocktup;
struct {
union {
UHeapDiskTupleData hdr;
char data[MaxPossibleUHeapTupleSize];
char data[MaxPossibleUHeapTupleSize + sizeof(UHeapDiskTupleData)];
} tbuf;
ItemPointer tid = tableam_tops_get_t_self(rel, outslot->tts_tuple);

8
src/gausskernel/runtime/executor/nodeLockRows.cpp
View File

@ -110,9 +110,9 @@ lnext:
bool isNull = false;
bool rowMovement = false;
HeapTupleData tuple;
struct {
union {
HeapTupleHeaderData hdr;
char data[MaxHeapTupleSize];
char data[MaxHeapTupleSize + sizeof(HeapTupleHeaderData)];
} tbuf;
Buffer buffer;
@ -321,9 +321,9 @@ lnext:
* If we need to do EvalPlanQual testing, do so.
*/
if (epq_started) {
struct {
union {
HeapTupleHeaderData hdr;
char data[MaxHeapTupleSize];
char data[MaxHeapTupleSize + sizeof(HeapTupleHeaderData)];
} tbuf;
/*

4
src/gausskernel/runtime/executor/nodeModifyTable.cpp
View File

@ -1949,9 +1949,9 @@ end:;
HeapTupleData del_tuple;
Buffer del_buffer;
struct {
union {
HeapTupleHeaderData hdr;
char data[MaxHeapTupleSize];
char data[MaxHeapTupleSize + sizeof(HeapTupleHeaderData)];
} tbuf;
errno_t errorNo = EOK;
errorNo = memset_s(&tbuf, sizeof(tbuf), 0, sizeof(tbuf));

4
src/gausskernel/runtime/opfusion/opfusion_selectforupdate.cpp
View File

@ -223,9 +223,9 @@ unsigned long SelectForUpdateFusion::ExecSelectForUpdate(Relation rel, ResultRel
HeapTupleData newtuple;
InitPartitionByScanFusion(rel, &partRel, &part, m_c_local.m_estate, m_local.m_scan);
struct {
union {
HeapTupleHeaderData hdr;
char data[MaxHeapTupleSize];
char data[MaxHeapTupleSize + sizeof(HeapTupleHeaderData)];
} tbuf;
errno_t errorno = EOK;