From dbccd9e4f1aaffcef002b03f6ccee0cd347b4700 Mon Sep 17 00:00:00 2001 From: BubbleCal Date: Mon, 7 Jul 2025 22:16:43 +0800 Subject: [PATCH] chore: upgrade lance to 0.31.1-beta.1 (#2486) this also upgrades: - datafusion 47.0 -> 48.0 - half 2.5.0 -> 2.6.0 to be consistent with lance --------- Signed-off-by: BubbleCal --- Cargo.lock | 217 +++++++++++++++------------ Cargo.toml | 32 ++-- rust/lancedb/src/table/datafusion.rs | 15 +- 3 files changed, 148 insertions(+), 116 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index faad3c9b..c8486b92 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -357,6 +357,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73a47aa0c771b5381de2b7f16998d351a6f4eb839f1e13d48353e17e873d969b" dependencies = [ "bitflags 2.9.1", + "serde", + "serde_json", ] [[package]] @@ -1816,9 +1818,9 @@ dependencies = [ [[package]] name = "datafusion" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe060b978f74ab446be722adb8a274e052e005bf6dfd171caadc3abaad10080" +checksum = "cc6cb8c2c81eada072059983657d6c9caf3fddefc43b4a65551d243253254a96" dependencies = [ "arrow", "arrow-ipc", @@ -1841,7 +1843,6 @@ dependencies = [ "datafusion-functions-nested", "datafusion-functions-table", "datafusion-functions-window", - "datafusion-macros", "datafusion-optimizer", "datafusion-physical-expr", "datafusion-physical-expr-common", @@ -1854,7 +1855,7 @@ dependencies = [ "log", "object_store", "parking_lot", - "rand 0.8.5", + "rand 0.9.1", "regex", "sqlparser 0.55.0", "tempfile", @@ -1865,9 +1866,9 @@ dependencies = [ [[package]] name = "datafusion-catalog" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61fe34f401bd03724a1f96d12108144f8cd495a3cdda2bf5e091822fb80b7e66" +checksum = "b7be8d1b627843af62e447396db08fe1372d882c0eb8d0ea655fd1fbc33120ee" dependencies = [ "arrow", "async-trait", @@ -1891,9 +1892,9 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4411b8e3bce5e0fc7521e44f201def2e2d5d1b5f176fb56e8cdc9942c890f00" +checksum = "38ab16c5ae43f65ee525fc493ceffbc41f40dee38b01f643dfcfc12959e92038" dependencies = [ "arrow", "async-trait", @@ -1914,9 +1915,9 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0734015d81c8375eb5d4869b7f7ecccc2ee8d6cb81948ef737cd0e7b743bd69c" +checksum = "d3d56b2ac9f476b93ca82e4ef5fb00769c8a3f248d12b4965af7e27635fa7e12" dependencies = [ "ahash", "arrow", @@ -1936,9 +1937,9 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5167bb1d2ccbb87c6bc36c295274d7a0519b14afcfdaf401d53cbcaa4ef4968b" +checksum = "16015071202d6133bc84d72756176467e3e46029f3ce9ad2cb788f9b1ff139b2" dependencies = [ "futures", "log", @@ -1947,9 +1948,9 @@ dependencies = [ [[package]] name = "datafusion-datasource" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e602dcdf2f50c2abf297cc2203c73531e6f48b29516af7695d338cf2a778b1" +checksum = "b77523c95c89d2a7eb99df14ed31390e04ab29b43ff793e562bdc1716b07e17b" dependencies = [ "arrow", "async-trait", @@ -1968,16 +1969,16 @@ dependencies = [ "itertools 0.14.0", "log", "object_store", - "rand 0.8.5", + "rand 0.9.1", "tokio", "url", ] [[package]] name = "datafusion-datasource-csv" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bb2253952dc32296ed5b84077cb2e0257fea4be6373e1c376426e17ead4ef6" +checksum = "40d25c5e2c0ebe8434beeea997b8e88d55b3ccc0d19344293f2373f65bc524fc" dependencies = [ "arrow", "async-trait", @@ -2000,9 +2001,9 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8c7f47a5d2fe03bfa521ec9bafdb8a5c82de8377f60967c3663f00c8790352" +checksum = "3dc6959e1155741ab35369e1dc7673ba30fc45ed568fad34c01b7cb1daeb4d4c" dependencies = [ "arrow", "async-trait", @@ -2025,15 +2026,15 @@ dependencies = [ [[package]] name = "datafusion-doc" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91f8c2c5788ef32f48ff56c68e5b545527b744822a284373ac79bba1ba47292" +checksum = "9bcd8a3e3e3d02ea642541be23d44376b5d5c37c2938cce39b3873cdf7186eea" [[package]] name = "datafusion-execution" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06f004d100f49a3658c9da6fb0c3a9b760062d96cd4ad82ccc3b7b69a9fb2f84" +checksum = "670da1d45d045eee4c2319b8c7ea57b26cf48ab77b630aaa50b779e406da476a" dependencies = [ "arrow", "dashmap", @@ -2043,16 +2044,16 @@ dependencies = [ "log", "object_store", "parking_lot", - "rand 0.8.5", + "rand 0.9.1", "tempfile", "url", ] [[package]] name = "datafusion-expr" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a4e4ce3802609be38eeb607ee72f6fe86c3091460de9dbfae9e18db423b3964" +checksum = "b3a577f64bdb7e2cc4043cd97f8901d8c504711fde2dbcb0887645b00d7c660b" dependencies = [ "arrow", "chrono", @@ -2070,9 +2071,9 @@ dependencies = [ [[package]] name = "datafusion-expr-common" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ac9cf3b22bbbae8cdf8ceb33039107fde1b5492693168f13bd566b1bcc839" +checksum = "51b7916806ace3e9f41884f230f7f38ebf0e955dfbd88266da1826f29a0b9a6a" dependencies = [ "arrow", "datafusion-common", @@ -2083,9 +2084,9 @@ dependencies = [ [[package]] name = "datafusion-functions" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ddf0a0a2db5d2918349c978d42d80926c6aa2459cd8a3c533a84ec4bb63479e" +checksum = "7fb31c9dc73d3e0c365063f91139dc273308f8a8e124adda9898db8085d68357" dependencies = [ "arrow", "arrow-buffer", @@ -2103,7 +2104,7 @@ dependencies = [ "itertools 0.14.0", "log", "md-5", - "rand 0.8.5", + "rand 0.9.1", "regex", "sha2", "unicode-segmentation", @@ -2112,9 +2113,9 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "408a05dafdc70d05a38a29005b8b15e21b0238734dab1e98483fcb58038c5aba" +checksum = "ebb72c6940697eaaba9bd1f746a697a07819de952b817e3fb841fb75331ad5d4" dependencies = [ "ahash", "arrow", @@ -2133,9 +2134,9 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756d21da2dd6c9bef97af1504970ff56cbf35d03fbd4ffd62827f02f4d2279d4" +checksum = "d7fdc54656659e5ecd49bf341061f4156ab230052611f4f3609612a0da259696" dependencies = [ "ahash", "arrow", @@ -2146,9 +2147,9 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d8d50f6334b378930d992d801a10ac5b3e93b846b39e4a05085742572844537" +checksum = "fad94598e3374938ca43bca6b675febe557e7a14eb627d617db427d70d65118b" dependencies = [ "arrow", "arrow-ord", @@ -2167,9 +2168,9 @@ dependencies = [ [[package]] name = "datafusion-functions-table" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9a97220736c8fff1446e936be90d57216c06f28969f9ffd3b72ac93c958c8a" +checksum = "de2fc6c2946da5cab8364fb28b5cac3115f0f3a87960b235ed031c3f7e2e639b" dependencies = [ "arrow", "async-trait", @@ -2183,10 +2184,11 @@ dependencies = [ [[package]] name = "datafusion-functions-window" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cefc2d77646e1aadd1d6a9c40088937aedec04e68c5f0465939912e1291f8193" +checksum = "3e5746548a8544870a119f556543adcd88fe0ba6b93723fe78ad0439e0fbb8b4" dependencies = [ + "arrow", "datafusion-common", "datafusion-doc", "datafusion-expr", @@ -2200,9 +2202,9 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4aff082c42fa6da99ce0698c85addd5252928c908eb087ca3cfa64ff16b313" +checksum = "dcbe9404382cda257c434f22e13577bee7047031dfdb6216dd5e841b9465e6fe" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -2210,9 +2212,9 @@ dependencies = [ [[package]] name = "datafusion-macros" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df6f88d7ee27daf8b108ba910f9015176b36fbc72902b1ca5c2a5f1d1717e1a1" +checksum = "8dce50e3b637dab0d25d04d2fe79dfdca2b257eabd76790bffd22c7f90d700c8" dependencies = [ "datafusion-expr", "quote", @@ -2221,9 +2223,9 @@ dependencies = [ [[package]] name = "datafusion-optimizer" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084d9f979c4b155346d3c34b18f4256e6904ded508e9554d90fed416415c3515" +checksum = "03cfaacf06445dc3bbc1e901242d2a44f2cae99a744f49f3fefddcee46240058" dependencies = [ "arrow", "chrono", @@ -2239,9 +2241,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c536062b0076f4e30084065d805f389f9fe38af0ca75bcbac86bc5e9fbab65" +checksum = "1908034a89d7b2630898e06863583ae4c00a0dd310c1589ca284195ee3f7f8a6" dependencies = [ "ahash", "arrow", @@ -2256,14 +2258,14 @@ dependencies = [ "itertools 0.14.0", "log", "paste", - "petgraph", + "petgraph 0.8.2", ] [[package]] name = "datafusion-physical-expr-common" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a92b53b3193fac1916a1c5b8e3f4347c526f6822e56b71faa5fb372327a863" +checksum = "47b7a12dd59ea07614b67dbb01d85254fbd93df45bcffa63495e11d3bdf847df" dependencies = [ "ahash", "arrow", @@ -2275,9 +2277,9 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa0a5ac94c7cf3da97bedabd69d6bbca12aef84b9b37e6e9e8c25286511b5e2" +checksum = "4371cc4ad33978cc2a8be93bd54a232d3f2857b50401a14631c0705f3f910aae" dependencies = [ "arrow", "datafusion-common", @@ -2293,9 +2295,9 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "690c615db468c2e5fe5085b232d8b1c088299a6c63d87fd960a354a71f7acb55" +checksum = "dc47bc33025757a5c11f2cd094c5b6b5ed87f46fa33c023e6fdfa25fcbfade23" dependencies = [ "ahash", "arrow", @@ -2323,9 +2325,9 @@ dependencies = [ [[package]] name = "datafusion-session" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad229a134c7406c057ece00c8743c0c34b97f4e72f78b475fe17b66c5e14fa4f" +checksum = "d7485da32283985d6b45bd7d13a65169dcbe8c869e25d01b2cfbc425254b4b49" dependencies = [ "arrow", "async-trait", @@ -2347,9 +2349,9 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "47.0.0" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f6ab28b72b664c21a27b22a2ff815fd390ed224c26e89a93b5a8154a4e8607" +checksum = "a466b15632befddfeac68c125f0260f569ff315c6831538cbb40db754134e0df" dependencies = [ "arrow", "bigdecimal", @@ -2813,8 +2815,8 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "fsst" -version = "0.31.0" -source = "git+https://github.com/lancedb/lance.git?tag=v0.31.0-beta.1#c594f7808f17d3b7749270085e1280372a7ce8d4" +version = "0.31.1" +source = "git+https://github.com/lancedb/lance.git?tag=v0.31.1-beta.1#db33a7421aee06f142b1e2f49a1b52553e0f064d" dependencies = [ "rand 0.8.5", ] @@ -3280,9 +3282,9 @@ dependencies = [ [[package]] name = "half" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7db2ff139bba50379da6aa0766b52fdcb62cb5b263009b09ed58ba604e14bbd1" +checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" dependencies = [ "bytemuck", "cfg-if", @@ -3906,8 +3908,8 @@ dependencies = [ [[package]] name = "lance" -version = "0.31.0" -source = "git+https://github.com/lancedb/lance.git?tag=v0.31.0-beta.1#c594f7808f17d3b7749270085e1280372a7ce8d4" +version = "0.31.1" +source = "git+https://github.com/lancedb/lance.git?tag=v0.31.1-beta.1#db33a7421aee06f142b1e2f49a1b52553e0f064d" dependencies = [ "arrow", "arrow-arith", @@ -3947,7 +3949,6 @@ dependencies = [ "lance-io", "lance-linalg", "lance-table", - "lazy_static", "log", "moka", "object_store", @@ -3970,8 +3971,8 @@ dependencies = [ [[package]] name = "lance-arrow" -version = "0.31.0" -source = "git+https://github.com/lancedb/lance.git?tag=v0.31.0-beta.1#c594f7808f17d3b7749270085e1280372a7ce8d4" +version = "0.31.1" +source = "git+https://github.com/lancedb/lance.git?tag=v0.31.1-beta.1#db33a7421aee06f142b1e2f49a1b52553e0f064d" dependencies = [ "arrow-array", "arrow-buffer", @@ -3988,8 +3989,8 @@ dependencies = [ [[package]] name = "lance-core" -version = "0.31.0" -source = "git+https://github.com/lancedb/lance.git?tag=v0.31.0-beta.1#c594f7808f17d3b7749270085e1280372a7ce8d4" +version = "0.31.1" +source = "git+https://github.com/lancedb/lance.git?tag=v0.31.1-beta.1#db33a7421aee06f142b1e2f49a1b52553e0f064d" dependencies = [ "arrow-array", "arrow-buffer", @@ -4003,7 +4004,6 @@ dependencies = [ "deepsize", "futures", "lance-arrow", - "lazy_static", "libc", "log", "mock_instant", @@ -4025,8 +4025,8 @@ dependencies = [ [[package]] name = "lance-datafusion" -version = "0.31.0" -source = "git+https://github.com/lancedb/lance.git?tag=v0.31.0-beta.1#c594f7808f17d3b7749270085e1280372a7ce8d4" +version = "0.31.1" +source = "git+https://github.com/lancedb/lance.git?tag=v0.31.1-beta.1#db33a7421aee06f142b1e2f49a1b52553e0f064d" dependencies = [ "arrow", "arrow-array", @@ -4043,7 +4043,6 @@ dependencies = [ "lance-arrow", "lance-core", "lance-datagen", - "lazy_static", "log", "pin-project", "prost", @@ -4055,8 +4054,8 @@ dependencies = [ [[package]] name = "lance-datagen" -version = "0.31.0" -source = "git+https://github.com/lancedb/lance.git?tag=v0.31.0-beta.1#c594f7808f17d3b7749270085e1280372a7ce8d4" +version = "0.31.1" +source = "git+https://github.com/lancedb/lance.git?tag=v0.31.1-beta.1#db33a7421aee06f142b1e2f49a1b52553e0f064d" dependencies = [ "arrow", "arrow-array", @@ -4067,12 +4066,13 @@ dependencies = [ "hex", "rand 0.8.5", "rand_xoshiro", + "random_word 0.5.0", ] [[package]] name = "lance-encoding" -version = "0.31.0" -source = "git+https://github.com/lancedb/lance.git?tag=v0.31.0-beta.1#c594f7808f17d3b7749270085e1280372a7ce8d4" +version = "0.31.1" +source = "git+https://github.com/lancedb/lance.git?tag=v0.31.1-beta.1#db33a7421aee06f142b1e2f49a1b52553e0f064d" dependencies = [ "arrayref", "arrow", @@ -4093,7 +4093,6 @@ dependencies = [ "itertools 0.13.0", "lance-arrow", "lance-core", - "lazy_static", "log", "lz4", "num-traits", @@ -4112,8 +4111,8 @@ dependencies = [ [[package]] name = "lance-file" -version = "0.31.0" -source = "git+https://github.com/lancedb/lance.git?tag=v0.31.0-beta.1#c594f7808f17d3b7749270085e1280372a7ce8d4" +version = "0.31.1" +source = "git+https://github.com/lancedb/lance.git?tag=v0.31.1-beta.1#db33a7421aee06f142b1e2f49a1b52553e0f064d" dependencies = [ "arrow-arith", "arrow-array", @@ -4147,8 +4146,8 @@ dependencies = [ [[package]] name = "lance-index" -version = "0.31.0" -source = "git+https://github.com/lancedb/lance.git?tag=v0.31.0-beta.1#c594f7808f17d3b7749270085e1280372a7ce8d4" +version = "0.31.1" +source = "git+https://github.com/lancedb/lance.git?tag=v0.31.1-beta.1#db33a7421aee06f142b1e2f49a1b52553e0f064d" dependencies = [ "arrow", "arrow-array", @@ -4181,7 +4180,6 @@ dependencies = [ "lance-io", "lance-linalg", "lance-table", - "lazy_static", "log", "moka", "num-traits", @@ -4203,8 +4201,8 @@ dependencies = [ [[package]] name = "lance-io" -version = "0.31.0" -source = "git+https://github.com/lancedb/lance.git?tag=v0.31.0-beta.1#c594f7808f17d3b7749270085e1280372a7ce8d4" +version = "0.31.1" +source = "git+https://github.com/lancedb/lance.git?tag=v0.31.1-beta.1#db33a7421aee06f142b1e2f49a1b52553e0f064d" dependencies = [ "arrow", "arrow-arith", @@ -4226,7 +4224,6 @@ dependencies = [ "futures", "lance-arrow", "lance-core", - "lazy_static", "log", "object_store", "path_abs", @@ -4243,8 +4240,8 @@ dependencies = [ [[package]] name = "lance-linalg" -version = "0.31.0" -source = "git+https://github.com/lancedb/lance.git?tag=v0.31.0-beta.1#c594f7808f17d3b7749270085e1280372a7ce8d4" +version = "0.31.1" +source = "git+https://github.com/lancedb/lance.git?tag=v0.31.1-beta.1#db33a7421aee06f142b1e2f49a1b52553e0f064d" dependencies = [ "arrow-array", "arrow-ord", @@ -4256,7 +4253,6 @@ dependencies = [ "half", "lance-arrow", "lance-core", - "lazy_static", "log", "num-traits", "rand 0.8.5", @@ -4267,8 +4263,8 @@ dependencies = [ [[package]] name = "lance-table" -version = "0.31.0" -source = "git+https://github.com/lancedb/lance.git?tag=v0.31.0-beta.1#c594f7808f17d3b7749270085e1280372a7ce8d4" +version = "0.31.1" +source = "git+https://github.com/lancedb/lance.git?tag=v0.31.1-beta.1#db33a7421aee06f142b1e2f49a1b52553e0f064d" dependencies = [ "arrow", "arrow-array", @@ -4287,7 +4283,6 @@ dependencies = [ "lance-core", "lance-file", "lance-io", - "lazy_static", "log", "object_store", "prost", @@ -4307,8 +4302,8 @@ dependencies = [ [[package]] name = "lance-testing" -version = "0.31.0" -source = "git+https://github.com/lancedb/lance.git?tag=v0.31.0-beta.1#c594f7808f17d3b7749270085e1280372a7ce8d4" +version = "0.31.1" +source = "git+https://github.com/lancedb/lance.git?tag=v0.31.1-beta.1#db33a7421aee06f142b1e2f49a1b52553e0f064d" dependencies = [ "arrow-array", "arrow-schema", @@ -4371,7 +4366,7 @@ dependencies = [ "polars", "polars-arrow", "rand 0.9.1", - "random_word", + "random_word 0.4.3", "regex", "reqwest", "rstest", @@ -5366,6 +5361,18 @@ dependencies = [ "indexmap 2.9.0", ] +[[package]] +name = "petgraph" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54acf3a685220b533e437e264e4d932cfbdc4cc7ec0cd232ed73c08d03b8a7ca" +dependencies = [ + "fixedbitset", + "hashbrown 0.15.4", + "indexmap 2.9.0", + "serde", +] + [[package]] name = "phf" version = "0.11.3" @@ -5898,7 +5905,7 @@ dependencies = [ "log", "multimap", "once_cell", - "petgraph", + "petgraph 0.7.1", "prettyplease", "prost", "prost-types", @@ -6240,6 +6247,20 @@ dependencies = [ "unicase", ] +[[package]] +name = "random_word" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcd87d2e3f99cc11e6c7fc518f09e63e194f7243b4cf30c979b0c524d04fbd90" +dependencies = [ + "ahash", + "brotli", + "once_cell", + "paste", + "rand 0.8.5", + "unicase", +] + [[package]] name = "rangemap" version = "1.5.1" diff --git a/Cargo.toml b/Cargo.toml index 568e87e8..6be74769 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,14 +21,16 @@ categories = ["database-implementations"] rust-version = "1.78.0" [workspace.dependencies] -lance = { "version" = "=0.31.0", tag="v0.31.0-beta.1", git="https://github.com/lancedb/lance.git", features = ["dynamodb"] } -lance-io = { "version" = "=0.31.0", tag="v0.31.0-beta.1", git="https://github.com/lancedb/lance.git" } -lance-index = { "version" = "=0.31.0", tag="v0.31.0-beta.1", git="https://github.com/lancedb/lance.git" } -lance-linalg = { "version" = "=0.31.0", tag="v0.31.0-beta.1", git="https://github.com/lancedb/lance.git" } -lance-table = { "version" = "=0.31.0", tag="v0.31.0-beta.1", git="https://github.com/lancedb/lance.git" } -lance-testing = { "version" = "=0.31.0", tag="v0.31.0-beta.1", git="https://github.com/lancedb/lance.git" } -lance-datafusion = { "version" = "=0.31.0", tag="v0.31.0-beta.1", git="https://github.com/lancedb/lance.git" } -lance-encoding = { "version" = "=0.31.0", tag="v0.31.0-beta.1", git="https://github.com/lancedb/lance.git" } +lance = { "version" = "=0.31.1", "tag" = "v0.31.1-beta.1", "git" = "https://github.com/lancedb/lance.git", features = [ + "dynamodb", +] } +lance-io = { "version" = "=0.31.1", "tag" = "v0.31.1-beta.1", "git" = "https://github.com/lancedb/lance.git" } +lance-index = { "version" = "=0.31.1", "tag" = "v0.31.1-beta.1", "git" = "https://github.com/lancedb/lance.git" } +lance-linalg = { "version" = "=0.31.1", "tag" = "v0.31.1-beta.1", "git" = "https://github.com/lancedb/lance.git" } +lance-table = { "version" = "=0.31.1", "tag" = "v0.31.1-beta.1", "git" = "https://github.com/lancedb/lance.git" } +lance-testing = { "version" = "=0.31.1", "tag" = "v0.31.1-beta.1", "git" = "https://github.com/lancedb/lance.git" } +lance-datafusion = { "version" = "=0.31.1", "tag" = "v0.31.1-beta.1", "git" = "https://github.com/lancedb/lance.git" } +lance-encoding = { "version" = "=0.31.1", "tag" = "v0.31.1-beta.1", "git" = "https://github.com/lancedb/lance.git" } # Note that this one does not include pyarrow arrow = { version = "55.1", optional = false } arrow-array = "55.1" @@ -39,14 +41,14 @@ arrow-schema = "55.1" arrow-arith = "55.1" arrow-cast = "55.1" async-trait = "0" -datafusion = { version = "47.0", default-features = false } -datafusion-catalog = "47.0" -datafusion-common = { version = "47.0", default-features = false } -datafusion-execution = "47.0" -datafusion-expr = "47.0" -datafusion-physical-plan = "47.0" +datafusion = { version = "48.0", default-features = false } +datafusion-catalog = "48.0" +datafusion-common = { version = "48.0", default-features = false } +datafusion-execution = "48.0" +datafusion-expr = "48.0" +datafusion-physical-plan = "48.0" env_logger = "0.11" -half = { "version" = "=2.5.0", default-features = false, features = [ +half = { "version" = "=2.6.0", default-features = false, features = [ "num-traits", ] } futures = "0" diff --git a/rust/lancedb/src/table/datafusion.rs b/rust/lancedb/src/table/datafusion.rs index 5a24d9ac..f136075e 100644 --- a/rust/lancedb/src/table/datafusion.rs +++ b/rust/lancedb/src/table/datafusion.rs @@ -392,9 +392,18 @@ pub mod tests { } else { expected_line.trim() }; - assert_eq!(&actual_trimmed[..expected_trimmed.len()], expected_trimmed); + assert_eq!( + &actual_trimmed[..expected_trimmed.len()], + expected_trimmed, + "\nactual:\n{physical_plan}\nexpected:\n{expected}" + ); } - assert_eq!(lines_checked, expected.lines().count()); + assert_eq!( + lines_checked, + expected.lines().count(), + "\nlines_checked:\n{lines_checked}\nexpected:\n{}", + expected.lines().count() + ); } } @@ -477,9 +486,9 @@ pub mod tests { TestFixture::check_plan( plan, "MetadataEraserExec - RepartitionExec:... CoalesceBatchesExec:... FilterExec: i@0 >= 5 + RepartitionExec:... ProjectionExec:... LanceScan:...", )