Skip to content

[chore](function) remove some unused close function #50285

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

Merged
merged 1 commit into from
Apr 23, 2025
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
8 changes: 0 additions & 8 deletions be/src/vec/functions/function_multi_match.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,6 @@ class FunctionMultiMatch : public IFunction {
return std::make_shared<DataTypeUInt8>();
}

Status open(FunctionContext* context, FunctionContext::FunctionStateScope scope) override {
return Status::OK();
}

Status close(FunctionContext* context, FunctionContext::FunctionStateScope scope) override {
return Status::OK();
}

Status execute_impl(FunctionContext* /*context*/, Block& block, const ColumnNumbers& arguments,
uint32_t result, size_t /*input_rows_count*/) const override;

Expand Down
8 changes: 0 additions & 8 deletions be/src/vec/functions/function_tokenize.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,6 @@ class FunctionTokenize : public IFunction {
NullMapType* dest_nested_null_map) const;
Status execute_impl(FunctionContext* /*context*/, Block& block, const ColumnNumbers& arguments,
uint32_t result, size_t /*input_rows_count*/) const override;

Status open(FunctionContext* context, FunctionContext::FunctionStateScope scope) override {
return Status::OK();
}

Status close(FunctionContext* context, FunctionContext::FunctionStateScope scope) override {
return Status::OK();
}
};

void register_function_tokenize(SimpleFunctionFactory& factory) {
Expand Down
71 changes: 5 additions & 66 deletions be/src/vec/functions/functions_geo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include "vec/common/string_ref.h"
#include "vec/core/block.h"
#include "vec/core/column_with_type_and_name.h"
#include "vec/core/field.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"
Expand All @@ -41,7 +40,6 @@
namespace doris::vectorized {

struct StPoint {
static constexpr auto NEED_CONTEXT = false;
static constexpr auto NAME = "st_point";
static const size_t NUM_ARGS = 2;
using Type = DataTypeString;
Expand Down Expand Up @@ -129,7 +127,6 @@ struct StAsWktName {

template <typename FunctionName>
struct StAsText {
static constexpr auto NEED_CONTEXT = false;
static constexpr auto NAME = FunctionName::NAME;
static const size_t NUM_ARGS = 1;
using Type = DataTypeString;
Expand Down Expand Up @@ -165,7 +162,6 @@ struct StAsText {
};

struct StX {
static constexpr auto NEED_CONTEXT = false;
static constexpr auto NAME = "st_x";
static const size_t NUM_ARGS = 1;
using Type = DataTypeFloat64;
Expand Down Expand Up @@ -203,7 +199,6 @@ struct StX {
};

struct StY {
static constexpr auto NEED_CONTEXT = false;
static constexpr auto NAME = "st_y";
static const size_t NUM_ARGS = 1;
using Type = DataTypeFloat64;
Expand Down Expand Up @@ -241,7 +236,6 @@ struct StY {
};

struct StDistanceSphere {
static constexpr auto NEED_CONTEXT = false;
static constexpr auto NAME = "st_distance_sphere";
static const size_t NUM_ARGS = 4;
using Type = DataTypeFloat64;
Expand Down Expand Up @@ -288,7 +282,6 @@ struct StDistanceSphere {
};

struct StAngleSphere {
static constexpr auto NEED_CONTEXT = false;
static constexpr auto NAME = "st_angle_sphere";
static const size_t NUM_ARGS = 4;
using Type = DataTypeFloat64;
Expand Down Expand Up @@ -337,7 +330,6 @@ struct StAngleSphere {
};

struct StAngle {
static constexpr auto NEED_CONTEXT = false;
static constexpr auto NAME = "st_angle";
static const size_t NUM_ARGS = 3;
using Type = DataTypeFloat64;
Expand Down Expand Up @@ -397,7 +389,6 @@ struct StAngle {
};

struct StAzimuth {
static constexpr auto NEED_CONTEXT = false;
static constexpr auto NAME = "st_azimuth";
static const size_t NUM_ARGS = 2;
using Type = DataTypeFloat64;
Expand Down Expand Up @@ -487,7 +478,6 @@ struct StAzimuth {
};

struct StAreaSquareMeters {
static constexpr auto NEED_CONTEXT = false;
static constexpr auto NAME = "st_area_square_meters";
static const size_t NUM_ARGS = 1;
using Type = DataTypeFloat64;
Expand Down Expand Up @@ -528,7 +518,6 @@ struct StAreaSquareMeters {
};

struct StAreaSquareKm {
static constexpr auto NEED_CONTEXT = false;
static constexpr auto NAME = "st_area_square_km";
static const size_t NUM_ARGS = 1;
using Type = DataTypeFloat64;
Expand Down Expand Up @@ -571,12 +560,10 @@ struct StAreaSquareKm {
};

struct StCircle {
static constexpr auto NEED_CONTEXT = true;
static constexpr auto NAME = "st_circle";
static const size_t NUM_ARGS = 3;
using Type = DataTypeString;
static Status execute(FunctionContext* context, Block& block, const ColumnNumbers& arguments,
size_t result) {
static Status execute(Block& block, const ColumnNumbers& arguments, size_t result) {
DCHECK_EQ(arguments.size(), 3);
auto return_type = block.get_data_type(result);
auto center_lng =
Expand Down Expand Up @@ -616,25 +603,15 @@ struct StCircle {
ColumnNullable::create(std::move(res), std::move(null_map)));
return Status::OK();
}

static Status open(FunctionContext* context, FunctionContext::FunctionStateScope scope) {
return Status::OK();
}

static Status close(FunctionContext* context, FunctionContext::FunctionStateScope scope) {
return Status::OK();
}
};

template <typename Func>
struct StRelationFunction {
static constexpr auto NEED_CONTEXT = true;
static constexpr auto NAME = Func::NAME;
static const size_t NUM_ARGS = 2;
using Type = DataTypeUInt8;

static Status execute(FunctionContext* context, Block& block, const ColumnNumbers& arguments,
size_t result) {
static Status execute(Block& block, const ColumnNumbers& arguments, size_t result) {
DCHECK_EQ(arguments.size(), 2);
auto return_type = block.get_data_type(result);
const auto& [left_column, left_const] =
Expand Down Expand Up @@ -707,14 +684,6 @@ struct StRelationFunction {
loop_do(lhs_value, rhs_value, shapes, res, null_map, row);
}
}

static Status open(FunctionContext* context, FunctionContext::FunctionStateScope scope) {
return Status::OK();
}

static Status close(FunctionContext* context, FunctionContext::FunctionStateScope scope) {
return Status::OK();
}
};

struct StContainsFunc {
Expand Down Expand Up @@ -774,12 +743,10 @@ struct StPolygonFromText {

template <typename Impl>
struct StGeoFromText {
static constexpr auto NEED_CONTEXT = true;
static constexpr auto NAME = Impl::NAME;
static const size_t NUM_ARGS = 1;
using Type = DataTypeString;
static Status execute(FunctionContext* context, Block& block, const ColumnNumbers& arguments,
size_t result) {
static Status execute(Block& block, const ColumnNumbers& arguments, size_t result) {
DCHECK_EQ(arguments.size(), 1);
auto return_type = block.get_data_type(result);
auto& geo = block.get_by_position(arguments[0]).column;
Expand Down Expand Up @@ -807,14 +774,6 @@ struct StGeoFromText {
ColumnNullable::create(std::move(res), std::move(null_map)));
return Status::OK();
}

static Status open(FunctionContext* context, FunctionContext::FunctionStateScope scope) {
return Status::OK();
}

static Status close(FunctionContext* context, FunctionContext::FunctionStateScope scope) {
return Status::OK();
}
};

struct StGeometryFromWKB {
Expand All @@ -829,12 +788,10 @@ struct StGeomFromWKB {

template <typename Impl>
struct StGeoFromWkb {
static constexpr auto NEED_CONTEXT = true;
static constexpr auto NAME = Impl::NAME;
static const size_t NUM_ARGS = 1;
using Type = DataTypeString;
static Status execute(FunctionContext* context, Block& block, const ColumnNumbers& arguments,
size_t result) {
static Status execute(Block& block, const ColumnNumbers& arguments, size_t result) {
DCHECK_EQ(arguments.size(), 1);
auto return_type = block.get_data_type(result);
auto& geo = block.get_by_position(arguments[0]).column;
Expand All @@ -861,23 +818,13 @@ struct StGeoFromWkb {
ColumnNullable::create(std::move(res), std::move(null_map)));
return Status::OK();
}

static Status open(FunctionContext* context, FunctionContext::FunctionStateScope scope) {
return Status::OK();
}

static Status close(FunctionContext* context, FunctionContext::FunctionStateScope scope) {
return Status::OK();
}
};

struct StAsBinary {
static constexpr auto NEED_CONTEXT = true;
static constexpr auto NAME = "st_asbinary";
static const size_t NUM_ARGS = 1;
using Type = DataTypeString;
static Status execute(FunctionContext* context, Block& block, const ColumnNumbers& arguments,
size_t result) {
static Status execute(Block& block, const ColumnNumbers& arguments, size_t result) {
DCHECK_EQ(arguments.size(), 1);
auto return_type = block.get_data_type(result);
auto res = ColumnString::create();
Expand Down Expand Up @@ -910,14 +857,6 @@ struct StAsBinary {
ColumnNullable::create(std::move(res), std::move(null_map)));
return Status::OK();
}

static Status open(FunctionContext* context, FunctionContext::FunctionStateScope scope) {
return Status::OK();
}

static Status close(FunctionContext* context, FunctionContext::FunctionStateScope scope) {
return Status::OK();
}
};

void register_function_geo(SimpleFunctionFactory& factory) {
Expand Down
23 changes: 1 addition & 22 deletions be/src/vec/functions/functions_geo.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "vec/core/column_numbers.h"
#include "vec/core/types.h"
#include "vec/data_types/data_type.h"
#include "vec/data_types/data_type_string.h"
#include "vec/functions/function.h"

namespace doris {
Expand Down Expand Up @@ -72,27 +71,7 @@ class GeoFunction : public IFunction {

Status execute_impl(FunctionContext* context, Block& block, const ColumnNumbers& arguments,
uint32_t result, size_t input_rows_count) const override {
if constexpr (Impl::NEED_CONTEXT) {
return Impl::execute(context, block, arguments, result);
} else {
return Impl::execute(block, arguments, result);
}
}

Status open(FunctionContext* context, FunctionContext::FunctionStateScope scope) override {
if constexpr (Impl::NEED_CONTEXT) {
return Impl::open(context, scope);
} else {
return Status::OK();
}
}

Status close(FunctionContext* context, FunctionContext::FunctionStateScope scope) override {
if constexpr (Impl::NEED_CONTEXT) {
return Impl::close(context, scope);
} else {
return Status::OK();
}
return Impl::execute(block, arguments, result);
}
};

Expand Down
4 changes: 0 additions & 4 deletions be/src/vec/functions/in.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,6 @@ class FunctionIn : public IFunction {
return Status::OK();
}

Status close(FunctionContext* context, FunctionContext::FunctionStateScope scope) override {
return Status::OK();
}

private:
template <typename T>
static void search_hash_set_check_null(InState* in_state, size_t input_rows_count,
Expand Down
5 changes: 0 additions & 5 deletions be/src/vec/functions/like.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -545,11 +545,6 @@ Status FunctionLikeBase::execute_impl(FunctionContext* context, Block& block,
return Status::OK();
}

Status FunctionLikeBase::close(FunctionContext* context,
FunctionContext::FunctionStateScope scope) {
return Status::OK();
}

Status FunctionLikeBase::execute_substring(const ColumnString::Chars& values,
const ColumnString::Offsets& value_offsets,
ColumnUInt8::Container& result,
Expand Down
2 changes: 0 additions & 2 deletions be/src/vec/functions/like.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,6 @@ class FunctionLikeBase : public IFunction {
Status execute_impl(FunctionContext* context, Block& block, const ColumnNumbers& arguments,
uint32_t result, size_t /*input_rows_count*/) const override;

Status close(FunctionContext* context, FunctionContext::FunctionStateScope scope) override;

friend struct VectorAllpassSearchState;
friend struct VectorEqualSearchState;
friend struct VectorSubStringSearchState;
Expand Down
4 changes: 0 additions & 4 deletions be/src/vec/functions/random.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,6 @@ class Random : public IFunction {
return _execute_float(context, block, arguments, result, input_rows_count);
}

Status close(FunctionContext* context, FunctionContext::FunctionStateScope scope) override {
return Status::OK();
}

private:
static Status _execute_int_range(FunctionContext* context, Block& block,
const ColumnNumbers& arguments, uint32_t result,
Expand Down
Loading