Changeset: 4333db21ae37 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4333db21ae37
Branch: default
Log Message:
Merge heads.
diffs (39 lines):
diff --git a/gdk/gdk_firstn.c b/gdk/gdk_firstn.c
--- a/gdk/gdk_firstn.c
+++ b/gdk/gdk_firstn.c
@@ -227,9 +227,9 @@ BATfirstn_unique(BATiter *bi, BAT *s, BU
if (n >= cnt) {
/* trivial: return all candidates */
- if (lastp)
- *lastp = 0;
bn = canditer_slice(&ci, 0, ci.ncand);
+ if (bn && lastp)
+ *lastp = BUNtoid(bn, cnt - 1);
TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",s=" ALGOOPTBATFMT
",n=" BUNFMT " -> " ALGOOPTBATFMT
" (trivial -- " LLFMT " usec)\n",
diff --git a/monetdb5/modules/kernel/algebra.c
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -683,7 +683,7 @@ ALGfirstn(Client cntxt, MalBlkPtr mb, Ma
bat *ret1, *ret2 = NULL;
bat bid, sid, gid;
BAT *b, *s = NULL, *g = NULL;
- BAT *bn, *gn;
+ BAT *bn = NULL, *gn = NULL;
lng n;
bit asc, nilslast, distinct;
gdk_return rc;
diff --git a/sql/test/miscellaneous/Tests/simple_selects.test
b/sql/test/miscellaneous/Tests/simple_selects.test
--- a/sql/test/miscellaneous/Tests/simple_selects.test
+++ b/sql/test/miscellaneous/Tests/simple_selects.test
@@ -210,7 +210,7 @@ CC
statement ok
drop table x
-query IIIIIIIIIIIIRRRRIIII rowsort
+query IIIIIIIIIIIIIIII rowsort
select difference('foobar', 'oobar'), difference(NULL, 'oobar'),
difference('foobar', NULL), difference(NULL, NULL),
editdistance('foobar', 'oobar'), editdistance(NULL, 'oobar'),
editdistance('foobar', NULL), editdistance(NULL, NULL),
editdistance2('foobar', 'oobar'), editdistance2(NULL, 'oobar'),
editdistance2('foobar', NULL), editdistance2(NULL, NULL),
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
