Changeset: 0d421f400d17 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d421f400d17
Modified Files:
        sql/backends/monet5/sql_upgrades.c
        sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
        sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade/Tests/upgrade.stable.out
        sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
        sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:

Add upgrade code for logging schema and some upgrade fixes.


diffs (truncated from 1008 to 300 lines):

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
@@ -2820,14 +2820,13 @@ sql_update_default(Client c, mvc *sql, c
        }
 #endif
 
-       /* 51_sys_schema_extension.sql */
        pos += snprintf(buf + pos, bufsize - pos,
-               "create window group_concat(str STRING) returns STRING\n"
+               "create window sys.group_concat(str STRING) returns STRING\n"
                " external name \"sql\".\"str_group_concat\";\n"
-               "GRANT EXECUTE ON WINDOW group_concat(STRING) TO PUBLIC;\n"
-               "create window group_concat(str STRING, sep STRING) returns 
STRING\n"
+               "GRANT EXECUTE ON WINDOW sys.group_concat(STRING) TO PUBLIC;\n"
+               "create window sys.group_concat(str STRING, sep STRING) returns 
STRING\n"
                " external name \"sql\".\"str_group_concat\";\n"
-               "GRANT EXECUTE ON WINDOW group_concat(STRING, STRING) TO 
PUBLIC;\n");
+               "GRANT EXECUTE ON WINDOW sys.group_concat(STRING, STRING) TO 
PUBLIC;\n");
 
        pos += snprintf(buf + pos, bufsize - pos,
                        "update sys.functions set system = true where name in"
@@ -2848,6 +2847,35 @@ sql_update_default(Client c, mvc *sql, c
                        "DROP AGGREGATE var_pop(time);\n"
                        "DROP AGGREGATE var_pop(timestamp);\n");
 
+       /* 81_tracer.sql */
+       pos += snprintf(buf + pos, bufsize - pos,
+                       "CREATE SCHEMA logging;\n"
+                       "CREATE PROCEDURE logging.flush()\n"
+                       " EXTERNAL NAME logging.flush;\n"
+                       "CREATE PROCEDURE logging.setcomplevel(comp_id INT, 
lvl_id INT)\n"
+                       " EXTERNAL NAME logging.setcomplevel;\n"
+                       "CREATE PROCEDURE logging.resetcomplevel(comp_id INT)\n"
+                       " EXTERNAL NAME logging.resetcomplevel;\n"
+                       "CREATE PROCEDURE logging.setlayerlevel(layer_id INT, 
lvl_id INT)\n"
+                       " EXTERNAL NAME logging.setlayerlevel;\n"
+                       "CREATE PROCEDURE logging.resetlayerlevel(layer_id 
INT)\n"
+                       " EXTERNAL NAME logging.resetlayerlevel;\n"
+                       "CREATE PROCEDURE logging.setflushlevel(lvl_id INT)\n"
+                       " EXTERNAL NAME logging.setflushlevel;\n"
+                       "CREATE PROCEDURE logging.resetflushlevel()\n"
+                       " EXTERNAL NAME logging.resetflushlevel;\n"
+                       "CREATE PROCEDURE logging.setadapter(adapter_id INT)\n"
+                       " EXTERNAL NAME logging.setadapter;\n"
+                       "CREATE PROCEDURE logging.resetadapter()\n"
+                       " EXTERNAL NAME logging.resetadapter;\n"
+                       "CREATE PROCEDURE logging.showinfo()\n"
+                       " EXTERNAL NAME logging.showinfo;\n");
+       pos += snprintf(buf + pos, bufsize - pos,
+                       "update sys.schemas set system = true where name = 
'logging';\n"
+                       "update sys.functions set system = true where name in"
+                       " ('flush', 'setcomplevel', 'resetcomplevel', 
'setlayerlevel', 'resetlayerlevel', 'setflushlevel', 'resetflushlevel', 
'setadapter', 'resetadapter', 'showinfo')"
+                       " and schema_id = (select id from sys.schemas where 
name = 'logging');\n");
+
        pos += snprintf(buf + pos, bufsize - pos, "commit;\n");
        pos += snprintf(buf + pos, bufsize - pos, "set schema \"%s\";\n", 
prev_schema);
        assert(pos < bufsize);
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
@@ -6296,12 +6296,12 @@ GRANT EXECUTE ON WINDOW covar_pop(HUGEIN
 create window corr(e1 HUGEINT, e2 HUGEINT) returns DOUBLE
  external name "sql"."corr";
 GRANT EXECUTE ON WINDOW corr(HUGEINT, HUGEINT) TO PUBLIC;
-create window group_concat(str STRING) returns STRING
+create window sys.group_concat(str STRING) returns STRING
  external name "sql"."str_group_concat";
-GRANT EXECUTE ON WINDOW group_concat(STRING) TO PUBLIC;
-create window group_concat(str STRING, sep STRING) returns STRING
+GRANT EXECUTE ON WINDOW sys.group_concat(STRING) TO PUBLIC;
+create window sys.group_concat(str STRING, sep STRING) returns STRING
  external name "sql"."str_group_concat";
-GRANT EXECUTE ON WINDOW group_concat(STRING, STRING) TO PUBLIC;
+GRANT EXECUTE ON WINDOW sys.group_concat(STRING, STRING) TO PUBLIC;
 update sys.functions set system = true where name in ('stddev_samp', 
'stddev_pop', 'var_samp', 'var_pop', 'covar_samp', 'covar_pop', 'corr', 
'group_concat') and schema_id = (select id from sys.schemas where name = 'sys');
 DROP AGGREGATE stddev_samp(date);
 DROP AGGREGATE stddev_samp(time);
@@ -6315,6 +6315,29 @@ DROP AGGREGATE var_samp(timestamp);
 DROP AGGREGATE var_pop(date);
 DROP AGGREGATE var_pop(time);
 DROP AGGREGATE var_pop(timestamp);
+CREATE SCHEMA logging;
+CREATE PROCEDURE logging.flush()
+ EXTERNAL NAME logging.flush;
+CREATE PROCEDURE logging.setcomplevel(comp_id INT, lvl_id INT)
+ EXTERNAL NAME logging.setcomplevel;
+CREATE PROCEDURE logging.resetcomplevel(comp_id INT)
+ EXTERNAL NAME logging.resetcomplevel;
+CREATE PROCEDURE logging.setlayerlevel(layer_id INT, lvl_id INT)
+ EXTERNAL NAME logging.setlayerlevel;
+CREATE PROCEDURE logging.resetlayerlevel(layer_id INT)
+ EXTERNAL NAME logging.resetlayerlevel;
+CREATE PROCEDURE logging.setflushlevel(lvl_id INT)
+ EXTERNAL NAME logging.setflushlevel;
+CREATE PROCEDURE logging.resetflushlevel()
+ EXTERNAL NAME logging.resetflushlevel;
+CREATE PROCEDURE logging.setadapter(adapter_id INT)
+ EXTERNAL NAME logging.setadapter;
+CREATE PROCEDURE logging.resetadapter()
+ EXTERNAL NAME logging.resetadapter;
+CREATE PROCEDURE logging.showinfo()
+ EXTERNAL NAME logging.showinfo;
+update sys.schemas set system = true where name = 'logging';
+update sys.functions set system = true where name in ('flush', 'setcomplevel', 
'resetcomplevel', 'setlayerlevel', 'resetlayerlevel', 'setflushlevel', 
'resetflushlevel', 'setadapter', 'resetadapter', 'showinfo') and schema_id = 
(select id from sys.schemas where name = 'logging');
 commit;
 set schema "sys";
 
diff --git 
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
--- 
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
+++ 
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
@@ -6296,12 +6296,12 @@ GRANT EXECUTE ON WINDOW covar_pop(HUGEIN
 create window corr(e1 HUGEINT, e2 HUGEINT) returns DOUBLE
  external name "sql"."corr";
 GRANT EXECUTE ON WINDOW corr(HUGEINT, HUGEINT) TO PUBLIC;
-create window group_concat(str STRING) returns STRING
+create window sys.group_concat(str STRING) returns STRING
  external name "sql"."str_group_concat";
-GRANT EXECUTE ON WINDOW group_concat(STRING) TO PUBLIC;
-create window group_concat(str STRING, sep STRING) returns STRING
+GRANT EXECUTE ON WINDOW sys.group_concat(STRING) TO PUBLIC;
+create window sys.group_concat(str STRING, sep STRING) returns STRING
  external name "sql"."str_group_concat";
-GRANT EXECUTE ON WINDOW group_concat(STRING, STRING) TO PUBLIC;
+GRANT EXECUTE ON WINDOW sys.group_concat(STRING, STRING) TO PUBLIC;
 update sys.functions set system = true where name in ('stddev_samp', 
'stddev_pop', 'var_samp', 'var_pop', 'covar_samp', 'covar_pop', 'corr', 
'group_concat') and schema_id = (select id from sys.schemas where name = 'sys');
 DROP AGGREGATE stddev_samp(date);
 DROP AGGREGATE stddev_samp(time);
@@ -6315,6 +6315,29 @@ DROP AGGREGATE var_samp(timestamp);
 DROP AGGREGATE var_pop(date);
 DROP AGGREGATE var_pop(time);
 DROP AGGREGATE var_pop(timestamp);
+CREATE SCHEMA logging;
+CREATE PROCEDURE logging.flush()
+ EXTERNAL NAME logging.flush;
+CREATE PROCEDURE logging.setcomplevel(comp_id INT, lvl_id INT)
+ EXTERNAL NAME logging.setcomplevel;
+CREATE PROCEDURE logging.resetcomplevel(comp_id INT)
+ EXTERNAL NAME logging.resetcomplevel;
+CREATE PROCEDURE logging.setlayerlevel(layer_id INT, lvl_id INT)
+ EXTERNAL NAME logging.setlayerlevel;
+CREATE PROCEDURE logging.resetlayerlevel(layer_id INT)
+ EXTERNAL NAME logging.resetlayerlevel;
+CREATE PROCEDURE logging.setflushlevel(lvl_id INT)
+ EXTERNAL NAME logging.setflushlevel;
+CREATE PROCEDURE logging.resetflushlevel()
+ EXTERNAL NAME logging.resetflushlevel;
+CREATE PROCEDURE logging.setadapter(adapter_id INT)
+ EXTERNAL NAME logging.setadapter;
+CREATE PROCEDURE logging.resetadapter()
+ EXTERNAL NAME logging.resetadapter;
+CREATE PROCEDURE logging.showinfo()
+ EXTERNAL NAME logging.showinfo;
+update sys.schemas set system = true where name = 'logging';
+update sys.functions set system = true where name in ('flush', 'setcomplevel', 
'resetcomplevel', 'setlayerlevel', 'resetlayerlevel', 'setflushlevel', 
'resetflushlevel', 'setadapter', 'resetadapter', 'showinfo') and schema_id = 
(select id from sys.schemas where name = 'logging');
 commit;
 set schema "sys";
 
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
@@ -5482,12 +5482,12 @@ GRANT EXECUTE ON WINDOW corr(INTERVAL SE
 create window corr(e1 INTERVAL MONTH, e2 INTERVAL MONTH) returns DOUBLE
  external name "sql"."corr";
 GRANT EXECUTE ON WINDOW corr(INTERVAL MONTH, INTERVAL MONTH) TO PUBLIC;
-create window group_concat(str STRING) returns STRING
+create window sys.group_concat(str STRING) returns STRING
  external name "sql"."str_group_concat";
-GRANT EXECUTE ON WINDOW group_concat(STRING) TO PUBLIC;
-create window group_concat(str STRING, sep STRING) returns STRING
+GRANT EXECUTE ON WINDOW sys.group_concat(STRING) TO PUBLIC;
+create window sys.group_concat(str STRING, sep STRING) returns STRING
  external name "sql"."str_group_concat";
-GRANT EXECUTE ON WINDOW group_concat(STRING, STRING) TO PUBLIC;
+GRANT EXECUTE ON WINDOW sys.group_concat(STRING, STRING) TO PUBLIC;
 update sys.functions set system = true where name in ('stddev_samp', 
'stddev_pop', 'var_samp', 'var_pop', 'covar_samp', 'covar_pop', 'corr', 
'group_concat') and schema_id = (select id from sys.schemas where name = 'sys');
 DROP AGGREGATE stddev_samp(date);
 DROP AGGREGATE stddev_samp(time);
@@ -5501,6 +5501,29 @@ DROP AGGREGATE var_samp(timestamp);
 DROP AGGREGATE var_pop(date);
 DROP AGGREGATE var_pop(time);
 DROP AGGREGATE var_pop(timestamp);
+CREATE SCHEMA logging;
+CREATE PROCEDURE logging.flush()
+ EXTERNAL NAME logging.flush;
+CREATE PROCEDURE logging.setcomplevel(comp_id INT, lvl_id INT)
+ EXTERNAL NAME logging.setcomplevel;
+CREATE PROCEDURE logging.resetcomplevel(comp_id INT)
+ EXTERNAL NAME logging.resetcomplevel;
+CREATE PROCEDURE logging.setlayerlevel(layer_id INT, lvl_id INT)
+ EXTERNAL NAME logging.setlayerlevel;
+CREATE PROCEDURE logging.resetlayerlevel(layer_id INT)
+ EXTERNAL NAME logging.resetlayerlevel;
+CREATE PROCEDURE logging.setflushlevel(lvl_id INT)
+ EXTERNAL NAME logging.setflushlevel;
+CREATE PROCEDURE logging.resetflushlevel()
+ EXTERNAL NAME logging.resetflushlevel;
+CREATE PROCEDURE logging.setadapter(adapter_id INT)
+ EXTERNAL NAME logging.setadapter;
+CREATE PROCEDURE logging.resetadapter()
+ EXTERNAL NAME logging.resetadapter;
+CREATE PROCEDURE logging.showinfo()
+ EXTERNAL NAME logging.showinfo;
+update sys.schemas set system = true where name = 'logging';
+update sys.functions set system = true where name in ('flush', 'setcomplevel', 
'resetcomplevel', 'setlayerlevel', 'resetlayerlevel', 'setflushlevel', 
'resetflushlevel', 'setadapter', 'resetadapter', 'showinfo') and schema_id = 
(select id from sys.schemas where name = 'logging');
 commit;
 set schema "sys";
 
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit 
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -5482,12 +5482,12 @@ GRANT EXECUTE ON WINDOW corr(INTERVAL SE
 create window corr(e1 INTERVAL MONTH, e2 INTERVAL MONTH) returns DOUBLE
  external name "sql"."corr";
 GRANT EXECUTE ON WINDOW corr(INTERVAL MONTH, INTERVAL MONTH) TO PUBLIC;
-create window group_concat(str STRING) returns STRING
+create window sys.group_concat(str STRING) returns STRING
  external name "sql"."str_group_concat";
-GRANT EXECUTE ON WINDOW group_concat(STRING) TO PUBLIC;
-create window group_concat(str STRING, sep STRING) returns STRING
+GRANT EXECUTE ON WINDOW sys.group_concat(STRING) TO PUBLIC;
+create window sys.group_concat(str STRING, sep STRING) returns STRING
  external name "sql"."str_group_concat";
-GRANT EXECUTE ON WINDOW group_concat(STRING, STRING) TO PUBLIC;
+GRANT EXECUTE ON WINDOW sys.group_concat(STRING, STRING) TO PUBLIC;
 update sys.functions set system = true where name in ('stddev_samp', 
'stddev_pop', 'var_samp', 'var_pop', 'covar_samp', 'covar_pop', 'corr', 
'group_concat') and schema_id = (select id from sys.schemas where name = 'sys');
 DROP AGGREGATE stddev_samp(date);
 DROP AGGREGATE stddev_samp(time);
@@ -5501,6 +5501,29 @@ DROP AGGREGATE var_samp(timestamp);
 DROP AGGREGATE var_pop(date);
 DROP AGGREGATE var_pop(time);
 DROP AGGREGATE var_pop(timestamp);
+CREATE SCHEMA logging;
+CREATE PROCEDURE logging.flush()
+ EXTERNAL NAME logging.flush;
+CREATE PROCEDURE logging.setcomplevel(comp_id INT, lvl_id INT)
+ EXTERNAL NAME logging.setcomplevel;
+CREATE PROCEDURE logging.resetcomplevel(comp_id INT)
+ EXTERNAL NAME logging.resetcomplevel;
+CREATE PROCEDURE logging.setlayerlevel(layer_id INT, lvl_id INT)
+ EXTERNAL NAME logging.setlayerlevel;
+CREATE PROCEDURE logging.resetlayerlevel(layer_id INT)
+ EXTERNAL NAME logging.resetlayerlevel;
+CREATE PROCEDURE logging.setflushlevel(lvl_id INT)
+ EXTERNAL NAME logging.setflushlevel;
+CREATE PROCEDURE logging.resetflushlevel()
+ EXTERNAL NAME logging.resetflushlevel;
+CREATE PROCEDURE logging.setadapter(adapter_id INT)
+ EXTERNAL NAME logging.setadapter;
+CREATE PROCEDURE logging.resetadapter()
+ EXTERNAL NAME logging.resetadapter;
+CREATE PROCEDURE logging.showinfo()
+ EXTERNAL NAME logging.showinfo;
+update sys.schemas set system = true where name = 'logging';
+update sys.functions set system = true where name in ('flush', 'setcomplevel', 
'resetcomplevel', 'setlayerlevel', 'resetlayerlevel', 'setflushlevel', 
'resetflushlevel', 'setadapter', 'resetadapter', 'showinfo') and schema_id = 
(select id from sys.schemas where name = 'logging');
 commit;
 set schema "sys";
 
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
@@ -6340,12 +6340,12 @@ GRANT EXECUTE ON WINDOW covar_pop(HUGEIN
 create window corr(e1 HUGEINT, e2 HUGEINT) returns DOUBLE
  external name "sql"."corr";
 GRANT EXECUTE ON WINDOW corr(HUGEINT, HUGEINT) TO PUBLIC;
-create window group_concat(str STRING) returns STRING
+create window sys.group_concat(str STRING) returns STRING
  external name "sql"."str_group_concat";
-GRANT EXECUTE ON WINDOW group_concat(STRING) TO PUBLIC;
-create window group_concat(str STRING, sep STRING) returns STRING
+GRANT EXECUTE ON WINDOW sys.group_concat(STRING) TO PUBLIC;
+create window sys.group_concat(str STRING, sep STRING) returns STRING
  external name "sql"."str_group_concat";
-GRANT EXECUTE ON WINDOW group_concat(STRING, STRING) TO PUBLIC;
+GRANT EXECUTE ON WINDOW sys.group_concat(STRING, STRING) TO PUBLIC;
 update sys.functions set system = true where name in ('stddev_samp', 
'stddev_pop', 'var_samp', 'var_pop', 'covar_samp', 'covar_pop', 'corr', 
'group_concat') and schema_id = (select id from sys.schemas where name = 'sys');
 DROP AGGREGATE stddev_samp(date);
 DROP AGGREGATE stddev_samp(time);
@@ -6359,6 +6359,29 @@ DROP AGGREGATE var_samp(timestamp);
 DROP AGGREGATE var_pop(date);
 DROP AGGREGATE var_pop(time);
 DROP AGGREGATE var_pop(timestamp);
+CREATE SCHEMA logging;
+CREATE PROCEDURE logging.flush()
+ EXTERNAL NAME logging.flush;
+CREATE PROCEDURE logging.setcomplevel(comp_id INT, lvl_id INT)
+ EXTERNAL NAME logging.setcomplevel;
+CREATE PROCEDURE logging.resetcomplevel(comp_id INT)
+ EXTERNAL NAME logging.resetcomplevel;
+CREATE PROCEDURE logging.setlayerlevel(layer_id INT, lvl_id INT)
+ EXTERNAL NAME logging.setlayerlevel;
+CREATE PROCEDURE logging.resetlayerlevel(layer_id INT)
+ EXTERNAL NAME logging.resetlayerlevel;
+CREATE PROCEDURE logging.setflushlevel(lvl_id INT)
+ EXTERNAL NAME logging.setflushlevel;
+CREATE PROCEDURE logging.resetflushlevel()
+ EXTERNAL NAME logging.resetflushlevel;
+CREATE PROCEDURE logging.setadapter(adapter_id INT)
+ EXTERNAL NAME logging.setadapter;
+CREATE PROCEDURE logging.resetadapter()
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to