feat: add ops.Contains -> singular_or_list translation

Author: gforsyth

ibis_substrait/compiler/decompile.py

@@ -756,6 +756,15 @@ def decompile_if_then(
     ) -> ir.ValueExpr:
         return decompile(if_then, children, offsets, decompiler)
 
+    @staticmethod
+    def decompile_singular_or_list(
+        singular_or_list: stalg.Expression.SingularOrList,
+        children: Sequence[ir.TableExpr],
+        offsets: Sequence[int],
+        decompiler: SubstraitDecompiler,
+    ) -> ir.ValueExpr:
+        return decompile(singular_or_list, children, offsets, decompiler)
+
 
 @decompile.register
 def _decompile_expression(
@@ -852,6 +861,19 @@ def _decompile_expression_if_then(
     return base_case
 
 
+@decompile.register
+def _decompile_expression_singular_or_list(
+    msg: stalg.Expression.SingularOrList,
+    children: Sequence[ir.TableExpr],
+    field_offsets: Sequence[int],
+    decompiler: SubstraitDecompiler,
+) -> ir.ValueExpr:
+    column = decompile(msg.value, children, field_offsets, decompiler)
+    return column.isin(
+        [decompile(value, children, field_offsets, decompiler) for value in msg.options]
+    )
+
+
 class LiteralDecompiler:
     @staticmethod
     def decompile_boolean(value: bool) -> tuple[bool, dt.Boolean]:

ibis_substrait/compiler/mapping.py

@@ -4,7 +4,6 @@
     "Any": "any",
     "Between": "between",
     "Cast": "cast",
-    "Contains": "contains",
     "Count": "count",
     "CountDistinct": "countdistinct",
     "Divide": "/",  # wrong but using for duckdb compatibility right now
@@ -26,7 +25,6 @@
     "Substring": "substring",
     "Subtract": "-",  # wrong but using for duckdb compatibility right now
     "Sum": "sum",
-    "ValueList": "values",
 }
 
 SUBSTRAIT_IBIS_OP_MAPPING = {v: k for k, v in IBIS_SUBSTRAIT_OP_MAPPING.items()}

ibis_substrait/compiler/translate.py

@@ -928,3 +928,18 @@ def _simple_case(
     _else = {"else": translate(op.default, compiler, **kwargs)}
 
     return stalg.Expression(if_then=stalg.Expression.IfThen(ifs=_ifs, **_else))
+
+
+@translate.register(ops.Contains)
+def _contains(
+    op: ops.Contains,
+    expr: ir.TableExpr,
+    compiler: SubstraitCompiler,
+    **kwargs: Any,
+) -> stalg.Expression:
+    return stalg.Expression(
+        singular_or_list=stalg.Expression.SingularOrList(
+            value=translate(op.value, compiler, **kwargs),
+            options=[translate(value, compiler, **kwargs) for value in op.options],
+        )
+    )

ibis_substrait/tests/compiler/test_decompiler.py

@@ -228,3 +228,13 @@ def test_decompile_if_then(t, compiler):
     plan = compiler.compile(expr)
     (result,) = decompile(plan)
     assert result.equals(expr)
+
+
+def test_singular_or_list(compiler):
+    t = ibis.table([("bork", dt.string)], name="t")
+
+    expr = t.filter(t.bork.isin(["ork", "bork"]))
+
+    plan = compiler.compile(expr)
+    (result,) = decompile(plan)
+    assert result.equals(expr)