diff --git a/benchmarks/benchmark_run.txt b/benchmarks/benchmark_run.txt index 1c410ed..917dcc1 100644 --- a/benchmarks/benchmark_run.txt +++ b/benchmarks/benchmark_run.txt @@ -1,5 +1,4 @@ CREATE TABLE benchmarktable(ID long, STR char(32)) load fill load mixed -select * from benchmarktable quit diff --git a/benchmarks/benchmark_run_hash.txt b/benchmarks/benchmark_run_hash.txt deleted file mode 100644 index fc0b717..0000000 --- a/benchmarks/benchmark_run_hash.txt +++ /dev/null @@ -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 diff --git a/benchmarks/benchmark_run_btree.txt b/benchmarks/benchmark_run_index.txt similarity index 60% rename from benchmarks/benchmark_run_btree.txt rename to benchmarks/benchmark_run_index.txt index 8602f4e..828d4d1 100644 --- a/benchmarks/benchmark_run_btree.txt +++ b/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 diff --git a/benchmarks/run_benchmarks.sh b/benchmarks/run_benchmarks.sh index d4391a6..95361e2 100755 --- a/benchmarks/run_benchmarks.sh +++ b/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 \ No newline at end of file +#./run_hashtable.sh + +echo "Ended at $(date -I'seconds')" diff --git a/benchmarks/run_hashtable.sh b/benchmarks/run_hashtable.sh index e7a0ff0..240d9a0 100755 --- a/benchmarks/run_hashtable.sh +++ b/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 \ No newline at end of file diff --git a/benchmarks/run_hchc.sh b/benchmarks/run_hchc.sh index 0837a30..68344cf 100755 --- a/benchmarks/run_hchc.sh +++ b/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 diff --git a/benchmarks/run_hclc.sh b/benchmarks/run_hclc.sh index a9c5d72..b2c4543 100755 --- a/benchmarks/run_hclc.sh +++ b/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 >> ./lclc/messung_index.txt done \ No newline at end of file diff --git a/benchmarks/run_lclc.sh b/benchmarks/run_lclc.sh index 8ab978a..ed89157 100755 --- a/benchmarks/run_lclc.sh +++ b/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 \ No newline at end of file diff --git a/benchmarks/run_rangequeries.sh b/benchmarks/run_rangequeries.sh index 8eae0b8..b8e2593 100755 --- a/benchmarks/run_rangequeries.sh +++ b/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 \ No newline at end of file