Changeset: 136ef1ae446c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=136ef1ae446c Modified Files: gdk/gdk.h gdk/gdk_analytic_bounds.c gdk/gdk_analytic_func.c gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_calc.c gdk/gdk_calc_private.h gdk/gdk_firstn.c gdk/gdk_hash.h gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_private.h gdk/gdk_system.h Branch: Nov2019 Log Message:
Layout.
diffs (truncated from 1364 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1083,7 +1083,7 @@ gdk_export uint8_t ATOMelmshift(int sz);
#define bunfastapp(b, v) \
do { \
- if (BATcount(b) >= BATcapacity(b)) {
\
+ if (BATcount(b) >= BATcapacity(b)) { \
if (BATcount(b) == BUN_MAX) { \
GDKerror("bunfastapp: too many elements to
accomodate (" BUNFMT ")\n", BUN_MAX); \
goto bunins_failed; \
@@ -1097,7 +1097,7 @@ gdk_export uint8_t ATOMelmshift(int sz);
#define bunfastappTYPE(TYPE, b, v) \
do { \
if (BATcount(b) >= BATcapacity(b)) { \
- if (BATcount(b) == BUN_MAX) { \
+ if (BATcount(b) == BUN_MAX) { \
GDKerror("bunfastapp: too many elements to
accomodate (" BUNFMT ")\n", BUN_MAX); \
goto bunins_failed; \
} \
@@ -2000,21 +2000,21 @@ gdk_export str GDKstrndup(const char *s,
__func__, __FILE__, __LINE__); \
_res; \
})
-#define GDKmmap(p, m, l) \
- ({ \
- const char *_path = (p); \
- int _mode = (m); \
- size_t _len = (l); \
- void *_res = GDKmmap(_path, _mode, _len); \
- ALLOCDEBUG \
- fprintf(stderr, \
- "#GDKmmap(%s,0x%x,%zu) -> %p" \
- " %s[%s:%d]\n", \
- _path ? _path : "NULL", \
- (unsigned) _mode, _len, \
- _res, \
- __func__, __FILE__, __LINE__); \
- _res; \
+#define GDKmmap(p, m, l) \
+ ({ \
+ const char *_path = (p); \
+ int _mode = (m); \
+ size_t _len = (l); \
+ void *_res = GDKmmap(_path, _mode, _len); \
+ ALLOCDEBUG \
+ fprintf(stderr, \
+ "#GDKmmap(%s,0x%x,%zu) -> %p" \
+ " %s[%s:%d]\n", \
+ _path ? _path : "NULL", \
+ (unsigned) _mode, _len, \
+ _res, \
+ __func__, __FILE__, __LINE__); \
+ _res; \
})
#define malloc(s) \
({ \
@@ -2656,10 +2656,10 @@ gdk_export void VIEWbounds(BAT *b, BAT *
hb = HASHgetlink(h,hb)) \
if (ATOMcmp(h->type, v, BUNtvar(bi, hb)) == 0)
-#define HASHloop_TYPE(bi, h, hb, v, TYPE) \
- for (hb = HASHget(h, hash_##TYPE(h, v)); \
- hb != HASHnil(h); \
- hb = HASHgetlink(h,hb)) \
+#define HASHloop_TYPE(bi, h, hb, v, TYPE) \
+ for (hb = HASHget(h, hash_##TYPE(h, v)); \
+ hb != HASHnil(h); \
+ hb = HASHgetlink(h,hb)) \
if (* (const TYPE *) (v) == * (const TYPE *) BUNtloc(bi, hb))
#define HASHloop_bte(bi, h, hb, v) HASHloop_TYPE(bi, h, hb, v, bte)
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
@@ -16,7 +16,7 @@
lng calc1, calc2; \
j = k; \
for (; k < i; k++, rb++) { \
- lng rlimit = LIMIT; \
+ 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); \
@@ -27,7 +27,7 @@
do { \
lng calc1, calc2; \
for (; k < i; k++, rb++) { \
- lng rlimit = LIMIT; \
+ 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); \
@@ -39,10 +39,10 @@
lng m = k - 1; \
TPE1 v, calc; \
TPE2 rlimit; \
- if (b->tnonil) { \
- for (; k < i; k++, rb++) { \
- rlimit = (TPE2) LIMIT; \
- v = bp[k]; \
+ if (b->tnonil) { \
+ for (; k < i; k++, rb++) { \
+ rlimit = (TPE2) LIMIT; \
+ v = bp[k]; \
for (j = k; ; j--) { \
if (j == m) \
break; \
@@ -50,132 +50,132 @@
if ((TPE2)(ABSOLUTE(calc)) > rlimit) \
break; \
} \
- j++;
\
- *rb = j;
\
- }
\
- } else { \
- for (; k < i; k++, rb++) {
\
- rlimit = (TPE2) LIMIT;
\
- v = bp[k];
\
- if (is_##TPE1##_nil(v)) {
\
- for (j = k; ; j--) {
\
- if (j == m)
\
- break;
\
- if (!is_##TPE1##_nil(bp[j]))
\
- break;
\
- }
\
- } else {
\
- for (j = k; ; j--) {
\
- if (j == m)
\
- break;
\
- if (is_##TPE1##_nil(bp[j]))
\
- break;
\
+ j++; \
+ *rb = j; \
+ } \
+ } else { \
+ for (; k < i; k++, rb++) { \
+ rlimit = (TPE2) LIMIT; \
+ v = bp[k]; \
+ if (is_##TPE1##_nil(v)) { \
+ for (j = k; ; j--) { \
+ if (j == m) \
+ break; \
+ if (!is_##TPE1##_nil(bp[j])) \
+ break; \
+ } \
+ } else { \
+ for (j = k; ; j--) { \
+ if (j == m) \
+ break; \
+ if (is_##TPE1##_nil(bp[j])) \
+ break; \
SUB_WITH_CHECK(v, bp[j], TPE1,
calc, GDK_##TPE1##_max, goto calc_overflow); \
if ((TPE2)(ABSOLUTE(calc)) >
rlimit) \
- break;
\
- }
\
- }
\
- j++;
\
- *rb = j;
\
- }
\
- } \
+ break; \
+ } \
+ } \
+ j++; \
+ *rb = j; \
+ } \
+ } \
} while (0)
#define ANALYTICAL_WINDOW_BOUNDS_FIXED_RANGE_FOLLOWING(TPE1, LIMIT, TPE2) \
do { \
TPE1 v, calc; \
TPE2 rlimit; \
- if (b->tnonil) { \
- for (; k < i; k++, rb++) {
\
- rlimit = (TPE2) LIMIT;
\
- v = bp[k];
\
+ if (b->tnonil) { \
+ for (; k < i; k++, rb++) { \
+ rlimit = (TPE2) LIMIT; \
+ v = bp[k]; \
for (j = k + 1; j < i; j++) { \
SUB_WITH_CHECK(v, bp[j], TPE1, calc,
GDK_##TPE1##_max, goto calc_overflow); \
if ((TPE2)(ABSOLUTE(calc)) > rlimit) \
break; \
} \
- *rb = j;
\
- }
\
- } else { \
- for (; k < i; k++, rb++) {
\
- rlimit = (TPE2) LIMIT;
\
- v = bp[k];
\
- if (is_##TPE1##_nil(v)) {
\
- for (j =k + 1; j < i; j++) {
\
- if (!is_##TPE1##_nil(bp[j]))
\
- break;
\
- }
\
- } else {
\
- for (j = k + 1; j < i; j++) {
\
- if (is_##TPE1##_nil(bp[j]))
\
- break;
\
+ *rb = j; \
+ } \
+ } else { \
+ for (; k < i; k++, rb++) { \
+ rlimit = (TPE2) LIMIT; \
+ v = bp[k]; \
+ if (is_##TPE1##_nil(v)) { \
+ for (j =k + 1; j < i; j++) { \
+ if (!is_##TPE1##_nil(bp[j])) \
+ break; \
+ } \
+ } else { \
+ for (j = k + 1; j < i; j++) { \
+ if (is_##TPE1##_nil(bp[j])) \
+ break; \
SUB_WITH_CHECK(v, bp[j], TPE1,
calc, GDK_##TPE1##_max, goto calc_overflow); \
if ((TPE2)(ABSOLUTE(calc)) >
rlimit) \
- break;
\
- }
\
- }
\
- *rb = j;
\
- }
\
- } \
+ break; \
+ } \
+ } \
+ *rb = j; \
+ } \
+ } \
} while (0)
#define ANALYTICAL_WINDOW_BOUNDS_FIXED_GROUPS_PRECEDING(TPE1, LIMIT, TPE2) \
do { \
lng m = k - 1; \
- if (b->tnonil) { \
- for (; k < i; k++, rb++) {
\
+ if (b->tnonil) { \
+ for (; k < i; k++, rb++) { \
TPE2 rlimit = LIMIT; \
- TPE1 v = bp[k];
\
+ TPE1 v = bp[k]; \
for (j = k; ; j--) { \
if (j == m) \
break; \
- if (v != bp[j]) { \
+ if (v != bp[j]) { \
if (rlimit == 0) \
break; \
rlimit--; \
v = bp[j]; \
} \
} \
- j++;
\
- *rb = j;
\
- }
\
- } else { \
- for (; k < i; k++, rb++) {
\
+ j++; \
+ *rb = j; \
+ } \
+ } else { \
+ for (; k < i; k++, rb++) { \
TPE2 rlimit = LIMIT; \
- TPE1 v = bp[k];
\
- if (is_##TPE1##_nil(v)) {
\
- for (j = k; ; j--) {
\
- if (j == m)
\
- break;
\
- if (!is_##TPE1##_nil(bp[j]))
\
- break;
\
- }
\
- } else {
\
- for (j = k; ; j--) {
\
- if (j == m)
\
- break;
\
- if (is_##TPE1##_nil(bp[j]))
\
- break;
\
- if (v != bp[j]) {
\
- if (rlimit == 0)
\
- break;
\
- rlimit--;
\
- v = bp[j];
\
- }
\
- }
\
- }
\
- j++;
\
- *rb = j;
\
- }
\
- } \
+ TPE1 v = bp[k]; \
+ if (is_##TPE1##_nil(v)) { \
+ for (j = k; ; j--) { \
+ if (j == m) \
+ break; \
+ if (!is_##TPE1##_nil(bp[j])) \
+ break; \
+ } \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
