Merge pull request #532 from modelix/bugfix/MODELIX-773

MODELIX-777 model-server 4.10.0 does not return any data in ModelQl queries

Author: mhuster23

model-datastructure/src/jvmMain/kotlin/org/modelix/model/InMemoryModel.kt

@@ -106,14 +106,15 @@ class InMemoryModel private constructor(
     val branchId: String,
     val loadedMapRef: KVEntryReference<CPHamtNode>,
     val nodeMap: TLongObjectMap<CPNode>,
+    val useRoleIds: Boolean,
 ) {
 
     companion object {
         fun load(tree: CLTree): InMemoryModel {
-            return load(tree.getId(), tree.data.idToHash, tree.store.keyValueStore)
+            return load(tree.getId(), tree.data.idToHash, tree.store.keyValueStore, tree.usesRoleIds())
         }
 
-        fun load(branchId: String, slowMapRef: KVEntryReference<CPHamtNode>, store: IKeyValueStore): InMemoryModel {
+        fun load(branchId: String, slowMapRef: KVEntryReference<CPHamtNode>, store: IKeyValueStore, useRoleIds: Boolean): InMemoryModel {
             val fastMap: TLongObjectMap<CPNode> = TLongObjectHashMap()
             val bulkQuery = NonCachingObjectStore(store).newBulkQuery()
             LOG.info { "Start loading model into memory" }
@@ -130,14 +131,14 @@ class InMemoryModel private constructor(
                 bulkQuery.process()
             }.milliseconds
             LOG.info { "Done loading model into memory after ${duration.toDouble(DurationUnit.SECONDS)} s" }
-            return InMemoryModel(branchId, slowMapRef, fastMap)
+            return InMemoryModel(branchId, slowMapRef, fastMap, useRoleIds)
         }
     }
 
     fun loadIncremental(tree: CLTree): InMemoryModel {
-        return loadIncremental(tree.data.idToHash, tree.store.keyValueStore)
+        return loadIncremental(tree.data.idToHash, tree.store.keyValueStore, tree.usesRoleIds())
     }
-    fun loadIncremental(slowMapRef: KVEntryReference<CPHamtNode>, store: IKeyValueStore): InMemoryModel {
+    fun loadIncremental(slowMapRef: KVEntryReference<CPHamtNode>, store: IKeyValueStore, useRoleIds: Boolean): InMemoryModel {
         if (slowMapRef.getHash() == loadedMapRef.getHash()) return this
 
         val fastMap: TLongObjectMap<CPNode> = TLongObjectHashMap()
@@ -180,7 +181,7 @@ class InMemoryModel private constructor(
             bulkQuery.process()
         }.milliseconds
         LOG.info { "Done updating model after ${duration.toDouble(DurationUnit.SECONDS)} s" }
-        return InMemoryModel(branchId, slowMapRef, fastMap)
+        return InMemoryModel(branchId, slowMapRef, fastMap, useRoleIds)
     }
 
     fun getNodeData(nodeId: Long): CPNode = nodeMap.get(nodeId)
@@ -253,6 +254,9 @@ class InMemoryModel private constructor(
 }
 
 data class InMemoryNode(val model: InMemoryModel, val nodeId: Long) : INode, INodeReference {
+
+    override fun usesRoleIds(): Boolean = model.useRoleIds
+
     fun getNodeData(): CPNode = model.getNodeData(nodeId)
 
     override fun serialize(): String {

model-datastructure/src/jvmTest/kotlin/org/modelix/model/InMemoryModelTest.kt

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2024.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.modelix.model
+
+import org.junit.Test
+import org.modelix.model.api.BuiltinLanguages
+import org.modelix.model.api.TreePointer
+import org.modelix.model.api.getRootNode
+import org.modelix.model.client.IdGenerator
+import org.modelix.model.lazy.CLTree
+import org.modelix.model.lazy.ObjectStoreCache
+import org.modelix.model.lazy.RepositoryId
+import org.modelix.model.persistent.CPTree
+import org.modelix.model.persistent.MapBasedStore
+import kotlin.test.assertEquals
+
+class InMemoryModelTest {
+
+    @Test
+    fun `built-in properties can be resolved - use role ids`() = `built-in properties can be resolved`(true)
+
+    @Test
+    fun `built-in properties can be resolved - use role names`() = `built-in properties can be resolved`(false)
+
+    private fun `built-in properties can be resolved`(useRoleIds: Boolean) {
+        val tree = CLTree(null as CPTree?, null as RepositoryId?, ObjectStoreCache(MapBasedStore()), useRoleIds = useRoleIds)
+        val treePointer = TreePointer(tree, IdGenerator.getInstance(1))
+        val expected = "MyModel"
+
+        treePointer.runWrite {
+            val root = treePointer.getRootNode()
+            root.addNewChild(BuiltinLanguages.MPSRepositoryConcepts.Repository.modules, -1, BuiltinLanguages.MPSRepositoryConcepts.Module).apply {
+                setPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name, expected)
+            }
+        }
+
+        val inMemoryModel = InMemoryModel.load(treePointer.tree as CLTree)
+        val inMemoryNode = inMemoryModel.getArea().getRoot().allChildren.first()
+        val actual = inMemoryNode.getPropertyValue(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name)
+        assertEquals(expected, actual)
+    }
+}