MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

Changeset: 1b7f20958b89 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1b7f20958b89
Modified Files:
        
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (45 lines):

diff -r 98bb35d25980 -r 1b7f20958b89 MonetDB5/src/modules/mal/mat.mx
--- a/MonetDB5/src/modules/mal/mat.mx   Thu Oct 07 15:19:30 2010 +0200
+++ b/MonetDB5/src/modules/mal/mat.mx   Thu Oct 07 16:14:43 2010 +0200
@@ -545,15 +545,15 @@
 
        if (ATOMstorage(bats[0]->ttype) <= TYPE_void) {
                //error
-       } else if (ATOMstorage(bats[0]->ttype) == TYPE_str) {
+       } else if (ATOMvarsized(bats[0]->ttype)) {
                res = MATproject_any(map, bats, len);
-       } else if (ATOMsize(bats[0]->ttype) == 1) {
+       } else if (ATOMsize(bats[0]->ttype) == sizeof(bte)) {
                res = MATproject_bte(map, bats, len);
-       } else if (ATOMsize(bats[0]->ttype) == 2) {
+       } else if (ATOMsize(bats[0]->ttype) == sizeof(sht)) {
                res = MATproject_sht(map, bats, len);
-       } else if (ATOMsize(bats[0]->ttype) == 4) {
+       } else if (ATOMsize(bats[0]->ttype) == sizeof(int)) {
                res = MATproject_int(map, bats, len);
-       } else if (ATOMsize(bats[0]->ttype) == 8) {
+       } else if (ATOMsize(bats[0]->ttype) == sizeof(lng)) {
                res = MATproject_lng(map, bats, len);
        } else {
                res = MATproject_any(map, bats, len);
@@ -831,15 +831,15 @@
 
        if (ATOMstorage(bats[0]->ttype) <= TYPE_void) {
                //error
-       } else if (ATOMstorage(bats[0]->ttype) == TYPE_str) {
+       } else if (ATOMvarsized(bats[0]->ttype)) {
                res = MATsort_any(&map, bats, len, pcnt, rev);
-       } else if (ATOMsize(bats[0]->ttype) == 1) {
+       } else if (ATOMsize(bats[0]->ttype) == sizeof(bte)) {
                res = MATsort_bte(&map, bats, len, pcnt, rev);
-       } else if (ATOMsize(bats[0]->ttype) == 2) {
+       } else if (ATOMsize(bats[0]->ttype) == sizeof(sht)) {
                res = MATsort_sht(&map, bats, len, pcnt, rev);
-       } else if (ATOMsize(bats[0]->ttype) == 4) {
+       } else if (ATOMsize(bats[0]->ttype) == sizeof(int)) {
                res = MATsort_int(&map, bats, len, pcnt, rev);
-       } else if (ATOMsize(bats[0]->ttype) == 8) {
+       } else if (ATOMsize(bats[0]->ttype) == sizeof(lng)) {
                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