Fixed test infrastructure to work with cexpr sql architecture

Author: mkitzan

resources/tests/data.hpp

@@ -8,7 +8,11 @@
 using books =
 	sql::schema<
 		sql::index<>,
+#ifdef CROSS
 		sql::column<"book", std::string>,
+#else
+		sql::column<"title", std::string>,
+#endif
 		sql::column<"genre", std::string>,
 		sql::column<"year", unsigned>,
 		sql::column<"pages", unsigned>
@@ -17,7 +21,11 @@ using books =
 using stories =
 	sql::schema<
 		sql::index<>,
+#ifdef CROSS
 		sql::column<"story", std::string>,
+#else
+		sql::column<"title", std::string>,
+#endif
 		sql::column<"genre", std::string>,
 		sql::column<"year", unsigned>
 	>;

resources/tests/data/library.db

@@ -489,7 +489,6 @@ The Flower of Shazui	science fiction	2012
 The Forces that Crush	science fiction	1958
 The Form of the Sword	fiction	1942
 The Funeral	science fiction	1972
-The Funeral	science fiction	1972
 The Fusion Bomb	science fiction	1972
 The Garden of Forking Paths	fiction	1941
 The Gateway Asteroid	science fiction	1990

resources/tests/data/stories-table.tsv

@@ -6,8 +6,10 @@
 
 tables = ["books", "stories", "authored", "collected"]
 columns = {
-	"books": ["book", "genre", "year", "pages"],
-	"stories": ["story", "genre", "year"],
+	# "books": ["book", "genre", "year", "pages"],
+	"books": ["title", "genre", "year", "pages"],
+	# "stories": ["story", "genre", "year"],
+	"stories": ["title", "genre", "year"],
 	"authored": ["title", "name"],
 	"collected": ["title", "collection", "pages"]
 }
@@ -17,10 +19,11 @@
 	"authored": [],
 	"collected": []
 }
-joins = ["cross", "natural"]
+# joins = ["cross"]
+joins = ["natural"]
 renames = {
 	"genre": "type",
-	"year": "published",
+	"year": "published"
 }
 integral = ["year", "pages"]
 all_comp = ["=", "!=", "<>"]
@@ -33,8 +36,11 @@
 	"pages": [300],
 	"genre": ["science fiction"]
 }
-
-query_output = open("all-queries.txt", "w")
+outfiles = {
+	"joinless": open("joinless-queries.txt", "w"),
+	# "cross": open("cross-queries.txt", "w"),
+	"natural": open("natural-queries.txt", "w")
+}
 
 def col_list(cs):
 	cl = []
@@ -57,23 +63,25 @@ def col_list(cs):
 
 def froms(ts):
 	f = []
+	output = outfiles["joinless"]
 	if len(ts) == 1:
 		f = [ts[0]]
 	else:
 		for j in joins:
+			output = outfiles[j]
 			if random.random() < 0.3333:
 				j = j.upper()
 			f += [ts[0] + " " + j + " join " + ts[1]]
-	return f
+	return f, output
 
 def compose(ts, cs, pred):
 	if pred != "":
 		pred = " where " + pred
 	cols = col_list(cs)
-	sel = froms(ts)
+	sel, output = froms(ts)
 	for s in sel:
 		for c in cols:
-			query_output.write("select " + c + " from " + s + pred + "\n")
+			output.write("select " + c + " from " + s + pred + "\n")
 
 def next(cs, ci):
 	if ci >= len(cs):
@@ -139,4 +147,6 @@ def main():
 
 if __name__ == "__main__":
 	main()
-	query_output.close()
+	outfiles["joinless"].close()
+	# outfiles["cross"].close()
+	outfiles["natural"].close()

resources/tests/generate.py

@@ -3,14 +3,18 @@
 def main():
 	os.system("python3 select.py")
 	num = 1
+	token = ""
 	with open("test-queries.txt", "r") as queries:
 		for query in queries:
-			query.strip()
+			query = query.strip()
+			if query[0] != "s":
+				token = query
+				continue
 			q = open("query.txt", "w")
 			q.write(query + "\n")
 			q.close()
 			os.system("python3 compose.py")
-			os.system("g++ -std=c++2a -O3 -I../../include -o test test.cpp")
+			os.system("g++ -std=c++2a " + "-D" + token + " -O3 -I../../include -o test test.cpp")
 			os.system("./test | sort > cpp-results.txt")
 			os.system("sqlite3 data/library.db \"" + query + ";\" | sort > sql-results.txt")
 			stream = os.popen("diff cpp-results.txt sql-results.txt")

resources/tests/runner.py

@@ -3,9 +3,21 @@
 import random
 
 def main():
-	h = 500 / 1380000
 	outfile = open("test-queries.txt", "w")
-	with open("all-queries.txt", "r") as infile:
+	h = 100 / 23000
+	outfile.write("JOINLESS\n")
+	with open("joinless-queries.txt", "r") as infile:
+		for line in infile:
+			if random.random() < h:
+				outfile.write(line)				
+	h = 500 / 700000
+	outfile.write("CROSS\n")
+	with open("cross-queries.txt", "r") as infile:
+		for line in infile:
+			if random.random() < h:
+				outfile.write(line)
+	outfile.write("NATURAL\n")
+	with open("natural-queries.txt", "r") as infile:
 		for line in infile:
 			if random.random() < h:
 				outfile.write(line)