Skip to content
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

Jump to bottom

GH-38879: [C++][Gandiva] Fix Gandiva to_date function's validation for supress errors parameter #38987

Merged
merged 1 commit into from
Nov 29, 2023
Merged

GH-38879: [C++][Gandiva] Fix Gandiva to_date function's validation for supress errors parameter #38987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cpp/src/gandiva/to_date_holder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Result<std::shared_ptr<ToDateHolder>> ToDateHolder::Make(const FunctionNode& nod
if (node.children().size() == 3) {
auto literal_suppress_errors =
dynamic_cast<LiteralNode*>(node.children().at(2).get());
if (literal_pattern == nullptr) {
if (literal_suppress_errors == nullptr) {
return Status::Invalid(
"The (optional) third parameter to 'to_date' function needs to an integer "
"literal to indicate whether to suppress the error");
Expand Down
24 changes: 19 additions & 5 deletions cpp/src/gandiva/to_date_holder_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,18 @@ namespace gandiva {

class TestToDateHolder : public ::testing::Test {
public:
FunctionNode BuildToDate(std::string pattern) {
FunctionNode BuildToDate(std::string pattern,
std::shared_ptr<Node> suppress_error_node = nullptr) {
auto field = std::make_shared<FieldNode>(arrow::field("in", arrow::utf8()));
auto pattern_node =
std::make_shared<LiteralNode>(arrow::utf8(), LiteralHolder(pattern), false);
auto suppress_error_node =
std::make_shared<LiteralNode>(arrow::int32(), LiteralHolder(0), false);
return FunctionNode("to_date_utf8_utf8_int32",
{field, pattern_node, suppress_error_node}, arrow::int64());
if (suppress_error_node == nullptr) {
suppress_error_node =
std::make_shared<LiteralNode>(arrow::int32(), LiteralHolder(0), false);
}
return {"to_date_utf8_utf8_int32",
{field, pattern_node, std::move(suppress_error_node)},
arrow::int64()};
}

protected:
Expand Down Expand Up @@ -167,4 +171,14 @@ TEST_F(TestToDateHolder, TestSimpleDateYear) {
EXPECT_EQ(millis_since_epoch, 915148800000);
}

TEST_F(TestToDateHolder, TestMakeFromFunctionNode) {
auto to_date_func = BuildToDate("YYYY");
EXPECT_OK_AND_ASSIGN(auto to_date_holder, ToDateHolder::Make(to_date_func));
}

TEST_F(TestToDateHolder, TestMakeFromInvalidSurpressParamFunctionNode) {
auto non_literal_param = std::make_shared<FieldNode>(arrow::field("in", arrow::utf8()));
auto to_date_func = BuildToDate("YYYY", std::move(non_literal_param));
ASSERT_RAISES(Invalid, ToDateHolder::Make(to_date_func).status());
}
} // namespace gandiva
Loading