Changeset: 39a43c47215b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=39a43c47215b
Modified Files:
gdk/gdk.h
gdk/gdk_bat.c
Branch: mosaic
Log Message:
Properties refer to the uncompressed version of the data.
And we want to check as many of them as possible.
diffs (60 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1762,8 +1762,7 @@ gdk_export void GDKqsort_rev(void *h, vo
if ((col)->seq == oid_nil) { \
(col)->nonil = (b)->batCount == 0; \
(col)->nil = !(col)->nonil; \
- if( !(col)->heap.compressed) \
- (col)->revsorted = 1;
\
+ (col)->revsorted = 1; \
(col)->key = (b)->batCount <= 1; \
(col)->dense = 0; \
} else { \
@@ -1771,13 +1770,11 @@ gdk_export void GDKqsort_rev(void *h, vo
(col)->nonil = 1; \
(col)->nil = 0; \
(col)->key = 1; \
- if( !(col)->heap.compressed) \
- (col)->revsorted = (b)->batCount <= 1;
\
+ (col)->revsorted = (b)->batCount <= 1; \
} \
- if( !(col)->heap.compressed) \
- (col)->sorted = 1;
\
+ (col)->sorted = 1; \
} else if ((b)->batCount <= 1) { \
- if( !(col)->heap.compressed &&
BATatoms[(col)->type].linear) { \
+ if (BATatoms[(col)->type].linear) { \
(col)->sorted = 1; \
(col)->revsorted = 1; \
} \
@@ -1804,7 +1801,7 @@ gdk_export void GDKqsort_rev(void *h, vo
(col)->seq = sqbs; \
} \
} \
- if( !(col)->heap.compressed && !BATatoms[(col)->type].linear) {
\
+ if (!BATatoms[(col)->type].linear) { \
(col)->sorted = 0; \
(col)->revsorted = 0; \
} \
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2816,7 +2816,7 @@ BATassertHeadProps(BAT *b)
p = BUNfirst(b);
q = BUNlast(b);
- assert(b->H->heap.free >= headsize(b, BUNlast(b)));
+ assert(b->H->heap.compressed || b->H->heap.free >= headsize(b,
BUNlast(b)));
if (b->htype != TYPE_void) {
assert(b->batCount <= b->batCapacity);
assert(b->H->heap.size >= b->H->heap.free);
@@ -3024,8 +3024,6 @@ BATassertProps(BAT *b)
/* general BAT sanity */
assert(b != NULL);
- if( b->T->heap.compressed)
- return;
bm = BATmirror(b);
assert(bm != NULL);
assert(b->H == bm->T);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
