Changeset: 99e2352a098e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99e2352a098e
Modified Files:
gdk/gdk_batop.c
gdk/gdk_firstn.c
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (125 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -792,8 +792,7 @@ BATslice(BAT *b, BUN l, BUN h)
/* Return whether the BAT is ordered or not. If we don't know, invest
* in a scan and record the results in the bat descriptor. If during
* the scan we happen to find evidence that the BAT is not reverse
- * sorted, we record the location.
- */
+ * sorted, we record the location. */
int
BATordered(BAT *b)
{
diff --git a/gdk/gdk_firstn.c b/gdk/gdk_firstn.c
--- a/gdk/gdk_firstn.c
+++ b/gdk/gdk_firstn.c
@@ -153,7 +153,7 @@ BATfirstn_unique(BAT *b, BAT *s, BUN n,
BATtseqbase(bn, start + b->hseqbase);
return bn;
}
- /* note, we want to do bot calls */
+ /* note, we want to do both calls */
if (BATordered(b) | BATordered_rev(b)) {
/* trivial: b is sorted so we just need to return the
* initial or final part of it (or of the candidate
diff --git a/sql/test/leaks/Tests/check1.stable.out
b/sql/test/leaks/Tests/check1.stable.out
--- a/sql/test/leaks/Tests/check1.stable.out
+++ b/sql/test/leaks/Tests/check1.stable.out
@@ -101,11 +101,11 @@ Ready.
[ "int", 34 ]
[ "int", 34 ]
[ "int", 34 ]
-[ "int", 46 ]
-[ "int", 46 ]
-[ "int", 46 ]
-[ "int", 46 ]
-[ "int", 46 ]
+[ "int", 47 ]
+[ "int", 47 ]
+[ "int", 47 ]
+[ "int", 47 ]
+[ "int", 47 ]
[ "int", 56 ]
[ "int", 56 ]
[ "int", 253 ]
diff --git a/sql/test/leaks/Tests/check2.stable.out
b/sql/test/leaks/Tests/check2.stable.out
--- a/sql/test/leaks/Tests/check2.stable.out
+++ b/sql/test/leaks/Tests/check2.stable.out
@@ -101,11 +101,11 @@ Ready.
[ "int", 34 ]
[ "int", 34 ]
[ "int", 34 ]
-[ "int", 46 ]
-[ "int", 46 ]
-[ "int", 46 ]
-[ "int", 46 ]
-[ "int", 46 ]
+[ "int", 47 ]
+[ "int", 47 ]
+[ "int", 47 ]
+[ "int", 47 ]
+[ "int", 47 ]
[ "int", 56 ]
[ "int", 56 ]
[ "int", 253 ]
diff --git a/sql/test/leaks/Tests/check3.stable.out
b/sql/test/leaks/Tests/check3.stable.out
--- a/sql/test/leaks/Tests/check3.stable.out
+++ b/sql/test/leaks/Tests/check3.stable.out
@@ -101,11 +101,11 @@ Ready.
[ "int", 34 ]
[ "int", 34 ]
[ "int", 34 ]
-[ "int", 46 ]
-[ "int", 46 ]
-[ "int", 46 ]
-[ "int", 46 ]
-[ "int", 46 ]
+[ "int", 47 ]
+[ "int", 47 ]
+[ "int", 47 ]
+[ "int", 47 ]
+[ "int", 47 ]
[ "int", 57 ]
[ "int", 57 ]
[ "int", 256 ]
diff --git a/sql/test/leaks/Tests/check4.stable.out
b/sql/test/leaks/Tests/check4.stable.out
--- a/sql/test/leaks/Tests/check4.stable.out
+++ b/sql/test/leaks/Tests/check4.stable.out
@@ -101,11 +101,11 @@ Ready.
[ "int", 34 ]
[ "int", 34 ]
[ "int", 34 ]
-[ "int", 46 ]
-[ "int", 46 ]
-[ "int", 46 ]
-[ "int", 46 ]
-[ "int", 46 ]
+[ "int", 47 ]
+[ "int", 47 ]
+[ "int", 47 ]
+[ "int", 47 ]
+[ "int", 47 ]
[ "int", 58 ]
[ "int", 58 ]
[ "int", 259 ]
diff --git a/sql/test/leaks/Tests/check5.stable.out
b/sql/test/leaks/Tests/check5.stable.out
--- a/sql/test/leaks/Tests/check5.stable.out
+++ b/sql/test/leaks/Tests/check5.stable.out
@@ -101,11 +101,11 @@ Ready.
[ "int", 34 ]
[ "int", 34 ]
[ "int", 34 ]
-[ "int", 46 ]
-[ "int", 46 ]
-[ "int", 46 ]
-[ "int", 46 ]
-[ "int", 46 ]
+[ "int", 47 ]
+[ "int", 47 ]
+[ "int", 47 ]
+[ "int", 47 ]
+[ "int", 47 ]
[ "int", 58 ]
[ "int", 58 ]
[ "int", 259 ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
