Merge pull request #58 from startupturbo/dmius-text-dump

dump as text + gz\bz2\sql file

Author: dmius

.circleci/test.dump.gz

@@ -0,0 +1,5 @@
+create table t1 as
+  select i as id, random() val
+  from generate_series(1, 1000000) _(i);
+
+alter table t1 add primary key (id);

.circleci/test.dump.sql

@@ -387,9 +387,20 @@ function checkParams() {
     exit 1
   fi
 
-  [ ! -z ${DB_DUMP_PATH+x} ] && ! checkPath DB_DUMP_PATH \
-    && >&2 echo "ERROR: file $DB_DUMP_PATH given by db_dump_path not found" \
-    && exit 1
+  if [ ! -z ${DB_DUMP_PATH+x} ]; then
+    checkPath DB_DUMP_PATH
+    if [ "$?" -ne "0" ]; then
+      echo "$DB_DUMP_PATH" > $TMP_PATH/db_dump_tmp.sql
+      DB_DUMP_PATH="$TMP_PATH/db_dump_tmp.sql"
+    else
+      [ "$DEBUG" -eq "1" ] && echo "DEBUG: Value given as db-dump-path will use as filename"
+    fi
+    DB_DUMP_FILENAME=$(basename $DB_DUMP_PATH)
+    DB_DUMP_EXT=${DB_DUMP_FILENAME##*.}
+  else
+    echo "ERROR: file $DB_DUMP_PATH given by db_dump_path not found"
+    exit 1
+  fi
 
   if [ -z ${PG_CONFIG+x} ]; then
     >&2 echo "WARNING: No DB config provided. Using default one."
@@ -775,9 +786,19 @@ function copyFile() {
 ## Apply machine features
 # Dump
 sleep 2 # wait for postgres up&running
-DB_DUMP_FILENAME=$(basename $DB_DUMP_PATH)
+
 echo "Restore database dump"
-docker_exec bash -c "bzcat $MACHINE_HOME/$DB_DUMP_FILENAME | psql -E --set ON_ERROR_STOP=on -U postgres test > /dev/null"
+case "$DB_DUMP_EXT" in
+  sql)
+    docker_exec bash -c "cat $MACHINE_HOME/$DB_DUMP_FILENAME | psql --set ON_ERROR_STOP=on -U postgres test"
+    ;;
+  bz2)
+    docker_exec bash -c "bzcat $MACHINE_HOME/$DB_DUMP_FILENAME | psql --set ON_ERROR_STOP=on -U postgres test"
+    ;;
+  gz)
+    docker_exec bash -c "zcat $MACHINE_HOME/$DB_DUMP_FILENAME | psql --set ON_ERROR_STOP=on -U postgres test"
+    ;;
+esac
 # After init database sql code apply
 echo "Apply sql code after db init"
 if ([ ! -z ${AFTER_DB_INIT_CODE+x} ] && [ "$AFTER_DB_INIT_CODE" != "" ])

nancy_run.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+thisDir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
+parentDir="$(dirname "$thisDir")"
+srcDir="$parentDir/.circleci"
+if [ ! -d "$srcDir/tmp" ]; then
+  mkdir "$srcDir/tmp"
+fi
+nancyRun="$parentDir/nancy_run.sh"
+
+output=$(
+  $nancyRun --workload-custom-sql "file://$srcDir/custom.sql" \
+    --db-dump-path "file://$srcDir/test.dump.gz" \
+    --tmp-path $srcDir/tmp 2>&1
+)
+
+if [[ $output =~ "Queries duration:" ]]; then
+  echo -e "\e[36mOK\e[39m"
+else
+  >&2 echo -e "\e[31mFAILED\e[39m"
+  >&2 echo -e "Output: $output"
+  exit 1
+fi

tests/nancy_run_localhost_simple_gz_dump.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+thisDir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
+parentDir="$(dirname "$thisDir")"
+srcDir="$parentDir/.circleci"
+if [ ! -d "$srcDir/tmp" ]; then
+  mkdir "$srcDir/tmp"
+fi
+nancyRun="$parentDir/nancy_run.sh"
+
+output=$(
+  $nancyRun --workload-custom-sql "file://$srcDir/custom.sql" \
+    --db-dump-path "file://$srcDir/test.dump.sql" \
+    --tmp-path $srcDir/tmp 2>&1
+)
+
+if [[ $output =~ "Queries duration:" ]]; then
+  echo -e "\e[36mOK\e[39m"
+else
+  >&2 echo -e "\e[31mFAILED\e[39m"
+  >&2 echo -e "Output: $output"
+  exit 1
+fi