Changeset: 57f7ece73e2c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57f7ece73e2c
Modified Files:
gdk/gdk_batop.c
Branch: properties
Log Message:
Merged with default
diffs (36 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -500,7 +500,7 @@ BATappend2(BAT *b, BAT *n, BAT *s, bool
struct canditer ci;
BUN cnt;
BUN r;
- PROPrec *prop, *nprop;
+ PROPrec *prop = NULL, *nprop;
oid hseq = n->hseqbase;
char buf[64];
lng t0 = 0;
@@ -548,9 +548,9 @@ BATappend2(BAT *b, BAT *n, BAT *s, bool
IMPSdestroy(b); /* imprints do not support updates yet */
OIDXdestroy(b);
- if ((prop = BATgetprop(b, GDK_MAX_VALUE)) != NULL) {
+ if (BATcount(b) == 0 || (prop = BATgetprop(b, GDK_MAX_VALUE)) != NULL) {
if ((nprop = BATgetprop(n, GDK_MAX_VALUE)) != NULL) {
- if (ATOMcmp(b->ttype, VALptr(&prop->v),
VALptr(&nprop->v)) < 0) {
+ if (BATcount(b) == 0 || ATOMcmp(b->ttype,
VALptr(&prop->v), VALptr(&nprop->v)) < 0) {
if (s == NULL) {
BATsetprop(b, GDK_MAX_VALUE, b->ttype,
VALptr(&nprop->v));
if ((nprop = BATgetprop(n,
GDK_MAX_POS)) != NULL)
@@ -567,9 +567,9 @@ BATappend2(BAT *b, BAT *n, BAT *s, bool
BATrmprop(b, GDK_MAX_POS);
}
}
- if ((prop = BATgetprop(b, GDK_MIN_VALUE)) != NULL) {
+ if (BATcount(b) == 0 || (prop = BATgetprop(b, GDK_MIN_VALUE)) != NULL) {
if ((nprop = BATgetprop(n, GDK_MIN_VALUE)) != NULL) {
- if (ATOMcmp(b->ttype, VALptr(&prop->v),
VALptr(&nprop->v)) > 0) {
+ if (BATcount(b) == 0 || ATOMcmp(b->ttype,
VALptr(&prop->v), VALptr(&nprop->v)) > 0) {
if (s == NULL) {
BATsetprop(b, GDK_MIN_VALUE, b->ttype,
VALptr(&nprop->v));
if ((nprop = BATgetprop(n,
GDK_MIN_POS)) != NULL)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
