Skip to content

feat(error-resume): on failure, make sure it's processed again next time #995

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

Merged
merged 1 commit into from
Sep 13, 2025
Merged

feat(error-resume): on failure, make sure it's processed again next time #995

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
236 changes: 150 additions & 86 deletions src/execution/source_indexer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,25 @@ use super::{
};

use crate::ops::interface;
struct SourceRowIndexingState {

#[derive(Default)]
struct SourceRowVersionState {
source_version: SourceVersion,
content_version_fp: Option<Vec<u8>>,
}
struct SourceRowIndexingState {
version_state: SourceRowVersionState,
processing_sem: Arc<Semaphore>,
touched_generation: usize,
}

impl Default for SourceRowIndexingState {
fn default() -> Self {
Self {
source_version: SourceVersion::default(),
content_version_fp: None,
version_state: SourceRowVersionState {
source_version: SourceVersion::default(),
content_version_fp: None,
},
processing_sem: Arc::new(Semaphore::new(1)),
touched_generation: 0,
}
Expand Down Expand Up @@ -62,13 +69,19 @@ struct LocalSourceRowStateOperator<'a> {
processing_sem: Option<Arc<Semaphore>>,
processing_sem_permit: Option<OwnedSemaphorePermit>,
last_source_version: Option<SourceVersion>,

// `None` means no advance yet.
// `Some(None)` means the state before advance is `None`.
// `Some(Some(version_state))` means the state before advance is `Some(version_state)`.
prev_version_state: Option<Option<SourceRowVersionState>>,

to_remove_entry_on_success: bool,
}

enum RowStateAdvanceOutcome {
Skipped,
Advanced {
prev_source_version: Option<SourceVersion>,
prev_content_version_fp: Option<Vec<u8>>,
prev_version_state: Option<SourceRowVersionState>,
},
Noop,
}
Expand All @@ -86,6 +99,8 @@ impl<'a> LocalSourceRowStateOperator<'a> {
processing_sem: None,
processing_sem_permit: None,
last_source_version: None,
prev_version_state: None,
to_remove_entry_on_success: false,
}
}
async fn advance(
Expand All @@ -108,6 +123,7 @@ impl<'a> LocalSourceRowStateOperator<'a> {
if !force_reload
&& entry
.get()
.version_state
.source_version
.should_skip(&source_version, Some(self.update_stats.as_ref()))
{
Expand All @@ -126,14 +142,20 @@ impl<'a> LocalSourceRowStateOperator<'a> {

let entry_mut = entry.get_mut();
let outcome = RowStateAdvanceOutcome::Advanced {
prev_source_version: Some(std::mem::take(&mut entry_mut.source_version)),
prev_content_version_fp: entry_mut.content_version_fp.take(),
prev_version_state: Some(std::mem::take(&mut entry_mut.version_state)),
};
if source_version.kind == row_indexer::SourceVersionKind::NonExistence {
entry.remove();
} else {
entry_mut.source_version = source_version;
entry_mut.content_version_fp = content_version_fp.cloned();
self.to_remove_entry_on_success = true;
}
let prev_version_state = std::mem::replace(
&mut entry_mut.version_state,
SourceRowVersionState {
source_version,
content_version_fp: content_version_fp.cloned(),
},
);
if self.prev_version_state.is_none() {
self.prev_version_state = Some(Some(prev_version_state));
}
(sem, outcome)
}
Expand All @@ -143,18 +165,22 @@ impl<'a> LocalSourceRowStateOperator<'a> {
return Ok(RowStateAdvanceOutcome::Skipped);
}
let new_entry = SourceRowIndexingState {
source_version,
content_version_fp: content_version_fp.cloned(),
version_state: SourceRowVersionState {
source_version,
content_version_fp: content_version_fp.cloned(),
},
touched_generation,
..Default::default()
};
let sem = new_entry.processing_sem.clone();
entry.insert(new_entry);
if self.prev_version_state.is_none() {
self.prev_version_state = Some(None);
}
(
Some(sem),
RowStateAdvanceOutcome::Advanced {
prev_source_version: None,
prev_content_version_fp: None,
prev_version_state: None,
},
)
}
Expand All @@ -166,6 +192,26 @@ impl<'a> LocalSourceRowStateOperator<'a> {
}
Ok(outcome)
}

fn commit(self) {
if self.to_remove_entry_on_success {
self.indexing_state.lock().unwrap().rows.remove(self.key);
}
}

fn rollback(self) {
let Some(prev_version_state) = self.prev_version_state else {
return;
};
let mut indexing_state = self.indexing_state.lock().unwrap();
if let Some(prev_version_state) = prev_version_state {
if let Some(entry) = indexing_state.rows.get_mut(self.key) {
entry.version_state = prev_version_state;
}
} else {
indexing_state.rows.remove(self.key);
}
}
}

#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
Expand Down Expand Up @@ -214,12 +260,14 @@ impl SourceIndexingContext {
rows.insert(
source_pk,
SourceRowIndexingState {
source_version: SourceVersion::from_stored(
key_metadata.processed_source_ordinal,
&key_metadata.process_logic_fingerprint,
plan.logic_fingerprint,
),
content_version_fp: key_metadata.processed_source_fp,
version_state: SourceRowVersionState {
source_version: SourceVersion::from_stored(
key_metadata.processed_source_ordinal,
&key_metadata.process_logic_fingerprint,
plan.logic_fingerprint,
),
content_version_fp: key_metadata.processed_source_fp,
},
processing_sem: Arc::new(Semaphore::new(1)),
touched_generation: scan_generation,
},
Expand Down Expand Up @@ -271,61 +319,65 @@ impl SourceIndexingContext {
&pool,
)?;

let source_data = row_input.data;
let mut row_state_operator =
LocalSourceRowStateOperator::new(&row_input.key, &self.state, &update_stats);

let source_data = row_input.data;
if let Some(ordinal) = source_data.ordinal
&& let Some(content_version_fp) = &source_data.content_version_fp
{
let version = SourceVersion::from_current_with_ordinal(ordinal);
match row_state_operator
.advance(
version,
Some(content_version_fp),
/*force_reload=*/ mode == UpdateMode::ReexportTargets,
)
.await?
{
RowStateAdvanceOutcome::Skipped => {
return anyhow::Ok(());
}
RowStateAdvanceOutcome::Advanced {
prev_source_version: Some(prev_source_version),
prev_content_version_fp: Some(prev_content_version_fp),
} => {
// Fast path optimization: may collapse the row based on source version fingerprint.
// Still need to update the tracking table as the processed ordinal advanced.
if mode == UpdateMode::Normal
let result = {
let row_state_operator = &mut row_state_operator;
let row_key = &row_input.key;
async move {
if let Some(ordinal) = source_data.ordinal
&& let Some(content_version_fp) = &source_data.content_version_fp
{
let version = SourceVersion::from_current_with_ordinal(ordinal);
match row_state_operator
.advance(
version,
Some(content_version_fp),
/*force_reload=*/ mode == UpdateMode::ReexportTargets,
)
.await?
{
RowStateAdvanceOutcome::Skipped => {
return anyhow::Ok(());
}
RowStateAdvanceOutcome::Advanced {
prev_version_state: Some(prev_version_state),
} => {
// Fast path optimization: may collapse the row based on source version fingerprint.
// Still need to update the tracking table as the processed ordinal advanced.
if let Some(prev_content_version_fp) =
&prev_version_state.content_version_fp
&& mode == UpdateMode::Normal
&& row_indexer
.try_collapse(
&version,
content_version_fp.as_slice(),
&prev_source_version,
&prev_version_state.source_version,
ContentHashBasedCollapsingBaseline::ProcessedSourceFingerprint(
&prev_content_version_fp,
prev_content_version_fp,
),
)
.await?
.is_some()
{
return Ok(());
}
}
_ => {}
}
}
_ => {}
}
}

let (ordinal, content_version_fp, value) =
match (source_data.ordinal, source_data.value) {
(Some(ordinal), Some(value)) => {
(ordinal, source_data.content_version_fp, value)
}
_ => {
let data = import_op
let (ordinal, content_version_fp, value) =
match (source_data.ordinal, source_data.value) {
(Some(ordinal), Some(value)) => {
(ordinal, source_data.content_version_fp, value)
}
_ => {
let data = import_op
.executor
.get_value(
&row_input.key,
row_key,
row_input.key_aux_info.as_ref().ok_or_else(|| {
anyhow::anyhow!(
"`key_aux_info` must be provided when there's no `source_data`"
Expand All @@ -338,37 +390,47 @@ impl SourceIndexingContext {
},
)
.await?;
(
data.ordinal
.ok_or_else(|| anyhow::anyhow!("ordinal is not available"))?,
data.content_version_fp,
data.value
.ok_or_else(|| anyhow::anyhow!("value is not available"))?,
(
data.ordinal.ok_or_else(|| {
anyhow::anyhow!("ordinal is not available")
})?,
data.content_version_fp,
data.value
.ok_or_else(|| anyhow::anyhow!("value is not available"))?,
)
}
};

let source_version = SourceVersion::from_current_data(ordinal, &value);
if let RowStateAdvanceOutcome::Skipped = row_state_operator
.advance(
source_version,
content_version_fp.as_ref(),
/*force_reload=*/ mode == UpdateMode::ReexportTargets,
)
.await?
{
return Ok(());
}
};

let source_version = SourceVersion::from_current_data(ordinal, &value);
if let RowStateAdvanceOutcome::Skipped = row_state_operator
.advance(
source_version,
content_version_fp.as_ref(),
/*force_reload=*/ mode == UpdateMode::ReexportTargets,
)
.await?
{
return Ok(());
}

let result = row_indexer
.update_source_row(&source_version, value, content_version_fp.clone())
.await?;
if let SkippedOr::Skipped(version, fp) = result {
row_state_operator
.advance(version, fp.as_ref(), /*force_reload=*/ false)
.await?;
let result = row_indexer
.update_source_row(&source_version, value, content_version_fp.clone())
.await?;
if let SkippedOr::Skipped(version, fp) = result {
row_state_operator
.advance(version, fp.as_ref(), /*force_reload=*/ false)
.await?;
}
Ok(())
}
}
.await;
if result.is_ok() {
row_state_operator.commit();
} else {
row_state_operator.rollback();
}
Ok(())
result
};
let process_and_ack = async {
process.await?;
Expand Down Expand Up @@ -481,6 +543,7 @@ impl SourceIndexingContext {
row_state.touched_generation = scan_generation;
if update_options.mode == UpdateMode::Normal
&& row_state
.version_state
.source_version
.should_skip(&source_version, Some(update_stats.as_ref()))
{
Expand Down Expand Up @@ -518,7 +581,8 @@ impl SourceIndexingContext {
let state = self.state.lock().unwrap();
for (key, row_state) in state.rows.iter() {
if row_state.touched_generation < scan_generation {
deleted_key_versions.push((key.clone(), row_state.source_version.ordinal));
deleted_key_versions
.push((key.clone(), row_state.version_state.source_version.ordinal));
}
}
deleted_key_versions
Expand Down
Loading