refactor(rqe-optimizer): move rqe-optimizer from sketch-bench

.dockerignore

@@ -1,2 +1,4 @@
 target/
 .git/
+rqe-optimizer/results/
+rqe-optimizer/data/

.github/workflows/accuracy_performance.yml

@@ -12,6 +12,8 @@ on:
     paths:
       - 'asap-query-engine/**'
       - 'asap-planner-rs/**'
+      - 'rqe-optimizer/Cargo.toml'
+      - 'rqe-optimizer/src/**'
       - 'asap-quickstart/**'
       - '.github/workflows/accuracy_performance.yml'
       - 'benchmarks/**'

.github/workflows/docker.yml

@@ -10,6 +10,8 @@ on:
     paths:
       - 'asap-common/installation/**'
       - 'asap-planner-rs/**'
+      - 'rqe-optimizer/Cargo.toml'
+      - 'rqe-optimizer/src/**'
       - 'asap-query-engine/**'
       - 'asap-tools/queriers/prometheus-client/**'
       - 'asap-tools/data-sources/prometheus-exporters/fake_exporter/fake_exporter_rust/**'

.github/workflows/rust.yml

@@ -6,6 +6,7 @@ on:
     paths:
       - 'asap-query-engine/**'
       - 'asap-planner-rs/**'
+      - 'rqe-optimizer/**'
       - 'asap-common/dependencies/rs/**'
       - 'asap-common/tests/**'
       - 'asap-common/sketch-core/**'
@@ -18,6 +19,7 @@ on:
     paths:
       - 'asap-query-engine/**'
       - 'asap-planner-rs/**'
+      - 'rqe-optimizer/**'
       - 'asap-common/dependencies/rs/**'
       - 'asap-common/tests/**'
       - 'asap-common/sketch-core/**'

.pre-commit-config.yaml

@@ -7,6 +7,8 @@ repos:
       - id: end-of-file-fixer
       - id: check-yaml
       - id: check-added-large-files
+        # rqe-optimizer's committed eval results (result JSON up to ~2 MB).
+        exclude: ^rqe-optimizer/results/
       - id: check-case-conflict
       - id: check-merge-conflict
       - id: check-executables-have-shebangs

Cargo.toml

@@ -9,6 +9,7 @@ members = [
     "asap-common/tests/compare_patterns",
     "asap-query-engine",
     "asap-planner-rs",
+    "rqe-optimizer",
 ]
 
 [workspace.package]

asap-planner-rs/Cargo.toml

@@ -38,7 +38,7 @@ chrono.workspace = true
 promql-parser = "0.5.0"
 reqwest = { version = "0.11", features = ["blocking", "json"] }
 flate2 = "1.1"
-rqe-optimizer = { git = "https://github.com/ProjectASAP/sketch-bench", branch = "main" }
+rqe-optimizer = { path = "../rqe-optimizer" }
 
 [dev-dependencies]
 tempfile = "3.20"

asap-planner-rs/Dockerfile

@@ -17,6 +17,8 @@ COPY Cargo.toml ./
 COPY Cargo.lock ./
 COPY asap-query-engine/Cargo.toml ./asap-query-engine/
 COPY asap-planner-rs/Cargo.toml ./asap-planner-rs/
+COPY rqe-optimizer/Cargo.toml ./rqe-optimizer/
+COPY rqe-optimizer/src ./rqe-optimizer/src
 
 # Create dummy source files so Cargo can resolve all workspace members
 RUN mkdir -p asap-query-engine/src && echo "fn main() {}" > asap-query-engine/src/main.rs && \

asap-planner-rs/src/main.rs

