1use std::cmp::{Ordering, Reverse};
13use std::collections::binary_heap::PeekMut;
14use std::collections::{BinaryHeap, VecDeque};
15use std::fmt::Debug;
16use std::marker::PhantomData;
17use std::mem;
18use std::sync::Arc;
19
20use anyhow::anyhow;
21use arrow::array::{Array, Int64Array};
22use differential_dataflow::difference::Monoid;
23use differential_dataflow::lattice::Lattice;
24use differential_dataflow::trace::Description;
25use futures_util::StreamExt;
26use futures_util::stream::FuturesUnordered;
27use itertools::Itertools;
28use mz_ore::soft_assert_eq_or_log;
29use mz_ore::task::JoinHandle;
30use mz_persist::indexed::encoding::BlobTraceUpdates;
31use mz_persist::location::Blob;
32use mz_persist::metrics::ColumnarMetrics;
33use mz_persist_types::arrow::{ArrayBound, ArrayIdx, ArrayOrd};
34use mz_persist_types::columnar::data_type;
35use mz_persist_types::part::Part;
36use mz_persist_types::{Codec, Codec64};
37use semver::Version;
38use timely::progress::Timestamp;
39use tracing::{Instrument, debug_span};
40
41use crate::ShardId;
42use crate::fetch::{EncodedPart, FetchBatchFilter, FetchConfig};
43use crate::internal::encoding::Schemas;
44use crate::internal::metrics::{ReadMetrics, ShardMetrics};
45use crate::internal::state::{HollowRun, RunMeta, RunOrder, RunPart};
46use crate::metrics::Metrics;
47
48pub const MINIMUM_CONSOLIDATED_VERSION: Version = Version::new(0, 67, 0);
52
53#[derive(Debug, Clone)]
56pub(crate) struct FetchData<T> {
57 run_meta: RunMeta,
58 part_desc: Description<T>,
59 part: RunPart<T>,
60 structured_lower: Option<ArrayBound>,
61}
62
63pub(crate) trait RowSort<T, D> {
64 fn updates_from_blob(&self, updates: BlobTraceUpdates) -> StructuredUpdates;
65
66 fn updates_to_blob(&self, updates: StructuredUpdates) -> Part;
67}
68
69fn interleave_updates<T: Codec64, D: Codec64>(
70 updates: &[&Part],
71 elements: impl IntoIterator<Item = (Indices, T, D)>,
72) -> Part {
73 let (indices, timestamps, diffs): (Vec<_>, Vec<_>, Vec<_>) = elements
74 .into_iter()
75 .map(|(idx, t, d)| {
76 (
77 idx,
78 i64::from_le_bytes(T::encode(&t)),
79 i64::from_le_bytes(D::encode(&d)),
80 )
81 })
82 .multiunzip();
83
84 let mut arrays: Vec<&dyn Array> = Vec::with_capacity(updates.len());
85 let mut interleave = |get_array: fn(&Part) -> &dyn Array| {
86 arrays.clear();
87 for part in updates {
88 arrays.push(get_array(part));
89 }
90 ::arrow::compute::interleave(arrays.as_slice(), &indices).expect("type-aligned input")
91 };
92
93 let key = interleave(|p| &*p.key);
94 let val = interleave(|p| &*p.val);
95 Part {
96 key,
97 val,
98 time: Int64Array::from(timestamps),
99 diff: Int64Array::from(diffs),
100 }
101}
102
103#[derive(Clone, Debug)]
105pub struct StructuredUpdates {
106 key_ord: ArrayOrd,
107 val_ord: ArrayOrd,
108 data: Part,
109}
110
111impl StructuredUpdates {
112 fn len(&self) -> usize {
113 self.data.len()
114 }
115
116 fn get<T: Codec64, D: Codec64>(&self, index: usize) -> Option<(SortKV<'_>, T, D)> {
117 let t = self.data.time.values().get(index)?.to_le_bytes();
118 let d = self.data.diff.values().get(index)?.to_le_bytes();
119 Some((
120 (self.key_ord.at(index), Some(self.val_ord.at(index))),
121 T::decode(t),
122 D::decode(d),
123 ))
124 }
125
126 fn interleave_updates<'a, T: Codec64, D: Codec64>(
127 updates: &[&'a StructuredUpdates],
128 elements: impl IntoIterator<Item = (Indices, SortKV<'a>, T, D)>,
129 ) -> StructuredUpdates {
130 let updates: Vec<_> = updates.iter().map(|u| &u.data).collect();
131 let interleaved = interleave_updates(
132 &updates,
133 elements.into_iter().map(|(idx, _, t, d)| (idx, t, d)),
134 );
135 let key_ord = ArrayOrd::new(interleaved.key.as_ref());
136 let val_ord = ArrayOrd::new(interleaved.val.as_ref());
137 StructuredUpdates {
138 key_ord,
139 val_ord,
140 data: interleaved,
141 }
142 }
143}
144
145#[derive(Debug, Clone)]
147pub struct StructuredSort<K: Codec, V: Codec, T, D> {
148 schemas: Schemas<K, V>,
149 _time_diff: PhantomData<fn(T, D)>,
150}
151
152impl<K: Codec, V: Codec, T, D> StructuredSort<K, V, T, D> {
153 pub fn new(schemas: Schemas<K, V>) -> Self {
155 Self {
156 schemas,
157 _time_diff: Default::default(),
158 }
159 }
160}
161
162type SortKV<'a> = (ArrayIdx<'a>, Option<ArrayIdx<'a>>);
163
164fn kv_lower<T>(data: &FetchData<T>) -> Option<SortKV<'_>> {
165 let key_idx = data.structured_lower.as_ref().map(|l| l.get())?;
166 Some((key_idx, None))
167}
168
169fn kv_size((key, value): SortKV<'_>) -> usize {
170 key.goodbytes() + value.map_or(0, |v| v.goodbytes())
171}
172
173impl<K: Codec, V: Codec, T: Codec64, D: Codec64> RowSort<T, D> for StructuredSort<K, V, T, D> {
174 fn updates_from_blob(&self, mut updates: BlobTraceUpdates) -> StructuredUpdates {
175 let structured = updates
176 .get_or_make_structured::<K, V>(&*self.schemas.key, &*self.schemas.val)
177 .clone();
178 soft_assert_eq_or_log!(
179 Some(structured.key.data_type()),
180 data_type::<K>(&*self.schemas.key).ok().as_ref(),
181 "migrated key type should match"
182 );
183 soft_assert_eq_or_log!(
184 Some(structured.val.data_type()),
185 data_type::<V>(&*self.schemas.val).ok().as_ref(),
186 "migrated val type should match"
187 );
188 let key_ord = ArrayOrd::new(&structured.key);
189 let val_ord = ArrayOrd::new(&structured.val);
190 StructuredUpdates {
191 key_ord,
192 val_ord,
193 data: Part {
194 key: structured.key,
195 val: structured.val,
196 time: updates.timestamps().clone(),
197 diff: updates.diffs().clone(),
198 },
199 }
200 }
201
202 fn updates_to_blob(&self, updates: StructuredUpdates) -> Part {
203 updates.data
204 }
205}
206
207type FetchResult<T> = Result<EncodedPart<T>, HollowRun<T>>;
208
209impl<T: Codec64 + Timestamp + Lattice> FetchData<T> {
210 async fn fetch(
211 self,
212 cfg: &FetchConfig,
213 shard_id: ShardId,
214 blob: &dyn Blob,
215 metrics: &Metrics,
216 shard_metrics: &ShardMetrics,
217 read_metrics: &ReadMetrics,
218 ) -> anyhow::Result<FetchResult<T>> {
219 match self.part {
220 RunPart::Single(part) => {
221 let part = EncodedPart::fetch(
222 cfg,
223 &shard_id,
224 &*blob,
225 metrics,
226 shard_metrics,
227 read_metrics,
228 &self.part_desc,
229 &part,
230 )
231 .await
232 .map_err(|blob_key| anyhow!("missing unleased key {blob_key}"))?;
233 Ok(Ok(part))
234 }
235 RunPart::Many(run_ref) => {
236 let runs = run_ref
237 .get(shard_id, blob, metrics)
238 .await
239 .ok_or_else(|| anyhow!("missing run ref {}", run_ref.key))?;
240 Ok(Err(runs))
241 }
242 }
243 }
244}
245
246#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Default)]
251struct PartIndices {
252 sorted_indices: VecDeque<usize>,
253 next_index: usize,
254}
255
256impl PartIndices {
257 fn index(&self) -> usize {
258 self.sorted_indices
259 .front()
260 .copied()
261 .unwrap_or(self.next_index)
262 }
263
264 fn inc(&mut self) {
265 if self.sorted_indices.pop_front().is_none() {
266 self.next_index += 1;
267 }
268 }
269}
270
271#[derive(Debug)]
272enum ConsolidationPart<T, D> {
273 Queued {
274 data: FetchData<T>,
275 task: Option<JoinHandle<anyhow::Result<FetchResult<T>>>>,
276 _diff: PhantomData<D>,
277 },
278 Encoded {
279 part: StructuredUpdates,
280 cursor: PartIndices,
281 },
282}
283
284impl<T: Timestamp + Codec64 + Lattice, D: Codec64> ConsolidationPart<T, D> {
285 pub(crate) fn from_encoded(
286 part: EncodedPart<T>,
287 force_reconsolidation: bool,
288 metrics: &ColumnarMetrics,
289 sort: &impl RowSort<T, D>,
290 ) -> Self {
291 let reconsolidate = part.maybe_unconsolidated() || force_reconsolidation;
292 let updates = part.normalize(metrics);
293 let updates: StructuredUpdates = sort.updates_from_blob(updates);
294 let cursor = if reconsolidate {
295 let len = updates.len();
296 let mut indices: Vec<_> = (0..len).collect();
297
298 indices.sort_by_key(|i| updates.get::<T, D>(*i).map(|(kv, t, _d)| (kv, t)));
299
300 PartIndices {
301 sorted_indices: indices.into(),
302 next_index: len,
303 }
304 } else {
305 PartIndices::default()
306 };
307
308 ConsolidationPart::Encoded {
309 part: updates,
310 cursor,
311 }
312 }
313
314 fn kvt_lower(&self) -> Option<(SortKV<'_>, T)> {
315 match self {
316 ConsolidationPart::Queued { data, .. } => Some((kv_lower(data)?, T::minimum())),
317 ConsolidationPart::Encoded { part, cursor } => {
318 let (kv, t, _d) = part.get::<T, D>(cursor.index())?;
319 Some((kv, t))
320 }
321 }
322 }
323
324 pub(crate) fn is_empty(&self) -> bool {
327 match self {
328 ConsolidationPart::Encoded { part, cursor, .. } => cursor.index() >= part.len(),
329 ConsolidationPart::Queued { .. } => false,
330 }
331 }
332}
333
334#[derive(Debug)]
349pub(crate) struct Consolidator<T, D, Sort: RowSort<T, D>> {
350 context: String,
351 cfg: FetchConfig,
352 shard_id: ShardId,
353 sort: Sort,
354 blob: Arc<dyn Blob>,
355 metrics: Arc<Metrics>,
356 shard_metrics: Arc<ShardMetrics>,
357 read_metrics: Arc<ReadMetrics>,
358 runs: Vec<VecDeque<(ConsolidationPart<T, D>, usize)>>,
359 filter: FetchBatchFilter<T>,
360 budget: usize,
361 lower_bound: Option<LowerBound<T>>,
365 drop_stash: Option<StructuredUpdates>,
371}
372
373#[derive(Debug)]
374pub struct LowerBound<T> {
376 pub(crate) key_bound: ArrayBound,
377 pub(crate) val_bound: ArrayBound,
378 pub(crate) t: T,
379}
380
381impl<T: Clone> LowerBound<T> {
382 pub fn kvt_bound(&self) -> (SortKV<'_>, T) {
384 (
385 (self.key_bound.get(), Some(self.val_bound.get())),
386 self.t.clone(),
387 )
388 }
389}
390
391impl<T, D, Sort> Consolidator<T, D, Sort>
392where
393 T: Timestamp + Codec64 + Lattice,
394 D: Codec64 + Monoid + Ord,
395 Sort: RowSort<T, D>,
396{
397 pub fn new(
401 context: String,
402 cfg: FetchConfig,
403 shard_id: ShardId,
404 sort: Sort,
405 blob: Arc<dyn Blob>,
406 metrics: Arc<Metrics>,
407 shard_metrics: Arc<ShardMetrics>,
408 read_metrics: ReadMetrics,
409 filter: FetchBatchFilter<T>,
410 lower_bound: Option<LowerBound<T>>,
411 prefetch_budget_bytes: usize,
412 ) -> Self {
413 Self {
414 context,
415 cfg,
416 metrics,
417 shard_id,
418 sort,
419 blob,
420 read_metrics: Arc::new(read_metrics),
421 shard_metrics,
422 runs: vec![],
423 filter,
424 budget: prefetch_budget_bytes,
425 drop_stash: None,
426 lower_bound,
427 }
428 }
429}
430
431impl<T, D, Sort> Consolidator<T, D, Sort>
432where
433 T: Timestamp + Codec64 + Lattice + Sync,
434 D: Codec64 + Monoid + Ord,
435 Sort: RowSort<T, D>,
436{
437 pub fn enqueue_run(
444 &mut self,
445 desc: &Description<T>,
446 run_meta: &RunMeta,
447 parts: impl IntoIterator<Item = RunPart<T>>,
448 ) {
449 let run = parts
450 .into_iter()
451 .map(|part| {
452 let bytes = part.encoded_size_bytes();
453 let c_part = ConsolidationPart::Queued {
454 data: FetchData {
455 run_meta: run_meta.clone(),
456 part_desc: desc.clone(),
457 structured_lower: part.structured_key_lower(),
458 part,
459 },
460 task: None,
461 _diff: Default::default(),
462 };
463 (c_part, bytes)
464 })
465 .collect();
466 self.push_run(run);
467 }
468
469 fn push_run(&mut self, run: VecDeque<(ConsolidationPart<T, D>, usize)>) {
470 let wrong_sort = run.iter().any(|(p, _)| match p {
474 ConsolidationPart::Queued { data, .. } => {
475 data.run_meta.order != Some(RunOrder::Structured)
476 }
477 ConsolidationPart::Encoded { .. } => false,
478 });
479
480 if wrong_sort {
481 self.metrics.consolidation.wrong_sort.inc();
482 }
483
484 if run.len() > 1 && wrong_sort {
485 for part in run {
486 self.runs.push(VecDeque::from([part]));
487 }
488 } else {
489 self.runs.push(run);
490 }
491 }
492
493 fn trim(&mut self) {
495 self.runs.retain_mut(|run| {
496 while run.front_mut().map_or(false, |(part, _)| part.is_empty()) {
497 run.pop_front();
498 }
499 !run.is_empty()
500 });
501
502 self.start_prefetches();
504 }
505
506 fn iter(&mut self) -> Option<ConsolidatingIter<'_, T, D>> {
510 if let Some(part) = self.drop_stash.take() {
516 self.runs.push(VecDeque::from_iter([(
517 ConsolidationPart::Encoded {
518 part,
519 cursor: PartIndices::default(),
520 },
521 0,
522 )]));
523 }
524
525 if self.runs.is_empty() {
526 return None;
527 }
528
529 let bound = self.lower_bound.as_ref().map(|b| b.kvt_bound());
530 let mut iter =
531 ConsolidatingIter::new(&self.context, &self.filter, bound, &mut self.drop_stash);
532
533 for run in &mut self.runs {
534 let last_in_run = run.len() < 2;
535 if let Some((part, _)) = run.front_mut() {
536 match part {
537 ConsolidationPart::Encoded { part, cursor } => {
538 iter.push(part, cursor, last_in_run);
539 }
540 other @ ConsolidationPart::Queued { .. } => {
541 if let Some(bound) = other.kvt_lower() {
544 iter.push_upper(bound);
545 }
546 }
547 };
548 }
549 }
550
551 Some(iter)
552 }
553
554 async fn unblock_progress(&mut self) -> anyhow::Result<()> {
560 if self.runs.is_empty() {
561 return Ok(());
562 }
563 self.runs
564 .sort_by(|a, b| a[0].0.kvt_lower().cmp(&b[0].0.kvt_lower()));
565
566 let first_larger = {
567 let run = &self.runs[0];
568 let min_lower = run[0].0.kvt_lower();
569 self.runs
570 .iter()
571 .position(|q| q[0].0.kvt_lower() > min_lower)
572 .unwrap_or(self.runs.len())
573 };
574
575 let mut ready_futures: FuturesUnordered<_> = self.runs[0..first_larger]
576 .iter_mut()
577 .map(|run| async {
578 loop {
583 let (mut part, size) = run.pop_front().expect("trimmed run should be nonempty");
584
585 let ConsolidationPart::Queued { data, task, .. } = &mut part else {
586 run.push_front((part, size));
587 return Ok(true);
588 };
589
590 let is_prefetched = task.as_ref().map_or(false, |t| t.is_finished());
591 if is_prefetched {
592 self.metrics.compaction.parts_prefetched.inc();
593 } else {
594 self.metrics.compaction.parts_waited.inc()
595 }
596 self.metrics.consolidation.parts_fetched.inc();
597
598 let wrong_sort = data.run_meta.order != Some(RunOrder::Structured);
599 let fetch_result: anyhow::Result<FetchResult<T>> = match task.take() {
600 Some(handle) => handle.await,
601 None => {
602 data.clone()
603 .fetch(
604 &self.cfg,
605 self.shard_id,
606 &*self.blob,
607 &*self.metrics,
608 &*self.shard_metrics,
609 &self.read_metrics,
610 )
611 .await
612 }
613 };
614 match fetch_result {
615 Err(err) => {
616 run.push_front((part, size));
617 return Err(err);
618 }
619 Ok(Err(run_part)) => {
620 for part in run_part.parts.into_iter().rev() {
623 let structured_lower = part.structured_key_lower();
624 let size = part.max_part_bytes();
625 run.push_front((
626 ConsolidationPart::Queued {
627 data: FetchData {
628 run_meta: data.run_meta.clone(),
629 part_desc: data.part_desc.clone(),
630 part,
631 structured_lower,
632 },
633 task: None,
634 _diff: Default::default(),
635 },
636 size,
637 ));
638 }
639 }
640 Ok(Ok(part)) => {
641 run.push_front((
642 ConsolidationPart::from_encoded(
643 part,
644 wrong_sort,
645 &self.metrics.columnar,
646 &self.sort,
647 ),
648 size,
649 ));
650 }
651 }
652 }
653 })
654 .collect();
655
656 let mut total_ready = 0;
658 while let Some(awaited) = ready_futures.next().await {
659 if awaited? {
660 total_ready += 1;
661 }
662 }
663 assert!(
664 total_ready > 0,
665 "at least one part should be fetched and ready to go"
666 );
667
668 Ok(())
669 }
670
671 #[allow(unused)]
675 pub(crate) async fn next(
676 &mut self,
677 ) -> anyhow::Result<Option<impl Iterator<Item = (SortKV<'_>, T, D)>>> {
678 self.trim();
679 self.unblock_progress().await?;
680 Ok(self.iter().map(|i| i.map(|(_idx, kv, t, d)| (kv, t, d))))
681 }
682
683 fn chunk(&mut self, max_len: usize, max_bytes: usize) -> Option<Part> {
684 let Some(mut iter) = self.iter() else {
685 return None;
686 };
687
688 let parts = iter.parts.clone();
689
690 let mut budget = max_bytes;
696 let iter = std::iter::from_fn(move || {
697 if budget == 0 {
698 return None;
699 }
700 let update @ (_, kv, _, _) = iter.next()?;
701 budget = budget.saturating_sub(kv_size(kv) + 16);
703 Some(update)
704 });
705
706 let updates = StructuredUpdates::interleave_updates(&parts, iter.take(max_len));
707 let updates = self.sort.updates_to_blob(updates);
708 Some(updates)
709 }
710
711 pub(crate) async fn next_chunk(
715 &mut self,
716 max_len: usize,
717 max_bytes: usize,
718 ) -> anyhow::Result<Option<Part>> {
719 self.trim();
720 self.unblock_progress().await?;
721 Ok(self.chunk(max_len, max_bytes))
722 }
723
724 fn live_bytes(&self) -> usize {
728 self.runs
729 .iter()
730 .flat_map(|run| {
731 run.iter().map(|(part, size)| match part {
732 ConsolidationPart::Queued { task: None, .. } => 0,
733 ConsolidationPart::Queued { task: Some(_), .. }
734 | ConsolidationPart::Encoded { .. } => *size,
735 })
736 })
737 .sum()
738 }
739
740 pub(crate) fn start_prefetches(&mut self) -> Option<usize> {
742 let mut prefetch_budget_bytes = self.budget;
743
744 let mut check_budget = |size| {
745 prefetch_budget_bytes
747 .checked_sub(size)
748 .map(|remaining| prefetch_budget_bytes = remaining)
749 };
750
751 let live_bytes = self.live_bytes();
753 check_budget(live_bytes)?;
754 let max_run_len = self.runs.iter().map(|x| x.len()).max().unwrap_or_default();
766 for idx in 0..max_run_len {
767 for run in self.runs.iter_mut() {
768 if let Some((c_part, size)) = run.get_mut(idx) {
769 let (data, task) = match c_part {
770 ConsolidationPart::Queued { data, task, .. } if task.is_none() => {
771 check_budget(*size)?;
772 (data, task)
773 }
774 _ => continue,
775 };
776 let span = debug_span!("compaction::prefetch");
777 let data = data.clone();
778 let handle = mz_ore::task::spawn(|| "persist::compaction::prefetch", {
779 let shard_id = self.shard_id;
780 let blob = Arc::clone(&self.blob);
781 let metrics = Arc::clone(&self.metrics);
782 let shard_metrics = Arc::clone(&self.shard_metrics);
783 let read_metrics = Arc::clone(&self.read_metrics);
784 let fetch_config = self.cfg.clone();
785 async move {
786 data.fetch(
787 &fetch_config,
788 shard_id,
789 &*blob,
790 &*metrics,
791 &*shard_metrics,
792 &*read_metrics,
793 )
794 .instrument(span)
795 .await
796 }
797 });
798 *task = Some(handle);
799 }
800 }
801 }
802
803 Some(prefetch_budget_bytes)
804 }
805}
806
807impl<T, D, Sort: RowSort<T, D>> Drop for Consolidator<T, D, Sort> {
808 fn drop(&mut self) {
809 for run in &self.runs {
810 for (part, _) in run {
811 match part {
812 ConsolidationPart::Queued { task: None, .. } => {
813 self.metrics.consolidation.parts_skipped.inc();
814 }
815 ConsolidationPart::Queued { task: Some(_), .. } => {
816 self.metrics.consolidation.parts_wasted.inc();
817 }
818 _ => {}
819 }
820 }
821 }
822 }
823}
824
825type Indices = (usize, usize);
829
830#[derive(Debug, Ord, PartialOrd, Eq, PartialEq)]
832struct PartRef<'a, T: Timestamp, D> {
833 next_kvt: Reverse<Option<(SortKV<'a>, T, D)>>,
837 part_index: usize,
839 row_index: &'a mut PartIndices,
843 last_in_run: bool,
846 _phantom: PhantomData<D>,
847}
848
849impl<'a, T: Timestamp + Codec64 + Lattice, D: Codec64 + Monoid> PartRef<'a, T, D> {
850 fn update_peek(&mut self, part: &'a StructuredUpdates, filter: &FetchBatchFilter<T>) {
851 let mut peek = part.get(self.row_index.index());
852 while let Some((_kv, t, _d)) = &mut peek {
853 let keep = filter.filter_ts(t);
854 if keep {
855 break;
856 } else {
857 self.row_index.inc();
858 peek = part.get(self.row_index.index());
859 }
860 }
861 self.next_kvt = Reverse(peek);
862 }
863
864 fn pop(
865 &mut self,
866 from: &[&'a StructuredUpdates],
867 filter: &FetchBatchFilter<T>,
868 ) -> Option<(Indices, SortKV<'a>, T, D)> {
869 let part = &from[self.part_index];
870 let Reverse(popped) = mem::take(&mut self.next_kvt);
871 let indices = (self.part_index, self.row_index.index());
872 self.row_index.inc();
873 self.update_peek(part, filter);
874 let (kv, t, d) = popped?;
875 Some((indices, kv, t, d))
876 }
877}
878
879#[derive(Debug)]
880pub(crate) struct ConsolidatingIter<'a, T, D>
881where
882 T: Timestamp + Codec64,
883 D: Codec64,
884{
885 context: &'a str,
886 filter: &'a FetchBatchFilter<T>,
887 parts: Vec<&'a StructuredUpdates>,
888 heap: BinaryHeap<PartRef<'a, T, D>>,
889 upper_bound: Option<(SortKV<'a>, T)>,
890 lower_bound: Option<(SortKV<'a>, T)>,
891 state: Option<(Indices, SortKV<'a>, T, D)>,
892 drop_stash: &'a mut Option<StructuredUpdates>,
893}
894
895impl<'a, T, D> ConsolidatingIter<'a, T, D>
896where
897 T: Timestamp + Codec64 + Lattice,
898 D: Codec64 + Monoid + Ord,
899{
900 fn new(
901 context: &'a str,
902 filter: &'a FetchBatchFilter<T>,
903 lower_bound: Option<(SortKV<'a>, T)>,
904 drop_stash: &'a mut Option<StructuredUpdates>,
905 ) -> Self {
906 Self {
907 context,
908 filter,
909 parts: vec![],
910 heap: BinaryHeap::new(),
911 upper_bound: None,
912 state: None,
913 drop_stash,
914 lower_bound,
915 }
916 }
917
918 fn push(&mut self, iter: &'a StructuredUpdates, index: &'a mut PartIndices, last_in_run: bool) {
919 let mut part_ref = PartRef {
920 next_kvt: Reverse(None),
921 part_index: self.parts.len(),
922 row_index: index,
923 last_in_run,
924 _phantom: Default::default(),
925 };
926 part_ref.update_peek(iter, self.filter);
927 self.parts.push(iter);
928 self.heap.push(part_ref);
929 }
930
931 fn push_upper(&mut self, upper: (SortKV<'a>, T)) {
934 let update_bound = self
935 .upper_bound
936 .as_ref()
937 .map_or(true, |existing| *existing > upper);
938 if update_bound {
939 self.upper_bound = Some(upper);
940 }
941 }
942
943 fn consolidate(&mut self) -> Option<(Indices, SortKV<'a>, T, D)> {
945 loop {
946 let Some(mut part) = self.heap.peek_mut() else {
947 break;
948 };
949 if let Some((kv1, t1, _)) = part.next_kvt.0.as_ref() {
950 if let Some((idx0, kv0, t0, d0)) = &mut self.state {
951 let consolidates = match (*kv0, &*t0).cmp(&(*kv1, t1)) {
952 Ordering::Less => false,
953 Ordering::Equal => true,
954 Ordering::Greater => {
955 panic!(
958 "data arrived at the consolidator out of order ({}, kvs equal? {}, {t0:?}, {t1:?})",
959 self.context,
960 (*kv0) == (*kv1)
961 );
962 }
963 };
964 if consolidates {
965 let (idx1, _, _, d1) = part
966 .pop(&self.parts, self.filter)
967 .expect("popping from a non-empty iterator");
968 d0.plus_equals(&d1);
969 *idx0 = idx1;
970 } else {
971 break;
972 }
973 } else {
974 if let Some((kv0, t0)) = &self.upper_bound {
977 if (kv0, t0) <= (kv1, t1) {
978 return None;
979 }
980 }
981
982 if let Some((kv_lower, t_lower)) = &self.lower_bound {
985 if (kv_lower, t_lower) >= (kv1, t1) {
986 let _ = part.pop(&self.parts, self.filter);
988
989 continue;
991 }
992 }
993
994 self.state = part.pop(&self.parts, self.filter);
995 }
996 } else {
997 if part.last_in_run {
998 PeekMut::pop(part);
999 } else {
1000 return None;
1003 }
1004 }
1005 }
1006
1007 self.state.take()
1008 }
1009}
1010
1011impl<'a, T, D> Iterator for ConsolidatingIter<'a, T, D>
1012where
1013 T: Timestamp + Codec64 + Lattice,
1014 D: Codec64 + Monoid + Ord,
1015{
1016 type Item = (Indices, SortKV<'a>, T, D);
1017
1018 fn next(&mut self) -> Option<Self::Item> {
1019 loop {
1020 match self.consolidate() {
1021 Some((_, _, _, d)) if d.is_zero() => continue,
1022 other => break other,
1023 }
1024 }
1025 }
1026}
1027
1028impl<'a, T, D> Drop for ConsolidatingIter<'a, T, D>
1029where
1030 T: Timestamp + Codec64,
1031 D: Codec64,
1032{
1033 fn drop(&mut self) {
1034 if let Some(update) = self.state.take() {
1037 let part = StructuredUpdates::interleave_updates(&self.parts, [update]);
1038 *self.drop_stash = Some(part);
1039 }
1040 }
1041}
1042
1043#[cfg(test)]
1044mod tests {
1045 use super::*;
1046
1047 use std::sync::Arc;
1048
1049 use crate::ShardId;
1050 use crate::cfg::PersistConfig;
1051 use crate::internal::paths::PartialBatchKey;
1052 use crate::internal::state::{BatchPart, HollowBatchPart};
1053 use crate::metrics::Metrics;
1054 use arrow::array::BinaryArray;
1055 use differential_dataflow::consolidation::consolidate_updates;
1056 use differential_dataflow::trace::Description;
1057 use mz_ore::metrics::MetricsRegistry;
1058 use mz_persist::indexed::columnar::ColumnarRecordsBuilder;
1059 use mz_persist::indexed::encoding::BlobTraceBatchPart;
1060 use mz_persist::location::Blob;
1061 use mz_persist::mem::{MemBlob, MemBlobConfig};
1062 use mz_persist_types::codec_impls::VecU8Schema;
1063 use mz_persist_types::part::PartBuilder;
1064 use proptest::collection::vec;
1065 use proptest::prelude::*;
1066 use timely::progress::Antichain;
1067
1068 #[mz_ore::test]
1069 #[cfg_attr(miri, ignore)] fn consolidation() {
1071 type Rows = Vec<((Vec<u8>, Vec<u8>), u64, i64)>;
1073
1074 fn check(
1075 metrics: &Arc<Metrics>,
1076 parts: Vec<(Rows, usize)>,
1077 lower_bound: (Vec<u8>, Vec<u8>, u64),
1078 ) {
1079 let schemas = Schemas {
1080 id: None,
1081 key: Arc::new(VecU8Schema),
1082 val: Arc::new(VecU8Schema),
1083 };
1084 let original = {
1085 let mut rows = parts
1086 .iter()
1087 .flat_map(|(p, _)| p.clone())
1088 .filter(|((k, v), t, _)| {
1089 let (k_lower, v_lower, t_lower) = &lower_bound;
1090 ((k_lower, v_lower), t_lower) < ((k, v), t)
1092 })
1093 .collect::<Vec<_>>();
1094
1095 consolidate_updates(&mut rows);
1096 let mut builder = PartBuilder::new(&*schemas.key, &*schemas.val);
1097 for ((k, v), t, d) in &rows {
1098 builder.push(k, v, *t, *d);
1099 }
1100 let part = builder.finish();
1101 part
1102 };
1103 let filter = FetchBatchFilter::Compaction {
1104 since: Antichain::from_elem(0),
1105 };
1106 let desc = Description::new(
1107 Antichain::from_elem(0),
1108 Antichain::new(),
1109 Antichain::from_elem(0),
1110 );
1111 let key_lower_bound_array = BinaryArray::from_vec(vec![&lower_bound.0]);
1112 let val_lower_bound_array = BinaryArray::from_vec(vec![&lower_bound.1]);
1113 let lower_bound = LowerBound {
1114 key_bound: ArrayBound::new(Arc::new(key_lower_bound_array), 0),
1115 val_bound: ArrayBound::new(Arc::new(val_lower_bound_array), 0),
1116 t: lower_bound.2,
1117 };
1118 let sort: StructuredSort<Vec<u8>, Vec<u8>, u64, i64> =
1119 StructuredSort::new(schemas.clone());
1120 let streaming = {
1121 let fetch_cfg = FetchConfig {
1123 validate_bounds_on_read: true,
1124 };
1125 let mut consolidator = Consolidator {
1126 cfg: fetch_cfg.clone(),
1127 context: "test".to_string(),
1128 shard_id: ShardId::new(),
1129 sort: sort.clone(),
1130 blob: Arc::new(MemBlob::open(MemBlobConfig::default())),
1131 metrics: Arc::clone(metrics),
1132 shard_metrics: metrics.shards.shard(&ShardId::new(), "test"),
1133 read_metrics: Arc::new(metrics.read.snapshot.clone()),
1134 runs: parts
1138 .into_iter()
1139 .map(|(mut part, cut)| {
1140 part.sort();
1141 let part_2 = part.split_off(cut.min(part.len()));
1142 [part, part_2]
1143 .into_iter()
1144 .map(|part| {
1145 let mut records = ColumnarRecordsBuilder::default();
1146 for ((k, v), t, d) in &part {
1147 assert!(records.push((
1148 (k, v),
1149 u64::encode(t),
1150 i64::encode(d)
1151 )));
1152 }
1153 let part = EncodedPart::new(
1154 &fetch_cfg,
1155 metrics.read.snapshot.clone(),
1156 desc.clone(),
1157 "part",
1158 None,
1159 BlobTraceBatchPart {
1160 desc: desc.clone(),
1161 index: 0,
1162 updates: BlobTraceUpdates::Row(
1163 records.finish(&metrics.columnar),
1164 ),
1165 },
1166 );
1167 (
1168 ConsolidationPart::from_encoded(
1169 part,
1170 true,
1171 &metrics.columnar,
1172 &sort,
1173 ),
1174 0,
1175 )
1176 })
1177 .collect::<VecDeque<_>>()
1178 })
1179 .collect::<Vec<_>>(),
1180 filter,
1181 budget: 0,
1182 drop_stash: None,
1183 lower_bound: Some(lower_bound),
1184 };
1185
1186 let mut out = vec![];
1187 loop {
1188 consolidator.trim();
1189 let Some(chunk) = consolidator.chunk(1000, 1000) else {
1190 break;
1191 };
1192 if chunk.len() > 0 {
1193 out.push(chunk);
1194 }
1195 }
1196 Part::concat(&out).expect("same schema")
1197 };
1198
1199 assert_eq!((original.len() > 0).then_some(original), streaming);
1200 }
1201
1202 let metrics = Arc::new(Metrics::new(
1203 &PersistConfig::new_for_tests(),
1204 &MetricsRegistry::new(),
1205 ));
1206
1207 let key_gen = (0..4usize).prop_map(|i| i.to_string().into_bytes()).boxed();
1209 let part_gen = vec(
1210 ((key_gen.clone(), key_gen.clone()), 0..10u64, -3..=3i64),
1211 0..10,
1212 );
1213 let kvt_gen = (key_gen.clone(), key_gen.clone(), 0..10u64);
1214 let run_gen = vec((part_gen, 0..10usize), 0..5);
1215 proptest!(|(state in run_gen, bound in kvt_gen)| {
1216 check(&metrics, state, bound)
1217 });
1218 }
1219
1220 #[mz_ore::test(tokio::test)]
1221 #[cfg_attr(miri, ignore)] async fn prefetches() {
1223 fn check(budget: usize, runs: Vec<Vec<usize>>, prefetch_all: bool) {
1224 let desc = Description::new(
1225 Antichain::from_elem(0u64),
1226 Antichain::new(),
1227 Antichain::from_elem(0u64),
1228 );
1229
1230 let total_size: usize = runs.iter().flat_map(|run| run.iter().map(|p| *p)).sum();
1231
1232 let shard_id = ShardId::new();
1233 let blob: Arc<dyn Blob> = Arc::new(MemBlob::open(MemBlobConfig::default()));
1234 let metrics = Arc::new(Metrics::new(
1235 &PersistConfig::new_for_tests(),
1236 &MetricsRegistry::new(),
1237 ));
1238 let shard_metrics = metrics.shards.shard(&shard_id, "");
1239 let sort: StructuredSort<Vec<u8>, Vec<u8>, _, _> = StructuredSort::new(Schemas {
1240 id: None,
1241 key: Arc::new(VecU8Schema),
1242 val: Arc::new(VecU8Schema),
1243 });
1244
1245 let fetch_cfg = FetchConfig {
1246 validate_bounds_on_read: true,
1247 };
1248
1249 let mut consolidator: Consolidator<u64, i64, StructuredSort<_, _, _, _>> =
1250 Consolidator::new(
1251 "test".to_string(),
1252 fetch_cfg,
1253 shard_id,
1254 sort,
1255 blob,
1256 Arc::clone(&metrics),
1257 shard_metrics,
1258 metrics.read.batch_fetcher.clone(),
1259 FetchBatchFilter::Compaction {
1260 since: desc.since().clone(),
1261 },
1262 None,
1263 budget,
1264 );
1265
1266 for run in runs {
1267 let parts: Vec<_> = run
1268 .into_iter()
1269 .map(|encoded_size_bytes| {
1270 RunPart::Single(BatchPart::Hollow(HollowBatchPart {
1271 key: PartialBatchKey(
1272 "n0000000/p00000000-0000-0000-0000-000000000000".into(),
1273 ),
1274 meta: Default::default(),
1275 encoded_size_bytes,
1276 key_lower: vec![],
1277 structured_key_lower: None,
1278 stats: None,
1279 ts_rewrite: None,
1280 diffs_sum: None,
1281 format: None,
1282 schema_id: None,
1283 deprecated_schema_id: None,
1284 }))
1285 })
1286 .collect();
1287 consolidator.enqueue_run(&desc, &RunMeta::default(), parts)
1288 }
1289
1290 let remaining = consolidator.start_prefetches();
1292 let live_bytes = consolidator.live_bytes();
1293 assert!(live_bytes <= budget, "budget should be respected");
1294 match remaining {
1295 None => assert!(live_bytes < total_size, "not all parts fetched"),
1296 Some(remaining) => assert_eq!(
1297 live_bytes + remaining,
1298 budget,
1299 "remaining should match budget"
1300 ),
1301 }
1302
1303 if prefetch_all {
1304 consolidator.budget = total_size;
1306 assert_eq!(consolidator.start_prefetches(), Some(0));
1307 } else {
1308 }
1311 }
1312
1313 let run_gen = vec(vec(0..20usize, 0..5usize), 0..5usize);
1314 proptest!(|(budget in 0..20usize, state in run_gen, prefetch_all in any::<bool>())| {
1315 check(budget, state, prefetch_all)
1316 });
1317 }
1318}