Changeset: 7647d1996503 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7647d1996503
Branch: default
Log Message:
Merge with Jun2023 branch.
diffs (truncated from 385 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
@@ -916,7 +916,7 @@ const char *fetchRef;
int findGDKtype(int type);
Module findModule(Module scope, const char *name);
const char *findRef;
-Scenario findScenario(str nme);
+Scenario findScenario(const char *nme);
Symbol findSymbol(Module usermodule, const char *mod, const char *fcn);
Symbol findSymbolInModule(Module v, const char *fcn);
int findVariable(MalBlkPtr mb, const char *name);
diff --git a/monetdb5/mal/mal_scenario.c b/monetdb5/mal/mal_scenario.c
--- a/monetdb5/mal/mal_scenario.c
+++ b/monetdb5/mal/mal_scenario.c
@@ -141,7 +141,7 @@ showScenario(stream *f, Scenario scen)
}
Scenario
-findScenario(str nme)
+findScenario(const char *nme)
{
int i;
Scenario scen = scenarioRec;
@@ -153,7 +153,7 @@ findScenario(str nme)
}
void
-showScenarioByName(stream *f, str nme)
+showScenarioByName(stream *f, const char *nme)
{
Scenario scen = findScenario(nme);
@@ -204,7 +204,7 @@ fillScenario(Client c, Scenario scen)
* and execution of the initClientScenario routine.
*/
str
-setScenario(Client c, str nme)
+setScenario(Client c, const char *nme)
{
str msg;
Scenario scen;
diff --git a/monetdb5/mal/mal_scenario.h b/monetdb5/mal/mal_scenario.h
--- a/monetdb5/mal/mal_scenario.h
+++ b/monetdb5/mal/mal_scenario.h
@@ -34,15 +34,15 @@ typedef struct SCENARIO {
} *Scenario;
mal_export Scenario getFreeScenario(void);
-mal_export Scenario findScenario(str nme);
+mal_export Scenario findScenario(const char *nme);
#ifdef LIBMONETDB5
-extern str setScenario(Client c, str nme);
+extern str setScenario(Client c, const char *nme);
extern str runScenario(Client c);
extern str getScenarioLanguage(Client c);
extern void showCurrentScenario(void);
-extern void showScenarioByName(stream *f, str s);
+extern void showScenarioByName(stream *f, const char *s);
extern void showScenario(stream *f, Scenario s);
extern void showAllScenarios(stream *f);
extern void resetScenario(Client c);
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
@@ -182,7 +182,8 @@ SQLexit(Client c)
str
SQLepilogue(void *ret)
{
- char *s = "sql", *m = "msql", *msg;
+ const char *s = "sql", *m = "msql";
+ char *msg;
(void) ret;
msg = SQLexit(NULL);
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -5557,6 +5557,7 @@ sql_update_jun2023(Client c, mvc *sql, s
"create function asciify(x string)\n"
"returns string external name
str.\"asciify\";\n"
+ "grant execute on function
asciify(string) to public;\n"
"create function sys.startswith(x
string, y string)\n"
"returns boolean external name
str.\"startsWith\";\n"
"grant execute on function
startswith(string, string) to public;\n"
diff --git
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
---
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -647,6 +647,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -647,6 +647,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -716,6 +716,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git
a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -641,6 +641,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
@@ -641,6 +641,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
@@ -710,6 +710,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -317,6 +317,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -317,6 +317,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -386,6 +386,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
@@ -386,6 +386,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -317,6 +317,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -317,6 +317,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
@@ -386,6 +386,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git a/sql/test/emptydb/Tests/check.stable.out
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -4223,6 +4223,7 @@ select 'null in fkeys.delete_action', de
[ "grant on function", "sys", "analyze", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "analyze", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "analyze", "public", "EXECUTE",
"monetdb", 0 ]
+[ "grant on function", "sys", "asciify", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "broadcast", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "contains", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "contains", "public", "EXECUTE",
"monetdb", 0 ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.int128
b/sql/test/emptydb/Tests/check.stable.out.int128
--- a/sql/test/emptydb/Tests/check.stable.out.int128
+++ b/sql/test/emptydb/Tests/check.stable.out.int128
@@ -4336,6 +4336,7 @@ select 'null in fkeys.delete_action', de
[ "grant on function", "sys", "analyze", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "analyze", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "analyze", "public", "EXECUTE",
"monetdb", 0 ]
+[ "grant on function", "sys", "asciify", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "broadcast", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "contains", "public", "EXECUTE",
"monetdb", 0 ]
[ "grant on function", "sys", "contains", "public", "EXECUTE",
"monetdb", 0 ]
diff --git
a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -647,6 +647,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -647,6 +647,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git
a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -716,6 +716,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git
a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -641,6 +641,7 @@ returns double external name txtsim.simi
grant execute on function similarity(string, string) to public;
create function asciify(x string)
returns string external name str."asciify";
+grant execute on function asciify(string) to public;
create function sys.startswith(x string, y string)
returns boolean external name str."startsWith";
grant execute on function startswith(string, string) to public;
diff --git a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
