Changeset: 3fe0879c6a13 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3fe0879c6a13
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/test/Dependencies/Tests/dependency_owner_schema_3.test
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.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.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
sql/test/testdb-previous-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.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.int128
Branch: default
Log Message:
Merge with Dec2025 branch.
diffs (truncated from 4710 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
@@ -5264,6 +5264,57 @@ sql_update_dec2025(Client c, mvc *sql, s
}
static str
+sql_update_dec2025_sp1(Client c, mvc *sql, sql_schema *s)
+{
+ char *err = NULL;
+ res_table *output = NULL;
+ BAT *b;
+
+ /* 10_sys_schema_extension.sql */
+ /* correct definition of view sys.roles */
+ static const char query1[] = "select id from sys._tables where name =
'roles' and schema_id = 2000"
+ " and query = 'create view sys.roles as select id, name,
grantor from sys.auths a where a.name not in (select u.name from
sys.db_user_info u);';";
+ err = SQLstatementIntern(c, query1, "update", true, false, &output);
+ if (err == MAL_SUCCEED && (b = BBPquickdesc(output->cols[0].b)) &&
BATcount(b) == 1) {
+ static const char stmt1[] =
+ "DROP VIEW sys.describe_accessible_tables CASCADE;\n"
+ "DROP VIEW sys.roles CASCADE;\n"
+ "CREATE VIEW sys.roles AS SELECT id, name, grantor FROM
sys.auths;\n"
+ "GRANT SELECT ON sys.roles TO PUBLIC;\n"
+ "CREATE VIEW sys.describe_accessible_tables AS\n"
+ " SELECT\n"
+ " schemas.name AS schema,\n"
+ " tables.name AS table,\n"
+ " tt.table_type_name AS table_type,\n"
+ " pc.privilege_code_name AS privs,\n"
+ " p.privileges AS privs_code\n"
+ " FROM privileges p\n"
+ " JOIN sys.roles ON p.auth_id = roles.id\n"
+ " JOIN sys.tables ON p.obj_id = tables.id\n"
+ " JOIN sys.table_types tt ON tables.type =
tt.table_type_id\n"
+ " JOIN sys.schemas ON tables.schema_id =
schemas.id\n"
+ " JOIN sys.privilege_codes pc ON p.privileges =
pc.privilege_code_id\n"
+ " WHERE roles.name = current_role;\n"
+ "GRANT SELECT ON sys.describe_accessible_tables TO
PUBLIC;\n"
+ "UPDATE sys._tables SET system = true WHERE not system
and schema_id = 2000 and name in ('roles', 'describe_accessible_tables');\n";
+ sql_table *t;
+ if ((t = mvc_bind_table(sql, s, "roles")) != NULL)
+ t->system = 0; /* make it non-system else the drop view
will fail */
+ if ((t = mvc_bind_table(sql, s, "describe_accessible_tables"))
!= NULL)
+ t->system = 0; /* make it non-system else the drop view
will fail */
+ printf("Running database upgrade commands:\n%s\n", stmt1);
+ fflush(stdout);
+ err = SQLstatementIntern(c, stmt1, "update", true, false, NULL);
+ }
+ if (output != NULL) {
+ res_table_destroy(output);
+ output = NULL;
+ }
+
+ return err;
+}
+
+static str
sql_update_default(Client c, mvc *sql, sql_schema *s)
{
char *err;
@@ -5484,6 +5535,11 @@ SQLupgrades(Client c, mvc *m)
goto handle_error;
}
+ if ((err = sql_update_dec2025_sp1(c, m, s)) != NULL) {
+ TRC_CRITICAL(SQL_PARSER, "%s\n", err);
+ goto handle_error;
+ }
+
if ((err = sql_update_default(c, m, s)) != NULL) {
TRC_CRITICAL(SQL_PARSER, "%s\n", err);
goto handle_error;
diff --git a/sql/benchmarks/tpcds/Tests/All b/sql/benchmarks/tpcds/Tests/All
--- a/sql/benchmarks/tpcds/Tests/All
+++ b/sql/benchmarks/tpcds/Tests/All
@@ -1,7 +1,7 @@
create
counts
+HAVE_DATA_PATH?alter
HAVE_DATA_PATH?load
-HAVE_DATA_PATH?alter
HAVE_DATA_PATH?check
HAVE_DATA_PATH?q1
HAVE_DATA_PATH?q2
diff --git a/sql/benchmarks/tpcds/Tests/alter.reqtests
b/sql/benchmarks/tpcds/Tests/alter.reqtests
--- a/sql/benchmarks/tpcds/Tests/alter.reqtests
+++ b/sql/benchmarks/tpcds/Tests/alter.reqtests
@@ -1,1 +1,1 @@
-load
+create
diff --git a/sql/benchmarks/tpcds/Tests/check.test
b/sql/benchmarks/tpcds/Tests/check.test
--- a/sql/benchmarks/tpcds/Tests/check.test
+++ b/sql/benchmarks/tpcds/Tests/check.test
@@ -1,146 +1,264 @@
+hash-threshold 1000
+
statement ok
start transaction
-query I rowsort
+query I nosort
select count(*) from dbgen_version
----
1
-query I rowsort
+query I nosort
select count(*) from customer_address
----
50000
-query I rowsort
+query I nosort
select count(*) from customer_demographics
----
1920800
-query I rowsort
+query I nosort
select count(*) from date_dim
----
73049
-query I rowsort
+query I nosort
select count(*) from warehouse
----
5
-query I rowsort
+query I nosort
select count(*) from ship_mode
----
20
-query I rowsort
+query I nosort
select count(*) from time_dim
----
86400
-query I rowsort
+query I nosort
select count(*) from reason
----
35
-query I rowsort
+query I nosort
select count(*) from income_band
----
20
-query I rowsort
+query I nosort
select count(*) from item
----
18000
-query I rowsort
+query I nosort
select count(*) from store
----
12
-query I rowsort
+query I nosort
select count(*) from call_center
----
6
-query I rowsort
+query I nosort
select count(*) from customer
----
100000
-query I rowsort
+query I nosort
select count(*) from web_site
----
30
-query I rowsort
+query I nosort
select count(*) from store_returns
----
287514
-query I rowsort
+query I nosort
select count(*) from household_demographics
----
7200
-query I rowsort
+query I nosort
select count(*) from web_page
----
60
-query I rowsort
+query I nosort
select count(*) from promotion
----
300
-query I rowsort
+query I nosort
select count(*) from catalog_page
----
11718
-query I rowsort
+query I nosort
select count(*) from inventory
----
11745000
-query I rowsort
+query I nosort
select count(*) from catalog_returns
----
144067
-query I rowsort
+query I nosort
select count(*) from web_returns
----
71763
-query I rowsort
+query I nosort
select count(*) from web_sales
----
719384
-query I rowsort
+query I nosort
select count(*) from catalog_sales
----
1441548
-query I rowsort
+query I nosort
select count(*) from store_sales
----
2880404
-query TTTT rowsort
-select * from dbgen_version limit 9
+query TTTT nosort
+select * from dbgen_version
----
2.10.0
2018-10-22
17:17:42
-DIR qual
-query ITTTTTTTTTTDT rowsort
+query ITTTTTTTTTTDT nosort
select * from customer_address limit 9
----
-117 values hashing to 80773b266492865dfe2a221a7fcb7ae4
+1
+AAAAAAAABAAAAAAA
+18
+Jackson
+Parkway
+Suite 280
+Fairfield
+Maricopa County
+AZ
+86192
+United States
+-7.00
+condo
+2
+AAAAAAAACAAAAAAA
+362
+Washington 6th
+RD
+Suite 80
+Fairview
+Taos County
+NM
+85709
+United States
+-7.00
+condo
+3
+AAAAAAAADAAAAAAA
+585
+Dogwood Washington
+Circle
+Suite Q
+Pleasant Valley
+York County
+PA
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
