diff --git a/.bumpversion.toml b/.bumpversion.toml index 59a609130..7f0138435 100644 --- a/.bumpversion.toml +++ b/.bumpversion.toml @@ -30,7 +30,7 @@ allow_shell_hooks = true pre_commit_hooks = [ """ NEW_VERSION="${BVHOOK_NEW_MAJOR}.${BVHOOK_NEW_MINOR}.${BVHOOK_NEW_PATCH}" - if [ ! -z "$BVHOOK_NEW_PRE_L" ] && [ ! -z "$BVHOOK_NEW_PRE_N" ]; then + if [ ! -z "$BVHOOK_NEW_PRE_L" ] && [ "$BVHOOK_NEW_PRE_L" != "final" ] && [ ! -z "$BVHOOK_NEW_PRE_N" ]; then NEW_VERSION="${NEW_VERSION}-${BVHOOK_NEW_PRE_L}.${BVHOOK_NEW_PRE_N}" fi echo "Constructed new version: $NEW_VERSION" diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 96b0f2bfb..9edc54d42 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -46,7 +46,8 @@ jobs: from pathlib import Path manifest = tomllib.loads(Path("Cargo.toml").read_text()) - tag = manifest["workspace"]["dependencies"]["lance"]["tag"] + dependency = manifest["workspace"]["dependencies"]["lance"] + tag = dependency.get("tag") or f"v{dependency['version'].removeprefix('=')}" with open(os.environ["GITHUB_OUTPUT"], "a") as output: output.write(f"tag={tag}\n") PYTHON @@ -73,6 +74,9 @@ jobs: [patch."https://github.com/lance-format/lance.git"] lance-arrow = { path = "../local-lance/rust/lance-arrow" } + + [patch.crates-io] + lance-arrow = { path = "../local-lance/rust/lance-arrow" } TOML cargo metadata --manifest-path downstream/Cargo.toml --format-version 1 > downstream/graph.json python3 - <<'PYTHON' diff --git a/Cargo.lock b/Cargo.lock index 46412bc3a..35836c388 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3584,8 +3584,9 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "fsst" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c16c4132156d3d563ecd127330b752843cf732d319018c70ac8cb50f2181ee19" dependencies = [ "arrow-array", "rand 0.9.5", @@ -5059,8 +5060,9 @@ checksum = "e037a2e1d8d5fdbd49b16a4ea09d5d6401c1f29eca5ff29d03d3824dba16256a" [[package]] name = "lance" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6895913cb87c0ca8140d13a3c980ceb5b6c67d95f5e96093a3e157347021c61b" dependencies = [ "arc-swap", "arrow", @@ -5135,7 +5137,9 @@ dependencies = [ [[package]] name = "lance-arrow" -version = "15.0.0-beta.3" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ea62150074a80309968f77456f51c43501a78fec604e01e5713d76acb70490" dependencies = [ "arrow-array", "arrow-buffer", @@ -5157,7 +5161,8 @@ dependencies = [ [[package]] name = "lance-arrow-scalar" version = "58.0.0" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771f68b04b47f3addf781116f65061808de94b05e1e9411c23c18f32d14ebe79" dependencies = [ "arrow-array", "arrow-buffer", @@ -5171,17 +5176,20 @@ dependencies = [ [[package]] name = "lance-arrow-stats" version = "58.0.0" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd47ec33c90bf29f688fd02118e37d3a5ad5c339caa3163f89e417dc0867001f" dependencies = [ "arrow-array", "arrow-schema", + "half", "lance-arrow-scalar", ] [[package]] name = "lance-bitpacking" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a49bf11e09df37ca96fe371287d719afade058a827f6f5fcee5fbb0b36b6d61" dependencies = [ "arrayref", "crunchy", @@ -5191,8 +5199,9 @@ dependencies = [ [[package]] name = "lance-core" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "874fd0494c0b3357a258c0614bbaff3d1654382613ba4cf76a758c399eed7f15" dependencies = [ "arrow-array", "arrow-buffer", @@ -5229,8 +5238,9 @@ dependencies = [ [[package]] name = "lance-datafusion" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2df1f26d0a01b1103d587bd46226979b5a03b1117f63d6fb0503a496708a6e38" dependencies = [ "arrow", "arrow-array", @@ -5246,11 +5256,10 @@ dependencies = [ "datafusion-functions", "datafusion-physical-expr", "futures", - "geodatafusion", "half", "lance-arrow", "lance-core", - "lance-datafusion-exec", + "lance-geo", "lance-jsonb", "log", "pin-project", @@ -5260,36 +5269,11 @@ dependencies = [ "tracing", ] -[[package]] -name = "lance-datafusion-exec" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" -dependencies = [ - "arrow", - "arrow-array", - "arrow-schema", - "async-trait", - "datafusion-common", - "datafusion-execution", - "datafusion-expr", - "datafusion-functions", - "datafusion-physical-expr", - "datafusion-physical-plan", - "futures", - "half", - "lance-arrow", - "lance-core", - "lance-jsonb", - "log", - "pin-project", - "tokio", - "tracing", -] - [[package]] name = "lance-datagen" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2de0472625c5d64345a6fc3409318482c814995198aca57b39bd1cdc0a146c4c" dependencies = [ "arrow", "arrow-array", @@ -5306,8 +5290,9 @@ dependencies = [ [[package]] name = "lance-derive" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12ce1e797e349908c3ddb0ef1d63ddc7a62368c7a6c24526f5bdfe76f1546092" dependencies = [ "proc-macro2", "quote", @@ -5316,8 +5301,9 @@ dependencies = [ [[package]] name = "lance-encoding" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acc812903e6daaa4ab2a925350a96ab04d06a83deeceac0f026355a4dccbfd0a" dependencies = [ "arrow-arith", "arrow-array", @@ -5342,7 +5328,6 @@ dependencies = [ "num-traits", "prost", "prost-build", - "serde_json", "tokio", "tracing", "xxhash-rust", @@ -5351,8 +5336,9 @@ dependencies = [ [[package]] name = "lance-file" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23f909cbffa69e3287fe8bbcbb2b004e3b9c3a8f013b4d0ad0ae751a38128ab8" dependencies = [ "arrow-arith", "arrow-array", @@ -5384,21 +5370,25 @@ dependencies = [ [[package]] name = "lance-geo" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c0d044191e8b7b9b9f693a7b40b26c89f66c1994de124857ecb1b507ec35660" dependencies = [ + "datafusion", "geo-traits", "geo-types", "geoarrow-array", "geoarrow-schema", + "geodatafusion", "lance-core", "serde", ] [[package]] name = "lance-index" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df56fde7e5e34b1d6cf67de22fdfed3a9f6f2875fc5a5d452ae8ab5a1cef150b" dependencies = [ "arc-swap", "arrow", @@ -5415,13 +5405,10 @@ dependencies = [ "blake3", "bytes", "crossbeam-queue", + "datafusion", "datafusion-common", - "datafusion-execution", "datafusion-expr", - "datafusion-functions", - "datafusion-functions-nested", "datafusion-physical-expr", - "datafusion-physical-plan", "dirs", "fst", "futures", @@ -5437,7 +5424,7 @@ dependencies = [ "lance-arrow-stats", "lance-bitpacking", "lance-core", - "lance-datafusion-exec", + "lance-datafusion", "lance-encoding", "lance-file", "lance-geo", @@ -5474,16 +5461,17 @@ dependencies = [ [[package]] name = "lance-index-core" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6ab34b812d49209a8772809e24897d43c713115e11dfd2bb6d48a81beab39c" dependencies = [ "arrow-array", "arrow-schema", "arrow-select", "async-trait", "bytes", + "datafusion", "datafusion-common", - "datafusion-execution", "datafusion-expr", "futures", "lance-core", @@ -5498,8 +5486,9 @@ dependencies = [ [[package]] name = "lance-io" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5bbdcf364df034775ebbe50f01248e724146b647ee88276f2e204528e1c6621" dependencies = [ "arrow", "arrow-array", @@ -5542,8 +5531,9 @@ dependencies = [ [[package]] name = "lance-jsonb" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0436ea33e57f7c98d30de9d6d198cab11ed4cb931189bf8f3894b0eb7fa0b21" dependencies = [ "byteorder", "ethnum", @@ -5560,8 +5550,9 @@ dependencies = [ [[package]] name = "lance-linalg" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98d1d007dc0aa3e1120dfdd1a6b0301122c2ad7b889512fce0aceecef190b86e" dependencies = [ "arrow-array", "arrow-schema", @@ -5575,8 +5566,9 @@ dependencies = [ [[package]] name = "lance-namespace" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8deb61f226dca6a8d97a712cb9da7ac4ea9f92aedd8a86b77ad839c6a0c4719f" dependencies = [ "arrow", "async-trait", @@ -5590,8 +5582,9 @@ dependencies = [ [[package]] name = "lance-namespace-impls" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413df17726266cdff33a372113caed7590c3c03193b5ce393e41995b285157d2" dependencies = [ "arc-swap", "arrow", @@ -5645,8 +5638,9 @@ dependencies = [ [[package]] name = "lance-select" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc463e3448a8734d82a0257807bbddb8d618b07981e134682571ebe3d7e1f0e9" dependencies = [ "arrow-array", "arrow-buffer", @@ -5660,8 +5654,9 @@ dependencies = [ [[package]] name = "lance-table" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39f2c0958a433c2b19c8db4b0187a972a758de3ab984c93cb764cd19bfa76caf" dependencies = [ "arrow", "arrow-array", @@ -5701,8 +5696,9 @@ dependencies = [ [[package]] name = "lance-testing" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a34a1b5b30d99775e2de85f6668018667d55ff5895f4e2e1ae24bfe394919d07" dependencies = [ "arrow-array", "arrow-schema", @@ -5715,8 +5711,9 @@ dependencies = [ [[package]] name = "lance-tokenizer" -version = "15.0.0-beta.3" -source = "git+https://github.com/lance-format/lance.git?tag=v15.0.0-beta.3#2e22bb984d6cc6f5990f188cabb0b586b7bb51bc" +version = "14.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e053c7ef3853f0e0dcb2a7a3d3071d6c65dc46f2186aff03f48601934817d09d" dependencies = [ "frostem", "icu_segmenter", @@ -6892,7 +6889,8 @@ dependencies = [ [[package]] name = "object_store" version = "0.14.2" -source = "git+https://github.com/apache/arrow-rs-object-store.git?rev=c10758c207c0103355f940f0c736fb8ecb157b04#c10758c207c0103355f940f0c736fb8ecb157b04" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1796bc93603f78c5760a69f2d58badc9618d22adade0a95385bb2adbae4eb94" dependencies = [ "async-trait", "aws-lc-rs", diff --git a/Cargo.toml b/Cargo.toml index 546613ce2..349b0c3c5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,21 +18,21 @@ categories = ["database-implementations"] rust-version = "1.94.0" [workspace.dependencies] -lance = { "version" = "=15.0.0-beta.3", default-features = false, "tag" = "v15.0.0-beta.3", "git" = "https://github.com/lance-format/lance.git" } -lance-core = { "version" = "=15.0.0-beta.3", "tag" = "v15.0.0-beta.3", "git" = "https://github.com/lance-format/lance.git" } -lance-datagen = { "version" = "=15.0.0-beta.3", "tag" = "v15.0.0-beta.3", "git" = "https://github.com/lance-format/lance.git" } -lance-file = { "version" = "=15.0.0-beta.3", "tag" = "v15.0.0-beta.3", "git" = "https://github.com/lance-format/lance.git" } -lance-io = { "version" = "=15.0.0-beta.3", default-features = false, "tag" = "v15.0.0-beta.3", "git" = "https://github.com/lance-format/lance.git" } -lance-index = { "version" = "=15.0.0-beta.3", "tag" = "v15.0.0-beta.3", "git" = "https://github.com/lance-format/lance.git" } -lance-jsonb = { "version" = "=15.0.0-beta.3", "tag" = "v15.0.0-beta.3", "git" = "https://github.com/lance-format/lance.git" } -lance-linalg = { "version" = "=15.0.0-beta.3", "tag" = "v15.0.0-beta.3", "git" = "https://github.com/lance-format/lance.git" } -lance-namespace = { "version" = "=15.0.0-beta.3", "tag" = "v15.0.0-beta.3", "git" = "https://github.com/lance-format/lance.git" } -lance-namespace-impls = { "version" = "=15.0.0-beta.3", default-features = false, "tag" = "v15.0.0-beta.3", "git" = "https://github.com/lance-format/lance.git" } -lance-table = { "version" = "=15.0.0-beta.3", "tag" = "v15.0.0-beta.3", "git" = "https://github.com/lance-format/lance.git" } -lance-testing = { "version" = "=15.0.0-beta.3", "tag" = "v15.0.0-beta.3", "git" = "https://github.com/lance-format/lance.git" } -lance-datafusion = { "version" = "=15.0.0-beta.3", "tag" = "v15.0.0-beta.3", "git" = "https://github.com/lance-format/lance.git" } -lance-encoding = { "version" = "=15.0.0-beta.3", "tag" = "v15.0.0-beta.3", "git" = "https://github.com/lance-format/lance.git" } -lance-arrow = { version = "=15.0.0-beta.3", path = "python/vendor/lance-arrow" } +lance = { "version" = "=14.0.2", default-features = false } +lance-core = { "version" = "=14.0.2" } +lance-datagen = { "version" = "=14.0.2" } +lance-file = { "version" = "=14.0.2" } +lance-io = { "version" = "=14.0.2", default-features = false } +lance-index = { "version" = "=14.0.2" } +lance-jsonb = { "version" = "=14.0.2" } +lance-linalg = { "version" = "=14.0.2" } +lance-namespace = { "version" = "=14.0.2" } +lance-namespace-impls = { "version" = "=14.0.2", default-features = false } +lance-table = { "version" = "=14.0.2" } +lance-testing = { "version" = "=14.0.2" } +lance-datafusion = { "version" = "=14.0.2" } +lance-encoding = { "version" = "=14.0.2" } +lance-arrow = { version = "=14.0.2" } lancedb = { path = "rust/lancedb", default-features = false } ahash = "0.8" # Note that this one does not include pyarrow @@ -86,14 +86,6 @@ tracing = "0.1" uuid = { version = "1.7.0", features = ["v4", "v7"] } chrono = { version = "0.4", default-features = false, features = ["clock"] } -[patch."https://github.com/lance-format/lance.git"] -# Carry the offset-safe validity fix until it is available in a Lance release. -lance-arrow = { path = "python/vendor/lance-arrow" } - -[patch.crates-io] -# Lance v14.0.0-beta.18 requires multipart write modes from this upstream revision. -object_store = { git = "https://github.com/apache/arrow-rs-object-store.git", rev = "c10758c207c0103355f940f0c736fb8ecb157b04" } - [profile.ci] debug = "line-tables-only" inherits = "dev" diff --git a/java/pom.xml b/java/pom.xml index 9e3191813..952768d0f 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -28,7 +28,7 @@ UTF-8 15.0.0 - 15.0.0-beta.3 + 14.0.2 2.18.11 false 2.30.0 diff --git a/python/pyproject.toml b/python/pyproject.toml index f71eac182..249dd3496 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -46,7 +46,7 @@ repository = "https://github.com/lancedb/lancedb" [project.optional-dependencies] pylance = [ # Keep the minimum in the bundled Lance major and compatible with tests below. - "pylance>=15.0.0b3", + "pylance>=14.0.2", ] # A library only needs the OpenTelemetry API; the application supplies and # configures the SDK (the actual exporter/reader). See @@ -64,7 +64,7 @@ tests = [ "polars>=0.19, <=1.32.3", "pyarrow<25", "pyarrow-stubs>=16.0", - "pylance==15.0.0b3", + "pylance==14.0.2", "requests>=2.31.0", "datafusion>=54,<55", "opentelemetry-sdk>=1.30.0", diff --git a/python/uv.lock b/python/uv.lock index 3158220dd..bb4cd3ee8 100644 --- a/python/uv.lock +++ b/python/uv.lock @@ -2006,8 +2006,8 @@ requires-dist = [ { name = "pyarrow", marker = "extra == 'tests'", specifier = "<25" }, { name = "pyarrow-stubs", marker = "extra == 'tests'", specifier = ">=16.0" }, { name = "pydantic", specifier = ">=2.7.4,<3" }, - { name = "pylance", marker = "extra == 'pylance'", specifier = ">=15.0.0b3" }, - { name = "pylance", marker = "extra == 'tests'", specifier = "==15.0.0b3" }, + { name = "pylance", marker = "extra == 'pylance'", specifier = ">=14.0.2" }, + { name = "pylance", marker = "extra == 'tests'", specifier = "==14.0.2" }, { name = "pyright", marker = "extra == 'dev'", specifier = ">=1.1.350" }, { name = "pytest", marker = "extra == 'tests'", specifier = ">=7.0" }, { name = "pytest-asyncio", marker = "extra == 'tests'", specifier = ">=0.21" }, @@ -3938,8 +3938,8 @@ crypto = [ [[package]] name = "pylance" -version = "15.0.0b3" -source = { registry = "https://pypi.fury.io/lance-format/" } +version = "14.0.2" +source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "lance-namespace" }, { name = "numpy", version = "2.2.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" }, @@ -3948,12 +3948,12 @@ dependencies = [ { name = "pyarrow" }, ] wheels = [ - { url = "https://pypi.fury.io/lance-format/-/ver_1ttHFr/pylance-15.0.0b3-cp310-abi3-macosx_11_0_arm64.whl", hash = "sha256:aaca475121cef79ada6fc19e2e2b54860e411cc8291f9ffa5643500264513086" }, - { url = "https://pypi.fury.io/lance-format/-/ver_19DzNz/pylance-15.0.0b3-cp310-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5632f269b9e138b9ed3e5c7b788dfe27e04debab9d0f4c72be468f56d4a0d45a" }, - { url = "https://pypi.fury.io/lance-format/-/ver_20XdL/pylance-15.0.0b3-cp310-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1bdc92d7dc4d38323452543f71e61b493c3cfb5129dade33175f478e394b1959" }, - { url = "https://pypi.fury.io/lance-format/-/ver_YBklr/pylance-15.0.0b3-cp310-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:6fcaced6f675f027979e1928284e104ae45eb8282d7c1eb0e51e4a5b92b93392" }, - { url = "https://pypi.fury.io/lance-format/-/ver_1HLHhZ/pylance-15.0.0b3-cp310-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:f19240f3ccd621b746062fd2825e9340b99131c2cbda7ed5b226b6f7871b73f4" }, - { url = "https://pypi.fury.io/lance-format/-/ver_24P9Ax/pylance-15.0.0b3-cp310-abi3-win_amd64.whl", hash = "sha256:3f964e4ed093b6f170601d40772fcd3525fd73d15fd56eb30d884a446668d602" }, + { url = "https://files.pythonhosted.org/packages/0d/3f/6217f37e36ea8eca2e487e6a2bcd8dcd19291bf2c5601d4523478fabb703/pylance-14.0.2-cp310-abi3-macosx_11_0_arm64.whl", hash = "sha256:f2a916954f882704c23cf28e9f35641db93250455570e7d9d80b294338372af8", size = 76485726, upload-time = "2026-10-29T05:28:36.559Z" }, + { url = "https://files.pythonhosted.org/packages/1c/a0/0376963dcaac36fc62b9b61c32e1bf5cdac2215f5e444d4a31f8190725b2/pylance-14.0.2-cp310-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:936a1d84c1a95915950b52dcf5ee936b59e67c921dafa52e573805bb8efe5981", size = 80898424, upload-time = "2026-10-29T05:23:18.12Z" }, + { url = "https://files.pythonhosted.org/packages/16/83/549de52f97a36a5cbb226019b14fc929afb605a8c0741049cade001b1c0a/pylance-14.0.2-cp310-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b3a913cb3ce88d7d5d55a4e771194ebb7574a7ececee4084a4e3e5439318d9f", size = 85324584, upload-time = "2026-10-29T05:44:56.132Z" }, + { url = "https://files.pythonhosted.org/packages/99/5b/7981a6be54c61c71b4e2303397382df699931432ef339e22bab2e94850ac/pylance-14.0.2-cp310-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:74dc23534a645ac52bfb754716f1f2c295b3f0e062d8e27fa6d9da10cb4a682d", size = 80918562, upload-time = "2026-10-29T05:34:20.046Z" }, + { url = "https://files.pythonhosted.org/packages/45/8e/16a52e7dc034a4b03d7fedcdf18de56efa4363bdac90e02a42b8990b88e5/pylance-14.0.2-cp310-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:01a571675ecf613f9988f8a6adc36fde00c1b1f8100c221ac602d122237e6ad6", size = 85324923, upload-time = "2026-10-29T05:34:30.511Z" }, + { url = "https://files.pythonhosted.org/packages/2b/a1/3611a6c7bba022b5ddc7716cc87b1bddcb532acabbef022ad8ce995cd1c7/pylance-14.0.2-cp310-abi3-win_amd64.whl", hash = "sha256:915d5f442d49ee048b89da01c2461caa6724a456fd6ce012feeb32c3d2a4f92f", size = 92616591, upload-time = "2026-10-29T05:34:47.231Z" }, ] [[package]] diff --git a/rust/lancedb/Cargo.toml b/rust/lancedb/Cargo.toml index d688aeaae..cfc01da80 100644 --- a/rust/lancedb/Cargo.toml +++ b/rust/lancedb/Cargo.toml @@ -46,7 +46,7 @@ lance-index = { workspace = true, features = ["tokenizer-jieba", "tokenizer-lind lance-table = { workspace = true } lance-linalg = { workspace = true } lance-encoding = { workspace = true } -lance-arrow = { "version" = "=15.0.0-beta.3", "tag" = "v15.0.0-beta.3", "git" = "https://github.com/lance-format/lance.git" } +lance-arrow = { workspace = true } lance-namespace = { workspace = true } lance-namespace-impls = { workspace = true } metrics = { workspace = true, optional = true } diff --git a/rust/lancedb/src/table/merge.rs b/rust/lancedb/src/table/merge.rs index a066a4d6d..91a0ed6ea 100644 --- a/rust/lancedb/src/table/merge.rs +++ b/rust/lancedb/src/table/merge.rs @@ -2137,7 +2137,7 @@ mod lsm_tests { } fn training_criteria(&self) -> lance_index::scalar::registry::TrainingCriteria { use lance_index::scalar::registry::{TrainingCriteria, TrainingOrdering}; - TrainingCriteria::new(TrainingOrdering::Values).with_row_addr() + TrainingCriteria::new(TrainingOrdering::Values).with_row_id() } fn validate( &self, @@ -2181,8 +2181,24 @@ mod lsm_tests { &self, ctx: &lance::dataset::mem_wal::index::FlushContext<'_>, ) -> lance_core::Result { + // BTree now trains on row addresses, while Bitmap still takes row IDs. + // These coincide in the flushed generation, which uses physical IDs. + assert!(!ctx.generation()?.dataset.manifest().uses_stable_row_ids()); + let batches = self + .0 + .to_training_batches(ctx.batch_size)? + .into_iter() + .map(|batch| { + assert_eq!(batch.schema().field(1).name(), lance_core::ROW_ADDR); + let schema = Arc::new(Schema::new(vec![ + batch.schema().field(0).clone(), + Field::new(lance_core::ROW_ID, DataType::UInt64, false), + ])); + RecordBatch::try_new(schema, batch.columns().to_vec()) + }) + .collect::, _>>()?; Ok(lance::dataset::mem_wal::index::FlushOutcome::from_batches( - self.0.to_training_batches(ctx.batch_size)?, + batches, )) } }