Merge pull request #816 from ClickHouse/revert-fix-ch-datalake

Revert "Work around https://github.com/ClickHouse/ClickHouse/issues/9…

Author: rschu1ze

clickhouse-datalake-partitioned/benchmark.sh

@@ -1,7 +1,20 @@
 #!/bin/bash
 
+# Install
+
 curl https://clickhouse.com/ | sh
 
+# Configure
+
+> clickhouse-local.yaml echo "
+filesystem_caches:
+    cache:
+        path: '/dev/shm/clickhouse/'
+        max_size_ratio_to_total_space: 0.9
+"
+
+# Run the queries
+
 ./run.sh
 
 echo "Load time: 0"

clickhouse-datalake-partitioned/run.sh

@@ -9,7 +9,7 @@ cat queries.sql | while read -r query; do
 
     echo -n "["
     for i in $(seq 1 $TRIES); do
-        RES=$(./clickhouse local --path . --time --format Null --query="$query" 2>&1) # (*)
+        RES=$(./clickhouse local --path . --time --format Null --filesystem_cache_name cache --query="$query" 2>&1) # (*)
         [[ "$?" == "0" ]] && echo -n "${RES}" || echo -n "null"
         [[ "$i" != $TRIES ]] && echo -n ", "
 

clickhouse-datalake/benchmark.sh

@@ -1,7 +1,20 @@
 #!/bin/bash
 
+# Install
+
 curl https://clickhouse.com/ | sh
 
+# Configure
+
+> clickhouse-local.yaml echo "
+filesystem_caches:
+    cache:
+        path: '/dev/shm/clickhouse/'
+        max_size_ratio_to_total_space: 0.9
+"
+
+# Run the queries
+
 ./run.sh
 
 echo "Load time: 0"

clickhouse-datalake/run.sh

@@ -9,7 +9,7 @@ cat queries.sql | while read -r query; do
 
     echo -n "["
     for i in $(seq 1 $TRIES); do
-        RES=$(./clickhouse local --path . --time --format Null --query="$query" 2>&1) # (*)
+        RES=$(./clickhouse local --path . --time --format Null --filesystem_cache_name cache --query="$query" 2>&1) # (*)
         [[ "$?" == "0" ]] && echo -n "${RES}" || echo -n "null"
         [[ "$i" != $TRIES ]] && echo -n ", "