Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
postgres-lambda-diff
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakob Huber
postgres-lambda-diff
Commits
1d41e885
Commit
1d41e885
authored
26 years ago
by
Vadim B. Mikheev
Browse files
Options
Downloads
Patches
Plain Diff
Trying to fix bad merging...
parent
e3a1ab76
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/backend/executor/execMain.c
+13
-15
13 additions, 15 deletions
src/backend/executor/execMain.c
with
13 additions
and
15 deletions
src/backend/executor/execMain.c
+
13
−
15
View file @
1d41e885
...
...
@@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.6
6
1999/01/29
09:22:57
vadim Exp $
* $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.6
7
1999/01/29
10:15:09
vadim Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -65,7 +65,7 @@ static TupleDesc InitPlan(CmdType operation, Query *parseTree,
static
void
EndPlan
(
Plan
*
plan
,
EState
*
estate
);
static
TupleTableSlot
*
ExecutePlan
(
EState
*
estate
,
Plan
*
plan
,
CmdType
operation
,
int
numberTuples
,
ScanDirection
direction
,
void
(
*
prin
tfunc
)
())
;
DestReceiver
*
des
tfunc
);
static
void
ExecRetrieve
(
TupleTableSlot
*
slot
,
DestReceiver
*
destfunc
,
EState
*
estate
);
...
...
@@ -756,7 +756,7 @@ ExecutePlan(EState *estate,
CmdType
operation
,
int
numberTuples
,
ScanDirection
direction
,
void
(
*
prin
tfunc
)
())
DestReceiver
*
des
tfunc
)
{
JunkFilter
*
junkfilter
;
...
...
@@ -941,7 +941,7 @@ lmark:;
{
case
CMD_SELECT
:
ExecRetrieve
(
slot
,
/* slot containing tuple */
prin
tfunc
,
/* print function */
des
tfunc
,
/* print function */
estate
);
/* */
result
=
slot
;
break
;
...
...
@@ -997,7 +997,7 @@ lmark:;
*/
static
void
ExecRetrieve
(
TupleTableSlot
*
slot
,
void
(
*
prin
tfunc
)
()
,
DestReceiver
*
des
tfunc
,
EState
*
estate
)
{
HeapTuple
tuple
;
...
...
@@ -1139,8 +1139,7 @@ ExecDelete(TupleTableSlot *slot,
{
RelationInfo
*
resultRelationInfo
;
Relation
resultRelationDesc
;
ItemPointerData
ctid
,
oldtid
;
ItemPointerData
ctid
;
int
result
;
/******************
...
...
@@ -1180,12 +1179,11 @@ ldelete:;
elog
(
ERROR
,
"Can't serialize access due to concurrent update"
);
else
if
(
!
(
ItemPointerEquals
(
tupleid
,
&
ctid
)))
{
TupleTableSlot
*
slot
=
EvalPlanQual
(
estate
,
TupleTableSlot
*
epq
slot
=
EvalPlanQual
(
estate
,
resultRelationInfo
->
ri_RangeTableIndex
,
&
ctid
);
if
(
!
TupIsNull
(
slot
))
if
(
!
TupIsNull
(
epq
slot
))
{
tupleid
=
&
oldtid
;
*
tupleid
=
ctid
;
goto
ldelete
;
}
...
...
@@ -1238,8 +1236,7 @@ ExecReplace(TupleTableSlot *slot,
HeapTuple
tuple
;
RelationInfo
*
resultRelationInfo
;
Relation
resultRelationDesc
;
ItemPointerData
ctid
,
oldtid
;
ItemPointerData
ctid
;
int
result
;
int
numIndices
;
...
...
@@ -1321,13 +1318,14 @@ lreplace:;
elog
(
ERROR
,
"Can't serialize access due to concurrent update"
);
else
if
(
!
(
ItemPointerEquals
(
tupleid
,
&
ctid
)))
{
TupleTableSlot
*
slot
=
EvalPlanQual
(
estate
,
TupleTableSlot
*
epq
slot
=
EvalPlanQual
(
estate
,
resultRelationInfo
->
ri_RangeTableIndex
,
&
ctid
);
if
(
!
TupIsNull
(
slot
))
if
(
!
TupIsNull
(
epq
slot
))
{
tupleid
=
&
oldtid
;
*
tupleid
=
ctid
;
tuple
=
ExecRemoveJunk
(
estate
->
es_junkFilter
,
epqslot
);
slot
=
ExecStoreTuple
(
tuple
,
slot
,
InvalidBuffer
,
true
);
goto
lreplace
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment