Fix logic of condition separation and refactor (facebookincubator#47)

liujiayi771 · Mar 29, 2023 · 5061adf · 5061adf
1 parent 4c480c9
commit 5061adf
Show file tree

Hide file tree

Showing 4 changed files with 251 additions and 177 deletions.
diff --git a/velox/substrait/SubstraitToVeloxExpr.cpp b/velox/substrait/SubstraitToVeloxExpr.cpp
@@ -276,11 +276,14 @@ core::TypedExprPtr SubstraitVeloxExprConverter::toVeloxExpr(
     const ::substrait::Expression::SingularOrList& singularOrList,
     const RowTypePtr& inputType) {
   std::vector<std::shared_ptr<const core::ITypedExpr>> params;
-  auto inLists = singularOrList.options().data()[0];
+  // TODO: other options?
+  auto inLists = singularOrList.options();
+  VELOX_CHECK(inLists.size() > 0, "At least one option is needed.");
   params.reserve(2);
   // first is the value, second is the list
   params.emplace_back(toVeloxExpr(singularOrList.value(), inputType));
-  params.emplace_back(toVeloxExpr(*inLists, inputType));
+  // TODO: is this the correct way to use SingularOrList?
+  params.emplace_back(toVeloxExpr(inLists[0], inputType));
   return std::make_shared<const core::CallTypedExpr>(
       BOOLEAN(), std::move(params), "in");
 }

diff --git a/velox/substrait/SubstraitToVeloxExpr.h b/velox/substrait/SubstraitToVeloxExpr.h
@@ -55,6 +55,7 @@ class SubstraitVeloxExprConverter {
       const ::substrait::Expression::ScalarFunction& sFunc,
       const RowTypePtr& inputType);
 
+  /// Convert Substrait SingularOrList into Velox Expression.
   core::TypedExprPtr toVeloxExpr(
       const ::substrait::Expression::SingularOrList& singularOrList,
       const RowTypePtr& inputType);