Skip to content

Commit d46ee7c

Browse files
Merge pull request #915 from ProjectASAP/refactor/move-rqe-optimizer
refactor(rqe-optimizer): move rqe-optimizer from sketch-bench
2 parents 336ce82 + 6062d90 commit d46ee7c

280 files changed

Lines changed: 943599 additions & 23 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dockerignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
target/
22
.git/
3+
rqe-optimizer/results/
4+
rqe-optimizer/data/

‎.github/workflows/accuracy_performance.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ on:
1212
paths:
1313
- 'asap-query-engine/**'
1414
- 'asap-planner-rs/**'
15+
- 'rqe-optimizer/Cargo.toml'
16+
- 'rqe-optimizer/src/**'
1517
- 'asap-quickstart/**'
1618
- '.github/workflows/accuracy_performance.yml'
1719
- 'benchmarks/**'

‎.github/workflows/docker.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ on:
1010
paths:
1111
- 'asap-common/installation/**'
1212
- 'asap-planner-rs/**'
13+
- 'rqe-optimizer/Cargo.toml'
14+
- 'rqe-optimizer/src/**'
1315
- 'asap-query-engine/**'
1416
- 'asap-tools/queriers/prometheus-client/**'
1517
- 'asap-tools/data-sources/prometheus-exporters/fake_exporter/fake_exporter_rust/**'

‎.github/workflows/rust.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
paths:
77
- 'asap-query-engine/**'
88
- 'asap-planner-rs/**'
9+
- 'rqe-optimizer/**'
910
- 'asap-common/dependencies/rs/**'
1011
- 'asap-common/tests/**'
1112
- 'asap-common/sketch-core/**'
@@ -18,6 +19,7 @@ on:
1819
paths:
1920
- 'asap-query-engine/**'
2021
- 'asap-planner-rs/**'
22+
- 'rqe-optimizer/**'
2123
- 'asap-common/dependencies/rs/**'
2224
- 'asap-common/tests/**'
2325
- 'asap-common/sketch-core/**'

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,9 @@ promql-compliance/runner/differential-report.json
1010
/.agent/
1111

1212
/**/*.log
13+
14+
# rqe-optimizer: only the saturation inputs' CSVs are committed
15+
rqe-optimizer/**/*.csv
16+
!rqe-optimizer/results/autosketch-vs-asap-inputs/saturation/**/*.csv
17+
!rqe-optimizer/results/autosketch-vs-asap-hydra/inputs/saturation/**/*.csv
18+
__pycache__/

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ repos:
77
- id: end-of-file-fixer
88
- id: check-yaml
99
- id: check-added-large-files
10+
# rqe-optimizer's committed eval results and inputs (JSON up to ~2 MB).
11+
exclude: ^rqe-optimizer/(results|data)/
1012
- id: check-case-conflict
1113
- id: check-merge-conflict
1214
- id: check-executables-have-shebangs

‎Cargo.lock‎

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ members = [
99
"asap-common/tests/compare_patterns",
1010
"asap-query-engine",
1111
"asap-planner-rs",
12+
"rqe-optimizer",
1213
]
1314

1415
[workspace.package]

‎asap-planner-rs/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ chrono.workspace = true
3838
promql-parser = "0.5.0"
3939
reqwest = { version = "0.11", features = ["blocking", "json"] }
4040
flate2 = "1.1"
41-
rqe-optimizer = { git = "https://github.com/ProjectASAP/sketch-bench", branch = "main" }
41+
rqe-optimizer = { path = "../rqe-optimizer" }
4242

4343
[dev-dependencies]
4444
tempfile = "3.20"

‎asap-planner-rs/Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ COPY Cargo.toml ./
1717
COPY Cargo.lock ./
1818
COPY asap-query-engine/Cargo.toml ./asap-query-engine/
1919
COPY asap-planner-rs/Cargo.toml ./asap-planner-rs/
20+
COPY rqe-optimizer/Cargo.toml ./rqe-optimizer/
21+
COPY rqe-optimizer/src ./rqe-optimizer/src
2022

2123
# Create dummy source files so Cargo can resolve all workspace members
2224
RUN mkdir -p asap-query-engine/src && echo "fn main() {}" > asap-query-engine/src/main.rs && \

0 commit comments

Comments
 (0)