MonetDB: pythonudf - Adding OFMT_NONE breaks simpleSQL.malC test.

[Mark Raasveldt]

Changeset: 5e6af8f4c2bd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e6af8f4c2bd
Modified Files:
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql_execute.c
        sql/backends/monet5/sql_result.c
Branch: pythonudf
Log Message:

Adding OFMT_NONE breaks simpleSQL.malC test.

However, we need OFMT_NONE for loopback queries, because otherwise the result 
of loopback queries are shipped back to the client.

Todo: fix OFMT_NONE to not break these tests.


diffs (45 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
@@ -3328,9 +3328,9 @@ mvc_scalar_value_wrap(Client cntxt, MalB
        b = cntxt->sqlcontext;
        if (ATOMextern(mtype))
                p = *(ptr *) p;
-       if (b->output_format == OFMT_NONE) {
+       /*if (b->output_format == OFMT_NONE) {
                return MAL_SUCCEED;
-       }
+       }*/
        if (b->out == NULL || mvc_export_value(b, b->out, 1, *tn, *cn, *type, 
*digits, *scale, *eclass, p, mtype, "", "NULL") != SQL_OK)
                throw(SQL, "sql.exportValue", "failed");
        return MAL_SUCCEED;
diff --git a/sql/backends/monet5/sql_execute.c 
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -95,9 +95,9 @@ SQLstatementIntern(Client c, str *expr, 
        be = sql;
        sql = backend_create(m, c);
        sql->output_format = be->output_format;
-       if (!output) {
+       /*if (!output) {
                sql->output_format = OFMT_NONE;
-       }
+       }*/
        m->qc = NULL;
        m->caching = 0;
        m->user_id = m->role_id = USER_MONETDB;
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -1870,9 +1870,9 @@ mvc_export_result(backend *b, stream *s,
                return 0;
        
        /* Proudly supporting SQLstatementIntern's output flag */
-       if (b->output_format == OFMT_NONE) {
+       /*if (b->output_format == OFMT_NONE) {
                return 0;
-       }
+       }*/
        /* we shouldn't have anything else but Q_TABLE here */
        assert(t->query_type == Q_TABLE);
        if (t->tsep)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list