Changeset: 02517489bb0c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=02517489bb0c
Modified Files:
gdk/gdk_batop.c
gdk/gdk_mapreduce.c
gdk/gdk_search.c
gdk/gdk_select.c
Branch: default
Log Message:
Ran indent on a few files.
diffs (truncated from 529 to 300 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -111,7 +111,7 @@ insert_string_bat(BAT *b, BAT *n, int ap
toff = (toff + GDK_VARALIGN - 1) & ~(GDK_VARALIGN - 1);
assert(((toff >> GDK_VARSHIFT) << GDK_VARSHIFT) == toff);
if (HEAPextend(b->T->vheap, toff + n->T->vheap->size) < 0) {
- toff = ~ (size_t) 0;
+ toff = ~(size_t) 0;
goto bunins_failed;
}
memcpy(b->T->vheap->base + toff, n->T->vheap->base,
n->T->vheap->size);
@@ -122,7 +122,7 @@ insert_string_bat(BAT *b, BAT *n, int ap
((size_t) 1 << 8 * b->T->width) < (b->T->width <= 2 ?
(b->T->vheap->size >> GDK_VARSHIFT) - GDK_VAROFFSET : (b->T->vheap->size >>
GDK_VARSHIFT))) {
/* offsets aren't going to fit */
if (GDKupgradevarheap(b->T, (var_t) (b->T->vheap->size
>> GDK_VARSHIFT), 0) == GDK_FAIL) {
- toff = ~ (size_t) 0;
+ toff = ~(size_t) 0;
goto bunins_failed;
}
btw = b->T->width;
@@ -161,7 +161,7 @@ insert_string_bat(BAT *b, BAT *n, int ap
hp = &o;
}
- if (toff != ~ (size_t) 0) {
+ if (toff != ~(size_t) 0) {
switch (ntw) {
case 1:
v = (var_t) *tbp + GDK_VAROFFSET;
@@ -401,6 +401,7 @@ BATins(BAT *b, BAT *n, bit force)
b = insert_string_bat(b, n, 0);
} else if (b->htype == TYPE_void) {
BATiter ni = bat_iterator(n);
+
BATloop(n, p, q) {
bunfastins_nocheck(b, r, NULL, BUNtail(ni, p),
0, Tsize(b));
r++;
@@ -508,7 +509,7 @@ BATappend(BAT *b, BAT *n, bit force)
return NULL;
}
- IMPSdestroy(b); /* imprints do not support updates yet */
+ IMPSdestroy(b); /* imprints do not support updates yet */
/* a hash is useless for void bats */
if (b->H->hash)
HASHremove(b);
@@ -612,6 +613,7 @@ BATappend(BAT *b, BAT *n, bit force)
BATloop(n, p, q) {
const void *t = BUNtail(ni, p);
+
if (BUNfnd(bm, t) == BUN_NONE) {
bunfastins(b, &h, t);
if (b->T->hash) {
@@ -627,6 +629,7 @@ BATappend(BAT *b, BAT *n, bit force)
BATloop(n, p, q) {
const void *t = BUNtail(ni, p);
+
if (BUNfnd(bm, t) == BUN_NONE) {
bunfastins(b, &on, t);
if (b->T->hash) {
@@ -786,6 +789,7 @@ BATslice(BAT *b, BUN l, BUN h)
*/
if (BAThrestricted(b) == BAT_READ && BATtrestricted(b) == BAT_READ) {
BUN cnt = h - l;
+
bn = VIEWcreate_(b, b, TRUE);
bn->batFirst = bn->batDeleted = bn->batInserted = 0;
bn->H->heap.base = (bn->htype) ? BUNhloc(bi, l) : NULL;
@@ -850,7 +854,7 @@ BATslice(BAT *b, BUN l, BUN h)
BATkey(BATmirror(bn), BATtkey(b));
bn->H->nonil = b->H->nonil || bn->batCount == 0;
bn->T->nonil = b->T->nonil || bn->batCount == 0;
- bn->H->nil = bn->T->nil = 0; /* we just don't know */
+ bn->H->nil = bn->T->nil = 0; /* we just don't know */
return bn;
bunins_failed:
BBPreclaim(bn);
@@ -1087,7 +1091,7 @@ BATrestrict(BAT *b, const void *hl, cons
* BATsort returns a sorted copy. BATorder sorts the BAT itself.
*/
int
-BATordered(BAT* b)
+BATordered(BAT *b)
{
if (!b->hsorted)
BATderiveHeadProps(b, 0);
@@ -1095,7 +1099,7 @@ BATordered(BAT* b)
}
int
-BATordered_rev(BAT* b)
+BATordered_rev(BAT *b)
{
if (!b->hrevsorted)
BATderiveHeadProps(b, 0);
@@ -1362,7 +1366,7 @@ BATsubsort(BAT **sorted, BAT **order, BA
goto error;
grps = (oid *) Tloc(on, BUNfirst(on));
for (p = 0, q = BATcount(bn); p < q; p++)
- grps[p] = p;
+ grps[p] = p;
BATsetcount(on, BATcount(bn));
on->tkey = 1;
}
@@ -1665,6 +1669,7 @@ BATmark_grp(BAT *b, BAT *g, oid *s)
return BATmark(b, *s);
} else {
BATiter gi = bat_iterator(g);
+
return BATmark(b, *(oid *) BUNtloc(gi, BUNfirst(g)));
}
}
@@ -1683,6 +1688,7 @@ BATmark_grp(BAT *b, BAT *g, oid *s)
}
} else {
BATiter gi = bat_iterator(g);
+
gc = BATnew(TYPE_oid, TYPE_oid, BATcount(g));
if (gc == NULL)
return NULL;
@@ -1751,6 +1757,7 @@ BATmark_grp(BAT *b, BAT *g, oid *s)
bn->tdense = trivprop;
if (BATtdense(bn)) {
BATiter bni = bat_iterator(bn);
+
BATseqbase(BATmirror(bn), *(oid *) BUNtloc(bni, BUNfirst(bn)));
}
BATkey(BATmirror(bn), trivprop);
@@ -1790,27 +1797,27 @@ BATconstant(int tailtype, const void *v,
break;
case TYPE_bte:
for (i = 0; i < n; i++)
- ((bte *) p)[i] = * (bte *) v;
- bn->T->nil = n >= 1 && * (bte *) v == bte_nil;
+ ((bte *) p)[i] = *(bte *) v;
+ bn->T->nil = n >= 1 && *(bte *) v == bte_nil;
break;
case TYPE_sht:
for (i = 0; i < n; i++)
- ((sht *) p)[i] = * (sht *) v;
- bn->T->nil = n >= 1 && * (sht *) v == sht_nil;
+ ((sht *) p)[i] = *(sht *) v;
+ bn->T->nil = n >= 1 && *(sht *) v == sht_nil;
break;
case TYPE_int:
case TYPE_flt:
assert(sizeof(int) == sizeof(flt));
for (i = 0; i < n; i++)
- ((int *) p)[i] = * (int *) v;
- bn->T->nil = n >= 1 && (ATOMstorage(tailtype) == TYPE_int ? *
(int *) v == int_nil : * (flt *) v == flt_nil);
+ ((int *) p)[i] = *(int *) v;
+ bn->T->nil = n >= 1 && (ATOMstorage(tailtype) == TYPE_int ?
*(int *) v == int_nil : *(flt *) v == flt_nil);
break;
case TYPE_lng:
case TYPE_dbl:
assert(sizeof(lng) == sizeof(dbl));
for (i = 0; i < n; i++)
- ((lng *) p)[i] = * (lng *) v;
- bn->T->nil = n >= 1 && (ATOMstorage(tailtype) == TYPE_lng ? *
(lng *) v == lng_nil : * (dbl *) v == dbl_nil);
+ ((lng *) p)[i] = *(lng *) v;
+ bn->T->nil = n >= 1 && (ATOMstorage(tailtype) == TYPE_lng ?
*(lng *) v == lng_nil : *(dbl *) v == dbl_nil);
break;
default:
bn->T->nil = n >= 1 && ATOMcmp(tailtype, v,
ATOMnilptr(tailtype)) == 0;
@@ -1845,6 +1852,7 @@ BATconst(BAT *b, int tailtype, const voi
return NULL;
if (b->H->type != bn->H->type) {
BAT *bnn = VIEWcreate(b, bn);
+
BBPunfix(bn->batCacheid);
bn = bnn;
} else {
@@ -2242,6 +2250,7 @@ BATmergecand(BAT *a, BAT *b)
/* both lists are VOID */
if (a->tseqbase > b->tseqbase) {
BAT *t = a;
+
a = b;
b = t;
}
@@ -2255,6 +2264,7 @@ BATmergecand(BAT *a, BAT *b)
} else if (a->ttype == TYPE_void || b->ttype == TYPE_void) {
if (b->ttype == TYPE_void) {
BAT *t = a;
+
a = b;
b = t;
}
@@ -2359,6 +2369,7 @@ BATintersectcand(BAT *a, BAT *b)
if (a->ttype == TYPE_void || b->ttype == TYPE_void) {
if (b->ttype == TYPE_void) {
BAT *t = a;
+
a = b;
b = t;
}
diff --git a/gdk/gdk_mapreduce.c b/gdk/gdk_mapreduce.c
--- a/gdk/gdk_mapreduce.c
+++ b/gdk/gdk_mapreduce.c
@@ -58,14 +58,14 @@ MRqueueCreate(int sz)
#endif
MT_lock_set(&mrqlock, "MRqueueCreate");
MT_sema_init(&mrqsema, 0, "mrqsema");
- if ( mrqueue ) {
+ if (mrqueue) {
MT_lock_unset(&mrqlock, "MRqueueCreate");
GDKerror("One map-reduce queue allowed");
return;
}
sz *= 2;
mrqueue = (MRqueue *) GDKzalloc(sizeof(MRqueue) * sz);
- if ( mrqueue == 0) {
+ if (mrqueue == 0) {
MT_lock_unset(&mrqlock, "MRqueueCreate");
GDKerror("Could not create the map-reduce queue");
return;
@@ -86,7 +86,7 @@ MRenqueue(int taskcnt, MRtask ** tasks)
if (mrqlast == mrqsize) {
mrqsize <<= 1;
mrqueue = (MRqueue *) GDKrealloc(mrqueue, sizeof(MRqueue) *
mrqsize);
- if ( mrqueue == 0) {
+ if (mrqueue == 0) {
MT_lock_unset(&mrqlock, "MRenqueue");
GDKerror("Could not enlarge the map-reduce queue");
return;
diff --git a/gdk/gdk_search.c b/gdk/gdk_search.c
--- a/gdk/gdk_search.c
+++ b/gdk/gdk_search.c
@@ -93,7 +93,8 @@
#include "gdk_private.h"
static int
-HASHwidth(BUN hashsize){
+HASHwidth(BUN hashsize)
+{
if (hashsize <= (BUN) BUN1_NONE)
return BUN1;
if (hashsize <= (BUN) BUN2_NONE)
@@ -123,8 +124,8 @@ static void
HASHclear(Hash *h)
{
BUN i, j, nil = (BUN) HASHnil(h);
- for (i = 0, j = h->mask; i <= j; i++)
- (void) HASHput(h,i,nil);
+ for (i = 0, j = h->mask; i <= j; i++)
+ (void) HASHput(h, i, nil);
}
Hash *
@@ -165,7 +166,7 @@ HASHnew(Heap *hp, int tpe, BUN size, BUN
h->type = tpe;
h->heap = hp;
HASHclear(h); /* zero the mask */
- ALGODEBUG fprintf(stderr, "#HASHnew: create hash(size " BUNFMT ", mask
" BUNFMT ",width %d, nil "BUNFMT ", total "BUNFMT " bytes);\n", size, mask,
width, h->nil, (size+mask) * width);
+ ALGODEBUG fprintf(stderr, "#HASHnew: create hash(size " BUNFMT ", mask
" BUNFMT ",width %d, nil " BUNFMT ", total " BUNFMT " bytes);\n", size, mask,
width, h->nil, (size + mask) * width);
return h;
}
@@ -193,24 +194,26 @@ HASHnew(Heap *hp, int tpe, BUN size, BUN
} while (0)
/* collect HASH statistics for analysis */
-static void HASHcollisions(BAT *b, Hash *h)
+static void
+HASHcollisions(BAT *b, Hash *h)
{
- lng cnt, entries=0, max =0;
- double total=0;
+ lng cnt, entries = 0, max = 0;
+ double total = 0;
BUN p, i, j, nil = HASHnil(h);
-
- if ( b == 0 || h == 0 )
+
+ if (b == 0 || h == 0)
return;
- for (i = 0, j = h->mask; i <= j; i++)
- if ( (p = HASHget(h,i)) != nil){
- entries++;
- cnt = 0;
- for ( ; p != nil; p = HASHgetlink(h,p))
- cnt++;
- if ( cnt > max ) max = cnt;
- total += cnt;
- }
- fprintf(stderr, "#BAThash: statistics (" BUNFMT ", entries " LLFMT",
mask " BUNFMT", max " LLFMT ", avg %2.6f);\n", BATcount(b), entries, h->mask,
max, total/entries);
+ for (i = 0, j = h->mask; i <= j; i++)
+ if ((p = HASHget(h, i)) != nil) {
+ entries++;
+ cnt = 0;
+ for (; p != nil; p = HASHgetlink(h, p))
+ cnt++;
+ if (cnt > max)
+ max = cnt;
+ total += cnt;
+ }
+ fprintf(stderr, "#BAThash: statistics (" BUNFMT ", entries " LLFMT ",
mask " BUNFMT ", max " LLFMT ", avg %2.6f);\n", BATcount(b), entries, h->mask,
max, total / entries);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
