Merge pull request #530 from ClickHouse/adjustments-10

Small adjustments (10)

Author: alexey-milovidov

heavyai/benchmark.sh

@@ -18,6 +18,7 @@ export HEAVYAI_LOG=/var/lib/heavyai/data/mapd_log
 
 pushd $HEAVYAI_PATH/systemd
 ./install_heavy_systemd.sh
+popd
 
 # Press Enter multiple times.
 
@@ -31,18 +32,17 @@ wget --continue --progress=dot:giga 'https://datasets.clickhouse.com/hits_compat
 pigz -d -f hits.csv.gz
 chmod 777 ~ hits.csv
 
-sudo bash -c "echo 'allowed-import-paths = [\"$(echo ~)\"]' > /var/lib/heavyai/heavy.conf_"
+sudo bash -c "echo 'allowed-import-paths = [\"$(pwd)\"]' > /var/lib/heavyai/heavy.conf_"
 sudo bash -c "cat /var/lib/heavyai/heavy.conf >> /var/lib/heavyai/heavy.conf_"
 sudo bash -c "mv /var/lib/heavyai/heavy.conf_ /var/lib/heavyai/heavy.conf && chown heavyai /var/lib/heavyai/heavy.conf"
 sudo systemctl restart heavydb
 
 /opt/heavyai/bin/heavysql -t -p HyperInteractive < create.sql
 echo -n "Load time: "
-command time -f '%e' /opt/heavyai/bin/heavysql -t -p HyperInteractive <<< "COPY hits FROM '$(pwd)/hits.csv' WITH (HEADER = 'false');"
+command time -f '%e' /opt/heavyai/bin/heavysql -q -t -p HyperInteractive <<< "COPY hits FROM '$(pwd)/hits.csv' WITH (HEADER = 'false');"
 
 # Loaded: 99997497 recs, Rejected: 0 recs in 572.633000 secs
 
-popd
 ./run.sh 2>&1 | tee log.txt
 
 echo -n "Data size: "

monetdb/benchmark.sh

@@ -6,7 +6,7 @@ echo "deb https://dev.monetdb.org/downloads/deb/ $(lsb_release -cs) monetdb" | s
 
 sudo wget --output-document=/etc/apt/trusted.gpg.d/monetdb.gpg https://www.monetdb.org/downloads/MonetDB-GPG-KEY.gpg
 sudo apt-get update -y
-sudo apt-get install -y monetdb5-sql monetdb-client dos2unix
+sudo apt-get install -y monetdb5-sql monetdb-client dos2unix net-tools
 
 sudo systemctl enable monetdbd
 sudo systemctl start monetdbd