rust/lancedb
1
0
Fork 0
mirror of https://github.com/lancedb/lancedb.git synced 2026-01-06 11:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "added capability to pass WriteParams to delete"

Browse Source 
This reverts commit 1415d1a23a.
This commit is contained in:
albertlockett
2024-07-19 11:25:57 -03:00
parent 2e1f4bfc62
commit c011539905
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nodejs/src/table.rs
View File

@@ -124,7 +124,7 @@ impl Table {
#[napi(catch_unwind)] #[napi(catch_unwind)]
pub async fn delete(&self, predicate: String) -> napi::Result<()> { pub async fn delete(&self, predicate: String) -> napi::Result<()> {
self.inner_ref()?.delete(&predicate, None).await.map_err(|e| { self.inner_ref()?.delete(&predicate).await.map_err(|e| {
napi::Error::from_reason(format!( napi::Error::from_reason(format!(
"Failed to delete rows in table {}: predicate={}", "Failed to delete rows in table {}: predicate={}",
self.name, e self.name, e

2
python/src/table.rs
View File

@@ -119,7 +119,7 @@ impl Table {
pub fn delete(self_: PyRef<'_, Self>, condition: String) -> PyResult<&PyAny> { pub fn delete(self_: PyRef<'_, Self>, condition: String) -> PyResult<&PyAny> {
let inner = self_.inner_ref()?.clone(); let inner = self_.inner_ref()?.clone();
future_into_py(self_.py(), async move { future_into_py(self_.py(), async move {
inner.delete(&condition, None).await.infer_error() inner.delete(&condition).await.infer_error()
}) })
} }

2
rust/ffi/node/src/table.rs
View File

@@ -168,7 +168,7 @@ impl JsTable {
let table = js_table.table.clone(); let table = js_table.table.clone();
rt.spawn(async move { rt.spawn(async move {
let delete_result = table.delete(&predicate, None).await; let delete_result = table.delete(&predicate).await;
deferred.settle_with(&channel, move |mut cx| { deferred.settle_with(&channel, move |mut cx| {
delete_result.or_throw(&mut cx)?; delete_result.or_throw(&mut cx)?;

2
rust/lancedb/examples/simple.rs
View File

@@ -50,7 +50,7 @@ async fn main() -> Result<()> {
create_empty_table(&db).await.unwrap(); create_empty_table(&db).await.unwrap();
// --8<-- [start:delete] // --8<-- [start:delete]
tbl.delete("id > 24", None).await.unwrap(); tbl.delete("id > 24").await.unwrap();
// --8<-- [end:delete] // --8<-- [end:delete]
// --8<-- [start:drop_table] // --8<-- [start:drop_table]

11
rust/lancedb/src/table.rs
View File

@@ -391,7 +391,7 @@ pub(crate) trait TableInternal: std::fmt::Display + std::fmt::Debug + Send + Syn
add: AddDataBuilder<NoData>, add: AddDataBuilder<NoData>,
data: Box<dyn arrow_array::RecordBatchReader + Send>, data: Box<dyn arrow_array::RecordBatchReader + Send>,
) -> Result<()>; ) -> Result<()>;
async fn delete(&self, predicate: &str, write_options: Option<WriteOptions>) -> Result<()>; async fn delete(&self, predicate: &str) -> Result<()>;
async fn update(&self, update: UpdateBuilder) -> Result<()>; async fn update(&self, update: UpdateBuilder) -> Result<()>;
async fn create_index(&self, index: IndexBuilder) -> Result<()>; async fn create_index(&self, index: IndexBuilder) -> Result<()>;
async fn list_indices(&self) -> Result<Vec<IndexConfig>>; async fn list_indices(&self) -> Result<Vec<IndexConfig>>;
@@ -558,8 +558,8 @@ impl Table {
/// tbl.delete("id > 5").await.unwrap(); /// tbl.delete("id > 5").await.unwrap();
/// # }); /// # });
/// ``` /// ```
pub async fn delete(&self, predicate: &str, write_options: Option<WriteOptions>) -> Result<()> { pub async fn delete(&self, predicate: &str) -> Result<()> {
self.inner.delete(predicate, write_options).await self.inner.delete(predicate).await
} }
/// Create an index on the provided column(s). /// Create an index on the provided column(s).
@@ -1853,9 +1853,8 @@ impl TableInternal for NativeTable {
} }
/// Delete rows from the table /// Delete rows from the table
async fn delete(&self, predicate: &str, write_options: Option<WriteOptions>) -> Result<()> { async fn delete(&self, predicate: &str) -> Result<()> {
let write_params = write_options.and_then(|e| e.lance_write_params); self.dataset.get_mut().await?.delete(predicate).await?;
self.dataset.get_mut().await?.delete(predicate, write_params).await?;
Ok(()) Ok(())
} }