Skip to content

Commit 0a346d0

Browse files
antiguruclaude
andcommitted
compute: carry the rebase of the layers below into the stash transition
The abort-handle test follows `promote`'s signature here, where a walk takes its stash target rather than the trace bundle. The guard the offloaded driver mirrored from the inline one goes with the diversion it guarded: this layer keeps one scan across the stash boundary, so there is no second ok-trace-only walk to divert into and no way to reach the stash with the error trace half-read. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
1 parent 130766c commit 0a346d0

3 files changed

Lines changed: 1 addition & 7 deletions

File tree

src/compute/src/compute_state/peek_offload.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ use mz_compute_types::dyncfgs::{
3232
use mz_dyncfg::{ConfigSet, ConfigValHandle};
3333
use mz_expr::ColumnOrder;
3434
use mz_ore::cast::CastFrom;
35-
use mz_ore::soft_panic_or_log;
3635
use mz_ore::task::AbortOnDropHandle;
3736
use timely::scheduling::SyncActivator;
3837
use tokio::sync::{OwnedSemaphorePermit, Semaphore, oneshot};

src/compute/src/compute_state/peek_offload/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,8 +686,8 @@ async fn dropping_a_promoted_peek_aborts_its_walk() {
686686

687687
let mut promoted = OffloadedPeek::promote(
688688
peek.clone(),
689-
bundle,
690689
scan,
690+
None,
691691
&permits,
692692
offload_config(1),
693693
PeekWalkMetrics::new(&metrics),

src/compute/src/compute_state/peek_scan.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -308,11 +308,6 @@ where
308308
Some(self.take_results())
309309
}
310310

311-
/// The collection this scan reads.
312-
pub(super) fn target_id(&self) -> GlobalId {
313-
self.target_id
314-
}
315-
316311
/// The number of cursor positions the ok walk has evaluated.
317312
pub(super) fn rows_processed(&self) -> usize {
318313
self.oks.rows_processed()

0 commit comments

Comments
 (0)