MonetDB: Jul2015 - Properly set (clear) revsorted property on he...

[Sjoerd Mullender]

Changeset: 4161d2234597 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4161d2234597
Modified Files:
        gdk/gdk_batop.c
Branch: Jul2015
Log Message:

Properly set (clear) revsorted property on head column.


diffs (37 lines):

diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -777,8 +777,6 @@ BATappend(BAT *b, BAT *n, bit force)
                                        r++;
                                }
                        }
-                       if (b->hseqbase != oid_nil)
-                               b->hrevsorted = 0;
                } else {
                        oid o = MAXoid(b);
                        BATiter ni = bat_iterator(n);
@@ -789,7 +787,6 @@ BATappend(BAT *b, BAT *n, bit force)
                                o++;
                                r++;
                        }
-                       b->hrevsorted = 0;
                }
        } else {
                BUN p, q;
@@ -813,7 +810,6 @@ BATappend(BAT *b, BAT *n, bit force)
                                                i++;
                                        }
                                }
-                               b->hrevsorted = 0;
                        } else {
                                oid on = oid_nil;
 
@@ -871,6 +867,8 @@ BATappend(BAT *b, BAT *n, bit force)
                        b->tdense = b->tsorted = b->trevsorted = 0;
                }
        }
+       if (b->hseqbase != oid_nil)
+               b->hrevsorted = BATcount(b) <= 1;
        b->H->nonil &= n->H->nonil;
        b->T->nonil &= n->T->nonil;
        return GDK_SUCCEED;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list