external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hack to fix another crash in intermediate results

cmake_branch_point
Brian Cloutier 2018-04-04 17:44:17 -07:00
parent c271c2350e
commit 99191cd8e4
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/backend/distributed/executor/multi_executor.c
View File

@ -165,16 +165,16 @@ ReadFileIntoTupleStore(char *fileName, char *copyFormat, TupleDesc tupleDescript
#endif
copyOptions = lappend(copyOptions, copyOption);
#if (PG_VERSION_NUM >= 100000)
copyState = BeginCopyFrom(NULL, stubRelation, fileName, false, NULL,
NULL, copyOptions);
#else
copyState = BeginCopyFrom(stubRelation, fileName, false, NULL,
copyOptions);
#endif
PG_TRY();
{
#if (PG_VERSION_NUM >= 100000)
copyState = BeginCopyFrom(NULL, stubRelation, fileName, false, NULL,
NULL, copyOptions);
#else
copyState = BeginCopyFrom(stubRelation, fileName, false, NULL,
copyOptions);
#endif
while (true)
{
bool nextRowFound = false;
@ -196,17 +196,21 @@ ReadFileIntoTupleStore(char *fileName, char *copyFormat, TupleDesc tupleDescript
}
PG_CATCH();
{
/*
* This is only necessary on windows, in the abort handler we might try to remove
* the file being COPY'd (if it was an intermediate result), but on Windows that's
* not possible unless we first close our handle to the file.
*/
if (oldContext != NULL)
{
MemoryContextSwitchTo(oldContext);
}
EndCopyFrom(copyState);
/*
* This is only necessary on windows, in the abort handler we might try to remove
* the file being COPY'd (if it was an intermediate result), but on Windows that's
* not possible unless we first close our handle to the file.
*
* This was already going to be called during abort, but it was going to be called
* after we try to delete the file, we need it to be called before.
*/
AtEOXact_Files();
PG_RE_THROW();
}
PG_END_TRY();