Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Postgres FD Implementation
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Abuhujair Javed
Postgres FD Implementation
Commits
d092d116
Commit
d092d116
authored
Nov 12, 2012
by
Heikki Linnakangas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Oops, have to rename local variables called 'errcontext' in contrib, too.
As pointed out by Alvaro.
parent
dbdf9679
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
contrib/file_fdw/file_fdw.c
contrib/file_fdw/file_fdw.c
+12
-12
No files found.
contrib/file_fdw/file_fdw.c
View file @
d092d116
...
@@ -614,13 +614,13 @@ fileIterateForeignScan(ForeignScanState *node)
...
@@ -614,13 +614,13 @@ fileIterateForeignScan(ForeignScanState *node)
FileFdwExecutionState
*
festate
=
(
FileFdwExecutionState
*
)
node
->
fdw_state
;
FileFdwExecutionState
*
festate
=
(
FileFdwExecutionState
*
)
node
->
fdw_state
;
TupleTableSlot
*
slot
=
node
->
ss
.
ss_ScanTupleSlot
;
TupleTableSlot
*
slot
=
node
->
ss
.
ss_ScanTupleSlot
;
bool
found
;
bool
found
;
ErrorContextCallback
errc
ontext
;
ErrorContextCallback
errc
allback
;
/* Set up callback to identify error line number. */
/* Set up callback to identify error line number. */
errc
ontext
.
callback
=
CopyFromErrorCallback
;
errc
allback
.
callback
=
CopyFromErrorCallback
;
errc
ontext
.
arg
=
(
void
*
)
festate
->
cstate
;
errc
allback
.
arg
=
(
void
*
)
festate
->
cstate
;
errc
ontext
.
previous
=
error_context_stack
;
errc
allback
.
previous
=
error_context_stack
;
error_context_stack
=
&
errc
ontext
;
error_context_stack
=
&
errc
allback
;
/*
/*
* The protocol for loading a virtual tuple into a slot is first
* The protocol for loading a virtual tuple into a slot is first
...
@@ -642,7 +642,7 @@ fileIterateForeignScan(ForeignScanState *node)
...
@@ -642,7 +642,7 @@ fileIterateForeignScan(ForeignScanState *node)
ExecStoreVirtualTuple
(
slot
);
ExecStoreVirtualTuple
(
slot
);
/* Remove error callback. */
/* Remove error callback. */
error_context_stack
=
errc
ontext
.
previous
;
error_context_stack
=
errc
allback
.
previous
;
return
slot
;
return
slot
;
}
}
...
@@ -976,7 +976,7 @@ file_acquire_sample_rows(Relation onerel, int elevel,
...
@@ -976,7 +976,7 @@ file_acquire_sample_rows(Relation onerel, int elevel,
char
*
filename
;
char
*
filename
;
List
*
options
;
List
*
options
;
CopyState
cstate
;
CopyState
cstate
;
ErrorContextCallback
errc
ontext
;
ErrorContextCallback
errc
allback
;
MemoryContext
oldcontext
=
CurrentMemoryContext
;
MemoryContext
oldcontext
=
CurrentMemoryContext
;
MemoryContext
tupcontext
;
MemoryContext
tupcontext
;
...
@@ -1009,10 +1009,10 @@ file_acquire_sample_rows(Relation onerel, int elevel,
...
@@ -1009,10 +1009,10 @@ file_acquire_sample_rows(Relation onerel, int elevel,
rstate
=
anl_init_selection_state
(
targrows
);
rstate
=
anl_init_selection_state
(
targrows
);
/* Set up callback to identify error line number. */
/* Set up callback to identify error line number. */
errc
ontext
.
callback
=
CopyFromErrorCallback
;
errc
allback
.
callback
=
CopyFromErrorCallback
;
errc
ontext
.
arg
=
(
void
*
)
cstate
;
errc
allback
.
arg
=
(
void
*
)
cstate
;
errc
ontext
.
previous
=
error_context_stack
;
errc
allback
.
previous
=
error_context_stack
;
error_context_stack
=
&
errc
ontext
;
error_context_stack
=
&
errc
allback
;
*
totalrows
=
0
;
*
totalrows
=
0
;
*
totaldeadrows
=
0
;
*
totaldeadrows
=
0
;
...
@@ -1072,7 +1072,7 @@ file_acquire_sample_rows(Relation onerel, int elevel,
...
@@ -1072,7 +1072,7 @@ file_acquire_sample_rows(Relation onerel, int elevel,
}
}
/* Remove error callback. */
/* Remove error callback. */
error_context_stack
=
errc
ontext
.
previous
;
error_context_stack
=
errc
allback
.
previous
;
/* Clean up. */
/* Clean up. */
MemoryContextDelete
(
tupcontext
);
MemoryContextDelete
(
tupcontext
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment