MonetDB: Oct2010 - Atom types are *not* ordered on size.

[Sjoerd Mullender]

Changeset: f608235799df for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f608235799df
Modified Files:
        MonetDB5/src/modules/mal/mat.mx
Branch: Oct2010
Log Message:

Atom types are *not* ordered on size.


diffs (43 lines):

diff -r 3bf4267bcb1e -r f608235799df MonetDB5/src/modules/mal/mat.mx
--- a/MonetDB5/src/modules/mal/mat.mx   Thu Oct 07 15:17:56 2010 +0200
+++ b/MonetDB5/src/modules/mal/mat.mx   Thu Oct 07 15:19:01 2010 +0200
@@ -545,13 +545,15 @@
 
        if (ATOMstorage(bats[0]->ttype) <= TYPE_void) {
                //error
-       } else if (ATOMstorage(bats[0]->ttype) <= TYPE_bte) {
+       } else if (ATOMstorage(bats[0]->ttype) == TYPE_str) {
+               res = MATproject_any(map, bats, len);
+       } else if (ATOMsize(bats[0]->ttype) == 1) {
                res = MATproject_bte(map, bats, len);
-       } else if (ATOMstorage(bats[0]->ttype) <= TYPE_sht) {
+       } else if (ATOMsize(bats[0]->ttype) == 2) {
                res = MATproject_sht(map, bats, len);
-       } else if (ATOMstorage(bats[0]->ttype) <= TYPE_int) {
+       } else if (ATOMsize(bats[0]->ttype) == 4) {
                res = MATproject_int(map, bats, len);
-       } else if (ATOMstorage(bats[0]->ttype) <= TYPE_lng) {
+       } else if (ATOMsize(bats[0]->ttype) == 8) {
                res = MATproject_lng(map, bats, len);
        } else {
                res = MATproject_any(map, bats, len);
@@ -829,13 +831,15 @@
 
        if (ATOMstorage(bats[0]->ttype) <= TYPE_void) {
                //error
-       } else if (ATOMstorage(bats[0]->ttype) <= TYPE_bte) {
+       } else if (ATOMstorage(bats[0]->ttype) == TYPE_str) {
+               res = MATsort_any(&map, bats, len, pcnt, rev);
+       } else if (ATOMsize(bats[0]->ttype) == 1) {
                res = MATsort_bte(&map, bats, len, pcnt, rev);
-       } else if (ATOMstorage(bats[0]->ttype) <= TYPE_sht) {
+       } else if (ATOMsize(bats[0]->ttype) == 2) {
                res = MATsort_sht(&map, bats, len, pcnt, rev);
-       } else if (ATOMstorage(bats[0]->ttype) <= TYPE_int) {
+       } else if (ATOMsize(bats[0]->ttype) == 4) {
                res = MATsort_int(&map, bats, len, pcnt, rev);
-       } else if (ATOMstorage(bats[0]->ttype) <= TYPE_lng) {
+       } else if (ATOMsize(bats[0]->ttype) == 8) {
                res = MATsort_lng(&map, bats, len, pcnt, rev);
        } else {
                res = MATsort_any(&map, bats, len, pcnt, rev);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list