mirror of
https://github.com/lancedb/lancedb.git
synced 2026-05-04 21:50:40 +00:00
Compare commits
5 Commits
python-v0.
...
task/add-n
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bc76671b62 | ||
|
|
bc814e1f66 | ||
|
|
82a6e5a196 | ||
|
|
b3100f0e7c | ||
|
|
8ec60e3c9d |
@@ -8,6 +8,14 @@
|
|||||||
|
|
||||||
## Properties
|
## Properties
|
||||||
|
|
||||||
|
### numDeletedRows
|
||||||
|
|
||||||
|
```ts
|
||||||
|
numDeletedRows: number;
|
||||||
|
```
|
||||||
|
|
||||||
|
***
|
||||||
|
|
||||||
### version
|
### version
|
||||||
|
|
||||||
```ts
|
```ts
|
||||||
|
|||||||
@@ -450,6 +450,31 @@ describe.each([arrow15, arrow16, arrow17, arrow18])(
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
describe("delete", () => {
|
||||||
|
let tmpDir: tmp.DirResult;
|
||||||
|
let table: Table;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
tmpDir = tmp.dirSync({ unsafeCleanup: true });
|
||||||
|
const conn = await connect(tmpDir.name);
|
||||||
|
table = await conn.createTable("delete_test", [
|
||||||
|
{ id: 1, value: "a" },
|
||||||
|
{ id: 2, value: "b" },
|
||||||
|
{ id: 3, value: "c" },
|
||||||
|
{ id: 4, value: "d" },
|
||||||
|
{ id: 5, value: "e" },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
afterEach(() => tmpDir.removeCallback());
|
||||||
|
|
||||||
|
test("returns num_deleted_rows", async () => {
|
||||||
|
const result = await table.delete("id > 3");
|
||||||
|
expect(result.numDeletedRows).toBe(2);
|
||||||
|
expect(result.version).toBe(2);
|
||||||
|
expect(await table.countRows()).toBe(3);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe("merge insert", () => {
|
describe("merge insert", () => {
|
||||||
let tmpDir: tmp.DirResult;
|
let tmpDir: tmp.DirResult;
|
||||||
let table: Table;
|
let table: Table;
|
||||||
|
|||||||
@@ -753,12 +753,14 @@ impl From<lancedb::table::AddResult> for AddResult {
|
|||||||
|
|
||||||
#[napi(object)]
|
#[napi(object)]
|
||||||
pub struct DeleteResult {
|
pub struct DeleteResult {
|
||||||
|
pub num_deleted_rows: i64,
|
||||||
pub version: i64,
|
pub version: i64,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<lancedb::table::DeleteResult> for DeleteResult {
|
impl From<lancedb::table::DeleteResult> for DeleteResult {
|
||||||
fn from(value: lancedb::table::DeleteResult) -> Self {
|
fn from(value: lancedb::table::DeleteResult) -> Self {
|
||||||
Self {
|
Self {
|
||||||
|
num_deleted_rows: value.num_deleted_rows as i64,
|
||||||
version: value.version as i64,
|
version: value.version as i64,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1331,7 +1331,7 @@ class Table(ABC):
|
|||||||
1 2 [3.0, 4.0]
|
1 2 [3.0, 4.0]
|
||||||
2 3 [5.0, 6.0]
|
2 3 [5.0, 6.0]
|
||||||
>>> table.delete("x = 2")
|
>>> table.delete("x = 2")
|
||||||
DeleteResult(version=2)
|
DeleteResult(num_deleted_rows=1, version=2)
|
||||||
>>> table.to_pandas()
|
>>> table.to_pandas()
|
||||||
x vector
|
x vector
|
||||||
0 1 [1.0, 2.0]
|
0 1 [1.0, 2.0]
|
||||||
@@ -1345,7 +1345,7 @@ class Table(ABC):
|
|||||||
>>> to_remove
|
>>> to_remove
|
||||||
'1, 5'
|
'1, 5'
|
||||||
>>> table.delete(f"x IN ({to_remove})")
|
>>> table.delete(f"x IN ({to_remove})")
|
||||||
DeleteResult(version=3)
|
DeleteResult(num_deleted_rows=1, version=3)
|
||||||
>>> table.to_pandas()
|
>>> table.to_pandas()
|
||||||
x vector
|
x vector
|
||||||
0 3 [5.0, 6.0]
|
0 3 [5.0, 6.0]
|
||||||
@@ -4215,7 +4215,7 @@ class AsyncTable:
|
|||||||
1 2 [3.0, 4.0]
|
1 2 [3.0, 4.0]
|
||||||
2 3 [5.0, 6.0]
|
2 3 [5.0, 6.0]
|
||||||
>>> table.delete("x = 2")
|
>>> table.delete("x = 2")
|
||||||
DeleteResult(version=2)
|
DeleteResult(num_deleted_rows=1, version=2)
|
||||||
>>> table.to_pandas()
|
>>> table.to_pandas()
|
||||||
x vector
|
x vector
|
||||||
0 1 [1.0, 2.0]
|
0 1 [1.0, 2.0]
|
||||||
@@ -4229,7 +4229,7 @@ class AsyncTable:
|
|||||||
>>> to_remove
|
>>> to_remove
|
||||||
'1, 5'
|
'1, 5'
|
||||||
>>> table.delete(f"x IN ({to_remove})")
|
>>> table.delete(f"x IN ({to_remove})")
|
||||||
DeleteResult(version=3)
|
DeleteResult(num_deleted_rows=1, version=3)
|
||||||
>>> table.to_pandas()
|
>>> table.to_pandas()
|
||||||
x vector
|
x vector
|
||||||
0 3 [5.0, 6.0]
|
0 3 [5.0, 6.0]
|
||||||
|
|||||||
@@ -112,19 +112,24 @@ impl From<lancedb::table::AddResult> for AddResult {
|
|||||||
#[pyclass(get_all)]
|
#[pyclass(get_all)]
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
pub struct DeleteResult {
|
pub struct DeleteResult {
|
||||||
|
pub num_deleted_rows: u64,
|
||||||
pub version: u64,
|
pub version: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[pymethods]
|
#[pymethods]
|
||||||
impl DeleteResult {
|
impl DeleteResult {
|
||||||
pub fn __repr__(&self) -> String {
|
pub fn __repr__(&self) -> String {
|
||||||
format!("DeleteResult(version={})", self.version)
|
format!(
|
||||||
|
"DeleteResult(num_deleted_rows={}, version={})",
|
||||||
|
self.num_deleted_rows, self.version
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<lancedb::table::DeleteResult> for DeleteResult {
|
impl From<lancedb::table::DeleteResult> for DeleteResult {
|
||||||
fn from(result: lancedb::table::DeleteResult) -> Self {
|
fn from(result: lancedb::table::DeleteResult) -> Self {
|
||||||
Self {
|
Self {
|
||||||
|
num_deleted_rows: result.num_deleted_rows,
|
||||||
version: result.version,
|
version: result.version,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1227,7 +1227,10 @@ impl<S: HttpSend> BaseTable for RemoteTable<S> {
|
|||||||
let body = response.text().await.err_to_http(request_id.clone())?;
|
let body = response.text().await.err_to_http(request_id.clone())?;
|
||||||
if body.trim().is_empty() {
|
if body.trim().is_empty() {
|
||||||
// Backward compatible with old servers
|
// Backward compatible with old servers
|
||||||
return Ok(DeleteResult { version: 0 });
|
return Ok(DeleteResult {
|
||||||
|
num_deleted_rows: 0,
|
||||||
|
version: 0,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
let delete_response: DeleteResult =
|
let delete_response: DeleteResult =
|
||||||
serde_json::from_str(&body).map_err(|e| Error::Http {
|
serde_json::from_str(&body).map_err(|e| Error::Http {
|
||||||
|
|||||||
@@ -7,6 +7,9 @@ use crate::Result;
|
|||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
|
||||||
pub struct DeleteResult {
|
pub struct DeleteResult {
|
||||||
|
/// The number of rows that were deleted.
|
||||||
|
#[serde(default)]
|
||||||
|
pub num_deleted_rows: u64,
|
||||||
// The commit version associated with the operation.
|
// The commit version associated with the operation.
|
||||||
// A version of `0` indicates compatibility with legacy servers that do not return
|
// A version of `0` indicates compatibility with legacy servers that do not return
|
||||||
/// a commit version.
|
/// a commit version.
|
||||||
@@ -20,10 +23,14 @@ pub struct DeleteResult {
|
|||||||
pub(crate) async fn execute_delete(table: &NativeTable, predicate: &str) -> Result<DeleteResult> {
|
pub(crate) async fn execute_delete(table: &NativeTable, predicate: &str) -> Result<DeleteResult> {
|
||||||
table.dataset.ensure_mutable()?;
|
table.dataset.ensure_mutable()?;
|
||||||
let mut dataset = (*table.dataset.get().await?).clone();
|
let mut dataset = (*table.dataset.get().await?).clone();
|
||||||
dataset.delete(predicate).await?;
|
let delete_result = dataset.delete(predicate).await?;
|
||||||
|
let num_deleted_rows = delete_result.num_deleted_rows;
|
||||||
let version = dataset.version().version;
|
let version = dataset.version().version;
|
||||||
table.dataset.update(dataset);
|
table.dataset.update(dataset);
|
||||||
Ok(DeleteResult { version })
|
Ok(DeleteResult {
|
||||||
|
num_deleted_rows,
|
||||||
|
version,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
@@ -108,6 +115,32 @@ mod tests {
|
|||||||
assert_eq!(current_schema, original_schema);
|
assert_eq!(current_schema, original_schema);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_delete_returns_num_deleted_rows() {
|
||||||
|
let conn = connect("memory://").execute().await.unwrap();
|
||||||
|
let batch = record_batch!(("id", Int32, [1, 2, 3, 4, 5])).unwrap();
|
||||||
|
let table = conn
|
||||||
|
.create_table("test_num_deleted", batch)
|
||||||
|
.execute()
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
// Delete 2 rows (id > 3 means id=4 and id=5)
|
||||||
|
let result = table.delete("id > 3").await.unwrap();
|
||||||
|
assert_eq!(result.num_deleted_rows, 2);
|
||||||
|
assert_eq!(table.count_rows(None).await.unwrap(), 3);
|
||||||
|
|
||||||
|
// Delete 0 rows (no rows match)
|
||||||
|
let result = table.delete("id > 100").await.unwrap();
|
||||||
|
assert_eq!(result.num_deleted_rows, 0);
|
||||||
|
assert_eq!(table.count_rows(None).await.unwrap(), 3);
|
||||||
|
|
||||||
|
// Delete remaining rows
|
||||||
|
let result = table.delete("true").await.unwrap();
|
||||||
|
assert_eq!(result.num_deleted_rows, 3);
|
||||||
|
assert_eq!(table.count_rows(None).await.unwrap(), 0);
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_delete_false_increments_version() {
|
async fn test_delete_false_increments_version() {
|
||||||
let conn = connect("memory://").execute().await.unwrap();
|
let conn = connect("memory://").execute().await.unwrap();
|
||||||
|
|||||||
Reference in New Issue
Block a user