Merge remote-tracking branch 'origin/master'

# Conflicts:
#	benchmarks/run_hclc.sh

benchmarks/run_hashtable.sh

@@ -14,7 +14,7 @@ echo "Executing hashtable benchmark"
 for run in 1 2 3 4 5
 do
   echo "Executing run $run"
-	cat benchmark_run.txt | ../sqlite_binary >> ./hashtable/messung.txt
+	cat benchmark_run.txt | ../sqlite_binary ":memory:" >> ./hashtable/messung.txt
 	echo "Executing run $run with index"
-	cat benchmark_run_index.txt | ../sqlite_binary >> ./hashtable/messung_index.txt
+	cat benchmark_run_index.txt | ../sqlite_binary ":memory:" >> ./hashtable/messung_index.txt
 done

benchmarks/run_hchc.sh

@@ -24,8 +24,8 @@ do
   for run in 1 2 3 4 5
   do
     echo "Executing run $run"
-		cat benchmark_run.txt | ../sqlite_binary >> ./hchc/$dir_name/messung.txt
+		cat benchmark_run.txt | ../sqlite_binary ":memory:" >> ./hchc/$dir_name/messung.txt
     echo "Executing run $run with index"
-		cat benchmark_run_index.txt | ../sqlite_binary >> ./hchc/$dir_name/messung_index.txt
+		cat benchmark_run_index.txt | ../sqlite_binary ":memory:" >> ./hchc/$dir_name/messung_index.txt
   done
 done

benchmarks/run_hclc.sh

@@ -14,7 +14,7 @@ echo "Executing hclc benchmark"
 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.txt | ../sqlite_binary ":memory:" >> ./hclc/messung.txt
 	echo "Executing run $run with index"
-	cat benchmark_run_index.txt | ../sqlite_binary >> ./hclc/messung_index.txt
+	cat benchmark_run_index.txt | ../sqlite_binary ":memory:" >> ./hclc/messung_index.txt
 done

benchmarks/run_lclc.sh

@@ -14,7 +14,7 @@ echo "Executing lclc benchmark"
 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.txt | ../sqlite_binary ":memory:" >> ./lclc/messung.txt
 	echo "Executing run $run with index"
-	cat benchmark_run_index.txt | ../sqlite_binary >> ./lclc/messung_index.txt
+	cat benchmark_run_index.txt | ../sqlite_binary ":memory:" >> ./lclc/messung_index.txt
 done

benchmarks/run_rangequeries.sh

@@ -14,7 +14,7 @@ echo "Executing range query benchmark"
 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.txt | ../sqlite_binary ":memory:" >> ./rangequeries/messung.txt
 	echo "Executing run $run with index"
-	cat benchmark_run_index.txt | ../sqlite_binary >> ./rangequeries/messung_index.txt
+	cat benchmark_run_index.txt | ../sqlite_binary ":memory:" >> ./rangequeries/messung_index.txt
 done