Merge pull request #639 from samply/release-v0.16.1

Release v0.16.1
samply · Mar 7, 2022 · f7d26bf · f7d26bf
2 parents 9b2e026 + 87b90dc
commit f7d26bf
Show file tree

Hide file tree

Showing 143 changed files with 4,304 additions and 2,589 deletions.
diff --git a/.github/scripts/evaluate-measure-subject-list.sh b/.github/scripts/evaluate-measure-subject-list.sh
@@ -103,7 +103,7 @@ evaluate-measure() {
 }
 
 fetch-patients() {
-  curl -s "$1/Patient?_list=$2&_count=100"
+  curl -s "$1/Patient?_list=$2&_count=200"
 }
 
 BASE="http://localhost:8080/fhir"

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,10 +22,10 @@ jobs:
     - name: Setup clj-kondo
       uses: DeLaGuardo/setup-clj-kondo@master
       with:
-        version: '2022.02.09'
+        version: '2022.03.04'
 
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Lint
       run: make lint
@@ -76,18 +76,18 @@ jobs:
 
     steps:
     - name: Setup Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java-version }}
 
     - name: Setup Clojure
       uses: DeLaGuardo/setup-clojure@master
       with:
-        tools-deps: '1.10.3.1082'
+        tools-deps: '1.10.3.1087'
 
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Cache Local Maven Repo
       uses: actions/cache@v2
@@ -107,18 +107,18 @@ jobs:
 
     steps:
     - name: Setup Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '17'
 
     - name: Setup Clojure
       uses: DeLaGuardo/setup-clojure@master
       with:
-        tools-deps: '1.10.3.1082'
+        tools-deps: '1.10.3.1087'
 
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Cache Local Maven Repo
       uses: actions/cache@v2
@@ -149,18 +149,18 @@ jobs:
 
     steps:
     - name: Setup Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java-version }}
 
     - name: Setup Clojure
       uses: DeLaGuardo/setup-clojure@master
       with:
-        tools-deps: '1.10.3.1082'
+        tools-deps: '1.10.3.1087'
 
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Cache Local Maven Repo
       uses: actions/cache@v2
@@ -177,18 +177,18 @@ jobs:
 
     steps:
     - name: Setup Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '17'
 
     - name: Setup Clojure
       uses: DeLaGuardo/setup-clojure@master
       with:
-        tools-deps: '1.10.3.1082'
+        tools-deps: '1.10.3.1087'
 
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Cache Local Maven Repo
       uses: actions/cache@v2
@@ -267,7 +267,7 @@ jobs:
 
     steps:
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Install Blazectl
       run: .github/scripts/install-blazectl.sh
@@ -304,7 +304,7 @@ jobs:
       run: .github/scripts/check-total-number-of-resources.sh 92114
 
     - name: Count Resources
-      run: blazectl --no-progress --server http://localhost:8080/fhir count-resources
+      run: blazectl count-resources --server http://localhost:8080/fhir
 
     - name: Download Patient Resources
       run: .github/scripts/download-resources.sh Patient
@@ -372,6 +372,12 @@ jobs:
     - name: Evaluate CQL Query 2 - Subject List
       run: .github/scripts/evaluate-measure-subject-list.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q2-query.cql 42
 
+    - name: Evaluate CQL Query 4
+      run: .github/scripts/evaluate-measure.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q4-query.cql 0
+
+    - name: Evaluate CQL Query 4 - Subject List
+      run: .github/scripts/evaluate-measure-subject-list.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q4-query.cql 0
+
     - name: Evaluate CQL Query 7
       run: .github/scripts/evaluate-measure.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q7-query.cql 81
 
@@ -384,6 +390,30 @@ jobs:
     - name: Evaluate CQL Query 14 - Subject List
       run: .github/scripts/evaluate-measure-subject-list.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q14-query.cql 96
 
