Changeset: 6864dc8c472d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6864dc8c472d
Modified Files:
gdk/gdk_align.c
monetdb5/modules/mal/pcre.c
Branch: string_imprints
Log Message:
Set the view pointer to strimps to NULL at view construction
diffs (34 lines):
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -133,6 +133,8 @@ VIEWcreate(oid seq, BAT *b)
bn->timprints = NULL;
/* Order OID index */
bn->torderidx = NULL;
+ /* Only the parent should have a pointer to the strimp */
+ bn->tstrimps = NULL;
if (BBPcacheit(bn, true) != GDK_SUCCEED) { /* enter in BBP */
if (tp) {
BBPunshare(tp);
@@ -377,6 +379,7 @@ VIEWdestroy(BAT *b)
HASHdestroy(b);
IMPSdestroy(b);
OIDXdestroy(b);
+ STRMPdestroy(b);
PROPdestroy(b);
VIEWunlink(b);
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
@@ -1892,10 +1892,8 @@ PCRElikeselect(bat *ret, const bat *bid,
*/
if (use_strimps && BATcount(b) >= STRIMP_CREATION_THRESHOLD && !*anti) {
if (STRMPcreate(b, NULL) == GDK_SUCCEED) {
- STRMPbatincref(b);
BAT *tmp_s;
tmp_s = STRMPfilter(b, s, *pat);
- STRMPbatdecref(b, false);
if (tmp_s && s) {
BBPunfix(s->batCacheid);
s = tmp_s;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
