Skip to content

[enhancement](function) floor/ceil/round/round_bankers can use column as scale argument #34391

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.

Sign up for GitHub

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

Merged
yiguolei merged 7 commits into from
May 6, 2024
Merged

[enhancement](function) floor/ceil/round/round_bankers can use column as scale argument #34391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6b562b1
init
superdiaodiao Apr 26, 2024
b20d635
add be code
superdiaodiao Apr 27, 2024
99d7fa8
suit fe code
superdiaodiao May 4, 2024
3d838af
add reg, fmt, fix, opt
superdiaodiao May 4, 2024
cbd0f2e
opt
superdiaodiao May 5, 2024
262d824
opt execute_impl
superdiaodiao May 5, 2024
246a386
fix execute_impl
superdiaodiao May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
245 changes: 0 additions & 245 deletions be/src/vec/functions/function_truncate.h
View file
Open in desktop

This file was deleted.

97 changes: 2 additions & 95 deletions be/src/vec/functions/math.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,20 @@
// specific language governing permissions and limitations
// under the License.

#include <stdint.h>
#include <string.h>
#include <cstdint>
#include <cstring>

#include <boost/iterator/iterator_facade.hpp>
// IWYU pragma: no_include <bits/std_abs.h>
#include <algorithm>
#include <cmath>
#include <memory>
#include <string>
#include <type_traits>
#include <utility>

#include "common/status.h"
#include "vec/aggregate_functions/aggregate_function.h"
#include "vec/columns/column.h"
#include "vec/columns/column_string.h"
#include "vec/columns/column_vector.h"
#include "vec/columns/columns_number.h"
#include "vec/core/types.h"
#include "vec/data_types/data_type.h"
#include "vec/data_types/data_type_decimal.h"
#include "vec/data_types/data_type_nullable.h"
#include "vec/data_types/data_type_number.h"
#include "vec/data_types/data_type_string.h"
#include "vec/data_types/number_traits.h"
#include "vec/functions/function_binary_arithmetic.h"
Expand All @@ -46,9 +37,7 @@
#include "vec/functions/function_math_unary.h"
#include "vec/functions/function_string.h"
#include "vec/functions/function_totype.h"
#include "vec/functions/function_truncate.h"
#include "vec/functions/function_unary_arithmetic.h"
#include "vec/functions/round.h"
#include "vec/functions/simple_function_factory.h"

namespace doris {
Expand Down Expand Up @@ -330,92 +319,15 @@ struct PowName {
};
using FunctionPow = FunctionBinaryArithmetic<PowImpl, PowName, false>;

struct TruncateName {
static constexpr auto name = "truncate";
};

struct CeilName {
static constexpr auto name = "ceil";
};

struct FloorName {
static constexpr auto name = "floor";
};

struct RoundName {
static constexpr auto name = "round";
};

struct RoundBankersName {
static constexpr auto name = "round_bankers";
};

/// round(double,int32)-->double
/// key_str:roundFloat64Int32
template <typename Name>
struct DoubleRoundTwoImpl {
static constexpr auto name = Name::name;

static DataTypes get_variadic_argument_types() {
return {std::make_shared<vectorized::DataTypeFloat64>(),
std::make_shared<vectorized::DataTypeInt32>()};
}
};

template <typename Name>
struct DoubleRoundOneImpl {
static constexpr auto name = Name::name;

static DataTypes get_variadic_argument_types() {
return {std::make_shared<vectorized::DataTypeFloat64>()};
}
};

template <typename Name>
struct DecimalRoundTwoImpl {
static constexpr auto name = Name::name;

static DataTypes get_variadic_argument_types() {
return {std::make_shared<vectorized::DataTypeDecimal<Decimal32>>(9, 0),
std::make_shared<vectorized::DataTypeInt32>()};
}
};

template <typename Name>
struct DecimalRoundOneImpl {
static constexpr auto name = Name::name;

static DataTypes get_variadic_argument_types() {
return {std::make_shared<vectorized::DataTypeDecimal<Decimal32>>(9, 0)};
}
};

// TODO: Now math may cause one thread compile time too long, because the function in math
// so mush. Split it to speed up compile time in the future
void register_function_math(SimpleFunctionFactory& factory) {
#define REGISTER_ROUND_FUNCTIONS(IMPL) \
factory.register_function< \
FunctionRounding<IMPL<RoundName>, RoundingMode::Round, TieBreakingMode::Auto>>(); \
factory.register_function< \
FunctionRounding<IMPL<FloorName>, RoundingMode::Floor, TieBreakingMode::Auto>>(); \
factory.register_function< \
FunctionRounding<IMPL<CeilName>, RoundingMode::Ceil, TieBreakingMode::Auto>>(); \
factory.register_function<FunctionRounding<IMPL<RoundBankersName>, RoundingMode::Round, \
TieBreakingMode::Bankers>>();

REGISTER_ROUND_FUNCTIONS(DecimalRoundOneImpl)
REGISTER_ROUND_FUNCTIONS(DecimalRoundTwoImpl)
REGISTER_ROUND_FUNCTIONS(DoubleRoundOneImpl)
REGISTER_ROUND_FUNCTIONS(DoubleRoundTwoImpl)
factory.register_alias("round", "dround");
factory.register_function<FunctionAcos>();
factory.register_function<FunctionAsin>();
factory.register_function<FunctionAtan>();
factory.register_function<FunctionAtan2>();
factory.register_function<FunctionCos>();
factory.register_function<FunctionCosh>();
factory.register_alias("ceil", "dceil");
factory.register_alias("ceil", "ceiling");
factory.register_function<FunctionE>();
factory.register_alias("ln", "dlog1");
factory.register_function<FunctionLog>();
Expand All @@ -434,7 +346,6 @@ void register_function_math(SimpleFunctionFactory& factory) {
factory.register_function<FunctionCbrt>();
factory.register_function<FunctionTan>();
factory.register_function<FunctionTanh>();
factory.register_alias("floor", "dfloor");
factory.register_function<FunctionPow>();
factory.register_alias("pow", "power");
factory.register_alias("pow", "dpow");
Expand All @@ -444,9 +355,5 @@ void register_function_math(SimpleFunctionFactory& factory) {
factory.register_function<FunctionRadians>();
factory.register_function<FunctionDegrees>();
factory.register_function<FunctionBin>();
factory.register_function<FunctionTruncate<TruncateFloatOneArgImpl>>();
factory.register_function<FunctionTruncate<TruncateFloatTwoArgImpl>>();
factory.register_function<FunctionTruncate<TruncateDecimalOneArgImpl>>();
factory.register_function<FunctionTruncate<TruncateDecimalTwoArgImpl>>();
}
} // namespace doris::vectorized
Loading