Fixes an issue in the execution of NNS search.

vitrivr · Aug 14, 2024 · 1c75f83 · 1c75f83
1 parent a3d7b61
commit 1c75f83
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.../main/kotlin/org/vitrivr/cottontail/dbms/execution/operators/sources/IndexScanOperator.kt b/.../main/kotlin/org/vitrivr/cottontail/dbms/execution/operators/sources/IndexScanOperator.kt
@@ -48,7 +48,7 @@ class IndexScanOperator(
      */
     override fun toFlow(): Flow<Tuple> = flow {
         val columns = this@IndexScanOperator.fetch.map { it.column }.toTypedArray()
-        val physical = this@IndexScanOperator.fetch.mapNotNull { it.physical }.toTypedArray()
+        val physical = this@IndexScanOperator.fetch.map { it.physical ?: it.column }.toTypedArray()
         var read = 0L
         if (this@IndexScanOperator.partitions == 1) {
             this@IndexScanOperator.index.filter(this@IndexScanOperator.predicate)

diff --git a/...g/vitrivr/cottontail/dbms/queries/planning/rules/physical/index/NNSIndexScanClass1Rule.kt b/...g/vitrivr/cottontail/dbms/queries/planning/rules/physical/index/NNSIndexScanClass1Rule.kt
@@ -80,7 +80,6 @@ object NNSIndexScanClass1Rule : RewriteRule {
         /* If candidate has been found, execute replacement. */
         if (candidate != null) {
             val produces = candidate.columnsFor(predicate)
-            val distanceColumn = predicate.distanceColumn
             if (produces.contains(predicate.distanceColumn.column)) {
                 var replacement: OperatorNode.Physical = IndexScanPhysicalOperatorNode(node.groupId, listOf(node.out.copy()), candidate, predicate)
                 val newFetch = scan.columns.filter { !produces.contains(it.physical) && it != predicate.column }