Changeset: 48645a83deae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=48645a83deae
Modified Files:
MonetDB5/src/modules/mal/pqueue.mx
Branch: Oct2010
Log Message:
fix mistake in pqueue topn. Although for topn we could stop if
the input is allready small enough, but we need to also fix
the order these days...
diffs (29 lines):
diff -r 92f99dca50dd -r 48645a83deae MonetDB5/src/modules/mal/pqueue.mx
--- a/MonetDB5/src/modules/mal/pqueue.mx Fri Sep 17 13:40:24 2010 +0200
+++ b/MonetDB5/src/modules/mal/pqueue.mx Fri Sep 17 15:57:08 2010 +0200
@@ -945,12 +945,6 @@
n = BATcount(a);
if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX && (BUN) *N < n)
n = (BUN) *N;
- if (n >= BATcount(a)) {
- *ret= a->batCacheid;
- BBPkeepref(*ret);
- BBPreleaseref(b->batCacheid);
- return MAL_SUCCEED;
- }
bn = BATnew(TYPE_oid, TYPE_oid, n);
for(i=0; i<n; ) {
oid *v = (oid*)Tloc(a,i), ov = *v;
@@ -994,12 +988,6 @@
n = BATcount(a);
if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX && (BUN) *N < n)
n = (BUN) *N;
- if (n >= BATcount(a)) {
- *ret= a->batCacheid;
- BBPkeepref(*ret);
- BBPreleaseref(b->batCacheid);
- return MAL_SUCCEED;
- }
bn = BATnew(TYPE_oid, TYPE_oid, n);
for(i=0; i<n; ) {
oid *v = (oid*)Tloc(a,i), ov = *v;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
