MonetDB: Jul2017 - Simplify the error message.

[martin kersten]

Changeset: 41cd8c917494 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=41cd8c917494
Modified Files:
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql.mal
Branch: Jul2017
Log Message:

Simplify the error message.


diffs (43 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -2783,11 +2783,8 @@ zero_or_one(ptr ret, const bat *bid)
                BATiter bi = bat_iterator(b);
                p = BUNtail(bi, 0);
        } else {
-               char buf[BUFSIZ];
-
                p = NULL;
-               snprintf(buf, BUFSIZ, "21000!cardinality violation (" BUNFMT 
">1)", c);
-               throw(SQL, "zero_or_one", "%s", buf);
+               throw(SQL, "zero_or_one", "21000!cardinality violation");
        }
        _s = ATOMsize(ATOMtype(b->ttype));
        if (ATOMextern(b->ttype)) {
diff --git a/sql/backends/monet5/sql.mal b/sql/backends/monet5/sql.mal
--- a/sql/backends/monet5/sql.mal
+++ b/sql/backends/monet5/sql.mal
@@ -339,10 +339,7 @@ inline function sql.subzero_or_one( b:ba
        c01 := calc.not(c0);
        c1 := calc.>(m,1:lng);
        c11 := calc.and(c01,c1);
-       ms := calc.str(m); 
-       msg := str.+("21000!zero_or_one: cardinality violation (", ms);
-       msg1 := str.+(msg, ">1)");
-       sql.assert(c11, msg1);
+       sql.assert(c11, 21000!zero_or_one: cardinality violation");
        return zero_or_one := b;
 end sql.subzero_or_one;
 
@@ -358,10 +355,7 @@ inline function sql.all( b:bat[:any_1], 
        c01 := calc.not(c0);
        c1 := calc.>(m,1:lng);
        c11 := calc.and(c01,c1);
-       ms := calc.str(m); 
-       msg := str.+("21000!zero_or_one: cardinality violation (", ms);
-       msg1 := str.+(msg, ">1)");
-       sql.assert(c11, msg1);
+       sql.assert(c11, "21000!zero_or_one: cardinality violation ");
        return all := b;
 end sql.all;
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list