Changeset: 7f9eb206a223 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f9eb206a223
Modified Files:
gdk/gdk.h
monetdb5/modules/kernel/colcalc.c.mx
monetdb5/modules/kernel/colcast.c.mx
monetdb5/modules/kernel/colcolor.c.mx
monetdb5/modules/kernel/colifthen.c.mx
monetdb5/modules/kernel/colmtime.c.mx
monetdb5/modules/kernel/colstr.c
Branch: headless
Log Message:
Stratify COLbase calls.
diffs (truncated from 477 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -3027,7 +3027,7 @@
for(q = COLlast(r), p = COLfirst(r);p < q; p++)
#define COLforloop(b,o) for( o = 0; o < b->count; o++)
-#define COLgetString(b,o) (str)(COLbase(b) + ((size_t)
VarHeapValRaw(b,o,b->width) << GDK_VARSHIFT))
+#define COLgetString(b,o) (str)(((char*)b->vheap) + ((size_t)
VarHeapValRaw(b,o,b->width) << GDK_VARSHIFT))
gdk_export str COLputString(COL *b, oid o, str v);
/*
@@ -3372,6 +3372,7 @@
#define ILLEGALVALUE ((ptr)-1L)
#define MAXPARAMS 32
+/* Inspection routines to be used outside GDK */
gdk_export lng COLgetDiskSize(COL *b);
gdk_export lng COLgetMemorySize(COL *b);
gdk_export lng COLgetTotalDiskSpace();
diff --git a/monetdb5/modules/kernel/colcalc.c.mx
b/monetdb5/modules/kernel/colcalc.c.mx
--- a/monetdb5/modules/kernel/colcalc.c.mx
+++ b/monetdb5/modules/kernel/colcalc.c.mx
@@ -52,9 +52,9 @@
@-
@= accum
{
- lbase = (@3*) getCOLbase(bl);
- rbase = (@4*) getCOLbase(br);
- nbase = (@5*) getCOLbase(bn);
+ lbase = (@3*) COLbase(bl);
+ rbase = (@4*) COLbase(br);
+ nbase = (@5*) COLbase(bn);
COLaccessBegin(bl, USE_HEAP, MMAP_SEQUENTIAL);
COLaccessBegin(br, USE_HEAP, MMAP_SEQUENTIAL);
@@ -88,8 +88,8 @@
@= accumCstRight
{
c = *(@4*)cst;
- lbase = (@3*) getCOLbase(bl);
- nbase = (@5*) getCOLbase(bn);
+ lbase = (@3*) COLbase(bl);
+ nbase = (@5*) COLbase(bn);
COLaccessBegin(bl, USE_HEAP, MMAP_SEQUENTIAL);
if( c == @3_nil){
@@ -112,8 +112,8 @@
@= accumCstLeft
{
c = *(@2*)cst;
- rbase = (@3*)getCOLbase(br);
- nbase = (@5*) getCOLbase(bn);
+ rbase = (@3*)COLbase(br);
+ nbase = (@5*) COLbase(bn);
COLaccessBegin(br, USE_HEAP, MMAP_SEQUENTIAL);
if (c == @2_nil) {
@@ -166,9 +166,9 @@
throw(MAL,"colcalc.@1",MAL_MALLOC_FAIL);
}
- lbase = (@3*) getCOLbase(bl);
- rbase = (@4*) getCOLbase(br);
- nbase = (@5*) getCOLbase(bn);
+ lbase = (@3*) COLbase(bl);
+ rbase = (@4*) COLbase(br);
+ nbase = (@5*) COLbase(bn);
COLaccessBegin(br, USE_HEAP, MMAP_SEQUENTIAL);
#if CMD_@2 == CMD_DIV
@@ -437,8 +437,8 @@
@:arithmeticImpl(>>,RSH,lng,int,lng,0)@
@= accumUnary
- { @2 *lbase = (@2 *) getCOLbase(bl);
- @2 *nbase = (@2 *) getCOLbase(bn);
+ { @2 *lbase = (@2 *) COLbase(bl);
+ @2 *nbase = (@2 *) COLbase(bn);
COLaccessBegin(bl, USE_HEAP, MMAP_SEQUENTIAL);
if (bl->nonil)
@@ -498,8 +498,8 @@
@-
@= accumUnaryISNIL
{
- @1 *lbase = (@1 *) getCOLbase(bl);
- @1 *nbase = (@1 *) getCOLbase(bn);
+ @1 *lbase = (@1 *) COLbase(bl);
+ @1 *nbase = (@1 *) COLbase(bn);
COLaccessBegin(bl, USE_HEAP, MMAP_SEQUENTIAL);
if (bl->nonil){
COLforloop(bl,o)
@@ -535,7 +535,7 @@
case TYPE_flt: @:accumUnaryISNIL(flt)@ break;
case TYPE_dbl: @:accumUnaryISNIL(dbl)@ break;
case TYPE_str: {
- bit *nbase = (bit *) getCOLbase(bn);
+ bit *nbase = (bit *) COLbase(bn);
COLaccessBegin(bl, USE_HEAP, MMAP_SEQUENTIAL);
if (bl->nonil){
COLforloop(bl,o)
@@ -587,9 +587,9 @@
throw(MAL,"colcalc.@1",MAL_MALLOC_FAIL);
}
- lbase = (@3 *) getCOLbase(bl);
- rbase = (@3 *) getCOLbase(br);
- nbase = (bit *) getCOLbase(bn);
+ lbase = (@3 *) COLbase(bl);
+ rbase = (@3 *) COLbase(br);
+ nbase = (bit *) COLbase(bn);
COLaccessBegin(bl, USE_HEAP, MMAP_SEQUENTIAL);
COLaccessBegin(br, USE_HEAP, MMAP_SEQUENTIAL);
if (bl->nonil && br->nonil) {
@@ -699,8 +699,8 @@
CBPreleaseref(bl);
throw(MAL,"colcalc.@1",MAL_MALLOC_FAIL);
}
- lbase = (@3 *) getCOLbase(bl);
- nbase = (bit *) getCOLbase(bn);
+ lbase = (@3 *) COLbase(bl);
+ nbase = (bit *) COLbase(bn);
COLaccessBegin(bl, USE_HEAP, MMAP_SEQUENTIAL);
@@ -833,8 +833,8 @@
throw(MAL,"colcalc.@1",MAL_MALLOC_FAIL);
}
- lbase = (bte *) getCOLbase(bl);
- nbase = (bte *) getCOLbase(bn);
+ lbase = (bte *) COLbase(bl);
+ nbase = (bte *) COLbase(bn);
COLaccessBegin(bl, USE_HEAP, MMAP_SEQUENTIAL);
if (bl->nonil) {
diff --git a/monetdb5/modules/kernel/colcast.c.mx
b/monetdb5/modules/kernel/colcast.c.mx
--- a/monetdb5/modules/kernel/colcast.c.mx
+++ b/monetdb5/modules/kernel/colcast.c.mx
@@ -71,8 +71,8 @@
throw(MAL,"colcalc.@1",MAL_MALLOC_FAIL);
}
- lbase = (@1* ) getCOLbase(bl);
- nbase = (@2*) getCOLbase(bn);
+ lbase = (@1* ) COLbase(bl);
+ nbase = (@2*) COLbase(bn);
COLaccessBegin(bl, USE_HEAP, MMAP_SEQUENTIAL);
if (bl->nonil)
@@ -110,8 +110,8 @@
throw(MAL,"colcalc.@1",MAL_MALLOC_FAIL);
}
- lbase = (@1*) getCOLbase(bl);
- nbase = (oid*) getCOLbase(bn);
+ lbase = (@1*) COLbase(bl);
+ nbase = (oid*) COLbase(bn);
COLaccessBegin(bl, USE_HEAP, MMAP_SEQUENTIAL);
@@ -154,7 +154,7 @@
throw(MAL,"colcalc.@1",MAL_MALLOC_FAIL);
}
- nbase = (@1*) getCOLbase(bn);
+ nbase = (@1*) COLbase(bn);
COLaccessBegin(bl, USE_HEAP, MMAP_SEQUENTIAL);
COLforloop(bl,o){
diff --git a/monetdb5/modules/kernel/colcolor.c.mx
b/monetdb5/modules/kernel/colcolor.c.mx
--- a/monetdb5/modules/kernel/colcolor.c.mx
+++ b/monetdb5/modules/kernel/colcolor.c.mx
@@ -46,8 +46,8 @@
}
bn->sorted=0;
- xbase= (@4*) getCOLbase(b);
- nbase= (@5*) getCOLbase(bn);
+ xbase= (@4*) COLbase(b);
+ nbase= (@5*) COLbase(bn);
COLaccessBegin(b,USE_HEAP,MMAP_SEQUENTIAL);
COLforloop(b, o) {
if (xbase[o] == @4_nil) {
@@ -121,10 +121,10 @@
}
bn->sorted=0;
- x1= (@3 *) getCOLbase(b1);
- x2= (@3 *) getCOLbase(b2);
- x3= (@3 *) getCOLbase(b3);
- nbase = (@4*) getCOLbase(bn);
+ x1= (@3 *) COLbase(b1);
+ x2= (@3 *) COLbase(b2);
+ x3= (@3 *) COLbase(b3);
+ nbase = (@4*) COLbase(bn);
COLaccessBegin(b1,USE_HEAP,MMAP_SEQUENTIAL);
COLaccessBegin(b2,USE_HEAP,MMAP_SEQUENTIAL);
diff --git a/monetdb5/modules/kernel/colifthen.c.mx
b/monetdb5/modules/kernel/colifthen.c.mx
--- a/monetdb5/modules/kernel/colifthen.c.mx
+++ b/monetdb5/modules/kernel/colifthen.c.mx
@@ -55,9 +55,9 @@
throw(MAL, "colcalc.ifThen", ILLEGAL_ARGUMENT " Requires
columns of identical size");
}
- lbase= (bit*) getCOLbase(bl);
- tbase= (@1*) getCOLbase(tb);
- nbase= (@1*) getCOLbase(bn);
+ lbase= (bit*) COLbase(bl);
+ tbase= (@1*) COLbase(tb);
+ nbase= (@1*) COLbase(bn);
COLaccessBegin(bl,USE_HEAP, MMAP_SEQUENTIAL);
COLaccessBegin(tb,USE_HEAP, MMAP_SEQUENTIAL);
@@ -99,8 +99,8 @@
CBPreleaseref(bl);
throw(MAL,"colstr.ifThen",MAL_MALLOC_FAIL);
}
- lbase= (bit*) getCOLbase(bl);
- nbase= (@1*) getCOLbase(bn);
+ lbase= (bit*) COLbase(bl);
+ nbase= (@1*) COLbase(bn);
COLaccessBegin(bl,USE_HEAP, MMAP_SEQUENTIAL);
if ( TYPE_@1 == TYPE_str){
@@ -142,8 +142,8 @@
throw(MAL,"colstr.ifThen",MAL_MALLOC_FAIL);
}
- lbase= (bit*) getCOLbase(bl);
- nbase= (@1*) getCOLbase(bn);
+ lbase= (bit*) COLbase(bl);
+ nbase= (@1*) COLbase(bn);
COLaccessBegin(bl,USE_HEAP, MMAP_SEQUENTIAL);
if ( TYPE_@1 == TYPE_str){
@@ -207,10 +207,10 @@
throw(MAL,"colcalc.ifthenelse",MAL_MALLOC_FAIL);
}
- lbase = (bit*) getCOLbase(bl);
- tbase = (@1*) getCOLbase(bt);
- ebase = (@1*) getCOLbase(be);
- nbase = (@1*) getCOLbase(bn);
+ lbase = (bit*) COLbase(bl);
+ tbase = (@1*) COLbase(bt);
+ ebase = (@1*) COLbase(be);
+ nbase = (@1*) COLbase(bn);
COLaccessBegin(bl,USE_HEAP, MMAP_SEQUENTIAL);
COLaccessBegin(tb,USE_HEAP, MMAP_SEQUENTIAL);
@@ -270,9 +270,9 @@
throw(MAL,"colcalc.@1",MAL_MALLOC_FAIL);
}
- lbase = (bit*) getCOLbase(bl);
- ebase = (@1*) getCOLbase(be);
- nbase = (@1*) getCOLbase(bn);
+ lbase = (bit*) COLbase(bl);
+ ebase = (@1*) COLbase(be);
+ nbase = (@1*) COLbase(bn);
COLaccessBegin(bl,USE_HEAP, MMAP_SEQUENTIAL);
COLaccessBegin(eb,USE_HEAP, MMAP_SEQUENTIAL);
@@ -330,9 +330,9 @@
throw(MAL,"colcalc.ifthenelse",MAL_MALLOC_FAIL);
}
- lbase = (bit*) getCOLbase(bl);
- tbase = (@1*) getCOLbase(tb);
- nbase = (@1*) getCOLbase(bn);
+ lbase = (bit*) COLbase(bl);
+ tbase = (@1*) COLbase(tb);
+ nbase = (@1*) COLbase(bn);
COLaccessBegin(bl,USE_HEAP, MMAP_SEQUENTIAL);
COLaccessBegin(tb,USE_HEAP, MMAP_SEQUENTIAL);
diff --git a/monetdb5/modules/kernel/colmtime.c.mx
b/monetdb5/modules/kernel/colmtime.c.mx
--- a/monetdb5/modules/kernel/colmtime.c.mx
+++ b/monetdb5/modules/kernel/colmtime.c.mx
@@ -48,9 +48,9 @@
throw(MAL,"colmtime.@3",MAL_MALLOC_FAIL);
}
- lbase = (bit*) getCOLbase(bl);
- rbase = (@1*) getCOLbase(br);
- nbase = (@1*) getCOLbase(bn);
+ lbase = (bit*) COLbase(bl);
+ rbase = (@1*) COLbase(br);
+ nbase = (@1*) COLbase(bn);
COLaccessBegin(b, USE_HEAP, MMAP_SEQUENTIAL);
COLaccessBegin(br, USE_HEAP, MMAP_SEQUENTIAL);
@@ -102,8 +102,8 @@
throw(MAL,"colmtime.@3",MAL_MALLOC_FAIL);
}
- lbase = (bit*) getCOLbase(bl);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
