Fix an issues processing varchar types.

substrait-io · Aug 15, 2023 · 340ec9c · 340ec9c
1 parent c694428
commit 340ec9c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/substrait/textplan/parser/SubstraitPlanTypeVisitor.cpp b/src/substrait/textplan/parser/SubstraitPlanTypeVisitor.cpp
@@ -114,6 +114,11 @@ ::substrait::proto::Type SubstraitPlanTypeVisitor::typeToProto(
  break;
  }
  try {
+ if (!varChar->length()->isInteger()) {
+ errorListener_->addError(
+ ctx->getStart(), "Missing varchar length.");
+ break;
+ }
  int32_t length = std::stoi(varChar->length()->value());
  type.mutable_varchar()->set_length(length);
  } catch (...) {

diff --git a/src/substrait/type/Type.cpp b/src/substrait/type/Type.cpp
@@ -197,7 +197,12 @@ ParameterizedTypePtr ParameterizedType::decode(
 
  const auto& leftAngleBracketPos = matchingType.find('<');
  if (leftAngleBracketPos == std::string::npos) {
- bool nullable = matchingType.back() == '?';
+ bool nullable;
+ if (matchingType.empty()) {
+ nullable = false;
+ } else {
+ nullable = matchingType.back() == '?';
+ }
  // deal with type and with a question mask like "i32?".
  const auto& baseType = nullable
  ? matchingType = matchingType.substr(0, questionMaskPos)