resolve conflicts

databendlabs · Nov 20, 2024 · 1fc79bf · 1fc79bf
1 parent b55c6c0
commit 1fc79bf
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/query/expression/src/types/date.rs b/src/query/expression/src/types/date.rs
@@ -17,8 +17,6 @@ use std::fmt::Display;
 use std::io::Cursor;
 use std::ops::Range;
 
-use chrono::NaiveDate;
-use chrono_tz::Tz;
 use databend_common_column::buffer::Buffer;
 use databend_common_exception::ErrorCode;
 use databend_common_io::cursor_ext::BufferReadDateTimeExt;

diff --git a/src/query/expression/src/types/timestamp.rs b/src/query/expression/src/types/timestamp.rs
@@ -17,8 +17,6 @@ use std::fmt::Display;
 use std::io::Cursor;
 use std::ops::Range;
 
-use chrono::DateTime;
-use chrono_tz::Tz;
 use databend_common_column::buffer::Buffer;
 use databend_common_exception::ErrorCode;
 use databend_common_io::cursor_ext::BufferReadDateTimeExt;

diff --git a/src/query/formats/src/field_encoder/values.rs b/src/query/formats/src/field_encoder/values.rs
@@ -42,7 +42,6 @@ use databend_common_io::geo_to_wkb;
 use databend_common_io::geo_to_wkt;
 use databend_common_io::GeometryDataType;
 use geozero::wkb::Ewkb;
-
 use jiff::tz::TimeZone;
 use lexical_core::ToLexical;
 use micromarshal::Marshal;

diff --git a/src/query/functions/src/scalars/variant.rs b/src/query/functions/src/scalars/variant.rs
@@ -44,7 +44,6 @@ use databend_common_expression::types::StringType;
 use databend_common_expression::types::TimestampType;
 use databend_common_expression::types::VariantType;
 use databend_common_expression::types::ALL_NUMERICS_TYPES;
-use databend_common_expression::utils::serialize::EPOCH_DAYS_FROM_CE;
 use databend_common_expression::vectorize_1_arg;
 use databend_common_expression::vectorize_with_builder_1_arg;
 use databend_common_expression::vectorize_with_builder_2_arg;