MonetDB: default - First check for errors, then create new bats.

[Sjoerd Mullender]

Changeset: d6c38949e478 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d6c38949e478
Modified Files:
        gdk/gdk_join.c
Branch: default
Log Message:

First check for errors, then create new bats.


diffs (41 lines):

diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -1700,18 +1700,6 @@ BATsubthetajoin(BAT **r1p, BAT **r2p, BA
        if (op[0] == '=' && ((op[1] == '=' && op[2] == 0) || op[1] == 0))
                return BATsubjoin(r1p, r2p, l, r, sl, sr, estimate);
 
-       *r1p = NULL;
-       *r2p = NULL;
-       if (joinparamcheck(l, r, sl, sr, "BATsubthetajoin") == GDK_FAIL)
-               return GDK_FAIL;
-       if (joininitresults(&r1, &r2,
-                           estimate != BUN_NONE ? estimate :
-                           (sl ? BATcount(sl) : BATcount(l)) * (sr ? 
BATcount(sr) : BATcount(r)),
-                           "BATsubthetajoin") == GDK_FAIL)
-               return GDK_FAIL;
-       *r1p = r1;
-       *r2p = r2;
-
        /* encode operator as a bit mask into opcode */
        if (op[0] == '=' && ((op[1] == '=' && op[2] == 0) || op[1] == 0)) {
                /* "=" or "==" */
@@ -1744,6 +1732,18 @@ BATsubthetajoin(BAT **r1p, BAT **r2p, BA
                return GDK_FAIL;
        }
 
+       *r1p = NULL;
+       *r2p = NULL;
+       if (joinparamcheck(l, r, sl, sr, "BATsubthetajoin") == GDK_FAIL)
+               return GDK_FAIL;
+       if (joininitresults(&r1, &r2,
+                           estimate != BUN_NONE ? estimate :
+                           (sl ? BATcount(sl) : BATcount(l)) * (sr ? 
BATcount(sr) : BATcount(r)),
+                           "BATsubthetajoin") == GDK_FAIL)
+               return GDK_FAIL;
+       *r1p = r1;
+       *r2p = r2;
+
        return thetajoin(r1, r2, l, r, sl, sr, opcode);
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list