Fixed type erosion when adding properties to retrieved

vitrivr · Dec 11, 2023 · bbb7c96 · bbb7c96
1 parent 7aa78fc
commit bbb7c96
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/.../main/kotlin/org/vitrivr/engine/base/database/cottontail/retrievable/RetrievableReader.kt b/.../main/kotlin/org/vitrivr/engine/base/database/cottontail/retrievable/RetrievableReader.kt
@@ -36,11 +36,11 @@ private val logger: KLogger = KotlinLogging.logger {}
 internal class RetrievableReader(private val connection: CottontailConnection) : RetrievableReader {
     /** The [Name.EntityName] for this [RetrievableInitializer]. */
     private val entityName: Name.EntityName =
-        Name.EntityName(this.connection.schemaName, CottontailConnection.RETRIEVABLE_ENTITY_NAME)
+        Name.EntityName.create(this.connection.schemaName, CottontailConnection.RETRIEVABLE_ENTITY_NAME)
 
     /** The [Name.EntityName] of the relationship entity. */
     private val relationshipEntityName: Name.EntityName =
-        Name.EntityName(this.connection.schemaName, CottontailConnection.RELATIONSHIP_ENTITY_NAME)
+        Name.EntityName.create(this.connection.schemaName, CottontailConnection.RELATIONSHIP_ENTITY_NAME)
 
     /**
      * Returns the [Retrievable]s that matches the provided [RetrievableId]

diff --git a/.../main/kotlin/org/vitrivr/engine/base/database/cottontail/retrievable/RetrievableWriter.kt b/.../main/kotlin/org/vitrivr/engine/base/database/cottontail/retrievable/RetrievableWriter.kt
@@ -35,10 +35,10 @@ private val logger: KLogger = KotlinLogging.logger {}
 internal class RetrievableWriter(private val connection: CottontailConnection) : RetrievableWriter {
 
     /** The [Name.EntityName] of the retrievable entity. */
-    private val entityName: Name.EntityName = Name.EntityName(this.connection.schemaName, CottontailConnection.RETRIEVABLE_ENTITY_NAME)
+    private val entityName: Name.EntityName = Name.EntityName.create(this.connection.schemaName, CottontailConnection.RETRIEVABLE_ENTITY_NAME)
 
     /** The [Name.EntityName] of the relationship entity. */
-    private val relationshipEntityName: Name.EntityName = Name.EntityName(this.connection.schemaName, CottontailConnection.RELATIONSHIP_ENTITY_NAME)
+    private val relationshipEntityName: Name.EntityName = Name.EntityName.create(this.connection.schemaName, CottontailConnection.RELATIONSHIP_ENTITY_NAME)
 
     /**
      * Adds a new [Retrievable] to the database using this [RetrievableWriter] instance.

diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/retrievable/Retrieved.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/retrievable/Retrieved.kt
@@ -110,6 +110,8 @@ interface Retrieved : Retrievable {
 
         fun PlusProperties(retrieved: Retrieved, properties: Map<String, String> = mutableMapOf()) = when(retrieved) {
             is RetrievedWithProperties -> retrieved
+            is ScorePlusRelationship -> ScorePlusRelationshipPlusProperties(retrieved, properties)
+
 
             //TODO other combinations
 
@@ -132,11 +134,16 @@ interface Retrieved : Retrievable {
         override val relationships: Set<Relationship> = mutableSetOf()
     ) : Retrieved by retrieved, RetrievedWithRelationship
 
-    class ScorePlusRelationship(
+    open class ScorePlusRelationship(
         retrieved: RetrievedWithScore,
         override val relationships: Set<Relationship> = mutableSetOf()
     ) : RetrievedWithScore by retrieved, RetrievedWithRelationship
 
+    class ScorePlusRelationshipPlusProperties(
+        retrieved: ScorePlusRelationship,
+        override val properties: Map<String, String> = mutableMapOf()
+    ) : ScorePlusRelationship(retrieved, retrieved.relationships), RetrievedWithProperties
+
     class RetrievedPlusProperties(
         retrieved: Retrieved,
         override val properties: Map<String, String> = mutableMapOf()