Changeset: bf81b282ec37 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bf81b282ec37
Modified Files:
monetdb5/modules/atoms/Tests/json02.stable.out
monetdb5/modules/atoms/Tests/json03.stable.out
monetdb5/modules/atoms/Tests/json04.stable.out
Branch: default
Log Message:
Approve output
diffs (190 lines):
diff --git a/monetdb5/modules/atoms/Tests/json02.stable.out
b/monetdb5/modules/atoms/Tests/json02.stable.out
--- a/monetdb5/modules/atoms/Tests/json02.stable.out
+++ b/monetdb5/modules/atoms/Tests/json02.stable.out
@@ -147,7 +147,7 @@ end main;
# void str # type
#-------------------------#
[ 0@0, "\"\\/\"" ]
-[ 1@0, "2 " ]
+[ 1@0, "2" ]
# 22:41:31 >
# 22:41:31 > "Done."
diff --git a/monetdb5/modules/atoms/Tests/json03.stable.out
b/monetdb5/modules/atoms/Tests/json03.stable.out
--- a/monetdb5/modules/atoms/Tests/json03.stable.out
+++ b/monetdb5/modules/atoms/Tests/json03.stable.out
@@ -64,49 +64,49 @@ end main;
[ 0@0, "category", "\"reference\"" ]
[ 1@0, "author", "\"Nigel Rees\"" ]
[ 2@0, "title", "\"Sayings of the Century\"" ]
-[ 3@0, "price", "8.95 " ]
+[ 3@0, "price", "8.95" ]
[ 4@0, "category", "\"fiction\"" ]
[ 5@0, "author", "\"Evelyn Waugh\"" ]
[ 6@0, "title", "\"Sword of Honour\"" ]
-[ 7@0, "price", "12.99 " ]
+[ 7@0, "price", "12.99" ]
[ 8@0, "category", "\"fiction\"" ]
[ 9@0, "author", "\"Herman Melville\"" ]
[ 10@0, "title", "\"Moby Dick\"" ]
[ 11@0, "isbn", "\"0-553-21311-3\"" ]
-[ 12@0, "price", "8.99 " ]
+[ 12@0, "price", "8.99" ]
[ 13@0, "category", "\"fiction\"" ]
[ 14@0, "author", "\"J. R. R. Tolkien\"" ]
[ 15@0, "title", "\"The Lord of the Rings\"" ]
[ 16@0, "isbn", "\"0-395-19395-8\"" ]
-[ 17@0, "price", "22.99 " ]
+[ 17@0, "price", "22.99" ]
[ 18@0, "color", "\"red\"" ]
-[ 19@0, "price", "19.95 " ]
-[ "[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings
of the Century\",\"price\":.9\",\"category\":\"fiction\",\"author\":\"Evelyn
Waugh\",\"title\":\"Sword of
Honour\",\"price\":2.9\",\"category\":\"fiction\",\"author\":\"Herman
Melville\",\"title\":\"Moby
Dick\",\"isbn\":\"0-553-21311-3\",\"price\":.9\",\"category\":\"fiction\",\"author\":\"J.
R. R. Tolkien\",\"title\":\"The Lord of the
Rings\",\"isbn\":\"0-395-19395-8\",\"price\":2.9\",\"color\":\"red\",\"price\":9.9\"}]"
]
-#-----------------------------------------------------------------#
+[ 19@0, "price", "19.95" ]
+[ "[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings
of the Century\",\"price\":.\",\"category\":\"fiction\",\"author\":\"Evelyn
Waugh\",\"title\":\"Sword of
Honour\",\"price\":2.\",\"category\":\"fiction\",\"author\":\"Herman
Melville\",\"title\":\"Moby
Dick\",\"isbn\":\"0-553-21311-3\",\"price\":.\",\"category\":\"fiction\",\"author\":\"J.
R. R. Tolkien\",\"title\":\"The Lord of the
Rings\",\"isbn\":\"0-395-19395-8\",\"price\":2.\",\"color\":\"red\",\"price\":9.\"}]"
]
+#--------------------------#
# h t t t # name
# void oid str json # type
#-----------------------------------------------------------------#
[ 0@0, 0@0, "category", "\"reference\"" ]
[ 1@0, 0@0, "author", "\"Nigel Rees\"" ]
[ 2@0, 0@0, "title", "\"Sayings of the Century\"" ]
-[ 3@0, 0@0, "price", "8.95 " ]
+[ 3@0, 0@0, "price", "8.95" ]
[ 4@0, 1@0, "category", "\"fiction\"" ]
[ 5@0, 1@0, "author", "\"Evelyn Waugh\"" ]
[ 6@0, 1@0, "title", "\"Sword of Honour\"" ]
-[ 7@0, 1@0, "price", "12.99 " ]
+[ 7@0, 1@0, "price", "12.99" ]
[ 8@0, 2@0, "category", "\"fiction\"" ]
[ 9@0, 2@0, "author", "\"Herman Melville\"" ]
[ 10@0, 2@0, "title", "\"Moby Dick\"" ]
[ 11@0, 2@0, "isbn", "\"0-553-21311-3\"" ]
-[ 12@0, 2@0, "price", "8.99 " ]
+[ 12@0, 2@0, "price", "8.99" ]
[ 13@0, 3@0, "category", "\"fiction\"" ]
[ 14@0, 3@0, "author", "\"J. R. R. Tolkien\"" ]
[ 15@0, 3@0, "title", "\"The Lord of the Rings\"" ]
[ 16@0, 3@0, "isbn", "\"0-395-19395-8\"" ]
-[ 17@0, 3@0, "price", "22.99 " ]
+[ 17@0, 3@0, "price", "22.99" ]
[ 18@0, 4@0, "color", "\"red\"" ]
-[ 19@0, 4@0, "price", "19.95 " ]
-[ "[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings
of the Century\",\"price\":.9\"},{\"category\":\"fiction\",\"author\":\"Evelyn
Waugh\",\"title\":\"Sword of
Honour\",\"price\":2.9\"},{\"category\":\"fiction\",\"author\":\"Herman
Melville\",\"title\":\"Moby
Dick\",\"isbn\":\"0-553-21311-3\",\"price\":.9\"},{\"category\":\"fiction\",\"author\":\"J.
R. R. Tolkien\",\"title\":\"The Lord of the
Rings\",\"isbn\":\"0-395-19395-8\",\"price\":2.9\"},{\"color\":\"red\",\"price\":9.9\"}]"
]
+[ 19@0, 4@0, "price", "19.95" ]
+[ "[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings
of the Century\",\"price\":.\"},{\"category\":\"fiction\",\"author\":\"Evelyn
Waugh\",\"title\":\"Sword of
Honour\",\"price\":2.\"},{\"category\":\"fiction\",\"author\":\"Herman
Melville\",\"title\":\"Moby
Dick\",\"isbn\":\"0-553-21311-3\",\"price\":.\"},{\"category\":\"fiction\",\"author\":\"J.
R. R. Tolkien\",\"title\":\"The Lord of the
Rings\",\"isbn\":\"0-395-19395-8\",\"price\":2.\"},{\"color\":\"red\",\"price\":9.\"}]"
]
[ "[1,22,333]" ]
[ "[{\"a\":1,\"b\":22,\"c\":333},{\"a\":2,\"c\":3},{\"b\":4}]" ]
diff --git a/monetdb5/modules/atoms/Tests/json04.stable.out
b/monetdb5/modules/atoms/Tests/json04.stable.out
--- a/monetdb5/modules/atoms/Tests/json04.stable.out
+++ b/monetdb5/modules/atoms/Tests/json04.stable.out
@@ -48,64 +48,64 @@ end main;
[ 0@0, "category", "\"reference\"" ]
[ 1@0, "author", "\"Nigel Rees\"" ]
[ 2@0, "title", "\"Sayings of the Century\"" ]
-[ 3@0, "price", "8.95 " ]
+[ 3@0, "price", "8.95" ]
[ 4@0, "category", "\"fiction\"" ]
[ 5@0, "author", "\"Evelyn Waugh\"" ]
[ 6@0, "title", "\"Sword of Honour\"" ]
-[ 7@0, "price", "12.99 " ]
+[ 7@0, "price", "12.99" ]
[ 8@0, "category", "\"fiction\"" ]
[ 9@0, "author", "\"Herman Melville\"" ]
[ 10@0, "title", "\"Moby Dick\"" ]
[ 11@0, "isbn", "\"0-553-21311-3\"" ]
-[ 12@0, "price", "8.99 " ]
+[ 12@0, "price", "8.99" ]
[ 13@0, "category", "\"fiction\"" ]
[ 14@0, "author", "\"J. R. R. Tolkien\"" ]
[ 15@0, "title", "\"The Lord of the Rings\"" ]
[ 16@0, "isbn", "\"0-395-19395-8\"" ]
-[ 17@0, "price", "22.99 " ]
+[ 17@0, "price", "22.99" ]
[ 18@0, "color", "\"red\"" ]
-[ 19@0, "price", "19.95 " ]
-[ "[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings
of the Century\",\"price\":.9\",\"category\":\"fiction\",\"author\":\"Evelyn
Waugh\",\"title\":\"Sword of
Honour\",\"price\":2.9\",\"category\":\"fiction\",\"author\":\"Herman
Melville\",\"title\":\"Moby
Dick\",\"isbn\":\"0-553-21311-3\",\"price\":.9\",\"category\":\"fiction\",\"author\":\"J.
R. R. Tolkien\",\"title\":\"The Lord of the
Rings\",\"isbn\":\"0-395-19395-8\",\"price\":2.9\",\"color\":\"red\",\"price\":9.9\"}]"
]
-#-----------------------------------------------------------------#
+[ 19@0, "price", "19.95" ]
+[ "[{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings
of the Century\",\"price\":.\",\"category\":\"fiction\",\"author\":\"Evelyn
Waugh\",\"title\":\"Sword of
Honour\",\"price\":2.\",\"category\":\"fiction\",\"author\":\"Herman
Melville\",\"title\":\"Moby
Dick\",\"isbn\":\"0-553-21311-3\",\"price\":.\",\"category\":\"fiction\",\"author\":\"J.
R. R. Tolkien\",\"title\":\"The Lord of the
Rings\",\"isbn\":\"0-395-19395-8\",\"price\":2.\",\"color\":\"red\",\"price\":9.\"}]"
]
+#--------------------------#
# h t t t # name
# void oid str json # type
#-----------------------------------------------------------------#
[ 0@0, 0@0, "category", "\"reference\"" ]
[ 1@0, 0@0, "author", "\"Nigel Rees\"" ]
[ 2@0, 0@0, "title", "\"Sayings of the Century\"" ]
-[ 3@0, 0@0, "price", "8.95 " ]
+[ 3@0, 0@0, "price", "8.95" ]
[ 4@0, 1@0, "category", "\"fiction\"" ]
[ 5@0, 1@0, "author", "\"Evelyn Waugh\"" ]
[ 6@0, 1@0, "title", "\"Sword of Honour\"" ]
-[ 7@0, 1@0, "price", "12.99 " ]
+[ 7@0, 1@0, "price", "12.99" ]
[ 8@0, 2@0, "category", "\"fiction\"" ]
[ 9@0, 2@0, "author", "\"Herman Melville\"" ]
[ 10@0, 2@0, "title", "\"Moby Dick\"" ]
[ 11@0, 2@0, "isbn", "\"0-553-21311-3\"" ]
-[ 12@0, 2@0, "price", "8.99 " ]
+[ 12@0, 2@0, "price", "8.99" ]
[ 13@0, 3@0, "category", "\"fiction\"" ]
[ 14@0, 3@0, "author", "\"J. R. R. Tolkien\"" ]
[ 15@0, 3@0, "title", "\"The Lord of the Rings\"" ]
[ 16@0, 3@0, "isbn", "\"0-395-19395-8\"" ]
-[ 17@0, 3@0, "price", "22.99 " ]
+[ 17@0, 3@0, "price", "22.99" ]
[ 18@0, 4@0, "color", "\"red\"" ]
-[ 19@0, 4@0, "price", "19.95 " ]
+[ 19@0, 4@0, "price", "19.95" ]
[ "\"reference\"" ]
[ "reference" ]
[ "\"Nigel Rees\"" ]
[ "Nigel Rees" ]
[ "\"Sayings of the Century\"" ]
[ "Sayings of the Century" ]
-[ "8.95 " ]
-[ "8.95 " ]
+[ "8.95" ]
+[ "8.95" ]
[ "\"fiction\"" ]
[ "fiction" ]
[ "\"Evelyn Waugh\"" ]
[ "Evelyn Waugh" ]
[ "\"Sword of Honour\"" ]
[ "Sword of Honour" ]
-[ "12.99 " ]
-[ "12.99 " ]
+[ "12.99" ]
+[ "12.99" ]
[ "\"fiction\"" ]
[ "fiction" ]
[ "\"Herman Melville\"" ]
@@ -114,8 +114,8 @@ end main;
[ "Moby Dick" ]
[ "\"0-553-21311-3\"" ]
[ "0-553-21311-3" ]
-[ "8.99 " ]
-[ "8.99 " ]
+[ "8.99" ]
+[ "8.99" ]
[ "\"fiction\"" ]
[ "fiction" ]
[ "\"J. R. R. Tolkien\"" ]
@@ -124,12 +124,12 @@ end main;
[ "The Lord of the Rings" ]
[ "\"0-395-19395-8\"" ]
[ "0-395-19395-8" ]
-[ "22.99 " ]
-[ "22.99 " ]
+[ "22.99" ]
+[ "22.99" ]
[ "\"red\"" ]
[ "red" ]
-[ "19.95 " ]
-[ "19.95 " ]
+[ "19.95" ]
+[ "19.95" ]
[ "[1,true, [2,false]]" ]
#-------------------------#
# h t # name
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
