-
Notifications
You must be signed in to change notification settings - Fork 169
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Support Ansi mode in abs function (#500)
* change proto msg * QueryPlanSerde with eval mode * Move eval mode * Add abs in planner * CometAbsFunc wrapper * Add error management * Add tests * Add license * spotless apply * format * Fix clippy * error msg for all spark versions * Fix benches * Use enum to ansi mode * Fix format * Add more tests * Format * Refactor * refactor * fix merge * fix merge
- Loading branch information
Showing
10 changed files
with
195 additions
and
30 deletions.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
// Licensed to the Apache Software Foundation (ASF) under one | ||
// or more contributor license agreements. See the NOTICE file | ||
// distributed with this work for additional information | ||
// regarding copyright ownership. The ASF licenses this file | ||
// to you 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 arrow::datatypes::DataType; | ||
use arrow_schema::ArrowError; | ||
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature}; | ||
use datafusion_common::DataFusionError; | ||
use datafusion_functions::math; | ||
use std::{any::Any, sync::Arc}; | ||
|
||
use crate::execution::operators::ExecutionError; | ||
|
||
use super::{arithmetic_overflow_error, EvalMode}; | ||
|
||
#[derive(Debug)] | ||
pub struct CometAbsFunc { | ||
inner_abs_func: Arc<dyn ScalarUDFImpl>, | ||
eval_mode: EvalMode, | ||
data_type_name: String, | ||
} | ||
|
||
impl CometAbsFunc { | ||
pub fn new(eval_mode: EvalMode, data_type_name: String) -> Result<Self, ExecutionError> { | ||
if let EvalMode::Legacy | EvalMode::Ansi = eval_mode { | ||
Ok(Self { | ||
inner_abs_func: math::abs().inner(), | ||
eval_mode, | ||
data_type_name, | ||
}) | ||
} else { | ||
Err(ExecutionError::GeneralError(format!( | ||
"Invalid EvalMode: \"{:?}\"", | ||
eval_mode | ||
))) | ||
} | ||
} | ||
} | ||
|
||
impl ScalarUDFImpl for CometAbsFunc { | ||
fn as_any(&self) -> &dyn Any { | ||
self | ||
} | ||
fn name(&self) -> &str { | ||
"abs" | ||
} | ||
|
||
fn signature(&self) -> &Signature { | ||
self.inner_abs_func.signature() | ||
} | ||
|
||
fn return_type(&self, arg_types: &[DataType]) -> Result<DataType, DataFusionError> { | ||
self.inner_abs_func.return_type(arg_types) | ||
} | ||
|
||
fn invoke(&self, args: &[ColumnarValue]) -> Result<ColumnarValue, DataFusionError> { | ||
match self.inner_abs_func.invoke(args) { | ||
Err(DataFusionError::ArrowError(ArrowError::ComputeError(msg), trace)) | ||
if msg.contains("overflow") => | ||
{ | ||
if self.eval_mode == EvalMode::Legacy { | ||
Ok(args[0].clone()) | ||
} else { | ||
let msg = arithmetic_overflow_error(&self.data_type_name).to_string(); | ||
Err(DataFusionError::ArrowError( | ||
ArrowError::ComputeError(msg), | ||
trace, | ||
)) | ||
} | ||
} | ||
other => other, | ||
} | ||
} | ||
} |
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
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 |
---|---|---|
|
@@ -480,6 +480,7 @@ message BitwiseNot { | |
|
||
message Abs { | ||
Expr child = 1; | ||
EvalMode eval_mode = 2; | ||
} | ||
|
||
message Subquery { | ||
|
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