Merge pull request #290 from samply/289-fix-mem-leak

Fix Memory Leak on Validation

Makefile

@@ -1,4 +1,4 @@
-VERSION := "0.10.1"
+VERSION := "0.10.2"
 MODULES := $(wildcard modules/*)
 
 $(MODULES):

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 report any issues you encounter during evaluation.
 
-Latest release: [v0.10.1][5]
+Latest release: [v0.10.2][5]
 
 ## Quick Start
 
@@ -24,7 +24,7 @@ In order to run Blaze just execute the following:
 
 ```bash
 docker volume create blaze-data
-docker run -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.10.1
+docker run -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.10.2
 ```
 
 Blaze will create multiple directories inside the `blaze-data` volume on its first start and use the same directories on subsequent starts.
@@ -63,7 +63,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.10.1>
+[5]: <https://github.com/samply/blaze/releases/tag/v0.10.2>
 [6]: <https://www.yourkit.com/java/profiler/>
 [7]: <https://www.yourkit.com/.net/profiler/>
 [8]: <https://www.yourkit.com/youmonitor/>

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.2'
 services:
   blaze:
-    image: "samply/blaze:0.10.1"
+    image: "samply/blaze:0.10.2"
     environment:
       BASE_URL: "http://localhost:8080"
       JAVA_TOOL_OPTIONS: "-Xmx2g"

docs/cql-queries.md

@@ -9,7 +9,7 @@ The most accessible way to create and execute CQL queries is to use the Quality
 If you don't already have Blaze running, you can read about how to do it in [Deployment](deployment/). If you have Docker available just run:
 
 ```
-docker run -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.10.1
+docker run -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.10.2
 ```
 
 Start the Quality Reporting UI. You should see an empty measure list.

docs/deployment/docker-deployment.md

@@ -11,7 +11,7 @@ docker volume create blaze-data
 ## Blaze
 
 ```bash
-docker run -d --name blaze -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.10.1
+docker run -d --name blaze -p 8080:8080 -v blaze-data:/app/data samply/blaze:0.10.2
 ```
 
 Blaze should log something like this:
@@ -29,7 +29,7 @@ Blaze should log something like this:
 2020-06-23 08:06:49.235+0000 73c1e4c03d80 INFO [blaze.core:60] - JVM version: 11.0.6
 2020-06-23 08:06:49.236+0000 73c1e4c03d80 INFO [blaze.core:61] - Maximum available memory: 1488 MiB
 2020-06-23 08:06:49.236+0000 73c1e4c03d80 INFO [blaze.core:62] - Number of available processors: 4
-2020-06-23 08:06:49.238+0000 73c1e4c03d80 INFO [blaze.core:63] - Successfully started Blaze version 0.10.1 in 24.9 seconds
+2020-06-23 08:06:49.238+0000 73c1e4c03d80 INFO [blaze.core:63] - Successfully started Blaze version 0.10.2 in 24.9 seconds
 ```
 
 In order to test connectivity, query the health endpoint:
@@ -49,7 +49,7 @@ that should return:
 ```javascript
 {
   "name": "Blaze",
-  "version": "0.10.1"
+  "version": "0.10.2"
 }
 ```
 
@@ -63,7 +63,7 @@ A Docker Compose file looks like this:
 version: '3.2'
 services:
   blaze:
-    image: "samply/blaze:0.10.1"
+    image: "samply/blaze:0.10.2"
     environment:
       BASE_URL: "http://localhost:8080"
       JAVA_TOOL_OPTIONS: "-Xmx2g"

docs/deployment/manual-deployment.md

@@ -2,12 +2,12 @@
 
 The installation works under Windows, Linux and macOS. The only dependency is an installed OpenJDK 11. Blaze is tested with [AdoptOpenJDK][1].
 
-Blaze runs on the JVM and comes as single JAR file. Download the most recent version [here](https://github.com/samply/blaze/releases/tag/v0.9.0). Look for `blaze-0.10.1-standalone.jar`.
+Blaze runs on the JVM and comes as single JAR file. Download the most recent version [here](https://github.com/samply/blaze/releases/tag/v0.9.0). Look for `blaze-0.10.2-standalone.jar`.
 
 After the download, you can start blaze with the following command (Linux, macOS):
 
 ```bash
-java -jar blaze-0.10.1-standalone.jar -m blaze.core
+java -jar blaze-0.10.2-standalone.jar -m blaze.core
 ```
 
 Blaze will run with an in-memory, volatile database for testing and demo purposes.
@@ -17,14 +17,14 @@ Blaze can be run with durable storage by setting the environment variables `STOR
 Under Linux/macOS:
 
 ```bash
-STORAGE=standalone java -jar blaze-0.10.1-standalone.jar -m blaze.core
+STORAGE=standalone java -jar blaze-0.10.2-standalone.jar -m blaze.core
 ```
 
 Under Windows, you need to set the Environment variables in the PowerShell before starting Blaze:
 
 ```powershell
 $Env:STORAGE="standalone"
-java -jar blaze-0.10.1-standalone.jar -m blaze.core
+java -jar blaze-0.10.2-standalone.jar -m blaze.core
 ```
 
 This will create three directories called `index`, `transaction` and `resource` inside the current working directory, one for each database part used.
@@ -76,7 +76,7 @@ The output should look like this:
 2020-06-23 06:45:06.858+0000 my-server INFO [blaze.core:60] - JVM version: 11.0.7
 2020-06-23 06:45:06.859+0000 my-server INFO [blaze.core:61] - Maximum available memory: 4070 MiB
 2020-06-23 06:45:06.859+0000 my-server INFO [blaze.core:62] - Number of available processors: 4
-2020-06-23 06:45:06.860+0000 my-server INFO [blaze.core:63] - Successfully started Blaze version 0.10.1 in 25,5 seconds
+2020-06-23 06:45:06.860+0000 my-server INFO [blaze.core:63] - Successfully started Blaze version 0.10.2 in 25,5 seconds
 ```
 
 In order to test connectivity, query the health endpoint:
@@ -96,7 +96,7 @@ that should return:
 ```javascript
 {
   "name": "Blaze",
-  "version": "0.10.1"
+  "version": "0.10.2"
 }
 ```
 

modules/fhir-structure/src/blaze/fhir/spec/impl.clj

@@ -690,7 +690,7 @@
 
 
 ;; Resource Spec
-(defmulti json-resource identity)
+(defmulti json-resource (constantly :default))
 
 
 (defmethod json-resource :default [{json-type :resourceType :fhir/keys [type]}]
@@ -713,7 +713,7 @@
   (s/conformer conform-cbor-resource unform-cbor-resource))
 
 
-(defmulti xml-resource identity)
+(defmulti xml-resource (constantly :default))
 
 
 (defmethod xml-resource :default [{:keys [tag] :fhir/keys [type]}]

modules/rest-api/src/blaze/rest_api.clj

@@ -382,7 +382,7 @@
          :copyright
          #fhir/markdown"Copyright 2019 The Samply Community\n\nLicensed 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\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless 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."
          :kind #fhir/code"instance"
-         :date #fhir/dateTime"2020-12-09"
+         :date #fhir/dateTime"2020-12-15"
          :software
          {:name "Blaze"
           :version version}

perf-test/gatling/pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>samply.blaze</groupId>
   <artifactId>gatling</artifactId>
-  <version>0.10.1</version>
+  <version>0.10.2</version>
 
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>samply</groupId>
     <artifactId>blaze</artifactId>
-    <version>0.10.1</version>
+    <version>0.10.2</version>
     <name>blaze</name>
 
     <description>A FHIR Store with internal, fast CQL Evaluation Engine</description>

src/blaze/system.clj

@@ -77,7 +77,7 @@
 
 
 (def ^:private root-config
-  {:blaze/version "0.10.1"
+  {:blaze/version "0.10.2"
 
    :blaze/structure-definition {}