Merge branch 'dev' of github.com:vitrivr/vitrivr-engine into dev

vitrivr · May 29, 2024 · ce53093 · ce53093
2 parents 9176859 + a888831
commit ce53093
Show file tree

Hide file tree

Showing 78 changed files with 199 additions and 195 deletions.
diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/Descriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/Descriptor.kt
@@ -18,16 +18,15 @@ typealias DescriptorId = UUID
  */
 interface Descriptor : Persistable {
     /** The [DescriptorId] held by this [Descriptor]. */
-    val id: DescriptorId
+    var id: DescriptorId
 
     /** The [RetrievableId] of the [Retrievable] that is being described by this [Descriptor]. */
-    val retrievableId: RetrievableId?
+    var retrievableId: RetrievableId?
 
     /** The [Schema.Field] backing this [Descriptor]. */
     val field: Schema.Field<*, out Descriptor>?
 
-
-    /** */
+    /** Flag indicating whether this [Descriptor] is persistent or not. */
     override val transient: Boolean
         get() = this.field != null
 

diff --git a/...core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/BooleanDescriptor.kt b/...core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/BooleanDescriptor.kt
@@ -15,8 +15,8 @@ import org.vitrivr.engine.core.model.types.Value
  */
 
 data class BooleanDescriptor(
-    override val id: DescriptorId,
-    override val retrievableId: RetrievableId,
+    override var id: DescriptorId,
+    override var retrievableId: RetrievableId?,
     override val value: Value.Boolean,
     override val field: Schema.Field<*, BooleanDescriptor>? = null
 ) : ScalarDescriptor<Value.Boolean> {

diff --git a/...-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/DoubleDescriptor.kt b/...-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/DoubleDescriptor.kt
@@ -15,8 +15,8 @@ import org.vitrivr.engine.core.model.types.Value
  */
 
 data class DoubleDescriptor(
-    override val id: DescriptorId,
-    override val retrievableId: RetrievableId,
+    override var id: DescriptorId,
+    override var retrievableId: RetrievableId?,
     override val value: Value.Double,
     override val field: Schema.Field<*, DoubleDescriptor>? = null
 ) : ScalarDescriptor<Value.Double> {

diff --git a/...e-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/FloatDescriptor.kt b/...e-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/FloatDescriptor.kt
@@ -15,8 +15,8 @@ import org.vitrivr.engine.core.model.types.Value
  */
 
 data class FloatDescriptor(
-    override val id: DescriptorId,
-    override val retrievableId: RetrievableId,
+    override var id: DescriptorId,
+    override var retrievableId: RetrievableId?,
     override val value: Value.Float,
     override val field: Schema.Field<*, FloatDescriptor>? = null
 ) : ScalarDescriptor<Value.Float> {

diff --git a/...ine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/IntDescriptor.kt b/...ine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/IntDescriptor.kt
@@ -15,8 +15,8 @@ import org.vitrivr.engine.core.model.types.Value
  */
 
 data class IntDescriptor(
-    override val id: DescriptorId,
-    override val retrievableId: RetrievableId,
+    override var id: DescriptorId,
+    override var retrievableId: RetrievableId?,
     override val value: Value.Int,
     override val field: Schema.Field<*, IntDescriptor>? = null
 ) : ScalarDescriptor<Value.Int> {

diff --git a/...ne-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/LongDescriptor.kt b/...ne-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/LongDescriptor.kt
@@ -15,8 +15,8 @@ import org.vitrivr.engine.core.model.types.Value
  */
 
 data class LongDescriptor(
-    override val id: DescriptorId,
-    override val retrievableId: RetrievableId,
+    override var id: DescriptorId,
+    override var retrievableId: RetrievableId?,
     override val value: Value.Long,
     override val field: Schema.Field<*, LongDescriptor>? = null
 ) : ScalarDescriptor<Value.Long> {

diff --git a/...-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/StringDescriptor.kt b/...-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/StringDescriptor.kt
@@ -15,8 +15,8 @@ import org.vitrivr.engine.core.model.types.Value
  */
 
 data class StringDescriptor(
-    override val id: DescriptorId,
-    override val retrievableId: RetrievableId?,
+    override var id: DescriptorId,
+    override var retrievableId: RetrievableId?,
     override val value: Value.String,
     override val field: Schema.Field<*, StringDescriptor>? = null
 ) : ScalarDescriptor<Value.String> {

diff --git a/...e-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/LabelDescriptor.kt b/...e-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/LabelDescriptor.kt
@@ -14,8 +14,8 @@ import org.vitrivr.engine.core.model.types.Value
  * @version 1.0.0
  */
 data class LabelDescriptor(
-    override val id: DescriptorId,
-    override val retrievableId: RetrievableId?,
+    override var id: DescriptorId,
+    override var retrievableId: RetrievableId?,
     val label: Value.String,
     val confidence: Value.Float,
     override val field: Schema.Field<*, LabelDescriptor>? = null

diff --git a/...-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/RasterDescriptor.kt b/...-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/RasterDescriptor.kt
@@ -8,8 +8,8 @@ import org.vitrivr.engine.core.model.types.Type
 import org.vitrivr.engine.core.model.types.Value
 
 data class RasterDescriptor(
-    override val id: DescriptorId,
-    override val retrievableId: RetrievableId,
+    override var id: DescriptorId,
+    override var retrievableId: RetrievableId?,
     val hist: List<Value.Float>,
     val raster: List<Value.Float>,
     override val field: Schema.Field<*, RasterDescriptor>? = null

diff --git a/...ore/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/SkeletonDescriptor.kt b/...ore/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/SkeletonDescriptor.kt
@@ -8,8 +8,8 @@ import org.vitrivr.engine.core.model.types.Type
 import org.vitrivr.engine.core.model.types.Value
 
 data class SkeletonDescriptor(
-    override val id: DescriptorId,
-    override val retrievableId: RetrievableId,
+    override var id: DescriptorId,
+    override var retrievableId: RetrievableId?,
     val person: Value.Int,
     val skeleton: List<Value.Float>,
     val weights: List<Value.Float>,

diff --git a/...lin/org/vitrivr/engine/core/model/descriptor/struct/metadata/MediaDimensionsDescriptor.kt b/...lin/org/vitrivr/engine/core/model/descriptor/struct/metadata/MediaDimensionsDescriptor.kt
@@ -17,8 +17,8 @@ import java.util.*
  * @version 1.0.0
  */
 data class MediaDimensionsDescriptor(
-    override val id: DescriptorId,
-    override val retrievableId: RetrievableId,
+    override var id: DescriptorId,
+    override var retrievableId: RetrievableId?,
     val width: Value.Int,
     val height: Value.Int,
     override val field: Schema.Field<*, MediaDimensionsDescriptor>? = null

diff --git a/...org/vitrivr/engine/core/model/descriptor/struct/metadata/Rectangle2DMetadataDescriptor.kt b/...org/vitrivr/engine/core/model/descriptor/struct/metadata/Rectangle2DMetadataDescriptor.kt
@@ -16,8 +16,8 @@ import java.util.*
  * @version 1.0.0
  */
 data class Rectangle2DMetadataDescriptor(
-    override val id: DescriptorId,
-    override val retrievableId: RetrievableId,
+    override var id: DescriptorId,
+    override var retrievableId: RetrievableId?,
     val leftX: Value.Int,
     val leftY: Value.Int,
     val width: Value.Int,

diff --git a/...in/org/vitrivr/engine/core/model/descriptor/struct/metadata/TemporalMetadataDescriptor.kt b/...in/org/vitrivr/engine/core/model/descriptor/struct/metadata/TemporalMetadataDescriptor.kt
@@ -16,8 +16,8 @@ import java.util.*
  * @version 1.0.0
  */
 data class TemporalMetadataDescriptor(
-    override val id: DescriptorId,
-    override val retrievableId: RetrievableId, //retrievable Id must come first, due to reflection
+    override var id: DescriptorId,
+    override var retrievableId: RetrievableId?, //retrievable Id must come first, due to reflection
     val startNs: Value.Long,
     val endNs: Value.Long,
     override val field: Schema.Field<*, TemporalMetadataDescriptor>? = null

diff --git a/...trivr/engine/core/model/descriptor/struct/metadata/source/FileSourceMetadataDescriptor.kt b/...trivr/engine/core/model/descriptor/struct/metadata/source/FileSourceMetadataDescriptor.kt
@@ -16,8 +16,8 @@ import java.util.*
  * @version 1.0.0
  */
 data class FileSourceMetadataDescriptor(
-    override val id: DescriptorId,
-    override val retrievableId: RetrievableId,
+    override var id: DescriptorId,
+    override var retrievableId: RetrievableId?,
     val path: Value.String,
     val size: Value.Long,
     override val field: Schema.Field<*, FileSourceMetadataDescriptor>? = null

diff --git a/...in/org/vitrivr/engine/core/model/descriptor/struct/metadata/source/MapStructDescriptor.kt b/...in/org/vitrivr/engine/core/model/descriptor/struct/metadata/source/MapStructDescriptor.kt
@@ -10,8 +10,8 @@ import org.vitrivr.engine.core.model.types.Value
 import java.util.*
 
 data class MapStructDescriptor(
-    override val id: DescriptorId,
-    override val retrievableId: RetrievableId,
+    override var id: DescriptorId,
+    override var retrievableId: RetrievableId?,
     val columnTypes: Map<String, String>,
     val columnValues: Map<String, Any?>,
     override val transient: Boolean = false,

diff --git a/...rivr/engine/core/model/descriptor/struct/metadata/source/VideoSourceMetadataDescriptor.kt b/...rivr/engine/core/model/descriptor/struct/metadata/source/VideoSourceMetadataDescriptor.kt
@@ -16,8 +16,8 @@ import java.util.*
  * @version 1.0.0
  */
 class VideoSourceMetadataDescriptor(
-    override val id: DescriptorId,
-    override val retrievableId: RetrievableId,
+    override var id: DescriptorId,
+    override var retrievableId: RetrievableId?,
     val width: Value.Int,
     val height: Value.Int,
     val fps: Value.Double,

diff --git a/...rc/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/BooleanVectorDescriptor.kt b/...rc/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/BooleanVectorDescriptor.kt
@@ -16,8 +16,8 @@ import java.util.*
  */
 
 data class BooleanVectorDescriptor(
-    override val id: UUID = UUID.randomUUID(),
-    override val retrievableId: RetrievableId? = null,
+    override var id: UUID = UUID.randomUUID(),
+    override var retrievableId: RetrievableId? = null,
     override val vector: List<Value.Boolean>,
     override val field: Schema.Field<*, BooleanVectorDescriptor>? = null
 ) : VectorDescriptor<Value.Boolean> {

diff --git a/...src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/DoubleVectorDescriptor.kt b/...src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/DoubleVectorDescriptor.kt
@@ -16,8 +16,8 @@ import java.util.*
  */
 
 data class DoubleVectorDescriptor(
-    override val id: UUID = UUID.randomUUID(),
-    override val retrievableId: RetrievableId? = null,
+    override var id: UUID = UUID.randomUUID(),
+    override var retrievableId: RetrievableId? = null,
     override val vector: List<Value.Double>,
     override val field: Schema.Field<*, DoubleVectorDescriptor>? = null
 ) : VectorDescriptor<Value.Double> {

diff --git a/.../src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/FloatVectorDescriptor.kt b/.../src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/FloatVectorDescriptor.kt
@@ -17,8 +17,8 @@ import java.util.*
  */
 
 data class FloatVectorDescriptor(
-    override val id: UUID = UUID.randomUUID(),
-    override val retrievableId: RetrievableId? = null,
+    override var id: UUID = UUID.randomUUID(),
+    override var retrievableId: RetrievableId? = null,
     override val vector: List<Value.Float>,
     override val field: Schema.Field<*, FloatVectorDescriptor>? = null
 ) : VectorDescriptor<Value.Float> {

diff --git a/...re/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/IntVectorDescriptor.kt b/...re/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/IntVectorDescriptor.kt
@@ -16,8 +16,8 @@ import java.util.*
  */
 
 data class IntVectorDescriptor(
-    override val id: UUID = UUID.randomUUID(),
-    override val retrievableId: RetrievableId? = null,
+    override var id: UUID = UUID.randomUUID(),
+    override var retrievableId: RetrievableId? = null,
     override val vector: List<Value.Int>,
     override val field: Schema.Field<*, IntVectorDescriptor>? = null
 ) : VectorDescriptor<Value.Int> {

diff --git a/...e/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/LongVectorDescriptor.kt b/...e/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/LongVectorDescriptor.kt
@@ -16,8 +16,8 @@ import java.util.*
  */
 
 data class LongVectorDescriptor(
-    override val id: UUID = UUID.randomUUID(),
-    override val retrievableId: RetrievableId? = null,
+    override var id: UUID = UUID.randomUUID(),
+    override var retrievableId: RetrievableId? = null,
     override val vector: List<Value.Long>,
     override val field: Schema.Field<*, LongVectorDescriptor>? = null
 ) : VectorDescriptor<Value.Long> {

diff --git a/...gine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/Common.kt b/...gine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/Common.kt
@@ -10,6 +10,7 @@ import org.vitrivr.engine.core.model.query.basics.ComparisonOperator
 import org.vitrivr.engine.core.model.query.bool.SimpleBooleanQuery
 import org.vitrivr.engine.core.model.types.Type
 import org.vitrivr.engine.core.model.types.Value
+import java.util.*
 
 /** The name of the retrievable entity. */
 const val RETRIEVABLE_ENTITY_NAME = "retrievable"
@@ -106,6 +107,34 @@ internal fun SimpleBooleanQuery<*>.operator() = when (this.comparison) {
     ComparisonOperator.GEQ -> Compare.Operator.GEQUAL
 }
 
+/**
+ * Tries to convert this [Any] to a [PublicValue] (Cottontail DB).
+ *
+ * @return [PublicValue] for this [Any]
+ */
+internal fun Any.toCottontailValue(): PublicValue = when (this)  {
+    is UUID -> UuidValue(this)
+    is String -> StringValue(this)
+    is Boolean -> BooleanValue(this)
+    is Byte -> ByteValue(this)
+    is Short -> ShortValue(this)
+    is Int -> IntValue(this)
+    is Long -> LongValue(this)
+    is Float -> FloatValue(this)
+    is Double -> DoubleValue(this)
+    is Date -> DateValue(this)
+    is Value.Boolean -> BooleanValue(this.value)
+    is Value.Byte -> ByteValue(this.value)
+    is Value.Double -> DoubleValue(this.value)
+    is Value.Float -> FloatValue(this.value)
+    is Value.Int -> IntValue(this.value)
+    is Value.Long -> LongValue(this.value)
+    is Value.Short -> ShortValue(this.value)
+    is Value.String -> StringValue(this.value)
+    is Value.DateTime -> DateValue(this.value)
+    else -> throw IllegalArgumentException("Unsupported type for vector value.")
+}
+
 /**
  * Converts this [Value] (vitrivr-engine) to a [PublicValue] (Cottontail DB).
  *

diff --git a/...otlin/org/vitrivr/engine/plugin/cottontaildb/descriptors/struct/StructDescriptorWriter.kt b/...otlin/org/vitrivr/engine/plugin/cottontaildb/descriptors/struct/StructDescriptorWriter.kt
@@ -9,15 +9,14 @@ import org.vitrivr.cottontail.client.language.basics.predicate.Compare
 import org.vitrivr.cottontail.client.language.dml.BatchInsert
 import org.vitrivr.cottontail.client.language.dml.Insert
 import org.vitrivr.cottontail.client.language.dml.Update
-import org.vitrivr.cottontail.core.values.*
+import org.vitrivr.cottontail.core.values.UuidValue
 import org.vitrivr.engine.core.model.descriptor.struct.StructDescriptor
 import org.vitrivr.engine.core.model.metamodel.Schema
-import org.vitrivr.engine.core.model.types.Value
 import org.vitrivr.engine.plugin.cottontaildb.CottontailConnection
 import org.vitrivr.engine.plugin.cottontaildb.DESCRIPTOR_ID_COLUMN_NAME
 import org.vitrivr.engine.plugin.cottontaildb.RETRIEVABLE_ID_COLUMN_NAME
 import org.vitrivr.engine.plugin.cottontaildb.descriptors.AbstractDescriptorWriter
-import java.util.*
+import org.vitrivr.engine.plugin.cottontaildb.toCottontailValue
 
 private val logger: KLogger = KotlinLogging.logger {}
 
@@ -43,29 +42,7 @@ class StructDescriptorWriter(field: Schema.Field<*, StructDescriptor>, connectio
 
         /* Append fields. */
         for ((field, value) in item.values()) {
-            insert.value(
-                field, when (value) {
-                    null -> null
-                    is UUID -> UuidValue(value)
-                    is String -> StringValue(value)
-                    is Value.String -> StringValue(value.value)
-                    is Boolean -> BooleanValue(value)
-                    is Value.Boolean -> BooleanValue(value.value)
-                    is Byte -> ByteValue(value)
-                    is Value.Byte -> ByteValue(value.value)
-                    is Short -> ShortValue(value)
-                    is Value.Short -> ShortValue(value.value)
-                    is Int -> IntValue(value)
-                    is Value.Int -> IntValue(value.value)
-                    is Long -> LongValue(value)
-                    is Value.Long -> LongValue(value.value)
-                    is Float -> FloatValue(value)
-                    is Value.Float -> FloatValue(value.value)
-                    is Double -> DoubleValue(value)
-                    is Value.Double -> DoubleValue(value.value)
-                    else -> throw IllegalArgumentException("Unsupported type ${value::class.simpleName} for struct descriptor.")
-                }
-            )
+            insert.value(field, value?.toCottontailValue())
         }
 
         return try {
@@ -106,29 +83,7 @@ class StructDescriptorWriter(field: Schema.Field<*, StructDescriptor>, connectio
                 when (it) {
                     0 -> UuidValue(item.id)
                     1 -> item.retrievableId?.let { v -> UuidValue(v) }
-                    else -> when (val v = values[it - 2].second) {
-                        null -> null
-                        is UUID -> UuidValue(v)
-                        is String -> StringValue(v)
-                        is Value.String -> StringValue(v.value)
-                        is Boolean -> BooleanValue(v)
-                        is Value.Boolean -> BooleanValue(v.value)
-                        is Byte -> ByteValue(v)
-                        is Value.Byte -> ByteValue(v.value)
-                        is Short -> ShortValue(v)
-                        is Value.Short -> ShortValue(v.value)
-                        is Int -> IntValue(v)
-                        is Value.Int -> IntValue(v.value)
-                        is Long -> LongValue(v)
-                        is Value.Long -> LongValue(v.value)
-                        is Float -> FloatValue(v)
-                        is Value.Float -> FloatValue(v.value)
-                        is Double -> DoubleValue(v)
-                        is Value.Double -> DoubleValue(v.value)
-                        is Date -> DateValue(v)
-                        is Value.DateTime -> DateValue(v.value)
-                        else -> throw IllegalArgumentException("Unsupported type ${v::class.simpleName} for struct descriptor.")
-                    }
+                    else -> values[it - 2].second?.toCottontailValue()
                 }
             }
             insert.any(*inserts)
@@ -163,7 +118,7 @@ class StructDescriptorWriter(field: Schema.Field<*, StructDescriptor>, connectio
 
         /* Append values. */
         for ((field, value) in item.values()) {
-            update.any(field to value)
+            update.any(field to value?.toCottontailValue())
         }
 
         /* Update values. */