Use aggregated metrics over planning window

mitdbg · Nov 13, 2023 · 365c9cb · 365c9cb
1 parent 54e1e45
commit 365c9cb
Show file tree

Hide file tree

Showing 3 changed files with 329 additions and 57 deletions.
diff --git a/src/brad/admin/run_planner.py b/src/brad/admin/run_planner.py
@@ -25,7 +25,7 @@
 from brad.planner.triggers.provider import EmptyTriggerProvider
 from brad.planner.triggers.trigger import Trigger
 from brad.planner.metrics import (
-    MetricsFromMonitor,
+    WindowedMetricsFromMonitor,
     FixedMetricsProvider,
     Metrics,
     MetricsProvider,
@@ -220,7 +220,9 @@ async def run_planner_impl(args) -> None:
             now,
         )
     else:
-        metrics_provider = MetricsFromMonitor(monitor, blueprint_mgr)
+        metrics_provider = WindowedMetricsFromMonitor(
+            monitor, blueprint_mgr, config, planner_config
+        )
 
     if config.routing_policy == RoutingPolicy.ForestTableSelectivity:
         pe = asyncio.run(PostgresEstimator.connect(args.schema_name, config))

diff --git a/src/brad/daemon/daemon.py b/src/brad/daemon/daemon.py
@@ -37,7 +37,7 @@
 from brad.planner.compare.provider import PerformanceCeilingComparatorProvider
 from brad.planner.estimator import EstimatorProvider
 from brad.planner.factory import BlueprintPlannerFactory
-from brad.planner.metrics import MetricsFromMonitor
+from brad.planner.metrics import WindowedMetricsFromMonitor
 from brad.planner.providers import BlueprintProviders
 from brad.planner.scoring.score import Score
 from brad.planner.scoring.data_access.provider import DataAccessProvider
@@ -202,7 +202,9 @@ async def _run_setup(self) -> None:
             ),
             analytics_latency_scorer=latency_scorer,
             comparator_provider=comparator_provider,
-            metrics_provider=MetricsFromMonitor(self._monitor, self._blueprint_mgr),
+            metrics_provider=WindowedMetricsFromMonitor(
+                self._monitor, self._blueprint_mgr, self._config, self._planner_config
+            ),
             data_access_provider=data_access_provider,
             estimator_provider=self._estimator_provider,
             trigger_provider=ConfigDefinedTriggers(