Changeset: 938d345d1cce for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=938d345d1cce
Modified Files:
gdk/gdk_imprints.c
gdk/gdk_private.h
gdk/gdk_select.c
Branch: Oct2014
Log Message:
Layout.
diffs (65 lines):
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -459,8 +459,10 @@ do {
\
if (!cnt_bins[bin]++) { \
min_bins[bin] = max_bins[bin] = i; \
} else { \
- if (col[i] < col[min_bins[bin]]) min_bins[bin]
= i; \
- if (col[i] > col[max_bins[bin]]) max_bins[bin]
= i; \
+ if (col[i] < col[min_bins[bin]]) \
+ min_bins[bin] = i; \
+ if (col[i] > col[max_bins[bin]]) \
+ max_bins[bin] = i; \
} \
} \
} \
@@ -631,8 +633,7 @@ BATimprints(BAT *b)
}
sprintf(imprints->imprints->filename, "%s.%cimprints", nme,
b->batCacheid > 0 ? 't' : 'h');
- pages = (((size_t) BATcount(b) * b->T->width) + IMPS_PAGE - 1)
- /
IMPS_PAGE;
+ pages = (((size_t) BATcount(b) * b->T->width) + IMPS_PAGE - 1)
/ IMPS_PAGE;
imprints->imprints->farmid = BBPselectfarm(PERSISTENT, b->ttype,
imprintsheap);
if ((fd = GDKfdlocate(imprints->imprints->farmid, nme, "rb",
@@ -818,9 +819,9 @@ BATimprints(BAT *b)
}
b->T->imprints = imprints;
}
-
- t1 = GDKusec();
- ALGODEBUG fprintf(stderr, "#BATimprints: imprints construction " LLFMT
" usec\n", t1 - t0);
+
+ t1 = GDKusec();
+ ALGODEBUG fprintf(stderr, "#BATimprints: imprints construction " LLFMT
" usec\n", t1 - t0);
do_return:
MT_lock_unset(&GDKimprintsLock(abs(b->batCacheid)), "BATimprints");
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -221,7 +221,7 @@ struct Imprints {
void *imps; /* pointer into imprints heap (bit vectors) */
void *dict; /* pointer into imprints heap (dictionary) */
BUN impcnt; /* counter for imprints */
- BUN dictcnt; /* counter for cache dictionary */
+ BUN dictcnt; /* counter for cache dictionary */
};
typedef struct {
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -357,8 +357,8 @@ do {
\
assert((imp_min != nil) && (imp_max != nil)); \
if (!s && !VIEWtparent(b)) { /* no candidate list and no views*/ \
if ((vl > imp_max || vh < imp_min) || \
- (anti && (vl < imp_min && vh > imp_max))) { \
- return 0; \
+ (anti && (vl < imp_min && vh > imp_max))) { \
+ return 0; \
} \
} \
} while (0)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
