MonetDB: leftmart - Use base types, not storage types.

[Sjoerd Mullender]

Changeset: af43a153c7b4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af43a153c7b4
Modified Files:
        monetdb5/modules/mal/orderidx.c
Branch: leftmart
Log Message:

Use base types, not storage types.


diffs (26 lines):

diff --git a/monetdb5/modules/mal/orderidx.c b/monetdb5/modules/mal/orderidx.c
--- a/monetdb5/modules/mal/orderidx.c
+++ b/monetdb5/modules/mal/orderidx.c
@@ -267,7 +267,7 @@ OIDXmerge(Client cntxt, MalBlkPtr mb, Ma
        assert(BAThdense(b));   /* assert void headed */
        assert(b->torderidx == NULL);
 
-       switch (ATOMstorage(b->ttype)) {
+       switch (ATOMbasetype(b->ttype)) {
        case TYPE_bte:
        case TYPE_sht:
        case TYPE_int:
@@ -278,11 +278,11 @@ OIDXmerge(Client cntxt, MalBlkPtr mb, Ma
        case TYPE_flt:
        case TYPE_dbl:
                break;
+       case TYPE_str:
+               /* TODO: support strings etc. */
        case TYPE_void:
-       case TYPE_str:
        case TYPE_ptr:
        default:
-               /* TODO: support strings, date, timestamps etc. */
                BBPunfix(bid);
                throw(MAL, "bat.orderidx", TYPE_NOT_SUPPORTED);
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list