Changeset: 7fee961a4eb0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7fee961a4eb0
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/mal.h
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_builder.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_wrapper.c
Branch: default
Log Message:
Make InstrRecord.fcnname a const char *.
diffs (195 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1439,8 +1439,8 @@ InstrPtr newFcnCallArgs(MalBlkPtr mb, ch
Symbol newFunction(const char *mod, str nme, int kind);
Symbol newFunctionArgs(const char *mod, str nme, int kind, int args);
MalStkPtr newGlobalStack(int size);
-InstrPtr newInstruction(MalBlkPtr mb, const char *modnme, str fcnnme);
-InstrPtr newInstructionArgs(MalBlkPtr mb, const char *modnme, str fcnnme, int
args);
+InstrPtr newInstruction(MalBlkPtr mb, const char *modnme, const char *fcnnme);
+InstrPtr newInstructionArgs(MalBlkPtr mb, const char *modnme, const char
*fcnnme, int args);
MalBlkPtr newMalBlk(int elements);
int newMalBlkStmt(MalBlkPtr mb, int elements);
Plant newPlant(MalBlkPtr mb);
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -161,8 +161,8 @@ typedef struct {
lng totticks; /* total time spent on this
instruction. */
lng wbytes; /* number of bytes
produced in last instruction */
/* the core admin */
- const char *modname; /* module context,
reference into namespace */
- str fcnname; /* function name, reference
into namespace */
+ const char *modname; /* module context, reference into
namespace */
+ const char *fcnname; /* function name, reference into
namespace */
int argc, retc, maxarg; /* total and result argument count */
int argv[FLEXIBLE_ARRAY_MEMBER]; /* at least a few entries */
} *InstrPtr, InstrRecord;
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
@@ -35,7 +35,7 @@ static void setAtomName(InstrPtr pci)
str
malAtomProperty(MalBlkPtr mb, InstrPtr pci)
{
- str name;
+ const char *name;
int tpe;
(void)mb; /* fool compilers */
assert(pci != 0);
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
@@ -93,7 +93,7 @@ newReturnStmt(MalBlkPtr mb)
}
InstrPtr
-newFcnCallArgs(MalBlkPtr mb, char *mod, char *fcn, int args)
+newFcnCallArgs(MalBlkPtr mb, const char *mod, const char *fcn, int args)
{
InstrPtr q = newAssignmentArgs(mb, args);
str fcnName, modName;
@@ -106,7 +106,7 @@ newFcnCallArgs(MalBlkPtr mb, char *mod,
}
InstrPtr
-newFcnCall(MalBlkPtr mb, char *mod, char *fcn)
+newFcnCall(MalBlkPtr mb, const char *mod, const char *fcn)
{
return newFcnCallArgs(mb, mod, fcn, MAXARG);
}
diff --git a/monetdb5/mal/mal_builder.h b/monetdb5/mal/mal_builder.h
--- a/monetdb5/mal/mal_builder.h
+++ b/monetdb5/mal/mal_builder.h
@@ -21,8 +21,8 @@ mal_export InstrPtr newCatchStmt(MalBlkP
mal_export InstrPtr newRaiseStmt(MalBlkPtr mb, str nme);
mal_export InstrPtr newExitStmt(MalBlkPtr mb, str nme);
mal_export InstrPtr newReturnStmt(MalBlkPtr mb);
-mal_export InstrPtr newFcnCall(MalBlkPtr mb, char *mod, char *fcn);
-mal_export InstrPtr newFcnCallArgs(MalBlkPtr mb, char *mod, char *fcn, int
args);
+mal_export InstrPtr newFcnCall(MalBlkPtr mb, const char *mod, const char *fcn);
+mal_export InstrPtr newFcnCallArgs(MalBlkPtr mb, const char *mod, const char
*fcn, int args);
mal_export InstrPtr pushSht(MalBlkPtr mb, InstrPtr q, sht val);
mal_export InstrPtr pushEndInstruction(MalBlkPtr mb);
mal_export InstrPtr pushInt(MalBlkPtr mb, InstrPtr q, int val);
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
@@ -1264,7 +1264,7 @@ retryRead:
if ( m == 0)
m = mb;
if ( m ){
- str nme = getFunctionId(mb->stmt[0]);
+ const char *nme =
getFunctionId(mb->stmt[0]);
str s = strstr(b, nme);
if( s ){
b = s + strlen(nme);
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
@@ -436,7 +436,7 @@ prepareMalBlk(MalBlkPtr mb, str s)
* Allocation of an instruction should always succeed.
*/
InstrPtr
-newInstructionArgs(MalBlkPtr mb, const char *modnme, str fcnnme, int args)
+newInstructionArgs(MalBlkPtr mb, const char *modnme, const char *fcnnme, int
args)
{
InstrPtr p = NULL;
@@ -466,7 +466,7 @@ newInstructionArgs(MalBlkPtr mb, const c
}
InstrPtr
-newInstruction(MalBlkPtr mb, const char *modnme, str fcnnme)
+newInstruction(MalBlkPtr mb, const char *modnme, const char *fcnnme)
{
return newInstructionArgs(mb, modnme, fcnnme, MAXARG);
}
diff --git a/monetdb5/mal/mal_instruction.h b/monetdb5/mal/mal_instruction.h
--- a/monetdb5/mal/mal_instruction.h
+++ b/monetdb5/mal/mal_instruction.h
@@ -121,8 +121,8 @@
mal_export void addMalException(MalBlkPtr mb, str msg);
mal_export void mal_instruction_reset(void);
-mal_export InstrPtr newInstruction(MalBlkPtr mb, const char *modnme, str
fcnnme);
-mal_export InstrPtr newInstructionArgs(MalBlkPtr mb, const char *modnme, str
fcnnme, int args);
+mal_export InstrPtr newInstruction(MalBlkPtr mb, const char *modnme, const
char *fcnnme);
+mal_export InstrPtr newInstructionArgs(MalBlkPtr mb, const char *modnme, const
char *fcnnme, int args);
mal_export InstrPtr copyInstruction(InstrPtr p);
mal_export InstrPtr copyInstructionArgs(InstrPtr p, int args);
mal_export void clrInstruction(InstrPtr p);
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -1102,8 +1102,8 @@ mat_joinNxM(Client cntxt, MalBlkPtr mb,
}
-static char *
-aggr_phase2(char *aggr, int type_dbl)
+static const char *
+aggr_phase2(const char *aggr, int type_dbl)
{
if (aggr == countRef || aggr == count_no_nilRef || (aggr == avgRef &&
type_dbl))
return sumRef;
@@ -1331,7 +1331,7 @@ static int
mat_group_aggr(MalBlkPtr mb, InstrPtr p, mat_t *mat, int b, int g, int e)
{
int tp = getArgType(mb,p,0), k, tp2 = 0, tpe = getBatType(tp);
- char *aggr2 = aggr_phase2(getFunctionId(p), tpe == TYPE_dbl);
+ const char *aggr2 = aggr_phase2(getFunctionId(p), tpe == TYPE_dbl);
int isAvg = (getFunctionId(p) == subavgRef);
InstrPtr ai1 = newInstructionArgs(mb, matRef, packRef,
mat[b].mi->argc), ai10 = NULL, ai11 = NULL, ai2;
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -413,7 +413,7 @@ validatePipe(MalBlkPtr mb)
for (i = 1; i < mb->stop - 1; i++){
p = getInstrPtr(mb, i);
- char *fname = getFunctionId(p);
+ const char *fname = getFunctionId(p);
if (fname != NULL) {
if (strcmp(fname, "deadcode") == 0)
deadcode = TRUE;
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -586,7 +586,7 @@ int isFragmentGroup2(InstrPtr p){
inline int isSelect(InstrPtr p)
{
- char *func = getFunctionId(p);
+ const char *func = getFunctionId(p);
size_t l = func?strlen(func):0;
return (l >= 6 && strcmp(func+l-6,"select") == 0);
@@ -594,7 +594,7 @@ inline int isSelect(InstrPtr p)
inline int isSubJoin(InstrPtr p)
{
- char *func = getFunctionId(p);
+ const char *func = getFunctionId(p);
size_t l = func?strlen(func):0;
return (l >= 7 && strcmp(func+l-7,"join") == 0);
@@ -638,4 +638,3 @@ isOptimizerEnabled(MalBlkPtr mb, str opt
}
return 0;
}
-
diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -99,7 +99,7 @@ struct{
str OPTwrapper (Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p){
str modnme = "(NONE)";
- str fcnnme = "(NONE)";
+ const char *fcnnme = "(NONE)";
Symbol s= NULL;
int i;
char optimizer[256];
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
