Merge pull request #348 from ldbc/v1-dev-umbra-update

Bump Umbra version in v1

Author: szarnyasg

.circleci/config.yml

@@ -11,7 +11,7 @@ jobs:
   test:
     resource_class: large
     machine:
-      image: ubuntu-2004:202008-01
+      image: ubuntu-2204:2022.04.1
     steps:
       - checkout
       - run:
@@ -20,6 +20,13 @@ jobs:
             export DEBIAN_FRONTEND=noninteractive
             sudo apt update && sudo apt install -y zstd
             scripts/install-dependencies.sh
+      - run:
+          name: Install OpenJDK 11
+          command: |
+            sudo apt-get update && sudo apt-get install openjdk-11-jdk
+            sudo update-alternatives --set java /usr/lib/jvm/java-11-openjdk-amd64/bin/java
+            sudo update-alternatives --set javac /usr/lib/jvm/java-11-openjdk-amd64/bin/javac
+            java -version
       - run:
           name: Build project
           command: scripts/build.sh
@@ -131,8 +138,9 @@ jobs:
       - run:
           name: Tiny data set - Cross-validate the Umbra project based on the results from Neo4j
           command: |
-            cp cypher/validation_params_cypher_tiny.csv umbra/validation_params.csv
+            cp cypher/validation_params_cypher_tiny.csv umbra/validation_params_tiny.csv
             cd umbra
+            grep -v Q14 validation_params_tiny.csv > validation_params.csv
             export UMBRA_CSV_DIR=`pwd`/../postgres/test-data/
             scripts/restore-database.sh
             driver/validate.sh | tee validation-log.txt
@@ -211,8 +219,9 @@ jobs:
       - run:
           name: SF1 data set - Cross-validate the Umbra project based on the results from Neo4j
           command: |
-            cp cypher/validation_params_cypher_sf1.csv umbra/validation_params.csv
+            cp cypher/validation_params_cypher_sf1.csv umbra/validation_params_sf1.csv
             cd umbra
+            grep -v Q14 validation_params_sf1.csv > validation_params.csv
             driver/validate.sh | tee validation-log.txt
             scripts/stop.sh
             grep 'Validation Result: PASS' validation-log.txt

umbra/ddl/create-role.sql

@@ -1 +1,3 @@
 alter role postgres with superuser login password 'mysecretpassword';
+drop database if exists ldbcsnb;
+create database ldbcsnb owner postgres;

umbra/driver/benchmark.properties

@@ -1,4 +1,4 @@
-endpoint=jdbc:postgresql:localhost:5432
+endpoint=jdbc:postgresql://localhost:5432/ldbcsnb
 user=postgres
 password=mysecretpassword
 databaseName=ldbcsnb

umbra/driver/create-validation-parameters.properties

@@ -1,4 +1,4 @@
-endpoint=jdbc:postgresql:localhost:5432
+endpoint=jdbc:postgresql://localhost:5432/ldbcsnb
 user=postgres
 password=mysecretpassword
 databaseName=ldbcsnb
@@ -49,7 +49,7 @@ ldbc.snb.interactive.LdbcQuery10_enable=true
 ldbc.snb.interactive.LdbcQuery11_enable=true
 ldbc.snb.interactive.LdbcQuery12_enable=true
 ldbc.snb.interactive.LdbcQuery13_enable=true
-ldbc.snb.interactive.LdbcQuery14_enable=true
+ldbc.snb.interactive.LdbcQuery14_enable=false
 
 ldbc.snb.interactive.LdbcShortQuery1PersonProfile_enable=true
 ldbc.snb.interactive.LdbcShortQuery2PersonPosts_enable=true

umbra/driver/validate.properties

@@ -1,4 +1,4 @@
-endpoint=jdbc:postgresql:localhost:5432
+endpoint=jdbc:postgresql://localhost:5432/ldbcsnb
 user=postgres
 password=mysecretpassword
 databaseName=ldbcsnb
