MonetDB: Mar2011 - Another instance: Don't use the same iterator...

[Sjoerd Mullender]

Changeset: f4c2e3c61c3f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f4c2e3c61c3f
Modified Files:
        gdk/gdk_bat.mx
Branch: Mar2011
Log Message:

Another instance: Don't use the same iterator twice in one expression.


diffs (39 lines):

diff --git a/gdk/gdk_bat.mx b/gdk/gdk_bat.mx
--- a/gdk/gdk_bat.mx
+++ b/gdk/gdk_bat.mx
@@ -3071,7 +3071,7 @@
 BAT *
 BATpropcheck(BAT *b, int mode)
 {
-       BATiter bvi, bi = bat_iterator(b);
+       BATiter bvi, bi = bat_iterator(b), bi2 = bat_iterator(b);
        int disprove_dense, disprove_sorted, disprove_key = TRUE, 
disprove_nonil = b->H->nonil;
        int dense_bak = 0, key_bak = 0, sorted_bak = 0, nonil_bak = 0;
        oid seq_bak = 0;
@@ -3235,7 +3235,7 @@
                     (b->H->nokey[0] < xx) &&
                     (b->H->nokey[1] >= yy) &&
                     (b->H->nokey[1] < xx) &&
-                    ATOMcmp(tpe, BUNhead(bi, b->H->nokey[0]), BUNhead(bi, 
b->H->nokey[1])) == 0)) {
+                    ATOMcmp(tpe, BUNhead(bi, b->H->nokey[0]), BUNhead(bi2, 
b->H->nokey[1])) == 0)) {
                        disprove_key = FALSE;
                } else {
                        b->H->nokey[0] = b->H->nokey[1] = 0;
@@ -3253,7 +3253,7 @@
                    ATOMlinear(tpe) == 0 ||
                    (b->H->nosorted > yy &&
                     b->H->nosorted < xx &&
-                    ATOMcmp(tpe, BUNhead(bi, b->H->nosorted - 1), BUNhead(bi, 
b->H->nosorted)) > 0)) {
+                    ATOMcmp(tpe, BUNhead(bi, b->H->nosorted - 1), BUNhead(bi2, 
b->H->nosorted)) > 0)) {
                        disprove_sorted = FALSE;
                } else {
                        b->H->nosorted = 0;     /* StM: nosorted_rev ? */
@@ -3263,7 +3263,7 @@
                if (((b->hsorted & 1) == FALSE && disprove_sorted == FALSE) ||
                    (b->H->nodense > yy &&
                     b->H->nodense < xx &&
-                    *(oid *) BUNhloc(bi, b->H->nodense - 1) + 1 != *(oid *) 
BUNhloc(bi, b->H->nodense))) {
+                    *(oid *) BUNhloc(bi, b->H->nodense - 1) + 1 != *(oid *) 
BUNhloc(bi2, b->H->nodense))) {
                        disprove_dense = FALSE;
                } else {
                        b->H->nodense = 0;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list