Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HPCC-16832 JOIN in roxie may leak rows if not consumed entirely #9468

Merged
merged 1 commit into from Jan 6, 2017
Merged

HPCC-16832 JOIN in roxie may leak rows if not consumed entirely #9468

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion common/thorhelper/roxiehelper.cpp
View file
Open in desktop
Expand Up @@ -527,7 +527,10 @@ class SortedInputReader : public InputReaderBase
{
sorter->reset();
}

~SortedInputReader()
{
sorter->reset();
}
virtual const void *nextRow()
{
if (!firstRead)
Expand Down Expand Up @@ -613,6 +616,11 @@ class CSortAlgorithm : implements CInterfaceOf<ISortAlgorithm>
public:
CSortAlgorithm() { elapsedCycles = 0; }

virtual void beforeDispose() override
{
reset();
}

virtual void getSortedGroup(ConstPointerArray & result)
{
loop
Expand Down