diff --git a/CHANGELOG.md b/CHANGELOG.md index e0f5b12bd2..0b2b672fb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file documents the historical progress of the Micromegas project. For curre ## Unreleased +* **Dependencies:** + * Update DataFusion to 52.2 and remove LimitPushdown workaround (#809) * **Security:** * Fix minimatch ReDoS vulnerabilities across JS packages (Dependabot alerts #116–#123) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index ff607e8cef..65019c5449 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1316,9 +1316,9 @@ dependencies = [ [[package]] name = "datafusion" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d12ee9fdc6cdb5898c7691bb994f0ba606c4acc93a2258d78bb9f26ff8158bb3" +checksum = "503f1f4a9060ae6e650d3dff5dc7a21266fea1302d890768d45b4b28586e830f" dependencies = [ "arrow", "arrow-schema", @@ -1371,9 +1371,9 @@ dependencies = [ [[package]] name = "datafusion-catalog" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "462dc9ef45e5d688aeaae49a7e310587e81b6016b9d03bace5626ad0043e5a9e" +checksum = "14417a3ee4ae3d092b56cd6c1d32e8ff3e2c9ec130ecb2276ec91c89fd599399" dependencies = [ "arrow", "async-trait", @@ -1396,9 +1396,9 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b96dbf1d728fc321817b744eb5080cdd75312faa6980b338817f68f3caa4208" +checksum = "9d0eba824adb45a4b3ac6f0251d40df3f6a9382371cad136f4f14ac9ebc6bc10" dependencies = [ "arrow", "async-trait", @@ -1419,9 +1419,9 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3237a6ff0d2149af4631290074289cae548c9863c885d821315d54c6673a074a" +checksum = "0039deefbd00c56adf5168b7ca58568fb058e4ba4c5a03b09f8be371b4e434b6" dependencies = [ "ahash", "arrow", @@ -1443,9 +1443,9 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b5e34026af55a1bfccb1ef0a763cf1f64e77c696ffcf5a128a278c31236528" +checksum = "1ec7e3e60b813048331f8fb9673583173e5d2dd8fef862834ee871fc98b57ca7" dependencies = [ "futures", "log", @@ -1454,9 +1454,9 @@ dependencies = [ [[package]] name = "datafusion-datasource" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b2a6be734cc3785e18bbf2a7f2b22537f6b9fb960d79617775a51568c281842" +checksum = "802068957f620302ecf05f84ff4019601aeafd36f5f3f1334984af2e34265129" dependencies = [ "arrow", "async-compression", @@ -1489,9 +1489,9 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1739b9b07c9236389e09c74f770e88aff7055250774e9def7d3f4f56b3dcc7be" +checksum = "90fc387d5067c62d494a6647d29c5ad4fcdd5a6e50ab4ea1d2568caa2d66f2cc" dependencies = [ "arrow", "arrow-ipc", @@ -1513,9 +1513,9 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c73bc54b518bbba7c7650299d07d58730293cfba4356f6f428cc94c20b7600" +checksum = "efd5e20579bb6c8bd4e6c620253972fb723822030c280dd6aa047f660d09eeba" dependencies = [ "arrow", "async-trait", @@ -1536,9 +1536,9 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37812c8494c698c4d889374ecfabbff780f1f26d9ec095dd1bddfc2a8ca12559" +checksum = "c0788b0d48fcef31880a02013ea3cc18e5a4e0eacc3b0abdd2cd0597b99dc96e" dependencies = [ "arrow", "async-trait", @@ -1558,9 +1558,9 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2210937ecd9f0e824c397e73f4b5385c97cd1aff43ab2b5836fcfd2d321523fb" +checksum = "66639b70f1f363f5f0950733170100e588f1acfacac90c1894e231194aa35957" dependencies = [ "arrow", "async-trait", @@ -1588,15 +1588,15 @@ dependencies = [ [[package]] name = "datafusion-doc" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c825f969126bc2ef6a6a02d94b3c07abff871acf4d6dd759ce1255edb7923ce" +checksum = "e44b41f3e8267c6cf3eec982d63f34db9f1dd5f30abfd2e1f124f0871708952e" [[package]] name = "datafusion-execution" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa03ef05a2c2f90dd6c743e3e111078e322f4b395d20d4b4d431a245d79521ae" +checksum = "9e456f60e5d38db45335e84617006d90af14a8c8c5b8e959add708b2daaa0e2c" dependencies = [ "arrow", "async-trait", @@ -1615,9 +1615,9 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef33934c1f98ee695cc51192cc5f9ed3a8febee84fdbcd9131bf9d3a9a78276f" +checksum = "6507c719804265a58043134580c1c20767e7c23ba450724393f03ec982769ad9" dependencies = [ "arrow", "async-trait", @@ -1638,9 +1638,9 @@ dependencies = [ [[package]] name = "datafusion-expr-common" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000c98206e3dd47d2939a94b6c67af4bfa6732dd668ac4fafdbde408fd9134ea" +checksum = "a413caa9c5885072b539337aed68488f0291653e8edd7d676c92df2480f6cab0" dependencies = [ "arrow", "datafusion-common", @@ -1651,9 +1651,9 @@ dependencies = [ [[package]] name = "datafusion-functions" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379b01418ab95ca947014066248c22139fe9af9289354de10b445bd000d5d276" +checksum = "189256495dc9cbbb8e20dbcf161f60422e628d201a78df8207e44bd4baefadb6" dependencies = [ "arrow", "arrow-buffer", @@ -1682,9 +1682,9 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd00d5454ba4c3f8ebbd04bd6a6a9dc7ced7c56d883f70f2076c188be8459e4c" +checksum = "12e73dfee4cd67c4a507ffff4c5a711d39983adf544adbc09c09bf06f789f413" dependencies = [ "ahash", "arrow", @@ -1703,9 +1703,9 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aec06b380729a87210a4e11f555ec2d729a328142253f8d557b87593622ecc9f" +checksum = "87727bd9e65f4f9ac6d608c9810b7da9eaa3b18b26a4a4b76520592d49020acf" dependencies = [ "ahash", "arrow", @@ -1716,9 +1716,9 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904f48d45e0f1eb7d0eb5c0f80f2b5c6046a85454364a6b16a2e0b46f62e7dff" +checksum = "2e5ef761359224b7c2b5a1bfad6296ac63225f8583d08ad18af9ba1a89ac3887" dependencies = [ "arrow", "arrow-ord", @@ -1739,9 +1739,9 @@ dependencies = [ [[package]] name = "datafusion-functions-table" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a0d20e2b887e11bee24f7734d780a2588b925796ac741c3118dd06d5aa77f0" +checksum = "3b17dac25dfda2d2a90ff0ad1c054a11fb1523766226bec6e9bd8c410daee2ae" dependencies = [ "arrow", "async-trait", @@ -1755,9 +1755,9 @@ dependencies = [ [[package]] name = "datafusion-functions-window" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3414b0a07e39b6979fe3a69c7aa79a9f1369f1d5c8e52146e66058be1b285ee" +checksum = "c594a29ddb22cbdbce500e4d99b5b2392c5cecb4c1086298b41d1ffec14dbb77" dependencies = [ "arrow", "datafusion-common", @@ -1773,9 +1773,9 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf2feae63cd4754e31add64ce75cae07d015bce4bb41cd09872f93add32523a" +checksum = "9aa1b15ed81c7543f62264a30dd49dec4b1b0b698053b968f53be32dfba4f729" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -1783,9 +1783,9 @@ dependencies = [ [[package]] name = "datafusion-macros" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4fe888aeb6a095c4bcbe8ac1874c4b9a4c7ffa2ba849db7922683ba20875aaf" +checksum = "c00c31c4795597aa25b74cab5174ac07a53051f27ce1e011ecaffa9eaeecef81" dependencies = [ "datafusion-doc", "quote", @@ -1794,9 +1794,9 @@ dependencies = [ [[package]] name = "datafusion-optimizer" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6527c063ae305c11be397a86d8193936f4b84d137fe40bd706dfc178cf733c" +checksum = "80ccf60767c09302b2e0fc3afebb3761a6d508d07316fab8c5e93312728a21bb" dependencies = [ "arrow", "chrono", @@ -1814,9 +1814,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb028323dd4efd049dd8a78d78fe81b2b969447b39c51424167f973ac5811d9" +checksum = "c64b7f277556944e4edd3558da01d9e9ff9f5416f1c0aa7fee088e57bd141a7e" dependencies = [ "ahash", "arrow", @@ -1838,9 +1838,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78fe0826aef7eab6b4b61533d811234a7a9e5e458331ebbf94152a51fc8ab433" +checksum = "b7abaee372ea2d19c016ee9ef8629c4415257d291cdd152bc7f0b75f28af1b63" dependencies = [ "arrow", "datafusion-common", @@ -1853,9 +1853,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfccd388620734c661bd8b7ca93c44cdd59fecc9b550eea416a78ffcbb29475f" +checksum = "42237efe621f92adc22d111b531fdbc2cc38ca9b5e02327535628fb103ae2157" dependencies = [ "ahash", "arrow", @@ -1870,9 +1870,9 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde5fa10e73259a03b705d5fddc136516814ab5f441b939525618a4070f5a059" +checksum = "fd093498bd1319c6e5c76e9dfa905e78486f01b34579ce97f2e3a49f84c37fac" dependencies = [ "arrow", "datafusion-common", @@ -1889,9 +1889,9 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1098760fb29127c24cc9ade3277051dc73c9ed0ac0131bd7bcd742e0ad7470" +checksum = "7cbe61b12daf81a9f20ba03bd3541165d51f86e004ef37426b11881330eed261" dependencies = [ "ahash", "arrow", @@ -1920,9 +1920,9 @@ dependencies = [ [[package]] name = "datafusion-pruning" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d0fef4201777b52951edec086c21a5b246f3c82621569ddb4a26f488bc38a9" +checksum = "0124331116db7f79df92ebfd2c3b11a8f90240f253555c9bb084f10b6fecf1dd" dependencies = [ "arrow", "datafusion-common", @@ -1937,9 +1937,9 @@ dependencies = [ [[package]] name = "datafusion-session" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71f1e39e8f2acbf1c63b0e93756c2e970a64729dab70ac789587d6237c4fde0" +checksum = "1673e3c58ba618a6ea0568672f00664087b8982c581e9afd5aa6c3c79c9b431f" dependencies = [ "async-trait", "datafusion-common", @@ -1951,9 +1951,9 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44693cfcaeb7a9f12d71d1c576c3a6dc025a12cef209375fa2d16fb3b5670ee" +checksum = "5272d256dab5347bb39d2040589f45d8c6b715b27edcb5fffe88cc8b9c3909cb" dependencies = [ "arrow", "bigdecimal", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 00c009274d..cafa5ed933 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -42,7 +42,7 @@ ciborium = "0.2.2" clap = { version = "4", features = ["derive", "env"] } colored = { version = "3" } ctrlc = "3.2.0" -datafusion = "52.1" +datafusion = "52.2" futures = "0.3" hmac = "0.12" http = "1.1" diff --git a/rust/datafusion-wasm/Cargo.lock b/rust/datafusion-wasm/Cargo.lock index cda654e716..f04bf61a3c 100644 --- a/rust/datafusion-wasm/Cargo.lock +++ b/rust/datafusion-wasm/Cargo.lock @@ -720,9 +720,9 @@ dependencies = [ [[package]] name = "datafusion" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d12ee9fdc6cdb5898c7691bb994f0ba606c4acc93a2258d78bb9f26ff8158bb3" +checksum = "503f1f4a9060ae6e650d3dff5dc7a21266fea1302d890768d45b4b28586e830f" dependencies = [ "arrow", "arrow-schema", @@ -775,9 +775,9 @@ dependencies = [ [[package]] name = "datafusion-catalog" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "462dc9ef45e5d688aeaae49a7e310587e81b6016b9d03bace5626ad0043e5a9e" +checksum = "14417a3ee4ae3d092b56cd6c1d32e8ff3e2c9ec130ecb2276ec91c89fd599399" dependencies = [ "arrow", "async-trait", @@ -800,9 +800,9 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b96dbf1d728fc321817b744eb5080cdd75312faa6980b338817f68f3caa4208" +checksum = "9d0eba824adb45a4b3ac6f0251d40df3f6a9382371cad136f4f14ac9ebc6bc10" dependencies = [ "arrow", "async-trait", @@ -823,9 +823,9 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3237a6ff0d2149af4631290074289cae548c9863c885d821315d54c6673a074a" +checksum = "0039deefbd00c56adf5168b7ca58568fb058e4ba4c5a03b09f8be371b4e434b6" dependencies = [ "ahash", "arrow", @@ -847,9 +847,9 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b5e34026af55a1bfccb1ef0a763cf1f64e77c696ffcf5a128a278c31236528" +checksum = "1ec7e3e60b813048331f8fb9673583173e5d2dd8fef862834ee871fc98b57ca7" dependencies = [ "futures", "log", @@ -858,9 +858,9 @@ dependencies = [ [[package]] name = "datafusion-datasource" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b2a6be734cc3785e18bbf2a7f2b22537f6b9fb960d79617775a51568c281842" +checksum = "802068957f620302ecf05f84ff4019601aeafd36f5f3f1334984af2e34265129" dependencies = [ "arrow", "async-compression", @@ -893,9 +893,9 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1739b9b07c9236389e09c74f770e88aff7055250774e9def7d3f4f56b3dcc7be" +checksum = "90fc387d5067c62d494a6647d29c5ad4fcdd5a6e50ab4ea1d2568caa2d66f2cc" dependencies = [ "arrow", "arrow-ipc", @@ -917,9 +917,9 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c73bc54b518bbba7c7650299d07d58730293cfba4356f6f428cc94c20b7600" +checksum = "efd5e20579bb6c8bd4e6c620253972fb723822030c280dd6aa047f660d09eeba" dependencies = [ "arrow", "async-trait", @@ -940,9 +940,9 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37812c8494c698c4d889374ecfabbff780f1f26d9ec095dd1bddfc2a8ca12559" +checksum = "c0788b0d48fcef31880a02013ea3cc18e5a4e0eacc3b0abdd2cd0597b99dc96e" dependencies = [ "arrow", "async-trait", @@ -962,9 +962,9 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2210937ecd9f0e824c397e73f4b5385c97cd1aff43ab2b5836fcfd2d321523fb" +checksum = "66639b70f1f363f5f0950733170100e588f1acfacac90c1894e231194aa35957" dependencies = [ "arrow", "async-trait", @@ -992,15 +992,15 @@ dependencies = [ [[package]] name = "datafusion-doc" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c825f969126bc2ef6a6a02d94b3c07abff871acf4d6dd759ce1255edb7923ce" +checksum = "e44b41f3e8267c6cf3eec982d63f34db9f1dd5f30abfd2e1f124f0871708952e" [[package]] name = "datafusion-execution" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa03ef05a2c2f90dd6c743e3e111078e322f4b395d20d4b4d431a245d79521ae" +checksum = "9e456f60e5d38db45335e84617006d90af14a8c8c5b8e959add708b2daaa0e2c" dependencies = [ "arrow", "async-trait", @@ -1019,9 +1019,9 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef33934c1f98ee695cc51192cc5f9ed3a8febee84fdbcd9131bf9d3a9a78276f" +checksum = "6507c719804265a58043134580c1c20767e7c23ba450724393f03ec982769ad9" dependencies = [ "arrow", "async-trait", @@ -1042,9 +1042,9 @@ dependencies = [ [[package]] name = "datafusion-expr-common" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000c98206e3dd47d2939a94b6c67af4bfa6732dd668ac4fafdbde408fd9134ea" +checksum = "a413caa9c5885072b539337aed68488f0291653e8edd7d676c92df2480f6cab0" dependencies = [ "arrow", "datafusion-common", @@ -1055,9 +1055,9 @@ dependencies = [ [[package]] name = "datafusion-functions" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379b01418ab95ca947014066248c22139fe9af9289354de10b445bd000d5d276" +checksum = "189256495dc9cbbb8e20dbcf161f60422e628d201a78df8207e44bd4baefadb6" dependencies = [ "arrow", "arrow-buffer", @@ -1086,9 +1086,9 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd00d5454ba4c3f8ebbd04bd6a6a9dc7ced7c56d883f70f2076c188be8459e4c" +checksum = "12e73dfee4cd67c4a507ffff4c5a711d39983adf544adbc09c09bf06f789f413" dependencies = [ "ahash", "arrow", @@ -1107,9 +1107,9 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aec06b380729a87210a4e11f555ec2d729a328142253f8d557b87593622ecc9f" +checksum = "87727bd9e65f4f9ac6d608c9810b7da9eaa3b18b26a4a4b76520592d49020acf" dependencies = [ "ahash", "arrow", @@ -1120,9 +1120,9 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904f48d45e0f1eb7d0eb5c0f80f2b5c6046a85454364a6b16a2e0b46f62e7dff" +checksum = "2e5ef761359224b7c2b5a1bfad6296ac63225f8583d08ad18af9ba1a89ac3887" dependencies = [ "arrow", "arrow-ord", @@ -1143,9 +1143,9 @@ dependencies = [ [[package]] name = "datafusion-functions-table" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a0d20e2b887e11bee24f7734d780a2588b925796ac741c3118dd06d5aa77f0" +checksum = "3b17dac25dfda2d2a90ff0ad1c054a11fb1523766226bec6e9bd8c410daee2ae" dependencies = [ "arrow", "async-trait", @@ -1159,9 +1159,9 @@ dependencies = [ [[package]] name = "datafusion-functions-window" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3414b0a07e39b6979fe3a69c7aa79a9f1369f1d5c8e52146e66058be1b285ee" +checksum = "c594a29ddb22cbdbce500e4d99b5b2392c5cecb4c1086298b41d1ffec14dbb77" dependencies = [ "arrow", "datafusion-common", @@ -1177,9 +1177,9 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf2feae63cd4754e31add64ce75cae07d015bce4bb41cd09872f93add32523a" +checksum = "9aa1b15ed81c7543f62264a30dd49dec4b1b0b698053b968f53be32dfba4f729" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -1187,9 +1187,9 @@ dependencies = [ [[package]] name = "datafusion-macros" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4fe888aeb6a095c4bcbe8ac1874c4b9a4c7ffa2ba849db7922683ba20875aaf" +checksum = "c00c31c4795597aa25b74cab5174ac07a53051f27ce1e011ecaffa9eaeecef81" dependencies = [ "datafusion-doc", "quote", @@ -1198,9 +1198,9 @@ dependencies = [ [[package]] name = "datafusion-optimizer" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6527c063ae305c11be397a86d8193936f4b84d137fe40bd706dfc178cf733c" +checksum = "80ccf60767c09302b2e0fc3afebb3761a6d508d07316fab8c5e93312728a21bb" dependencies = [ "arrow", "chrono", @@ -1218,9 +1218,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb028323dd4efd049dd8a78d78fe81b2b969447b39c51424167f973ac5811d9" +checksum = "c64b7f277556944e4edd3558da01d9e9ff9f5416f1c0aa7fee088e57bd141a7e" dependencies = [ "ahash", "arrow", @@ -1242,9 +1242,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78fe0826aef7eab6b4b61533d811234a7a9e5e458331ebbf94152a51fc8ab433" +checksum = "b7abaee372ea2d19c016ee9ef8629c4415257d291cdd152bc7f0b75f28af1b63" dependencies = [ "arrow", "datafusion-common", @@ -1257,9 +1257,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfccd388620734c661bd8b7ca93c44cdd59fecc9b550eea416a78ffcbb29475f" +checksum = "42237efe621f92adc22d111b531fdbc2cc38ca9b5e02327535628fb103ae2157" dependencies = [ "ahash", "arrow", @@ -1274,9 +1274,9 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde5fa10e73259a03b705d5fddc136516814ab5f441b939525618a4070f5a059" +checksum = "fd093498bd1319c6e5c76e9dfa905e78486f01b34579ce97f2e3a49f84c37fac" dependencies = [ "arrow", "datafusion-common", @@ -1293,9 +1293,9 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1098760fb29127c24cc9ade3277051dc73c9ed0ac0131bd7bcd742e0ad7470" +checksum = "7cbe61b12daf81a9f20ba03bd3541165d51f86e004ef37426b11881330eed261" dependencies = [ "ahash", "arrow", @@ -1324,9 +1324,9 @@ dependencies = [ [[package]] name = "datafusion-pruning" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d0fef4201777b52951edec086c21a5b246f3c82621569ddb4a26f488bc38a9" +checksum = "0124331116db7f79df92ebfd2c3b11a8f90240f253555c9bb084f10b6fecf1dd" dependencies = [ "arrow", "datafusion-common", @@ -1341,9 +1341,9 @@ dependencies = [ [[package]] name = "datafusion-session" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71f1e39e8f2acbf1c63b0e93756c2e970a64729dab70ac789587d6237c4fde0" +checksum = "1673e3c58ba618a6ea0568672f00664087b8982c581e9afd5aa6c3c79c9b431f" dependencies = [ "async-trait", "datafusion-common", @@ -1355,9 +1355,9 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "52.1.0" +version = "52.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44693cfcaeb7a9f12d71d1c576c3a6dc025a12cef209375fa2d16fb3b5670ee" +checksum = "5272d256dab5347bb39d2040589f45d8c6b715b27edcb5fffe88cc8b9c3909cb" dependencies = [ "arrow", "bigdecimal", @@ -3344,7 +3344,6 @@ dependencies = [ "cfg-if", "libc", "psm", - "windows-sys 0.52.0", "windows-sys 0.59.0", ] diff --git a/rust/datafusion-wasm/Cargo.toml b/rust/datafusion-wasm/Cargo.toml index 99f503b0fa..1efb7e1725 100644 --- a/rust/datafusion-wasm/Cargo.toml +++ b/rust/datafusion-wasm/Cargo.toml @@ -17,7 +17,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] arrow = { version = "57.3", default-features = false, features = ["ipc"] } chrono = { version = "0.4", default-features = false, features = ["wasmbind"] } -datafusion = { version = "52.1", default-features = false, features = ["nested_expressions", "sql"] } +datafusion = { version = "52.2", default-features = false, features = ["nested_expressions", "sql"] } getrandom = { version = "0.3", features = ["wasm_js"] } micromegas-datafusion-extensions = { path = "../datafusion-extensions", version = "^0.22" } micromegas-telemetry-sink = { path = "../telemetry-sink", version = "^0.22", default-features = false } diff --git a/rust/datafusion-wasm/src/lib.rs b/rust/datafusion-wasm/src/lib.rs index e7f1393d2b..b632fd4373 100644 --- a/rust/datafusion-wasm/src/lib.rs +++ b/rust/datafusion-wasm/src/lib.rs @@ -4,9 +4,6 @@ use arrow::array::RecordBatch; use arrow::datatypes::Schema; use arrow::ipc::reader::StreamReader; use arrow::ipc::writer::StreamWriter; -use datafusion::execution::SessionStateBuilder; -use datafusion::physical_optimizer::PhysicalOptimizerRule; -use datafusion::physical_optimizer::optimizer::PhysicalOptimizer; use datafusion::prelude::*; use micromegas_tracing::prelude::*; use wasm_bindgen::prelude::*; @@ -42,28 +39,8 @@ impl WasmQueryEngine { ensure_tracing(); info!("WasmQueryEngine created"); - // Work around a DataFusion 52.1 bug where the LimitPushdown physical - // optimizer rule removes GlobalLimitExec without actually pushing the - // fetch into DataSourceExec, causing LIMIT to be silently ignored. - // Fixed upstream in https://github.com/apache/datafusion/pull/20048 - // but not yet released. - // TODO: remove after upgrading DataFusion past 52.1 - // https://github.com/madesroches/micromegas/issues/809 - let filtered_rules = PhysicalOptimizer::default() - .rules - .into_iter() - .filter(|rule: &Arc| { - rule.name() != "LimitPushdown" - }) - .collect::>(); - - let config = SessionConfig::default().with_information_schema(true); - let state = SessionStateBuilder::new() - .with_config(config) - .with_default_features() - .with_physical_optimizer_rules(filtered_rules) - .build(); - let ctx = SessionContext::new_with_state(state); + let ctx = + SessionContext::new_with_config(SessionConfig::default().with_information_schema(true)); micromegas_datafusion_extensions::register_extension_udfs(&ctx); Self { ctx } }