Skip to content
Open
Changes from all commits
Commits
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
55 changes: 54 additions & 1 deletion crates/lance-context-core/src/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ impl RolloutRegistry {
let dataset = match Self::load(uri, storage_options.clone()).await {
Ok(dataset) => dataset,
Err(LanceError::DatasetNotFound { .. }) => {
Self::create(uri, storage_options.clone()).await?
Self::create_or_load(uri, storage_options.clone()).await?
}
Err(err) => return Err(err),
};
Expand All @@ -94,6 +94,18 @@ impl RolloutRegistry {
}
}

/// Create the registry, or load it if another caller won the creation race.
async fn create_or_load(
uri: &str,
storage_options: Option<HashMap<String, String>>,
) -> LanceResult<Dataset> {
match Self::create(uri, storage_options.clone()).await {
Ok(dataset) => Ok(dataset),
Err(LanceError::DatasetAlreadyExists { .. }) => Self::load(uri, storage_options).await,
Err(err) => Err(err),
}
}

async fn create(
uri: &str,
storage_options: Option<HashMap<String, String>>,
Expand Down Expand Up @@ -349,6 +361,47 @@ mod tests {
.unwrap()
}

#[tokio::test]
async fn create_or_load_recovers_when_another_caller_wins() {
let dir = TempDir::new().unwrap();
let uri = dir.path().join("_registry.rollout.lance");
let uri = uri.to_str().unwrap();

// Force the check-then-create interleaving: both callers observe that
// the registry is absent before either one attempts to create it.
assert!(matches!(
RolloutRegistry::load(uri, None).await,
Err(LanceError::DatasetNotFound { .. })
));
assert!(matches!(
RolloutRegistry::load(uri, None).await,
Err(LanceError::DatasetNotFound { .. })
));

let winner = RolloutRegistry::create(uri, None).await.unwrap();
let mut winner = RolloutRegistry {
dataset: winner,
uri: uri.to_string(),
storage_options: None,
};
winner
.upsert("winner", "/data/winner.rollout.lance")
.await
.unwrap();

let loser = RolloutRegistry::create_or_load(uri, None).await.unwrap();

// In this late-loser interleaving, the caller reopens the winner's
// dataset instead of losing its rows or propagating DatasetAlreadyExists.
assert_eq!(loser.manifest.version, winner.dataset.manifest.version);
let mut loser = RolloutRegistry {
dataset: loser,
uri: uri.to_string(),
storage_options: None,
};
assert!(loser.contains("winner").await.unwrap());
}

#[tokio::test]
async fn upsert_is_idempotent() {
let dir = TempDir::new().unwrap();
Expand Down