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

[native] Fix varchar cast for json #24396

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[native] Fix varchar cast for json #24396

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
11 changes: 8 additions & 3 deletions presto-native-execution/presto_cpp/main/types/PrestoToVeloxExpr.cpp
View file
Open in desktop
natashasehgal marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,13 @@ std::optional<TypedExprPtr> convertCastToVarcharWithMaxLength(
VELOX_DCHECK(end == returnType.data() + returnType.size() - 1);

VELOX_DCHECK_EQ(args.size(), 1);
const auto arg = args[0];

auto arg = args[0];
// If the argument is of JSON type, convert it to VARCHAR before applying
// substr.
if (velox::isJsonType(arg->type())) {
arg = std::make_shared<CastTypedExpr>(velox::VARCHAR(), arg, false);
}
return std::make_shared<CallTypedExpr>(
arg->type(),
std::vector<TypedExprPtr>{
Expand Down Expand Up @@ -256,8 +261,8 @@ std::optional<TypedExprPtr> tryConvertCast(
}

// When the return type is varchar with max length, truncate if only the
// argument type is varchar (or varchar with max length). Non-varchar argument
// types are not truncated.
// argument type is varchar, or varchar with max length or json. Non-varchar
// argument types are not truncated.
if (returnType.find(kVarchar) == 0 &&
args[0]->type()->kind() == TypeKind::VARCHAR &&
returnType.size() > strlen(kVarchar)) {
Expand Down
25 changes: 25 additions & 0 deletions presto-native-execution/presto_cpp/main/types/tests/RowExpressionTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "presto_cpp/presto_protocol/core/presto_protocol_core.h"
#include "velox/core/Expressions.h"
#include "velox/type/Type.h"
#include "velox/functions/prestosql/types/JsonType.h"

using namespace facebook::presto;
using namespace facebook::velox;
Expand All @@ -30,6 +31,7 @@ class RowExpressionTest : public ::testing::Test {
}

void SetUp() override {
registerJsonType();
pool_ = memory::MemoryManager::getInstance()->addLeafPool();
converter_ =
std::make_unique<VeloxExprConverter>(pool_.get(), &typeParser_);
Expand Down Expand Up @@ -626,6 +628,29 @@ TEST_F(RowExpressionTest, castToVarchar) {
ASSERT_TRUE(returnExpr->nullOnFailure());
ASSERT_EQ(returnExpr->type()->toString(), "VARCHAR");
}
// CAST(json AS varchar(3))
{
std::shared_ptr<protocol::CallExpression> p =
json::parse(makeCastToVarchar(false, "json", "varchar(3)"));
auto expr = converter_->toVeloxExpr(p);
auto returnExpr = std::dynamic_pointer_cast<const CallTypedExpr>(expr);

ASSERT_NE(returnExpr, nullptr);
ASSERT_EQ(returnExpr->name(), "presto.default.substr");

auto returnArg1 = std::dynamic_pointer_cast<const CastTypedExpr>(
returnExpr->inputs()[0]);
auto returnArg2 = std::dynamic_pointer_cast<const ConstantTypedExpr>(
returnExpr->inputs()[1]);
auto returnArg3 = std::dynamic_pointer_cast<const ConstantTypedExpr>(
returnExpr->inputs()[2]);

ASSERT_EQ(returnArg1->type()->toString(), "VARCHAR");
ASSERT_EQ(returnArg2->type()->toString(), "BIGINT");
ASSERT_EQ(returnArg2->value().toJson(returnArg2->type()), "1");
ASSERT_EQ(returnArg3->type()->toString(), "BIGINT");
ASSERT_EQ(returnArg3->value().toJson(returnArg3->type()), "3");
}
}

TEST_F(RowExpressionTest, special) {
Expand Down
Loading