MonetDB: resultset - Nil handling and fix frStr api

[Martin Kersten]

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

Nil handling and fix frStr api
Avoid MonetDB nils to be seen as SQL NULL.


diffs (79 lines):

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
@@ -476,14 +476,12 @@ bat_max_hgelength(BAT *b)
        } while (0)
 
 static void *
-dec_frstr(Column *c, int type, const char *s, const char *e, char quote)
+dec_frstr(Column *c, int type, const char *s)
 {
        /* support dec map to bte, sht, int and lng */
-       (void) e;
-       (void) quote;
-       if (s == e) {
+       if( strcmp(s,"nil")== 0)
                return NULL;
-       } else if (type == TYPE_bte) {
+       if (type == TYPE_bte) {
                DEC_FRSTR(bte);
        } else if (type == TYPE_sht) {
                DEC_FRSTR(sht);
@@ -500,7 +498,7 @@ dec_frstr(Column *c, int type, const cha
 }
 
 static void *
-sec_frstr(Column *c, int type, const char *s, const char *e, char quote)
+sec_frstr(Column *c, int type, const char *s)
 {
        /* read a sec_interval value
         * this knows that the stored scale is always 3 */
@@ -510,12 +508,10 @@ sec_frstr(Column *c, int type, const cha
 
        (void) c;
        (void) type;
-       (void) quote;
        assert(type == TYPE_lng);
 
-       if (s == e)
+       if( strcmp(s,"nil")== 0)
                return NULL;
-
        if (*s == '-') {
                neg = 1;
                s++;
@@ -561,14 +557,22 @@ sec_frstr(Column *c, int type, const cha
        return (void *) r;
 }
 
+/* Literal parsing for SQL all pass through this routine */
 static void *
-_ASCIIadt_frStr(Column *c, int type, const char *s, const char *e, char quote)
+_ASCIIadt_frStr(Column *c, int type, const char *s)
 {
        int len;
-       (void) quote;
+       const char *e; 
+
+       if( strcmp(s,"nil")== 0)
+               return NULL;
        if (type == TYPE_str) {
                sql_column *col = (sql_column *) c->extra;
-               int len = (int) (e - s + 1);    /* 64bit: should check for 
overflow */
+               int len;
+
+               for (e = s; *e; e++) ;
+               len = (int) (e - s + 1);        /* 64bit: should check for 
overflow */
+
                /* or shouldn't len rather be ssize_t, here? */
 
                if (c->len < len) {
@@ -603,7 +607,7 @@ static void *
        len = (*BATatoms[type].atomFromStr) (s, &c->len, (ptr) &c->data);
        if (len < 0)
                return NULL;
-       if (len == 0 || len != e - s) {
+       if (len == 0 || s[len]) {
                /* decimals can be converted to integers when *.000 */
                if (s[len++] == '.')
                        switch (type) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list