From 224b1d15cdda4d444b0aad07af6846856494f3dc Mon Sep 17 00:00:00 2001 From: yihong Date: Fri, 14 Feb 2025 01:23:29 +0800 Subject: [PATCH] chore: use the same version of chrono-tz (#5523) * fix: use the same version of chrono-tz Signed-off-by: yihong0618 * fix: address comments Signed-off-by: yihong0618 --------- Signed-off-by: yihong0618 --- Cargo.lock | 54 ++++---------------------------------- Cargo.toml | 1 + src/common/time/Cargo.toml | 2 +- src/pipeline/Cargo.toml | 2 +- 4 files changed, 8 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8d1440395b..e4091bcf53 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -313,7 +313,7 @@ dependencies = [ "arrow-data", "arrow-schema", "chrono", - "chrono-tz 0.10.1", + "chrono-tz", "half", "hashbrown 0.15.2", "num", @@ -1508,28 +1508,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "chrono-tz" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" -dependencies = [ - "chrono", - "chrono-tz-build 0.2.1", - "phf", -] - -[[package]] -name = "chrono-tz" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" -dependencies = [ - "chrono", - "chrono-tz-build 0.3.0", - "phf", -] - [[package]] name = "chrono-tz" version = "0.10.1" @@ -1537,32 +1515,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c6ac4f2c0bf0f44e9161aec9675e1050aa4a530663c4a9e37e108fa948bca9f" dependencies = [ "chrono", - "chrono-tz-build 0.4.0", + "chrono-tz-build", "phf", ] -[[package]] -name = "chrono-tz-build" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" -dependencies = [ - "parse-zoneinfo", - "phf", - "phf_codegen", -] - -[[package]] -name = "chrono-tz-build" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" -dependencies = [ - "parse-zoneinfo", - "phf", - "phf_codegen", -] - [[package]] name = "chrono-tz-build" version = "0.4.0" @@ -2425,7 +2381,7 @@ version = "0.12.0" dependencies = [ "arrow", "chrono", - "chrono-tz 0.8.6", + "chrono-tz", "common-error", "common-macro", "humantime", @@ -7885,7 +7841,7 @@ dependencies = [ "bytemuck", "bytes", "chrono", - "chrono-tz 0.10.1", + "chrono-tz", "fallible-streaming-iterator", "flate2", "futures", @@ -8380,7 +8336,7 @@ dependencies = [ "async-trait", "catalog", "chrono", - "chrono-tz 0.9.0", + "chrono-tz", "common-catalog", "common-error", "common-function", diff --git a/Cargo.toml b/Cargo.toml index b53f827e3e..4ed533acd2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -106,6 +106,7 @@ bitflags = "2.4.1" bytemuck = "1.12" bytes = { version = "1.7", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] } +chrono-tz = "0.10.1" clap = { version = "4.4", features = ["derive"] } config = "0.13.0" crossbeam-utils = "0.8" diff --git a/src/common/time/Cargo.toml b/src/common/time/Cargo.toml index 28ff40ff90..fcb471eb4e 100644 --- a/src/common/time/Cargo.toml +++ b/src/common/time/Cargo.toml @@ -10,7 +10,7 @@ workspace = true [dependencies] arrow.workspace = true chrono.workspace = true -chrono-tz = "0.8" +chrono-tz.workspace = true common-error.workspace = true common-macro.workspace = true humantime.workspace = true diff --git a/src/pipeline/Cargo.toml b/src/pipeline/Cargo.toml index 9c26d1a52f..ceb3a992b2 100644 --- a/src/pipeline/Cargo.toml +++ b/src/pipeline/Cargo.toml @@ -16,7 +16,7 @@ arrow.workspace = true async-trait.workspace = true catalog.workspace = true chrono.workspace = true -chrono-tz = "0.9.0" +chrono-tz.workspace = true common-catalog.workspace = true common-error.workspace = true common-function.workspace = true