Skip to content

chore: delete the superseded GORILLA1 format (Rust store + legacy archive leg) - #315

Merged
zzylol merged 1 commit into
mainfrom
chore/delete-gorilla1
May 24, 2026
Merged

zzylol merged 1 commit into
mainfrom
chore/delete-gorilla1

Conversation

@zzylol

@zzylol zzylol commented May 24, 2026

Copy link
Copy Markdown
Contributor

Summary

Deletes the GORILLA1 read side. The custom GORILLA1 container format is fully superseded by Path A2: agents emit XOR-chunk fragments → backend gorilla-merger → TSDB blocks → S3 → thanos-query, answered by ThanosQueryEngine (env ASAP_THANOS_QUERY_URL). Path A2 is verified end-to-end, so the "Phase δ deletes this leg after Path A2 is verified" cleanup is now done.

What was removed

  • data_plane/src/storage_engines/gorilla_object_store/ in full — GorillaS3Store + decode_block (the GORILLA1 block decoder via the asap_gorilla crate), the in-process GorillaQueryEngine + ExactExecutor (archive_query.rs), the postings sidecar, and the GORILLA1-only S3 cost wrapper (s3_cost.rs) plus its /metrics append and /internal/s3_cost.csv endpoint (those counters were only ever populated by GorillaS3Store).
  • The legacy archive leg in main.rs: the Ok(None) fallback that built GorillaS3Store / GorillaQueryEngine is gone. When ASAP_THANOS_QUERY_URL is unset the binary now registers the existing NoDataArchiveEngine stub on the archive slot.
  • The now-unused asap-gorilla path-dep + the rust-s3 / lru crates from data_plane/Cargo.toml (and their transitive entries in Cargo.lock).
  • Stale doc-comment references to the deleted symbols across query_engines/{mod.rs,routing/mod.rs,thanos_query_engine/*}, storage_engines/mod.rs, and fallback/metrics.rs.

Kept intact (coupling note)

  • StorageBackend::GorillaObjectStore (in asap_types) is kept — it is the archive-tier routing slot that the live ThanosQueryEngine registers under (data_source_id = thanos_query, see forward.rs). Only the answering engine changed; the routing key, its YAML serialized form (gorilla_object_store), and the backend_storage_routing tests are untouched.
  • The sketch / thanos query paths and the gorilla-merger story.

Build & test status

  • cargo build -p data_plane --all-targets → green (binary + all test targets; only pre-existing warnings).
  • Lib unit tests pass: routing (77), thanos (15), http-server (53 passed / 1 pre-existing ignored).

🤖 Generated with Claude Code

…hive leg)

The custom GORILLA1 container format read side is fully superseded by
Path A2: agents emit XOR-chunk fragments -> backend gorilla-merger ->
TSDB blocks -> S3 -> thanos-query, answered by ThanosQueryEngine
(env ASAP_THANOS_QUERY_URL). Path A2 is verified end-to-end, so the
"Phase δ deletes this leg after Path A2 is verified" cleanup is now done.

Removed:
* data_plane/src/storage_engines/gorilla_object_store/ in full --
  GorillaS3Store + decode_block (the GORILLA1 block decoder via the
  asap_gorilla crate), the in-process GorillaQueryEngine + ExactExecutor
  (archive_query.rs), postings sidecar, and the GORILLA1-only S3 cost
  wrapper (s3_cost.rs) + its /metrics append and /internal/s3_cost.csv
  endpoint (the counters were only ever populated by GorillaS3Store).
* The legacy archive leg in main.rs: the Ok(None) fallback that built
  GorillaS3Store/GorillaQueryEngine is gone; when ASAP_THANOS_QUERY_URL
  is unset the binary now registers the NoDataArchiveEngine stub.
* The now-unused asap-gorilla path-dep plus the rust-s3 / lru crates
  from data_plane/Cargo.toml (and their transitive entries in Cargo.lock).

Kept intact:
* StorageBackend::GorillaObjectStore (asap_types) -- the archive-tier
  routing slot the live ThanosQueryEngine still registers under
  (data_source_id = thanos_query); only the answering engine changed.
* The sketch / thanos query paths and the gorilla-merger story.

Build: cargo build -p data_plane --all-targets green; routing (77),
thanos (15) and http-server (53) lib unit tests pass.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@zzylol
zzylol merged commit 9b26649 into main May 24, 2026
@zzylol
zzylol deleted the chore/delete-gorilla1 branch July 17, 2026 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant