Fix issue with Dependencies order which could cause crashes on migrat…

…ion check.
marykdb · Oct 24, 2024 · a7e43c3 · a7e43c3
1 parent 5deaf02
commit a7e43c3
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/core/src/commonMain/kotlin/maryk/core/properties/definitions/EmbeddedObjectDefinition.kt b/core/src/commonMain/kotlin/maryk/core/properties/definitions/EmbeddedObjectDefinition.kt
@@ -134,8 +134,8 @@ class EmbeddedObjectDefinition<DO : Any, DM : IsTypedObjectDataModel<DO, *, CXI,
 
     override fun getAllDependencies(dependencySet: MutableList<MarykPrimitive>) {
         if (!dependencySet.contains(dataModel as MarykPrimitive)) {
-            dependencySet.add(dataModel as MarykPrimitive)
             dataModel.getAllDependencies(dependencySet)
+            dependencySet.add(dataModel as MarykPrimitive)
         }
     }
 

diff --git a/core/src/commonMain/kotlin/maryk/core/properties/definitions/EmbeddedValuesDefinition.kt b/core/src/commonMain/kotlin/maryk/core/properties/definitions/EmbeddedValuesDefinition.kt
@@ -144,8 +144,8 @@ class EmbeddedValuesDefinition<DM : IsValuesDataModel>(
 
     override fun getAllDependencies(dependencySet: MutableList<MarykPrimitive>) {
         if (!dependencySet.contains(dataModel as MarykPrimitive)) {
-            dependencySet.add(dataModel as MarykPrimitive)
             dataModel.getAllDependencies(dependencySet)
+            dependencySet.add(dataModel as MarykPrimitive)
         }
     }
 

diff --git a/store/hbase/src/commonMain/kotlin/maryk/datastore/hbase/model/storeModelDefinition.kt b/store/hbase/src/commonMain/kotlin/maryk/datastore/hbase/model/storeModelDefinition.kt
@@ -53,8 +53,6 @@ suspend fun HbaseDataStore.storeModelDefinition(
 
     val dependencies = mutableListOf<MarykPrimitive>()
     dataModel.getAllDependencies(dependencies)
-    // Needs to be in reverse order to do sub dependencies first and then the higher up dependencies
-    dependencies.reverse()
 
     if (dependencies.isNotEmpty()) {
         val dependentCache = WriteCache()

diff --git a/store/rocksdb/src/commonMain/kotlin/maryk/datastore/rocksdb/model/storeModelDefinition.kt b/store/rocksdb/src/commonMain/kotlin/maryk/datastore/rocksdb/model/storeModelDefinition.kt
@@ -31,8 +31,6 @@ fun storeModelDefinition(
 
     val dependencies = mutableListOf<MarykPrimitive>()
     dataModel.getAllDependencies(dependencies)
-    // Needs to be in reverse order to do sub dependencies first and then the higher up dependencies
-    dependencies.reverse()
 
     if (dependencies.isNotEmpty()) {
         val dependentCache = WriteCache()