From 2f1370148f838f4298ad06a5e7eb999568b703af Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Thu, 30 May 2024 01:40:47 +0300
Subject: [PATCH] cleanup

---
 cloudbuild.yaml                                 | 2 +-
 docker/compose-controller-spark-sql-single.yaml | 7 ++++++-
 docker/config_fhir_sink/application.yaml        | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 90f556bda..5448cc896 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -109,7 +109,7 @@ steps:
     - PARQUET_SUBDIR=JDBC_HAPI
     - DOCKER_NETWORK=--use_docker_network
 
-#The `views` database is used for creating flat views from ViewDefinitions.
+# The `views` database is used for creating flat views from ViewDefinitions.
 - name: 'postgres'
   id: 'Create views database'
   entrypoint: psql
diff --git a/docker/compose-controller-spark-sql-single.yaml b/docker/compose-controller-spark-sql-single.yaml
index 525885d06..83896375e 100644
--- a/docker/compose-controller-spark-sql-single.yaml
+++ b/docker/compose-controller-spark-sql-single.yaml
@@ -62,7 +62,6 @@ services:
       - ${DWH_ROOT}:/dwh
     environment:
       - JAVA_OPTS=$JAVA_OPTS
-
     ports:
       - '8090:8080'
     networks:
@@ -87,6 +86,12 @@ services:
       - '4041:4040'
     volumes:
       - ${DWH_ROOT}:/dwh
+      # NON-EMBEDDED METASTORE CONFIG:
+      # If you want to persist the Metastore data, e.g., table and view
+      # definitions, you can use an external database by adjusting hive-site.xml
+      #- ./hive-site_example.xml:/opt/bitnami/spark/conf/hive-site.xml
+      # Note to use an external DB, you need to provide its driver jar too:
+      #- ./postgresql-42.6.0.jar:/opt/bitnami/spark/jars/postgresql-42.6.0.jar
       - spark_vol_single:/opt/bitnami/spark
     networks:
       - cloudbuild
diff --git a/docker/config_fhir_sink/application.yaml b/docker/config_fhir_sink/application.yaml
index cf6cbe270..942a6c325 100644
--- a/docker/config_fhir_sink/application.yaml
+++ b/docker/config_fhir_sink/application.yaml
@@ -37,13 +37,13 @@ fhirdata:
   numThreads: 1
   autoGenerateFlinkConfiguration: true
   createHiveResourceTables: false
-  thriftserverHiveConfig: "config/thriftserver-hive-config_local.json"
-  hiveResourceViewsDir: "config/views"
+  #thriftserverHiveConfig: "config/thriftserver-hive-config_local.json"
+  #hiveResourceViewsDir: "config/views"
   # structureDefinitionsPath: "config/profile-definitions"
   structureDefinitionsPath: "classpath:/r4-us-core-definitions"
   fhirVersion: "R4"
   rowGroupSizeForParquetFiles: 33554432   # 32mb
-  viewDefinitionsDir: "config/views"
+  #viewDefinitionsDir: "config/views"
   #sinkDbConfigPath: "config/hapi-postgres-config_local_views.json"
   sinkFhirServerUrl: "http://sink-server:8080/fhir"
   #sinkUserName: "hapi"