@@ -47,7 +47,7 @@ ldbc.snb.interactive.LdbcQuery10_enable=true
 ldbc.snb.interactive.LdbcQuery11_enable=true
 ldbc.snb.interactive.LdbcQuery12_enable=true
 ldbc.snb.interactive.LdbcQuery13_enable=true
-ldbc.snb.interactive.LdbcQuery14_enable=true
+ldbc.snb.interactive.LdbcQuery14_enable=false
 
 ldbc.snb.interactive.LdbcShortQuery1PersonProfile_enable=true
 ldbc.snb.interactive.LdbcShortQuery2PersonPosts_enable=true

umbra/queries/interactive-complex-14.sql

@@ -1,3 +1,4 @@
+-- NOTE: This query currently fails validation and is therefore disabled.
 with recursive
 path(src, dst) as (
     select k_person1id, k_person2id from knows
@@ -82,7 +83,7 @@ path0r(v, path, l, w) as (
     from path0
     where l0 = -1
 ),
-path1(v, path, l) as (
+path1(v, path, l, w) as (
     select v, path, l, w from path0r
     union all
     select ss.prev, array_append(path, ss.prev), l - 1, w + coalesce(score, 0)

umbra/scripts/connect.sh

@@ -10,4 +10,4 @@ cd ..
 
 export PGPASSWORD=mysecretpassword
 
-psql -h localhost -U postgres
+psql -h localhost -U postgres -d ldbcsnb

umbra/scripts/create-db.sh

@@ -9,6 +9,7 @@ cd ..
 echo -n "Cleaning up . . ."
 # ensure database and log dirs exists and are empty
 mkdir -p ${UMBRA_DATABASE_DIR}/
+mkdir -p ${UMBRA_LOG_DIR}/
 docker run \
     --volume=${UMBRA_DATABASE_DIR}:/var/db/:z \
     ${UMBRA_DOCKER_IMAGE} \
@@ -23,6 +24,14 @@ docker run \
     umbra_sql \
     --createdb \
       /var/db/ldbc.db \
-      /ddl/create-role.sql \
+      /ddl/create-role.sql
+
+docker run \
+    --volume=${UMBRA_DATABASE_DIR}:/var/db/:z \
+    --volume=${UMBRA_DDL_DIR}:/ddl/:z \
+    ${UMBRA_DOCKER_IMAGE} \
+    umbra_sql \
+    --database ldbcsnb \
+      /var/db/ldbc.db \
       /ddl/schema.sql
 echo " Database created."

umbra/scripts/load.py

@@ -6,13 +6,15 @@
 class UmbraDbLoader():
 
     def __init__(self):
+        self.database = os.environ.get("UMBRA_DATABASE", "ldbcsnb")
         self.endpoint = os.environ.get("UMBRA_HOST", "localhost")
         self.port = int(os.environ.get("UMBRA_PORT", 5432))
         self.user = os.environ.get("UMBRA_USER", "postgres")
         self.password = os.environ.get("UMBRA_PASSWORD", "mysecretpassword")
 
     def load_data(self):
         with psycopg.connect(
+            dbname=self.database,
             host=self.endpoint,
             user=self.user,
             password=self.password,

umbra/scripts/vars.sh

@@ -2,10 +2,11 @@ cd "$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" >/dev/null 2>&1 && pwd
 cd ..
 
 export UMBRA_DDL_DIR=`pwd`/ddl/
+export UMBRA_LOG_DIR=`pwd`/scratch/log/
 export UMBRA_DATABASE_DIR=`pwd`/scratch/db/
 export UMBRA_BACKUP_DIR=`pwd`/scratch/backup/
 export UMBRA_CONTAINER_NAME=snb-interactive-umbra
-export UMBRA_VERSION=e7415d13f
+export UMBRA_VERSION=45f3aae27
 export UMBRA_DOCKER_IMAGE=umbra-release:${UMBRA_VERSION}
 
 export UMBRA_USER=postgres