Changeset: 98f7e12a4fa0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/98f7e12a4fa0
Modified Files:
gdk/gdk_logger.c
monetdb5/mal/mal_profiler.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/kernel/bat5.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_remap.c
tools/mserver/mserver5.c
Branch: Jun2023
Log Message:
Fixed layout.
The indent program sometimes makes weird choices...
diffs (truncated from 456 to 300 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2753,8 +2753,7 @@ internal_log_bat(logger *lg, BAT *b, log
if (b->ttype == TYPE_msk) {
BATiter bi = bat_iterator(b);
if (offset % 32 == 0) {
- if (!mnstr_writeIntArray
- (lg->current->output_log, (int *) ((char *) bi.base
+ offset / 32),
+ if (!mnstr_writeIntArray(lg->current->output_log, (int
*) ((char *) bi.base + offset / 32),
(size_t) ((nr + 31) / 32)))
ok = GDK_FAIL;
} else {
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -418,9 +418,8 @@ prepareMalEvent(Client cntxt, MalBlkPtr
goto
cleanup_and_exit;
}
} else {
- if (!logadd
- (&logbuf,
",\"mode\":\"%s\"",
- (di.transient
? "transient" : "persistent"))) {
+ if (!logadd(&logbuf,
",\"mode\":\"%s\"",
+
(di.transient ? "transient" : "persistent"))) {
BBPunfix(d->batCacheid);
goto
cleanup_and_exit;
}
@@ -514,8 +513,7 @@ prepareMalEvent(Client cntxt, MalBlkPtr
if (!ok)
goto cleanup_and_exit;
}
- if (!logadd
- (&logbuf, ",\"eol\":%d",
getVarEolife(mb, getArg(pci, j))))
+ if (!logadd(&logbuf, ",\"eol\":%d",
getVarEolife(mb, getArg(pci, j))))
goto cleanup_and_exit;
// if (!logadd(&logbuf, ",\"fixed\":%d",
isVarFixed(mb,getArg(pci,j)))) return NULL;
if (!logadd(&logbuf, "}"))
diff --git a/monetdb5/modules/atoms/mtime.h b/monetdb5/modules/atoms/mtime.h
--- a/monetdb5/modules/atoms/mtime.h
+++ b/monetdb5/modules/atoms/mtime.h
@@ -48,8 +48,7 @@ date_sub_msec_interval(date *ret, date d
*ret = date_nil;
return MAL_SUCCEED;
}
- if (is_date_nil
- ((*ret = date_add_day(d, (int) (-ms / (24 * 60 * 60 * 1000))))))
+ if (is_date_nil((*ret = date_add_day(d, (int) (-ms / (24 * 60 * 60 *
1000))))))
throw(MAL, "mtime.date_sub_msec_interval",
SQLSTATE(22003) "overflow in calculation");
return MAL_SUCCEED;
@@ -62,8 +61,7 @@ date_add_msec_interval(date *ret, date d
*ret = date_nil;
return MAL_SUCCEED;
}
- if (is_date_nil
- ((*ret = date_add_day(d, (int) (ms / (24 * 60 * 60 * 1000))))))
+ if (is_date_nil((*ret = date_add_day(d, (int) (ms / (24 * 60 * 60 *
1000))))))
throw(MAL, "mtime.date_add_msec_interval",
SQLSTATE(22003) "overflow in calculation");
return MAL_SUCCEED;
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
@@ -664,10 +664,11 @@ HASHinfo(BAT *bk, BAT *bv, Hash *h, str
for (i = 0; i < COLLISION + 1; i++)
if (cnt[i]) {
- if (BUNappend
- (bk,
- pre(s, local_utoa(i ? (((size_t) 1) << (i -
1)) : 0, buf),
- prebuf), false) != GDK_SUCCEED
+ if (BUNappend(bk,
+ pre(s, local_utoa(i ?
(((size_t) 1) << (i - 1)) : 0,
+
buf),
+ prebuf),
+ false) != GDK_SUCCEED
|| BUNappend(bv, local_utoa((size_t) cnt[i],
buf),
false) != GDK_SUCCEED)
return GDK_FAIL;
diff --git a/monetdb5/modules/mal/bbp.c b/monetdb5/modules/mal/bbp.c
--- a/monetdb5/modules/mal/bbp.c
+++ b/monetdb5/modules/mal/bbp.c
@@ -245,11 +245,7 @@ CMDbbpDirty(bat *ret)
if (BBP_logical(i) && (BBP_refs(i) || BBP_lrefs(i))) {
BAT *bn = BBP_cache(i);
- if (BUNappend
- (b,
- bn ? BATdirty(bn) ? "dirty" :
DELTAdirty(bn) ? "diffs" :
- "clean" : (BBP_status(i) & BBPSWAPPED)
? "diffs" : "clean",
- false) != GDK_SUCCEED) {
+ if (BUNappend(b, bn ? BATdirty(bn) ? "dirty" :
DELTAdirty(bn) ? "diffs" : "clean" : (BBP_status(i) & BBPSWAPPED) ? "diffs" :
"clean", false) != GDK_SUCCEED) {
BBPunlock();
BBPreclaim(b);
throw(MAL, "catalog.bbpDirty",
diff --git a/monetdb5/modules/mal/calc.c b/monetdb5/modules/mal/calc.c
--- a/monetdb5/modules/mal/calc.c
+++ b/monetdb5/modules/mal/calc.c
@@ -42,9 +42,9 @@ CMDvarSUB(Client cntxt, MalBlkPtr mb, Ma
(void) cntxt;
(void) mb;
- if (VARcalcsub
- (&stk->stk[getArg(pci, 0)], &stk->stk[getArg(pci, 1)],
- &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
+ if (VARcalcsub(&stk->stk[getArg(pci, 0)],
+ &stk->stk[getArg(pci, 1)],
+ &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
return mythrow(MAL, "calc.-", OPERATION_FAILED);
return MAL_SUCCEED;
}
@@ -56,9 +56,9 @@ CMDvarADD(Client cntxt, MalBlkPtr mb, Ma
(void) cntxt;
(void) mb;
- if (VARcalcadd
- (&stk->stk[getArg(pci, 0)], &stk->stk[getArg(pci, 1)],
- &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
+ if (VARcalcadd(&stk->stk[getArg(pci, 0)],
+ &stk->stk[getArg(pci, 1)],
+ &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
return mythrow(MAL, "calc.+", OPERATION_FAILED);
return MAL_SUCCEED;
}
@@ -114,9 +114,9 @@ CMDvarMUL(Client cntxt, MalBlkPtr mb, Ma
(void) cntxt;
(void) mb;
- if (VARcalcmul
- (&stk->stk[getArg(pci, 0)], &stk->stk[getArg(pci, 1)],
- &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
+ if (VARcalcmul(&stk->stk[getArg(pci, 0)],
+ &stk->stk[getArg(pci, 1)],
+ &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
return mythrow(MAL, "calc.*", OPERATION_FAILED);
return MAL_SUCCEED;
}
@@ -128,9 +128,9 @@ CMDvarDIV(Client cntxt, MalBlkPtr mb, Ma
(void) cntxt;
(void) mb;
- if (VARcalcdiv
- (&stk->stk[getArg(pci, 0)], &stk->stk[getArg(pci, 1)],
- &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
+ if (VARcalcdiv(&stk->stk[getArg(pci, 0)],
+ &stk->stk[getArg(pci, 1)],
+ &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
return mythrow(MAL, "calc./", OPERATION_FAILED);
return MAL_SUCCEED;
}
@@ -142,9 +142,9 @@ CMDvarMOD(Client cntxt, MalBlkPtr mb, Ma
(void) cntxt;
(void) mb;
- if (VARcalcmod
- (&stk->stk[getArg(pci, 0)], &stk->stk[getArg(pci, 1)],
- &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
+ if (VARcalcmod(&stk->stk[getArg(pci, 0)],
+ &stk->stk[getArg(pci, 1)],
+ &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
return mythrow(MAL, "calc.%", OPERATION_FAILED);
return MAL_SUCCEED;
}
@@ -156,9 +156,9 @@ CMDvarLSH(Client cntxt, MalBlkPtr mb, Ma
(void) cntxt;
(void) mb;
- if (VARcalclsh
- (&stk->stk[getArg(pci, 0)], &stk->stk[getArg(pci, 1)],
- &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
+ if (VARcalclsh(&stk->stk[getArg(pci, 0)],
+ &stk->stk[getArg(pci, 1)],
+ &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
return mythrow(MAL, "calc.<<", OPERATION_FAILED);
return MAL_SUCCEED;
}
@@ -170,9 +170,9 @@ CMDvarRSH(Client cntxt, MalBlkPtr mb, Ma
(void) cntxt;
(void) mb;
- if (VARcalcrsh
- (&stk->stk[getArg(pci, 0)], &stk->stk[getArg(pci, 1)],
- &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
+ if (VARcalcrsh(&stk->stk[getArg(pci, 0)],
+ &stk->stk[getArg(pci, 1)],
+ &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
return mythrow(MAL, "calc.>>", OPERATION_FAILED);
return MAL_SUCCEED;
}
@@ -184,9 +184,9 @@ CMDvarAND(Client cntxt, MalBlkPtr mb, Ma
(void) cntxt;
(void) mb;
- if (VARcalcand
- (&stk->stk[getArg(pci, 0)], &stk->stk[getArg(pci, 1)],
- &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
+ if (VARcalcand(&stk->stk[getArg(pci, 0)],
+ &stk->stk[getArg(pci, 1)],
+ &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
return mythrow(MAL, "calc.and", OPERATION_FAILED);
return MAL_SUCCEED;
}
@@ -198,9 +198,9 @@ CMDvarOR(Client cntxt, MalBlkPtr mb, Mal
(void) cntxt;
(void) mb;
- if (VARcalcor
- (&stk->stk[getArg(pci, 0)], &stk->stk[getArg(pci, 1)],
- &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
+ if (VARcalcor(&stk->stk[getArg(pci, 0)],
+ &stk->stk[getArg(pci, 1)],
+ &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
return mythrow(MAL, "calc.or", OPERATION_FAILED);
return MAL_SUCCEED;
}
@@ -212,9 +212,9 @@ CMDvarXOR(Client cntxt, MalBlkPtr mb, Ma
(void) cntxt;
(void) mb;
- if (VARcalcxor
- (&stk->stk[getArg(pci, 0)], &stk->stk[getArg(pci, 1)],
- &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
+ if (VARcalcxor(&stk->stk[getArg(pci, 0)],
+ &stk->stk[getArg(pci, 1)],
+ &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
return mythrow(MAL, "calc.xor", OPERATION_FAILED);
return MAL_SUCCEED;
}
@@ -226,9 +226,9 @@ CMDvarLT(Client cntxt, MalBlkPtr mb, Mal
(void) cntxt;
(void) mb;
- if (VARcalclt
- (&stk->stk[getArg(pci, 0)], &stk->stk[getArg(pci, 1)],
- &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
+ if (VARcalclt(&stk->stk[getArg(pci, 0)],
+ &stk->stk[getArg(pci, 1)],
+ &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
return mythrow(MAL, "calc.<", OPERATION_FAILED);
return MAL_SUCCEED;
}
@@ -240,9 +240,9 @@ CMDvarLE(Client cntxt, MalBlkPtr mb, Mal
(void) cntxt;
(void) mb;
- if (VARcalcle
- (&stk->stk[getArg(pci, 0)], &stk->stk[getArg(pci, 1)],
- &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
+ if (VARcalcle(&stk->stk[getArg(pci, 0)],
+ &stk->stk[getArg(pci, 1)],
+ &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
return mythrow(MAL, "calc.<=", OPERATION_FAILED);
return MAL_SUCCEED;
}
@@ -254,9 +254,9 @@ CMDvarGT(Client cntxt, MalBlkPtr mb, Mal
(void) cntxt;
(void) mb;
- if (VARcalcgt
- (&stk->stk[getArg(pci, 0)], &stk->stk[getArg(pci, 1)],
- &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
+ if (VARcalcgt(&stk->stk[getArg(pci, 0)],
+ &stk->stk[getArg(pci, 1)],
+ &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
return mythrow(MAL, "calc.>", OPERATION_FAILED);
return MAL_SUCCEED;
}
@@ -301,8 +301,7 @@ CMDvarNE(Client cntxt, MalBlkPtr mb, Mal
if (VARcalcne(&stk->stk[getArg(pci, 0)],
&stk->stk[getArg(pci, 1)],
&stk->stk[getArg(pci, 2)],
- pci->argc == 3 ? false :
*getArgReference_bit(stk, pci, 3)
- ) != GDK_SUCCEED)
+ pci->argc == 3 ? false :
*getArgReference_bit(stk, pci, 3)) != GDK_SUCCEED)
return mythrow(MAL, "calc.!=", OPERATION_FAILED);
return MAL_SUCCEED;
}
@@ -314,9 +313,9 @@ CMDvarCMP(Client cntxt, MalBlkPtr mb, Ma
(void) cntxt;
(void) mb;
- if (VARcalccmp
- (&stk->stk[getArg(pci, 0)], &stk->stk[getArg(pci, 1)],
- &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
+ if (VARcalccmp(&stk->stk[getArg(pci, 0)],
+ &stk->stk[getArg(pci, 1)],
+ &stk->stk[getArg(pci, 2)]) != GDK_SUCCEED)
return mythrow(MAL, "calc.cmp", OPERATION_FAILED);
return MAL_SUCCEED;
}
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -1866,9 +1866,8 @@ SERVERmapi_rpc_single_row(Client cntxt,
case TYPE_flt:
case TYPE_dbl:
case TYPE_str:
- if (SERVERfieldAnalysis
- (fld, getVarType(mb, getArg(pci, j)),
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
