MonetDB: default - Use the right macro and cleanup

[Pedro Ferreira]

Changeset: 51b23383f673 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/51b23383f673
Modified Files:
        monetdb5/modules/mal/batExtensions.c
        monetdb5/modules/mal/mal_io.c
        monetdb5/modules/mal/remote.c
        sql/server/sql_atom.c
Branch: default
Log Message:

Use the right macro and cleanup


diffs (61 lines):

diff --git a/monetdb5/modules/mal/batExtensions.c 
b/monetdb5/modules/mal/batExtensions.c
--- a/monetdb5/modules/mal/batExtensions.c
+++ b/monetdb5/modules/mal/batExtensions.c
@@ -100,7 +100,7 @@ CMDBATsingle(Client cntxt, MalBlkPtr mb,
        if( b == 0)
                throw(MAL,"bat.single", SQLSTATE(HY013) MAL_MALLOC_FAIL);
        if (ATOMextern(b->ttype))
-               u = (ptr) *(str *)u;
+               u = (ptr) *(ptr *)u;
        if (BUNappend(b, u, false) != GDK_SUCCEED) {
                BBPreclaim(b);
                throw(MAL, "bat.single", SQLSTATE(HY013) MAL_MALLOC_FAIL);
diff --git a/monetdb5/modules/mal/mal_io.c b/monetdb5/modules/mal/mal_io.c
--- a/monetdb5/modules/mal/mal_io.c
+++ b/monetdb5/modules/mal/mal_io.c
@@ -120,8 +120,8 @@ IOprintBoth(Client cntxt, MalBlkPtr mb, 
        if (hd)
                mnstr_printf(fp, "%s", hd);
 
-       if (ATOMvarsized(tpe))
-               ATOMprint(tpe, *(str *) val, fp);
+       if (ATOMextern(tpe))
+               ATOMprint(tpe, *(ptr *) val, fp);
        else
                ATOMprint(tpe, val, fp);
 
diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -1102,7 +1102,7 @@ static str RMTput(Client cntxt, MalBlkPt
                int (*atomcmp)(const void *, const void *) = ATOMcompare(type);
 
                if (ATOMextern(type))
-                       p = *(str *)value;
+                       p = *(ptr *)value;
 
                val = ATOMformat(type, p);
                if (val == NULL) {
diff --git a/sql/server/sql_atom.c b/sql/server/sql_atom.c
--- a/sql/server/sql_atom.c
+++ b/sql/server/sql_atom.c
@@ -348,7 +348,6 @@ char *
 atom2string(sql_allocator *sa, atom *a)
 {
        char buf[BUFSIZ], *p = NULL;
-       void *v;
 
        if (a->isnull)
                return sa_strdup(sa, "NULL");
@@ -390,10 +389,7 @@ atom2string(sql_allocator *sa, atom *a)
                assert(a->data.val.sval);
                return sa_strdup(sa, a->data.val.sval);
        default:
-               v = &a->data.val.ival;
-               if (ATOMvarsized(a->data.vtype))
-                       v = a->data.val.pval;
-               if ((p = ATOMformat(a->data.vtype, v)) == NULL) {
+               if ((p = ATOMformat(a->data.vtype, VALget(&a->data))) == NULL) {
                        snprintf(buf, BUFSIZ, "atom2string(TYPE_%d) not 
implemented", a->data.vtype);
                } else {
                         char *r = sa_strdup(sa, p);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list