Adds closePeeking and openPeeking to RelPeeking

johnedquinn · Apr 24, 2024 · 0962bcf · 0962bcf
1 parent b57bc37
commit 0962bcf
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 32 deletions.
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelDistinct.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelDistinct.kt
@@ -10,9 +10,8 @@ internal class RelDistinct(
 
     private val seen = mutableSetOf<Record>()
 
-    override fun open(env: Environment) {
+    override fun openPeeking(env: Environment) {
         input.open(env)
-        super.open(env)
     }
 
     override fun peek(): Record? {
@@ -25,9 +24,8 @@ internal class RelDistinct(
         return null
     }
 
-    override fun close() {
+    override fun closePeeking() {
         seen.clear()
         input.close()
-        super.close()
     }
 }
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelExceptAll.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelExceptAll.kt
@@ -12,12 +12,11 @@ internal class RelExceptAll(
     private val seen: MutableMap<Record, Int> = mutableMapOf()
     private var init: Boolean = false
 
-    override fun open(env: Environment) {
+    override fun openPeeking(env: Environment) {
         lhs.open(env)
         rhs.open(env)
         init = false
         seen.clear()
-        super.open(env)
     }
 
     override fun peek(): Record? {
@@ -35,11 +34,10 @@ internal class RelExceptAll(
         return null
     }
 
-    override fun close() {
+    override fun closePeeking() {
         lhs.close()
         rhs.close()
         seen.clear()
-        super.close()
     }
 
     /**

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelExceptDistinct.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelExceptDistinct.kt
@@ -18,12 +18,11 @@ internal class RelExceptDistinct(
     private var seen: MutableSet<Record> = mutableSetOf()
     private var init: Boolean = false
 
-    override fun open(env: Environment) {
+    override fun openPeeking(env: Environment) {
         lhs.open(env)
         rhs.open(env)
         init = false
         seen = mutableSetOf()
-        super.open(env)
     }
 
     override fun peek(): Record? {
@@ -38,11 +37,10 @@ internal class RelExceptDistinct(
         return null
     }
 
-    override fun close() {
+    override fun closePeeking() {
         lhs.close()
         rhs.close()
         seen.clear()
-        super.close()
     }
 
     /**

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelFilter.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelFilter.kt
@@ -13,10 +13,9 @@ internal class RelFilter(
 
     private lateinit var env: Environment
 
-    override fun open(env: Environment) {
+    override fun openPeeking(env: Environment) {
         this.env = env
         input.open(env)
-        super.open(env)
     }
 
     override fun peek(): Record? {
@@ -28,9 +27,8 @@ internal class RelFilter(
         return null
     }
 
-    override fun close() {
+    override fun closePeeking() {
         input.close()
-        super.close()
     }
 
     @OptIn(PartiQLValueExperimental::class)

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelIntersectAll.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelIntersectAll.kt
@@ -12,12 +12,11 @@ internal class RelIntersectAll(
     private val seen: MutableMap<Record, Int> = mutableMapOf()
     private var init: Boolean = false
 
-    override fun open(env: Environment) {
+    override fun openPeeking(env: Environment) {
         lhs.open(env)
         rhs.open(env)
         init = false
         seen.clear()
-        super.open(env)
     }
 
     override fun peek(): Record? {
@@ -35,11 +34,10 @@ internal class RelIntersectAll(
         return null
     }
 
-    override fun close() {
+    override fun closePeeking() {
         lhs.close()
         rhs.close()
         seen.clear()
-        super.close()
     }
 
     /**

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelIntersectDistinct.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelIntersectDistinct.kt
@@ -12,12 +12,11 @@ internal class RelIntersectDistinct(
     private val seen: MutableSet<Record> = mutableSetOf()
     private var init: Boolean = false
 
-    override fun open(env: Environment) {
+    override fun openPeeking(env: Environment) {
         lhs.open(env)
         rhs.open(env)
         init = false
         seen.clear()
-        super.open(env)
     }
 
     override fun peek(): Record? {
@@ -32,11 +31,10 @@ internal class RelIntersectDistinct(
         return null
     }
 
-    override fun close() {
+    override fun closePeeking() {
         lhs.close()
         rhs.close()
         seen.clear()
-        super.close()
     }
 
     /**

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelJoinNestedLoop.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelJoinNestedLoop.kt
@@ -19,15 +19,14 @@ internal abstract class RelJoinNestedLoop : RelPeeking() {
     private var lhsRecord: Record? = null
     private lateinit var env: Environment
 
-    override fun open(env: Environment) {
+    override fun openPeeking(env: Environment) {
         this.env = env
         lhs.open(env)
         if (lhs.hasNext().not()) {
             return
         }
         lhsRecord = lhs.next()
         rhs.open(env.push(lhsRecord!!))
-        super.open(env)
     }
 
     abstract fun join(condition: Boolean, lhs: Record, rhs: Record): Record?
@@ -69,10 +68,9 @@ internal abstract class RelJoinNestedLoop : RelPeeking() {
         return toReturn
     }
 
-    override fun close() {
+    override fun closePeeking() {
         lhs.close()
         rhs.close()
-        super.close()
     }
 
     @OptIn(PartiQLValueExperimental::class)

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelPeeking.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelPeeking.kt
@@ -11,11 +11,29 @@ import org.partiql.eval.internal.operator.Operator
  */
 internal abstract class RelPeeking : Operator.Relation, IteratorPeeking<Record>() {
 
+    /**
+     * This shall have the same functionality as [open]. Implementers of [RelPeeking] shall not override [open].
+     */
+    abstract fun openPeeking(env: Environment)
+
+    /**
+     * This shall have the same functionality as [close]. Implementers of [RelPeeking] shall not override [close].
+     */
+    abstract fun closePeeking()
+
+    /**
+     * Implementers shall not override this method.
+     */
     override fun open(env: Environment) {
         next = null
+        openPeeking(env)
     }
 
+    /**
+     * Implementers shall not override this method.
+     */
     override fun close() {
         next = null
+        closePeeking()
     }
 }
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelUnionDistinct.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelUnionDistinct.kt
@@ -13,12 +13,11 @@ internal class RelUnionDistinct(
     private val seen: MutableSet<Record> = mutableSetOf()
     private lateinit var input: Iterator<Record>
 
-    override fun open(env: Environment) {
+    override fun openPeeking(env: Environment) {
         lhs.open(env)
         rhs.open(env)
         seen.clear()
         input = IteratorChain(arrayOf(lhs, rhs))
-        super.open(env)
     }
 
     override fun peek(): Record? {
@@ -31,10 +30,9 @@ internal class RelUnionDistinct(
         return null
     }
 
-    override fun close() {
+    override fun closePeeking() {
         lhs.close()
         rhs.close()
         seen.clear()
-        super.close()
     }
 }