MonetDB: Jan2022 - At the moment throw error message when there ...

[Pedro Ferreira]

Changeset: 3eb67b1b700a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3eb67b1b700a
Modified Files:
        gdk/gdk_strimps.c
        sql/backends/monet5/sql_strimps.c
Branch: Jan2022
Log Message:

At the moment throw error message when there aren't enough values to build 
strimps


diffs (44 lines):

diff --git a/gdk/gdk_strimps.c b/gdk/gdk_strimps.c
--- a/gdk/gdk_strimps.c
+++ b/gdk/gdk_strimps.c
@@ -297,11 +297,13 @@ STRMPbuildHeader(BAT *b, BAT *s, CharPai
        CharPair cp, *cpp;
        struct canditer ci;
        size_t values = 0;
+       bool res;
 
        TRC_DEBUG_IF(ACCELERATOR) t0 = GDKusec();
 
        ncand = canditer_init(&ci, b, s);
        if (ncand == 0) {
+               GDKerror("Not enough distinct values to create strimp index\n");
                return false;
        }
 
@@ -389,7 +391,9 @@ STRMPbuildHeader(BAT *b, BAT *s, CharPai
        GDKfree(hist);
 
        TRC_DEBUG(ACCELERATOR, LLFMT " usec\n", GDKusec() - t0);
-       return values >= STRIMP_HEADER_SIZE;
+       if (!(res = values >= STRIMP_HEADER_SIZE))
+               GDKerror("Not enough distinct values to create strimp index\n");
+       return res;
 }
 
 static bool
diff --git a/sql/backends/monet5/sql_strimps.c 
b/sql/backends/monet5/sql_strimps.c
--- a/sql/backends/monet5/sql_strimps.c
+++ b/sql/backends/monet5/sql_strimps.c
@@ -62,9 +62,10 @@ sql_createstrimps(Client cntxt, MalBlkPt
 {
        BAT *b, *s;
        gdk_return res;
+       str msg = MAL_SUCCEED;
 
-       if (sql_load_bat(cntxt, mb, stk, pci, &b) != MAL_SUCCEED)
-               throw(SQL, "sql.createstrimps", SQLSTATE(HY002) 
OPERATION_FAILED);
+       if ((msg = sql_load_bat(cntxt, mb, stk, pci, &b)) != MAL_SUCCEED)
+               return msg;
 
        if (!(s = BATdense(0, 0, b->batCount))) {
                BBPunfix(b->batCacheid);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list