MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

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

Merge with Oct2010 branch.


diffs (55 lines):

diff -r ef4ce53d89cf -r 98bb35d25980 MonetDB/src/common/stream.mx
--- a/MonetDB/src/common/stream.mx      Thu Oct 07 10:53:25 2010 +0200
+++ b/MonetDB/src/common/stream.mx      Thu Oct 07 15:19:30 2010 +0200
@@ -1680,7 +1680,7 @@
        errno = 0;
 #if defined(SO_DOMAIN)
        {
-               socklen_t len;
+               socklen_t len = (socklen_t) sizeof(domain);
                getsockopt(sock, SOL_SOCKET, SO_DOMAIN, (void *) &domain, &len);
        }
 #endif
diff -r ef4ce53d89cf -r 98bb35d25980 MonetDB5/src/modules/mal/mat.mx
--- a/MonetDB5/src/modules/mal/mat.mx   Thu Oct 07 10:53:25 2010 +0200
+++ b/MonetDB5/src/modules/mal/mat.mx   Thu Oct 07 15:19:30 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