MonetDB: resultset - Added missing typos

[Martin Kersten]

Changeset: aec94c8ae417 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aec94c8ae417
Modified Files:
        monetdb5/modules/atoms/mtime.c
        monetdb5/modules/kernel/bat5.c
        monetdb5/modules/mal/tablet.c
Branch: resultset
Log Message:

Added missing typos


diffs (94 lines):

diff --git a/monetdb5/modules/atoms/mtime.c b/monetdb5/modules/atoms/mtime.c
--- a/monetdb5/modules/atoms/mtime.c
+++ b/monetdb5/modules/atoms/mtime.c
@@ -2660,23 +2660,6 @@ MTIMEtimestamplng(timestamp *ret, const 
 }
 
 str
-MTIMEtimestamplng(timestamp *ret, const lng *sec)
-{
-       timestamp t;
-       lng l;
-       str e;
-
-       if (*sec == lng_nil) {
-               *ret = *timestamp_nil;
-               return MAL_SUCCEED;
-       }
-       if ((e = MTIMEunix_epoch(&t)) != MAL_SUCCEED)
-               return e;
-       l = ((lng) *sec);
-       return MTIMEtimestamp_add(ret, &t, &l);
-}
-
-str
 MTIMEtimestamp_bulk(bat *ret, bat *bid)
 {
        BAT *b, *bn;
diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c
--- a/monetdb5/modules/kernel/bat5.c
+++ b/monetdb5/modules/kernel/bat5.c
@@ -561,14 +561,14 @@ BKCorder(bat *r, const bat *bid)
                BBPunfix(b->batCacheid);
                throw(MAL, "bat.order", GDK_EXCEPTION);
        }
-       BBPkeepref(*r = n->batCacheid);
+       BBPkeepref(*r = b->batCacheid);
        return MAL_SUCCEED;
 }
 
 str
 BKCorder_rev(bat *r, const bat *bid)
 {
-       BAT *bn, *b;
+       BAT *b;
 
        if ((b = BATdescriptor(*bid)) == NULL)
                throw(MAL, "bat.order_rev", RUNTIME_OBJECT_MISSING);
@@ -732,7 +732,7 @@ BKCreplace_bat(bat *r, const bat *bid, c
        }
        ret = BATreplace(b, s, 0);
        BBPunfix(s->batCacheid);
-       if ret == GDK_FAIL)
+       if (ret == GDK_FAIL){
                BBPunfix(b->batCacheid);
                throw(MAL, "bat.replace", GDK_EXCEPTION);
        }
@@ -898,6 +898,7 @@ char *
 BKCappend_wrap(bat *r, const bat *bid, const bat *uid)
 {
        BAT *b, *u;
+       gdk_return ret;
 
        if ((b = BATdescriptor(*bid)) == NULL)
                throw(MAL, "bat.append", RUNTIME_OBJECT_MISSING);
@@ -1315,7 +1316,7 @@ BKCsetAccess(bat *res, const bat *bid, c
                *res = 0;
                throw(MAL, "bat.setAccess", ILLEGAL_ARGUMENT " Got %c" " 
expected 'r','a', or 'w'", *param[0]);
        }
-       if (setaccess(b, m)) == GDK_FA(IL)
+       if (setaccess(b, m) == GDK_FAIL)
                throw(MAL, "bat.setAccess", OPERATION_FAILED);
        BBPkeepref(*res = b->batCacheid);
        return MAL_SUCCEED;
@@ -1641,7 +1642,7 @@ BKCsetHash(bit *ret, const bat *bid)
 str
 BKCsetImprints(bit *ret, const bat *bid)
 {
-       BAT *b, *bn;
+       BAT *b;
 
        (void) ret;
        if ((b = BATdescriptor(*bid)) == NULL) {
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -854,7 +854,7 @@ SQLworker_column(READERtask *task, int c
        /* watch out for concurrent threads */
        MT_lock_set(&mal_copyLock, "tablet insert value");
        if (BATcapacity(fmt[col].c) < BATcount(fmt[col].c) + 
task->top[task->cur]) {
-               if ((fmt[col].c = BATextend(fmt[col].c, BATgrows(fmt[col].c) + 
task->limit)) == GDK_FAIL) {
+               if (BATextend(fmt[col].c, BATgrows(fmt[col].c) + task->limit) 
== GDK_FAIL) {
                        tablet_error(task, lng_nil, col, "Failed to extend the 
BAT, perhaps disk full\n","SQLworker_column");
                        MT_lock_unset(&mal_copyLock, "tablet insert value");
                        return -1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list