Changeset: ad724f3c216f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad724f3c216f
Modified Files:
gdk/gdk_storage.c
sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (53 lines):
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -711,13 +711,6 @@ BATsave(BAT *bd)
BAT *b = bd;
BATcheck(b, "BATsave", GDK_FAIL);
- /* there is a possibility that BATsave gets called with a
- * pointer to a BAT that has *no* fixes (refs == 0), and so
- * the heaps may not be in core, in which case BATmirror()
- * would not find the mirror (this can happen when BATsave
- * gets called during a (sub)commit after the BAT had been
- * trimmed) */
- CHECKDEBUG if (BATmirror(b)) BATassertProps(b);
/* views cannot be saved, but make an exception for
* force-remapped views */
@@ -797,23 +790,6 @@ BATsave(BAT *bd)
if (err == GDK_SUCCEED) {
bd->batCopiedtodisk = 1;
DESCclean(bd);
- /* see comment with BATassertProps() at the top of this
function */
- if (BATmirror(bd)) {
- if (bd->htype && bd->H->heap.storage == STORE_MMAP) {
- HEAPshrink(&bd->H->heap, bd->H->heap.free);
- if (bd->batCapacity > bd->H->heap.size >>
bd->H->shift)
- bd->batCapacity = (BUN)
(bd->H->heap.size >> bd->H->shift);
- }
- if (bd->ttype && bd->T->heap.storage == STORE_MMAP) {
- HEAPshrink(&bd->T->heap, bd->T->heap.free);
- if (bd->batCapacity > bd->T->heap.size >>
bd->T->shift)
- bd->batCapacity = (BUN)
(bd->T->heap.size >> bd->T->shift);
- }
- if (bd->H->vheap && bd->H->vheap->storage == STORE_MMAP)
- HEAPshrink(bd->H->vheap, bd->H->vheap->free);
- if (bd->T->vheap && bd->T->vheap->storage == STORE_MMAP)
- HEAPshrink(bd->T->vheap, bd->T->vheap->free);
- }
return GDK_SUCCEED;
}
return err;
diff --git
a/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
b/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
---
a/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
+++
b/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
@@ -94,7 +94,7 @@ project (
project (
| group by (
| | table(sys.sorted) [ sorted.a, sorted.b ] COUNT
-| ) [ sorted.a, sorted.b ] [ sorted.b, sorted.a ]
+| ) [ sorted.b, sorted.a ] [ sorted.b, sorted.a ]
) [ sorted.a, sorted.b ]
# 13:59:55 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
