Skip to content

Add memory limit check for HashBuilderOperator's spilling #17905

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

Merged
highker merged 1 commit into from
Jul 5, 2022
Merged

Add memory limit check for HashBuilderOperator's spilling #17905

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions presto-main/src/main/java/com/facebook/presto/operator/HashBuilderOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
import java.util.Queue;

import static com.facebook.airlift.concurrent.MoreFutures.getDone;
import static com.facebook.presto.ExceededMemoryLimitException.exceededLocalUserMemoryLimit;
import static com.facebook.presto.SystemSessionProperties.getQueryMaxMemoryPerNode;
import static com.facebook.presto.operator.SpillingUtils.checkSpillSucceeded;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
Expand Down Expand Up @@ -366,6 +368,14 @@ private void spillInput(Page page)
checkState(spillInProgress.isDone(), "Previous spill still in progress");
checkSpillSucceeded(spillInProgress);
spillInProgress = getSpiller().spill(page);

// check that spilled data can still fit into memory limit as otherwise
// it fails later during unspilling when all spilled pages need to be loaded into memory
long maxUserMemoryBytes = getQueryMaxMemoryPerNode(operatorContext.getSession()).toBytes();
if (getSpiller().getSpilledPagesInMemorySize() > maxUserMemoryBytes) {
String additionalInfo = format("Spilled: %s, Operator: %s", succinctBytes(getSpiller().getSpilledPagesInMemorySize()), HashBuilderOperator.class.getSimpleName());
throw exceededLocalUserMemoryLimit(succinctBytes(maxUserMemoryBytes), additionalInfo, false, Optional.empty());
}
}

@Override
Expand Down
37 changes: 37 additions & 0 deletions presto-main/src/test/java/com/facebook/presto/operator/TestHashJoinOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@
import static com.facebook.airlift.testing.Assertions.assertEqualsIgnoreOrder;
import static com.facebook.presto.RowPagesBuilder.rowPagesBuilder;
import static com.facebook.presto.SessionTestUtils.TEST_SESSION;
import static com.facebook.presto.SystemSessionProperties.QUERY_MAX_MEMORY_PER_NODE;
import static com.facebook.presto.SystemSessionProperties.getQueryMaxMemoryPerNode;
import static com.facebook.presto.common.type.BigintType.BIGINT;
import static com.facebook.presto.common.type.VarcharType.VARCHAR;
import static com.facebook.presto.operator.OperatorAssertion.assertOperatorEquals;
Expand Down Expand Up @@ -1207,6 +1209,41 @@ public void testBroadcastMemoryLimit(boolean parallelBuild, boolean buildHashEna
buildLookupSource(buildSideSetup);
}

@Test(expectedExceptions = ExceededMemoryLimitException.class, expectedExceptionsMessageRegExp = "Query exceeded per-node user memory limit of.* \\[Spilled:.*")
public void testSpillMemoryLimit()
{
Session session = testSessionBuilder().setSystemProperty(QUERY_MAX_MEMORY_PER_NODE, "1000B").build();

TaskContext taskContext = TestingTaskContext.createTaskContext(executor, scheduledExecutor, session, getQueryMaxMemoryPerNode(session));
RowPagesBuilder buildPages = rowPagesBuilder(true, Ints.asList(0), ImmutableList.of(VARCHAR, BIGINT, BIGINT))
.addSequencePage(1000, 2000, 3000, 4000);
BuildSideSetup buildSideSetup = setupBuildSide(true,
taskContext,
Ints.asList(0),
buildPages,
Optional.empty(),
true,
SINGLE_STREAM_SPILLER_FACTORY);
instantiateBuildDrivers(buildSideSetup, taskContext);

JoinBridgeManager<PartitionedLookupSourceFactory> lookupSourceFactoryManager = buildSideSetup.getLookupSourceFactoryManager();
PartitionedLookupSourceFactory lookupSourceFactory = lookupSourceFactoryManager.getJoinBridge(Lifespan.taskWide());
ListenableFuture<LookupSourceProvider> lookupSourceProvider = lookupSourceFactory.createLookupSourceProvider();
List<Driver> buildDrivers = buildSideSetup.getBuildDrivers();

while (!lookupSourceProvider.isDone()) {
for (int i = 0; i < buildDrivers.size(); i++) {
revokeMemory(buildSideSetup.getBuildOperators().get(i));
buildDrivers.get(i).process();
}
}
getFutureValue(lookupSourceProvider).close();

for (Driver buildDriver : buildDrivers) {
runDriverInThread(executor, buildDriver);
}
}

@Test(dataProvider = "hashJoinTestValues")
public void testInnerJoinWithEmptyLookupSource(boolean parallelBuild, boolean probeHashEnabled, boolean buildHashEnabled)
{
Expand Down