Changeset: 8985f446aad3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8985f446aad3
Modified Files:
gdk/gdk_col.c
Branch: headless
Log Message:
Merge with default branch.
diffs (39 lines):
diff --git a/gdk/gdk_col.c b/gdk/gdk_col.c
--- a/gdk/gdk_col.c
+++ b/gdk/gdk_col.c
@@ -2156,7 +2156,7 @@
COL *
COLpropcheck(COL *b, int mode)
{
- COLiter bvi, bi = col_iterator(b);
+ COLiter bvi, bi = col_iterator(b, bi2 = col_iterator(b));
int disprove_dense, disprove_sorted, disprove_key = TRUE,
disprove_nonil = b->nonil;
int dense_bak = 0, key_bak = 0, sorted_bak = 0, nonil_bak = 0;
oid seq_bak = 0;
@@ -2293,7 +2293,7 @@
(b->nokey[0] < xx) &&
(b->nokey[1] >= yy) &&
(b->nokey[1] < xx) &&
- ATOMcmp(tpe, BUNhead(bi, b->nokey[0]), BUNhead(bi,
b->nokey[1])) == 0)) {
+ ATOMcmp(tpe, BUNhead(bi, b->nokey[0]), BUNhead(bi2,
b->nokey[1])) == 0)) {
disprove_key = FALSE;
} else {
b->nokey[0] = b->nokey[1] = 0;
@@ -2311,7 +2311,7 @@
ATOMlinear(tpe) == 0 ||
(b->nosorted > yy &&
b->nosorted < xx &&
- ATOMcmp(tpe, BUNhead(bi, b->nosorted - 1), BUNhead(bi,
b->nosorted)) > 0)) {
+ ATOMcmp(tpe, BUNhead(bi, b->nosorted - 1), BUNhead(bi2,
b->nosorted)) > 0)) {
disprove_sorted = FALSE;
} else {
b->nosorted = 0; /* StM: nosorted_rev ? */
@@ -2321,7 +2321,7 @@
if (((b->sorted & 1) == FALSE && disprove_sorted == FALSE) ||
(b->nodense > yy &&
b->nodense < xx &&
- *(oid *) BUNloc(bi, b->nodense - 1) + 1 != *(oid *)
BUNloc(bi, b->nodense))) {
+ *(oid *) BUNloc(bi, b->nodense - 1) + 1 != *(oid *)
BUNloc(bi2, b->nodense))) {
disprove_dense = FALSE;
} else {
b->nodense = 0;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
