MonetDB: default - merge from Jun2010

[Stefan Manegold]

Changeset: 21ea89ae3a17 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=21ea89ae3a17
Modified Files:
        MonetDB/src/gdk/gdk_relop.mx
        MonetDB/src/gdk/gdk_search.mx
Branch: default
Log Message:

merge from Jun2010


diffs (32 lines):

diff -r 98b9327fd486 -r 21ea89ae3a17 MonetDB/src/gdk/gdk_relop.mx
--- a/MonetDB/src/gdk/gdk_relop.mx      Wed Aug 11 09:57:20 2010 +0200
+++ b/MonetDB/src/gdk/gdk_relop.mx      Wed Aug 11 10:07:02 2010 +0200
@@ -1251,10 +1251,12 @@
        lcount = BATcount(l);
        rcount = BATcount(r);
 
-       if (lcount == 0 || rcount == 0) {
+       if (lcount == 0 || rcount == 0 ||
+           (l->ttype == TYPE_void && l->tseqbase == oid_nil) ||
+           (r->htype == TYPE_void && r->hseqbase == oid_nil)) {
                BAT *bn;
 
-               @:return_empty_join_result(l,r, BATjoin: |l|==0 or |r|==0,0)@
+               @:return_empty_join_result(l,r, BATjoin: |l|==0 or |r|==0 or 
tail(l)==NIL or head(r)==NIL,0)@
        }
 @-
 collect statistics that help us decide what to do
diff -r 98b9327fd486 -r 21ea89ae3a17 MonetDB/src/gdk/gdk_search.mx
--- a/MonetDB/src/gdk/gdk_search.mx     Wed Aug 11 09:57:20 2010 +0200
+++ b/MonetDB/src/gdk/gdk_search.mx     Wed Aug 11 10:07:02 2010 +0200
@@ -394,6 +394,10 @@
                        cnt = BATcapacity(b);
 
                if (b->htype == TYPE_void) {
+                       if (b->hseqbase == oid_nil) {
+                               ALGODEBUG THRprintf(GDKout, "#BAThash: cannot 
create hash-table on void column.\n");
+                               return NULL;
+                       }
                        ALGODEBUG THRprintf(GDKout, "#BAThash: creating 
hash-table on void column..\n");
 
                        tpe = TYPE_void;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list