HappenLee commented on a change in pull request #8572: URL: https://github.com/apache/incubator-doris/pull/8572#discussion_r836114439
########## File path: be/src/vec/aggregate_functions/aggregate_function_percentile_approx.h ########## @@ -152,32 +166,86 @@ class AggregateFunctionPercentileApproxMerge : public AggregateFunctionPercentil } }; +template <bool is_nullable> class AggregateFunctionPercentileApproxTwoParams : public AggregateFunctionPercentileApprox { public: AggregateFunctionPercentileApproxTwoParams(const DataTypes& argument_types_) : AggregateFunctionPercentileApprox(argument_types_) {} void add(AggregateDataPtr __restrict place, const IColumn** columns, size_t row_num, Arena*) const override { - const auto& sources = static_cast<const ColumnVector<Float64>&>(*columns[0]); - const auto& quantile = static_cast<const ColumnVector<Float64>&>(*columns[1]); + if constexpr (is_nullable) { + double column_data[2] = {0}; + + for (int i = 0; i < 2; ++i) { + const auto* nullable_column = check_and_get_column<ColumnNullable>(columns[i]); + if (nullable_column == nullptr) { //Not Nullable column + const auto& column = static_cast<const ColumnVector<Float64>&>(*columns[i]); + column_data[i] = column.get_float64(row_num); + + } else if (!nullable_column->is_null_at(row_num)) { // Nullable column && Not null data + const auto& column = static_cast<const ColumnVector<Float64>&>( + nullable_column->get_nested_column()); + column_data[i] = column.get_float64(row_num); + + } else { // Nullable column && null data + if (i == 0) { + return; + } + } + } + + this->data(place).init(); + this->data(place).add(column_data[0], column_data[1]); + + } else { + const auto& sources = static_cast<const ColumnVector<Float64>&>(*columns[0]); + const auto& quantile = static_cast<const ColumnVector<Float64>&>(*columns[1]); - this->data(place).init(); - this->data(place).add(sources.get_float64(row_num), quantile.get_float64(row_num)); + this->data(place).init(); + this->data(place).add(sources.get_float64(row_num), quantile.get_float64(row_num)); + } } }; +template <bool is_nullable> class AggregateFunctionPercentileApproxThreeParams : public AggregateFunctionPercentileApprox { public: AggregateFunctionPercentileApproxThreeParams(const DataTypes& argument_types_) : AggregateFunctionPercentileApprox(argument_types_) {} void add(AggregateDataPtr __restrict place, const IColumn** columns, size_t row_num, Arena*) const override { - const auto& sources = static_cast<const ColumnVector<Float64>&>(*columns[0]); - const auto& quantile = static_cast<const ColumnVector<Float64>&>(*columns[1]); - const auto& compression = static_cast<const ColumnVector<Float64>&>(*columns[2]); + if constexpr (is_nullable) { + double column_data[3] = {0}; Review comment: {0,0,0} ########## File path: be/src/vec/aggregate_functions/aggregate_function_percentile_approx.h ########## @@ -152,32 +166,86 @@ class AggregateFunctionPercentileApproxMerge : public AggregateFunctionPercentil } }; +template <bool is_nullable> class AggregateFunctionPercentileApproxTwoParams : public AggregateFunctionPercentileApprox { public: AggregateFunctionPercentileApproxTwoParams(const DataTypes& argument_types_) : AggregateFunctionPercentileApprox(argument_types_) {} void add(AggregateDataPtr __restrict place, const IColumn** columns, size_t row_num, Arena*) const override { - const auto& sources = static_cast<const ColumnVector<Float64>&>(*columns[0]); - const auto& quantile = static_cast<const ColumnVector<Float64>&>(*columns[1]); + if constexpr (is_nullable) { + double column_data[2] = {0}; + + for (int i = 0; i < 2; ++i) { + const auto* nullable_column = check_and_get_column<ColumnNullable>(columns[i]); + if (nullable_column == nullptr) { //Not Nullable column + const auto& column = static_cast<const ColumnVector<Float64>&>(*columns[i]); + column_data[i] = column.get_float64(row_num); + + } else if (!nullable_column->is_null_at(row_num)) { // Nullable column && Not null data + const auto& column = static_cast<const ColumnVector<Float64>&>( + nullable_column->get_nested_column()); + column_data[i] = column.get_float64(row_num); + + } else { // Nullable column && null data + if (i == 0) { + return; + } + } + } + + this->data(place).init(); + this->data(place).add(column_data[0], column_data[1]); + + } else { + const auto& sources = static_cast<const ColumnVector<Float64>&>(*columns[0]); + const auto& quantile = static_cast<const ColumnVector<Float64>&>(*columns[1]); - this->data(place).init(); - this->data(place).add(sources.get_float64(row_num), quantile.get_float64(row_num)); + this->data(place).init(); + this->data(place).add(sources.get_float64(row_num), quantile.get_float64(row_num)); + } } }; +template <bool is_nullable> class AggregateFunctionPercentileApproxThreeParams : public AggregateFunctionPercentileApprox { public: AggregateFunctionPercentileApproxThreeParams(const DataTypes& argument_types_) : AggregateFunctionPercentileApprox(argument_types_) {} void add(AggregateDataPtr __restrict place, const IColumn** columns, size_t row_num, Arena*) const override { - const auto& sources = static_cast<const ColumnVector<Float64>&>(*columns[0]); - const auto& quantile = static_cast<const ColumnVector<Float64>&>(*columns[1]); - const auto& compression = static_cast<const ColumnVector<Float64>&>(*columns[2]); + if constexpr (is_nullable) { + double column_data[3] = {0}; + + for (int i = 0; i < 3; ++i) { + const auto* nullable_column = check_and_get_column<ColumnNullable>(columns[i]); + if (nullable_column == nullptr) { //Not Nullable column + const auto& column = static_cast<const ColumnVector<Float64>&>(*columns[i]); + column_data[i] = column.get_float64(row_num); + Review comment: delete the useless space -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org