Changeset: 9838f722d598 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9838f722d598
Modified Files:
MonetDB/src/gdk/gdk_batop.mx
Branch: Oct2010
Log Message:
Indirect *after* NULL check.
diffs (21 lines):
diff -r 28dfae9db91c -r 9838f722d598 MonetDB/src/gdk/gdk_batop.mx
--- a/MonetDB/src/gdk/gdk_batop.mx Thu Jan 13 15:55:06 2011 +0100
+++ b/MonetDB/src/gdk/gdk_batop.mx Fri Jan 14 14:52:08 2011 +0100
@@ -240,7 +240,7 @@
{
BAT *tmp = NULL, *res = NULL;
int fastpath = 0;
- int countonly = (b->htype == TYPE_void && b->ttype == TYPE_void);
+ int countonly;
if (b == NULL || n == NULL || BATcount(n) == 0) {
return b;
@@ -248,6 +248,8 @@
ALIGNins(b, "BATins", force);
BATcompatible(b, n);
+ countonly = (b->htype == TYPE_void && b->ttype == TYPE_void);
+
if (BUNlast(b) + BATcount(n) > BUN_MAX) {
GDKerror("BATins: combined BATs too large\n");
return NULL;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