@@ -57,14 +57,14 @@ struct Args {
     #[arg(long = "clickhouse-database", required = false)]
     clickhouse_database: Option<String>,
 
-    /// `milp` plans with sketch-bench's rqe-optimizer: PromQL or SQL with
+    /// `milp` plans with rqe-optimizer's MILP: PromQL or SQL with
     /// --input_config only, labels from its `metrics:` hints or tables'
-    /// `metadata_columns`. `saved` writes a PromQL or SQL plan sketch-bench's
+    /// `metadata_columns`. `saved` writes a PromQL or SQL plan rqe-optimizer's
     /// `autosketch_vs_asap` already solved.
     #[arg(long, value_enum, default_value = "legacy")]
     planner: PlannerArg,
 
-    /// Saved only. sketch-bench `autosketch_vs_asap` plan file
+    /// Saved only. rqe-optimizer `autosketch_vs_asap` plan file
     /// (`<table>.plans.json.gz`).
     #[arg(long, required_if_eq("planner", "saved"))]
     plan: Option<PathBuf>,
@@ -152,7 +152,7 @@ fn main() -> anyhow::Result<()> {
 
     if args.planner == PlannerArg::Milp {
         anyhow::bail!(
-            "--planner milp is temporarily disabled; use --planner saved for sketch-bench eval plans"
+            "--planner milp is temporarily disabled; use --planner saved for rqe-optimizer eval plans"
         );
     }
 

asap-planner-rs/src/optimizer/milp.rs

@@ -1,4 +1,4 @@
-//! Plans a workload with sketch-bench's rqe-optimizer MILP: converts the
+//! Plans a workload with rqe-optimizer's MILP: converts the
 //! workload config into `Raqe`s and solves for the cheapest deployments.
 
 use promql_utilities::query_logics::enums::Statistic;
@@ -74,7 +74,7 @@ pub enum MilpError {
     Solver(String),
 }
 
-/// The cheapest plan. Only families in sketch-bench's `DEPLOYABLE_FAMILIES`
+/// The cheapest plan. Only families in rqe-optimizer's `DEPLOYABLE_FAMILIES`
 /// are candidates unless `allow_undeployable_families`, whose plan can be
 /// studied but not deployed. `accuracy` is what a deployment achieves for a
 /// Raqe: in production sketch-bench's saturation curves
@@ -503,7 +503,7 @@ fn item_to_raqe(item: &OptimizerItem) -> Result<Raqe, MilpError> {
     // the Raqe has no field for those labels, so it is priced from the
     // bucket grouping's shape. Key count is bounded by the series count, but
     // accuracy curves measured per series may not match summed values; needs
-    // key labels in sketch-bench's Raqe.
+    // key labels in rqe-optimizer's Raqe.
     let grouping_labels: LabelSet = match capability {
         Capability::TopKByValue | Capability::TopKByCount => req
             .topk_by_labels

asap-planner-rs/src/optimizer/saved_plan.rs

@@ -1,4 +1,4 @@
-//! Writes a plan solved elsewhere, sketch-bench `autosketch_vs_asap`'s plan
+//! Writes a plan solved elsewhere, rqe-optimizer `autosketch_vs_asap`'s plan
 //! file, as the planner's streaming and inference YAML, without re-solving.
 //! The workload comes from the eval table's `e2e` block: its PromQL or SQL
 //! queries, the plan RQEs each reads, and the metrics' labels. A query's RQE
@@ -690,7 +690,7 @@ fn whole_ms(secs: f64) -> anyhow::Result<u64> {
     Ok(ms.round() as u64)
 }
 
-/// The rules of sketch-bench's `is_eligible` that need no workload facts or
+/// The rules of rqe-optimizer's `is_eligible` that need no workload facts or
 /// accuracy: a pick that breaks them belongs to another workload table.
 /// Grouping is left to the converter's roll-up check.
 fn can_serve(r: &Raqe, d: &Deployment) -> bool {

asap-planner-rs/tests/saved_plan_e2e_tables.rs

@@ -1,5 +1,5 @@
 //! `--planner saved` on real sketch-bench eval tables and their saved plans:
-//! the `all` workload of sketch-bench's `rqe-optimizer/results/e2e-rate10`,
+//! the `all` workload of `rqe-optimizer/results/e2e-rate10`,
 //! whose e2e queries carry RQE trees (all but its `rate` queries), and a
 //! pilot random workload, `seed-862/workload-01-pilot`, whose top-k queries
 //! are `topk by (region, service)`.

asap-query-engine/Dockerfile

@@ -23,6 +23,8 @@ COPY Cargo.toml ./
 COPY Cargo.lock ./
 COPY asap-query-engine/Cargo.toml ./asap-query-engine/
 COPY asap-planner-rs/Cargo.toml ./asap-planner-rs/
+COPY rqe-optimizer/Cargo.toml ./rqe-optimizer/
+COPY rqe-optimizer/src ./rqe-optimizer/src
 
 # Create dummy source files so Cargo can resolve all workspace members
 # All explicit [[bin]] targets in Cargo.toml must have stubs here for the dependency cache layer

rqe-optimizer/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "rqe-optimizer"
+version.workspace = true
+edition.workspace = true
+license = "MIT"
+description = "v1 brute-force solver for the RQE -> sketch-deployment mapping problem (docs/rqe_sketch_deployment_v1.md). Consumes aqpbm-core's AtomicCostEntry directly so a real atomic-cost export can be dropped in later without a translation layer."
+
+[dependencies]
+# The atomic-cost table's row types: sketch-bench measures and exports the table.
+aqpbm-core = { git = "https://github.com/ProjectASAP/sketch-bench", rev = "c750fa6ed6cf742810b2339c89057612dfa39c86", default-features = false }
+serde_json.workspace = true
+good_lp = { version = "1.15", default-features = false, features = ["highs"] }
+csv = "1"