Update of /cvsroot/monetdb/pathfinder/compiler/algebra/prop
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11734/algebra/prop

Modified Files:
        prop_dom.c prop_dom_nat.c 
Log Message:
-- Fixed bug: The distinct operator does not change the domain.


Index: prop_dom_nat.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_dom_nat.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- prop_dom_nat.c      13 Dec 2007 13:08:17 -0000      1.13
+++ prop_dom_nat.c      18 Dec 2007 12:00:38 -0000      1.14
@@ -635,16 +635,7 @@
             break;
 
         case la_distinct:
-            /* create new subdomains for all existing attributes */
-            for (unsigned int i = 0; i < L(n)->schema.count; i++)
-                if (L(n)->schema.items[i].type == aat_nat) {
-                    add_subdom (n->prop,
-                                PFprop_dom (L(n)->prop,
-                                            L(n)->schema.items[i].name),
-                                id);
-                    add_dom (n->prop, L(n)->schema.items[i].name, id);
-                    id++;
-                }
+            bulk_add_dom (n->prop, L(n));
             break;
 
         case la_fun_1to1:

Index: prop_dom.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/algebra/prop/prop_dom.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- prop_dom.c  13 Dec 2007 13:08:17 -0000      1.45
+++ prop_dom.c  18 Dec 2007 12:00:37 -0000      1.46
@@ -873,15 +873,7 @@
             break;
 
         case la_distinct:
-            /* create new subdomains for all existing attributes */
-            for (unsigned int i = 0; i < L(n)->schema.count; i++) {
-                add_subdom (n->prop,
-                            PFprop_dom (L(n)->prop,
-                                        L(n)->schema.items[i].name),
-                            id);
-                add_dom (n->prop, L(n)->schema.items[i].name, id);
-                id++;
-            }
+            bulk_add_dom (n->prop, L(n));
             break;
 
         case la_fun_1to1:


-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to