Changeset: 6c20e6724f96 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c20e6724f96
Modified Files:
monetdb5/extras/mal_optimizer_template/opt_sql_append.c
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_factory.c
monetdb5/mal/mal_function.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_module.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_namespace.h
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_recycle.c
monetdb5/mal/mal_session.c
monetdb5/modules/mal/factories.c
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/language.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/remote.c
monetdb5/optimizer/opt_coercion.c
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_matpack.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_wrapper.c
monetdb5/optimizer/optimizer.c
monetdb5/scheduler/run_memo.c
monetdb5/scheduler/run_pipeline.c
monetdb5/scheduler/srvpool.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
tools/embedded/rpackage/configure
Branch: Jun2016
Log Message:
Length for getName/putName redundant in almost all cases
diffs (truncated from 1459 to 300 lines):
diff --git a/monetdb5/extras/mal_optimizer_template/opt_sql_append.c
b/monetdb5/extras/mal_optimizer_template/opt_sql_append.c
--- a/monetdb5/extras/mal_optimizer_template/opt_sql_append.c
+++ b/monetdb5/extras/mal_optimizer_template/opt_sql_append.c
@@ -276,7 +276,7 @@ str OPTsql_append(Client cntxt, MalBlkPt
modnme= getArgDefault(mb,p,1);
fcnnme= getArgDefault(mb,p,2);
}
- s= findSymbol(cntxt->nspace,
putName(modnme,strlen(modnme)),putName(fcnnme,strlen(fcnnme)));
+ s= findSymbol(cntxt->nspace, putName(modnme),putName(fcnnme));
if( s == NULL) {
char buf[1024];
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
@@ -29,7 +29,7 @@ static void setAtomName(InstrPtr pci)
{
char buf[PATHLENGTH];
snprintf(buf, PATHLENGTH, "#%s", getFunctionId(pci));
- setFunctionId(pci, putName(buf, strlen(buf)));
+ setFunctionId(pci, putName(buf));
}
int malAtomProperty(MalBlkPtr mb, InstrPtr pci)
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
@@ -46,8 +46,8 @@ newStmt(MalBlkPtr mb, const char *module
if (q == NULL)
return NULL;
- setModuleId(q, putName(module, strlen(module)));
- setFunctionId(q, putName(name, strlen(name)));
+ setModuleId(q, putName(module));
+ setFunctionId(q, putName(name));
setDestVar(q, newTmpVariable(mb, TYPE_any));
if (getDestVar(q) < 0) {
freeInstruction(q);
@@ -88,8 +88,8 @@ newFcnCall(MalBlkPtr mb, char *mod, char
if (q == NULL || mod == NULL || fcn == NULL)
return NULL;
- setModuleId(q, putName(mod, strlen(mod)));
- setFunctionId(q, putName(fcn, strlen(fcn)));
+ setModuleId(q, putName(mod));
+ setFunctionId(q, putName(fcn));
return q;
}
@@ -631,8 +631,8 @@ pushEmptyBAT(MalBlkPtr mb, InstrPtr q, i
{
if (q == NULL)
return NULL;
- getModuleId(q) = getName("bat",3);
- getFunctionId(q) = getName("new",3);
+ getModuleId(q) = getName("bat");
+ getFunctionId(q) = getName("new");
q = pushArgument(mb, q, newTypeVariable(mb,TYPE_void));
q = pushArgument(mb, q, newTypeVariable(mb,getColumnType(tpe)));
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -335,7 +335,7 @@ MCforkClient(Client father)
son->promptlength = strlen(father->prompt);
/* reuse the scopes wherever possible */
if (son->nspace == 0)
- son->nspace = newModule(NULL, putName("child", 5));
+ son->nspace = newModule(NULL, putName("child"));
son->nspace->outer = father->nspace->outer;
}
return son;
diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c
+++ b/monetdb5/mal/mal_debugger.c
@@ -144,8 +144,8 @@ mdbSetBreakRequest(Client cntxt, MalBlkP
mdb->brkBlock[mdb->brkTop] = sym ? sym->def : mb;
mdb->brkPc[mdb->brkTop] = -1;
mdb->brkVar[mdb->brkTop] = -1;
- mdb->brkMod[mdb->brkTop] = putName(modnme, strlen(modnme));
- mdb->brkFcn[mdb->brkTop] = putName(fcnnme, strlen(fcnnme));
+ mdb->brkMod[mdb->brkTop] = putName(modnme);
+ mdb->brkFcn[mdb->brkTop] = putName(fcnnme);
fcnnme--;
*fcnnme = '.';
mdb->brkRequest[mdb->brkTop] = GDKstrdup(request);
@@ -255,8 +255,8 @@ int
mdbSetTrap(Client cntxt, str modnme, str fcnnme, int flag)
{
Symbol s;
- s = findSymbol(cntxt->nspace, putName(modnme, strlen(modnme)),
- putName(fcnnme, strlen(fcnnme)));
+ s = findSymbol(cntxt->nspace, putName(modnme),
+ putName(fcnnme));
if (s == NULL)
return -1;
while (s) {
@@ -358,7 +358,7 @@ mdbLocateMalBlk(Client cntxt, MalBlkPtr
if( idx < 0)
return NULL;
}
- fsym = findSymbolInModule(findModule(cntxt->nspace, putName(b,
strlen(b))), fcnname + 1);
+ fsym = findSymbolInModule(findModule(cntxt->nspace,
putName(b)), fcnname + 1);
*fcnname = '.';
if (h)
*h = '[';
@@ -517,7 +517,7 @@ retryRead:
*fcnname = 0;
fcnname++;
}
- fsym = findModule(cntxt->nspace,
putName(modname, strlen(modname)));
+ fsym = findModule(cntxt->nspace,
putName(modname));
if (fsym == cntxt->nspace && strcmp(modname,
"user")) {
mnstr_printf(out, "#module '%s' not
found\n", modname);
@@ -587,7 +587,7 @@ retryRead:
modname = b;
fcnname = strchr(b, '.');
if (fcnname == NULL) {
- fsym = findModule(cntxt->nspace,
putName(modname, strlen(modname)));
+ fsym = findModule(cntxt->nspace,
putName(modname));
if (fsym == 0) {
mnstr_printf(out, "#%s module
not found\n", modname);
continue;
@@ -603,7 +603,7 @@ retryRead:
}
*fcnname = 0;
fcnname++;
- fsym = findModule(cntxt->nspace,
putName(modname, strlen(modname)));
+ fsym = findModule(cntxt->nspace,
putName(modname));
if (fsym == 0) {
mnstr_printf(out, "#%s module not
found\n", modname);
continue;
@@ -875,7 +875,7 @@ retryRead:
continue;
}
/* optionally dump the complete module
*/
- fsym = findModule(cntxt->nspace,
putName(b, strlen(b)));
+ fsym = findModule(cntxt->nspace,
putName(b));
if (fsym == 0) {
mnstr_printf(out, "#'%s' not
found\n", b);
continue;
diff --git a/monetdb5/mal/mal_factory.c b/monetdb5/mal/mal_factory.c
--- a/monetdb5/mal/mal_factory.c
+++ b/monetdb5/mal/mal_factory.c
@@ -361,7 +361,7 @@ shutdownFactoryByName(Client cntxt, Modu
if (s == NULL){
throw(MAL, "factory.remove",
OPERATION_FAILED " SQL entry '%s' not
found",
- putName(nme, strlen(nme)));
+ putName(nme));
}
stk = pl->stk;
MSresetVariables(cntxt, pl->factory, stk, 0);
diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c
--- a/monetdb5/mal/mal_function.c
+++ b/monetdb5/mal/mal_function.c
@@ -537,7 +537,7 @@ setLifespan(MalBlkPtr mb)
InstrPtr p;
int *blk;
Lifespan span= newLifespan(mb);
- str lang = putName("language",8), dataflow= putName("dataflow",8);
+ str lang = putName("language"), dataflow= putName("dataflow");
if (span == NULL)
return NULL;
@@ -715,7 +715,7 @@ void chkDeclarations(stream *out, MalBlk
InstrPtr p;
short blks[MAXDEPTH], top= 0, blkId=1;
int *decl;
- str lang = putName("language",8), dataflow= putName("dataflow",8);
+ str lang = putName("language"), dataflow= putName("dataflow");
int dflow = -1;
decl = (int*) GDKzalloc(sizeof(int) * mb->vtop);
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
@@ -30,7 +30,7 @@ newSymbol(str nme, int kind)
GDKerror("newSymbol:" MAL_MALLOC_FAIL);
return NULL;
}
- cur->name = putName(nme, strlen(nme));
+ cur->name = putName(nme);
cur->kind = kind;
cur->peer = NULL;
cur->def = newMalBlk(kind == FUNCTIONsymbol?MAXVARS : MAXARG, kind ==
FUNCTIONsymbol? STMT_INCREMENT : 1);
diff --git a/monetdb5/mal/mal_module.c b/monetdb5/mal/mal_module.c
--- a/monetdb5/mal/mal_module.c
+++ b/monetdb5/mal/mal_module.c
@@ -63,7 +63,7 @@ void setModuleJump(str nme, Module cur){
Module newModule(Module scope, str nme){
Module cur;
- nme = putName(nme,strlen(nme));
+ nme = putName(nme);
assert(nme != NULL);
cur = (Module) GDKzalloc(sizeof(ModuleRecord));
if( cur == NULL){
diff --git a/monetdb5/mal/mal_namespace.c b/monetdb5/mal/mal_namespace.c
--- a/monetdb5/mal/mal_namespace.c
+++ b/monetdb5/mal/mal_namespace.c
@@ -78,10 +78,15 @@ void mal_namespace_reset(void) {
/*
* Before a name is being stored we should check for its occurrence first.
* The administration is initialized incrementally.
- * Beware, the routine getName relies on datastructure maintenance that
+ * Beware, the routine getName relies on data structure maintenance that
* is conflict free.
*/
-str getName(const char *nme, size_t len)
+
+str getName(const char *nme) {
+ return getNameLen(nme, strlen(nme));
+}
+
+str getNameLen(const char *nme, size_t len)
{
NamePtr n;
size_t l = len, key;
@@ -112,12 +117,16 @@ str getName(const char *nme, size_t len)
*/
void delName(const char *nme, size_t len){
str n;
- n= getName(nme,len);
+ n= getNameLen(nme,len);
if( nme[0]==0 || n == 0) return ;
/*Namespace garbage collection not available yet */
}
-str putName(const char *nme, size_t len)
+str putName(const char *nme) {
+ return putNameLen(nme, strlen(nme));
+}
+
+str putNameLen(const char *nme, size_t len)
{
size_t l,k;
int key;
@@ -125,7 +134,7 @@ str putName(const char *nme, size_t len)
str fnd;
NamePtr n;
- fnd = getName(nme,len);
+ fnd = getNameLen(nme,len);
if ( fnd )
return fnd;
@@ -164,5 +173,5 @@ str putName(const char *nme, size_t len)
ehash[key] = n;
}
MT_lock_unset(&mal_namespaceLock);
- return putName(nme, len); /* just to be sure */
+ return putNameLen(nme, len); /* just to be sure */
}
diff --git a/monetdb5/mal/mal_namespace.h b/monetdb5/mal/mal_namespace.h
--- a/monetdb5/mal/mal_namespace.h
+++ b/monetdb5/mal/mal_namespace.h
@@ -11,8 +11,10 @@
mal_export void initNamespace(void);
mal_export void finishNamespace(void);
-mal_export str putName(const char *nme, size_t len);
-mal_export str getName(const char *nme, size_t len);
+mal_export str putName(const char *nme);
+mal_export str putNameLen(const char *nme, size_t len);
+mal_export str getName(const char *nme);
+mal_export str getNameLen(const char *nme, size_t len);
mal_export void delName(const char *nme, size_t len);
#define MAXIDENTLEN 1024
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
@@ -944,7 +944,7 @@ parseAtom(Client cntxt)
return parseError(cntxt, "atom name expected\n");
/* parse: ATOM id:type */
- modnme = putName(nxt, l);
+ modnme = putNameLen(nxt, l);
advance(cntxt, l);
if (currChar(cntxt) != ':')
tpe = TYPE_void; /* no type qualifier */
@@ -970,13 +970,13 @@ parseLibrary(Client cntxt)
if ((l = idLength(cntxt)) <= 0) {
if ((l = cstToken(cntxt, &cst)) && cst.vtype == TYPE_str) {
advance(cntxt, l);
- libnme = putName(nxt + 1, l - 2);
+ libnme = putNameLen(nxt + 1, l - 2);
} else
return parseError(cntxt, "<library name> or <library
path> expected\n");
} else
- libnme = putName(nxt, l);
+ libnme = putNameLen(nxt, l);
s = loadLibrary(libnme, TRUE);
- (void) putName(nxt, l);
+ (void) putNameLen(nxt, l);
if (s){
mnstr_printf(cntxt->fdout, "#WARNING: %s\n", s);
GDKfree(s);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
