Changeset: 80710db14f22 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=80710db14f22
Modified Files:
monetdb5/modules/kernel/colstr.c
monetdb5/modules/kernel/column.c.mx
monetdb5/modules/mal/pcrelib.c
Branch: headless
Log Message:
Use the agreed up calling convention
All gdk related primitives to accces/update the column are
marked by COL{get/set}_{short typename}
diffs (220 lines):
diff --git a/monetdb5/modules/kernel/colstr.c b/monetdb5/modules/kernel/colstr.c
--- a/monetdb5/modules/kernel/colstr.c
+++ b/monetdb5/modules/kernel/colstr.c
@@ -21,7 +21,7 @@
#include "monetdb_config.h"
#include "colstr.h"
-#define COLputString(X,Y,Z) (void) Z
+#define COLset_str(X,Y,Z) (void) Z
str STRcolLength(int *ret, int *l)
{
@@ -164,7 +164,7 @@
x= COLget_str(bl,o);
if (x != 0 && strcmp(x,str_nil) != 0)
strLower(yp,x);
- COLputString(bn,o,y);
+ COLset_str(bn,o,y);
if (y && y != str_nil)
GDKfree(y);
}
@@ -202,7 +202,7 @@
x= COLget_str(bl,o);
if (x != 0 && strcmp(x,str_nil) != 0)
strUpper(yp,x);
- COLputString(bn,o,y);
+ COLset_str(bn,o,y);
if (y && y != str_nil)
GDKfree(y);
}
@@ -241,7 +241,7 @@
x= COLget_str(bl,o);
if (x != 0 && strcmp(x,str_nil) != 0)
strStrip(yp,x);
- COLputString(bn,o,y);
+ COLset_str(bn,o,y);
if (y && y != str_nil)
GDKfree(y);
}
@@ -280,7 +280,7 @@
x= COLget_str(bl,o);
if (x != 0 && strcmp(x,str_nil) != 0)
strLtrim(yp,x);
- COLputString(bn,o,y);
+ COLset_str(bn,o,y);
if (y && y != str_nil)
GDKfree(y);
}
@@ -319,7 +319,7 @@
x= COLget_str(bl,o);
if (x != 0 && strcmp(x,str_nil) != 0)
strRtrim(yp,x);
- COLputString(bn,o,y);
+ COLset_str(bn,o,y);
if (y && y != str_nil)
GDKfree(y);
}
@@ -539,7 +539,7 @@
COLforloop(bl,o){
tl = COLget_str(bl,o);
strTail(vp, tl, &rbase[o]);
- COLputString(bn,o,v);
+ COLset_str(bn,o,v);
if( v) GDKfree(v);
}
COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
@@ -572,7 +572,7 @@
COLforloop(bl,o){
tl = COLget_str(bl,o);
strTail(vp, tl, r);
- COLputString(bn,o,v);
+ COLset_str(bn,o,v);
}
COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
COLsetcount(bn, COLcount(bl));
@@ -602,7 +602,7 @@
COLforloop(bl,o){
tl = COLget_str(bl,o);
strChrAt(vp, tl, r);
- COLputString(bn,o,v);
+ COLset_str(bn,o,v);
}
COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
COLsetcount(bn, COLcount(bl));
@@ -631,7 +631,7 @@
COLforloop(bl,o){
tl = COLget_str(bl,o);
strChrAt(vp, tl, cst);
- COLputString(bn,o,v);
+ COLset_str(bn,o,v);
}
COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
COLsetcount(bn, COLcount(bl));
@@ -670,7 +670,7 @@
tl = COLget_str(bl,o);
tr = COLget_str(br,o);
STRPrefix(vp, &tl, &tr);
- COLputString(bn,o,v);
+ COLset_str(bn,o,v);
}
COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
COLaccessEnd(br, USE_HEAP, MMAP_SEQUENTIAL);
@@ -702,7 +702,7 @@
COLforloop(bl, o) {
tr = COLget_str(bl,o);
STRPrefix(vp, &tr, cst);
- COLputString(bn,o,v);
+ COLset_str(bn,o,v);
}
COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
bn->nonil = 0;
@@ -732,7 +732,7 @@
COLforloop(br,o){
tr = COLget_str(br,o);
STRPrefix(vp, cst, &tr);
- COLputString(bn,o,v);
+ COLset_str(bn,o,v);
}
COLaccessEnd(br, USE_HEAP, MMAP_SEQUENTIAL);
bn->nonil = 0;
@@ -772,7 +772,7 @@
tl = COLget_str(bl,o);
tr = COLget_str(br,o);
STRConcat(vp, &tl, &tr);
- COLputString(bn,o,v);
+ COLset_str(bn,o,v);
}
COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
COLaccessEnd(br, USE_HEAP, MMAP_SEQUENTIAL);
@@ -804,7 +804,7 @@
COLforloop(bl, o) {
str tl = COLget_str(bl,o);
STRConcat(vp, &tl, cst);
- COLputString(bn,o,v);
+ COLset_str(bn,o,v);
}
COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
bn->nonil = 0;
@@ -834,7 +834,7 @@
COLforloop(br,o){
str tr = COLget_str(br,o);
STRConcat(vp, cst, &tr);
- COLputString(bn,o,v);
+ COLset_str(bn,o,v);
}
COLaccessEnd(br, USE_HEAP, MMAP_SEQUENTIAL);
bn->nonil = 0;
@@ -868,7 +868,7 @@
x = COLget_str(bl,o);
if (x != 0 && strcmp(x, str_nil) != 0)
STRSubstitute(yp, &x, arg2, arg3, rep);
- COLputString(bn,o,y);
+ COLset_str(bn,o,y);
if (y != str_nil)
GDKfree(yp);
}
@@ -947,7 +947,7 @@
if ((msg= STRsubstring(&res, &t, start, length)))
break;
- COLputString(bn,o,res);
+ COLset_str(bn,o,res);
GDKfree(res);
}
COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
@@ -979,7 +979,7 @@
COLforloop(bl,o){
str tl = COLget_str(bl,o);
STRsubstring(&v, &tl, r, t);
- COLputString(bn,o,v);
+ COLset_str(bn,o,v);
GDKfree(v);
}
COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
@@ -1011,7 +1011,7 @@
COLforloop(bl,o){
str tl = (str) COLget_str(bl,o);
STRreplace(vp, &tl, pat, s2);
- COLputString(bn,o,v);
+ COLset_str(bn,o,v);
GDKfree(v);
}
bn->nonil = 0;
diff --git a/monetdb5/modules/kernel/column.c.mx
b/monetdb5/modules/kernel/column.c.mx
--- a/monetdb5/modules/kernel/column.c.mx
+++ b/monetdb5/modules/kernel/column.c.mx
@@ -230,7 +230,7 @@
}
case TYPE_str: {
COLforloop(r,o)
- COLputString(b,rbase[o], COLget_str(v,rbase[o]));
+ COLset_str(b,rbase[o], COLget_str(v,rbase[o]));
break;
}
default:
@@ -311,7 +311,7 @@
}
case TYPE_str: {
COLforloop(r,o)
- COLputString(b,rbase[o], COLget_str(v,rbase[o]));
+ COLset_str(b,rbase[o], COLget_str(v,rbase[o]));
break;
}
default:
diff --git a/monetdb5/modules/mal/pcrelib.c b/monetdb5/modules/mal/pcrelib.c
--- a/monetdb5/modules/mal/pcrelib.c
+++ b/monetdb5/modules/mal/pcrelib.c
@@ -486,10 +486,10 @@
strncpy(replaced_str+k, origin_str+capture_offsets[j],
len);
k += len;
replaced_str[k] = '\0';
- COLputString(tmpbat,o, replaced_str);
+ COLset_str(tmpbat,o, replaced_str);
GDKfree(replaced_str);
} else /* no captured substrings, copy the original string into
new bat */
- COLputString(tmpbat,o, origin_str);
+ COLset_str(tmpbat,o, origin_str);
}
COLaccessEnd(origin_strs,USE_HEAP,MMAP_SEQUENTIAL);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
