Skip to content

Commit f8ab86d

Browse files
authored
Merge pull request #67 from ClickHouse/remove-pglz
2 parents f5fa955 + 41128e3 commit f8ab86d

20 files changed

Lines changed: 18 additions & 484 deletions

postgresql/ddl_pglz.sql

Lines changed: 0 additions & 12 deletions
This file was deleted.

postgresql/main.sh

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -36,51 +36,42 @@ fi
3636

3737
benchmark() {
3838
local size=$1
39-
local compression=$2
4039
# Check DATA_DIRECTORY contains the required number of files to run the benchmark
4140
file_count=$(find "$DATA_DIRECTORY" -type f | wc -l)
4241
if (( file_count < size )); then
4342
echo "Error: Not enough files in '$DATA_DIRECTORY'. Required: $size, Found: $file_count."
4443
exit 1
4544
fi
46-
./create_and_load.sh "bluesky_${size}m_${compression}" bluesky "ddl_${compression}.sql" "$DATA_DIRECTORY" "$size" "$SUCCESS_LOG" "$ERROR_LOG"
47-
./total_size.sh "bluesky_${size}m_${compression}" bluesky | tee "${OUTPUT_PREFIX}_bluesky_${size}m_${compression}.total_size"
48-
./data_size.sh "bluesky_${size}m_${compression}" bluesky | tee "${OUTPUT_PREFIX}_bluesky_${size}m_${compression}.data_size"
49-
./index_size.sh "bluesky_${size}m_${compression}" bluesky | tee "${OUTPUT_PREFIX}_bluesky_${size}m_${compression}.index_size"
50-
./count.sh "bluesky_${size}m_${compression}" bluesky | tee "${OUTPUT_PREFIX}_bluesky_${size}m_${compression}.count"
51-
./index_usage.sh "bluesky_${size}m_${compression}" | tee "${OUTPUT_PREFIX}_bluesky_${size}m_${compression}.index_usage"
52-
#./query_results.sh "bluesky_${size}m_${compression}" | tee "${OUTPUT_PREFIX}_bluesky_${size}m_${compression}.query_results"
53-
./benchmark.sh "bluesky_${size}m_${compression}" "${OUTPUT_PREFIX}_bluesky_${size}m_${compression}.results_runtime"
54-
./drop_tables.sh "bluesky_${size}m_${compression}"
45+
./create_and_load.sh "bluesky_${size}m" bluesky "ddl.sql" "$DATA_DIRECTORY" "$size" "$SUCCESS_LOG" "$ERROR_LOG"
46+
./total_size.sh "bluesky_${size}m" bluesky | tee "${OUTPUT_PREFIX}_bluesky_${size}m.total_size"
47+
./data_size.sh "bluesky_${size}m" bluesky | tee "${OUTPUT_PREFIX}_bluesky_${size}m.data_size"
48+
./index_size.sh "bluesky_${size}m" bluesky | tee "${OUTPUT_PREFIX}_bluesky_${size}m.index_size"
49+
./count.sh "bluesky_${size}m" bluesky | tee "${OUTPUT_PREFIX}_bluesky_${size}m.count"
50+
./index_usage.sh "bluesky_${size}m" | tee "${OUTPUT_PREFIX}_bluesky_${size}m.index_usage"
51+
#./query_results.sh "bluesky_${size}m" | tee "${OUTPUT_PREFIX}_bluesky_${size}m.query_results"
52+
./benchmark.sh "bluesky_${size}m" "${OUTPUT_PREFIX}_bluesky_${size}m.results_runtime"
53+
./drop_tables.sh "bluesky_${size}m"
5554
}
5655

5756
case $CHOICE in
5857
2)
59-
benchmark 10 lz4
60-
benchmark 10 pglz
58+
benchmark 10
6159
;;
6260
3)
63-
benchmark 100 lz4
64-
benchmark 100 pglz
61+
benchmark 100
6562
;;
6663
4)
67-
benchmark 1000 lz4
68-
benchmark 1000 pglz
64+
benchmark 1000
6965
;;
7066
5)
71-
benchmark 1 lz4
72-
benchmark 1 pglz
73-
benchmark 10 lz4
74-
benchmark 10 pglz
75-
benchmark 100 lz4
76-
benchmark 100 pglz
77-
benchmark 1000 lz4
78-
benchmark 1000 pglz
67+
benchmark 1
68+
benchmark 10
69+
benchmark 100
70+
benchmark 1000
7971
;;
8072
*)
81-
benchmark 1 lz4
82-
benchmark 1 pglz
73+
benchmark 1
8374
;;
8475
esac
8576

86-
./uninstall
77+
./uninstall.sh

postgresql/results/_index_usage/_m6i.8xlarge_bluesky_1000m_lz4.index_usage renamed to postgresql/results/_index_usage/_m6i.8xlarge_bluesky_1000m.index_usage

File renamed without changes.

postgresql/results/_index_usage/_m6i.8xlarge_bluesky_1000m_pglz.index_usage

Lines changed: 0 additions & 94 deletions
This file was deleted.

postgresql/results/_index_usage/_m6i.8xlarge_bluesky_100m_lz4.index_usage renamed to postgresql/results/_index_usage/_m6i.8xlarge_bluesky_100m.index_usage

File renamed without changes.

postgresql/results/_index_usage/_m6i.8xlarge_bluesky_100m_pglz.index_usage

Lines changed: 0 additions & 94 deletions
This file was deleted.

postgresql/results/_index_usage/_m6i.8xlarge_bluesky_10m_lz4.index_usage renamed to postgresql/results/_index_usage/_m6i.8xlarge_bluesky_10m.index_usage

File renamed without changes.

0 commit comments

Comments
 (0)