Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ using FunctionDatetimeToWeekTwoArgs =

void register_function_date_time_computation(SimpleFunctionFactory& factory) {
factory.register_function<FunctionNextDay>();
factory.register_function<FunctionPreviousDay>();
factory.register_function<FunctionNow>();
factory.register_function<FunctionNowWithPrecision>();
factory.register_function(CurDateFunctionName::name, &createCurDateFunctionBuilderFunction);
Expand Down
25 changes: 14 additions & 11 deletions be/src/vec/functions/function_date_or_datetime_computation.h
Original file line number Diff line number Diff line change
Expand Up @@ -1493,10 +1493,11 @@ class FunctionMonthsBetween : public IFunction {
}
};

class FunctionNextDay : public IFunction {
template <bool IsPrevious>
class FunctionRelativeDay : public IFunction {
public:
static constexpr auto name = "next_day";
static FunctionPtr create() { return std::make_shared<FunctionNextDay>(); }
static constexpr auto name = IsPrevious ? "previous_day" : "next_day";
static FunctionPtr create() { return std::make_shared<FunctionRelativeDay<IsPrevious>>(); }
String get_name() const override { return name; }
size_t get_number_of_arguments() const override { return 2; }
DataTypePtr get_return_type_impl(const ColumnsWithTypeAndName& arguments) const override {
Expand All @@ -1515,9 +1516,7 @@ class FunctionNextDay : public IFunction {
const auto& date_col = *assert_cast<const ColumnDateV2*>(left_col.get());
const auto& week_col = *assert_cast<const ColumnString*>(right_col.get());
Status status;
if (left_const && right_const) {
status = execute_vector<true, true>(input_rows_count, date_col, week_col, *res);
} else if (left_const) {
if (left_const) {
status = execute_vector<true, false>(input_rows_count, date_col, week_col, *res);
} else if (right_const) {
status = execute_vector<false, true>(input_rows_count, date_col, week_col, *res);
Expand Down Expand Up @@ -1547,10 +1546,11 @@ class FunctionNextDay : public IFunction {
}
return it->second;
}
static Status compute_next_day(DateV2Value<DateV2ValueType>& dtv, const int week_day) {
auto days_to_add = (week_day - (dtv.weekday() + 1) + 7) % 7;
days_to_add = days_to_add == 0 ? 7 : days_to_add;
dtv.date_add_interval<TimeUnit::DAY>(TimeInterval(TimeUnit::DAY, days_to_add, false));
static Status compute_relative_day(DateV2Value<DateV2ValueType>& dtv, const int week_day) {
auto delta_days = IsPrevious ? ((dtv.weekday() + 1) - week_day + 7) % 7
: (week_day - (dtv.weekday() + 1) + 7) % 7;
delta_days = delta_days == 0 ? 7 : delta_days;
dtv.date_add_interval<TimeUnit::DAY>(TimeInterval(TimeUnit::DAY, delta_days, IsPrevious));
return Status::OK();
}

Expand Down Expand Up @@ -1583,13 +1583,16 @@ class FunctionNextDay : public IFunction {
week);
}
}
RETURN_IF_ERROR(compute_next_day(dtv, week_day));
RETURN_IF_ERROR(compute_relative_day(dtv, week_day));
res_col.insert_value(dtv);
}
return Status::OK();
}
};

using FunctionNextDay = FunctionRelativeDay<true>;
using FunctionPreviousDay = FunctionRelativeDay<false>;

class FunctionTime : public IFunction {
public:
static constexpr auto name = "time";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@
import org.apache.doris.nereids.trees.expressions.functions.scalar.Positive;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Pow;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Power;
import org.apache.doris.nereids.trees.expressions.functions.scalar.PreviousDay;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Protocol;
import org.apache.doris.nereids.trees.expressions.functions.scalar.QuantilePercent;
import org.apache.doris.nereids.trees.expressions.functions.scalar.QuantileStateEmpty;
Expand Down Expand Up @@ -955,6 +956,7 @@ public class BuiltinScalarFunctions implements FunctionHelper {
scalar(ParseDataSize.class, "parse_data_size"),
scalar(PeriodAdd.class, "period_add"),
scalar(PeriodDiff.class, "period_diff"),
scalar(PreviousDay.class, "previous_day"),
scalar(Pi.class, "pi"),
scalar(Pmod.class, "pmod"),
scalar(Positive.class, "positive"),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
// 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.

package org.apache.doris.nereids.trees.expressions.functions.scalar;

import org.apache.doris.catalog.FunctionSignature;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
import org.apache.doris.nereids.trees.expressions.functions.PropagateNullLiteral;
import org.apache.doris.nereids.trees.expressions.functions.PropagateNullable;
import org.apache.doris.nereids.trees.expressions.shape.BinaryExpression;
import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
import org.apache.doris.nereids.types.DateV2Type;
import org.apache.doris.nereids.types.StringType;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;

import java.util.List;

/**
* ScalarFunction 'previous_day'.
*/
public class PreviousDay extends ScalarFunction
implements BinaryExpression, ExplicitlyCastableSignature, PropagateNullLiteral, PropagateNullable {
private static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
FunctionSignature.ret(DateV2Type.INSTANCE).args(DateV2Type.INSTANCE, StringType.INSTANCE));

public PreviousDay(Expression arg0, Expression arg1) {
super("previous_day", arg0, arg1);
}

/** constructor for withChildren and reuse signature */
private PreviousDay(ScalarFunctionParams functionParams) {
super(functionParams);
}

@Override
public PreviousDay withChildren(List<Expression> children) {
Preconditions.checkArgument(children.size() == 2);
return new PreviousDay(getFunctionParams(children));
}

@Override
public List<FunctionSignature> getSignatures() {
return SIGNATURES;
}

@Override
public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
return visitor.visitPreviousDay(this, context);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@
import org.apache.doris.nereids.trees.expressions.functions.scalar.Positive;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Pow;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Power;
import org.apache.doris.nereids.trees.expressions.functions.scalar.PreviousDay;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Protocol;
import org.apache.doris.nereids.trees.expressions.functions.scalar.QuantilePercent;
import org.apache.doris.nereids.trees.expressions.functions.scalar.QuantileStateEmpty;
Expand Down Expand Up @@ -2912,6 +2913,10 @@ default R visitPeriodDiff(PeriodDiff periodDiff, C context) {
return visitScalarFunction(periodDiff, context);
}

default R visitPreviousDay(PreviousDay previousDay, C context) {
return visitScalarFunction(previousDay, context);
}

default R visitUnicodeNormalize(UnicodeNormalize func, C context) {
return visitScalarFunction(func, context);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !empty_nullable --

-- !empty_not_nullable --

-- !empty_partial_nullable --

-- !all_null --
\N \N
2024-12-31 2024-12-31

-- !nullable --
2024-03-11 2024-03-11
0000-01-01 0000-01-01
0000-12-29 0000-12-29
0000-02-27 0000-02-27
2024-02-21 2024-02-21
2024-02-22 2024-02-22
2023-02-21 2023-02-21
2023-02-22 2023-02-22
1900-02-21 1900-02-21
1900-02-22 1900-02-22
9999-12-24 9999-12-24
1969-12-24 1969-12-24
1969-12-25 1969-12-25

-- !not_nullable --
2024-03-11 2024-03-11
0000-01-01 0000-01-01
0000-12-29 0000-12-29
0000-02-27 0000-02-27
2024-02-21 2024-02-21
2024-02-22 2024-02-22
2023-02-21 2023-02-21
2023-02-22 2023-02-22
1900-02-21 1900-02-21
1900-02-22 1900-02-22
9999-12-24 9999-12-24
1969-12-24 1969-12-24
1969-12-25 1969-12-25

-- !partial_nullable --
2024-03-11 2024-03-11 2024-03-11 2024-03-11
0000-01-01 0000-01-01 0000-01-01 0000-01-01
0000-12-29 0000-12-29 0000-12-29 0000-12-29
0000-02-27 0000-02-27 0000-02-27 0000-02-27
2024-02-21 2024-02-21 2024-02-21 2024-02-21
2024-02-22 2024-02-22 2024-02-22 2024-02-22
2023-02-21 2023-02-21 2023-02-21 2023-02-21
2023-02-22 2023-02-22 2023-02-22 2023-02-22
1900-02-21 1900-02-21 1900-02-21 1900-02-21
1900-02-22 1900-02-22 1900-02-22 1900-02-22
9999-12-24 9999-12-24 9999-12-24 9999-12-24
1969-12-24 1969-12-24 1969-12-24 1969-12-24
1969-12-25 1969-12-25 1969-12-25 1969-12-25

-- !nullable_no_null --
2024-03-11 2024-03-11
0000-01-01 0000-01-01
0000-12-29 0000-12-29
0000-02-27 0000-02-27
2024-02-21 2024-02-21
2024-02-22 2024-02-22
2023-02-21 2023-02-21
2023-02-22 2023-02-22
1900-02-21 1900-02-21
1900-02-22 1900-02-22
9999-12-24 9999-12-24
1969-12-24 1969-12-24
1969-12-25 1969-12-25

-- !timestamptz_literal --
2025-10-03 2025-10-04

-- !timestamptz_mixed --
2025-10-04 2025-10-04

-- !const_nullable --
\N
\N
\N
\N
\N
\N
\N
\N
\N
\N
\N
\N
\N

-- !partial_const_nullable --
\N
\N
\N
\N
\N
\N
\N
\N
\N
\N
\N
\N
\N

-- !const_not_nullable --
2024-12-30
2024-12-30
2024-12-30
2024-12-30
2024-12-30
2024-12-30
2024-12-30
2024-12-30
2024-12-30
2024-12-30
2024-12-30
2024-12-30
2024-12-30

-- !const_other_nullable --
2024-12-30
2024-12-29
2024-12-27
2024-12-30
2024-12-25
2024-12-26
2024-12-24
2024-12-25
2024-12-25
2024-12-26
2024-12-27
2024-12-25
2024-12-26

-- !const_other_not_nullable --
2024-03-08
0000-01-01
0000-12-29
0000-02-24
2024-02-23
2024-02-23
2023-02-24
2023-02-24
1900-02-23
1900-02-23
9999-12-24
1969-12-26
1969-12-26

-- !const_nullable_no_null --
2024-12-30

-- !const_nullable_no_null_multirows --
2024-03-11
0000-01-01
0000-12-29
0000-02-27
2024-02-21
2024-02-22
2023-02-21
2023-02-22
1900-02-21
1900-02-22
9999-12-24
1969-12-24
1969-12-25

-- !const_partial_nullable_no_null --
2024-12-30
2024-12-29
2024-12-27
2024-12-30
2024-12-25
2024-12-26
2024-12-24
2024-12-25
2024-12-25
2024-12-26
2024-12-27
2024-12-25
2024-12-26

Loading
Loading