Skip to content

Commit

Permalink
Merge pull request #2552 from mbeddr/feature/Enable_Caching_of_ILogic…
Browse files Browse the repository at this point in the history 
…alChildren_at_ILogicalChildOwner_#2547

Add Caching mechanism (#2547)
  • Loading branch information
@dbinkele
dbinkele authored Oct 16, 2024
2 parents 399d728 + dc4c7f0 commit 59e9f3f
Show file tree
Hide file tree
Showing 10 changed files with 2,845 additions and 85 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ Semantic Versioning and the changes are simply documented in reverse chronologic

# October 2024

## com.mbeddr.mpsutil

### Feature

- Adds a caching mechanism for caching the retrieval of 'ILogicalChild' by 'ILogicalChildOwner'

## com.mbeddr.mpsutil.ecore

### Fixed
Expand Down
180 changes: 165 additions & 15 deletions ...uild/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,12 @@
<node concept="L2wRC" id="4JHJliM0gol" role="39821P">
<ref role="L2wRA" node="4JHJliM0g2K" resolve="test.com.mbeddr.mpsutil.ecore.modelImportExport" />
</node>
<node concept="L2wRC" id="6n0otOpma6w" role="39821P">
<ref role="L2wRA" node="6n0otOpkvEj" resolve="com.mbeddr.mpsutil.logicalChild.sandbox" />
</node>
<node concept="L2wRC" id="6n0otOpmcXq" role="39821P">
<ref role="L2wRA" node="6n0otOpkQ9s" resolve="test.com.mbeddr.mpsutil.logicalChild" />
</node>
<node concept="398223" id="2GRHOLIUBUT" role="39821P">
<node concept="3_J27D" id="2GRHOLIUBUV" role="Nbhlr">
<node concept="3Mxwew" id="2GRHOLIUC5d" role="3MwsjC">
Expand Down Expand Up @@ -1527,21 +1533,6 @@
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
</node>
</node>
<node concept="1SiIV0" id="bHMJKhDDfb" role="3bR37C">
<node concept="3bR9La" id="bHMJKhDDfc" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
</node>
</node>
<node concept="1SiIV0" id="bHMJKhDDfd" role="3bR37C">
<node concept="3bR9La" id="bHMJKhDDfe" role="1SiIV1">
<ref role="3bR37D" to="al5i:vOGyTeKPEA" resolve="com.mbeddr.mpsutil.ecore.testing" />
</node>
</node>
<node concept="1SiIV0" id="bHMJKhDDff" role="3bR37C">
<node concept="3bR9La" id="bHMJKhDDfg" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
</node>
</node>
<node concept="398BVA" id="bHMJKhDAXY" role="3LF7KH">
<ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
<node concept="2Ry0Ak" id="bHMJKhDAYF" role="iGT6I">
Expand Down Expand Up @@ -1592,6 +1583,21 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="bHMJKhDDfb" role="3bR37C">
<node concept="3bR9La" id="bHMJKhDDfc" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
</node>
</node>
<node concept="1SiIV0" id="bHMJKhDDfd" role="3bR37C">
<node concept="3bR9La" id="bHMJKhDDfe" role="1SiIV1">
<ref role="3bR37D" to="al5i:vOGyTeKPEA" resolve="com.mbeddr.mpsutil.ecore.testing" />
</node>
</node>
<node concept="1SiIV0" id="bHMJKhDDff" role="3bR37C">
<node concept="3bR9La" id="bHMJKhDDfg" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
</node>
</node>
</node>
<node concept="1E1JtD" id="4JHJliM0jp_" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -2737,6 +2743,147 @@
</node>
</node>
</node>
<node concept="1E1JtA" id="6n0otOpkQ9s" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="test.com.mbeddr.mpsutil.logicalChild" />
<property role="3LESm3" value="943c7443-45f4-48a4-a282-49cc46ddc1bf" />
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
<node concept="398BVA" id="6n0otOpkRio" role="3LF7KH">
<ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
<node concept="2Ry0Ak" id="6n0otOpkTbm" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="6n0otOpkV4X" role="2Ry0An">
<property role="2Ry0Am" value="test.com.mbeddr.mpsutil.logicalChild" />
<node concept="2Ry0Ak" id="6n0otOpkZvd" role="2Ry0An">
<property role="2Ry0Am" value="test.com.mbeddr.mpsutil.logicalChild.msd" />
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="6n0otOpl0Aw" role="3bR37C">
<node concept="3bR9La" id="6n0otOpl0Ax" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="6n0otOpl0Ay" role="3bR37C">
<node concept="3bR9La" id="6n0otOpl0Az" role="1SiIV1">
<ref role="3bR37D" node="6n0otOpkvEj" resolve="com.mbeddr.mpsutil.logicalChild.sandbox" />
</node>
</node>
<node concept="1BupzO" id="6n0otOpl0AQ" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="6n0otOpl0AR" role="1HemKq">
<node concept="398BVA" id="6n0otOpl0A$" role="3LXTmr">
<ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
<node concept="2Ry0Ak" id="6n0otOpl0A_" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="6n0otOpl0AA" role="2Ry0An">
<property role="2Ry0Am" value="test.com.mbeddr.mpsutil.logicalChild" />
<node concept="2Ry0Ak" id="6n0otOpl0AB" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="6n0otOpl0AS" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
<node concept="3rtmxn" id="3WyAxHbtRcO" role="3bR31x">
<node concept="3LXTmp" id="3WyAxHbtRcP" role="3rtmxm">
<node concept="3qWCbU" id="3WyAxHbtRcQ" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="3WyAxHbtRcR" role="3LXTmr">
<ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
<node concept="2Ry0Ak" id="3WyAxHbtRcS" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3WyAxHbtRcT" role="2Ry0An">
<property role="2Ry0Am" value="test.com.mbeddr.mpsutil.logicalChild" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtD" id="6n0otOpkvEj" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
<property role="3LESm3" value="286e2375-00e3-4042-b083-84873dd623be" />
<node concept="398BVA" id="6n0otOpkwJe" role="3LF7KH">
<ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
<node concept="2Ry0Ak" id="6n0otOpkywM" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="6n0otOpk$iZ" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
<node concept="2Ry0Ak" id="6n0otOpkA4y" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox.mpl" />
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="6n0otOpkB88" role="3bR37C">
<node concept="3bR9La" id="6n0otOpkB89" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
</node>
</node>
<node concept="1SiIV0" id="6n0otOpkB8a" role="3bR37C">
<node concept="3bR9La" id="6n0otOpkB8b" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
</node>
</node>
<node concept="1SiIV0" id="6n0otOpkB8c" role="3bR37C">
<node concept="3bR9La" id="6n0otOpkB8d" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
</node>
</node>
<node concept="1BupzO" id="6n0otOpkB8w" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="6n0otOpkB8x" role="1HemKq">
<node concept="398BVA" id="6n0otOpkB8e" role="3LXTmr">
<ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
<node concept="2Ry0Ak" id="6n0otOpkB8f" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="6n0otOpkB8g" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
<node concept="2Ry0Ak" id="6n0otOpkB8h" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="6n0otOpkB8y" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
<node concept="1SiIV0" id="6n0otOpkB8z" role="3bR37C">
<node concept="1Busua" id="6n0otOpkB8$" role="1SiIV1">
<ref role="1Busuk" to="al5i:3lcj7hzsmpl" resolve="com.mbeddr.mpsutil.logicalChild" />
</node>
</node>
<node concept="3rtmxn" id="3WyAxHbtRcV" role="3bR31x">
<node concept="3LXTmp" id="3WyAxHbtRcW" role="3rtmxm">
<node concept="3qWCbU" id="3WyAxHbtRcX" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="3WyAxHbtRcY" role="3LXTmr">
<ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
<node concept="2Ry0Ak" id="3WyAxHbtRcZ" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="3WyAxHbtRd0" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild.sandbox" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="4pIcGABAyzC" role="3989C9">
<property role="TrG5h" value="com.mbeddr.doc.tests" />
Expand Down Expand Up @@ -2885,6 +3032,9 @@
<node concept="22LTRM" id="4JHJliM0gmY" role="22LTRK">
<ref role="22LTRN" node="4JHJliM0g2K" resolve="test.com.mbeddr.mpsutil.ecore.modelImportExport" />
</node>
<node concept="22LTRM" id="6n0otOpmfAs" role="22LTRK">
<ref role="22LTRN" node="6n0otOpkQ9s" resolve="test.com.mbeddr.mpsutil.logicalChild" />
</node>
</node>
<node concept="2igEWh" id="3HpWboH_Z$G" role="1hWBAP">
<property role="2igJW4" value="true" />
Expand Down
15 changes: 10 additions & 5 deletions ...uages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20168,11 +20168,6 @@
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
</node>
</node>
<node concept="1SiIV0" id="3lcj7hzsBNN" role="3bR37C">
<node concept="3bR9La" id="3lcj7hzsBNO" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
</node>
</node>
<node concept="1BupzO" id="3lcj7hzsBO0" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
Expand Down Expand Up @@ -20211,6 +20206,16 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="5bVx5KEQpYM" role="3bR37C">
<node concept="3bR9La" id="5bVx5KEQpYN" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="5bVx5KEQpYO" role="3bR37C">
<node concept="3bR9La" id="5bVx5KEQpYP" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
</node>
</node>
</node>
</node>
<node concept="m$_wf" id="3lcj7hzsuXf" role="3989C9">
Expand Down
1 change: 1 addition & 0 deletions code/languages/com.mbeddr.mpsutil/.mps/modules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
<modulePath path="$PROJECT_DIR$/solutions/org.apache.batik/org.apache.batik.msd" folder="" />
<modulePath path="$PROJECT_DIR$/solutions/org.mockito/org.mockito.msd" folder="stubs" />
<modulePath path="$PROJECT_DIR$/solutions/org.xml/org.xml.msd" folder="" />
<modulePath path="$PROJECT_DIR$/solutions/test.com.mbeddr.mpsutil.logicalChild/test.com.mbeddr.mpsutil.logicalChild.msd" folder="logicalChild" />
<modulePath path="$PROJECT_DIR$/tests/com.mbeddr.mpsutil.compare.pattern.test/com.mbeddr.mpsutil.compare.pattern.test.msd" folder="staging.comparator" />
<modulePath path="$PROJECT_DIR$/tests/com.mbeddr.mpsutil.javainterpreter.test/com.mbeddr.mpsutil.javainterpreter.test.mpl" folder="staging.javainterpreter" />
<modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.asynccell/test.com.mbeddr.mpsutil.asynccell.msd" folder="asynccell" />
Expand Down
8 changes: 5 additions & 3 deletions ...ddr.mpsutil/languages/com.mbeddr.mpsutil.logicalChild/com.mbeddr.mpsutil.logicalChild.mpl
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<language namespace="com.mbeddr.mpsutil.logicalChild" uuid="85a9bace-37a1-40af-956a-7bb1b081a77c" languageVersion="0" moduleVersion="0">
<models>
<modelRoot contentPath="${module}" type="default">
<modelRoot type="default" contentPath="${module}">
<sourceRoot location="models" />
</modelRoot>
</models>
Expand All @@ -13,12 +13,13 @@
<accessoryModels />
<sourcePath />
<dependencies>
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
</dependencies>
<languageVersions>
<language slang="l:3eada220-3310-4fd3-b794-ff924add7d8a:com.mbeddr.mpsutil.smodule" version="0" />
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
<language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
Expand Down Expand Up @@ -55,6 +56,7 @@
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="85a9bace-37a1-40af-956a-7bb1b081a77c(com.mbeddr.mpsutil.logicalChild)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
Expand Down
Loading

0 comments on commit 59e9f3f

Please sign in to comment.