chore: delete the superseded GORILLA1 format (Rust store + legacy archive leg) - #315
Merged
Merged
Conversation
…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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 byThanosQueryEngine(envASAP_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 theasap_gorillacrate), the in-processGorillaQueryEngine+ExactExecutor(archive_query.rs), the postings sidecar, and the GORILLA1-only S3 cost wrapper (s3_cost.rs) plus its/metricsappend and/internal/s3_cost.csvendpoint (those counters were only ever populated byGorillaS3Store).main.rs: theOk(None)fallback that builtGorillaS3Store/GorillaQueryEngineis gone. WhenASAP_THANOS_QUERY_URLis unset the binary now registers the existingNoDataArchiveEnginestub on the archive slot.asap-gorillapath-dep + therust-s3/lrucrates fromdata_plane/Cargo.toml(and their transitive entries inCargo.lock).query_engines/{mod.rs,routing/mod.rs,thanos_query_engine/*},storage_engines/mod.rs, andfallback/metrics.rs.Kept intact (coupling note)
StorageBackend::GorillaObjectStore(inasap_types) is kept — it is the archive-tier routing slot that the liveThanosQueryEngineregisters under (data_source_id = thanos_query, seeforward.rs). Only the answering engine changed; the routing key, its YAML serialized form (gorilla_object_store), and thebackend_storage_routingtests are untouched.Build & test status
cargo build -p data_plane --all-targets→ green (binary + all test targets; only pre-existing warnings).🤖 Generated with Claude Code