Merge branch 'v1' into v1-plans-eval

partiql · Sep 6, 2024 · c287a1f · c287a1f
2 parents a3a2c8a + 1dbb203
commit c287a1f
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/partiql-plan/src/main/kotlin/org/partiql/plan/v1/builder/PlanFactory.kt b/partiql-plan/src/main/kotlin/org/partiql/plan/v1/builder/PlanFactory.kt
@@ -433,14 +433,11 @@ public interface PlanFactory {
     public fun rexLit(value: Datum): RexLit = RexLitImpl(value)
 
     /**
-<<<<<<< HEAD
-=======
-     * TODO REMOVE ME
+     * Create a [RexNullIf] instance.
      */
     public fun rexNullIf(value: Rex, nullifier: Rex): RexNullIf = RexNullIfImpl(value, nullifier)
 
     /**
->>>>>>> c2cc48d5 (Ports evaluation changes to v1 plans)
      * Create a [RexPathIndex] instance.
      *
      * @param operand