Changeset: 638a8f1340b8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=638a8f1340b8
Modified Files:
gdk/gdk_batop.mx
Branch: Apr2011
Log Message:
Backout changeset bfabaa675a1c.
Thinko: you can use the same iterator twice in a single expression if
the iterator is used for different columns.
diffs (22 lines):
diff --git a/gdk/gdk_batop.mx b/gdk/gdk_batop.mx
--- a/gdk/gdk_batop.mx
+++ b/gdk/gdk_batop.mx
@@ -1355,8 +1355,7 @@
BUN cnt, i, r = 0, n, j;
BUN *choice = NULL, *dst;
BAT *bn;
- BATiter bi1 = bat_iterator(b);
- BATiter bi2 = bat_iterator(b);
+ BATiter bi = bat_iterator(b);
BUN bun;
BATcheck(b, "BATsample: source BAT required");
@@ -1446,7 +1445,7 @@
for (j = 0; j < n; j++) {
BUN p = bun + choice[j];
- bunfastins(bn, BUNhead(bi1, p), BUNtail(bi2, p));
+ bunfastins(bn, BUNhead(bi, p), BUNtail(bi, p));
}
GDKfree(choice); /* clean up choice array of BUN positions */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
