-
Notifications
You must be signed in to change notification settings - Fork 753
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add toStartOfWeek #1942
Merged
Merged
add toStartOfWeek #1942
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,190 @@ | ||
| // Copyright 2020 Datafuse Labs. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| use std::fmt; | ||
| use std::marker::PhantomData; | ||
| use std::ops::Sub; | ||
|
|
||
| use common_datavalues::chrono::DateTime; | ||
| use common_datavalues::chrono::Datelike; | ||
| use common_datavalues::chrono::Duration; | ||
| use common_datavalues::chrono::TimeZone; | ||
| use common_datavalues::chrono::Utc; | ||
| use common_datavalues::prelude::*; | ||
| use common_exception::ErrorCode; | ||
| use common_exception::Result; | ||
|
|
||
| use crate::scalars::Function; | ||
|
|
||
| #[derive(Clone, Debug)] | ||
| pub struct WeekFunction<T, R> { | ||
| display_name: String, | ||
| t: PhantomData<T>, | ||
| r: PhantomData<R>, | ||
| } | ||
|
|
||
| pub trait WeekResultFunction<R> { | ||
| fn return_type() -> Result<DataType>; | ||
| fn to_number(_value: DateTime<Utc>, mode: Option<u64>) -> R; | ||
| fn to_constant_value(_value: DateTime<Utc>, mode: Option<u64>) -> DataValue; | ||
| } | ||
|
|
||
| #[derive(Clone)] | ||
| pub struct ToStartOfWeek; | ||
|
|
||
| impl WeekResultFunction<u32> for ToStartOfWeek { | ||
| fn return_type() -> Result<DataType> { | ||
| Ok(DataType::Date16) | ||
| } | ||
| fn to_number(value: DateTime<Utc>, mode: Option<u64>) -> u32 { | ||
| let week_mode = mode.unwrap_or(0); | ||
| let mut weekday = value.weekday().number_from_monday(); | ||
| if (week_mode & 1) == 0 { | ||
| weekday = value.weekday().number_from_sunday(); | ||
| } | ||
| weekday -= 1; | ||
| let duration = Duration::days(weekday as i64); | ||
| let result = value.sub(duration); | ||
| get_day(result) | ||
| } | ||
|
|
||
| fn to_constant_value(value: DateTime<Utc>, mode: Option<u64>) -> DataValue { | ||
| DataValue::UInt16(Some(Self::to_number(value, mode) as u16)) | ||
| } | ||
| } | ||
|
|
||
| impl<T, R> WeekFunction<T, R> | ||
| where | ||
| T: WeekResultFunction<R> + Clone + Sync + Send + 'static, | ||
| R: DFPrimitiveType + Clone, | ||
| DFPrimitiveArray<R>: IntoSeries, | ||
| { | ||
| pub fn try_create(display_name: &str) -> Result<Box<dyn Function>> { | ||
| Ok(Box::new(WeekFunction::<T, R> { | ||
| display_name: display_name.to_string(), | ||
| t: PhantomData, | ||
| r: PhantomData, | ||
| })) | ||
| } | ||
| } | ||
|
|
||
| impl<T, R> Function for WeekFunction<T, R> | ||
| where | ||
| T: WeekResultFunction<R> + Clone + Sync + Send, | ||
| R: DFPrimitiveType + Clone, | ||
| DFPrimitiveArray<R>: IntoSeries, | ||
| { | ||
| fn name(&self) -> &str { | ||
| self.display_name.as_str() | ||
| } | ||
|
|
||
| fn return_type(&self, _args: &[DataType]) -> Result<DataType> { | ||
| T::return_type() | ||
| } | ||
|
|
||
| fn variadic_arguments(&self) -> Option<(usize, usize)> { | ||
| Some((1, 2)) | ||
| } | ||
|
|
||
| fn nullable(&self, _input_schema: &DataSchema) -> Result<bool> { | ||
| Ok(false) | ||
| } | ||
|
|
||
| fn eval(&self, columns: &DataColumnsWithField, input_rows: usize) -> Result<DataColumn> { | ||
| let data_type = columns[0].data_type(); | ||
| let mut mode: Option<u64> = None; | ||
| if columns.len() == 2 && !columns[1].column().is_empty() { | ||
| let week_mode = columns[1].column().to_values()?[0].clone().as_u64()?; | ||
| if !(0..=9).contains(&week_mode) { | ||
| return Err(ErrorCode::BadArguments(format!( | ||
| "The parameter:{} range is abnormal, it should be between 0-9", | ||
| week_mode | ||
| ))); | ||
| } | ||
| mode = Some(week_mode); | ||
| } | ||
| let number_array: DataColumn = match data_type { | ||
| DataType::Date16 => { | ||
| if let DataColumn::Constant(v, _) = columns[0].column() { | ||
| let date_time = Utc.timestamp(v.as_u64()? as i64 * 24 * 3600, 0_u32); | ||
| let constant_result = T::to_constant_value(date_time, mode); | ||
| Ok(DataColumn::Constant(constant_result, input_rows)) | ||
| } else { | ||
| let result: DFPrimitiveArray<R> = columns[0].column() | ||
| .to_array()? | ||
| .u16()? | ||
| .apply_cast_numeric(|v| { | ||
| let date_time = Utc.timestamp(v as i64 * 24 * 3600, 0_u32); | ||
| T::to_number(date_time, mode) | ||
| } | ||
| ); | ||
| Ok(result.into()) | ||
| } | ||
| }, | ||
| DataType::Date32 => { | ||
| if let DataColumn::Constant(v, _) = columns[0].column() { | ||
| let date_time = Utc.timestamp(v.as_u64()? as i64 * 24 * 3600, 0_u32); | ||
| let constant_result = T::to_constant_value(date_time, mode); | ||
| Ok(DataColumn::Constant(constant_result, input_rows)) | ||
| } else { | ||
| let result = columns[0].column() | ||
| .to_array()? | ||
| .u32()? | ||
| .apply_cast_numeric(|v| { | ||
| let date_time = Utc.timestamp(v as i64 * 24 * 3600, 0_u32); | ||
| T::to_number(date_time, mode) | ||
| } | ||
| ); | ||
| Ok(result.into()) | ||
| } | ||
| }, | ||
| DataType::DateTime32(_) => { | ||
| if let DataColumn::Constant(v, _) = columns[0].column() { | ||
| let date_time = Utc.timestamp(v.as_u64()? as i64, 0_u32); | ||
| let constant_result = T::to_constant_value(date_time, mode); | ||
| Ok(DataColumn::Constant(constant_result, input_rows)) | ||
| } else { | ||
| let result = columns[0].column() | ||
| .to_array()? | ||
| .u32()? | ||
| .apply_cast_numeric(|v| { | ||
| let date_time = Utc.timestamp(v as i64, 0_u32); | ||
| T::to_number(date_time, mode) | ||
| } | ||
| ); | ||
| Ok(result.into()) | ||
| } | ||
| }, | ||
| other => Result::Err(ErrorCode::IllegalDataType(format!( | ||
| "Illegal type {:?} of argument of function {}.Should be a date16/data32 or a dateTime32", | ||
| other, | ||
| self.name()))), | ||
| }?; | ||
| Ok(number_array) | ||
| } | ||
| } | ||
|
|
||
| impl<T, R> fmt::Display for WeekFunction<T, R> { | ||
| fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { | ||
| write!(f, "{}()", self.display_name) | ||
| } | ||
| } | ||
|
|
||
| fn get_day(date: DateTime<Utc>) -> u32 { | ||
| let start: DateTime<Utc> = Utc.ymd(1970, 1, 1).and_hms(0, 0, 0); | ||
| let duration = date.signed_duration_since(start); | ||
| duration.num_days() as u32 | ||
| } | ||
|
|
||
| pub type ToStartOfWeekFunction = WeekFunction<ToStartOfWeek, u32>; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If week_mode is 1,should use monday first?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
my mistake
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I find clickhouse doc, if week_mode is 1,First day of week is Monday. https://clickhouse.com/docs/zh/sql-reference/functions/date-time-functions/#toweekdatemode
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So this should be like:
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shouldn't I have 1 in the code? This is magic number?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, just a little weird.
Default weekday should be
number_from_sundaybecause of the week_mode defaults to 0.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand.I will modify it right away