diff --git a/Cargo.lock b/Cargo.lock index 65f1326f..31529024 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -936,7 +936,7 @@ dependencies = [ [[package]] name = "datafusion" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "arrow-schema", @@ -989,7 +989,7 @@ dependencies = [ [[package]] name = "datafusion-catalog" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "async-trait", @@ -1013,7 +1013,7 @@ dependencies = [ [[package]] name = "datafusion-catalog-listing" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "async-trait", @@ -1036,7 +1036,7 @@ dependencies = [ [[package]] name = "datafusion-common" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "arrow-ipc", @@ -1062,7 +1062,7 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "futures", "log", @@ -1072,7 +1072,7 @@ dependencies = [ [[package]] name = "datafusion-datasource" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "async-compression", @@ -1108,7 +1108,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-arrow" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "arrow-ipc", @@ -1131,7 +1131,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-avro" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "arrow-avro", @@ -1154,7 +1154,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-csv" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "async-trait", @@ -1176,7 +1176,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-json" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "async-trait", @@ -1198,7 +1198,7 @@ dependencies = [ [[package]] name = "datafusion-datasource-parquet" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "arrow-schema", @@ -1229,12 +1229,12 @@ dependencies = [ [[package]] name = "datafusion-doc" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" [[package]] name = "datafusion-execution" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "arrow-buffer", @@ -1259,7 +1259,7 @@ dependencies = [ [[package]] name = "datafusion-expr" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "arrow-schema", @@ -1282,7 +1282,7 @@ dependencies = [ [[package]] name = "datafusion-expr-common" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "datafusion-common", @@ -1293,7 +1293,7 @@ dependencies = [ [[package]] name = "datafusion-functions" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "arrow-buffer", @@ -1325,7 +1325,7 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "arrow-select", @@ -1347,7 +1347,7 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate-common" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "datafusion-common", @@ -1358,7 +1358,7 @@ dependencies = [ [[package]] name = "datafusion-functions-nested" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "arrow-ord", @@ -1382,7 +1382,7 @@ dependencies = [ [[package]] name = "datafusion-functions-table" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "async-trait", @@ -1397,7 +1397,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "datafusion-common", @@ -1413,7 +1413,7 @@ dependencies = [ [[package]] name = "datafusion-functions-window-common" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "datafusion-common", "datafusion-physical-expr-common", @@ -1422,7 +1422,7 @@ dependencies = [ [[package]] name = "datafusion-macros" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "datafusion-doc", "quote", @@ -1432,7 +1432,7 @@ dependencies = [ [[package]] name = "datafusion-optimizer" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "chrono", @@ -1451,7 +1451,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "arrow-schema", @@ -1474,7 +1474,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-adapter" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "datafusion-common", @@ -1488,7 +1488,7 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "chrono", @@ -1505,7 +1505,7 @@ dependencies = [ [[package]] name = "datafusion-physical-optimizer" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "datafusion-common", @@ -1525,7 +1525,7 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "arrow-data", @@ -1562,7 +1562,7 @@ dependencies = [ [[package]] name = "datafusion-pruning" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "datafusion-common", @@ -1577,7 +1577,7 @@ dependencies = [ [[package]] name = "datafusion-session" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow-schema", "async-trait", @@ -1626,7 +1626,7 @@ dependencies = [ [[package]] name = "datafusion-spark" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "base64", @@ -1668,7 +1668,7 @@ dependencies = [ [[package]] name = "datafusion-sql" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "arrow-schema", @@ -1688,14 +1688,14 @@ dependencies = [ [[package]] name = "datafusion-sqllogictest" version = "56.0.0" -source = "git+https://github.com/apache/datafusion?branch=branch-56#3f197fe0bc6365756bb88ef2e51c01631da913ca" +source = "git+https://github.com/apache/datafusion?tag=56.0.0-rc2#7e7ae72a820e2bf87da1205b96639fba334ed2f7" dependencies = [ "arrow", "async-trait", "bigdecimal", "clap", "datafusion", - "datafusion-spark 56.0.0 (git+https://github.com/apache/datafusion?branch=branch-56)", + "datafusion-spark 56.0.0 (git+https://github.com/apache/datafusion?tag=56.0.0-rc2)", "futures", "half", "indicatif", diff --git a/Cargo.toml b/Cargo.toml index e02a721b..8c164b41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,17 +21,17 @@ arrow = { version = "60.0.0", features = ["prettyprint", "chrono-tz"] } bigdecimal = "0.4.8" chrono = { version = "0.4.45", default-features = false } criterion = "0.8" -datafusion = { git = "https://github.com/apache/datafusion", branch = "branch-56", default-features = false } -datafusion-common = { git = "https://github.com/apache/datafusion", branch = "branch-56", default-features = false } -datafusion-expr = { git = "https://github.com/apache/datafusion", branch = "branch-56", default-features = false } -datafusion-doc = { git = "https://github.com/apache/datafusion", branch = "branch-56" } -datafusion-functions = { git = "https://github.com/apache/datafusion", branch = "branch-56" } -datafusion-functions-aggregate = { git = "https://github.com/apache/datafusion", branch = "branch-56" } -datafusion-functions-aggregate-common = { git = "https://github.com/apache/datafusion", branch = "branch-56" } -datafusion-functions-nested = { git = "https://github.com/apache/datafusion", branch = "branch-56", default-features = false } -datafusion-macros = { git = "https://github.com/apache/datafusion", branch = "branch-56" } -datafusion-physical-expr-common = { git = "https://github.com/apache/datafusion", branch = "branch-56", default-features = false } -datafusion-session = { git = "https://github.com/apache/datafusion", branch = "branch-56" } +datafusion = { git = "https://github.com/apache/datafusion", tag = "56.0.0-rc2", default-features = false } +datafusion-common = { git = "https://github.com/apache/datafusion", tag = "56.0.0-rc2", default-features = false } +datafusion-expr = { git = "https://github.com/apache/datafusion", tag = "56.0.0-rc2", default-features = false } +datafusion-doc = { git = "https://github.com/apache/datafusion", tag = "56.0.0-rc2" } +datafusion-functions = { git = "https://github.com/apache/datafusion", tag = "56.0.0-rc2" } +datafusion-functions-aggregate = { git = "https://github.com/apache/datafusion", tag = "56.0.0-rc2" } +datafusion-functions-aggregate-common = { git = "https://github.com/apache/datafusion", tag = "56.0.0-rc2" } +datafusion-functions-nested = { git = "https://github.com/apache/datafusion", tag = "56.0.0-rc2", default-features = false } +datafusion-macros = { git = "https://github.com/apache/datafusion", tag = "56.0.0-rc2" } +datafusion-physical-expr-common = { git = "https://github.com/apache/datafusion", tag = "56.0.0-rc2", default-features = false } +datafusion-session = { git = "https://github.com/apache/datafusion", tag = "56.0.0-rc2" } log = "^0.4" num-traits = { version = "0.2" } rand = "0.9" diff --git a/crates/sqllogictest/Cargo.toml b/crates/sqllogictest/Cargo.toml index 57f8f306..71e2f684 100644 --- a/crates/sqllogictest/Cargo.toml +++ b/crates/sqllogictest/Cargo.toml @@ -19,7 +19,7 @@ workspace = true [dev-dependencies] datafusion = { workspace = true, default-features = true } datafusion-spark = { path = "../spark", features = ["core", "sql"] } -datafusion-sqllogictest = { git = "https://github.com/apache/datafusion", branch = "branch-56" } +datafusion-sqllogictest = { git = "https://github.com/apache/datafusion", tag = "56.0.0-rc2" } async-trait = "0.1" sqllogictest = "0.29.1" tokio = { workspace = true, features = ["rt-multi-thread"] } diff --git a/dev/release/README.md b/dev/release/README.md index 969b6f01..c6ac53ef 100644 --- a/dev/release/README.md +++ b/dev/release/README.md @@ -88,7 +88,7 @@ cargo semver-checks -p datafusion-spark --baseline-version ``` crates.io does not accept crates with git dependencies. During development `main` may depend on a -DataFusion git branch (for example `branch = "branch-56"`); before a release these must be changed to +DataFusion git branch or tag (for example `tag = "56.0.0-rc2"`); before a release these must be changed to the matching DataFusion release published on crates.io. ## Prerequisites