Changeset: 6963f27a434e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6963f27a434e
Modified Files:
sql/server/rel_schema.c
sql/server/rel_select.c
sql/storage/store.c
Branch: default
Log Message:
Merge with Aug2024 branch.
diffs (239 lines):
diff --git a/debian/libmonetdb5-server-cfitsio.install
b/debian/monetdb-cfitsio.install
rename from debian/libmonetdb5-server-cfitsio.install
rename to debian/monetdb-cfitsio.install
diff --git a/debian/libmonetdb5-server-geom.install
b/debian/monetdb-geom.install
rename from debian/libmonetdb5-server-geom.install
rename to debian/monetdb-geom.install
diff --git a/debian/monetdb5-server-dev.install
b/debian/monetdb-server-dev.install
rename from debian/monetdb5-server-dev.install
rename to debian/monetdb-server-dev.install
diff --git a/debian/monetdb5-server.dirs b/debian/monetdb-server.dirs
rename from debian/monetdb5-server.dirs
rename to debian/monetdb-server.dirs
diff --git a/debian/monetdb5-server.docs b/debian/monetdb-server.docs
rename from debian/monetdb5-server.docs
rename to debian/monetdb-server.docs
diff --git a/debian/monetdb5-server.install b/debian/monetdb-server.install
rename from debian/monetdb5-server.install
rename to debian/monetdb-server.install
diff --git a/debian/monetdb5-server.manpages b/debian/monetdb-server.manpages
rename from debian/monetdb5-server.manpages
rename to debian/monetdb-server.manpages
diff --git a/debian/monetdb5-server.postinst b/debian/monetdb-server.postinst
rename from debian/monetdb5-server.postinst
rename to debian/monetdb-server.postinst
diff --git a/debian/monetdb5-sql-dev.install b/debian/monetdb-sql-dev.install
rename from debian/monetdb5-sql-dev.install
rename to debian/monetdb-sql-dev.install
diff --git a/debian/monetdb5-sql.README.Debian
b/debian/monetdb-sql.README.Debian
rename from debian/monetdb5-sql.README.Debian
rename to debian/monetdb-sql.README.Debian
diff --git a/debian/monetdb5-sql.default b/debian/monetdb-sql.default
rename from debian/monetdb5-sql.default
rename to debian/monetdb-sql.default
diff --git a/debian/monetdb5-sql.dirs b/debian/monetdb-sql.dirs
rename from debian/monetdb5-sql.dirs
rename to debian/monetdb-sql.dirs
diff --git a/debian/monetdb5-sql.docs b/debian/monetdb-sql.docs
rename from debian/monetdb5-sql.docs
rename to debian/monetdb-sql.docs
diff --git a/debian/monetdb5-sql.init.d b/debian/monetdb-sql.init.d
rename from debian/monetdb5-sql.init.d
rename to debian/monetdb-sql.init.d
diff --git a/debian/monetdb5-sql.install b/debian/monetdb-sql.install
rename from debian/monetdb5-sql.install
rename to debian/monetdb-sql.install
diff --git a/debian/monetdb5-sql.manpages b/debian/monetdb-sql.manpages
rename from debian/monetdb5-sql.manpages
rename to debian/monetdb-sql.manpages
diff --git a/debian/monetdb5-sql.postinst b/debian/monetdb-sql.postinst
rename from debian/monetdb5-sql.postinst
rename to debian/monetdb-sql.postinst
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -2078,7 +2078,7 @@ dumpPointsPolygon(BAT *idBAT, BAT *geomB
const int lvlDigitsNum = 10; //MAX_UNIT = 4,294,967,295
size_t pathLength = strlen(path);
char *newPath;
- char *extraStr = ",";
+ const char extraStr[] = ",";
int extraLength = 1;
//get the exterior ring of the polygon
@@ -2133,7 +2133,7 @@ dumpPointsMultiGeometry(BAT *idBAT, BAT
unsigned int lvl = 0;
size_t pathLength = strlen(path);
char *newPath = NULL;
- char *extraStr = ",";
+ const char extraStr[] = ",";
int extraLength = 1;
geometriesNum = GEOSGetNumGeometries_r(geoshandle, geosGeometry);
diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c
--- a/monetdb5/extras/rapi/rapi.c
+++ b/monetdb5/extras/rapi/rapi.c
@@ -358,7 +358,7 @@ static BAT* sexp_to_bat(SEXP s, int type
return b;
}
-const char* rapi_enableflag = "embedded_r";
+const char rapi_enableflag[] = "embedded_r";
static bool RAPIEnabled(void) {
return (GDKgetenv_istrue(rapi_enableflag)
diff --git a/monetdb5/modules/mal/bbp.c b/monetdb5/modules/mal/bbp.c
--- a/monetdb5/modules/mal/bbp.c
+++ b/monetdb5/modules/mal/bbp.c
@@ -437,8 +437,8 @@ CMDbbp(bat *ID, bat *NS, bat *TT, bat *C
if (bn->batCacheid != 0) {
lng l = BATcount(bn);
int heat_ = 0, len;
- char *loc = BBP_status(i) & BBPLOADED ? "load"
: "disk";
- char *mode = "persistent";
+ const char *loc = BBP_status(i) & BBPLOADED ?
"load" : "disk";
+ const char *mode = "persistent";
int refs = BBP_refs(i);
int lrefs = BBP_lrefs(i);
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1262,7 +1262,7 @@ SQLchannelcmd(Client c, backend *be)
sqlcleanup(be, 0);
return msg;
}
- static const char* columnar_protocol = "columnar_protocol ";
+ static const char columnar_protocol[] = "columnar_protocol ";
if (strncmp(in->buf + in->pos, columnar_protocol,
strlen(columnar_protocol)) == 0) {
v = (int) strtol(in->buf + in->pos + strlen(columnar_protocol),
NULL, 10);
diff --git a/sql/backends/monet5/sql_user.c b/sql/backends/monet5/sql_user.c
--- a/sql/backends/monet5/sql_user.c
+++ b/sql/backends/monet5/sql_user.c
@@ -427,7 +427,7 @@ monet5_create_privileges(ptr _mvc, sql_s
assert(schema_id == 2000);
sqlstore *store = m->session->tr->store;
- char *username = "monetdb";
+ const char *username = "monetdb";
char *password = initpasswd ? mcrypt_BackendSum(initpasswd,
strlen(initpasswd)) : mcrypt_BackendSum("monetdb", strlen("monetdb"));
char *hash = NULL;
if (password == NULL ||
@@ -439,8 +439,8 @@ monet5_create_privileges(ptr _mvc, sql_s
}
free(password);
- char *fullname = "MonetDB Admin";
- char *schema_path = default_schema_path;
+ const char *fullname = "MonetDB Admin";
+ const char *schema_path = default_schema_path;
// default values
char *optimizer = default_optimizer;
lng max_memory = 0;
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -1109,7 +1109,7 @@ table_element(sql_query *query, symbol *
(partition_find_part(sql->session->tr, t, NULL) &&
(s->token == SQL_DROP_COLUMN || s->token == SQL_COLUMN
|| s->token == SQL_CONSTRAINT ||
s->token == SQL_DEFAULT || s->token ==
SQL_DROP_DEFAULT || s->token == SQL_NOT_NULL || s->token == SQL_NULL ||
s->token == SQL_DROP_CONSTRAINT)))){
- char *msg = "";
+ const char *msg = "";
switch (s->token) {
case SQL_TABLE:
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -3814,7 +3814,8 @@ static sql_exp *
}
return e;
}
- char *type = "unknown", *uaname = SA_NEW_ARRAY(sql->ta, char,
strlen(aname) + 1);
+ const char *type = "unknown";
+ char *uaname = SA_NEW_ARRAY(sql->ta, char, strlen(aname) + 1);
if (!list_empty(exps)) {
sql_exp *e = exps->h->data;
@@ -6031,7 +6032,7 @@ rel_setquery(sql_query *query, symbol *q
if (!corresponding && list_length(t1->exps) != list_length(t2->exps)) {
int t1nrcols = list_length(t1->exps);
int t2nrcols = list_length(t2->exps);
- char *op = "UNION";
+ const char *op = "UNION";
if (q->token == SQL_EXCEPT)
op = "EXCEPT";
else if (q->token == SQL_INTERSECT)
diff --git a/sql/server/sql_semantic.c b/sql/server/sql_semantic.c
--- a/sql/server/sql_semantic.c
+++ b/sql/server/sql_semantic.c
@@ -970,7 +970,7 @@ result_datatype(sql_subtype *super, sql_
/* case a strings */
if (EC_VARCHAR(lclass) || EC_VARCHAR(rclass)) {
- char *tpe = "varchar";
+ const char *tpe = "varchar";
unsigned int digits = 0;
if (!EC_VARCHAR(lclass)) {
tpe = r->type->base.name;
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -2802,7 +2802,7 @@ pick_tmp_name(str filename)
if (ext == NULL) {
return strcat(name, "..tmp");
} else {
- char *tmp = "..tmp.";
+ const char tmp[] = "..tmp.";
size_t tmplen = strlen(tmp);
memmove(ext + tmplen, ext, strlen(ext) + 1);
memmove(ext, tmp, tmplen);
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -706,9 +706,9 @@ command_status(int argc, char *argv[])
{
bool doall = true; /* we default to showing all */
int mode = 1; /* 0=crash, 1=short, 2=long */
- char *state = "rbscl"; /* contains states to show */
+ const char *state = "rbscl"; /* contains states to show */
int i;
- char *p;
+ const char *p;
char *e;
sabdb *stats;
sabdb *orig;
@@ -2328,7 +2328,7 @@ command_snapshot_write(int argc, char *a
}
msab_freeStatus(&stats);
- char *merocmd = "snapshot stream";
+ const char merocmd[] = "snapshot stream";
msg = control_send_callback(
&out, mero_host, mero_port, dbname,
diff --git a/tools/merovingian/utils/utils.c b/tools/merovingian/utils/utils.c
--- a/tools/merovingian/utils/utils.c
+++ b/tools/merovingian/utils/utils.c
@@ -78,7 +78,7 @@ void
readConfFileFull(confkeyval *list, FILE *cnf) {
char buf[1024];
char *key, *val;
- char *separator = "=";
+ const char *separator = "=";
char *err;
confkeyval *t = list;
int cnt = 0;
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -115,7 +115,7 @@ static void
monet_hello(void)
{
double sz_mem_h;
- char *qc = " kMGTPE";
+ const char qc[] = " kMGTPE";
int qi = 0;
printf("# MonetDB 5 server v%s", GDKversion());
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
