Changeset: 83939fbce7eb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83939fbce7eb
Modified Files:
gdk/gdk_bat.c
gdk/gdk_sample.c
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (59 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -534,13 +534,13 @@ BATclear(BAT *b, int force)
IMPSdestroy(b);
/* we must dispose of all inserted atoms */
- if (b->batDeleted == b->batInserted &&
+ if ((b->batDeleted == b->batInserted || force) &&
BATatoms[b->htype].atomDel == NULL &&
BATatoms[b->ttype].atomDel == NULL) {
Heap hh, th;
/* no stable elements: we do a quick heap clean */
- /* need to clean heap which keep data even though the
+ /* need to clean heap which keeps data even though the
BUNs got removed. This means reinitialize when
free > 0
*/
diff --git a/gdk/gdk_sample.c b/gdk/gdk_sample.c
--- a/gdk/gdk_sample.c
+++ b/gdk/gdk_sample.c
@@ -111,7 +111,7 @@ OIDTreeToBATAntiset(struct oidtreenode *
((oid *) bat->T->heap.base)[bat->batFirst +
bat->batCount++] = noid;
if (node->right != NULL)
- OIDTreeToBATAntiset(node->right, bat, node->o, stop);
+ OIDTreeToBATAntiset(node->right, bat, node->o + 1, stop);
else
for (noid = node->o+1; noid < stop; noid++)
((oid *) bat->T->heap.base)[bat->batFirst +
bat->batCount++] = noid;
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -55,8 +55,8 @@ Operation successful
| X_42 := io.stdout(); |
| sql.exportResult(X_42,X_36); |
| end s2_1;
|
-| # querylog.define("explain select \"name\" from
\"tables\";","sequential_pipe") |
-+-------------------------------------------------------------------------------------+
+| # querylog.define("explain select \"name\" from
\"tables\"\n;","sequential_pipe") |
++-----------------------------------------------------------------------------------+
30 rows
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -80,8 +80,8 @@ Operation successful
| X_40:wrd := aggr.sum(X_39); |
| sql.exportValue(1,".L1","L1","wrd",64,0,6,X_40,""); |
| end s3_1; |
-| # querylog.define("explain select count(*) from tables;","sequential_pipe") |
-+-------------------------------------------------------------------------------------+
+| # querylog.define("explain select count(*) from
tables\n;","sequential_pipe") |
++-------------------------------------------------------------------------------+
31 rows
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
