Changeset: a722eef5e949 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a722eef5e949 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 monetdb5/modules/atoms/batxml.c monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/batstr.c Branch: default Log Message:
Merge with Dec2016 branch. diffs (50 lines): diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c --- a/monetdb5/modules/atoms/batxml.c +++ b/monetdb5/modules/atoms/batxml.c @@ -13,10 +13,8 @@ * The collection of routines provided here are map operations * for the atom xml primitives. * - * In line with the batcalc module, we assume that - * if two bat operands are provided that they are already - * aligned on the head. Moreover, the head of the BATs - * are limited to :oid. + * In line with the batcalc module, we assume that if two bat operands + * are provided that they are aligned. * * The implementation is focussed on functionality. At a later stage * we may postpone string contstruction until it is really needed. diff --git a/monetdb5/modules/kernel/batcolor.c b/monetdb5/modules/kernel/batcolor.c --- a/monetdb5/modules/kernel/batcolor.c +++ b/monetdb5/modules/kernel/batcolor.c @@ -13,11 +13,8 @@ * The collection of routines provided here are map operations * for the color string primitives. * - * In line with the batcalc module, we assume that - * if two bat operands are provided that they are already - * aligned on the head. Moreover, the head of the BATs - * are limited to :oid, which can be cheaply realized using - * the GRPsplit operation. + * In line with the batcalc module, we assume that if two bat operands + * are provided that they are aligned. */ #include "monetdb_config.h" diff --git a/monetdb5/modules/kernel/batstr.c b/monetdb5/modules/kernel/batstr.c --- a/monetdb5/modules/kernel/batstr.c +++ b/monetdb5/modules/kernel/batstr.c @@ -13,11 +13,8 @@ * The collection of routines provided here are map operations * for the atom string primitives. * - * In line with the batcalc module, we assume that - * if two bat operands are provided that they are already - * aligned on the head. Moreover, the head of the BATs - * are limited to :void, which can be cheaply realized using - * the GRPsplit operation. + * In line with the batcalc module, we assume that if two bat operands + * are provided that they are aligned. */ #include "monetdb_config.h" #include <gdk.h> _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list