Changeset: 542034ee6098 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=542034ee6098
Added Files:
monetdb5/extras/jaql/jaqltests/Tests/All
monetdb5/extras/jaql/jaqltests/Tests/expand.jaql
monetdb5/extras/jaql/jaqltests/Tests/expand.stable.err
monetdb5/extras/jaql/jaqltests/Tests/expand.stable.out
monetdb5/extras/jaql/jaqltests/Tests/filter.jaql
monetdb5/extras/jaql/jaqltests/Tests/filter.stable.err
monetdb5/extras/jaql/jaqltests/Tests/filter.stable.out
monetdb5/extras/jaql/jaqltests/Tests/group.jaql
monetdb5/extras/jaql/jaqltests/Tests/group.stable.err
monetdb5/extras/jaql/jaqltests/Tests/group.stable.out
monetdb5/extras/jaql/jaqltests/Tests/join.jaql
monetdb5/extras/jaql/jaqltests/Tests/join.stable.err
monetdb5/extras/jaql/jaqltests/Tests/join.stable.out
monetdb5/extras/jaql/jaqltests/Tests/sort.jaql
monetdb5/extras/jaql/jaqltests/Tests/sort.stable.err
monetdb5/extras/jaql/jaqltests/Tests/sort.stable.out
monetdb5/extras/jaql/jaqltests/Tests/top.jaql
monetdb5/extras/jaql/jaqltests/Tests/top.stable.err
monetdb5/extras/jaql/jaqltests/Tests/top.stable.out
monetdb5/extras/jaql/jaqltests/Tests/transform.jaql
monetdb5/extras/jaql/jaqltests/Tests/transform.stable.err
monetdb5/extras/jaql/jaqltests/Tests/transform.stable.out
Branch: jacqueline
Log Message:
add pure JAQL tests
diffs (truncated from 819 to 300 lines):
diff --git a/monetdb5/extras/jaql/jaqltests/Tests/All
b/monetdb5/extras/jaql/jaqltests/Tests/All
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/jaql/jaqltests/Tests/All
@@ -0,0 +1,7 @@
+expand
+group
+top
+filter
+join
+sort
+transform
diff --git a/monetdb5/extras/jaql/jaqltests/Tests/expand.jaql
b/monetdb5/extras/jaql/jaqltests/Tests/expand.jaql
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/jaql/jaqltests/Tests/expand.jaql
@@ -0,0 +1,11 @@
+# from the docs
+
+nestedData = [ [3,65,8,72], [5,98,2,65] ];
+nestedData -> expand;
+nestedData -> expand ($ -> transform $ * 2);
+nestedData -> expand each arr (arr -> transform each n (n * 2));
+nestedData -> expand -> transform $ * 2;
+
+moviesOwned = [ {"name":"Jon Doe", "movie_ids":[3,65,8,72]}, {"name":"Jane
Dean", "movie_ids":[5,98,2]} ];
+moviesOwned -> expand unroll $.movie_ids;
+
diff --git a/monetdb5/extras/jaql/jaqltests/Tests/expand.stable.err
b/monetdb5/extras/jaql/jaqltests/Tests/expand.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/jaql/jaqltests/Tests/expand.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'expand` in directory 'extras/jaql/jaqltests` itself:
+
+
+# 15:44:37 >
+# 15:44:37 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-jacqueline-sofia.ins.cwi.nl/five/dbfarm"
"--set" "mapi_open=true" "--set" "mapi_port=34222" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_jaql_jaqltests" "--set" "mal_listing=0"
+# 15:44:37 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/ufs/fabian/scratch/ssd/monetdb/jacqueline/program-x86_64/var/lib/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# 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 gdk_dbfarm =
/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-jacqueline-sofia.ins.cwi.nl/five/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 34222
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_extras_jaql_jaqltests
+# cmdline opt mal_listing = 0
+
+# 15:44:37 >
+# 15:44:37 > "mclient" "-ljaql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia"
"--port=34222"
+# 15:44:37 >
+
+
+# 15:44:37 >
+# 15:44:37 > "Done."
+# 15:44:37 >
+
diff --git a/monetdb5/extras/jaql/jaqltests/Tests/expand.stable.out
b/monetdb5/extras/jaql/jaqltests/Tests/expand.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/jaql/jaqltests/Tests/expand.stable.out
@@ -0,0 +1,68 @@
+stdout of test 'expand` in directory 'extras/jaql/jaqltests` itself:
+
+
+# 10:29:02 >
+# 10:29:02 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-jacqueline-sofia.ins.cwi.nl/five/dbfarm"
"--set" "mapi_open=true" "--set" "mapi_port=37179" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_jaql_jaqltests" "--set" "mal_listing=0"
+# 10:29:02 >
+
+# MonetDB 5 server v11.10.0 "jacqueline-c183b5316fe7+"
+# Serving database 'mTests_extras_jaql_jaqltests', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked
+# Found 15.630 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://sofia.ins.cwi.nl:37179/
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 10:29:02 >
+# 10:29:02 > "mclient" "-ljaql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia"
"--port=37179"
+# 10:29:02 >
+
+#nestedData -> expand;
+% .json # table_name
+% json # name
+% clob # type
+% 30 # length
+[ 3, 65, 8, 72, 5, 98, 2, 65 ]
+#nestedData -> expand ($ -> transform $ * 2);
+% .json # table_name
+% json # name
+% clob # type
+% 36 # length
+[ 6, 130, 16, 144, 10, 196, 4, 130 ]
+#nestedData -> expand each arr (arr -> transform each n (n * 2));
+% .json # table_name
+% json # name
+% clob # type
+% 36 # length
+[ 6, 130, 16, 144, 10, 196, 4, 130 ]
+#nestedData -> expand -> transform $ * 2;
+% .json # table_name
+% json # name
+% clob # type
+% 36 # length
+[ 6, 130, 16, 144, 10, 196, 4, 130 ]
+#moviesOwned -> expand unroll $.movie_ids;
+% .json # table_name
+% json # name
+% clob # type
+% 43 # length
+[
+ { "name": "Jon Doe", "movie_ids": 3 },
+ { "name": "Jon Doe", "movie_ids": 65 },
+ { "name": "Jon Doe", "movie_ids": 8 },
+ { "name": "Jon Doe", "movie_ids": 72 },
+ { "name": "Jane Dean", "movie_ids": 5 },
+ { "name": "Jane Dean", "movie_ids": 98 },
+ { "name": "Jane Dean", "movie_ids": 2 }
+]
+
+# 10:29:02 >
+# 10:29:02 > "Done."
+# 10:29:02 >
+
diff --git a/monetdb5/extras/jaql/jaqltests/Tests/filter.jaql
b/monetdb5/extras/jaql/jaqltests/Tests/filter.jaql
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/jaql/jaqltests/Tests/filter.jaql
@@ -0,0 +1,6 @@
+# from the docs
+
+employees = [{"name": "Jon Doe", "income": 20000, "mgr": false}, {"name":
"Vince Wayne", "income": 32500, "mgr": false}, {"name": "Jane Dean", "income":
72000, "mgr": true}, {"name": "Alex Smith", "income": 25000, "mgr": false} ];
+employees -> filter $.mgr or $.income > 30000;
+employees -> filter each emp emp.mgr or emp.income > 30000;
+employees -> filter each emp (emp.mgr or emp.income > 30000);
diff --git a/monetdb5/extras/jaql/jaqltests/Tests/filter.stable.err
b/monetdb5/extras/jaql/jaqltests/Tests/filter.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/jaql/jaqltests/Tests/filter.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'filter` in directory 'extras/jaql/jaqltests` itself:
+
+
+# 15:46:08 >
+# 15:46:08 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-jacqueline-sofia.ins.cwi.nl/five/dbfarm"
"--set" "mapi_open=true" "--set" "mapi_port=39241" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_jaql_jaqltests" "--set" "mal_listing=0"
+# 15:46:08 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/ufs/fabian/scratch/ssd/monetdb/jacqueline/program-x86_64/var/lib/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# 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 gdk_dbfarm =
/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-jacqueline-sofia.ins.cwi.nl/five/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 39241
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_extras_jaql_jaqltests
+# cmdline opt mal_listing = 0
+
+# 15:46:08 >
+# 15:46:08 > "mclient" "-ljaql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia"
"--port=39241"
+# 15:46:08 >
+
+
+# 15:46:08 >
+# 15:46:08 > "Done."
+# 15:46:08 >
+
diff --git a/monetdb5/extras/jaql/jaqltests/Tests/filter.stable.out
b/monetdb5/extras/jaql/jaqltests/Tests/filter.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/jaql/jaqltests/Tests/filter.stable.out
@@ -0,0 +1,57 @@
+stdout of test 'filter` in directory 'extras/jaql/jaqltests` itself:
+
+
+# 15:46:08 >
+# 15:46:08 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-jacqueline-sofia.ins.cwi.nl/five/dbfarm"
"--set" "mapi_open=true" "--set" "mapi_port=39241" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_jaql_jaqltests" "--set" "mal_listing=0"
+# 15:46:08 >
+
+# MonetDB 5 server v11.10.0 "jacqueline-c183b5316fe7+"
+# Serving database 'mTests_extras_jaql_jaqltests', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked
+# Found 15.630 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://sofia.ins.cwi.nl:39241/
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 15:46:08 >
+# 15:46:08 > "mclient" "-ljaql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia"
"--port=39241"
+# 15:46:08 >
+
+#employees -> filter $.mgr or $.income > 30000;
+% .json # table_name
+% json # name
+% clob # type
+% 59 # length
+[
+ { "name": "Vince Wayne", "income": 32500, "mgr": false },
+ { "name": "Jane Dean", "income": 72000, "mgr": true }
+]
+#employees -> filter each emp emp.mgr or emp.income > 30000;
+% .json # table_name
+% json # name
+% clob # type
+% 59 # length
+[
+ { "name": "Vince Wayne", "income": 32500, "mgr": false },
+ { "name": "Jane Dean", "income": 72000, "mgr": true }
+]
+#employees -> filter each emp (emp.mgr or emp.income > 30000);
+% .json # table_name
+% json # name
+% clob # type
+% 59 # length
+[
+ { "name": "Vince Wayne", "income": 32500, "mgr": false },
+ { "name": "Jane Dean", "income": 72000, "mgr": true }
+]
+
+# 15:46:08 >
+# 15:46:08 > "Done."
+# 15:46:08 >
+
diff --git a/monetdb5/extras/jaql/jaqltests/Tests/group.jaql
b/monetdb5/extras/jaql/jaqltests/Tests/group.jaql
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/jaql/jaqltests/Tests/group.jaql
@@ -0,0 +1,9 @@
+# from the docs
+
+employees = [ {"id":1, "dept": 1, "income":12000}, {"id":2, "dept": 1,
"income":13000}, {"id":3, "dept": 2, "income":15000}, {"id":4, "dept": 1,
"income":10000}, {"id":5, "dept": 3, "income":8000}, {"id":6, "dept": 2,
"income":5000}, {"id":7, "dept": 1, "income":24000} ];
+employees -> group into count($);
+employees -> group by d = $.dept into {d, "total": sum($[*].income)};
+employees -> group each emp by d = emp.dept as deptEmps into {d, "total":
sum(deptEmps[*].income)};
+
+depts = [ {"did": 1, "name": "development"}, {"did": 2, "name": "marketing"},
{"did": 3, "name": "sales"} ];
+group employees by g = $.dept as es, depts by g = $.did as ds into { "dept":
g, "deptName": ds[0].name, "emps": es[*].id, "numEmps": count(es) };
diff --git a/monetdb5/extras/jaql/jaqltests/Tests/group.stable.err
b/monetdb5/extras/jaql/jaqltests/Tests/group.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/extras/jaql/jaqltests/Tests/group.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'group` in directory 'extras/jaql/jaqltests` itself:
+
+
+# 13:50:38 >
+# 13:50:38 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-jacqueline-sofia.ins.cwi.nl/five/dbfarm"
"--set" "mapi_open=true" "--set" "mapi_port=39015" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_jaql_jaqltests" "--set" "mal_listing=0"
+# 13:50:38 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/ufs/fabian/scratch/ssd/monetdb/jacqueline/program-x86_64/var/lib/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# 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 gdk_dbfarm =
/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-jacqueline-sofia.ins.cwi.nl/five/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 39015
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
