Changeset: 38c070f6ef66 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=38c070f6ef66 Modified Files: gdk/gdk_analytic_bounds.c Branch: window-tunning Log Message:
Starting cleanup by removing redundant increments
diffs (truncated from 444 to 300 lines):
diff --git a/gdk/gdk_analytic_bounds.c b/gdk/gdk_analytic_bounds.c
--- a/gdk/gdk_analytic_bounds.c
+++ b/gdk/gdk_analytic_bounds.c
@@ -15,22 +15,22 @@
do { \
lng calc1, calc2; \
j = k; \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
lng rlimit = LIMIT; \
SUB_WITH_CHECK(k, rlimit, lng, calc1, GDK_lng_max, goto
calc_overflow); \
ADD_WITH_CHECK(calc1, !first_half, lng, calc2,
GDK_lng_max, goto calc_overflow); \
- *rb = MAX(calc2, j); \
+ rb[k] = MAX(calc2, j); \
} \
} while (0)
#define ANALYTICAL_WINDOW_BOUNDS_ROWS_FOLLOWING(LIMIT) \
do { \
lng calc1, calc2; \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
lng rlimit = LIMIT; \
ADD_WITH_CHECK(rlimit, k, lng, calc1, GDK_lng_max, goto
calc_overflow); \
ADD_WITH_CHECK(calc1, !first_half, lng, calc2,
GDK_lng_max, goto calc_overflow); \
- *rb = MIN(calc2, i); \
+ rb[k] = MIN(calc2, i); \
} \
} while (0)
@@ -40,7 +40,7 @@
TPE1 v, calc; \
TPE2 rlimit; \
if (b->tnonil) { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
rlimit = (TPE2) LIMIT; \
v = bp[k]; \
for (j = k; ; j--) { \
@@ -50,11 +50,10 @@
if ((TPE2)(ABSOLUTE(calc)) > rlimit) \
break; \
} \
- j++; \
- *rb = j; \
+ rb[k] = j++; \
} \
} else { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
rlimit = (TPE2) LIMIT; \
v = bp[k]; \
if (is_##TPE1##_nil(v)) { \
@@ -75,8 +74,7 @@
break; \
} \
} \
- j++; \
- *rb = j; \
+ rb[k] = j++; \
} \
} \
} while (0)
@@ -86,7 +84,7 @@
TPE1 v, calc; \
TPE2 rlimit; \
if (b->tnonil) { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
rlimit = (TPE2) LIMIT; \
v = bp[k]; \
for (j = k + 1; j < i; j++) { \
@@ -94,10 +92,10 @@
if ((TPE2)(ABSOLUTE(calc)) > rlimit) \
break; \
} \
- *rb = j; \
+ rb[k] = j; \
} \
} else { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
rlimit = (TPE2) LIMIT; \
v = bp[k]; \
if (is_##TPE1##_nil(v)) { \
@@ -114,7 +112,7 @@
break; \
} \
} \
- *rb = j; \
+ rb[k] = j; \
} \
} \
} while (0)
@@ -123,7 +121,7 @@
do { \
lng m = k - 1; \
if (b->tnonil) { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
TPE2 rlimit = LIMIT; \
TPE1 v = bp[k]; \
for (j = k; ; j--) { \
@@ -136,11 +134,10 @@
v = bp[j]; \
} \
} \
- j++; \
- *rb = j; \
+ rb[k] = j++; \
} \
} else { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
TPE2 rlimit = LIMIT; \
TPE1 v = bp[k]; \
if (is_##TPE1##_nil(v)) { \
@@ -164,8 +161,7 @@
} \
} \
} \
- j++; \
- *rb = j; \
+ rb[k] = j++; \
} \
} \
} while (0)
@@ -173,7 +169,7 @@
#define ANALYTICAL_WINDOW_BOUNDS_FIXED_GROUPS_FOLLOWING(TPE1, LIMIT, TPE2) \
do { \
if (b->tnonil) { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
TPE2 rlimit = LIMIT; \
TPE1 v = bp[k]; \
for (j = k + 1; j < i; j++) { \
@@ -184,10 +180,10 @@
v = bp[j]; \
} \
} \
- *rb = j; \
+ rb[k] = j; \
} \
} else { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
TPE2 rlimit = LIMIT; \
TPE1 v = bp[k]; \
if (is_##TPE1##_nil(v)) { \
@@ -207,7 +203,7 @@
} \
} \
} \
- *rb = j; \
+ rb[k] = j; \
} \
} \
} while (0)
@@ -216,18 +212,14 @@
do { \
TPE1 *restrict bp = (TPE1*)Tloc(b, 0); \
if (np) { \
- nend += cnt; \
- for (; np < nend; np++) { \
- if (*np) { \
- i += (np - pnp); \
+ for (; i < cnt; i++) { \
+ if (np[i]) \
IMP(TPE1, LIMIT, TPE2); \
- pnp = np; \
- } \
} \
- i += (np - pnp); \
+ i = cnt; \
IMP(TPE1, LIMIT, TPE2); \
} else { \
- i += (lng) cnt; \
+ i = cnt; \
IMP(TPE1, LIMIT, TPE2); \
} \
} while (0)
@@ -236,7 +228,7 @@
do { \
lng m = k - 1; \
if (b->tnonil) { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
void *v = BUNtail(bpi, (BUN) k); \
for (j = k; ; j--) { \
void *next; \
@@ -246,11 +238,10 @@
if (ABSOLUTE((TPE) atomcmp(v, next)) >
(TPE) LIMIT) \
break; \
} \
- j++; \
- *rb = j; \
+ rb[k] = j++;
\
} \
} else { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
void *v = BUNtail(bpi, (BUN) k); \
if (atomcmp(v, nil) == 0) { \
for (j = k; ; j--) { \
@@ -271,8 +262,7 @@
break; \
} \
} \
- j++; \
- *rb = j; \
+ rb[k] = j++;
\
} \
} \
} while (0)
@@ -280,17 +270,17 @@
#define ANALYTICAL_WINDOW_BOUNDS_VARSIZED_RANGE_FOLLOWING(LIMIT, TPE) \
do { \
if (b->tnonil) { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
void *v = BUNtail(bpi, (BUN) k); \
for (j = k + 1; j < i; j++) { \
void *next = BUNtail(bpi, (BUN) j); \
if (ABSOLUTE((TPE) atomcmp(v, next)) >
(TPE) LIMIT) \
break; \
} \
- *rb = j; \
+ rb[k] = j; \
} \
} else { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
void *v = BUNtail(bpi, (BUN) k); \
if (atomcmp(v, nil) == 0) { \
for (j = k + 1; j < i; j++) { \
@@ -306,7 +296,7 @@
break; \
} \
} \
- *rb = j; \
+ rb[k] = j; \
} \
} \
} while (0)
@@ -315,7 +305,7 @@
do { \
lng m = k - 1; \
if (b->tnonil) { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
TPE rlimit = LIMIT; \
void *v = BUNtail(bpi, (BUN) k); \
for (j = k; ; j--) { \
@@ -330,11 +320,10 @@
v = next; \
} \
} \
- j++; \
- *rb = j; \
+ rb[k] = j++; \
} \
} else { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
TPE rlimit = LIMIT; \
void *v = BUNtail(bpi, (BUN) k); \
if (atomcmp(v, nil) == 0) { \
@@ -360,8 +349,7 @@
} \
} \
} \
- j++; \
- *rb = j; \
+ rb[k] = j++;
\
} \
} \
} while (0)
@@ -369,7 +357,7 @@
#define ANALYTICAL_WINDOW_BOUNDS_VARSIZED_GROUPS_FOLLOWING(LIMIT, TPE) \
do { \
if (b->tnonil) { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
TPE rlimit = LIMIT; \
void *v = BUNtail(bpi, (BUN) k); \
for (j = k + 1; j < i; j++) { \
@@ -381,10 +369,10 @@
v = next; \
} \
} \
- *rb = j; \
+ rb[k] = j; \
} \
} else { \
- for (; k < i; k++, rb++) { \
+ for (; k < i; k++) { \
TPE rlimit = LIMIT; \
void *v = BUNtail(bpi, (BUN) k); \
if (atomcmp(v, nil) == 0) { \
@@ -405,7 +393,7 @@
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
