Removed superfluous fqn.

vitrivr · Feb 23, 2022 · 7d583f4 · 7d583f4
1 parent f207891
commit 7d583f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.../src/main/kotlin/org/vitrivr/cottontail/dbms/execution/operators/sort/HeapSortOperator.kt b/.../src/main/kotlin/org/vitrivr/cottontail/dbms/execution/operators/sort/HeapSortOperator.kt
@@ -23,7 +23,7 @@ open class HeapSortOperator(parent: Operator, sortOn: List<Pair<ColumnDef<*>, So
      * @param context The [TransactionContext] used for execution
      * @return [Flow] representing this [HeapSortOperator]
      */
-    override fun toFlow(context: org.vitrivr.cottontail.dbms.execution.TransactionContext): Flow<Record> {
+    override fun toFlow(context: TransactionContext): Flow<Record> {
         val parentFlow = this.parent.toFlow(context)
         return flow {
             val queue = ObjectHeapPriorityQueue(this@HeapSortOperator.queueSize, this@HeapSortOperator.comparator)

diff --git a/...rc/main/kotlin/org/vitrivr/cottontail/dbms/execution/operators/transform/MergeOperator.kt b/...rc/main/kotlin/org/vitrivr/cottontail/dbms/execution/operators/transform/MergeOperator.kt
@@ -1,8 +1,7 @@
 package org.vitrivr.cottontail.dbms.execution.operators.transform
 
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flattenMerge
-import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
 import org.vitrivr.cottontail.core.basics.Record
 import org.vitrivr.cottontail.core.database.ColumnDef
@@ -36,7 +35,7 @@ class MergeOperator(parents: List<Operator>, val context: BindingContext): Opera
      */
     override fun toFlow(context: TransactionContext): Flow<Record> {
         /* Obtain parent flows amd compose new flow. */
-        val parentFlows = flowOf(*this.parents.map { it.toFlow(context) }.toTypedArray())
-        return parentFlows.flattenMerge(this.parents.size).onEach { this@MergeOperator.context.update(it) }
+        val parentFlows = this.parents.map { it.toFlow(context) }.toTypedArray()
+        return merge(*parentFlows).onEach { this@MergeOperator.context.update(it) }
     }
 }