+    - name: Evaluate CQL Query 15
+      run: .github/scripts/evaluate-measure.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q15-query.cql 31
+
+    - name: Evaluate CQL Query 15 - Subject List
+      run: .github/scripts/evaluate-measure-subject-list.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q15-query.cql 31
+
+    - name: Evaluate CQL Query 17
+      run: .github/scripts/evaluate-measure.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q17-query.cql 120
+
+    - name: Evaluate CQL Query 17 - Subject List
+      run: .github/scripts/evaluate-measure-subject-list.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q17-query.cql 120
+
+    - name: Evaluate CQL Query 36
+      run: .github/scripts/evaluate-measure.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q36-parameter-query.cql 86
+
+    - name: Evaluate CQL Query 36 - Subject List
+      run: .github/scripts/evaluate-measure-subject-list.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q36-parameter-query.cql 86
+
+    - name: Evaluate CQL Query 34
+      run: .github/scripts/evaluate-measure.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q37-overlaps-query.cql 24
+
+    - name: Evaluate CQL Query 34 - Subject List
+      run: .github/scripts/evaluate-measure-subject-list.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q37-overlaps-query.cql 24
+
     - name: Forwarded Header HTTPS
       run: .github/scripts/forwarded-header.sh https
 
@@ -426,7 +456,7 @@ jobs:
 
     steps:
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Install Blazectl
       run: .github/scripts/install-blazectl.sh
@@ -472,7 +502,7 @@ jobs:
 
     steps:
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Install Blazectl
       run: .github/scripts/install-blazectl.sh
@@ -514,18 +544,18 @@ jobs:
 
     steps:
     - name: Setup Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '17'
 
     - name: Setup Clojure
       uses: DeLaGuardo/setup-clojure@master
       with:
-        tools-deps: '1.10.3.1082'
+        tools-deps: '1.10.3.1087'
 
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Cache Local Maven Repo
       uses: actions/cache@v2
@@ -570,7 +600,7 @@ jobs:
 
     steps:
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v1
@@ -603,7 +633,7 @@ jobs:
 
     steps:
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Install Blazectl
       run: .github/scripts/install-blazectl.sh
@@ -658,7 +688,7 @@ jobs:
       run: .github/scripts/check-total-number-of-resources.sh 92114
 
     - name: Count Resources
-      run: blazectl --no-progress --server http://localhost:8080/fhir count-resources
+      run: blazectl count-resources --server http://localhost:8080/fhir
 
     - name: Download Patient Resources
       run: .github/scripts/download-resources.sh Patient
@@ -726,6 +756,12 @@ jobs:
     - name: Evaluate CQL Query 2 - Subject List
       run: .github/scripts/evaluate-measure-subject-list.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q2-query.cql 42
 
+    - name: Evaluate CQL Query 4
+      run: .github/scripts/evaluate-measure.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q4-query.cql 0
+
+    - name: Evaluate CQL Query 4 - Subject List
+      run: .github/scripts/evaluate-measure-subject-list.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q4-query.cql 0
+
     - name: Evaluate CQL Query 7
       run: .github/scripts/evaluate-measure.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q7-query.cql 81
 
@@ -738,6 +774,30 @@ jobs:
     - name: Evaluate CQL Query 14 - Subject List
       run: .github/scripts/evaluate-measure-subject-list.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q14-query.cql 96
 
