Update of /cvsroot/monetdb/pathfinder/compiler/algebra/prop
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4641/algebra/prop
Modified Files:
Tag: XQuery_0-24
prop_dom.c prop_dom_nat.c
Log Message:
-- Fix incorrect domain property inference for union+empty_tbl.
U prop_dom_nat.c
Index: prop_dom_nat.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_dom_nat.c,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -d -r1.21.2.1 -r1.21.2.2
--- prop_dom_nat.c 28 May 2008 11:37:30 -0000 1.21.2.1
+++ prop_dom_nat.c 3 Jun 2008 07:21:33 -0000 1.21.2.2
@@ -532,10 +532,10 @@
if (dom1 == dom2)
union_dom = dom1;
else if (PFprop_subdom (n->prop, dom1, dom2) ||
- dom2 == EMPTYDOM)
+ dom1 == EMPTYDOM)
union_dom = dom2;
else if (PFprop_subdom (n->prop, dom2, dom1) ||
- dom1 == EMPTYDOM)
+ dom2 == EMPTYDOM)
union_dom = dom1;
else {
union_dom = id++;
U prop_dom.c
Index: prop_dom.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_dom.c,v
retrieving revision 1.54.2.1
retrieving revision 1.54.2.2
diff -u -d -r1.54.2.1 -r1.54.2.2
--- prop_dom.c 28 May 2008 11:37:29 -0000 1.54.2.1
+++ prop_dom.c 3 Jun 2008 07:21:33 -0000 1.54.2.2
@@ -773,10 +773,10 @@
if (dom1 == dom2)
union_dom = dom1;
else if (PFprop_subdom (n->prop, dom1, dom2) ||
- dom2 == EMPTYDOM)
+ dom1 == EMPTYDOM)
union_dom = dom2;
else if (PFprop_subdom (n->prop, dom2, dom1) ||
- dom1 == EMPTYDOM)
+ dom2 == EMPTYDOM)
union_dom = dom1;
else {
union_dom = id++;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
