Changeset: b09cd1d58c45 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b09cd1d58c45
Modified Files:
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_type.c
monetdb5/mal/mal_type.h
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/pcre.c
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_remoteQueries.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_statement.c
sql/server/rel_semantic.c
sql/server/rel_updates.c
sql/server/sql_semantic.c
Branch: default
Log Message:
More size_t.
diffs (truncated from 496 to 300 lines):
diff --git a/monetdb5/mal/mal_atom.c b/monetdb5/mal/mal_atom.c
--- a/monetdb5/mal/mal_atom.c
+++ b/monetdb5/mal/mal_atom.c
@@ -40,7 +40,7 @@ malAtomProperty(MalBlkPtr mb, InstrPtr p
(void)mb; /* fool compilers */
assert(pci != 0);
name = getFunctionId(pci);
- tpe = getAtomIndex(getModuleId(pci), (int)strlen(getModuleId(pci)),
TYPE_any);
+ tpe = getAtomIndex(getModuleId(pci), strlen(getModuleId(pci)),
TYPE_any);
if (tpe < 0 || tpe >= GDKatomcnt || tpe >= MAXATOMS)
return MAL_SUCCEED;
assert(pci->fcn != NULL);
diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c
--- a/monetdb5/mal/mal_authorize.c
+++ b/monetdb5/mal/mal_authorize.c
@@ -859,7 +859,7 @@ AUTHdecypherValue(str *ret, const char *
int escaped = 0;
/* we default to some garbage key, just to make password unreadable
* (a space would only uppercase the password) */
- int keylen = 0;
+ size_t keylen = 0;
if (vaultKey == NULL)
throw(MAL, "decypherValue", "The vault is still locked!");
@@ -867,7 +867,7 @@ AUTHdecypherValue(str *ret, const char *
if( r == NULL)
throw(MAL, "decypherValue", SQLSTATE(HY001) MAL_MALLOC_FAIL);
- keylen = (int) strlen(vaultKey);
+ keylen = strlen(vaultKey);
/* XOR all characters. If we encounter a 'one' char after the XOR
* operation, it is an escape, so replace it with the next char. */
@@ -901,7 +901,7 @@ AUTHcypherValue(str *ret, const char *va
const char *s = value;
/* we default to some garbage key, just to make password unreadable
* (a space would only uppercase the password) */
- int keylen = 0;
+ size_t keylen = 0;
if (vaultKey == NULL)
throw(MAL, "cypherValue", "The vault is still locked!");
@@ -909,7 +909,7 @@ AUTHcypherValue(str *ret, const char *va
if( r == NULL)
throw(MAL, "cypherValue", SQLSTATE(HY001) MAL_MALLOC_FAIL);
- keylen = (int) strlen(vaultKey);
+ keylen = strlen(vaultKey);
/* XOR all characters. If we encounter a 'zero' char after the XOR
* operation, escape it with an 'one' char. */
diff --git a/monetdb5/mal/mal_builder.c b/monetdb5/mal/mal_builder.c
--- a/monetdb5/mal/mal_builder.c
+++ b/monetdb5/mal/mal_builder.c
@@ -106,7 +106,7 @@ newComment(MalBlkPtr mb, const char *val
freeInstruction(q);
return NULL;
}
- cst.len= (int) strlen(cst.val.sval);
+ cst.len = strlen(cst.val.sval);
getArg(q,0) = defConstant(mb,TYPE_str,&cst);
clrVarConstant(mb,getArg(q,0));
setVarDisabled(mb,getArg(q,0));
@@ -457,7 +457,7 @@ getStrConstant(MalBlkPtr mb, str val)
cst.vtype = TYPE_str;
cst.val.sval = val;
- cst.len = (int) strlen(val);
+ cst.len = strlen(val);
_t= fndConstant(mb, &cst, mb->vtop);
if( _t < 0) {
if ((cst.val.sval= GDKstrdup(val)) == NULL)
@@ -480,7 +480,7 @@ pushStr(MalBlkPtr mb, InstrPtr q, const
freeInstruction(q);
return NULL;
}
- cst.len= (int) strlen(cst.val.sval);
+ cst.len = strlen(cst.val.sval);
_t = defConstant(mb,TYPE_str,&cst);
return pushArgument(mb, q, _t);
}
@@ -564,7 +564,7 @@ pushNilType(MalBlkPtr mb, InstrPtr q, ch
if (q == NULL)
return NULL;
- idx= getAtomIndex(tpe, -1, TYPE_any);
+ idx= getAtomIndex(tpe, 0, TYPE_any);
if( idx < 0 || idx >= GDKatomcnt || idx >= MAXATOMS)
return NULL;
cst.vtype=TYPE_void;
diff --git a/monetdb5/mal/mal_import.c b/monetdb5/mal/mal_import.c
--- a/monetdb5/mal/mal_import.c
+++ b/monetdb5/mal/mal_import.c
@@ -128,7 +128,7 @@ malLoadScript(str name, bstream **fdin)
c->srcFile = oldsrcFile; \
if(c->prompt) GDKfree(c->prompt); \
c->prompt = oldprompt; \
- c->promptlength= (int)strlen(c->prompt);
+ c->promptlength = strlen(c->prompt);
#define restoreClient2 \
assert(c->glb == 0 || c->glb == oldglb); /* detect leak */ \
c->glb = oldglb; \
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -632,7 +632,7 @@ getType(MalBlkPtr mb, str nme)
i = findVariable(mb, nme);
if (i < 0)
- return getAtomIndex(nme, -1, TYPE_any);
+ return getAtomIndex(nme, 0, TYPE_any);
return getVarType(mb, i);
}
@@ -1208,7 +1208,7 @@ pushArgumentId(MalBlkPtr mb, InstrPtr p,
return NULL;
v = findVariable(mb, name);
if (v < 0) {
- if ((v = newVariable(mb, name, strlen(name), getAtomIndex(name,
-1, TYPE_any))) < 0) {
+ if ((v = newVariable(mb, name, strlen(name), getAtomIndex(name,
0, TYPE_any))) < 0) {
freeInstruction(p);
return NULL;
}
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -940,7 +940,7 @@ str runMALsequence(Client cntxt, MalBlkP
freeException(v->val.sval); /* old
exception*/
v->vtype = TYPE_str;
v->val.sval = ret;
- v->len = (int)strlen(v->val.sval);
+ v->len = strlen(v->val.sval);
ret = 0;
MT_lock_unset(&mal_contextLock);
} else {
diff --git a/monetdb5/mal/mal_listing.c b/monetdb5/mal/mal_listing.c
--- a/monetdb5/mal/mal_listing.c
+++ b/monetdb5/mal/mal_listing.c
@@ -565,10 +565,11 @@ str
mal2str(MalBlkPtr mb, int first, int last)
{
str ps = NULL, *txt;
- int i, *len, totlen = 0, j;
+ int i, j;
+ size_t *len, totlen = 0;
txt = GDKmalloc(sizeof(str) * mb->stop);
- len = GDKmalloc(sizeof(int) * mb->stop);
+ len = GDKmalloc(sizeof(size_t) * mb->stop);
if( txt == NULL || len == NULL){
addMalException(mb,"mal2str: " MAL_MALLOC_FAIL);
@@ -586,7 +587,7 @@ mal2str(MalBlkPtr mb, int first, int las
#endif
if ( txt[i])
- totlen += len[i] = (int)strlen(txt[i]);
+ totlen += len[i] = strlen(txt[i]);
else {
addMalException(mb,"mal2str: " MAL_MALLOC_FAIL);
GDKfree(len);
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -419,7 +419,7 @@ cstToken(Client cntxt, ValPtr cst)
i = stringLength(cntxt);
cst->val.sval = strCopy(cntxt, i);
if (cst->val.sval)
- cst->len = (int) strlen(cst->val.sval);
+ cst->len = strlen(cst->val.sval);
else
cst->len = 0;
return i;
@@ -682,7 +682,7 @@ simpleTypeId(Client cntxt)
cntxt->yycur--; /* keep it */
return -1;
}
- tpe = getAtomIndex(CURRENT(cntxt), l, -1);
+ tpe = getAtomIndex(CURRENT(cntxt), (size_t) l, -1);
if (tpe < 0) {
parseError(cntxt, "Type identifier expected\n");
cntxt->yycur -= l; /* keep it */
@@ -1406,7 +1406,7 @@ static int
parseEnd(Client cntxt)
{
Symbol curPrg = 0;
- int l;
+ size_t l;
InstrPtr sig;
str errors = MAL_SUCCEED;
@@ -1427,7 +1427,7 @@ parseEnd(Client cntxt)
l = operatorLength(cntxt);
}
/* parse fcn */
- if ((l == (int) strlen(curPrg->name) &&
+ if ((l == strlen(curPrg->name) &&
strncmp(CURRENT(cntxt), curPrg->name, l) == 0) || l ==
0)
advance(cntxt, l);
else
@@ -1799,7 +1799,7 @@ parseMAL(Client cntxt, Symbol curPrg, in
curInstr->token= REMsymbol;
curInstr->barrier= 0;
cst.vtype = TYPE_str;
- cst.len = (int) strlen(start);
+ cst.len = strlen(start);
if((cst.val.sval = GDKstrdup(start)) == NULL) {
parseError(cntxt, SQLSTATE(HY001)
MAL_MALLOC_FAIL);
freeInstruction(curInstr);
diff --git a/monetdb5/mal/mal_type.c b/monetdb5/mal/mal_type.c
--- a/monetdb5/mal/mal_type.c
+++ b/monetdb5/mal/mal_type.c
@@ -98,12 +98,12 @@ getTypeIdentifier(malType tpe){
#define qt(x) (nme[1]==x[1] && nme[2]==x[2] )
int
-getAtomIndex(const char *nme, int len, int deftype)
+getAtomIndex(const char *nme, size_t len, int deftype)
{
int i;
- if (len < 0)
- len = (int) strlen(nme);
+ if (len == 0)
+ len = strlen(nme);
if (len >= IDLENGTH) {
/* name too long: cannot match any atom name */
return deftype;
diff --git a/monetdb5/mal/mal_type.h b/monetdb5/mal/mal_type.h
--- a/monetdb5/mal/mal_type.h
+++ b/monetdb5/mal/mal_type.h
@@ -62,7 +62,7 @@
mal_export str getTypeName(malType tpe);
mal_export str getTypeIdentifier(malType tpe);
-mal_export int getAtomIndex(const char *nme, int len, int deftpe);
+mal_export int getAtomIndex(const char *nme, size_t len, int deftpe);
#define idcmp(n, m) strcmp(n, m)
mal_export int isIdentifier(str s);
mal_export int findGDKtype(int type); /* used in src/mal/mal_interpreter.c */
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -1847,11 +1847,11 @@ static int SERVERfieldAnalysis(str fld,
if(fld==0 || strcmp(fld,"nil")==0){
if((v->val.sval= GDKstrdup(str_nil)) == NULL)
return -1;
- v->len= (int) strlen(v->val.sval);
+ v->len = strlen(v->val.sval);
} else {
if((v->val.sval= GDKstrdup(fld)) == NULL)
return -1;
- v->len= (int) strlen(fld);
+ v->len = strlen(fld);
}
break;
}
@@ -1999,7 +1999,7 @@ SERVERput(Client cntxt, MalBlkPtr mb, Ma
/* and reload it into the proper format */
str ht,tt;
BAT *b= BATdescriptor(BBPindex(*nme));
- int len;
+ size_t len;
if( b== NULL){
throw(MAL,"mapi.put","Can not access BAT");
@@ -2009,7 +2009,7 @@ SERVERput(Client cntxt, MalBlkPtr mb, Ma
ht = getTypeName(TYPE_oid);
tt = getTypeName(getBatType(tpe));
snprintf(buf,BUFSIZ,"%s:= bat.new(:%s,%s);", *nme, ht,tt );
- len = (int) strlen(buf);
+ len = strlen(buf);
snprintf(buf+len,BUFSIZ-len,"%s:= io.import(%s,tuples);", *nme,
*nme);
/* and execute the request */
diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -1412,7 +1412,7 @@ sql2pcre(str *r, const char *pat, const
static str
pat2pcre(str *r, const char *pat)
{
- int len = (int) strlen(pat);
+ size_t len = strlen(pat);
char *ppat = GDKmalloc(len*2+3 /* 3 = "^'the translated regexp'$0" */);
int start = 0;
diff --git a/monetdb5/optimizer/opt_remap.c b/monetdb5/optimizer/opt_remap.c
--- a/monetdb5/optimizer/opt_remap.c
+++ b/monetdb5/optimizer/opt_remap.c
@@ -350,7 +350,7 @@ OPTremapSwitched(Client cntxt, MalBlkPtr
/* always restore the allocated function name */
getVarConstant(mb, getArg(pci, 2)).val.sval= fcn;
assert(strlen(fcn) <= INT_MAX);
- getVarConstant(mb, getArg(pci, 2)).len= (int) strlen(fcn);
+ getVarConstant(mb, getArg(pci, 2)).len = strlen(fcn);
if (r) return 1;
diff --git a/monetdb5/optimizer/opt_remoteQueries.c
b/monetdb5/optimizer/opt_remoteQueries.c
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
