Restructure standalone workloads

ldbc · Nov 19, 2019 · ee302d7 · ee302d7
1 parent 8379948
commit ee302d7
Show file tree

Hide file tree

Showing 15 changed files with 140 additions and 80 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,11 @@
 DOCUMENT=ldbc-snb-specification.tex
 
-all: $(DOCUMENT)
+spec: $(DOCUMENT)
 	latexmk -pdf --interaction=batchmode $(DOCUMENT)
 
+all: generate_query_cards compile_query_cards workloads texfot
+	ls *.pdf
+
 generate_query_cards: $(DOCUMENT)
 	./generate-tex.py
 
@@ -13,7 +16,7 @@ compile_query_cards: $(DOCUMENT)
 	done
 
 workloads: $(DOCUMENT)
-	for doc in *-workload.tex; do \
+	for doc in workload-*.tex; do \
 		./texfot.pl latexmk -pdf --interaction=batchmode $$doc ; \
 	done
 

diff --git a/bi-reads.tex b/bi-reads.tex
@@ -0,0 +1,28 @@
+\input{query-cards/bi-read-01}
+\input{query-cards/bi-read-02}
+\input{query-cards/bi-read-03}
+\input{query-cards/bi-read-04}
+\input{query-cards/bi-read-05}
+\input{query-cards/bi-read-06}
+\input{query-cards/bi-read-07}
+\input{query-cards/bi-read-08}
+\input{query-cards/bi-read-09}
+\input{query-cards/bi-read-10}
+\input{query-cards/bi-read-11}
+\input{query-cards/bi-read-12}
+\input{query-cards/bi-read-13}
+\input{query-cards/bi-read-14}
+\input{query-cards/bi-read-15}
+\input{query-cards/bi-read-16}
+\input{query-cards/bi-read-17}
+\input{query-cards/bi-read-18}
+\input{query-cards/bi-read-19}
+\input{query-cards/bi-read-20}
+\input{query-cards/bi-read-21}
+\input{query-cards/bi-read-22}
+\input{query-cards/bi-read-23}
+\input{query-cards/bi-read-24}
+\input{query-cards/bi-read-25}
+
+% reset counter to make sure the last query card isn't stuck in highlighted mode
+\renewcommand{\currentQueryCard}{0}
diff --git a/bi.tex b/bi.tex
@@ -10,34 +10,7 @@ \chapter{Business Intelligence Workload}
 
 \section{Read Query Descriptions}
 
-\input{query-cards/bi-read-01}
-\input{query-cards/bi-read-02}
-\input{query-cards/bi-read-03}
-\input{query-cards/bi-read-04}
-\input{query-cards/bi-read-05}
-\input{query-cards/bi-read-06}
-\input{query-cards/bi-read-07}
-\input{query-cards/bi-read-08}
-\input{query-cards/bi-read-09}
-\input{query-cards/bi-read-10}
-\input{query-cards/bi-read-11}
-\input{query-cards/bi-read-12}
-\input{query-cards/bi-read-13}
-\input{query-cards/bi-read-14}
-\input{query-cards/bi-read-15}
-\input{query-cards/bi-read-16}
-\input{query-cards/bi-read-17}
-\input{query-cards/bi-read-18}
-\input{query-cards/bi-read-19}
-\input{query-cards/bi-read-20}
-\input{query-cards/bi-read-21}
-\input{query-cards/bi-read-22}
-\input{query-cards/bi-read-23}
-\input{query-cards/bi-read-24}
-\input{query-cards/bi-read-25}
-
-% reset counter to make sure the last query card isn't stuck in highlighted mode
-\renewcommand{\currentQueryCard}{0}
+\input{bi-reads}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/deployment/readme-to-deploy.md b/deployment/readme-to-deploy.md
@@ -8,8 +8,12 @@
 
 ## Workloads
 
