Changeset: 2bc0520a9aad for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2bc0520a9aad
Modified Files:
        monetdb5/modules/atoms/uuid.c
Branch: Jan2022
Log Message:

Clean possible generated GDK error from atomFromStr call


diffs (20 lines):

diff --git a/monetdb5/modules/atoms/uuid.c b/monetdb5/modules/atoms/uuid.c
--- a/monetdb5/modules/atoms/uuid.c
+++ b/monetdb5/modules/atoms/uuid.c
@@ -155,6 +155,8 @@ static str
 UUIDisaUUID(bit *retval, str *s)
 {
        *retval = isaUUID(*s);
+       if (*retval == false)
+               GDKclrerr();
        return MAL_SUCCEED;
 }
 
@@ -181,6 +183,7 @@ UUIDisaUUID_bulk(bat *ret, const bat *bi
        for (BUN p = 0 ; p < q ; p++)
                dst[p] = isaUUID(BUNtvar(bi, p));
        bat_iterator_end(&bi);
+       GDKclrerr(); /* Not interested in atomFromStr errors */
        BATsetcount(bn, q);
        bn->tnonil = b->tnonil;
        bn->tnil = b->tnil;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to