Changeset: de97f8ff9ee6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=de97f8ff9ee6
Modified Files:
monetdb5/modules/kernel/colifthen.c.mx
monetdb5/modules/kernel/colstr.c
Branch: headless
Log Message:
Revert the change
For the time being use putvalue() instead of COLputString()
diffs (225 lines):
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
@@ -71,7 +71,7 @@
if (lbase[o] == bit_nil)
nbase[o] = nilval;
else if (lbase[o])
- COLputString(bn, o, COLgetString(tb,o));
+ putvalue(bn, o, COLgetString(tb,o));
} else
COLforloop(bl,o){
if (lbase[o] == bit_nil)
@@ -113,7 +113,7 @@
if (lbase[o] == bit_nil)
nbase[o] = nilval;
else if (lbase[o])
- COLputString(bn, o, *(@1*) tid);
+ putvalue(bn, o, *(@1*) tid);
}
} else
COLforloop(bl,o){
@@ -225,9 +225,9 @@
if (lbase[o] == bit_nil)
nbase[o] = nilval;
else if (lbase[o])
- COLputString(bn, o, COLgetString(tb,o));
+ putvalue(bn, o, COLgetString(tb,o));
else
- COLputString(bn, o, COLgetString(eb,o));
+ putvalue(bn, o, COLgetString(eb,o));
}
} else
COLforloop(bl,o){
@@ -288,7 +288,7 @@
else if (lbase[o])
nbase[o] = **val;
else
- COLputString(bn, o, COLgetString(eb,o));
+ putvalue(bn, o, COLgetString(eb,o));
}
} else
COLforloop(bl,o){
@@ -346,7 +346,7 @@
if (lbase[o] == bit_nil)
nbase[o] = nilval;
else if (lbase[o])
- COLputString(bn, o, COLgetString(tb,o));
+ putvalue(bn, o, COLgetString(tb,o));
else
nbase[o] = **val;
}
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
@@ -161,7 +161,7 @@
x= COLgetString(bl,o);
if (x != 0 && strcmp(x,str_nil) != 0)
strLower(yp,x);
- COLputString(bn,o,y);
+ putvalue(bn,o,y);
if (y && y != str_nil)
GDKfree(y);
}
@@ -199,7 +199,7 @@
x= COLgetString(bl,o);
if (x != 0 && strcmp(x,str_nil) != 0)
strUpper(yp,x);
- COLputString(bn,o,y);
+ putvalue(bn,o,y);
if (y && y != str_nil)
GDKfree(y);
}
@@ -237,7 +237,7 @@
x= COLgetString(bl,o);
if (x != 0 && strcmp(x,str_nil) != 0)
strStrip(yp,x);
- COLputString(bn,o,y);
+ putvalue(bn,o,y);
if (y && y != str_nil)
GDKfree(y);
}
@@ -275,7 +275,7 @@
x= COLgetString(bl,o);
if (x != 0 && strcmp(x,str_nil) != 0)
strLtrim(yp,x);
- COLputString(bn,o,y);
+ putvalue(bn,o,y);
if (y && y != str_nil)
GDKfree(y);
}
@@ -313,7 +313,7 @@
x= COLgetString(bl,o);
if (x != 0 && strcmp(x,str_nil) != 0)
strRtrim(yp,x);
- COLputString(bn,o,y);
+ putvalue(bn,o,y);
if (y && y != str_nil)
GDKfree(y);
}
@@ -531,7 +531,7 @@
tl = COLgetString(bl,o);
tr = COLgetString(br,o);
strTail(vp, tl, tr);
- COLputString(bn,o,v);
+ putvalue(bn,o,v);
if( v) GDKfree(v);
}
COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
@@ -564,7 +564,7 @@
COLforloop(bl,o){
tl = COlgetString(bl,o);
WChrAt(vp, tl, cst);
- COLputString(bn,o,v);
+ putvalue(bn,o,v);
}
COLaccessEnd(left, USE_HEAP, MMAP_SEQUENTIAL);
COLsetcount(bn, BATcount(bl));
@@ -604,7 +604,7 @@
COLforloop(bl,o){
tl = COLgetString(bl,o);
strCharAt(vp, tl, rbase[o]);
- COLputString(bn,o,v);
+ putvalue(bn,o,v);
}
COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
COLaccessEnd(br, USE_TAIL, MMAP_SEQUENTIAL);
@@ -638,7 +638,7 @@
COLforloop(bl,o){
tl = OLgetString(bl,o);
strCharAt(vp, tl, cst);
- COLputString(bn,o,v);
+ putvalue(bn,o,v);
}
COLaccessEnd(left, USE_HEAP, MMAP_SEQUENTIAL);
COLsetcount(bn, BATcount(bl));
@@ -677,7 +677,7 @@
tl = COLgetString(bl,o);
tr = COLgetString(br,o);
STRPrefix(vp, &tl, &tr);
- COLputString(bn,o,v);
+ putvalue(bn,o,v);
}
COLaccessEnd(left, USE_HEAP, MMAP_SEQUENTIAL);
COLaccessEnd(right, USE_TAIL, MMAP_SEQUENTIAL);
@@ -709,7 +709,7 @@
COLforloop(bl, o) {
tl = COLgetString(bl,o);
STRPrefix(vp, &tl, cst);
- COLputString(bn,o,v);
+ putvalue(bn,o,v);
}
COLaccessEnd(left, USE_HEAP, MMAP_SEQUENTIAL);
bn->nonil = 0;
@@ -739,7 +739,7 @@
COLforloop(br,o){
tr = COLgetString(br,o);
STRPrefix(vp, cst, &tr);
- COLputString(bn,o,v);
+ putvalue(bn,o,v);
}
COLaccessEnd(right, USE_HEAP, MMAP_SEQUENTIAL);
bn->nonil = 0;
@@ -779,7 +779,7 @@
tl = COLgetString(bl,o);
tr = COLgetString(br,o);
STRConcat(vp, &tl, &tr);
- COLputString(bn,o,v);
+ putvalue(bn,o,v);
}
COLaccessEnd(left, USE_HEAP, MMAP_SEQUENTIAL);
COLaccessEnd(right, USE_TAIL, MMAP_SEQUENTIAL);
@@ -811,7 +811,7 @@
COLforloop(bl, o) {
str tl = COLgetString(bl,o);
STRConcat(vp, &tl, cst);
- COLputString(bn,o,v);
+ putvalue(bn,o,v);
}
COLaccessEnd(left, USE_HEAP, MMAP_SEQUENTIAL);
bn->nonil = 0;
@@ -841,7 +841,7 @@
COLforloop(br,o){
str tr = COLgetString(br,o);
STRConcat(vp, cst, &tr);
- COLputString(bn,o,v);
+ putvalue(bn,o,v);
}
COLaccessEnd(right, USE_HEAP, MMAP_SEQUENTIAL);
bn->nonil = 0;
@@ -875,7 +875,7 @@
x = COLgetString(bl,o);
if (x != 0 && strcmp(x, str_nil) != 0)
STRSubstitute(yp, xp, arg2, arg3, rep);
- COLputString(bn,o,y);
+ putvalue(bn,o,y);
if (y != str_nil)
GDKfree(yp);
}
@@ -954,7 +954,7 @@
if ((msg=STRsubstring(&res, &t, start, length)))
break;
- COLputString(bn,o,res);
+ putvalue(bn,o,res);
GDKfree(res);
}
COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
@@ -1008,7 +1008,7 @@
COLforloop(bl,o){
str tl = COLgetString(bl,o);
STRsubstring(vp, &tl, rbase[o], tbase[o]);
- COLputString(bn,o,v);
+ putvalue(bn,o,v);
GDKfree(*vp);
}
COLaccessEnd(bl, USE_HEAP, MMAP_SEQUENTIAL);
@@ -1043,7 +1043,7 @@
COLforloop(bl,o){
str tl = COLgetString(bl,o);
STRreplace(vp, &tl, pat, s2);
- COLputString(bn,o,v);
+ putvalue(bn,o,v);
GDKfree(v);
}
bn->nonil = 0;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
