Small fixes: journal routing, selector double-slash, null handling#2718
Merged
jgraettinger merged 4 commits intomasterfrom Mar 3, 2026
Merged
Small fixes: journal routing, selector double-slash, null handling#2718jgraettinger merged 4 commits intomasterfrom
jgraettinger merged 4 commits intomasterfrom
Conversation
A null top-level merge-patch operand triggers the LWW delete flag during full reduction, removing position 1 from the [key, value] array. The extraction code assumed array[1] always exists, causing a panic. Handle the missing position by emitting JSON null, which is the correct RFC 7396 result for merge(anything, null). Also broadens the QuickCheck fuzz test to generate non-object operands (scalars, nulls, arrays), exercising NotAssociative batching paths that were previously excluded by an is_object() guard. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…nal routing Production Gazette deployments don't use a reverse proxy, and the client-side behavior of ignoring known topology when `do_not_proxy` wasn't set was counterproductive: there are requests (like metadata fetches) where you want a peer to forward on your behalf for reduced latency, while still using the response's route on a subsequent request. If a reverse proxy setup were reintroduced, the proxy itself would be responsible for rewriting response headers to reference itself rather than the internal brokers it fronts. Concretely: - Append, Fragments, and Read always use topology-aware routing (Primary or Replica as appropriate) instead of falling back to Mode::Default when `do_not_proxy` is unset. - In read_some, capture metadata response routing before branching, fixing a gap where the fragment-URL path lost routing info. - Re-pick a routed subclient before starting a direct journal read, so the data stream is served by a broker that actually serves the journal rather than the arbitrary default dialed for metadata. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Deleted specs can have null spec_type, which caused the dataloader query to fail with "unexpected null" since the column was annotated as non-nullable. Filter them out in the join condition instead. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The authorization endpoint returns journal_name_prefix with a trailing slash (added in snapshot.rs for binary-search purposes), but assemble::journal_selector() also appends one when building the name:prefix label. This produced a double-slash (e.g. "collection/gen1234//") that matched no journals, breaking list-journals, list-fragments, split-journals, and collection reads. Strip the trailing slash in build_label_selector before passing through to journal_selector. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
github-actions bot
pushed a commit
to estuary/homebrew-flowctl
that referenced
this pull request
Mar 25, 2026
This release includes support for the upcoming materialization triggers feature, in addition to several other bugfixes and improvements. ## What's Changed - Fix double-slash in journal list selector breaking collection reads by @jgraettinger in estuary/flow#2718 - Include flowctl version in publication details by @psFried in estuary/flow#2748 - Improve error message for concurrent spec modifications by @jwhartley in estuary/flow#2678 - Add support for materialization triggers by @williamhbaker in estuary/flow#2800
williamhbaker
added a commit
to estuary/homebrew-flowctl
that referenced
this pull request
Mar 25, 2026
This release includes support for the upcoming materialization triggers feature, in addition to several other bugfixes and improvements. ## What's Changed - Fix double-slash in journal list selector breaking collection reads by @jgraettinger in estuary/flow#2718 - Include flowctl version in publication details by @psFried in estuary/flow#2748 - Improve error message for concurrent spec modifications by @jwhartley in estuary/flow#2678 - Add support for materialization triggers by @williamhbaker in estuary/flow#2800
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
2 participants
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
Smaller seemingly independent changes that came out of developing and testing an update to
gazetterouting behavior.The RocksDB change is a bonus from some extra sanity checking I did. It makes the local implementation more-correct / defensive, but wasn't actually possible in the wired application.
gazette: always use routing topology in client — Updates the gazette
journal client to always route through the topology (Primary for appends,
Replica for reads/fragments) instead of conditionally falling back to the
default service address when
do_not_proxywas set. Also fixes reads tore-pick a routed subclient when transitioning from the metadata request to
the content stream, ensuring the content read goes to a broker that actually
serves the journal rather than whichever broker handled the initial metadata
RPC.
flowctl: fix double-slash in journal list selector — The authorization
endpoint returns
journal_name_prefixwith a trailing slash, butassemble::journal_selector()adds its own slash when building selectors.This produced
collection/name//pivot=00patterns that matched nothing.Now strips the trailing slash from the prefix before passing it to the
assembler.
control-plane-api: fix null spec_type crash in live_specs dataloader —
Adds
ls.spec_type is not nullto the join condition so that soft-deletedlive_specs rows (which have a null
spec_type) are excluded from thedataloader query instead of crashing at deserialization.
rocksdb: fix panic on null merge-patch operand, broaden fuzz coverage —
When a full merge-patch reduction with a null operand fires the LWW delete
flag, the value position is removed from the
[key, doc]array. The mergeoperator now handles this case by emitting JSON
nullinstead of panickingon an out-of-bounds index. Fuzz test coverage is broadened to include scalar
and null operands (not just objects), which exercises the
NotAssociativepartial-merge path.
Testing
Verifed
flowctl collections list,list-fragments,list-journals, andreadnow work (no longer produces double-slash selectors)