Remove materialized result

Author: rschu1ze

doris/create_and_load.sh

@@ -1,22 +1,20 @@
 #!/bin/bash
 
 # Check if the required arguments are provided
-if [[ $# -lt 7 ]]; then
-    echo "Usage: $0 <DB_NAME> <TABLE_NAME> <DDL_FILE> <DATA_DIRECTORY> <NUM_FILES> <SUCCESS_LOG> <ERROR_LOG>"
+if [[ $# -lt 6 ]]; then
+    echo "Usage: $0 <DB_NAME> <TABLE_NAME> <DATA_DIRECTORY> <NUM_FILES> <SUCCESS_LOG> <ERROR_LOG>"
     exit 1
 fi
 
 # Arguments
 DB_NAME="$1"
 TABLE_NAME="$2"
-DDL_FILE="$3"
-DATA_DIRECTORY="$4"
-NUM_FILES="$5"
-SUCCESS_LOG="$6"
-ERROR_LOG="$7"
+DATA_DIRECTORY="$3"
+NUM_FILES="$4"
+SUCCESS_LOG="$5"
+ERROR_LOG="$6"
 
 # Validate arguments
-[[ ! -f "$DDL_FILE" ]] && { echo "Error: DDL file '$DDL_FILE' does not exist."; exit 1; }
 [[ ! -d "$DATA_DIRECTORY" ]] && { echo "Error: Data directory '$DATA_DIRECTORY' does not exist."; exit 1; }
 [[ ! "$NUM_FILES" =~ ^[0-9]+$ ]] && { echo "Error: NUM_FILES must be a positive integer."; exit 1; }
 
@@ -25,7 +23,7 @@ echo "Create database"
 mysql -P 9030 -h 127.0.0.1 -u root -e "CREATE DATABASE IF NOT EXISTS $DB_NAME"
 
 echo "Execute DDL"
-mysql -P 9030 -h 127.0.0.1 -u root $DB_NAME < "$DDL_FILE"
+mysql -P 9030 -h 127.0.0.1 -u root $DB_NAME < "ddl.sql"
 
 echo "Load data"
 ./load_data.sh "$DATA_DIRECTORY" "$DB_NAME" "$TABLE_NAME" "$NUM_FILES" "$SUCCESS_LOG" "$ERROR_LOG"

doris/ddl_default.sql doris/ddl.sqldoris/ddl_default.sql renamed to doris/ddl.sql

@@ -41,46 +41,37 @@ fi;
 
 benchmark() {
     local size=$1
-    local suffix=$2
     # Check DATA_DIRECTORY contains the required number of files to run the benchmark
     file_count=$(find "$DATA_DIRECTORY" -type f | wc -l)
     if (( file_count < size )); then
         echo "Error: Not enough files in '$DATA_DIRECTORY'. Required: $size, Found: $file_count."
         exit 1
     fi
-    ./create_and_load.sh "bluesky_${size}m_${suffix}" bluesky "ddl_${suffix}.sql" "$DATA_DIRECTORY" "$size" "$SUCCESS_LOG" "$ERROR_LOG"
-    ./total_size.sh "bluesky_${size}m_${suffix}" bluesky | tee "${OUTPUT_PREFIX}_bluesky_${size}m_${suffix}.total_size"
-    ./count.sh "bluesky_${size}m_${suffix}" bluesky | tee "${OUTPUT_PREFIX}_bluesky_${size}m_${suffix}.count"
-    ./benchmark.sh "bluesky_${size}m_${suffix}" "${OUTPUT_PREFIX}_bluesky_${size}m_${suffix}.results_runtime" "queries_${suffix}.sql"
-    ./drop_table.sh "bluesky_${size}m_${suffix}" bluesky
+    ./create_and_load.sh "bluesky_${size}m" bluesky "$DATA_DIRECTORY" "$size" "$SUCCESS_LOG" "$ERROR_LOG"
+    ./total_size.sh "bluesky_${size}m" bluesky | tee "${OUTPUT_PREFIX}_bluesky_${size}m.total_size"
+    ./count.sh "bluesky_${size}m" bluesky | tee "${OUTPUT_PREFIX}_bluesky_${size}m.count"
+    ./benchmark.sh "bluesky_${size}m" "${OUTPUT_PREFIX}_bluesky_${size}m.results_runtime" "queries.sql"
+    ./drop_table.sh "bluesky_${size}m" bluesky
 }
 
 case $CHOICE in
     2)
-        benchmark 10 default
-        benchmark 10 materialized
+        benchmark 10
         ;;
     3)
-        benchmark 100 default
-        benchmark 100 materialized
+        benchmark 100
         ;;
     4)
-        benchmark 1000 default
-        benchmark 1000 materialized
+        benchmark 1000
         ;;
     5)
-        benchmark 1 default
-        benchmark 1 materialized
-        benchmark 10 default
-        benchmark 10 materialized
-        benchmark 100 default
-        benchmark 100 materialized
-        benchmark 1000 default
-        benchmark 1000 materialized
+        benchmark 1
+        benchmark 10
+        benchmark 100
+        benchmark 1000
         ;;
     *)
-        benchmark 1 default
-        benchmark 1 materialized
+        benchmark 1
         ;;
 esac
 

doris/ddl_materialized.sql

@@ -1,5 +1,5 @@
 {
-  "system": "Apache Doris (default)",
+  "system": "Apache Doris",
   "version": "doris-3.0.5-rc01-e277cfb83f",
   "os": "Ubuntu 24.04",
   "date": "2025-05-13",

doris/main.sh

@@ -1,5 +1,5 @@
 {
-  "system": "Apache Doris (default)",
+  "system": "Apache Doris",
   "version": "doris-3.0.5-rc01-e277cfb83f",
   "os": "Ubuntu 24.04",
   "date": "2025-05-13",

…8xlarge_bluesky_1m_default.query_results …ts/_m6i.8xlarge_bluesky_1m.query_resultsdoris/results/_query_results/_m6i.8xlarge_bluesky_1m_default.query_results renamed to doris/results/_query_results/_m6i.8xlarge_bluesky_1m.query_results doris/results/_query_results/_m6i.8xlarge_bluesky_1m_default.query_results renamed to doris/results/_query_results/_m6i.8xlarge_bluesky_1m.query_results

@@ -1,5 +1,5 @@
 {
-  "system": "Apache Doris (default)",
+  "system": "Apache Doris",
   "version": "doris-3.0.5-rc01-e277cfb83f",
   "os": "Ubuntu 24.04",
   "date": "2025-05-13",