[IR][Util] Pass SearchConfiguration for heuristic search by const reference

Nora Buschauer · Nora Buschauer · commit b5cbba724117 · 2024-05-16T21:39:06.000+02:00
diff --git a/include/mutable/IR/HeuristicSearchPlanEnumerator.hpp b/include/mutable/IR/HeuristicSearchPlanEnumerator.hpp
@@ -2186,7 +2186,7 @@ template<
     ai::SearchConfigConcept StaticConfig
 >
 bool heuristic_search(PlanTable &PT, const QueryGraph &G, const AdjacencyMatrix &M, const CostFunction &CF,
-                      const CardinalityEstimator &CE, Search &S, ai::SearchConfiguration<StaticConfig> config);
+                      const CardinalityEstimator &CE, Search &S, const ai::SearchConfiguration<StaticConfig> &config);
 
 /** Computes the join order using heuristic search */
 struct HeuristicSearch final : PlanEnumeratorCRTP<HeuristicSearch>
diff --git a/include/mutable/util/HeuristicSearch.hpp b/include/mutable/util/HeuristicSearch.hpp
@@ -727,7 +727,7 @@ struct genericAStar
      * @return the cost of the computed path from `initial_state` to a goal state
      */
     const State & search(state_type initial_state, expand_type expand, heuristic_type &heuristic,
-                         SearchConfiguration<StaticConfig> config, Context&... context);
+                         const SearchConfiguration<StaticConfig> &config, Context&... context);
 
     /** Resets the state of the search. */
     void clear() {
@@ -895,7 +895,7 @@ const State & genericAStar<State, Expand, Heuristic, StaticConfig, Context...>::
     state_type initial_state,
     expand_type expand,
     heuristic_type &heuristic,
-    SearchConfiguration<StaticConfig> config,
+    const SearchConfiguration<StaticConfig> &config,
     Context&... context
 ) {
     if constexpr (use_weighted_search) {
diff --git a/src/IR/HeuristicSearchPlanEnumerator.cpp b/src/IR/HeuristicSearchPlanEnumerator.cpp
@@ -129,7 +129,8 @@ template<
     ai::SearchConfigConcept StaticConfig
 >
 bool heuristic_search(PlanTable &PT, const QueryGraph &G, const AdjacencyMatrix &M, const CostFunction &CF,
-                      const CardinalityEstimator &CE, SearchAlgorithm &S, ai::SearchConfiguration<StaticConfig> config)
+                      const CardinalityEstimator &CE, SearchAlgorithm &S,
+                      const ai::SearchConfiguration<StaticConfig> &config)
 {
     State::RESET_STATE_COUNTERS();
 

Original file line number	Diff line number	Diff line change
`@@ -2186,7 +2186,7 @@ template<`
`2186`	`2186`	`ai::SearchConfigConcept StaticConfig`
`2187`	`2187`	`>`
`2188`	`2188`	`bool heuristic_search(PlanTable &PT, const QueryGraph &G, const AdjacencyMatrix &M, const CostFunction &CF,`
`2189`		`- const CardinalityEstimator &CE, Search &S, ai::SearchConfiguration<StaticConfig> config);`
	`2189`	`+ const CardinalityEstimator &CE, Search &S, const ai::SearchConfiguration<StaticConfig> &config);`
`2190`	`2190`
`2191`	`2191`	`/** Computes the join order using heuristic search */`
`2192`	`2192`	`struct HeuristicSearch final : PlanEnumeratorCRTP<HeuristicSearch>`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,8 @@ template<`
`129`	`129`	`ai::SearchConfigConcept StaticConfig`
`130`	`130`	`>`
`131`	`131`	`bool heuristic_search(PlanTable &PT, const QueryGraph &G, const AdjacencyMatrix &M, const CostFunction &CF,`
`132`		`- const CardinalityEstimator &CE, SearchAlgorithm &S, ai::SearchConfiguration<StaticConfig> config)`
	`132`	`+ const CardinalityEstimator &CE, SearchAlgorithm &S,`
	`133`	`+ const ai::SearchConfiguration<StaticConfig> &config)`
`133`	`134`	`{`
`134`	`135`	`State::RESET_STATE_COUNTERS();`
`135`	`136`