Skip to content

feat(namespace)!: accept multiple columns for the merge insert on key #8915

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
wjones127 merged 4 commits into from
Sep 2, 2026
+508 −33
Merged

feat(namespace)!: accept multiple columns for the merge insert on key #8915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6877d5
feat(namespace)!: accept multiple columns for the merge insert on key
wjones127 Aug 31, 2026
8613e49
refactor(namespace): replace the merge insert compat newtype with a f…
wjones127 Aug 31, 2026
52f9f66
test(namespace): cover NULL key columns in a composite merge insert key
wjones127 Aug 31, 2026
09eee13
build(deps): depend on the released lance-namespace 0.12.0
wjones127 Sep 2, 2026
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
6 changes: 4 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ lance-io = { version = "=12.0.0-beta.11", path = "./rust/lance-io", default-feat
lance-linalg = { version = "=12.0.0-beta.11", path = "./rust/lance-linalg" }
lance-namespace = { version = "=12.0.0-beta.11", path = "./rust/lance-namespace" }
lance-namespace-impls = { version = "=12.0.0-beta.11", path = "./rust/lance-namespace-impls" }
lance-namespace-reqwest-client = "0.11.1"
lance-namespace-reqwest-client = "0.12.0"
lance-select = { version = "=12.0.0-beta.11", path = "./rust/lance-select" }
lance-tokenizer = { version = "=12.0.0-beta.11", path = "./rust/lance-tokenizer" }
lance-table = { version = "=12.0.0-beta.11", path = "./rust/lance-table" }
Expand Down
6 changes: 4 additions & 2 deletions java/lance-jni/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions java/lance-jni/src/namespace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use jni::JNIEnv;
use jni::objects::{GlobalRef, JByteArray, JMap, JObject, JString, JValue};
use jni::sys::{jbyteArray, jlong, jobject, jstring};
use lance_namespace::LanceNamespace as LanceNamespaceTrait;
use lance_namespace::compat::merge_insert_request_from_json;
use lance_namespace::models::*;
use lance_namespace_impls::{
ConnectBuilder, DirectoryNamespace, DirectoryNamespaceBuilder, DynamicContextProvider,
Expand Down Expand Up @@ -1914,7 +1915,8 @@ pub extern "system" fn Java_org_lance_namespace_DirectoryNamespace_mergeInsertIn
handle,
request_json,
request_data,
|namespace_client, req, data| {
|namespace_client, req: serde_json::Value, data| {
let req = merge_insert_request_from_json(req)?;
block_on(namespace_client.inner.merge_insert_into_table(req, data))
}
),
Expand Down Expand Up @@ -2864,7 +2866,8 @@ pub extern "system" fn Java_org_lance_namespace_RestNamespace_mergeInsertIntoTab
handle,
request_json,
request_data,
|namespace_client, req, data| {
|namespace_client, req: serde_json::Value, data| {
let req = merge_insert_request_from_json(req)?;
block_on(namespace_client.inner.merge_insert_into_table(req, data))
}
),
Expand Down
6 changes: 4 additions & 2 deletions python/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions python/src/namespace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use std::sync::Arc;
use async_trait::async_trait;
use bytes::Bytes;
use lance_namespace::LanceNamespace as LanceNamespaceTrait;
use lance_namespace::compat::merge_insert_request_from_json;
use lance_namespace::models::{
AlterTableAddColumnsRequest, AlterTableAlterColumnsRequest, AlterTableBackfillColumnsRequest,
AlterTableDropColumnsRequest, AlterTransactionRequest, AnalyzeTableQueryPlanRequest,
Expand All @@ -19,10 +20,9 @@ use lance_namespace::models::{
DescribeTableVersionResponse, DescribeTransactionRequest, DropTableIndexRequest,
ExplainTableQueryPlanRequest, GetTableStatsRequest, GetTableTagVersionRequest,
InsertIntoTableRequest, ListTableIndicesRequest, ListTableTagsRequest,
ListTableVersionsRequest, ListTableVersionsResponse, ListTablesRequest,
MergeInsertIntoTableRequest, QueryTableRequest, RefreshMaterializedViewRequest,
RestoreTableRequest, UpdateTableRequest, UpdateTableSchemaMetadataRequest,
UpdateTableTagRequest,
ListTableVersionsRequest, ListTableVersionsResponse, ListTablesRequest, QueryTableRequest,
RefreshMaterializedViewRequest, RestoreTableRequest, UpdateTableRequest,
UpdateTableSchemaMetadataRequest, UpdateTableTagRequest,
};
use lance_namespace_impls::RestNamespaceBuilder;
use lance_namespace_impls::{ConnectBuilder, RestAdapter, RestAdapterConfig, RestAdapterHandle};
Expand Down Expand Up @@ -460,7 +460,7 @@ impl PyDirectoryNamespace {
request: &Bound<'_, PyAny>,
request_data: &Bound<'_, PyBytes>,
) -> PyResult<Bound<'py, PyAny>> {
let request: MergeInsertIntoTableRequest = depythonize(request)?;
let request = merge_insert_request_from_json(depythonize(request)?).infer_error()?;
let data = Bytes::copy_from_slice(request_data.as_bytes());
let response = crate::rt()
.block_on(Some(py), self.inner.merge_insert_into_table(request, data))?
Expand Down Expand Up @@ -1160,7 +1160,7 @@ impl PyRestNamespace {
request: &Bound<'_, PyAny>,
request_data: &Bound<'_, PyBytes>,
) -> PyResult<Bound<'py, PyAny>> {
let request: MergeInsertIntoTableRequest = depythonize(request)?;
let request = merge_insert_request_from_json(depythonize(request)?).infer_error()?;
let data = Bytes::copy_from_slice(request_data.as_bytes());
let response = crate::rt()
.block_on(Some(py), self.inner.merge_insert_into_table(request, data))?
Expand Down
Loading
Loading