From c713dff9c5bc2f15c20bce9ea89303fc4520d05a Mon Sep 17 00:00:00 2001 From: Ralph Gasser Date: Tue, 11 Jun 2024 13:19:38 +0200 Subject: [PATCH 1/2] Fixes a bug with the entity name for fetching retrievables. --- .../plugin/cottontaildb/descriptors/AbstractDescriptorReader.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/descriptors/AbstractDescriptorReader.kt b/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/descriptors/AbstractDescriptorReader.kt index 9f422ada..502bbf8e 100644 --- a/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/descriptors/AbstractDescriptorReader.kt +++ b/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/descriptors/AbstractDescriptorReader.kt @@ -197,7 +197,7 @@ abstract class AbstractDescriptorReader(final override val field */ protected fun fetchRetrievable(ids: Iterable): Map { /* Prepare Cottontail DB query. */ - val query = org.vitrivr.cottontail.client.language.dql.Query(this.entityName).select("*").where( + val query = org.vitrivr.cottontail.client.language.dql.Query(this.entityName.schema().entity(RETRIEVABLE_ENTITY_NAME)).select("*").where( Compare( Column(this.entityName.column(RETRIEVABLE_ID_COLUMN_NAME)), Compare.Operator.IN, From f272b61ccb684310621317675a99cc10b9538f3e Mon Sep 17 00:00:00 2001 From: Ralph Gasser Date: Tue, 11 Jun 2024 13:42:16 +0200 Subject: [PATCH 2/2] Fixes a bug with the column name for fetching retrievables. --- .../cottontaildb/descriptors/AbstractDescriptorReader.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/descriptors/AbstractDescriptorReader.kt b/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/descriptors/AbstractDescriptorReader.kt index 502bbf8e..648ac6d7 100644 --- a/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/descriptors/AbstractDescriptorReader.kt +++ b/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/descriptors/AbstractDescriptorReader.kt @@ -197,9 +197,10 @@ abstract class AbstractDescriptorReader(final override val field */ protected fun fetchRetrievable(ids: Iterable): Map { /* Prepare Cottontail DB query. */ - val query = org.vitrivr.cottontail.client.language.dql.Query(this.entityName.schema().entity(RETRIEVABLE_ENTITY_NAME)).select("*").where( + val entityName = this.entityName.schema().entity(RETRIEVABLE_ENTITY_NAME) + val query = org.vitrivr.cottontail.client.language.dql.Query(entityName).select("*").where( Compare( - Column(this.entityName.column(RETRIEVABLE_ID_COLUMN_NAME)), + Column(entityName.column(RETRIEVABLE_ID_COLUMN_NAME)), Compare.Operator.IN, org.vitrivr.cottontail.client.language.basics.expression.List(ids.map { UuidValue(it) }.toTypedArray()) )