提交 d092d116 编写于 作者: H Heikki Linnakangas

Oops, have to rename local variables called 'errcontext' in contrib, too.

As pointed out by Alvaro.
上级 dbdf9679
...@@ -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 errcontext; ErrorContextCallback errcallback;
/* Set up callback to identify error line number. */ /* Set up callback to identify error line number. */
errcontext.callback = CopyFromErrorCallback; errcallback.callback = CopyFromErrorCallback;
errcontext.arg = (void *) festate->cstate; errcallback.arg = (void *) festate->cstate;
errcontext.previous = error_context_stack; errcallback.previous = error_context_stack;
error_context_stack = &errcontext; error_context_stack = &errcallback;
/* /*
* 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 = errcontext.previous; error_context_stack = errcallback.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 errcontext; ErrorContextCallback errcallback;
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. */
errcontext.callback = CopyFromErrorCallback; errcallback.callback = CopyFromErrorCallback;
errcontext.arg = (void *) cstate; errcallback.arg = (void *) cstate;
errcontext.previous = error_context_stack; errcallback.previous = error_context_stack;
error_context_stack = &errcontext; error_context_stack = &errcallback;
*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 = errcontext.previous; error_context_stack = errcallback.previous;
/* Clean up. */ /* Clean up. */
MemoryContextDelete(tupcontext); MemoryContextDelete(tupcontext);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册