Changeset: 96111b28e6c7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/96111b28e6c7
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_cand.c
gdk/gdk_cand.h
gdk/gdk_private.h
gdk/gdk_select.c
monetdb5/modules/atoms/str.c
monetdb5/modules/mal/pcre.c
Branch: default
Log Message:
Change BATnegcands interface: add argument for tseqbase.
diffs (108 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -167,7 +167,7 @@ BAT *BATmergecand(BAT *a, BAT *b);
void *BATmin(BAT *b, void *aggr);
void *BATmin_skipnil(BAT *b, void *aggr, bit skipnil);
gdk_return BATmode(BAT *b, bool transient);
-BAT *BATnegcands(BUN nr, BAT *odels);
+BAT *BATnegcands(oid tseq, BUN nr, BAT *odels);
BAT *BATnil_grp(BAT *l, BAT *g, BAT *e, BAT *s);
bool BATordered(BAT *b);
bool BATordered_rev(BAT *b);
diff --git a/gdk/gdk_cand.c b/gdk/gdk_cand.c
--- a/gdk/gdk_cand.c
+++ b/gdk/gdk_cand.c
@@ -1293,7 +1293,7 @@ canditer_slice2val(const struct canditer
}
BAT *
-BATnegcands2(oid tseq, BUN nr, BAT *odels)
+BATnegcands(oid tseq, BUN nr, BAT *odels)
{
const char *nme;
Heap *dels;
@@ -1363,12 +1363,6 @@ BATnegcands2(oid tseq, BUN nr, BAT *odel
}
BAT *
-BATnegcands(BUN nr, BAT *odels)
-{
- return BATnegcands2(0, nr, odels);
-}
-
-BAT *
BATmaskedcands(oid hseq, BUN nr, BAT *masked, bool selected)
{
const char *nme;
diff --git a/gdk/gdk_cand.h b/gdk/gdk_cand.h
--- a/gdk/gdk_cand.h
+++ b/gdk/gdk_cand.h
@@ -228,7 +228,7 @@ gdk_export BAT *canditer_slice(const str
gdk_export BAT *canditer_sliceval(const struct canditer *ci, oid lo, oid hi);
gdk_export BAT *canditer_slice2(const struct canditer *ci, BUN lo1, BUN hi1,
BUN lo2, BUN hi2);
gdk_export BAT *canditer_slice2val(const struct canditer *ci, oid lo1, oid
hi1, oid lo2, oid hi2);
-gdk_export BAT *BATnegcands(BUN nr, BAT *odels);
+gdk_export BAT *BATnegcands(oid tseq, BUN nr, BAT *odels);
gdk_export BAT *BATmaskedcands(oid hseq, BUN nr, BAT *masked, bool selected);
gdk_export BAT *BATunmask(BAT *b);
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -78,8 +78,6 @@ BAT *BATload_intern(bat bid, bool lock)
gdk_return BATmaterialize(BAT *b, BUN cap)
__attribute__((__warn_unused_result__))
__attribute__((__visibility__("hidden")));
-BAT *BATnegcands2(oid hseq, BUN nr, BAT *odels)
- __attribute__((__visibility__("hidden")));
gdk_return BATsave_iter(BAT *bd, BATiter *bi, BUN size)
__attribute__((__visibility__("hidden")));
void BATsetdims(BAT *b, uint16_t width)
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -1742,7 +1742,7 @@ BATselect(BAT *b, BAT *s, const void *tl
if (s) {
bn2 = BATdiffcand(s, bn);
} else {
- bn2 = BATnegcands2(ci.seq, bi.count, bn);
+ bn2 = BATnegcands(ci.seq, bi.count, bn);
}
bat_iterator_end(&bi);
BBPreclaim(bn);
@@ -2288,7 +2288,7 @@ BATselect(BAT *b, BAT *s, const void *tl
if (s) {
bn2 = BATdiffcand(s, bn);
} else {
- bn2 = BATnegcands2(ci.seq, bi.count, bn);
+ bn2 = BATnegcands(ci.seq, bi.count, bn);
}
BBPreclaim(bn);
bn = bn2;
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -1959,7 +1959,7 @@ STRselect(MalStkPtr stk, InstrPtr pci,
assert(rev->batCount == old_s->batCount
- bn->batCount);
#endif
} else
- rev = BATnegcands(b->batCount, bn);
+ rev = BATnegcands(0, b->batCount, bn);
BBPreclaim(bn);
bn = rev;
diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -1623,8 +1623,8 @@ PCRElikeselect(bat *ret, const bat *bid,
}
else
- rev = BATnegcands(b->batCount, bn);
- /* BAT *rev = BATnegcands(b->batCount, bn); */
+ rev = BATnegcands(0, b->batCount, bn);
+ /* BAT *rev = BATnegcands(0, b->batCount, bn); */
BBPunfix(bn->batCacheid);
bn = rev;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
