Changeset: cbf17b040d72 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cbf17b040d72
Modified Files:
gdk/gdk.h
gdk/gdk_join.c
gdk/gdk_private.h
Branch: unlock
Log Message:
make it compile (probably more needed)
diffs (36 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1231,7 +1231,7 @@ gdk_export void GDKqsort(void *restrict
/* BATtvoid: BAT can be (or actually is) represented by TYPE_void */
#define BATtvoid(b) (BATtdense(b) || (b)->ttype==TYPE_void)
#define BATtkey(b) ((b)->tkey || BATtdense(b))
-#define BATiscand(b) ((b)->ttype == TYPE_msk || (b)->ttype == TYPE_void ||
(b)->ttype == TYPE_oid)
+bool BATiscand(BAT *b);
/* set some properties that are trivial to deduce */
static inline void
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -84,7 +84,7 @@ joinparamcheck(BAT *l, BAT *r1, BAT *r2,
GDKerror("%s: right inputs not aligned.\n", func);
return GDK_FAIL;
}
- if (!BATiscand(sl) || !BATiscand(sr)) {
+ if ((sl && !BATiscand(sl)) || (sr && !BATiscand(sr))) {
GDKerror("%s: argument not a candidate list.\n", func);
return GDK_FAIL;
}
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -78,8 +78,6 @@ gdk_return BAThashsave(BAT *b, bool dosy
__attribute__((__visibility__("hidden")));
void BATinit_idents(BAT *bn)
__attribute__((__visibility__("hidden")));
-bool BATiscand(BAT *b)
- __attribute__((__visibility__("hidden")));
BAT *BATload_intern(bat bid, bool lock)
__attribute__((__visibility__("hidden")));
gdk_return BATmaterialize(BAT *b)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
