Changeset: ae381ff32035 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ae381ff32035
Modified Files:
MonetDB5/src/modules/mal/mat.mx
Branch: Oct2010
Log Message:
Fix for previous fix.
All varsized atoms need to treated specially.
Also, use symbolic names instead of numbers.
diffs (45 lines):
diff -r f608235799df -r ae381ff32035 MonetDB5/src/modules/mal/mat.mx
--- a/MonetDB5/src/modules/mal/mat.mx Thu Oct 07 15:19:01 2010 +0200
+++ b/MonetDB5/src/modules/mal/mat.mx Thu Oct 07 16:14:32 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
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
