Remove experimental preallocated memory system

sopel39 · Nov 4, 2018 · 105a057 · 105a057
1 parent b77fa0b
commit 105a057
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 504 deletions.
diff --git a/presto-main/src/main/java/com/facebook/presto/execution/MemoryAwareQueryExecution.java b/presto-main/src/main/java/com/facebook/presto/execution/MemoryAwareQueryExecution.java
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
@@ -28,7 +28,6 @@
 import com.facebook.presto.execution.scheduler.SqlQueryScheduler;
 import com.facebook.presto.execution.warnings.WarningCollector;
 import com.facebook.presto.failureDetector.FailureDetector;
-import com.facebook.presto.memory.ClusterMemoryManager;
 import com.facebook.presto.memory.VersionedMemoryPoolId;
 import com.facebook.presto.metadata.Metadata;
 import com.facebook.presto.metadata.TableHandle;
@@ -43,7 +42,6 @@
 import com.facebook.presto.split.SplitSource;
 import com.facebook.presto.sql.analyzer.Analysis;
 import com.facebook.presto.sql.analyzer.Analyzer;
-import com.facebook.presto.sql.analyzer.FeaturesConfig;
 import com.facebook.presto.sql.analyzer.QueryExplainer;
 import com.facebook.presto.sql.parser.SqlParser;
 import com.facebook.presto.sql.planner.DistributedExecutionPlanner;
@@ -313,20 +311,6 @@ public BasicQueryInfo getBasicQueryInfo()
                 .orElseGet(() -> stateMachine.getBasicQueryInfo(Optional.ofNullable(queryScheduler.get()).map(SqlQueryScheduler::getBasicStageStats)));
     }
 
-    public void startWaitingForResources()
-    {
-        try (SetThreadName ignored = new SetThreadName("Query-%s", stateMachine.getQueryId())) {
-            try {
-                // transition to waiting for resources
-                stateMachine.transitionToWaitingForResources();
-            }
-            catch (Throwable e) {
-                fail(e);
-                throwIfInstanceOf(e, Error.class);
-            }
-        }
-    }
-
     @Override
     public void start()
     {
@@ -677,14 +661,11 @@ public static class SqlQueryExecutionFactory
         private final FailureDetector failureDetector;
         private final NodeTaskMap nodeTaskMap;
         private final Map<String, ExecutionPolicy> executionPolicies;
-        private final ClusterMemoryManager clusterMemoryManager;
-        private final DataSize preAllocateMemoryThreshold;
         private final StatsCalculator statsCalculator;
         private final CostCalculator costCalculator;
 
         @Inject
         SqlQueryExecutionFactory(QueryManagerConfig config,
-                FeaturesConfig featuresConfig,
                 Metadata metadata,
                 AccessControl accessControl,
                 SqlParser sqlParser,
@@ -703,7 +684,6 @@ public static class SqlQueryExecutionFactory
                 QueryExplainer queryExplainer,
                 Map<String, ExecutionPolicy> executionPolicies,
                 SplitSchedulerStats schedulerStats,
-                ClusterMemoryManager clusterMemoryManager,
                 StatsCalculator statsCalculator,
                 CostCalculator costCalculator)
         {
@@ -727,8 +707,6 @@ public static class SqlQueryExecutionFactory
             this.nodeTaskMap = requireNonNull(nodeTaskMap, "nodeTaskMap is null");
             this.queryExplainer = requireNonNull(queryExplainer, "queryExplainer is null");
             this.executionPolicies = requireNonNull(executionPolicies, "schedulerPolicies is null");
-            this.clusterMemoryManager = requireNonNull(clusterMemoryManager, "clusterMemoryManager is null");
-            this.preAllocateMemoryThreshold = requireNonNull(featuresConfig, "featuresConfig is null").getPreAllocateMemoryThreshold();
             this.planOptimizers = planOptimizers.get();
             this.statsCalculator = requireNonNull(statsCalculator, "statsCalculator is null");
             this.costCalculator = requireNonNull(costCalculator, "costCalculator is null");
@@ -775,11 +753,6 @@ public QueryExecution createQueryExecution(
                     costCalculator,
                     warningCollector);
 
-            if (preAllocateMemoryThreshold.toBytes() > 0 && session.getResourceEstimates().getPeakMemory().isPresent() &&
-                    session.getResourceEstimates().getPeakMemory().get().compareTo(preAllocateMemoryThreshold) >= 0) {
-                return new MemoryAwareQueryExecution(clusterMemoryManager, execution);
-            }
-
             return execution;
         }
     }