Initialize planner beans lazily

trinodb · Apr 26, 2021 · f3dda9c · f3dda9c
1 parent 93bc1e1
commit f3dda9c
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/PlanOptimizers.java b/core/trino-main/src/main/java/io/trino/sql/planner/PlanOptimizers.java
@@ -228,7 +228,6 @@
 import io.trino.sql.planner.optimizations.WindowFilterPushDown;
 import org.weakref.jmx.MBeanExporter;
 
-import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 
@@ -245,6 +244,8 @@ public class PlanOptimizers
     private final OptimizerStatsRecorder optimizerStats = new OptimizerStatsRecorder();
     private final MBeanExporter exporter;
 
+    private boolean initialized;
+
     @Inject
     public PlanOptimizers(
             Metadata metadata,
@@ -279,13 +280,6 @@ public PlanOptimizers(
                 nodePartitioningManager);
     }
 
-    @PostConstruct
-    public void initialize()
-    {
-        ruleStats.export(exporter);
-        optimizerStats.export(exporter);
-    }
-
     @PreDestroy
     public void destroy()
     {
@@ -896,6 +890,18 @@ public PlanOptimizers(
     @Override
     public List<PlanOptimizer> get()
     {
+        initialize();
         return optimizers;
     }
+
+    private synchronized void initialize()
+    {
+        if (initialized) {
+            return;
+        }
+
+        ruleStats.export(exporter);
+        optimizerStats.export(exporter);
+        initialized = true;
+    }
 }