Changeset: 8c5c2d47a772 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8c5c2d47a772
Modified Files:
monetdb5/extras/jaql/jaqlgencode.c
monetdb5/extras/jaql/jaqltests/Tests/shred.jaql.in
monetdb5/extras/jaql/jaqltests/Tests/shred.stable.err
monetdb5/extras/jaql/jaqltests/Tests/shred.stable.out
monetdb5/extras/jaql/jaqltests/Tests/unroll.stable.err
monetdb5/extras/jaql/jaqltests/Tests/unroll.stable.out
Branch: Oct2012
Log Message:
unroll: really fix (activate) implementation for multi-level indirections
I was too optimistic/quick at last commit. I forgot my tests were
"fixed" for the broken previous implementation. This way, it didn't
reveal my for-loop logic wasn't quite right.
diffs (267 lines):
diff --git a/monetdb5/extras/jaql/jaqlgencode.c
b/monetdb5/extras/jaql/jaqlgencode.c
--- a/monetdb5/extras/jaql/jaqlgencode.c
+++ b/monetdb5/extras/jaql/jaqlgencode.c
@@ -5675,7 +5675,7 @@ dumptree(jc *j, Client cntxt, MalBlkPtr
dumpbatwritable(j, mb, 1);
dumpbatwritable(j, mb, 6);
dumpbatwritable(j, mb, 7);
- for (w = t->tval1; w != NULL; w = w->tval1) {
+ for (w = t->tval2->tval1; w != NULL; w =
w->tval1) {
MALCOMMENT(mb, "| reverse object
traversal with re-creation");
/* get parents of variable matches */
diff --git a/monetdb5/extras/jaql/jaqltests/Tests/shred.jaql.in
b/monetdb5/extras/jaql/jaqltests/Tests/shred.jaql.in
--- a/monetdb5/extras/jaql/jaqltests/Tests/shred.jaql.in
+++ b/monetdb5/extras/jaql/jaqltests/Tests/shred.jaql.in
@@ -3,4 +3,4 @@ a = shred("file://$TSTSRCDIR/imenu.json"
a;
-a -> expand unroll $.menu.items -> filter $.items.id == "OpenNew";
+a -> expand unroll $.menu.items -> filter $.menu.items.id == "OpenNew";
diff --git a/monetdb5/extras/jaql/jaqltests/Tests/shred.stable.err
b/monetdb5/extras/jaql/jaqltests/Tests/shred.stable.err
--- a/monetdb5/extras/jaql/jaqltests/Tests/shred.stable.err
+++ b/monetdb5/extras/jaql/jaqltests/Tests/shred.stable.err
@@ -1,14 +1,13 @@
stderr of test 'shred` in directory 'extras/jaql/jaqltests` itself:
-# 14:36:19 >
-# 14:36:19 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-current-sofia.ins.cwi.nl/five/dbfarm"
"--set" "mapi_open=true" "--set" "mapi_port=38685" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_jaql_jaqltests" "--set" "mal_listing=0"
-# 14:36:19 >
+# 19:18:44 >
+# 19:18:44 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/five/dbfarm"
"--set" "mapi_open=true" "--set" "mapi_port=36812" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_jaql_jaqltests" "--set" "mal_listing=0"
+# 19:18:44 >
# builtin opt gdk_dbname = demo
-# builtin opt gdk_dbfarm =
/ufs/fabian/scratch/ssd/monetdb/current/program-x86_64/var/lib/monetdb5/dbfarm
+# builtin opt gdk_dbfarm =
/ufs/fabian/scratch/ssd/monetdb/Oct2012/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
@@ -18,20 +17,20 @@ stderr of test 'shred` in directory 'ext
# 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-current-sofia.ins.cwi.nl/five/dbfarm
+# cmdline opt gdk_dbfarm =
/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/five/dbfarm
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 38685
+# cmdline opt mapi_port = 36812
# cmdline opt monet_prompt =
# cmdline opt mal_listing = 2
# cmdline opt gdk_dbname = mTests_extras_jaql_jaqltests
# cmdline opt mal_listing = 0
-# 14:36:19 >
-# 14:36:19 > "mclient" "-ljaql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia"
"--port=38685"
-# 14:36:19 >
+# 19:18:44 >
+# 19:18:44 > "mclient" "-ljaql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia"
"--port=36812"
+# 19:18:44 >
-# 14:36:19 >
-# 14:36:19 > "Done."
-# 14:36:19 >
+# 19:18:44 >
+# 19:18:44 > "Done."
+# 19:18:44 >
diff --git a/monetdb5/extras/jaql/jaqltests/Tests/shred.stable.out
b/monetdb5/extras/jaql/jaqltests/Tests/shred.stable.out
--- a/monetdb5/extras/jaql/jaqltests/Tests/shred.stable.out
+++ b/monetdb5/extras/jaql/jaqltests/Tests/shred.stable.out
@@ -1,27 +1,28 @@
stdout of test 'shred` in directory 'extras/jaql/jaqltests` itself:
-# 14:36:19 >
-# 14:36:19 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-current-sofia.ins.cwi.nl/five/dbfarm"
"--set" "mapi_open=true" "--set" "mapi_port=38685" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_jaql_jaqltests" "--set" "mal_listing=0"
-# 14:36:19 >
+# 19:18:44 >
+# 19:18:44 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/five/dbfarm"
"--set" "mapi_open=true" "--set" "mapi_port=36812" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_jaql_jaqltests" "--set" "mal_listing=0"
+# 19:18:44 >
-# MonetDB 5 server v11.10.0 "current-bbe885033e64+"
+# MonetDB 5 server v11.13.0 "Oct2012-b3df9ec1a3e0+"
# 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.
+# Found 15.629 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:38685/
+# Listening for connection requests on mapi:monetdb://sofia.ins.cwi.nl:36812/
# MonetDB/GIS module loaded
# MonetDB/JAQL module loaded
# MonetDB/SQL module loaded
+# MonetDB/DataCell loaded
Ready.
-# 14:36:19 >
-# 14:36:19 > "mclient" "-ljaql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia"
"--port=38685"
-# 14:36:19 >
+# 19:18:44 >
+# 19:18:44 > "mclient" "-ljaql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia"
"--port=36812"
+# 19:18:44 >
#a;
% .json # table_name
@@ -109,23 +110,27 @@ Ready.
}
}
]
-#a -> expand unroll $.menu.items -> filter $.items.id == "OpenNew";
+#a -> expand unroll $.menu.items -> filter $.menu.items.id == "OpenNew";
+#BATsetaccess: tmp_775 has 4 views; deliver a copy.
% .json # table_name
% json # name
% clob # type
-% 37 # length
+% 39 # length
[
{
- "header": "xProgress SVG Viewer",
- "items":
+ "menu":
{
- "id": "OpenNew",
- "label": "Open New"
+ "header": "xProgress SVG Viewer",
+ "items":
+ {
+ "id": "OpenNew",
+ "label": "Open New"
+ }
}
}
]
-# 14:36:19 >
-# 14:36:19 > "Done."
-# 14:36:19 >
+# 19:18:44 >
+# 19:18:44 > "Done."
+# 19:18:44 >
diff --git a/monetdb5/extras/jaql/jaqltests/Tests/unroll.stable.err
b/monetdb5/extras/jaql/jaqltests/Tests/unroll.stable.err
--- a/monetdb5/extras/jaql/jaqltests/Tests/unroll.stable.err
+++ b/monetdb5/extras/jaql/jaqltests/Tests/unroll.stable.err
@@ -1,9 +1,9 @@
stderr of test 'unroll` in directory 'extras/jaql/jaqltests` itself:
-# 18:49:52 >
-# 18:49:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/five/dbfarm"
"--set" "mapi_open=true" "--set" "mapi_port=33903" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_jaql_jaqltests" "--set" "mal_listing=0"
-# 18:49:52 >
+# 19:22:35 >
+# 19:22:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/five/dbfarm"
"--set" "mapi_open=true" "--set" "mapi_port=37464" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_jaql_jaqltests" "--set" "mal_listing=0"
+# 19:22:35 >
# builtin opt gdk_dbname = demo
# builtin opt gdk_dbfarm =
/ufs/fabian/scratch/ssd/monetdb/Oct2012/program-x86_64/var/lib/monetdb5/dbfarm
@@ -19,18 +19,18 @@ stderr of test 'unroll` in directory 'ex
# cmdline opt gdk_nr_threads = 0
# cmdline opt gdk_dbfarm =
/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/five/dbfarm
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 33903
+# cmdline opt mapi_port = 37464
# cmdline opt monet_prompt =
# cmdline opt mal_listing = 2
# cmdline opt gdk_dbname = mTests_extras_jaql_jaqltests
# cmdline opt mal_listing = 0
-# 18:49:52 >
-# 18:49:52 > "mclient" "-ljaql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia"
"--port=33903"
-# 18:49:52 >
+# 19:22:35 >
+# 19:22:35 > "mclient" "-ljaql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia"
"--port=37464"
+# 19:22:35 >
-# 18:49:52 >
-# 18:49:52 > "Done."
-# 18:49:52 >
+# 19:22:35 >
+# 19:22:35 > "Done."
+# 19:22:35 >
diff --git a/monetdb5/extras/jaql/jaqltests/Tests/unroll.stable.out
b/monetdb5/extras/jaql/jaqltests/Tests/unroll.stable.out
--- a/monetdb5/extras/jaql/jaqltests/Tests/unroll.stable.out
+++ b/monetdb5/extras/jaql/jaqltests/Tests/unroll.stable.out
@@ -1,9 +1,9 @@
stdout of test 'unroll` in directory 'extras/jaql/jaqltests` itself:
-# 18:49:52 >
-# 18:49:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/five/dbfarm"
"--set" "mapi_open=true" "--set" "mapi_port=33903" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_jaql_jaqltests" "--set" "mal_listing=0"
-# 18:49:52 >
+# 19:22:35 >
+# 19:22:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/five/dbfarm"
"--set" "mapi_open=true" "--set" "mapi_port=37464" "--set" "monet_prompt="
"--trace" "--forcemito" "--set" "mal_listing=2"
"--dbname=mTests_extras_jaql_jaqltests" "--set" "mal_listing=0"
+# 19:22:35 >
# MonetDB 5 server v11.13.0 "Oct2012-b3df9ec1a3e0+"
# Serving database 'mTests_extras_jaql_jaqltests', using 8 threads
@@ -12,7 +12,7 @@ stdout of test 'unroll` in directory 'ex
# 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:33903/
+# Listening for connection requests on mapi:monetdb://sofia.ins.cwi.nl:37464/
# MonetDB/GIS module loaded
# MonetDB/JAQL module loaded
# MonetDB/SQL module loaded
@@ -20,39 +20,23 @@ stdout of test 'unroll` in directory 'ex
Ready.
-# 18:49:52 >
-# 18:49:52 > "mclient" "-ljaql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia"
"--port=33903"
-# 18:49:52 >
+# 19:22:35 >
+# 19:22:35 > "mclient" "-ljaql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia"
"--port=37464"
+# 19:22:35 >
#a -> expand unroll $.menu.items;
#BATsetaccess: tmp_775 has 4 views; deliver a copy.
% .json # table_name
% json # name
% clob # type
-% 37 # length
+% 102 # length
[
- {
- "header": "xProgress SVG Viewer",
- "items":
- {
- "id": "Open"
- }
- },
- {
- "header": "xProgress SVG Viewer",
- "items":
- {
- "id": "OpenNew",
- "label": "Open New"
- }
- },
- {
- "header": "xProgress SVG Viewer",
- "items": null
- }
+ { "menu": { "header": "xProgress SVG Viewer", "items": { "id": "Open" } } },
+ { "menu": { "header": "xProgress SVG Viewer", "items": { "id": "OpenNew",
"label": "Open New" } } },
+ { "menu": { "header": "xProgress SVG Viewer", "items": null } }
]
-# 18:49:52 >
-# 18:49:52 > "Done."
-# 18:49:52 >
+# 19:22:35 >
+# 19:22:35 > "Done."
+# 19:22:35 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
