[OPPRO-233] Add SingularOrList support (oap-project#45)

zhejiangxiaomai · Sep 22, 2022 · a57a872 · a57a872
1 parent 366f060
commit a57a872
Show file tree

Hide file tree

Showing 4 changed files with 281 additions and 166 deletions.
diff --git a/velox/substrait/SubstraitToVeloxExpr.cpp b/velox/substrait/SubstraitToVeloxExpr.cpp
@@ -142,6 +142,20 @@ SubstraitVeloxExprConverter::toVeloxExpr(
       toVeloxType(typeName), std::move(params), veloxFunction);
 }
 
+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];
+  params.reserve(2);
+  // first is the value, second is the list
+  params.emplace_back(toVeloxExpr(singularOrList.value(), inputType));
+  params.emplace_back(toVeloxExpr(*inLists, inputType));
+  return std::make_shared<const core::CallTypedExpr>(
+      BOOLEAN(), std::move(params), "in");
+}
+
 std::shared_ptr<const core::ConstantTypedExpr>
 SubstraitVeloxExprConverter::toVeloxExpr(
     const ::substrait::Expression::Literal& substraitLit) {
@@ -272,6 +286,8 @@ SubstraitVeloxExprConverter::toVeloxExpr(
       return toVeloxExpr(sExpr.cast(), inputType);
     case ::substrait::Expression::RexTypeCase::kIfThen:
       return toVeloxExpr(sExpr.if_then(), inputType);
+    case ::substrait::Expression::RexTypeCase::kSingularOrList:
+      return toVeloxExpr(sExpr.singular_or_list(), inputType);
     default:
       VELOX_NYI(
           "Substrait conversion not supported for Expression '{}'", typeCase);

diff --git a/velox/substrait/SubstraitToVeloxExpr.h b/velox/substrait/SubstraitToVeloxExpr.h
@@ -54,6 +54,10 @@ class SubstraitVeloxExprConverter {
       const ::substrait::Expression::ScalarFunction& sFunc,
       const RowTypePtr& inputType);
 
+  core::TypedExprPtr toVeloxExpr(
+      const ::substrait::Expression::SingularOrList& singularOrList,
+      const RowTypePtr& inputType);
+
   /// Convert Substrait CastExpression to Velox Expression.
   std::shared_ptr<const core::ITypedExpr> toVeloxExpr(
       const ::substrait::Expression::Cast& castExpr,