Changeset: 171b7504b0ee for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/171b7504b0ee Modified Files: gdk/gdk_analytic_func.c gdk/gdk_analytic_statistics.c gdk/gdk_logger.c gdk/gdk_string.c sql/backends/monet5/sql_rank.c Branch: Dec2025 Log Message:
Change "silly" use of for.
diffs (195 lines):
diff --git a/gdk/gdk_analytic_func.c b/gdk/gdk_analytic_func.c
--- a/gdk/gdk_analytic_func.c
+++ b/gdk/gdk_analytic_func.c
@@ -929,7 +929,7 @@ GDKanalyticallead(BAT *b, BAT *p, BUN le
#define ANALYTICAL_MIN_MAX_CALC_FIXED_UNBOUNDED_TILL_CURRENT_ROW(TPE, MIN_MAX)
\
do { \
TPE curval = TPE##_nil; \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
if (!is_##TPE##_nil(bp[k])) { \
@@ -1036,7 +1036,7 @@ GDKanalyticallead(BAT *b, BAT *p, BUN le
do { \
const void *curval = nil; \
if (ATOMvarsized(tpe)) { \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
const void *next = BUNtvar(bi, k); \
@@ -1054,7 +1054,7 @@ GDKanalyticallead(BAT *b, BAT *p, BUN le
has_nils |= atomeq(curval, nil); \
} \
} else { \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
const void *next = BUNtloc(bi, k); \
@@ -1367,7 +1367,7 @@ ANALYTICAL_MIN_MAX(max, MAX, <)
do { \
curval = 0; \
if (count_all) { \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
k++; \
@@ -1377,7 +1377,7 @@ ANALYTICAL_MIN_MAX(max, MAX, <)
rb[j] = curval; \
} \
} else { \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
curval += !is_##TPE##_nil(bp[k]); \
@@ -1489,7 +1489,7 @@ ANALYTICAL_MIN_MAX(max, MAX, <)
do { \
curval = 0; \
if (count_all) { \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
k++; \
@@ -1499,7 +1499,7 @@ ANALYTICAL_MIN_MAX(max, MAX, <)
rb[j] = curval; \
} \
} else { \
- for (; k < i; ) { \
+ while (k < i) { \
j = k; \
do { \
curval += !atomeq(BUNtail(bi, k), nil);
\
@@ -1733,7 +1733,7 @@ cleanup:
#define ANALYTICAL_SUM_IMP_NUM_UNBOUNDED_TILL_CURRENT_ROW(TPE1, TPE2) \
do { \
TPE2 curval = TPE2##_nil; \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
if (!is_##TPE1##_nil(bp[k])) { \
@@ -2092,7 +2092,7 @@ nosupport:
#define ANALYTICAL_PROD_CALC_NUM_UNBOUNDED_TILL_CURRENT_ROW(TPE1, TPE2, TPE3) \
do { \
TPE2 curval = TPE2##_nil; \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
PROD_NUM(TPE1, TPE2, TPE3, bp[k]); \
@@ -2199,7 +2199,7 @@ nosupport:
#define ANALYTICAL_PROD_CALC_NUM_LIMIT_UNBOUNDED_TILL_CURRENT_ROW(TPE1, TPE2,
REAL_IMP) \
do { \
TPE2 curval = TPE2##_nil; \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
PROD_NUM_LIMIT(TPE1, TPE2, REAL_IMP, bp[k]); \
@@ -2295,7 +2295,7 @@ nosupport:
#define ANALYTICAL_PROD_CALC_FP_UNBOUNDED_TILL_CURRENT_ROW(TPE1, TPE2, ARG3)
/* ARG3 is ignored here */ \
do { \
TPE2 curval = TPE2##_nil; \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
PROD_FP(TPE1, TPE2, bp[k]); \
diff --git a/gdk/gdk_analytic_statistics.c b/gdk/gdk_analytic_statistics.c
--- a/gdk/gdk_analytic_statistics.c
+++ b/gdk/gdk_analytic_statistics.c
@@ -58,7 +58,7 @@
do { \
TPE a = 0; \
dbl curval = dbl_nil; \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
ANALYTICAL_AVERAGE_CALC_NUM_STEP1(TPE, IMP,
bp[k]); \
@@ -203,7 +203,7 @@ avg_num_deltas(lng)
do { \
TPE a = 0; \
dbl curval = dbl_nil; \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
if (!is_##TPE##_nil(bp[k])) \
@@ -456,7 +456,7 @@ nosupport:
#define ANALYTICAL_AVG_INT_UNBOUNDED_TILL_CURRENT_ROW(TPE) \
do { \
TPE avg = 0; \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
if (!is_##TPE##_nil(bp[k])) \
@@ -704,7 +704,7 @@ nosupport:
#define ANALYTICAL_STDEV_VARIANCE_UNBOUNDED_TILL_CURRENT_ROW(TPE, SAMPLE, OP) \
do { \
TPE *restrict bp = (TPE*)bi.base; \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
TPE v = bp[k]; \
@@ -990,7 +990,7 @@ GDK_ANALYTICAL_STDEV_VARIANCE(variance_p
#define ANALYTICAL_COVARIANCE_UNBOUNDED_TILL_CURRENT_ROW(TPE, SAMPLE, OP) \
do { \
TPE *bp1 = (TPE*)b1i.base, *bp2 = (TPE*)b2i.base; \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
TPE v1 = bp1[k], v2 = bp2[k]; \
@@ -1221,7 +1221,7 @@ GDK_ANALYTICAL_COVARIANCE(covariance_pop
#define ANALYTICAL_CORRELATION_UNBOUNDED_TILL_CURRENT_ROW(TPE, SAMPLE, OP)
/* SAMPLE and OP not used */ \
do { \
TPE *bp1 = (TPE*)b1i.base, *bp2 = (TPE*)b2i.base; \
- for (; k < i;) { \
+ while (k < i) { \
j = k; \
do { \
TPE v1 = bp1[k], v2 = bp2[k]; \
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -3185,7 +3185,7 @@ string_writer(logger *lg, BAT *b, lng of
return GDK_FAIL;
BATiter bi = bat_iterator(b);
BUN p = (BUN) offset;
- for (; p < end;) {
+ while (p < end) {
size_t sz = 0;
if (resize) {
if ((buf = GDKrealloc(lg->wbuf, resize)) == NULL) {
diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c
--- a/gdk/gdk_string.c
+++ b/gdk/gdk_string.c
@@ -1375,7 +1375,7 @@ GDKanalytical_str_group_concat(BAT *r, B
k, i) !=
GDK_SUCCEED) /* compute the entire string then slice it starting from the
beginning */
goto allocation_error;
bool empty = true;
- for (; k < i;) {
+ while (k < i) {
const char *nsep;
oid m = k;
j = k;
diff --git a/sql/backends/monet5/sql_rank.c b/sql/backends/monet5/sql_rank.c
--- a/sql/backends/monet5/sql_rank.c
+++ b/sql/backends/monet5/sql_rank.c
@@ -1677,7 +1677,7 @@ SQLvar_pop(Client cntxt, MalBlkPtr mb, M
#define COVARIANCE_AND_CORRELATION_ONE_SIDE_UNBOUNDED_TILL_CURRENT_ROW(TPE) \
do {
\
TPE *restrict bp = (TPE*)di.base;
\
- for (; k < i;) {
\
+ while (k < i) {
\
j = k;
\
do {
\
n += !is_##TPE##_nil(bp[k]);
\
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
