Skip to content

Commit b04576a

Browse files
committed
De-snappify
1 parent 0b8d8ac commit b04576a

File tree

7 files changed

+24
-42
lines changed

7 files changed

+24
-42
lines changed

ferretdb/ddl.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../mongodb/ddl.js

ferretdb/ddl_snappy.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

ferretdb/ddl_zstd.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

mongodb/create_and_load.sh

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
#!/bin/bash
22

33
# Check if the required arguments are provided
4-
if [[ $# -lt 7 ]]; then
5-
echo "Usage: $0 <DB_NAME> <COLLECTION_NAME> <DDL_FILE> <DATA_DIRECTORY> <NUM_FILES> <SUCCESS_LOG> <ERROR_LOG>"
4+
if [[ $# -lt 6 ]]; then
5+
echo "Usage: $0 <DB_NAME> <COLLECTION_NAME> <DATA_DIRECTORY> <NUM_FILES> <SUCCESS_LOG> <ERROR_LOG>"
66
exit 1
77
fi
88

99
# Arguments
1010
DB_NAME="$1"
1111
COLLECTION_NAME="$2"
12-
DDL_FILE="$3"
13-
DATA_DIRECTORY="$4"
14-
NUM_FILES="$5"
15-
SUCCESS_LOG="$6"
16-
ERROR_LOG="$7"
12+
DATA_DIRECTORY="$3"
13+
NUM_FILES="$4"
14+
SUCCESS_LOG="$5"
15+
ERROR_LOG="$6"
1716

1817
# Validate arguments
19-
[[ ! -f "$DDL_FILE" ]] && { echo "Error: DDL file '$DDL_FILE' does not exist."; exit 1; }
2018
[[ ! -d "$DATA_DIRECTORY" ]] && { echo "Error: Data directory '$DATA_DIRECTORY' does not exist."; exit 1; }
2119
[[ ! "$NUM_FILES" =~ ^[0-9]+$ ]] && { echo "Error: NUM_FILES must be a positive integer."; exit 1; }
2220

File renamed without changes.

mongodb/ddl_snappy.js

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

mongodb/main.sh

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,50 +36,41 @@ 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}.js" "$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-
#./query_results.sh "bluesky_${size}m_${compression}" | tee "${OUTPUT_PREFIX}_bluesky_${size}m_${compression}.query_results"
52-
./index_usage.sh "bluesky_${size}m_${compression}" | tee "${OUTPUT_PREFIX}_bluesky_${size}m_${compression}.index_usage"
53-
./benchmark.sh "bluesky_${size}m_${compression}" "${OUTPUT_PREFIX}_bluesky_${size}m_${compression}.results_runtime"
54-
./drop_table.sh "bluesky_${size}m_${compression}"
45+
./create_and_load.sh "bluesky_${size}m" bluesky "$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+
#./query_results.sh "bluesky_${size}m" | tee "${OUTPUT_PREFIX}_bluesky_${size}m.query_results"
51+
./index_usage.sh "bluesky_${size}m" | tee "${OUTPUT_PREFIX}_bluesky_${size}m.index_usage"
52+
./benchmark.sh "bluesky_${size}m" "${OUTPUT_PREFIX}_bluesky_${size}m.results_runtime"
53+
./drop_table.sh "bluesky_${size}m"
5554
}
5655

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

0 commit comments

Comments
 (0)