Fix NPE when pruning info from query plan

prestodb · Aug 29, 2024 · 4dd678d · 4dd678d
1 parent d6a42fc
commit 4dd678d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryExecution.java b/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryExecution.java
@@ -753,10 +753,12 @@ public void pruneExpiredQueryInfo()
     @Override
     public void pruneFinishedQueryInfo()
     {
-        queryPlan.getAndUpdate(plan -> new Plan(
-                plan.getRoot(),
-                plan.getTypes(),
-                pruneHistogramsFromStatsAndCosts(plan.getStatsAndCosts())));
+        queryPlan.getAndUpdate(nullablePlan -> Optional.ofNullable(nullablePlan)
+                .map(plan -> new Plan(
+                        plan.getRoot(),
+                        plan.getTypes(),
+                        pruneHistogramsFromStatsAndCosts(plan.getStatsAndCosts())))
+                .orElse(null));
         // drop the reference to the scheduler since execution is finished
         queryScheduler.set(null);
         stateMachine.pruneQueryInfoFinished();