Changeset: cb3e424bfcc4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cb3e424bfcc4
Added Files:
monetdb5/modules/atoms/Tests/json00.mal
monetdb5/modules/atoms/Tests/json00.stable.err
monetdb5/modules/atoms/Tests/json00.stable.out
monetdb5/modules/atoms/Tests/json01.mal
monetdb5/modules/atoms/Tests/json01.stable.err
monetdb5/modules/atoms/Tests/json01.stable.out
monetdb5/modules/atoms/Tests/json02.mal
monetdb5/modules/atoms/Tests/json02.stable.err
monetdb5/modules/atoms/Tests/json02.stable.out
monetdb5/modules/atoms/json_atom.c
monetdb5/modules/atoms/json_atom.h
monetdb5/modules/atoms/json_atom.mal
sql/test/json/Tests/miniexample.sql
sql/test/json/Tests/parsing.sql
Modified Files:
monetdb5/mal/mal_parser.c
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/atoms/Tests/All
monetdb5/modules/mal/mal_init.mal
Branch: default
Log Message:
JSON as a data type
The JSON data type has been added as MAL type
It provides validation routines and some functions
to extract one/all key/value pairs.
It is to be linked with SQL to manipuate JSON data.
The necessary SQL script will follow.
diffs (truncated from 1575 to 300 lines):
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -407,6 +407,9 @@ cstToken(Client cntxt, ValPtr cst)
cst->vtype = TYPE_int;
cst->val.lval = 0;
switch (*s) {
+ case '{': case '[':
+ /* JSON Literal */
+ break;
case '"':
cst->vtype = TYPE_str;
i = stringLength(cntxt);
diff --git a/monetdb5/modules/atoms/Makefile.ag
b/monetdb5/modules/atoms/Makefile.ag
--- a/monetdb5/modules/atoms/Makefile.ag
+++ b/monetdb5/modules/atoms/Makefile.ag
@@ -34,6 +34,7 @@ lib_atoms = {
streams.c streams.h \
str.c str.h \
url.c url.h \
+ json_atom.c json_atom.h \
xml.c xml.h
}
@@ -49,9 +50,10 @@ headers_mal = {
streams.mal \
str.mal \
url.mal \
+ json_atom.mal \
xml.mal \
mtime.mal
}
EXTRA_DIST_DIR = Tests
-EXTRA_DIST = blob.mal color.mal identifier.mal inet.mal xml.mal xml.sql
batxml.sql str.mal batxml.mal url.mal streams.mal mtime.mal
+EXTRA_DIST = blob.mal color.mal identifier.mal inet.mal xml.mal xml.sql
batxml.sql str.mal batxml.mal url.mal json_atom.mal streams.mal mtime.mal
diff --git a/monetdb5/modules/atoms/Tests/All b/monetdb5/modules/atoms/Tests/All
--- a/monetdb5/modules/atoms/Tests/All
+++ b/monetdb5/modules/atoms/Tests/All
@@ -14,3 +14,7 @@ xml04
xml05
xml10
xml100
+
+json00
+json01
+json02
diff --git a/monetdb5/modules/atoms/Tests/json00.mal
b/monetdb5/modules/atoms/Tests/json00.mal
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/atoms/Tests/json00.mal
@@ -0,0 +1,40 @@
+#validity tests
+b:= json.isvalid("{}");
+io.print(b);
+b:= json.isvalid("{} ");
+io.print(b);
+b:= json.isvalid("{");
+io.print(b);
+b:= json.isvalid("}");
+io.print(b);
+b:= json.isvalid("{} }");
+io.print(b);
+b:= json.isvalid("{} }[1]");
+io.print(b);
+b:= json.isvalid("{\"null\": null}");
+io.print(b);
+b:= json.isvalid("{[}]");
+io.print(b);
+b:= json.isvalid("{:1}");
+io.print(b);
+b:= json.isvalid("{\"k\"}");
+io.print(b);
+b:= json.isvalid("{\"k\" :}");
+io.print(b);
+b:= json.isvalid("{\"f1\"::1");
+io.print(b);
+b:= json.isvalid("{\"f1\":1,\"f2\":2} ");
+io.print(b);
+b:= json.isvalid("{\"f1\":1,\"f2\":2");
+io.print(b);
+b:= json.isvalid("{\"f1\":{\"f12\":3},\"f2\":[2,3,4]}");
+io.print(b);
+
+b:= json.isvalid("[ ]");
+io.print(b);
+b:= json.isvalid("[1,\"f2\", 2]");
+io.print(b);
+b:= json.isvalid("[1 , 2 ]");
+io.print(b);
+b:= json.isvalid("[\"\\/\" , 2 ]");
+io.print(b);
diff --git a/monetdb5/modules/atoms/Tests/json00.stable.err
b/monetdb5/modules/atoms/Tests/json00.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/atoms/Tests/json00.stable.err
@@ -0,0 +1,29 @@
+stderr of test 'json00` in directory 'monetdb5/modules/atoms` itself:
+
+
+# 22:41:30 >
+# 22:41:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35654" "--set"
"mapi_usock=/var/tmp/mtest-10794/.s.monetdb.35654" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_modules_atoms"
"json00.mal"
+# 22:41:30 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/mk/current//Linux/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 35654
+# cmdline opt mapi_usock = /var/tmp/mtest-10794/.s.monetdb.35654
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_modules_atoms
+
+# 22:41:30 >
+# 22:41:30 > "Done."
+# 22:41:30 >
+
diff --git a/monetdb5/modules/atoms/Tests/json00.stable.out
b/monetdb5/modules/atoms/Tests/json00.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/atoms/Tests/json00.stable.out
@@ -0,0 +1,69 @@
+stdout of test 'json00` in directory 'monetdb5/modules/atoms` itself:
+
+
+# 22:41:30 >
+# 22:41:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35654" "--set"
"mapi_usock=/var/tmp/mtest-10794/.s.monetdb.35654" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_modules_atoms"
"json00.mal"
+# 22:41:30 >
+
+# MonetDB 5 server v11.16.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_modules_atoms', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.629 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:35654/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-10794/.s.monetdb.35654
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+function user.main():void;
+#validity tests
+ b := json.isvalid("{}");
+ io.print(b);
+ b := json.isvalid("{} ");
+ io.print(b);
+ b := json.isvalid("{");
+ io.print(b);
+ b := json.isvalid("}");
+ io.print(b);
+ b := json.isvalid("{} }");
+ io.print(b);
+ b := json.isvalid("{} }[1]");
+ io.print(b);
+ b := json.isvalid("{\"null\": null}");
+ io.print(b);
+ b := json.isvalid("{[}]");
+ io.print(b);
+ b := json.isvalid("{:1}");
+ io.print(b);
+ b := json.isvalid("{\"k\"}");
+ io.print(b);
+ b := json.isvalid("{\"k\" :}");
+ io.print(b);
+ b := json.isvalid("{\"f1\"::1");
+ io.print(b);
+ b := json.isvalid("{\"f1\":1,\"f2\":2} ");
+ io.print(b);
+ b := json.isvalid("{\"f1\":1,\"f2\":2");
+ io.print(b);
+ b := json.isvalid("{\"f1\":{\"f12\":3},\"f2\":[2,3,4]}");
+ io.print(b);
+ b := json.isvalid("[ ]");
+ io.print(b);
+ b := json.isvalid("[1,\"f2\", 2]");
+ io.print(b);
+ b := json.isvalid("[1 , 2 ]");
+ io.print(b);
+ b := json.isvalid("[\"\\/\" , 2 ]");
+ io.print(b);
+end main;
+[ true ]
+[ true ]
+
+
+# 22:41:30 >
+# 22:41:30 > "Done."
+# 22:41:30 >
+
diff --git a/monetdb5/modules/atoms/Tests/json01.mal
b/monetdb5/modules/atoms/Tests/json01.mal
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/atoms/Tests/json01.mal
@@ -0,0 +1,31 @@
+#validity tests
+b:= json.new("{}");
+f:= json.filter(b,"f1");
+io.print(f);
+b:= json.new("{\"f1\":1}");
+f:= json.filter(b,"f1");
+io.print(f);
+b:= json.new("{\"f1\":1,\"f2\":2}");
+f:= json.filter(b,"f2");
+io.print(f);
+b:= json.new("{\"f1\":1,\"f2\":2,\"f1\":3}");
+f:= json.filter(b,"f1");
+io.print(f);
+b:= json.new("{\"f1\":{\"f12\":3},\"f2\":[2,3,4]}");
+f:= json.filter(b,"f1");
+io.print(f);
+f:= json.filter(b,"f12");
+io.print(f);
+
+b:= json.new("[]");
+b:= json.new("[1,\"f2\", 2]");
+f:= json.filter(b,0);
+io.print(f);
+f:= json.filter(b,1);
+io.print(f);
+f:= json.filter(b,2);
+io.print(f);
+f:= json.filter(b,3);
+io.print(f);
+b:= json.new("[1,2 ]");
+b:= json.new("[\"\\/\" , 2 ]");
diff --git a/monetdb5/modules/atoms/Tests/json01.stable.err
b/monetdb5/modules/atoms/Tests/json01.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/atoms/Tests/json01.stable.err
@@ -0,0 +1,29 @@
+stderr of test 'json01` in directory 'monetdb5/modules/atoms` itself:
+
+
+# 22:41:30 >
+# 22:41:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35654" "--set"
"mapi_usock=/var/tmp/mtest-10794/.s.monetdb.35654" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_modules_atoms"
"json01.mal"
+# 22:41:30 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/mk/current//Linux/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 35654
+# cmdline opt mapi_usock = /var/tmp/mtest-10794/.s.monetdb.35654
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_modules_atoms
+
+# 22:41:31 >
+# 22:41:31 > "Done."
+# 22:41:31 >
+
diff --git a/monetdb5/modules/atoms/Tests/json01.stable.out
b/monetdb5/modules/atoms/Tests/json01.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/atoms/Tests/json01.stable.out
@@ -0,0 +1,67 @@
+stdout of test 'json01` in directory 'monetdb5/modules/atoms` itself:
+
+
+# 22:41:30 >
+# 22:41:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35654" "--set"
"mapi_usock=/var/tmp/mtest-10794/.s.monetdb.35654" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_modules_atoms"
"json01.mal"
+# 22:41:30 >
+
+# MonetDB 5 server v11.16.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_modules_atoms', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.629 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:35654/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-10794/.s.monetdb.35654
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+function user.main():void;
+#validity tests
+ b := json.new("{}");
+ f := json.filter(b,"f1");
+ io.print(f);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
