Changeset: dffbe2a1cd80 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dffbe2a1cd80
Modified Files:
gdk/gdk_join.c
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (23 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -3388,6 +3388,19 @@ BATproject(BAT *l, BAT *r)
bn->tkey = 1;
if (l->T->nonil && r->T->nonil)
nilcheck = 0; /* don't bother checking: no nils */
+ if (tpe != TYPE_oid &&
+ tpe != ATOMstorage(tpe) &&
+ !ATOMvarsized(tpe) &&
+ ATOMcompare(tpe) == ATOMcompare(ATOMstorage(tpe)) &&
+ (!nilcheck ||
+ ATOMnilptr(tpe) == ATOMnilptr(ATOMstorage(tpe)))) {
+ /* use base type if we can:
+ * only fixed sized (no advantage for variable sized),
+ * compare function identical (for sorted check),
+ * either no nils, or nil representation identical,
+ * not oid (separate case for those) */
+ tpe = ATOMstorage(tpe);
+ }
}
bn->T->nil = 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
