build: point lance dependencies at the sibling submodule checkout

Path deps replace the git+tag pins so the sophon build resolves lance
from src/lance directly, independent of the pinned tag's version.

Cargo.lock

@@ -3421,8 +3421,8 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
 
 [[package]]
 name = "fsst"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow-array",
  "rand 0.9.5",
@@ -4777,8 +4777,8 @@ checksum = "e037a2e1d8d5fdbd49b16a4ea09d5d6401c1f29eca5ff29d03d3824dba16256a"
 
 [[package]]
 name = "lance"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arc-swap",
  "arrow",
@@ -4852,8 +4852,8 @@ dependencies = [
 
 [[package]]
 name = "lance-arrow"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -4875,7 +4875,7 @@ dependencies = [
 [[package]]
 name = "lance-arrow-scalar"
 version = "58.0.0"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -4889,7 +4889,7 @@ dependencies = [
 [[package]]
 name = "lance-arrow-stats"
 version = "58.0.0"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow-array",
  "arrow-schema",
@@ -4898,8 +4898,8 @@ dependencies = [
 
 [[package]]
 name = "lance-bitpacking"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrayref",
  "crunchy",
@@ -4909,8 +4909,8 @@ dependencies = [
 
 [[package]]
 name = "lance-core"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -4948,8 +4948,8 @@ dependencies = [
 
 [[package]]
 name = "lance-datafusion"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -4979,8 +4979,8 @@ dependencies = [
 
 [[package]]
 name = "lance-datagen"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -4997,8 +4997,8 @@ dependencies = [
 
 [[package]]
 name = "lance-derive"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5007,8 +5007,8 @@ dependencies = [
 
 [[package]]
 name = "lance-encoding"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow-arith",
  "arrow-array",
@@ -5043,8 +5043,8 @@ dependencies = [
 
 [[package]]
 name = "lance-file"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow-arith",
  "arrow-array",
@@ -5074,8 +5074,8 @@ dependencies = [
 
 [[package]]
 name = "lance-index"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arc-swap",
  "arrow",
@@ -5142,8 +5142,8 @@ dependencies = [
 
 [[package]]
 name = "lance-index-core"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow-array",
  "arrow-schema",
@@ -5165,8 +5165,8 @@ dependencies = [
 
 [[package]]
 name = "lance-io"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow",
  "arrow-arith",
@@ -5209,8 +5209,8 @@ dependencies = [
 
 [[package]]
 name = "lance-linalg"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -5226,8 +5226,8 @@ dependencies = [
 
 [[package]]
 name = "lance-namespace"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow",
  "async-trait",
@@ -5239,8 +5239,8 @@ dependencies = [
 
 [[package]]
 name = "lance-namespace-impls"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow",
  "arrow-ipc",
@@ -5294,8 +5294,8 @@ dependencies = [
 
 [[package]]
 name = "lance-select"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow-array",
  "arrow-buffer",
@@ -5310,8 +5310,8 @@ dependencies = [
 
 [[package]]
 name = "lance-table"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow",
  "arrow-array",
@@ -5350,8 +5350,8 @@ dependencies = [
 
 [[package]]
 name = "lance-testing"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "arrow-array",
  "arrow-schema",
@@ -5364,8 +5364,8 @@ dependencies = [
 
 [[package]]
 name = "lance-tokenizer"
-version = "9.1.0-beta.8"
+version = "10.0.0-beta.2"
-source = "git+https://github.com/lance-format/lance.git?tag=v9.1.0-beta.8#5107a99e3f3912851c8cbb3822bd5b4cbf7fda2f"
+source = "git+https://github.com/lance-format/lance.git?tag=v10.0.0-beta.2#bbc04776fff39355a7287e6feacb0041395a45e1"
 dependencies = [
  "icu_segmenter",
  "jieba-rs",

Cargo.toml

@@ -13,20 +13,20 @@ categories = ["database-implementations"]
 rust-version = "1.91.0"
 
 [workspace.dependencies]
-lance = { "version" = "=9.1.0-beta.8", default-features = false, "tag" = "v9.1.0-beta.8", "git" = "https://github.com/lance-format/lance.git" }
+lance = { path = "../lance/rust/lance", default-features = false }
-lance-core = { "version" = "=9.1.0-beta.8", "tag" = "v9.1.0-beta.8", "git" = "https://github.com/lance-format/lance.git" }
+lance-core = { path = "../lance/rust/lance-core" }
-lance-datagen = { "version" = "=9.1.0-beta.8", "tag" = "v9.1.0-beta.8", "git" = "https://github.com/lance-format/lance.git" }
+lance-datagen = { path = "../lance/rust/lance-datagen" }
-lance-file = { "version" = "=9.1.0-beta.8", "tag" = "v9.1.0-beta.8", "git" = "https://github.com/lance-format/lance.git" }
+lance-file = { path = "../lance/rust/lance-file" }
-lance-io = { "version" = "=9.1.0-beta.8", default-features = false, "tag" = "v9.1.0-beta.8", "git" = "https://github.com/lance-format/lance.git" }
+lance-io = { path = "../lance/rust/lance-io", default-features = false }
-lance-index = { "version" = "=9.1.0-beta.8", "tag" = "v9.1.0-beta.8", "git" = "https://github.com/lance-format/lance.git" }
+lance-index = { path = "../lance/rust/lance-index" }
-lance-linalg = { "version" = "=9.1.0-beta.8", "tag" = "v9.1.0-beta.8", "git" = "https://github.com/lance-format/lance.git" }
+lance-linalg = { path = "../lance/rust/lance-linalg" }
-lance-namespace = { "version" = "=9.1.0-beta.8", "tag" = "v9.1.0-beta.8", "git" = "https://github.com/lance-format/lance.git" }
+lance-namespace = { path = "../lance/rust/lance-namespace" }
-lance-namespace-impls = { "version" = "=9.1.0-beta.8", default-features = false, "tag" = "v9.1.0-beta.8", "git" = "https://github.com/lance-format/lance.git" }
+lance-namespace-impls = { path = "../lance/rust/lance-namespace-impls", default-features = false }
-lance-table = { "version" = "=9.1.0-beta.8", "tag" = "v9.1.0-beta.8", "git" = "https://github.com/lance-format/lance.git" }
+lance-table = { path = "../lance/rust/lance-table" }
-lance-testing = { "version" = "=9.1.0-beta.8", "tag" = "v9.1.0-beta.8", "git" = "https://github.com/lance-format/lance.git" }
+lance-testing = { path = "../lance/rust/lance-testing" }
-lance-datafusion = { "version" = "=9.1.0-beta.8", "tag" = "v9.1.0-beta.8", "git" = "https://github.com/lance-format/lance.git" }
+lance-datafusion = { path = "../lance/rust/lance-datafusion" }
-lance-encoding = { "version" = "=9.1.0-beta.8", "tag" = "v9.1.0-beta.8", "git" = "https://github.com/lance-format/lance.git" }
+lance-encoding = { path = "../lance/rust/lance-encoding" }
-lance-arrow = { "version" = "=9.1.0-beta.8", "tag" = "v9.1.0-beta.8", "git" = "https://github.com/lance-format/lance.git" }
+lance-arrow = { path = "../lance/rust/lance-arrow" }
 ahash = "0.8"
 # Note that this one does not include pyarrow
 arrow = { version = "58.0.0", optional = false }

java/pom.xml

@@ -28,7 +28,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <arrow.version>15.0.0</arrow.version>
-        <lance-core.version>9.1.0-beta.8</lance-core.version>
+        <lance-core.version>10.0.0-beta.2</lance-core.version>
         <spotless.skip>false</spotless.skip>
         <spotless.version>2.30.0</spotless.version>
         <spotless.java.googlejavaformat.version>1.7</spotless.java.googlejavaformat.version>

rust/lancedb/src/blob.rs

@@ -273,7 +273,15 @@ pub(crate) async fn take_blobs_aligned(
         if *is_null {
             builder.append_null();
         } else {
-            builder.append_value(payloads[payload_idx].data.as_ref());
+            let data = payloads[payload_idx]
+                .data
+                .as_ref()
+                .ok_or_else(|| Error::Runtime {
+                    message: format!(
+                        "blob read for column '{column}' returned null payload for a non-null row"
+                    ),
+                })?;
+            builder.append_value(data);
             payload_idx += 1;
         }
     }
@@ -309,16 +317,20 @@ pub(crate) async fn take_blob_files_aligned(
     }
 
     let mut handles = handles.into_iter();
-    Ok(null_mask
+    let mut aligned_handles = Vec::with_capacity(row_ids.len());
-        .iter()
+    for is_null in null_mask {
-        .map(|is_null| {
+        if is_null {
-            if *is_null {
+            aligned_handles.push(None);
-                None
         } else {
-                Some(handles.next().unwrap())
+            let handle = handles.next().unwrap().ok_or_else(|| Error::Runtime {
+                message: format!(
+                    "blob take for column '{column}' returned a null handle for a non-null row"
+                ),
+            })?;
+            aligned_handles.push(Some(handle));
         }
-        })
+    }
-        .collect())
+    Ok(aligned_handles)
 }
 
 #[cfg(test)]