MonetDB: string_imprints - Treat gdb_use_strimps as an integer

[Panagiotis Koutsourakis]

Changeset: 95d06449d0b1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/95d06449d0b1
Modified Files:
        monetdb5/modules/mal/pcre.c
Branch: string_imprints
Log Message:

Treat gdb_use_strimps as an integer


diffs (29 lines):

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
@@ -1873,7 +1873,7 @@ PCRElikeselect(bat *ret, const bat *bid,
        str msg = MAL_SUCCEED;
        char *ppat = NULL;
        bool use_re = false, use_strcmp = false, empty = false;
-       bool use_strimps = GDKgetenv("gdk_use_strimps");
+       bool use_strimps = GDKgetenv_int("gdk_use_strimps", 0);
 
        if ((b = BATdescriptor(*bid)) == NULL) {
                msg = createException(MAL, "algebra.likeselect", 
SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
@@ -1884,6 +1884,8 @@ PCRElikeselect(bat *ret, const bat *bid,
                goto bailout;
        }
 
+       assert(ATOMstorage(b->ttype) == TYPE_str);
+
        if (use_strimps) {
                if (STRMPcreate(b, NULL) == GDK_SUCCEED) {
                        BAT *tmp_s;
@@ -1895,7 +1897,6 @@ PCRElikeselect(bat *ret, const bat *bid,
 
        }
 
-       assert(ATOMstorage(b->ttype) == TYPE_str);
        if ((msg = choose_like_path(&ppat, &use_re, &use_strcmp, &empty, pat, 
esc)) != MAL_SUCCEED)
                goto bailout;
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list