Changeset: 84a308d197ae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=84a308d197ae
Modified Files:
gdk/gdk_bbp.mx
monetdb5/tests/BugTracker/Tests/All
monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.mal
monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.stable.err
monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.stable.out
Branch: Dec2011
Log Message:
When returning a BAT to the intrepreter, set the trivial properties.
BBPkeepref is called whenever a new BAT is returned to the
interpreter, so it is a good place to set trivial properties
(properties which can be inferred trivially).
This fixes bug 2974.
Also added test for the bug.
diffs (138 lines):
diff --git a/gdk/gdk_bbp.mx b/gdk/gdk_bbp.mx
--- a/gdk/gdk_bbp.mx
+++ b/gdk/gdk_bbp.mx
@@ -2489,6 +2489,10 @@ BBPkeepref(bat i)
i = -i;
if (BBPcheck(i, "BBPkeepref")) {
int lock = locked_by ? BBP_getpid() != locked_by : 1;
+ BAT *b;
+
+ if ((b = BBPdescriptor(i)) != NULL)
+ BATsettrivprop(b);
incref(i, TRUE, lock);
assert(BBP_refs(i));
diff --git a/monetdb5/tests/BugTracker/Tests/All
b/monetdb5/tests/BugTracker/Tests/All
--- a/monetdb5/tests/BugTracker/Tests/All
+++ b/monetdb5/tests/BugTracker/Tests/All
@@ -9,4 +9,5 @@ parser.SF-2051309
mal_var_persistent_over_sessions.SF-2581675
merge-join_properties.SF-2952191
joinpath-loop.Bug-2965
+thetajoin-properties.Bug-2974
algebra_project.Bug-3045
diff --git a/monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.mal
b/monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.mal
new file mode 100644
--- /dev/null
+++ b/monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.mal
@@ -0,0 +1,19 @@
+l := bat.new(:oid, :int);
+r := bat.new(:oid, :int);
+
+l := bat.insert(l, 2@0, 1);
+l := bat.insert(l, 6@0, 2);
+
+r := bat.insert(r, 3@0, 1);
+r := bat.insert(r, 7@0, 2);
+
+rr := bat.reverse(r);
+
+t := algebra.thetajoin(l, rr, 1); # gt
+
+io.print(t); # returns 6@0 3@0 (2 is greater than 1?)
+
+b := bat.new(:oid, :oid);
+b := bat.insert(b, t); # BUG: ERROR: BATkey: dense column must be unique.
+
+io.print(b);
diff --git
a/monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.stable.err
b/monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.stable.err
@@ -0,0 +1,31 @@
+stderr of test 'thetajoin-properties.Bug-2974` in directory 'tests/BugTracker`
itself:
+
+
+# 16:24:34 >
+# 16:24:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" "--set" "mapi_open=true"
"--set" "mapi_port=37407" "--set" "monet_prompt=" "--trace" "--forcemito"
"--set" "mal_listing=2" "--dbname=mTests_tests_BugTracker"
"thetajoin-properties.Bug-2974.mal"
+# 16:24:34 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = /ufs/sjoerd/Monet-stable/var/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 = /ufs/sjoerd/Monet-stable/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 37407
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_tests_BugTracker
+
+# 16:24:34 >
+# 16:24:34 > "Done."
+# 16:24:34 >
+
diff --git
a/monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.stable.out
b/monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.stable.out
@@ -0,0 +1,50 @@
+stdout of test 'thetajoin-properties.Bug-2974` in directory 'tests/BugTracker`
itself:
+
+
+# 16:24:34 >
+# 16:24:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" "--set" "mapi_open=true"
"--set" "mapi_port=37407" "--set" "monet_prompt=" "--trace" "--forcemito"
"--set" "mal_listing=2" "--dbname=mTests_tests_BugTracker"
"thetajoin-properties.Bug-2974.mal"
+# 16:24:34 >
+
+# MonetDB 5 server v11.7.8 (hg id: b7fc08d320ae+)
+# This is an unreleased version
+# Serving database 'mTests_tests_BugTracker', 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-2012 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:37407/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+function user.main():void;
+ l := bat.new(:oid,:int);
+ r := bat.new(:oid,:int);
+ l := bat.insert(l,2@0,1);
+ l := bat.insert(l,6@0,2);
+ r := bat.insert(r,3@0,1);
+ r := bat.insert(r,7@0,2);
+ rr := bat.reverse(r);
+ t := algebra.thetajoin(l,rr,1);
+# gt
+ io.print(t);
+# returns 6@0 3@0 (2 is greater than 1?)
+ b := bat.new(:oid,:oid);
+ b := bat.insert(b,t);
+# BUG: ERROR: BATkey: dense column must be unique.
+ io.print(b);
+end main;
+#-----------------#
+# h t # name
+# oid oid # type
+#-----------------#
+[ 6@0, 3@0 ]
+#-----------------#
+# h t # name
+# void oid # type
+#-----------------#
+[ 6@0, 3@0 ]
+
+# 16:24:34 >
+# 16:24:34 > "Done."
+# 16:24:34 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
