benchmark Skripte angepasst

benchmarks/benchmark_run.txt

@@ -1,5 +1,4 @@
 CREATE TABLE benchmarktable(ID long, STR char(32))
 load fill
 load mixed
-select * from benchmarktable
 quit

benchmarks/benchmark_run_hash.txt

@@ -1,5 +0,0 @@
-CREATE TABLE benchmarktable(ID long, STR char(32))
-CREATE INDEX idx ON benchmarktable(ID) USING HASHTABLE
-load fill
-load mixed
-quit

benchmarks/benchmark_run_index.txt

@@ -1,5 +1,5 @@
 CREATE TABLE benchmarktable(ID long, STR char(32))
-CREATE INDEX idx ON benchmarktable(ID) USING BTREE
+CREATE UNIQUE INDEX idx ON benchmarktable(ID)
 load fill
 load mixed
 quit

benchmarks/run_benchmarks.sh

@@ -19,6 +19,8 @@ do
   esac
 done
 
+echo "Started at $(date -I'seconds')"
+
 # High contention, high conflict
 # ~5h runtime
 #./run_hchc.sh
@@ -37,4 +39,6 @@ done
 
 # Hashtable
 # ~2h runtime
-#./run_hashtable.sh
+#./run_hashtable.sh
+
+echo "Ended at $(date -I'seconds')"

benchmarks/run_hashtable.sh

@@ -15,8 +15,6 @@ for run in 1 2 3 4 5
 do
   echo "Executing run $run"
 	cat benchmark_run.txt | ../sqlite_binary >> ./hashtable/messung.txt
-	echo "Executing run $run with hashtable"
-	cat benchmark_run_hash.txt | ../sqlite_binary >> ./hashtable/messung_hash.txt
-	echo "Executing run $run with btree"
-	cat benchmark_run_btree.txt | ../sqlite_binary >> ./hashtable/messung_btree.txt
+	echo "Executing run $run with index"
+	cat benchmark_run_index.txt | ../sqlite_binary >> ./hashtable/messung_index.txt
 done

benchmarks/run_hchc.sh

@@ -25,9 +25,7 @@ do
   do
     echo "Executing run $run"
 		cat benchmark_run.txt | ../sqlite_binary >> ./hchc/$dir_name/messung.txt
-    echo "Executing run $run with hashtable"
-		cat benchmark_run_hash.txt | ../sqlite_binary >> ./hchc/$dir_name/messung_hash.txt
-    echo "Executing run $run with btree"
-		cat benchmark_run_btree.txt | ../sqlite_binary >> ./hchc/$dir_name/messung_btree.txt
+    echo "Executing run $run with index"
+		cat benchmark_run_index.txt | ../sqlite_binary >> ./hchc/$dir_name/messung_index.txt
   done
 done

benchmarks/run_hclc.sh

@@ -15,6 +15,6 @@ for run in 1 2 3 4 5
 do
   echo "Executing run $run"
 	cat benchmark_run.txt | ../sqlite_binary >> ./hclc/messung.txt
-	#cat benchmark_run_hash.txt | ../sqlite_binary >> ./lclc/messung_hash.txt
-	#cat benchmark_run_btree.txt | ../sqlite_binary >> ./lclc/messung_btree.txt
+	echo "Executing run $run with index"
+	cat benchmark_run_index.txt | ../sqlite_binary >> ./hclc/messung_index.txt
 done

benchmarks/run_lclc.sh

@@ -15,6 +15,6 @@ for run in 1 2 3 4 5
 do
   echo "Executing run $run"
 	cat benchmark_run.txt | ../sqlite_binary >> ./lclc/messung.txt
-	#cat benchmark_run_hash.txt | ../sqlite_binary >> ./lclc/messung_hash.txt
-	#cat benchmark_run_btree.txt | ../sqlite_binary >> ./lclc/messung_btree.txt
+	echo "Executing run $run with index"
+	cat benchmark_run_index.txt | ../sqlite_binary >> ./lclc/messung_index.txt
 done

benchmarks/run_rangequeries.sh

@@ -15,7 +15,6 @@ for run in 1 2 3 4 5
 do
   echo "Executing run $run"
 	cat benchmark_run.txt | ../sqlite_binary >> ./rangequeries/messung.txt
-	#cat benchmark_run_hash.txt | ../sqlite_binary >> ./rangequeries/messung_hash.txt
-	echo "Executing run $run with btree"
-	cat benchmark_run_btree.txt | ../sqlite_binary >> ./rangequeries/messung_btree.txt
+	echo "Executing run $run with index"
+	cat benchmark_run_index.txt | ../sqlite_binary >> ./rangequeries/messung_index.txt
 done