Changeset: 251a9dca7b2c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=251a9dca7b2c
Modified Files:
clients/Tests/exports.stable.out
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_pipes.h
sql/backends/monet5/sql.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_result.h
sql/server/sql_env.c
sql/server/sql_env.h
Branch: default
Log Message:
Use more const char *.
diffs (truncated from 458 to 300 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
@@ -1928,8 +1928,8 @@ str XMLxmltext(str *s, xml *x);
str abortRef;
str actionRef;
void addMalException(MalBlkPtr mb, str msg);
-str addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name);
-str addPipeDefinition(Client cntxt, str name, str pipe);
+str addOptimizerPipe(Client cntxt, MalBlkPtr mb, const char *name);
+str addPipeDefinition(Client cntxt, const char *name, const char *pipe);
void addtoMalBlkHistory(MalBlkPtr mb);
str affectedRowsRef;
str aggrRef;
@@ -2016,7 +2016,7 @@ str columnBindRef;
str columnRef;
str commitRef;
str compileAllOptimizers(Client cntxt);
-str compileOptimizer(Client cntxt, str name);
+str compileOptimizer(Client cntxt, const char *name);
str compileString(Symbol *fcn, Client c, str s);
str connectRef;
str convertConstant(malType type, ValPtr vr);
@@ -2223,7 +2223,7 @@ int isMatLeftJoinOp(InstrPtr q);
int isMultiplex(InstrPtr q);
int isNotUsedIn(InstrPtr p, int start, int a);
int isOptimizerEnabled(MalBlkPtr mb, str opt);
-int isOptimizerPipe(str name);
+int isOptimizerPipe(const char *name);
int isOrderby(InstrPtr q);
int isSample(InstrPtr q);
int isSealedFunction(InstrPtr q);
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
@@ -241,7 +241,7 @@ optPipeInit(void)
/* the session_pipe is the one defined by the user */
str
-addPipeDefinition(Client cntxt, str name, str pipe)
+addPipeDefinition(Client cntxt, const char *name, const char *pipe)
{
int i;
str msg;
@@ -292,7 +292,7 @@ addPipeDefinition(Client cntxt, str name
}
int
-isOptimizerPipe(str name)
+isOptimizerPipe(const char *name)
{
int i;
@@ -426,7 +426,7 @@ validateOptimizerPipes(void)
* then copy the statements to the end of the MAL plan
*/
str
-compileOptimizer(Client cntxt, str name)
+compileOptimizer(Client cntxt, const char *name)
{
int i, j;
char buf[2048];
@@ -472,7 +472,7 @@ compileAllOptimizers(Client cntxt)
return msg;
}
str
-addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name)
+addOptimizerPipe(Client cntxt, MalBlkPtr mb, const char *name)
{
int i, j, k;
InstrPtr p,q;
diff --git a/monetdb5/optimizer/opt_pipes.h b/monetdb5/optimizer/opt_pipes.h
--- a/monetdb5/optimizer/opt_pipes.h
+++ b/monetdb5/optimizer/opt_pipes.h
@@ -13,10 +13,10 @@
mal_export str getPipeDefinition(str name);
mal_export str getPipeCatalog(bat *nme, bat *def, bat *stat);
-mal_export str addPipeDefinition(Client cntxt, str name, str pipe);
-mal_export int isOptimizerPipe(str name);
-mal_export str addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name);
-mal_export str compileOptimizer(Client cntxt, str name);
+mal_export str addPipeDefinition(Client cntxt, const char *name, const char
*pipe);
+mal_export int isOptimizerPipe(const char *name);
+mal_export str addOptimizerPipe(Client cntxt, MalBlkPtr mb, const char *name);
+mal_export str compileOptimizer(Client cntxt, const char *name);
mal_export str compileAllOptimizers(Client cntxt);
mal_export void opt_pipes_reset(void);
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -533,7 +533,7 @@ setVariable(Client cntxt, MalBlkPtr mb,
int *res = getArgReference_int(stk, pci, 0);
mvc *m = NULL;
str msg;
- str varname = *getArgReference_str(stk, pci, 2);
+ const char *varname = *getArgReference_str(stk, pci, 2);
int mtype = getArgType(mb, pci, 3);
ValRecord *src;
char buf[BUFSIZ];
@@ -547,7 +547,7 @@ setVariable(Client cntxt, MalBlkPtr mb,
if (mtype < 0 || mtype >= 255)
throw(SQL, "sql.setVariable", SQLSTATE(42100) "Variable type
error");
if (strcmp("optimizer", varname) == 0) {
- str newopt = *getArgReference_str(stk, pci, 3);
+ const char *newopt = *getArgReference_str(stk, pci, 3);
if (newopt) {
if (!isOptimizerPipe(newopt) && strchr(newopt, (int)
';') == 0) {
throw(SQL, "sql.setVariable", SQLSTATE(42100)
"optimizer '%s' unknown", newopt);
@@ -589,7 +589,7 @@ getVariable(Client cntxt, MalBlkPtr mb,
int mtype = getArgType(mb, pci, 0);
mvc *m = NULL;
str msg;
- str varname = *getArgReference_str(stk, pci, 2);
+ const char *varname = *getArgReference_str(stk, pci, 2);
atom *a;
ValRecord *dst, *src;
@@ -646,7 +646,7 @@ mvc_logfile(Client cntxt, MalBlkPtr mb,
{
mvc *m = NULL;
str msg;
- str filename = *getArgReference_str(stk, pci, 1);
+ const char *filename = *getArgReference_str(stk, pci, 1);
if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != NULL)
return msg;
@@ -670,8 +670,8 @@ mvc_next_value(Client cntxt, MalBlkPtr m
str msg;
sql_schema *s;
lng *res = getArgReference_lng(stk, pci, 0);
- str sname = *getArgReference_str(stk, pci, 1);
- str seqname = *getArgReference_str(stk, pci, 2);
+ const char *sname = *getArgReference_str(stk, pci, 1);
+ const char *seqname = *getArgReference_str(stk, pci, 2);
if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != NULL)
return msg;
@@ -704,7 +704,7 @@ mvc_bat_next_value(Client cntxt, MalBlkP
BATiter bi;
bat *res = getArgReference_bat(stk, pci, 0);
bat sid = *getArgReference_bat(stk, pci, 1);
- str seqname = *getArgReference_str(stk, pci, 2);
+ const char *seqname = *getArgReference_str(stk, pci, 2);
if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != NULL)
return msg;
@@ -772,8 +772,8 @@ mvc_get_value(Client cntxt, MalBlkPtr mb
str msg;
sql_schema *s;
lng *res = getArgReference_lng(stk, pci, 0);
- str sname = *getArgReference_str(stk, pci, 1);
- str seqname = *getArgReference_str(stk, pci, 2);
+ const char *sname = *getArgReference_str(stk, pci, 1);
+ const char *seqname = *getArgReference_str(stk, pci, 2);
if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != NULL)
return msg;
@@ -814,8 +814,8 @@ mvc_restart_seq(Client cntxt, MalBlkPtr
str msg;
sql_schema *s;
lng *res = getArgReference_lng(stk, pci, 0);
- str sname = *getArgReference_str(stk, pci, 1);
- str seqname = *getArgReference_str(stk, pci, 2);
+ const char *sname = *getArgReference_str(stk, pci, 1);
+ const char *seqname = *getArgReference_str(stk, pci, 2);
lng start = *getArgReference_lng(stk, pci, 3);
if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != NULL)
@@ -837,7 +837,7 @@ mvc_restart_seq(Client cntxt, MalBlkPtr
}
static BAT *
-mvc_bind_dbat(mvc *m, char *sname, char *tname, int access)
+mvc_bind_dbat(mvc *m, const char *sname, const char *tname, int access)
{
sql_trans *tr = m->session->tr;
BAT *b = NULL;
@@ -885,9 +885,9 @@ mvc_bind_wrap(Client cntxt, MalBlkPtr mb
int coltype = getBatType(getArgType(mb, pci, 0));
mvc *m = NULL;
str msg;
- str sname = *getArgReference_str(stk, pci, 2 + upd);
- str tname = *getArgReference_str(stk, pci, 3 + upd);
- str cname = *getArgReference_str(stk, pci, 4 + upd);
+ const char *sname = *getArgReference_str(stk, pci, 2 + upd);
+ const char *tname = *getArgReference_str(stk, pci, 3 + upd);
+ const char *cname = *getArgReference_str(stk, pci, 4 + upd);
int access = *getArgReference_int(stk, pci, 5 + upd);
if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != NULL)
@@ -992,9 +992,9 @@ mvc_bind_idxbat_wrap(Client cntxt, MalBl
int coltype = getBatType(getArgType(mb, pci, 0));
mvc *m = NULL;
str msg;
- str sname = *getArgReference_str(stk, pci, 2 + upd);
- str tname = *getArgReference_str(stk, pci, 3 + upd);
- str iname = *getArgReference_str(stk, pci, 4 + upd);
+ const char *sname = *getArgReference_str(stk, pci, 2 + upd);
+ const char *tname = *getArgReference_str(stk, pci, 3 + upd);
+ const char *iname = *getArgReference_str(stk, pci, 4 + upd);
int access = *getArgReference_int(stk, pci, 5 + upd);
if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != NULL)
@@ -1096,9 +1096,9 @@ mvc_append_wrap(Client cntxt, MalBlkPtr
int *res = getArgReference_int(stk, pci, 0);
mvc *m = NULL;
str msg;
- str sname = *getArgReference_str(stk, pci, 2);
- str tname = *getArgReference_str(stk, pci, 3);
- str cname = *getArgReference_str(stk, pci, 4);
+ const char *sname = *getArgReference_str(stk, pci, 2);
+ const char *tname = *getArgReference_str(stk, pci, 3);
+ const char *cname = *getArgReference_str(stk, pci, 4);
ptr ins = getArgReference(stk, pci, 5);
int tpe = getArgType(mb, pci, 5);
sql_schema *s;
@@ -1154,9 +1154,9 @@ mvc_update_wrap(Client cntxt, MalBlkPtr
int *res = getArgReference_int(stk, pci, 0);
mvc *m = NULL;
str msg;
- str sname = *getArgReference_str(stk, pci, 2);
- str tname = *getArgReference_str(stk, pci, 3);
- str cname = *getArgReference_str(stk, pci, 4);
+ const char *sname = *getArgReference_str(stk, pci, 2);
+ const char *tname = *getArgReference_str(stk, pci, 3);
+ const char *cname = *getArgReference_str(stk, pci, 4);
bat Tids = *getArgReference_bat(stk, pci, 5);
bat Upd = *getArgReference_bat(stk, pci, 6);
BAT *tids, *upd;
@@ -1222,8 +1222,8 @@ mvc_clear_table_wrap(Client cntxt, MalBl
mvc *m = NULL;
str msg;
lng *res = getArgReference_lng(stk, pci, 0);
- str sname = *getArgReference_str(stk, pci, 1);
- str tname = *getArgReference_str(stk, pci, 2);
+ const char *sname = *getArgReference_str(stk, pci, 1);
+ const char *tname = *getArgReference_str(stk, pci, 2);
if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != NULL)
return msg;
@@ -1246,8 +1246,8 @@ mvc_delete_wrap(Client cntxt, MalBlkPtr
int *res = getArgReference_int(stk, pci, 0);
mvc *m = NULL;
str msg;
- str sname = *getArgReference_str(stk, pci, 2);
- str tname = *getArgReference_str(stk, pci, 3);
+ const char *sname = *getArgReference_str(stk, pci, 2);
+ const char *tname = *getArgReference_str(stk, pci, 3);
ptr ins = getArgReference(stk, pci, 4);
int tpe = getArgType(mb, pci, 4);
BAT *b = NULL;
@@ -1755,8 +1755,8 @@ SQLtid(Client cntxt, MalBlkPtr mb, MalSt
mvc *m = NULL;
str msg;
sql_trans *tr;
- str sname = *getArgReference_str(stk, pci, 2);
- str tname = *getArgReference_str(stk, pci, 3);
+ const char *sname = *getArgReference_str(stk, pci, 2);
+ const char *tname = *getArgReference_str(stk, pci, 3);
sql_schema *s;
sql_table *t;
@@ -1905,8 +1905,8 @@ str
mvc_export_table_wrap( Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
int *res_id =getArgReference_int(stk,pci,0);
- str filename = *getArgReference_str(stk,pci,1);
- str format = *getArgReference_str(stk,pci,2);
+ const char *filename = *getArgReference_str(stk,pci,1);
+ const char *format = *getArgReference_str(stk,pci,2);
unsigned char *tsep = NULL, *rsep = NULL, *ssep = NULL, *ns = NULL;
unsigned char *T = (unsigned char *) *getArgReference_str(stk, pci, 3);
unsigned char *R = (unsigned char *) *getArgReference_str(stk, pci, 4);
@@ -2104,7 +2104,7 @@ mvc_export_row_wrap( Client cntxt, MalBl
{
int *res_id= getArgReference_int(stk, pci,0);
str filename = * getArgReference_str(stk,pci,1);
- str format = *getArgReference_str(stk,pci,2);
+ const char *format = *getArgReference_str(stk,pci,2);
unsigned char *tsep = NULL, *rsep = NULL, *ssep = NULL, *ns = NULL;
unsigned char *T = (unsigned char *) *getArgReference_str(stk, pci, 3);
unsigned char *R = (unsigned char *) *getArgReference_str(stk, pci, 4);
@@ -2271,7 +2271,7 @@ mvc_declared_table_wrap(Client cntxt, Ma
str msg;
sql_schema *s = NULL;
int *res_id = getArgReference_int(stk, pci, 0);
- str name = *getArgReference_str(stk, pci, 1);
+ const char *name = *getArgReference_str(stk, pci, 1);
if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != NULL)
return msg;
@@ -2296,9 +2296,9 @@ mvc_declared_table_column_wrap(Client cn
sql_type *type = NULL;
sql_subtype tpe;
int rs = *getArgReference_int(stk, pci, 1);
- str tname = *getArgReference_str(stk, pci, 2);
- str name = *getArgReference_str(stk, pci, 3);
- str typename = *getArgReference_str(stk, pci, 4);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