-* [BI](http://ldbc.github.io/ldbc_snb_docs_snapshot/bi-workload.pdf)
-* [Interactive](http://ldbc.github.io/ldbc_snb_docs_snapshot/interactive-workload.pdf)
+* [BI / reads](http://ldbc.github.io/ldbc_snb_docs_snapshot/workload-bi-reads.pdf)
+* [Interactive / complex reads](http://ldbc.github.io/ldbc_snb_docs_snapshot/workload-interactive-complex-reads.pdf)
+* [Interactive / short reads](http://ldbc.github.io/ldbc_snb_docs_snapshot/workload-interactive-short-reads.pdf)
+* [Interactive / inserts](http://ldbc.github.io/ldbc_snb_docs_snapshot/workload-interactive-inserts.pdf)
+* [Interactive / deletes](http://ldbc.github.io/ldbc_snb_docs_snapshot/workload-interactive-deletes.pdf)
+
 
 ## BI query cards
 

diff --git a/interactive-complex-reads.tex b/interactive-complex-reads.tex
@@ -0,0 +1,17 @@
+\input{query-cards/interactive-complex-read-01}
+\input{query-cards/interactive-complex-read-02}
+\input{query-cards/interactive-complex-read-03}
+\input{query-cards/interactive-complex-read-04}
+\input{query-cards/interactive-complex-read-05}
+\input{query-cards/interactive-complex-read-06}
+\input{query-cards/interactive-complex-read-07}
+\input{query-cards/interactive-complex-read-08}
+\input{query-cards/interactive-complex-read-09}
+\input{query-cards/interactive-complex-read-10}
+\input{query-cards/interactive-complex-read-11}
+\input{query-cards/interactive-complex-read-12}
+\input{query-cards/interactive-complex-read-13}
+\input{query-cards/interactive-complex-read-14}
+
+% reset counter to make sure the last query card isn't stuck in highlighted mode
+\renewcommand{\currentQueryCard}{0}
diff --git a/interactive-deletes.tex b/interactive-deletes.tex
@@ -0,0 +1,11 @@
+\input{query-cards/interactive-delete-01}
+\input{query-cards/interactive-delete-02}
+\input{query-cards/interactive-delete-03}
+\input{query-cards/interactive-delete-04}
+\input{query-cards/interactive-delete-05}
+\input{query-cards/interactive-delete-06}
+\input{query-cards/interactive-delete-07}
+\input{query-cards/interactive-delete-08}
+
+% reset counter to make sure the last query card isn't stuck in highlighted mode
+\renewcommand{\currentQueryCard}{0}
diff --git a/interactive-inserts.tex b/interactive-inserts.tex
@@ -0,0 +1,8 @@
+\input{query-cards/interactive-insert-01}
+\input{query-cards/interactive-insert-02}
+\input{query-cards/interactive-insert-03}
+\input{query-cards/interactive-insert-04}
+\input{query-cards/interactive-insert-05}
+\input{query-cards/interactive-insert-06}
+\input{query-cards/interactive-insert-07}
+\input{query-cards/interactive-insert-08}
diff --git a/interactive-short-reads.tex b/interactive-short-reads.tex
@@ -0,0 +1,10 @@
+\input{query-cards/interactive-short-read-01}
+\input{query-cards/interactive-short-read-02}
+\input{query-cards/interactive-short-read-03}
+\input{query-cards/interactive-short-read-04}
+\input{query-cards/interactive-short-read-05}
+\input{query-cards/interactive-short-read-06}
+\input{query-cards/interactive-short-read-07}
+
+% reset counter to make sure the last query card isn't stuck in highlighted mode
+\renewcommand{\currentQueryCard}{0}
diff --git a/interactive.tex b/interactive.tex
@@ -22,20 +22,7 @@ \chapter{Interactive Workload}
 \section{Complex Reads}
 \label{sec:complex-reads}
 
-\input{query-cards/interactive-complex-read-01}
-\input{query-cards/interactive-complex-read-02}
-\input{query-cards/interactive-complex-read-03}
-\input{query-cards/interactive-complex-read-04}
-\input{query-cards/interactive-complex-read-05}
-\input{query-cards/interactive-complex-read-06}
-\input{query-cards/interactive-complex-read-07}
-\input{query-cards/interactive-complex-read-08}
-\input{query-cards/interactive-complex-read-09}
-\input{query-cards/interactive-complex-read-10}
-\input{query-cards/interactive-complex-read-11}
-\input{query-cards/interactive-complex-read-12}
-\input{query-cards/interactive-complex-read-13}
-\input{query-cards/interactive-complex-read-14}
+\input{interactive-complex-reads}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -44,13 +31,7 @@ \section{Complex Reads}
 \section{Short Reads}
 \label{sec:short-reads}
 
-\input{query-cards/interactive-short-read-01}
-\input{query-cards/interactive-short-read-02}
-\input{query-cards/interactive-short-read-03}
-\input{query-cards/interactive-short-read-04}
-\input{query-cards/interactive-short-read-05}
-\input{query-cards/interactive-short-read-06}
-\input{query-cards/interactive-short-read-07}
+\input{interactive-short-reads}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -61,28 +42,11 @@ \section{Inserts}
 
 Each insert query inserts either (1) a single node of a certain type, along with its edges to other existing nodes or (2) a single edge of a certain type between two existing nodes.
 
-\input{query-cards/interactive-insert-01}
-\input{query-cards/interactive-insert-02}
-\input{query-cards/interactive-insert-03}
-\input{query-cards/interactive-insert-04}
-\input{query-cards/interactive-insert-05}
-\input{query-cards/interactive-insert-06}
-\input{query-cards/interactive-insert-07}
-\input{query-cards/interactive-insert-08}
+\input{interactive-inserts}
 
 \section{Deletes}
 \label{sec:deletes}
 
 Each delete query removes either (1) a single edge between two existing vertices or (2) a vertex, all incident edges and transitive vertices (where appropriate).
 
-\input{query-cards/interactive-delete-01}
-\input{query-cards/interactive-delete-02}
-\input{query-cards/interactive-delete-03}
-\input{query-cards/interactive-delete-04}
-\input{query-cards/interactive-delete-05}
-\input{query-cards/interactive-delete-06}
-\input{query-cards/interactive-delete-07}
-\input{query-cards/interactive-delete-08}
-
-% reset counter to make sure the last query card isn't stuck in highlighted mode
-\renewcommand{\currentQueryCard}{0}
+\input{interactive-deletes}
diff --git a/query-card-definitions.tex b/query-card-definitions.tex
@@ -16,11 +16,7 @@
 
 \reversemarginpar
 \newcommand{\currentQueryCard}{0}
-\newcommand{\queryRefCard}[3]{%
-	\queryRefCardInternal{#1}{#2}{#3}%
-}
-
-\newcommand{\queryRefCardInternal}[3]{%
+\newcommand{\queryRefCard}[3]{
 	\ifthenelse{
 		\equal{\currentQueryCard}{#3}
 	}{%

diff --git a/bi-workload.tex → workload-bi-reads.tex b/bi-workload.tex → workload-bi-reads.tex
@@ -14,4 +14,3 @@
 \input{bi}
 
 \end{document}
-
diff --git a/workload-interactive-complex-reads.tex b/workload-interactive-complex-reads.tex
@@ -0,0 +1,16 @@
+% !TeX spellcheck = en_GB
+% !TeX encoding = UTF-8
+% !TeX program = pdflatex
+\documentclass{ldbc}
+
+\input{packages}
+\input{commands}
+\input{query-card-definitions}
+
+\usepackage[a4paper, margin=1in]{geometry}
+
+\begin{document}
+
+\input{interactive-complex-reads}
+
+\end{document}
diff --git a/interactive-workload.tex → workload-interactive-deletes.tex b/interactive-workload.tex → workload-interactive-deletes.tex
@@ -11,7 +11,6 @@
 
 \begin{document}
 
-\input{interactive}
+\input{interactive-deletes}
 
 \end{document}
-
diff --git a/workload-interactive-inserts.tex b/workload-interactive-inserts.tex
@@ -0,0 +1,16 @@
+% !TeX spellcheck = en_GB
+% !TeX encoding = UTF-8
+% !TeX program = pdflatex
+\documentclass{ldbc}
+
+\input{packages}
+\input{commands}
+\input{query-card-definitions}
+
+\usepackage[a4paper, margin=1in]{geometry}
+
+\begin{document}
+
+\input{interactive-inserts}
+
+\end{document}
diff --git a/workload-interactive-short-reads.tex b/workload-interactive-short-reads.tex
@@ -0,0 +1,16 @@
+% !TeX spellcheck = en_GB
+% !TeX encoding = UTF-8
+% !TeX program = pdflatex
+\documentclass{ldbc}
+
+\input{packages}
+\input{commands}
+\input{query-card-definitions}
+
+\usepackage[a4paper, margin=1in]{geometry}
+
+\begin{document}
+
+\input{interactive-short-reads}
+
+\end{document}