Changeset: 47a770e552f0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47a770e552f0
Modified Files:
MonetDB5/src/modules/kernel/aggr.mx
MonetDB5/src/modules/kernel/aggr_bge_avg.mx
MonetDB5/src/modules/kernel/aggr_bge_count.mx
MonetDB5/src/modules/kernel/aggr_bge_minmax.mx
MonetDB5/src/modules/kernel/aggr_bge_prod.mx
MonetDB5/src/modules/kernel/aggr_bge_sum.mx
Branch: Jun2010
Log Message:
GDK -> GDK2:
- BUNhloc(bni, .) -> Hloc(bn, .)
- BUNtloc(gi, .) -> Tloc(b, .)
diffs (212 lines):
diff -r f5ea265a4d17 -r 47a770e552f0 MonetDB5/src/modules/kernel/aggr.mx
--- a/MonetDB5/src/modules/kernel/aggr.mx Wed Jun 30 12:43:25 2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr.mx Wed Jun 30 12:43:26 2010 +0200
@@ -177,7 +177,7 @@
#define SCAN_aggr_init \
oid _h; \
BUN _j = BATcount(bn); \
- oid *_bnh = (oid*) BUNhloc(bni, BUNfirst(bn)); \
+ oid *_bnh = (oid*) Hloc(bn, BUNfirst(bn)); \
BUN _r = BUNfirst(bn);
#define SCANfndOID(r, bn, h) \
@@ -204,7 +204,7 @@
@h
#define MERGE_aggr_init \
BUN _i = 0, _j = BATcount(bn), _r = BUNfirst(bn); \
- oid _h, *_bnh = (oid*) BUNhloc(bni, _r); \
+ oid _h, *_bnh = (oid*) Hloc(bn, _r); \
if (_j > 0) \
_j--;
@@ -223,7 +223,7 @@
/*
#define _MERGE_aggr_init \
BUN _i = 0, _j = BATcount(bn), _r = BUNfirst(bn); \
- oid _h, *_bnh = (oid*) BUNhloc(bni, _r); \
+ oid _h, *_bnh = (oid*) Hloc(bn, _r); \
dbl s = (dbl)_j / (dbl)range; \
if (_j > 0) \
_j--;
diff -r f5ea265a4d17 -r 47a770e552f0 MonetDB5/src/modules/kernel/aggr_bge_avg.mx
--- a/MonetDB5/src/modules/kernel/aggr_bge_avg.mx Wed Jun 30 12:43:25
2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr_bge_avg.mx Wed Jun 30 12:43:26
2010 +0200
@@ -104,7 +104,7 @@
@:aggrX3_avg3_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,@[10],oid hh =
(oid) (gt_offset + v); oid *h = &hh)@
} else {
BATaccessBegin(g,USE_TAIL,MMAP_SEQUENTIAL);
- @:aggrX3_avg3_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,@[10],oid *h =
(oid*) BUNtloc(gi, w))@
+ @:aggrX3_avg3_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,@[10],oid *h =
(oid*) Tloc(g, w))@
BATaccessEnd(g,USE_TAIL,MMAP_SEQUENTIAL);
}
if (b_use)
@@ -149,7 +149,7 @@
@c
/* aggrX3_avg3_body
@[11]: oid hh = (oid) (gt_offset + v); oid *h = &hh g tail
value calculation
- oid *h = (oid*) BUNtloc(gi, w) g tail
value lookup
+ oid *h = (oid*) Tloc(g, w) g tail
value lookup
*/
@= aggrX3_avg3_body
ALGODEBUG THRprintf(GDKout,
"#aggrX3_avg3_oid_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,@[10],@[11]);\n");
@@ -209,7 +209,7 @@
cmdaggrx3_av...@1(BAT **ret, BAT *b, BAT *g, BAT *e)
{
BAT *bn;
- BATiter bni, bi = bat_iterator(b), gi = bat_iterator(g);
+ BATiter bni, bi = bat_iterator(b);
BUN off;
BUN *cnt = NULL;
oid range;
diff -r f5ea265a4d17 -r 47a770e552f0
MonetDB5/src/modules/kernel/aggr_bge_count.mx
--- a/MonetDB5/src/modules/kernel/aggr_bge_count.mx Wed Jun 30 12:43:25
2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr_bge_count.mx Wed Jun 30 12:43:26
2010 +0200
@@ -150,13 +150,13 @@
@:aggrX3_count3_loop_body(@1,@2,@3,@4,@5,@6,@7,oid hh = (oid)
(gt_offset + v); oid *h = &hh)@
} else {
BATaccessBegin(g,USE_TAIL,MMAP_SEQUENTIAL);
- @:aggrX3_count3_loop_body(@1,@2,@3,@4,@5,@6,@7,oid *h = (oid*)
BUNtloc(gi, w))@
+ @:aggrX3_count3_loop_body(@1,@2,@3,@4,@5,@6,@7,oid *h = (oid*)
Tloc(g, w))@
BATaccessEnd(g,USE_TAIL,MMAP_SEQUENTIAL);
}
@c
/* aggrX3_count3_loop_body
@8: oid hh = (oid) (gt_offset + v); oid *h = &hh g tail
value calculation
- oid *h = (oid*) BUNtloc(gi, w) g tail
value lookup
+ oid *h = (oid*) Tloc(g, w) g tail
value lookup
*/
@= aggrX3_count3_loop_body
ALGODEBUG THRprintf(GDKout,
"#aggrX3_count3_loop_body(@1,@2,@3,@4,@5,@6,@7,@8);\n");
@@ -192,7 +192,7 @@
int
CMDaggrX3_count3(BAT **ret, BAT *b, BAT *g, BAT *e, bit *ignore_nils)
{
- BATiter bni, bi = bat_iterator(b), gi = bat_iterator(g);
+ BATiter bni, bi = bat_iterator(b);
BAT *bn;
wrd zero = 0, *cnt = NULL;
BUN p, q, r;
diff -r f5ea265a4d17 -r 47a770e552f0
MonetDB5/src/modules/kernel/aggr_bge_minmax.mx
--- a/MonetDB5/src/modules/kernel/aggr_bge_minmax.mx Wed Jun 30 12:43:25
2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr_bge_minmax.mx Wed Jun 30 12:43:26
2010 +0200
@@ -87,7 +87,7 @@
@:aggrX3_minmax3_ptr_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,oid hh =
(oid) (gt_offset + v); oid *h = &hh)@
} else {
BATaccessBegin(g,USE_TAIL,MMAP_SEQUENTIAL);
- @:aggrX3_minmax3_ptr_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,oid *h =
(oid*) BUNtloc(gi, w))@
+ @:aggrX3_minmax3_ptr_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,oid *h =
(oid*) Tloc(g, w))@
BATaccessEnd(g,USE_TAIL,MMAP_SEQUENTIAL);
}
if (b_use)
@@ -104,7 +104,7 @@
@c
/* aggrX3_minmax3_ptr_body
@[10]: oid hh = (oid) (gt_offset + v); oid *h = &hh g tail
value calculation
- oid *h = (oid*) BUNtloc(gi, w) g tail
value lookup
+ oid *h = (oid*) Tloc(g, w) g tail
value lookup
*/
@= aggrX3_minmax3_ptr_body
ALGODEBUG THRprintf(GDKout,
"#aggrX3_minmax3_ptr_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,@[10]);\n");
@@ -203,13 +203,13 @@
@:aggrX3_minmax3_oid_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,oid hh =
(oid) (gt_offset + v); oid *h = &hh)@
} else {
BATaccessBegin(g,USE_TAIL,MMAP_SEQUENTIAL);
- @:aggrX3_minmax3_oid_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,oid *h =
(oid*) BUNtloc(gi, w))@
+ @:aggrX3_minmax3_oid_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,oid *h =
(oid*) Tloc(g, w))@
BATaccessEnd(g,USE_TAIL,MMAP_SEQUENTIAL);
}
@c
/* aggrX3_minmax3_oid_body
@[10]: oid hh = (oid) (gt_offset + v); oid *h = &hh g tail
value calculation
- oid *h = (oid*) BUNtloc(gi, w) g tail
value lookup
+ oid *h = (oid*) Tloc(g, w) g tail
value lookup
*/
@= aggrX3_minmax3_oid_body
ALGODEBUG THRprintf(GDKout,
"#aggrX3_minmax3_oid_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,@[10]);\n");
@@ -282,7 +282,7 @@
aggr...@13_@3...@4_@5(BAT **ret, BAT *b, BAT *g, BAT *e)
{
BAT *bn;
- BATiter bni, bi = bat_iterator(b), gi = bat_iterator(g);
+ BATiter bni, bi = bat_iterator(b);
int (*cmp)(ptr,ptr);
ptr nil;
BUN off;
diff -r f5ea265a4d17 -r 47a770e552f0
MonetDB5/src/modules/kernel/aggr_bge_prod.mx
--- a/MonetDB5/src/modules/kernel/aggr_bge_prod.mx Wed Jun 30 12:43:25
2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr_bge_prod.mx Wed Jun 30 12:43:26
2010 +0200
@@ -111,7 +111,7 @@
@:aggrX3_prod3_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,@[10],oid hh =
(oid) (gt_offset + v); oid *h = &hh)@
} else {
BATaccessBegin(g,USE_TAIL,MMAP_SEQUENTIAL);
- @:aggrX3_prod3_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,@[10],oid *h =
(oid*) BUNtloc(gi, w))@
+ @:aggrX3_prod3_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,@[10],oid *h =
(oid*) Tloc(g, w))@
BATaccessEnd(g,USE_TAIL,MMAP_SEQUENTIAL);
}
if (b_use)
@@ -151,7 +151,7 @@
@c
/* aggrX3_prod3_body
@[11]: oid hh = (oid) (gt_offset + v); oid *h = &hh g tail
value calculation
- oid *h = (oid*) BUNtloc(gi, w) g tail
value lookup
+ oid *h = (oid*) Tloc(g, w) g tail
value lookup
*/
@= aggrX3_prod3_body
ALGODEBUG THRprintf(GDKout,
"#aggrX3_prod3_oid_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,@[10],@[11]);\n");
@@ -224,7 +224,7 @@
BUN base, end, w;
ssize_t gh_offset, gt_offset;
int b_use = USE_TAIL;
- BATiter bni = bat_iterator(bn), bi = bat_iterator(b), gi =
bat_iterator(g);
+ BATiter bni = bat_iterator(bn), bi = bat_iterator(b);
ALGODEBUG THRprintf(GDKout,
"#aggrx3_pro...@1_@2_EarrayBvoidGvoid(bn=%s,b=%s,g=%s,e=%s,range=" OIDFMT
",min=" OIDFMT ",max=" OIDFMT ");\n",
BATgetId(bn),BATgetId(b),BATgetId(g),BATgetId(e),
@@ -238,7 +238,7 @@
cmdaggrx3_pro...@1_@2(BAT **ret, BAT *b, BAT *g, BAT *e)
{
BAT *bn;
- BATiter bni, bi = bat_iterator(b), gi = bat_iterator(g);
+ BATiter bni, bi = bat_iterator(b);
@2 zero = (@2) 1, *prods = NULL;
bit *hit = NULL;
BUN slots, off;
diff -r f5ea265a4d17 -r 47a770e552f0 MonetDB5/src/modules/kernel/aggr_bge_sum.mx
--- a/MonetDB5/src/modules/kernel/aggr_bge_sum.mx Wed Jun 30 12:43:25
2010 +0200
+++ b/MonetDB5/src/modules/kernel/aggr_bge_sum.mx Wed Jun 30 12:43:26
2010 +0200
@@ -108,7 +108,7 @@
@:aggrX3_sum3_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,@[10],oid hh =
(oid) (gt_offset + v); oid *h = &hh)@
} else {
BATaccessBegin(g,USE_TAIL,MMAP_SEQUENTIAL);
- @:aggrX3_sum3_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,@[10],oid *h =
(oid*) BUNtloc(gi, w))@
+ @:aggrX3_sum3_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,@[10],oid *h =
(oid*) Tloc(g, w))@
BATaccessEnd(g,USE_TAIL,MMAP_SEQUENTIAL);
}
if (b_use)
@@ -148,7 +148,7 @@
@c
/* aggrX3_sum3_body
@[11]: oid hh = (oid) (gt_offset + v); oid *h = &hh g tail
value calculation
- oid *h = (oid*) BUNtloc(gi, w) g tail
value lookup
+ oid *h = (oid*) Tloc(g, w) g tail
value lookup
*/
@= aggrX3_sum3_body
ALGODEBUG THRprintf(GDKout,
"#aggrX3_sum3_oid_body(@1,@2,@3,@4,@5,@6,@7,@8,@9,@[10],@[11]);\n");
@@ -221,7 +221,7 @@
BUN base, end, w;
ssize_t gh_offset, gt_offset;
int b_use = USE_TAIL;
- BATiter bni = bat_iterator(bn), bi = bat_iterator(b), gi =
bat_iterator(g);
+ BATiter bni = bat_iterator(bn), bi = bat_iterator(b);
ALGODEBUG THRprintf(GDKout,
"#aggrx3_su...@1_@2_EarrayBvoidGvoid(bn=%s,b=%s,g=%s,e=%s,range=" OIDFMT
",min=" OIDFMT ",max=" OIDFMT ");\n",
BATgetId(bn),BATgetId(b),BATgetId(g),BATgetId(e),
@@ -234,7 +234,7 @@
cmdaggrx3_su...@1_@2(BAT **ret, BAT *b, BAT *g, BAT *e)
{
BAT *bn;
- BATiter bni, bi = bat_iterator(b), gi = bat_iterator(g);
+ BATiter bni, bi = bat_iterator(b);
@2 zero = (@2) 0, *sums = NULL;
bit *hit = NULL;
BUN slots, off;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
