Changed schema to a named block approach

vitrivr · Aug 5, 2024 · cee071b · cee071b
1 parent 74ebaa8
commit cee071b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/config-schema.json b/config-schema.json
@@ -1,7 +1,6 @@
 {
-  "schemas": [
-    {
-      "name": "vitrivr",
+  "schemas": {
+    "vitrivr": {
       "connection": {
         "database": "CottontailConnectionProvider",
         "parameters": {
@@ -10,10 +9,18 @@
         }
       },
       "fields": {
-        "averagecolor": { "factory": "AverageColor" },
-        "file": { "factory": "FileSourceMetadata" },
-        "time": { "factory":  "TemporalMetadata" },
-        "video": { "factory":  "VideoSourceMetadata" }
+        "averagecolor": {
+          "factory": "AverageColor"
+        },
+        "file": {
+          "factory": "FileSourceMetadata"
+        },
+        "time": {
+          "factory": "TemporalMetadata"
+        },
+        "video": {
+          "factory": "VideoSourceMetadata"
+        }
       },
       "resolvers": {
         "disk": {
@@ -43,8 +50,10 @@
         }
       },
       "extractionPipelines": {
-        "ingestion": { "path": "./config-ingestion.json" }
+        "ingestion": {
+          "path": "./config-ingestion.json"
+        }
       }
     }
-  ]
+  }
 }
diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/config/schema/SchemaConfig.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/config/schema/SchemaConfig.kt
@@ -20,7 +20,7 @@ import java.nio.file.Paths
 @Serializable
 data class SchemaConfig(
     /** Name of the [Schema]. */
-    val name: String = "vitrivr",
+    var name: String = "vitrivr",
 
     /** The (database) [ConnectionConfig] for this [SchemaConfig]. */
     val connection: ConnectionConfig,

diff --git a/vitrivr-engine-server/src/main/kotlin/org/vitrivr/engine/server/Main.kt b/vitrivr-engine-server/src/main/kotlin/org/vitrivr/engine/server/Main.kt
@@ -31,7 +31,8 @@ fun main(args: Array<String>) {
 
     /* Setup schema manager. */
     val manager = SchemaManager()
-    for (schema in config.schemas) {
+    for ((name, schema) in config.schemas) {
+        schema.name = name
         manager.load(schema)
     }
 

diff --git a/vitrivr-engine-server/src/main/kotlin/org/vitrivr/engine/server/config/ServerConfig.kt b/vitrivr-engine-server/src/main/kotlin/org/vitrivr/engine/server/config/ServerConfig.kt
@@ -19,7 +19,7 @@ data class ServerConfig(
     val api: ApiConfig = ApiConfig(),
 
     /** List of [SchemaConfig] managed by this [ServerConfig]. */
-    val schemas: List<SchemaConfig>
+    val schemas: Map<String, SchemaConfig>
 ) {
     companion object {
         /** Default path to fall back to. */