Skip to content

compute: Emit dataflow import outputs as the columnar edge #37786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
antiguru wants to merge 4 commits into from
+19 −8
Open

compute: Emit dataflow import outputs as the columnar edge #37786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0e0f04
compute: Emit dataflow import outputs as the columnar edge
antiguru Jul 21, 2026
d010a75
test: update relations.slt golden for import leaf-encode
antiguru Jul 22, 2026
44a7151
style: split structuring semicolons in import leaf-encode comments
antiguru Jul 22, 2026
54539a8
doc: tighten the import leaf-encode comments
antiguru Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions src/compute/src/render.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ use crate::extensions::temporal_bucket::TemporalBucketing;
use crate::logging::compute::{
ComputeEvent, DataflowGlobal, LirMapping, LirMetadata, LogDataflowErrors, OperatorHydration,
};
use crate::render::columnar::CollectionEdge;
use crate::render::columnar::{CollectionEdge, vec_to_columnar};
use crate::render::context::{ArrangementFlavor, Context};
use crate::render::errors::DataflowErrorSer;
use crate::typedefs::{ErrBatcher, ErrBuilder, ErrSpine, KeyBatcher, MzTimestamp};
Expand Down Expand Up @@ -375,8 +375,10 @@ pub fn build_compute_dataflow(
);

for (id, (oks, errs)) in imported_sources.into_iter() {
let bundle = crate::render::CollectionBundle::from_collections(
oks.enter(region),
// Persist batches are row-shaped and already consolidated, so the
// encode here is non-consolidating.
let bundle = crate::render::CollectionBundle::from_edge(
CollectionEdge::Columnar(vec_to_columnar(oks.enter(region))),
errs.enter(region),
);
// Associate collection bundle with the source identifier.
Expand Down Expand Up @@ -475,8 +477,10 @@ pub fn build_compute_dataflow(
);

for (id, (oks, errs)) in imported_sources.into_iter() {
let bundle = crate::render::CollectionBundle::from_collections(
oks.enter_region(region),
// Persist batches are row-shaped and already consolidated, so the
// encode here is non-consolidating.
let bundle = crate::render::CollectionBundle::from_edge(
CollectionEdge::Columnar(vec_to_columnar(oks.enter_region(region))),
errs.enter_region(region),
);
// Associate collection bundle with the source identifier.
Expand Down Expand Up @@ -668,7 +672,12 @@ where
start_signal,
|e, _| e.clone(),
);
CollectionBundle::from_collections(oks, errs)
// The filtered index collection is row-shaped and already
// consolidated, so the encode here is non-consolidating.
CollectionBundle::from_edge(
CollectionEdge::Columnar(vec_to_columnar(oks)),
errs,
)
}
};
self.update_id(Id::Global(idx.on_id), bundle);
Expand Down
6 changes: 4 additions & 2 deletions test/sqllogictest/introspection/relations.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,10 @@ FormArrangementKey Concatenate alloc::vec::Vec<(mz_compute::render::errors::Da
InputRegion:␠materialize.public.test_primary_idx BuildRegion:␠materialize.public.test_primary_idx alloc::vec::Vec<(mz_compute::render::errors::DataflowErrorSer,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>
InputRegion:␠materialize.public.test_primary_idx BuildRegion:␠materialize.public.test_primary_idx alloc::vec::Vec<(mz_repr::row::Row,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>
LimitProgress(Dataflow:␠materialize.public.test_primary_idx) Probe alloc::vec::Vec<(mz_repr::row::Row,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>
LogOperatorHydration␠(1) FormArrangementKey alloc::vec::Vec<(mz_repr::row::Row,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>
LogOperatorHydration␠(1) FormArrangementKey mz_timely_util::columnar::Column<(mz_repr::row::Row,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>
OkErr SuppressEarlyProgress alloc::vec::Vec<(mz_repr::row::Row,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>
SuppressEarlyProgress LimitProgress(Dataflow:␠materialize.public.test_primary_idx) alloc::vec::Vec<(mz_repr::row::Row,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>
VecToColumnar BuildingObject(User(2)) mz_timely_util::columnar::Column<(mz_repr::row::Row,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>
decode_backpressure_probe(u1) Feedback alloc::vec::Vec<core::convert::Infallible>
expire_stream_at(materialize.public.test_primary_idx_export_index_errs) LogDataflowErrorsStream alloc::vec::Vec<mz_row_spine::arc_batch::ArcBatch<differential_dataflow::trace::implementations::ord_neu::key_batch::OrdKeyBatch<mz_compute::typedefs::spines::MzStack<((mz_compute::render::errors::DataflowErrorSer,␠()),␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>>>>
expire_stream_at(materialize.public.test_primary_idx_export_index_oks) InspectBatch alloc::vec::Vec<mz_row_spine::arc_batch::ArcBatch<differential_dataflow::trace::implementations::ord_neu::val_batch::OrdValBatch<mz_row_spine::spines::RowRowLayout<((mz_repr::row::Row,␠mz_repr::row::Row),␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>>>>
Expand Down Expand Up @@ -97,11 +98,12 @@ GROUP BY type;
2 alloc::vec::Vec<(usize,␠mz_persist_client::fetch::ExchangeableBatchPart<mz_repr::timestamp::Timestamp>)>
2 alloc::vec::Vec<mz_txn_wal::txn_read::DataRemapEntry<mz_repr::timestamp::Timestamp>>
4 alloc::vec::Vec<(core::result::Result<mz_repr::row::Row,␠mz_compute::render::errors::DataflowErrorSer>,␠(mz_repr::timestamp::Timestamp,␠mz_storage_operators::persist_source::Subtime),␠mz_ore::overflowing::Overflowing<i64>)>
4 mz_timely_util::columnar::Column<(mz_repr::row::Row,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>
5 alloc::vec::Vec<core::convert::Infallible>
5 alloc::vec::Vec<mz_row_spine::arc_batch::ArcBatch<differential_dataflow::trace::implementations::ord_neu::key_batch::OrdKeyBatch<mz_compute::typedefs::spines::MzStack<((mz_compute::render::errors::DataflowErrorSer,␠()),␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>>>>
6 alloc::vec::Vec<(mz_compute::render::errors::DataflowErrorSer,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>
6 alloc::vec::Vec<(mz_repr::row::Row,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>
6 alloc::vec::Vec<mz_row_spine::arc_batch::ArcBatch<differential_dataflow::trace::implementations::ord_neu::val_batch::OrdValBatch<mz_row_spine::spines::RowRowLayout<((mz_repr::row::Row,␠mz_repr::row::Row),␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>>>>
9 alloc::vec::Vec<(mz_repr::row::Row,␠mz_repr::timestamp::Timestamp,␠mz_ore::overflowing::Overflowing<i64>)>

query TTT rowsort
SELECT mdod_from.name AS from_name,
Expand Down
Loading