+    - name: Evaluate CQL Query 15
+      run: .github/scripts/evaluate-measure.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q15-query.cql 31
+
+    - name: Evaluate CQL Query 15 - Subject List
+      run: .github/scripts/evaluate-measure-subject-list.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q15-query.cql 31
+
+    - name: Evaluate CQL Query 17
+      run: .github/scripts/evaluate-measure.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q17-query.cql 120
+
+    - name: Evaluate CQL Query 17 - Subject List
+      run: .github/scripts/evaluate-measure-subject-list.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q17-query.cql 120
+
+    - name: Evaluate CQL Query 36
+      run: .github/scripts/evaluate-measure.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q36-parameter-query.cql 86
+
+    - name: Evaluate CQL Query 36 - Subject List
+      run: .github/scripts/evaluate-measure-subject-list.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q36-parameter-query.cql 86
+
+    - name: Evaluate CQL Query 34
+      run: .github/scripts/evaluate-measure.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q37-overlaps-query.cql 24
+
+    - name: Evaluate CQL Query 34 - Subject List
+      run: .github/scripts/evaluate-measure-subject-list.sh modules/operation-measure-evaluate-measure/test/blaze/fhir/operation/evaluate_measure/q37-overlaps-query.cql 24
+
     - name: Forwarded Header HTTPS
       run: .github/scripts/forwarded-header.sh https
 
@@ -786,18 +846,18 @@ jobs:
 
     steps:
     - name: Setup Java
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '17'
 
     - name: Setup Clojure
       uses: DeLaGuardo/setup-clojure@master
       with:
-        tools-deps: '1.10.3.1082'
+        tools-deps: '1.10.3.1087'
 
     - name: Check out Git repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Cache Local Maven Repo
       uses: actions/cache@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## v0.16.1
+
+### Performance Improvements
+
+* Improve CQL Quantity Creation ([#621](https://github.com/samply/blaze/pull/621))
+* Improve FHIRPath Performance ([#617](https://github.com/samply/blaze/pull/617))
+* Intern Uri, Canonical, Code, Coding and CodeableConcept ([#628](https://github.com/samply/blaze/pull/628))
+* Use Records For HumanName and Address, Intern Meta ([#633](https://github.com/samply/blaze/pull/633))
+
+The full changelog can be found [here](https://github.com/samply/blaze/milestone/31?closed=1).
+
 ## v0.16.0
 
 ### New Features

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ The goal of this project is to provide a FHIR® Store with an internal CQL Evalu
 
 Blaze passes all [Touchstone FHIR 4.0.1 Basic Tests][12] and almost all [CQL Tests][3]. Please refer to the [Conformance](docs/conformance.md) section and report any issues you encounter during evaluation.
 
-Latest release: [v0.16.0][5]
+Latest release: [v0.16.1][5]
 
 ## Quick Start
 
@@ -72,7 +72,7 @@ Unless required by applicable law or agreed to in writing, software distributed
 
 [3]: <https://cql.hl7.org/tests.html>
 [4]: <https://alexanderkiel.gitbook.io/blaze/deployment>
-[5]: <https://github.com/samply/blaze/releases/tag/v0.16.0>
+[5]: <https://github.com/samply/blaze/releases/tag/v0.16.1>
 [6]: <https://www.yourkit.com/java/profiler/>
 [7]: <https://www.yourkit.com/.net/profiler/>
 [8]: <https://www.yourkit.com/youmonitor/>

diff --git a/deps.edn b/deps.edn
@@ -78,7 +78,7 @@
   :outdated
   {:replace-deps
    {com.github.liquidz/antq
-    {:mvn/version "1.5.0"}
+    {:mvn/version "1.6.0"}
 
     org.slf4j/slf4j-nop
     {:mvn/version "1.7.36"}}

diff --git a/docs/deployment/docker-deployment.md b/docs/deployment/docker-deployment.md
@@ -27,7 +27,7 @@ Blaze should log something like this:
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:64] - JVM version: 16.0.2
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:65] - Maximum available memory: 1738 MiB
 2021-06-27T11:02:37.835Z ee086ef908c1 main INFO [blaze.core:66] - Number of available processors: 8
-2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.16.0 in 8.2 seconds
+2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.16.1 in 8.2 seconds
 ```
 
 In order to test connectivity, query the health endpoint:
@@ -47,7 +47,7 @@ that should return:
 ```json
 {
   "name": "Blaze",
-  "version": "0.16.0"
+  "version": "0.16.1"
 }
 ```