Testing framework adjustments (#1719)

* Change answers/*.csv to answers/*.txt * Replace STATEMENT_BLOCK by INSERT_STATEMENT_BLOCK * Replace NAME by DEBUG_LOG * Use ARANGE in UNWIND test * Replace -QUERY by -STATEMENT * Clang adjustment on test_parser.h * Changed -DEBUG_LOG to -LOG
kuzudb · Jun 26, 2023 · 67eb0c2 · 67eb0c2
1 parent 2c21a5e
commit 67eb0c2
Show file tree

Hide file tree

Showing 124 changed files with 2,608 additions and 2,609 deletions.
diff --git a/test/answers/copy_large_list_fwd_answer.csv → test/answers/copy_large_list_fwd_answer.txt b/test/answers/copy_large_list_fwd_answer.csv → test/answers/copy_large_list_fwd_answer.txt
diff --git a/...ers/copy_large_list_single_bwd_answer.csv → ...ers/copy_large_list_single_bwd_answer.txt b/...ers/copy_large_list_single_bwd_answer.csv → ...ers/copy_large_list_single_bwd_answer.txt
diff --git a/...ers/copy_large_list_single_fwd_answer.csv → ...ers/copy_large_list_single_fwd_answer.txt b/...ers/copy_large_list_single_fwd_answer.csv → ...ers/copy_large_list_single_fwd_answer.txt
diff --git a/test/answers/copy_npy_large_f32_answer.csv → test/answers/copy_npy_large_f32_answer.txt b/test/answers/copy_npy_large_f32_answer.csv → test/answers/copy_npy_large_f32_answer.txt
diff --git a/test/answers/copy_npy_large_id_answer.csv → test/answers/copy_npy_large_id_answer.txt b/test/answers/copy_npy_large_id_answer.csv → test/answers/copy_npy_large_id_answer.txt
diff --git a/test/include/test_runner/test_group.h b/test/include/test_runner/test_group.h
@@ -6,7 +6,7 @@ namespace kuzu {
 namespace testing {
 
 struct TestStatement {
-    std::string name;
+    std::string logMessage;
     std::string query;
     uint64_t numThreads = 4;
     std::string encodedJoin;

diff --git a/test/include/test_runner/test_parser.h b/test/include/test_runner/test_parser.h
@@ -23,25 +23,24 @@ enum class TokenType {
     ENCODED_JOIN,
     END_OF_STATEMENT_BLOCK,
     ENUMERATE,
-    NAME,
+    INSERT_STATEMENT_BLOCK,
+    LOG,
     PARALLELISM,
-    QUERY,
     RESULT,
     SEPARATOR,
     STATEMENT,
-    STATEMENT_BLOCK,
     _SKIP_LINE
 };
 
 const std::unordered_map<std::string, TokenType> tokenMap = {{"-GROUP", TokenType::GROUP},
     {"-DATASET", TokenType::DATASET}, {"-CASE", TokenType::CASE},
     {"-CHECK_ORDER", TokenType::CHECK_ORDER}, {"-ENCODED_JOIN", TokenType::ENCODED_JOIN},
-    {"-DEFINE_STATEMENT_BLOCK", TokenType::DEFINE_STATEMENT_BLOCK},
-    {"-ENUMERATE", TokenType::ENUMERATE}, {"-NAME", TokenType::NAME},
+    {"-LOG", TokenType::LOG}, {"-DEFINE_STATEMENT_BLOCK", TokenType::DEFINE_STATEMENT_BLOCK},
+    {"-ENUMERATE", TokenType::ENUMERATE},
     {"-BEGIN_WRITE_TRANSACTION", TokenType::BEGIN_WRITE_TRANSACTION},
-    {"-PARALLELISM", TokenType::PARALLELISM}, {"-QUERY", TokenType::QUERY},
-    {"-SKIP", TokenType::SKIP}, {"-DEFINE", TokenType::DEFINE},
-    {"-STATEMENT", TokenType::STATEMENT}, {"-STATEMENT_BLOCK", TokenType::STATEMENT_BLOCK},
+    {"-PARALLELISM", TokenType::PARALLELISM}, {"-SKIP", TokenType::SKIP},
+    {"-DEFINE", TokenType::DEFINE}, {"-STATEMENT", TokenType::STATEMENT},
+    {"-INSERT_STATEMENT_BLOCK", TokenType::INSERT_STATEMENT_BLOCK},
     {"-BUFFER_POOL_SIZE", TokenType::BUFFER_POOL_SIZE}, {"]", TokenType::END_OF_STATEMENT_BLOCK},
     {"----", TokenType::RESULT}, {"--", TokenType::SEPARATOR}, {"#", TokenType::EMPTY}};
 
@@ -62,7 +61,7 @@ class TestParser {
     std::ifstream fileStream;
     std::streampos previousFilePosition;
     std::string line;
-    std::string name;
+    std::string logMessage;
     std::unique_ptr<TestGroup> testGroup;
     std::string extractTextBeforeNextStatement(bool ignoreLineBreak = false);
     std::string parseCommand();

diff --git a/test/test_files/copy/copy_dates.test b/test/test_files/copy/copy_dates.test
@@ -4,7 +4,7 @@
 --
 
 -CASE NodePropertyColumnWithDate
--QUERY MATCH (p:person) RETURN p.birthdate
+-STATEMENT MATCH (p:person) RETURN p.birthdate
 ---- 8
 1900-01-01
 1900-01-01

diff --git a/test/test_files/copy/copy_dos_style_newline.test b/test/test_files/copy/copy_dos_style_newline.test
@@ -4,7 +4,7 @@
 --
 
 -CASE DOSStyleNewlineTest
--QUERY MATCH (p:person) return p.ID
+-STATEMENT MATCH (p:person) return p.ID
 ---- 5
 0
 1

diff --git a/test/test_files/copy/copy_init_rel_tables.test b/test/test_files/copy/copy_init_rel_tables.test
@@ -24,5 +24,5 @@
 ---- ok
 -STATEMENT COPY person FROM "${KUZU_ROOT_DIRECTORY}/dataset/tinysnb/vPerson.csv" (HEADER=true);
 ---- ok
--QUERY MATCH (:person)-[:knows]->(:person) return count(*)
+-STATEMENT MATCH (:person)-[:knows]->(:person) return count(*)
 ---- ok
diff --git a/test/test_files/copy/copy_interval.test b/test/test_files/copy/copy_interval.test
@@ -4,7 +4,7 @@
 --
 
 -CASE NodePropertyColumnWithInterval
--QUERY MATCH (p:person) RETURN p.lastJobDuration
+-STATEMENT MATCH (p:person) RETURN p.lastJobDuration
 ---- 8
 00:18:00.024
 10 years 5 months 13:00:00.000024

diff --git a/test/test_files/copy/copy_large_list.test b/test/test_files/copy/copy_large_list.test
@@ -6,54 +6,54 @@
 -CASE CopyLargeList
 
 # p0 has 5001 fwd edges to p0...p5000
--NAME ForwardCheck
--QUERY MATCH (p0:person)-[r:knows]->(p1:person) WHERE p0.ID = 0 RETURN COUNT(*)
+-LOG ForwardCheck
+-STATEMENT MATCH (p0:person)-[r:knows]->(p1:person) WHERE p0.ID = 0 RETURN COUNT(*)
 ---- 1
 5001
--QUERY MATCH (p0:person)-[r:knows]->(p1:person) WHERE p0.ID = 0 RETURN p0.ID, ID(r), p1.ID
+-STATEMENT MATCH (p0:person)-[r:knows]->(p1:person) WHERE p0.ID = 0 RETURN p0.ID, ID(r), p1.ID
 ---- 5001
-<FILE>:copy_large_list_fwd_answer.csv
+<FILE>:copy_large_list_fwd_answer.txt
 
 # p0 has only 1 bwd edge, which from itself
--NAME BackwardCheck
--QUERY match (p0:person)<-[r:knows]-(p1:person) WHERE p0.ID = 0 RETURN p0.ID, ID(r), p1.ID
+-LOG BackwardCheck
+-STATEMENT match (p0:person)<-[r:knows]-(p1:person) WHERE p0.ID = 0 RETURN p0.ID, ID(r), p1.ID
 ---- 1
 0|1:0|0
 
 # p1,p2,...,p5000 have a single fwd edge to p5000 and 1 bwd edge from node p0
--NAME OneSingleForwardEdge
--QUERY MATCH (p0:person)-[r:knows]->(p1:person) WHERE p0.ID > 0 AND p0.ID < 5001 AND p1.ID = 5000 RETURN p0.ID, ID(r), p1.ID
+-LOG OneSingleForwardEdge
+-STATEMENT MATCH (p0:person)-[r:knows]->(p1:person) WHERE p0.ID > 0 AND p0.ID < 5001 AND p1.ID = 5000 RETURN p0.ID, ID(r), p1.ID
 ---- 1
-<FILE>:copy_large_list_single_fwd_answer.csv
+<FILE>:copy_large_list_single_fwd_answer.txt
 
--NAME OneBackwardEdge
--QUERY MATCH (p0:person)<-[r:knows]-(p1:person) WHERE p0.ID > 0 AND p0.ID < 5001 AND p1.ID = 0 RETURN p0.ID, ID(r), p1.ID;
+-LOG OneBackwardEdge
+-STATEMENT MATCH (p0:person)<-[r:knows]-(p1:person) WHERE p0.ID > 0 AND p0.ID < 5001 AND p1.ID = 0 RETURN p0.ID, ID(r), p1.ID;
 ---- 1
-<FILE>:copy_large_list_single_bwd_answer.csv
+<FILE>:copy_large_list_single_bwd_answer.txt
 
 # p5001 to p6000 are singletons
--NAME SingletonNodeForwardCheck
--QUERY MATCH (p0:person)-[r:knows]->(p1:person) WHERE p0.ID > 5000 and p0.ID < 6000 RETURN COUNT(*)
+-LOG SingletonNodeForwardCheck
+-STATEMENT MATCH (p0:person)-[r:knows]->(p1:person) WHERE p0.ID > 5000 and p0.ID < 6000 RETURN COUNT(*)
 ---- 1
 0
 
--NAME SingletonNodeBackwardCheck
--QUERY MATCH (p0:person)<-[r:knows]-(p1:person) WHERE p0.ID > 5000 and p0.ID < 6000 RETURN COUNT(*)
+-LOG SingletonNodeBackwardCheck
+-STATEMENT MATCH (p0:person)<-[r:knows]-(p1:person) WHERE p0.ID > 5000 and p0.ID < 6000 RETURN COUNT(*)
 ---- 1
 0
 
 -CASE AddPropertyWithLargeListTest
 -SKIP
 -STATEMENT alter table knows add length INT64 DEFAULT 50
 ---- ok
--QUERY match (:person)-[e:knows]->(:person) return e.length
+-STATEMENT match (:person)-[e:knows]->(:person) return e.length
 ---- 2
 10001
 50
 
 -STATEMENT match (:person)-[e:knows]->(:person) set e.length=37
 ---- ok
--QUERY match (p:person)-[e:knows]->(:person) return e.length
+-STATEMENT match (p:person)-[e:knows]->(:person) return e.length
 ---- 2
 10001
 37
diff --git a/test/test_files/copy/copy_lists.test b/test/test_files/copy/copy_lists.test
@@ -4,7 +4,7 @@
 --
 
 -CASE NodePropertyIntColumnWithList
--QUERY MATCH (p:person) RETURN p.workedHours
+-STATEMENT MATCH (p:person) RETURN p.workedHours
 ---- 8
 [1,9]
 [10,11,12,3,4,5,6,7]
@@ -16,7 +16,7 @@
 [4,5]
 
 -CASE NodePropertyStringColumnWithList
--QUERY MATCH (p:person) RETURN p.usedNames
+-STATEMENT MATCH (p:person) RETURN p.usedNames
 ---- 8
 [Ad,De,Hi,Kye,Orlan]
 [Aida]
@@ -28,7 +28,7 @@
 [Wolfeschlegelstein,Daniel]
 
 -CASE RelPropertyColumnWithList
--QUERY MATCH ()-[s:studyAt]-() RETURN s.places
+-STATEMENT MATCH ()-[s:studyAt]-() RETURN s.places
 ---- 6
 [anew,jsdnwusklklklwewsd]
 [anew,jsdnwusklklklwewsd]

diff --git a/test/test_files/copy/copy_long_string.test b/test/test_files/copy/copy_long_string.test
@@ -6,14 +6,14 @@
 -CASE LongStringError
 -DEFINE AliceStr REPEAT 819 "Alice"
 
--NAME LongStringAlice
--QUERY MATCH (p:person) RETURN p.fName;
+-LOG LongStringAlice
+-STATEMENT MATCH (p:person) RETURN p.fName;
 ---- 2
 ${AliceStr}A
 Bob
 
--NAME Gender
--QUERY MATCH (p:person) RETURN p.gender
+-LOG Gender
+-STATEMENT MATCH (p:person) RETURN p.gender
 ---- 2
 1
 2
diff --git a/test/test_files/copy/copy_multiple_files.test b/test/test_files/copy/copy_multiple_files.test
@@ -4,7 +4,7 @@
 --
 
 -DEFINE_STATEMENT_BLOCK VALIDATE_PERSON_TABLE_AFTER_COPYING [
--QUERY MATCH (p:person) RETURN p.ID
+-STATEMENT MATCH (p:person) RETURN p.ID
 ---- 11
 1
 12
@@ -20,7 +20,7 @@
 ]
 
 -DEFINE_STATEMENT_BLOCK VALIDATE_KNOWS_TABLE_AFTER_COPYING [
--QUERY MATCH (:person)-[e:knows]->(:person) RETURN e.weight
+-STATEMENT MATCH (:person)-[e:knows]->(:person) RETURN e.weight
 ---- 8
 22
 25
@@ -38,22 +38,22 @@
                              "${KUZU_ROOT_DIRECTORY}/dataset/copy-multiple-files-test/vPerson2.csv",
                              "${KUZU_ROOT_DIRECTORY}/dataset/copy-multiple-files-test/vPerson3.csv"]
 ---- ok
--STATEMENT_BLOCK VALIDATE_PERSON_TABLE_AFTER_COPYING
+-INSERT_STATEMENT_BLOCK VALIDATE_PERSON_TABLE_AFTER_COPYING
 
 -STATEMENT COPY knows FROM ["${KUZU_ROOT_DIRECTORY}/dataset/copy-multiple-files-test/eKnows1.csv", 
                             "${KUZU_ROOT_DIRECTORY}/dataset/copy-multiple-files-test/eKnows2.csv"]
 ---- ok
--STATEMENT_BLOCK VALIDATE_KNOWS_TABLE_AFTER_COPYING
+-INSERT_STATEMENT_BLOCK VALIDATE_KNOWS_TABLE_AFTER_COPYING
 
 
 -CASE CopyFilesWithWildcardPattern
 
 -STATEMENT COPY person FROM "${KUZU_ROOT_DIRECTORY}/dataset/copy-multiple-files-test/vPerson?.csv"
 ---- ok
--STATEMENT_BLOCK VALIDATE_PERSON_TABLE_AFTER_COPYING
+-INSERT_STATEMENT_BLOCK VALIDATE_PERSON_TABLE_AFTER_COPYING
 -STATEMENT COPY knows FROM "${KUZU_ROOT_DIRECTORY}/dataset/copy-multiple-files-test/eK*"
 ---- ok
--STATEMENT_BLOCK VALIDATE_KNOWS_TABLE_AFTER_COPYING
+-INSERT_STATEMENT_BLOCK VALIDATE_KNOWS_TABLE_AFTER_COPYING
 
 -CASE CopyFilesWithWrongPath
 -STATEMENT COPY person FROM ["1.csv", "${KUZU_ROOT_DIRECTORY}/dataset/copy-multiple-files-test/vPerson?.csv"]

diff --git a/test/test_files/copy/copy_node_csv.test b/test/test_files/copy/copy_node_csv.test
@@ -5,51 +5,51 @@
 
 -CASE CopyNodeTest
 
--NAME SubsetTest
--QUERY MATCH (row:tableOfTypes) WHERE row.id >= 20 AND row.id <= 24 RETURN *;
+-LOG SubsetTest
+-STATEMENT MATCH (row:tableOfTypes) WHERE row.id >= 20 AND row.id <= 24 RETURN *;
 ---- 5
 (label:tableOfTypes, 0:20, {id:20, int64Column:0, doubleColumn:57.579280, booleanColumn:True, dateColumn:1731-09-26, timestampColumn:1731-09-26 03:30:08, stringColumn:OdM})
 (label:tableOfTypes, 0:21, {id:21, int64Column:7, doubleColumn:64.630960, booleanColumn:False, dateColumn:1307-01-26, timestampColumn:1307-01-26 03:31:08, stringColumn:AjbxHQThEtDDlOjbzMjCQSXlvGQEjcFLykESrnFHwPKX})
 (label:tableOfTypes, 0:22, {id:22, int64Column:71, doubleColumn:37.963386, booleanColumn:True, dateColumn:1455-07-26, timestampColumn:1455-07-26 03:07:03, stringColumn:dRvHHdyNXYfSUcicaxBoQEKQUfgex})
 (label:tableOfTypes, 0:23, {id:23, int64Column:58, doubleColumn:42.774957, booleanColumn:False, dateColumn:1181-10-16, timestampColumn:1181-10-16 18:19:43, stringColumn:ISImRVpUjynGMFRQyYmeIUVjM})
 (label:tableOfTypes, 0:24, {id:24, int64Column:75, doubleColumn:53.813224, booleanColumn:False, dateColumn:1942-10-24, timestampColumn:1942-10-24 09:30:16, stringColumn:naDlQ})
 
--NAME CheckNumLinesTest
--QUERY MATCH (row:tableOfTypes) RETURN count(*)
+-LOG CheckNumLinesTest
+-STATEMENT MATCH (row:tableOfTypes) RETURN count(*)
 ---- 1
 49999
 
--NAME CountTrueTest
--QUERY MATCH (row:tableOfTypes) WHERE row.booleanColumn = True RETURN count(*)
+-LOG CountTrueTest
+-STATEMENT MATCH (row:tableOfTypes) WHERE row.booleanColumn = True RETURN count(*)
 ---- 1
 24997
 
--NAME CountFalseTest
--QUERY MATCH (row:tableOfTypes) WHERE row.booleanColumn = False RETURN count(*)
+-LOG CountFalseTest
+-STATEMENT MATCH (row:tableOfTypes) WHERE row.booleanColumn = False RETURN count(*)
 ---- 1
 25002
 
--NAME CheckSumTest
--QUERY MATCH (row:tableOfTypes) RETURN sum(row.id), sum(row.int64Column), sum(row.doubleColumn)
+-LOG CheckSumTest
+-STATEMENT MATCH (row:tableOfTypes) RETURN sum(row.id), sum(row.int64Column), sum(row.doubleColumn)
 ---- 1
 1249925001|2500180|2504542.349696
 
--NAME EmptyStringTest
--QUERY MATCH (row:tableOfTypes) WHERE row.id = 49992 RETURN *;
+-LOG EmptyStringTest
+-STATEMENT MATCH (row:tableOfTypes) WHERE row.id = 49992 RETURN *;
 ---- 1
 (label:tableOfTypes, 0:49992, {id:49992, int64Column:50, doubleColumn:31.582059, booleanColumn:False, dateColumn:1551-07-19, timestampColumn:1551-07-19 16:28:31, stringColumn:})
 
--NAME FloatTest
--QUERY MATCH (row:tableOfTypes) WHERE row.doubleColumn = 68.73718401556897 RETURN row.dateColumn;
+-LOG FloatTest
+-STATEMENT MATCH (row:tableOfTypes) WHERE row.doubleColumn = 68.73718401556897 RETURN row.dateColumn;
 ---- 1
 1042-06-05
 
--NAME DateTest
--QUERY MATCH (row:tableOfTypes) WHERE row.id = 25531 RETURN *;
+-LOG DateTest
+-STATEMENT MATCH (row:tableOfTypes) WHERE row.id = 25531 RETURN *;
 ---- 1
 (label:tableOfTypes, 0:25531, {id:25531, int64Column:77, doubleColumn:28.417543, booleanColumn:False, dateColumn:1895-03-13, timestampColumn:1895-03-13 04:31:22, stringColumn:XB})
 
--NAME IntervalTest
--QUERY MATCH (row:tableOfTypes) WHERE 0 <= row.doubleColumn AND row.doubleColumn <= 10 AND 0 <= row.int64Column AND row.int64Column <= 10 RETURN count(*);
+-LOG IntervalTest
+-STATEMENT MATCH (row:tableOfTypes) WHERE 0 <= row.doubleColumn AND row.doubleColumn <= 10 AND 0 <= row.int64Column AND row.int64Column <= 10 RETURN count(*);
 ---- 1
 546
diff --git a/test/test_files/copy/copy_node_parquet.test b/test/test_files/copy/copy_node_parquet.test
@@ -5,51 +5,51 @@
 
 -CASE CopyNodeTest
 
--NAME SubsetTest
--QUERY MATCH (row:tableOfTypes) WHERE row.id >= 20 AND row.id <= 24 RETURN row.id, row.int64Column, row.doubleColumn, row.booleanColumn, row.dateColumn, row.timestampColumn, row.stringColumn, row.listOfInt64, row.listOfString, row.listOfListOfInt64, row.fixedSizeList, row.listOfFixedSizeList, row.structColumn;
+-LOG SubsetTest
+-STATEMENT MATCH (row:tableOfTypes) WHERE row.id >= 20 AND row.id <= 24 RETURN row.id, row.int64Column, row.doubleColumn, row.booleanColumn, row.dateColumn, row.timestampColumn, row.stringColumn, row.listOfInt64, row.listOfString, row.listOfListOfInt64, row.fixedSizeList, row.listOfFixedSizeList, row.structColumn;
 ---- 5
 20|0|57.579280|True|2094-08-19|1731-09-26 03:30:08|OdM|[85,11,98,6]|[wl7evae,lLtQIMJI,vNvYnjt27]|[[131,129]]|[297,283,26]|[[36,165,199],[182,108,165],[17,120,181],[193,171,93]]|{ID: 717, NAME: 3oOf}
 21|7|64.630960|False|2090-07-13|1307-01-26 03:31:08|AjbxHQThEtDDlOjbzMjCQSXlvGQEjcFLykESrnFHwPKX|[53,44,76,78]|[V0yNTz60W2i4J,LN3F2erCELm]|[[191,62],[64,259,183,130,116],[49,29,222,249,128],[222,169,22,80],[206,59]]|[114,108,207]|[[53,135,64],[173,101,155],[173,161,11],[140,113,18]]|{ID: 956, NAME: GNX5sv9V}
 22|71|37.963386|True|2048-04-24|1455-07-26 03:07:03|dRvHHdyNXYfSUcicaxBoQEKQUfgex|[74]|[GOLV1]|[[139,156,218],[148,187,62],[158,118],[297,151]]|[258,1,50]|[[34,123,13],[84,122,133]]|{ID: 838, NAME: gRdEkZSI8qQ7dIH}
 23|58|42.774957|False|2043-08-19|1181-10-16 18:19:43|ISImRVpUjynGMFRQyYmeIUVjM|[16,38,98,61,2]|[EzPWolZ2iCsga46o,lbhcKq7DDPeiX,yaxsyrbzolAyVWlxj,5Rlse62CKuIitVf4,yKOx0P]|[[95,209,75,7],[197],[69,244],[164,160,153,125]]|[55,59,114]|[[80,52,187],[64,175,142],[148,141,185],[90,51,49]]|{ID: 682, NAME: 06SBnT}
 24|75|53.813224|False|1971-12-05|1942-10-24 09:30:16|naDlQ|[94,17,22]|[gVYovI30hQyC,b6OpP]|[[81,66],[255,44],[37]]|[262,288,66]|[[34,178,128]]|{ID: 185, NAME: 7xymBThq}
 
--NAME CheckNumLinesTest
--QUERY MATCH (row:tableOfTypes) RETURN count(*)
+-LOG CheckNumLinesTest
+-STATEMENT MATCH (row:tableOfTypes) RETURN count(*)
 ---- 1
 49999
 
--NAME CountTrueTest
--QUERY MATCH (row:tableOfTypes) WHERE row.booleanColumn = True RETURN count(*)
+-LOG CountTrueTest
+-STATEMENT MATCH (row:tableOfTypes) WHERE row.booleanColumn = True RETURN count(*)
 ---- 1
 24997
 
--NAME CountFalseTest
--QUERY MATCH (row:tableOfTypes) WHERE row.booleanColumn = False RETURN count(*)
+-LOG CountFalseTest
+-STATEMENT MATCH (row:tableOfTypes) WHERE row.booleanColumn = False RETURN count(*)
 ---- 1
 25002
 
--NAME CheckSumTest
--QUERY MATCH (row:tableOfTypes) RETURN sum(row.id), sum(row.int64Column), sum(row.doubleColumn)
+-LOG CheckSumTest
+-STATEMENT MATCH (row:tableOfTypes) RETURN sum(row.id), sum(row.int64Column), sum(row.doubleColumn)
 ---- 1
 1249925001|2500180|2504542.349696
 
--NAME EmptyStringTest
--QUERY MATCH (row:tableOfTypes) WHERE row.id = 49992 RETURN row.id, row.int64Column, row.doubleColumn, row.booleanColumn, row.dateColumn, row.timestampColumn, row.stringColumn;
+-LOG EmptyStringTest
+-STATEMENT MATCH (row:tableOfTypes) WHERE row.id = 49992 RETURN row.id, row.int64Column, row.doubleColumn, row.booleanColumn, row.dateColumn, row.timestampColumn, row.stringColumn;
 ---- 1
 49992|50|31.582059|False|2056-05-02|1551-07-19 16:28:31|
 
--NAME FloatTest
--QUERY MATCH (row:tableOfTypes) WHERE row.doubleColumn = 68.73718401556897 RETURN row.dateColumn;
+-LOG FloatTest
+-STATEMENT MATCH (row:tableOfTypes) WHERE row.doubleColumn = 68.73718401556897 RETURN row.dateColumn;
 ---- 1
 2055-08-09
 
--NAME DateTest
--QUERY MATCH (row:tableOfTypes) WHERE row.id = 25531 RETURN row.id, row.int64Column, row.doubleColumn, row.booleanColumn, row.dateColumn, row.timestampColumn, row.stringColumn;
+-LOG DateTest
+-STATEMENT MATCH (row:tableOfTypes) WHERE row.id = 25531 RETURN row.id, row.int64Column, row.doubleColumn, row.booleanColumn, row.dateColumn, row.timestampColumn, row.stringColumn;
 ---- 1
 25531|77|28.417543|False|2040-07-09|1895-03-13 04:31:22|XB
 
--NAME IntervalTest
--QUERY MATCH (row:tableOfTypes) WHERE 0 <= row.doubleColumn AND row.doubleColumn <= 10 AND 0 <= row.int64Column AND row.int64Column <= 10 RETURN count(*);
+-LOG IntervalTest
+-STATEMENT MATCH (row:tableOfTypes) WHERE 0 <= row.doubleColumn AND row.doubleColumn <= 10 AND 0 <= row.int64Column AND row.int64Column <= 10 RETURN count(*);
 ---- 1
 546