MonetDB: default - Approve information schema changes.
Changeset: 6c2a629ade03 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/6c2a629ade03 Modified Files: 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/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: Approve information schema changes. diffs (truncated from 1200 to 300 lines): 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 @@ -1059,3 +1059,46 @@ UPDATE sys._tables SET system = true WHE Running database upgrade commands: ALTER TABLE sys.key_types SET READ ONLY; +Running database upgrade commands: +DROP VIEW information_schema.check_constraints CASCADE; +DROP VIEW information_schema.table_constraints CASCADE; +CREATE VIEW INFORMATION_SCHEMA.CHECK_CONSTRAINTS AS SELECT + cast(NULL AS varchar(1)) AS CONSTRAINT_CATALOG, + s."name" AS CONSTRAINT_SCHEMA, + k."name" AS CONSTRAINT_NAME, + cast(sys.check_constraint(s."name", k."name") AS varchar(2048)) AS CHECK_CLAUSE, + t."schema_id" AS schema_id, + t."id" AS table_id, + t."name" AS table_name, + k."id" AS key_id + FROM (SELECT sk."id", sk."table_id", sk."name" FROM sys."keys" sk WHERE sk."type" = 4 UNION ALL SELECT tk."id", tk."table_id", tk."name" FROM tmp."keys" tk WHERE tk."type" = 4) k + INNER JOIN (SELECT st."id", st."schema_id", st."name" FROM sys."_tables" st UNION ALL SELECT tt."id", tt."schema_id", tt."name" FROM tmp."_tables" tt) t ON k."table_id" = t."id" + INNER JOIN sys."schemas" s ON t."schema_id" = s."id" + ORDER BY s."name", t."name", k."name"; +GRANT SELECT ON TABLE INFORMATION_SCHEMA.CHECK_CONSTRAINTS TO PUBLIC WITH GRANT OPTION; +CREATE VIEW INFORMATION_SCHEMA.TABLE_CONSTRAINTS AS SELECT + cast(NULL AS varchar(1)) AS CONSTRAINT_CATALOG, + s."name" AS CONSTRAINT_SCHEMA, + k."name" AS CONSTRAINT_NAME, + cast(NULL AS varchar(1)) AS TABLE_CATALOG, + s."name" AS TABLE_SCHEMA, + t."name" AS TABLE_NAME, + cast(CASE k."type" WHEN 0 THEN 'PRIMARY KEY' WHEN 1 THEN 'UNIQUE' WHEN 2 THEN 'FOREIGN KEY' WHEN 3 THEN 'UNIQUE NULLS NOT DISTINCT' WHEN 4 THEN 'CHECK' ELSE NULL END AS varchar(26)) AS CONSTRAINT_TYPE, + cast('NO' AS varchar(3)) AS IS_DEFERRABLE, + cast('NO' AS varchar(3)) AS INITIALLY_DEFERRED, + cast('YES' AS varchar(3)) AS ENFORCED, + t."schema_id" AS schema_id, + t."id" AS table_id, + k."id" AS key_id, + k."type" AS key_type, + t."system" AS is_system + FROM (SELECT sk."id", sk."table_id", sk."name", sk."type" FROM sys."keys" sk UNION ALL SELECT tk."id", tk."table_id", tk."name", tk."type" FROM tmp."keys" tk) k + INNER JOIN (SELECT st."id", st."schema_id", st."name", st."system" FROM sys."_tables" st UNION ALL SELECT tt."id", tt."schema_id", tt."name", tt."system" FROM tmp."_tables" tt) t ON k."table_id" = t."id" + INNER JOIN sys."schemas" s ON t."schema_id" = s."id" + ORDER BY s."name", t."name", k."name"; +GRANT SELECT ON TABLE INFORMATION_SCHEMA.TABLE_CONSTRAINTS TO PUBLIC WITH GRANT OPTION; + +UPDATE sys._tables SET system = true where system <> true + and schema_id = (select s.id from sys.schemas s where s.name = 'information_schema') + and name in ('check_constraints','table_constraints'); + diff --git
MonetDB: default - Approve new signatures.
Changeset: b35af04a9070 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/b35af04a9070 Modified Files: clients/Tests/MAL-signatures-hge.test clients/Tests/MAL-signatures.test Branch: default Log Message: Approve new signatures. diffs (154 lines): diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -44944,36 +44944,6 @@ pattern generator.join(X_0:bat[:sht], X_ VLTgenerator_join; (empty) generator -join -pattern generator.join(X_0:bat[:bte], X_1:bat[:bte], X_2:bat[:bte], X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid]) -VLTgenerator_rangejoin; -(empty) -generator -join -pattern generator.join(X_0:bat[:dbl], X_1:bat[:dbl], X_2:bat[:dbl], X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid]) -VLTgenerator_rangejoin; -Overloaded range join operation -generator -join -pattern generator.join(X_0:bat[:flt], X_1:bat[:flt], X_2:bat[:flt], X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid]) -VLTgenerator_rangejoin; -(empty) -generator -join -pattern generator.join(X_0:bat[:int], X_1:bat[:int], X_2:bat[:int], X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid]) -VLTgenerator_rangejoin; -(empty) -generator -join -pattern generator.join(X_0:bat[:lng], X_1:bat[:lng], X_2:bat[:lng], X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid]) -VLTgenerator_rangejoin; -(empty) -generator -join -pattern generator.join(X_0:bat[:sht], X_1:bat[:sht], X_2:bat[:sht], X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid]) -VLTgenerator_rangejoin; -(empty) -generator parameters pattern generator.parameters(X_0:bte, X_1:bte):bat[:bte] VLTgenerator_noop; @@ -45104,6 +45074,36 @@ pattern generator.projection(X_0:bat[:oi VLTgenerator_projection; Overloaded projection operation generator +rangejoin +pattern generator.rangejoin(X_0:bat[:bte], X_1:bat[:bte], X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:bit, X_7:bit, X_8:bit, X_9:lng) (X_10:bat[:oid], X_11:bat[:oid]) +VLTgenerator_rangejoin; +(empty) +generator +rangejoin +pattern generator.rangejoin(X_0:bat[:dbl], X_1:bat[:dbl], X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:bit, X_7:bit, X_8:bit, X_9:lng) (X_10:bat[:oid], X_11:bat[:oid]) +VLTgenerator_rangejoin; +Overloaded range join operation +generator +rangejoin +pattern generator.rangejoin(X_0:bat[:flt], X_1:bat[:flt], X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:bit, X_7:bit, X_8:bit, X_9:lng) (X_10:bat[:oid], X_11:bat[:oid]) +VLTgenerator_rangejoin; +(empty) +generator +rangejoin +pattern generator.rangejoin(X_0:bat[:int], X_1:bat[:int], X_2:bat[:int], X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:bit, X_7:bit, X_8:bit, X_9:lng) (X_10:bat[:oid], X_11:bat[:oid]) +VLTgenerator_rangejoin; +(empty) +generator +rangejoin +pattern generator.rangejoin(X_0:bat[:lng], X_1:bat[:lng], X_2:bat[:lng], X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:bit, X_7:bit, X_8:bit, X_9:lng) (X_10:bat[:oid], X_11:bat[:oid]) +VLTgenerator_rangejoin; +(empty) +generator +rangejoin +pattern generator.rangejoin(X_0:bat[:sht], X_1:bat[:sht], X_2:bat[:sht], X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:bit, X_7:bit, X_8:bit, X_9:lng) (X_10:bat[:oid], X_11:bat[:oid]) +VLTgenerator_rangejoin; +(empty) +generator select pattern generator.select(X_0:bat[:bte], X_1:bat[:oid], X_2:bte, X_3:bte, X_4:bit, X_5:bit, X_6:bit):bat[:oid] VLTgenerator_subselect; diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -33474,36 +33474,6 @@ pattern generator.join(X_0:bat[:sht], X_ VLTgenerator_join; (empty) generator -join -pattern generator.join(X_0:bat[:bte], X_1:bat[:bte], X_2:bat[:bte], X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid]) -VLTgenerator_rangejoin; -(empty) -generator -join -pattern generator.join(X_0:bat[:dbl], X_1:bat[:dbl], X_2:bat[:dbl], X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid]) -VLTgenerator_rangejoin; -Overloaded range join operation -generator -join -pattern generator.join(X_0:bat[:flt], X_1:bat[:flt], X_2:bat[:flt], X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid]) -VLTgenerator_rangejoin; -(empty) -generator -join -pattern generator.join(X_0:bat[:int], X_1:bat[:int], X_2:bat[:int], X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid]) -VLTgenerator_rangejoin; -(empty) -generator -join -pattern generator.join(X_0:bat[:lng], X_1:bat[:lng], X_2:bat[:lng], X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid]) -VLTgenerator_rangejoin; -(empty) -generator -join -pattern generator.join(X_0:bat[:sht], X_1:bat[:sht], X_2:bat[:sht], X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid]) -VLTgenerator_rangejoin; -(empty) -generator parameters pattern generator.parameters(X_0:bte, X_1:bte):bat[:bte] VLTgenerator_noop; @@ -33619,6 +33589,36 @@ pattern generator.projection(X_0:bat[:oi VLTgenerator_projection; Overloaded projection operation generator +rangejoin +pattern
MonetDB: default - Approve output.
Changeset: baf72dba3d7b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/baf72dba3d7b Modified Files: sql/test/emptydb/Tests/check.stable.out.int128 Branch: default Log Message: Approve output. diffs (137 lines): 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 @@ -5597,7 +5597,7 @@ select 'null in fkeys.delete_action', de % .%1, .key_types # table_name % %1, key_type_name # name % varchar, varchar # type -% 13, 11 # length +% 13, 34 # length [ "sys.key_types", "Check Constraint" ] [ "sys.key_types", "Foreign Key" ] [ "sys.key_types", "Primary Key" ] @@ -6057,26 +6057,26 @@ select 'null in fkeys.delete_action', de % %237,id, id, name, schema_id, table_id, table_name, obj_type, sys_table, system # name % varchar, int,int,varchar,int,int,varchar, varchar,varchar,boolean # type % 0, 1, 1, 0, 1, 1, 0, 0, 0, 5 # length -% .%5, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys # table_name -% %5, id, id, table_id, type, name, rkey, action # name -% varchar, int,int,int,int,varchar,int,int # type -% 0, 1, 1, 1, 1, 0, 1, 1 # length -% .%5, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys # table_name -% %5, table_id, id, table_id, type, name, rkey, action # name -% varchar, int,int,int,int,varchar,int,int # type -% 0, 1, 1, 1, 1, 0, 1, 1 # length -% .%13,sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys # table_name -% %13, table_id, id, table_id, type, name, rkey, action # name -% varchar, int,int,int,int,varchar,int,int # type -% 0, 1, 1, 1, 1, 0, 1, 1 # length -% .%5, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys # table_name -% %5, type, id, table_id, type, name, rkey, action # name -% varchar, int,int,int,int,varchar,int,int # type -% 0, 1, 1, 1, 1, 0, 1, 1 # length -% .%5, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys # table_name -% %5, rkey, id, table_id, type, name, rkey, action # name -% varchar, int,int,int,int,varchar,int,int # type -% 0, 1, 1, 1, 1, 0, 1, 1 # length +% .%5, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys # table_name +% %5, id, id, table_id, type, name, rkey, action, check # name +% varchar, int,int,int,int,varchar,int,int, varchar # type +% 0, 1, 1, 1, 1, 0, 1, 1, 0 # length +% .%5, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys # table_name +% %5, table_id, id, table_id, type, name, rkey, action, check # name +% varchar, int,int,int,int,varchar,int,int, varchar # type +% 0, 1, 1, 1, 1, 0, 1, 1, 0 # length +% .%13,sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys # table_name +% %13, table_id, id, table_id, type, name, rkey, action, check # name +% varchar, int,int,int,int,varchar,int,int, varchar # type +% 0, 1, 1, 1, 1, 0, 1, 1, 0 # length +% .%5, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys # table_name +% %5, type, id, table_id, type, name, rkey, action, check # name +% varchar, int,int,int,int,varchar,int,int, varchar # type +% 0, 1, 1, 1, 1, 0, 1, 1, 0 # length +% .%5, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys, sys.keys # table_name +% %5, rkey, id, table_id, type, name, rkey, action, check # name +% varchar, int,int,int,int,varchar,int,int, varchar # type +% 0, 1, 1, 1, 1, 0, 1,
MonetDB: default - Approve notint128 output.
Changeset: 9bec0e3a6a90 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/9bec0e3a6a90 Modified Files: sql/test/emptydb/Tests/check.stable.out Branch: default Log Message: Approve notint128 output. diffs (169 lines): 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 @@ -1704,7 +1704,7 @@ select 'null in fkeys.delete_action', de % .%1, .s, .f, ., ., .f, .fl,., .f, .f, .f, .f, ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., . # table_name % %1, name, name, system, query, mod,language_name, func_type, side_effect,varres, vararg, semantics, comment,name0, type0, type_digits0, type_scale0,inout0, name1, type1, type_digits1, type_scale1,inout1, name2, type2, type_digits2, type_scale2,inout2, name3, type3, type_digits3, type_scale3,inout3, name4, type4, type_digits4, type_scale4,inout4, name5, type5, type_digits5, type_scale5,inout5, name6, type6, type_digits6, type_scale6,inout6, name7, type7, type_digits7, type_scale7,inout7, name8, type8, type_digits8, type_scale8,inout8, name9, type9, type_digits9, type_scale9,inout9, name10, type10, type_digits10, type_scale10, inout10,name11, type11, type_digits11, type_scale11, inout11, name12, type12, type_digits12, type_scale12, inout12,name13, type13, type_digits13, type_scale13, inout13,name14, type14, type_digits14, type_scale14, inout14,name15, type15, type_digits15, type_scale15, inout15 # name % varchar, varchar,varchar,varchar,varchar, varchar,varchar,varchar,boolean,boolean, boolean,boolean,varchar,varchar,varchar, int,int,varchar,varchar,varchar,int,int, varchar,varchar,varchar,int,int,varchar, varchar,varchar,int,int,varchar,varchar, varchar,int,int,varchar,varchar,varchar, int,int,varchar,varchar,varchar,int,int, varchar,varchar,varchar,int,int,varchar, varchar,varchar,int,int,varchar,varchar, varchar,int,int,varchar,varchar,varchar, int,int,varchar,varchar,varchar,int,int, varchar,varchar,varchar,int,int,varchar, varchar,varchar,int,int,varchar,varchar, varchar,int,int,varchar,varchar,varchar, int,int,varchar # type -% 13, 8, 37, 6, 3806, 9, 10, 26, 5, 5, 5, 5, 0, 11, 14, 4, 1, 3, 16, 14, 4, 1, 3, 16, 14, 4, 1, 3, 27, 14, 4, 1, 3, 9, 9, 4, 1, 3, 14, 7, 4, 1, 3, 12, 9, 2, 1, 3, 11, 7, 2, 1, 3, 11, 7, 2, 1, 3, 10, 7, 2, 1, 3, 9, 7, 2, 1, 3, 6, 7, 1, 1, 3, 9, 7, 2, 1, 3, 6, 7, 4, 1, 3, 9, 7, 4, 1, 3, 6, 7, 4, 1, 3 # length +% 13, 8, 37, 6, 3806, 9, 10, 26, 5, 5, 5, 5, 0, 11, 14, 4, 1, 3, 16, 14, 4, 1, 3, 16, 14, 4, 1, 3, 27, 14, 4, 1, 3, 9, 9, 4, 1, 3, 14, 7, 4, 1, 3, 12, 9, 2, 1, 3, 11, 7, 2, 1, 3, 11, 7, 2, 1, 3, 10, 7, 2, 1, 3, 9, 7, 2, 1, 3, 8, 7, 1, 1, 3, 11, 7, 2, 1, 3, 6, 7,
MonetDB: default - Approve 32 bit output.
Changeset: 771567d3a287 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/771567d3a287 Modified Files: sql/test/emptydb/Tests/check.stable.out.32bit Branch: default Log Message: Approve 32 bit output. diffs (178 lines): diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit b/sql/test/emptydb/Tests/check.stable.out.32bit --- a/sql/test/emptydb/Tests/check.stable.out.32bit +++ b/sql/test/emptydb/Tests/check.stable.out.32bit @@ -1704,7 +1704,7 @@ select 'null in fkeys.delete_action', de % .%1, .s, .f, ., ., .f, .fl,., .f, .f, .f, .f, ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., . # table_name % %1, name, name, system, query, mod,language_name, func_type, side_effect,varres, vararg, semantics, comment,name0, type0, type_digits0, type_scale0,inout0, name1, type1, type_digits1, type_scale1,inout1, name2, type2, type_digits2, type_scale2,inout2, name3, type3, type_digits3, type_scale3,inout3, name4, type4, type_digits4, type_scale4,inout4, name5, type5, type_digits5, type_scale5,inout5, name6, type6, type_digits6, type_scale6,inout6, name7, type7, type_digits7, type_scale7,inout7, name8, type8, type_digits8, type_scale8,inout8, name9, type9, type_digits9, type_scale9,inout9, name10, type10, type_digits10, type_scale10, inout10,name11, type11, type_digits11, type_scale11, inout11, name12, type12, type_digits12, type_scale12, inout12,name13, type13, type_digits13, type_scale13, inout13,name14, type14, type_digits14, type_scale14, inout14,name15, type15, type_digits15, type_scale15, inout15 # name % varchar, varchar,varchar,varchar,varchar, varchar,varchar,varchar,boolean,boolean, boolean,boolean,varchar,varchar,varchar, int,int,varchar,varchar,varchar,int,int, varchar,varchar,varchar,int,int,varchar, varchar,varchar,int,int,varchar,varchar, varchar,int,int,varchar,varchar,varchar, int,int,varchar,varchar,varchar,int,int, varchar,varchar,varchar,int,int,varchar, varchar,varchar,int,int,varchar,varchar, varchar,int,int,varchar,varchar,varchar, int,int,varchar,varchar,varchar,int,int, varchar,varchar,varchar,int,int,varchar, varchar,varchar,int,int,varchar,varchar, varchar,int,int,varchar,varchar,varchar, int,int,varchar # type -% 13, 8, 37, 6, 3806, 9, 10, 26, 5, 5, 5, 5, 0, 11, 14, 4, 1, 3, 16, 14, 4, 1, 3, 16, 14, 4, 1, 3, 27, 12, 4, 1, 3, 9, 9, 4, 1, 3, 14, 7, 4, 1, 3, 12, 9, 2, 1, 3, 11, 7, 2, 1, 3, 11, 7, 2, 1, 3, 10, 7, 2, 1, 3, 9, 7, 2, 1, 3, 6, 7, 1, 1, 3, 9, 7, 2, 1, 3, 6, 7, 4, 1, 3, 9, 7, 4, 1, 3, 6, 7, 4, 1, 3 # length +% 13, 8, 37, 6, 3806, 9, 10, 26, 5, 5, 5, 5, 0, 11, 14, 4, 1, 3, 16, 14, 4, 1, 3, 16, 14, 4, 1, 3, 27, 14, 4, 1, 3, 9, 9, 4, 1, 3, 14, 7, 4, 1, 3, 12, 9, 2, 1, 3, 11, 7, 2, 1, 3, 11, 7, 2, 1, 3, 10, 7, 2, 1, 3, 9, 7, 2, 1, 3, 8, 7, 1, 1, 3, 11, 7, 2, 1,
MonetDB: default - Approve tests.
Changeset: d5c6125facb1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/d5c6125facb1 Modified Files: sql/backends/monet5/generator/Tests/generator03.test Branch: default Log Message: Approve tests. diffs (27 lines): diff --git a/sql/backends/monet5/generator/Tests/generator03.test b/sql/backends/monet5/generator/Tests/generator03.test --- a/sql/backends/monet5/generator/Tests/generator03.test +++ b/sql/backends/monet5/generator/Tests/generator03.test @@ -22,6 +22,7 @@ 2008-03-02 16:00:00 2008-03-03 02:00:00 2008-03-03 12:00:00 2008-03-03 22:00:00 +2008-03-04 08:00:00 query T rowsort select * from generate_series( @@ -32,6 +33,7 @@ select * from generate_series( 2008-03-01 00:00:00 2008-03-02 00:00:00 2008-03-03 00:00:00 +2008-03-04 00:00:00 query T rowsort select * from generate_series( @@ -39,6 +41,7 @@ select * from generate_series( timestamp '2008-03-01 00:00', cast( '-1' as interval day)) +2008-03-01 12:00:00 2008-03-02 12:00:00 2008-03-03 12:00:00 2008-03-04 12:00:00 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve non-hge tests.
Changeset: 60b8d7104db5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/60b8d7104db5 Modified Files: clients/Tests/MAL-signatures.test sql/test/emptydb/Tests/check.stable.out Branch: default Log Message: Approve non-hge tests. diffs (99 lines): diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -33510,6 +33510,16 @@ VLTgenerator_noop; (empty) generator parameters +pattern generator.parameters(X_0:date, X_1:date, X_2:int):bat[:date] +VLTgenerator_noop; +Retain the table definition, but don't materialize (months) +generator +parameters +pattern generator.parameters(X_0:date, X_1:date, X_2:lng):bat[:date] +VLTgenerator_noop; +Retain the table definition, but don't materialize (days) +generator +parameters pattern generator.parameters(X_0:dbl, X_1:dbl):bat[:dbl] VLTgenerator_noop; (empty) @@ -33570,6 +33580,11 @@ VLTgenerator_projection; (empty) generator projection +pattern generator.projection(X_0:bat[:oid], X_1:bat[:date]):bat[:date] +VLTgenerator_projection; +(empty) +generator +projection pattern generator.projection(X_0:bat[:oid], X_1:bat[:dbl]):bat[:dbl] VLTgenerator_projection; (empty) @@ -33610,6 +33625,16 @@ VLTgenerator_subselect; (empty) generator select +pattern generator.select(X_0:bat[:date], X_1:bat[:oid], X_2:date, X_3:date, X_4:bit, X_5:bit, X_6:bit):bat[:oid] +VLTgenerator_subselect; +(empty) +generator +select +pattern generator.select(X_0:bat[:date], X_1:date, X_2:date, X_3:bit, X_4:bit, X_5:bit):bat[:oid] +VLTgenerator_subselect; +(empty) +generator +select pattern generator.select(X_0:bat[:dbl], X_1:bat[:oid], X_2:dbl, X_3:dbl, X_4:bit, X_5:bit, X_6:bit):bat[:oid] VLTgenerator_subselect; (empty) @@ -33680,6 +33705,16 @@ VLTgenerator_table; (empty) generator series +pattern generator.series(X_0:date, X_1:date, X_2:int):bat[:date] +VLTgenerator_table; +date generator with step size in months +generator +series +pattern generator.series(X_0:date, X_1:date, X_2:lng):bat[:date] +VLTgenerator_table; +date generator with step size in days +generator +series pattern generator.series(X_0:dbl, X_1:dbl):bat[:dbl] VLTgenerator_table; (empty) @@ -33740,6 +33775,11 @@ VLTgenerator_thetasubselect; (empty) generator thetaselect +pattern generator.thetaselect(X_0:bat[:date], X_1:bat[:oid], X_2:date, X_3:str):bat[:oid] +VLTgenerator_thetasubselect; +Overloaded selection routine +generator +thetaselect pattern generator.thetaselect(X_0:bat[:dbl], X_1:bat[:oid], X_2:dbl, X_3:str):bat[:oid] VLTgenerator_thetasubselect; (empty) 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 @@ -1693,7 +1693,7 @@ select 'null in fkeys.delete_action', de % .%1, .s, .f, ., ., .f, .fl,., .f, .f, .f, .f, ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., ., . # table_name % %1, name, name, system, query, mod,language_name, func_type, side_effect,varres, vararg, semantics, comment,name0, type0, type_digits0, type_scale0,inout0, name1, type1, type_digits1, type_scale1,inout1, name2, type2, type_digits2, type_scale2,inout2, name3, type3, type_digits3, type_scale3,inout3, name4, type4, type_digits4, type_scale4,inout4, name5, type5, type_digits5, type_scale5,inout5, name6, type6, type_digits6, type_scale6,inout6, name7, type7, type_digits7, type_scale7,inout7, name8, type8, type_digits8, type_scale8,inout8, name9, type9, type_digits9, type_scale9,inout9, name10, type10, type_digits10, type_scale10, inout10,name11, type11, type_digits11, type_scale11, inout11, name12, type12, type_digits12, type_scale12, inout12,name13, type13, type_digits13, type_scale13, inout13,name14, type14, type_digits14, type_scale14, inout14,name15, type15, type_digits15, type_scale15, inout15 # name % varchar, varchar,varchar,varchar,varchar, varchar,varchar,varchar,boolean,boolean, boolean,boolean,varchar,varchar,varchar,
MonetDB: default - Approve 32 bit output.
Changeset: 775c53d2116c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/775c53d2116c Modified Files: sql/test/emptydb/Tests/check.stable.out.32bit Branch: default Log Message: Approve 32 bit output. diffs (truncated from 3603 to 300 lines): diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit b/sql/test/emptydb/Tests/check.stable.out.32bit --- a/sql/test/emptydb/Tests/check.stable.out.32bit +++ b/sql/test/emptydb/Tests/check.stable.out.32bit @@ -39,7 +39,7 @@ select 'sys.objects', o.name, case when -- schemas select 'default schema of user', s.name, u.name from sys.schemas s, sys.users u where s.id = u.default_schema order by s.name, u.name; -- tables -select 'grant on table', t.name, a.name, pc.privilege_code_name, g.name, p.grantable from sys._tables t, sys.privileges p left outer join sys.auths g on p.grantor = g.id left outer join sys.privilege_codes pc on p.privileges = pc.privilege_code_id, sys.auths a where t.id = p.obj_id and p.auth_id = a.id order by t.name, a.name; +select 'grant on table', t.name, a.name, pc.privilege_code_name, g.name, p.grantable from sys._tables t, sys.privileges p left outer join sys.auths g on p.grantor = g.id left outer join sys.privilege_codes pc on p.privileges = pc.privilege_code_id, sys.auths a where t.id = p.obj_id and p.auth_id = a.id order by t.name, a.name, g.name nulls first; -- columns select 'grant on column', t.name, c.name, a.name, pc.privilege_code_name, g.name, p.grantable from sys._tables t, sys._columns c, sys.privileges p left outer join sys.auths g on p.grantor = g.id left outer join sys.privilege_codes pc on p.privileges = pc.privilege_code_id, sys.auths a where c.id = p.obj_id and c.table_id = t.id and p.auth_id = a.id order by t.name, c.name, a.name; -- functions @@ -433,7 +433,7 @@ select 'null in fkeys.delete_action_id', select 'null in fkeys.delete_action', delete_action, * from sys.fkeys where delete_action is null; % .%1, .s, ., ., .s, . # table_name % %1, name, authorization, owner, system, comment # name -% char,varchar,varchar,varchar,boolean, varchar # type +% varchar, varchar,varchar,varchar,boolean, varchar # type % 11, 18, 8, 7, 5, 28 # length [ "sys.schemas", "information_schema", "monetdb", "monetdb", true, "ISO/IEC 9075-11 SQL/Schemata" ] [ "sys.schemas", "json", "monetdb", "monetdb", true, NULL ] @@ -443,8 +443,8 @@ select 'null in fkeys.delete_action', de [ "sys.schemas", "tmp", "sysadmin", "monetdb", true, NULL ] % .%25,.s, .t, ., ., .t, ., ., . # table_name % %25, name, name, query, type, system, commit_action, access, comment # name -% char,varchar,varchar,char, varchar, boolean,char, char, varchar # type -% 11, 18, 34, 6812, 5, 5, 8, 10, 0 # length +% varchar, varchar,varchar,varchar,varchar, boolean,varchar,varchar,varchar # type +% 11, 18, 34, 6812, 5, 5, 8, 8, 0 # length [ "sys._tables", "information_schema", "character_sets", "create view information_schema.character_sets as select cast(null as varchar(1)) as character_set_catalog, cast(null as varchar(1)) as character_set_schema, cast('UTF-8' as varchar(16)) as character_set_name, cast('ISO/IEC 10646:2021' as varchar(20)) as character_repertoire, cast('UTF-8' as varchar(16)) as form_of_use, cast(null as varchar(1)) as default_collate_catalog, cast(null as varchar(1)) as default_collate_schema, cast(null as varchar(1)) as default_collate_name;", "VIEW", true, "COMMIT", "WRITABLE", NULL ] [ "sys._tables", "information_schema", "check_constraints","create view information_schema.check_constraints as select cast(null as varchar(1)) as constraint_catalog, cast(null as varchar(1024)) as constraint_schema, cast(null as varchar(1024)) as constraint_name, cast(null as varchar(1024)) as check_clause where 1=0;", "VIEW", true, "COMMIT", "WRITABLE", NULL ] [ "sys._tables", "information_schema", "columns", "create view information_schema.columns as select cast(null as varchar(1)) as table_catalog, s.\"name\" as table_schema, t.\"name\" as table_name, c.\"name\" as column_name, cast(1 + c.\"number\" as int) as ordinal_position, c.\"default\" as column_default, cast(sys.ifthenelse(c.\"null\", 'YES', 'NO') as varchar(3)) as is_nullable, cast(sys.\"sql_datatype\"(c.\"type\", c.\"type_digits\", c.\"type_scale\", true, true) as varchar(1024)) as data_type, cast(sys.ifthenelse(c.\"type\" in ('varchar','clob','char','json','url','xml') and c.\"type_digits\" > 0, c.\"type_digits\", null) as int) as character_maximum_length,
MonetDB: default - Approve non-hge output.
Changeset: 69363e9ed196 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/69363e9ed196 Modified Files: sql/test/emptydb/Tests/check.stable.out Branch: default Log Message: Approve non-hge output. diffs (14 lines): 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 @@ -6927,8 +6927,8 @@ select 'null in fkeys.delete_action', de % %14, table_id, id, table_id, type, name, rkey, update_action_id, update_action, delete_action_id, delete_action # name % varchar, int,int,int,int,varchar,int, smallint, varchar,smallint, varchar # type % 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0 # length -% .%14,.fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, sys.fkeys, .fkeys, sys.fkeys # table_name -% %14, type, id, table_id, type, name, rkey, update_action_id, update_action, delete_action_id, delete_action # name +% .%15,.fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys # table_name +% %15, type, id, table_id, type, name, rkey, update_action_id, update_action, delete_action_id, delete_action # name % varchar, int,int,int,int,varchar,int, smallint, varchar,smallint, varchar # type % 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0 # length % .%14,.fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, sys.fkeys, .fkeys, sys.fkeys # table_name ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve header change.
Changeset: 960be3294ecb for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/960be3294ecb Modified Files: sql/test/emptydb/Tests/check.stable.out.int128 Branch: default Log Message: Approve header change. diffs (14 lines): 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 @@ -7068,8 +7068,8 @@ select 'null in fkeys.delete_action', de % %14, table_id, id, table_id, type, name, rkey, update_action_id, update_action, delete_action_id, delete_action # name % varchar, int,int,int,int,varchar,int, smallint, varchar,smallint, varchar # type % 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0 # length -% .%14,.fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, sys.fkeys, .fkeys, sys.fkeys # table_name -% %14, type, id, table_id, type, name, rkey, update_action_id, update_action, delete_action_id, delete_action # name +% .%15,.fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys # table_name +% %15, type, id, table_id, type, name, rkey, update_action_id, update_action, delete_action_id, delete_action # name % varchar, int,int,int,int,varchar,int, smallint, varchar,smallint, varchar # type % 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0 # length % .%14,.fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, .fkeys, sys.fkeys, .fkeys, sys.fkeys # table_name ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve non-hge optional bat changes.
Changeset: ddf6ccc1a753 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/ddf6ccc1a753 Modified Files: clients/Tests/MAL-signatures.test Branch: default Log Message: Approve non-hge optional bat changes. diffs (147 lines): diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -25330,122 +25330,62 @@ SQLvar_pop; return the variance population of groups batsql window_bound -pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:bat[:bte]):bat[:oid] -SQLwindow_bound; -computes window ranges for each row -batsql -window_bound -pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:bat[:dbl]):bat[:oid] +pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:bat?[:bte]):bat[:oid] SQLwindow_bound; computes window ranges for each row batsql window_bound -pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:bat[:flt]):bat[:oid] -SQLwindow_bound; -computes window ranges for each row -batsql -window_bound -pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:bat[:int]):bat[:oid] -SQLwindow_bound; -computes window ranges for each row -batsql -window_bound -pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:bat[:lng]):bat[:oid] +pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:bat?[:dbl]):bat[:oid] SQLwindow_bound; computes window ranges for each row batsql window_bound -pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:bat[:sht]):bat[:oid] -SQLwindow_bound; -computes window ranges for each row -batsql -window_bound -pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:bte):bat[:oid] +pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:bat?[:flt]):bat[:oid] SQLwindow_bound; computes window ranges for each row batsql window_bound -pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:dbl):bat[:oid] +pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:bat?[:int]):bat[:oid] SQLwindow_bound; computes window ranges for each row batsql window_bound -pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:flt):bat[:oid] -SQLwindow_bound; -computes window ranges for each row -batsql -window_bound -pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:int):bat[:oid] -SQLwindow_bound; -computes window ranges for each row -batsql -window_bound -pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:lng):bat[:oid] +pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:bat?[:lng]):bat[:oid] SQLwindow_bound; computes window ranges for each row batsql window_bound -pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:sht):bat[:oid] -SQLwindow_bound; -computes window ranges for each row -batsql -window_bound -pattern batsql.window_bound(X_0:bat[:bit], X_1:bat[:any_1], X_2:int, X_3:int, X_4:int, X_5:bat[:bte]):bat[:oid] +pattern batsql.window_bound(X_0:bat[:any_1], X_1:int, X_2:int, X_3:int, X_4:bat?[:sht]):bat[:oid] SQLwindow_bound; computes window ranges for each row batsql window_bound -pattern batsql.window_bound(X_0:bat[:bit], X_1:bat[:any_1], X_2:int, X_3:int, X_4:int, X_5:bat[:dbl]):bat[:oid] +pattern batsql.window_bound(X_0:bat[:bit], X_1:bat[:any_1], X_2:int, X_3:int, X_4:int, X_5:bat?[:bte]):bat[:oid] SQLwindow_bound; computes window ranges for each row batsql window_bound -pattern batsql.window_bound(X_0:bat[:bit], X_1:bat[:any_1], X_2:int, X_3:int, X_4:int, X_5:bat[:flt]):bat[:oid] -SQLwindow_bound; -computes window ranges for each row -batsql -window_bound -pattern batsql.window_bound(X_0:bat[:bit], X_1:bat[:any_1], X_2:int, X_3:int, X_4:int, X_5:bat[:int]):bat[:oid] -SQLwindow_bound; -computes window ranges for each row -batsql -window_bound -pattern batsql.window_bound(X_0:bat[:bit], X_1:bat[:any_1], X_2:int, X_3:int, X_4:int, X_5:bat[:lng]):bat[:oid] +pattern batsql.window_bound(X_0:bat[:bit], X_1:bat[:any_1], X_2:int, X_3:int, X_4:int, X_5:bat?[:dbl]):bat[:oid] SQLwindow_bound; computes window ranges for each row batsql window_bound -pattern batsql.window_bound(X_0:bat[:bit], X_1:bat[:any_1], X_2:int, X_3:int, X_4:int, X_5:bat[:sht]):bat[:oid] -SQLwindow_bound; -computes window ranges for each row -batsql -window_bound -pattern batsql.window_bound(X_0:bat[:bit], X_1:bat[:any_1], X_2:int, X_3:int, X_4:int, X_5:bte):bat[:oid] -SQLwindow_bound; -computes window ranges for each row -batsql -window_bound -pattern batsql.window_bound(X_0:bat[:bit], X_1:bat[:any_1], X_2:int, X_3:int, X_4:int, X_5:dbl):bat[:oid] +pattern batsql.window_bound(X_0:bat[:bit], X_1:bat[:any_1], X_2:int, X_3:int, X_4:int, X_5:bat?[:flt]):bat[:oid] SQLwindow_bound; computes
MonetDB: default - Approve upgrade output.
Changeset: 546e048a5ca0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/546e048a5ca0 Modified Files: 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-chain/Tests/upgrade.stable.out.ppc64.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/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: Approve upgrade output. diffs (truncated from 2800 to 300 lines): 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 @@ -530,7 +530,6 @@ CREATE VIEW INFORMATION_SCHEMA.SCHEMATA cast(NULL AS varchar(1)) AS DEFAULT_CHARACTER_SET_SCHEMA, cast('UTF-8' AS varchar(16)) AS DEFAULT_CHARACTER_SET_NAME, cast(NULL AS varchar(1)) AS SQL_PATH, - -- MonetDB column extensions s."id" AS schema_id, s."system" AS is_system, cm."remark" AS comments @@ -552,7 +551,6 @@ CREATE VIEW INFORMATION_SCHEMA.TABLES AS cast(sys.ifthenelse((t."type" IN (0, 3, 7, 20, 30) AND t."access" IN (0, 2)), 'YES', 'NO') AS varchar(3)) AS IS_INSERTABLE_INTO, cast('NO' AS varchar(3)) AS IS_TYPED, cast((CASE t."commit_action" WHEN 1 THEN 'DELETE' WHEN 2 THEN 'PRESERVE' WHEN 3 THEN 'DROP' ELSE NULL END) AS varchar(10)) AS COMMIT_ACTION, - -- MonetDB column extensions t."schema_id" AS schema_id, t."id" AS table_id, t."type" AS table_type_id, @@ -579,7 +577,6 @@ CREATE VIEW INFORMATION_SCHEMA.VIEWS AS cast('NO' AS varchar(3)) AS IS_TRIGGER_UPDATABLE, cast('NO' AS varchar(3)) AS IS_TRIGGER_DELETABLE, cast('NO' AS varchar(3)) AS IS_TRIGGER_INSERTABLE_INTO, - -- MonetDB column extensions t."schema_id" AS schema_id, t."id" AS table_id, cast(sys.ifthenelse(t."system", t."type" + 10 , t."type") AS smallint) AS table_type_id, @@ -605,7 +602,7 @@ CREATE VIEW INFORMATION_SCHEMA.COLUMNS A cast(sys.ifthenelse(c."type" IN ('int','smallint','tinyint','bigint','hugeint','float','real','double','decimal','numeric','oid'), c."type_digits", NULL) AS int) AS NUMERIC_PRECISION, cast(sys.ifthenelse(c."type" IN ('int','smallint','tinyint','bigint','hugeint','float','real','double','oid'), 2, sys.ifthenelse(c."type" IN ('decimal','numeric'), 10, NULL)) AS int) AS NUMERIC_PRECISION_RADIX, cast(sys.ifthenelse(c."type" IN ('int','smallint','tinyint','bigint','hugeint','float','real','double','decimal','numeric','oid'), c."type_scale", NULL) AS int) AS NUMERIC_SCALE, - cast(sys.ifthenelse(c."type" IN ('date','timestamp','timestamptz','time','timetz'), c."type_scale" -1, NULL) AS int) AS DATETIME_PRECISION, + cast(sys.ifthenelse(c."type" IN ('date','timestamp','timestamptz','time','timetz'), sys.ifthenelse(c."type_scale" > 0, c."type_scale" -1, 0), NULL) AS int) AS DATETIME_PRECISION, cast(CASE c."type" WHEN 'day_interval' THEN 'interval day' WHEN 'month_interval' THEN (CASE c."type_digits" WHEN 1 THEN 'interval year' WHEN 2 THEN 'interval year to month' WHEN 3 THEN 'interval month' ELSE NULL END) WHEN 'sec_interval' THEN (CASE c."type_digits" WHEN 5 THEN 'interval day to hour' WHEN 6 THEN 'interval day to minute' WHEN 7 THEN 'interval day to second' WHEN 8 THEN 'interval hour' WHEN 9 THEN 'interval hour to minute' WHEN
MonetDB: default - Approve upgrades for recent changes.
Changeset: 314bef24a7e2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/314bef24a7e2 Modified Files: 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-chain/Tests/upgrade.stable.out.ppc64.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.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: Approve upgrades for recent changes. diffs (truncated from 3268 to 300 lines): 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 @@ -599,15 +599,15 @@ CREATE VIEW INFORMATION_SCHEMA.COLUMNS A cast(c."number" +1 AS int) AS ORDINAL_POSITION, c."default" AS COLUMN_DEFAULT, cast(sys.ifthenelse(c."null", 'YES', 'NO') AS varchar(3)) AS IS_NULLABLE, - c."type" AS DATA_TYPE, + CASE c."type" WHEN 'day_interval' THEN 'interval day' WHEN 'month_interval' THEN 'interval month' WHEN 'sec_interval' THEN 'interval second' ELSE c."type" END AS DATA_TYPE, cast(sys.ifthenelse(c."type" IN ('varchar','clob','char','json','url','xml'), c."type_digits", NULL) AS int) AS CHARACTER_MAXIMUM_LENGTH, cast(sys.ifthenelse(c."type" IN ('varchar','clob','char','json','url','xml'), c."type_digits" * 3, NULL) AS int) AS CHARACTER_OCTET_LENGTH, cast(sys.ifthenelse(c."type" IN ('int','smallint','tinyint','bigint','hugeint','float','real','double','decimal','numeric','oid'), c."type_digits", NULL) AS int) AS NUMERIC_PRECISION, cast(sys.ifthenelse(c."type" IN ('int','smallint','tinyint','bigint','hugeint','float','real','double','oid'), 2, sys.ifthenelse(c."type" IN ('decimal','numeric'), 10, NULL)) AS int) AS NUMERIC_PRECISION_RADIX, cast(sys.ifthenelse(c."type" IN ('int','smallint','tinyint','bigint','hugeint','float','real','double','decimal','numeric','oid'), c."type_scale", NULL) AS int) AS NUMERIC_SCALE, cast(sys.ifthenelse(c."type" IN ('date','timestamp','timestamptz','time','timetz'), c."type_scale" -1, NULL) AS int) AS DATETIME_PRECISION, - cast(CASE c."type" WHEN 'day_interval' THEN 'interval day' WHEN 'month_interval' THEN 'interval month' WHEN 'sec_interval' THEN 'interval second' ELSE NULL END AS varchar(40)) AS INTERVAL_TYPE, - cast(sys.ifthenelse(c."type" IN ('day_interval','month_interval','sec_interval'), c."type_scale" -1, NULL) AS int) AS INTERVAL_PRECISION, + cast(CASE c."type" WHEN 'day_interval' THEN 'interval day' WHEN 'month_interval' THEN (CASE c."type_digits" WHEN 1 THEN 'interval year' WHEN 2 THEN 'interval year to month' WHEN 3 THEN 'interval month' ELSE NULL END) WHEN 'sec_interval' THEN (CASE c."type_digits" WHEN 5 THEN 'interval day to hour' WHEN 6 THEN 'interval day to minute' WHEN 7 THEN 'interval day to second' WHEN 8 THEN 'interval hour' WHEN 9 THEN 'interval hour to minute' WHEN 10 THEN 'interval hour to second' WHEN 11 THEN 'interval minute' WHEN 12 THEN 'interval minute to second' WHEN 13 THEN 'interval second' ELSE NULL END) ELSE NULL END AS varchar(40)) AS INTERVAL_TYPE, + cast(CASE c."type" WHEN 'day_interval' THEN 0 WHEN 'month_interval' THEN 0 WHEN 'sec_interval' THEN (sys.ifthenelse(c."type_digits" IN (7, 10, 12, 13),
MonetDB: default - Approve new added information_schema views ch...
Changeset: f29975023432 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/f29975023432 Modified Files: sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 Branch: default Log Message: Approve new added information_schema views check_constraints, sequences and table_constraints. diffs (truncated from 470 to 300 lines): 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 @@ -444,10 +444,13 @@ select 'null in fkeys.delete_action', de % .%25,.s, .t, ., ., .t, ., ., . # table_name % %25, name, name, query, type, system, commit_action, access, comment # name % char,varchar,varchar,clob, varchar, boolean,char, char, varchar # type -% 11, 18, 34, 3752, 5, 5, 8, 10, 0 # length +% 11, 18, 34, 4470, 5, 5, 8, 10, 0 # length [ "sys._tables", "information_schema", "character_sets", "create view information_schema.character_sets as select cast(null as varchar(1)) as character_set_catalog, cast(null as varchar(1)) as character_set_schema, cast('UTF-8' as varchar(16)) as character_set_name, cast('ISO/IEC 10646:2021' as varchar(20)) as character_repertoire, cast('UTF-8' as varchar(16)) as form_of_use, cast(null as varchar(1)) as default_collate_catalog, cast(null as varchar(1)) as default_collate_schema, cast(null as varchar(1)) as default_collate_name;", "VIEW", true, "COMMIT", "WRITABLE", NULL ] -[ "sys._tables", "information_schema", "columns", "create view information_schema.columns as select cast(null as varchar(1)) as table_catalog, s.\"name\" as table_schema, t.\"name\" as table_name, c.\"name\" as column_name, cast(c.\"number\" +1 as int) as ordinal_position, c.\"default\" as column_default, cast(sys.ifthenelse(c.\"null\", 'YES', 'NO') as varchar(3)) as is_nullable, c.\"type\" as data_type, cast(sys.ifthenelse(c.\"type\" in ('varchar','clob','char','json','url','xml'), c.\"type_digits\", null) as int) as character_maximum_length, cast(sys.ifthenelse(c.\"type\" in ('varchar','clob','char','json','url','xml'), c.\"type_digits\" * 3, null) as int) as character_octet_length, cast(sys.ifthenelse(c.\"type\" in ('int','smallint','tinyint','bigint','hugeint','float','real','double','decimal','numeric','oid'), c.\"type_digits\", null) as int) as numeric_precision, cast(sys.ifthenelse(c.\"type\" in ('int','smallint','tinyint','bigint','hugeint','float','real','double','oid'), 2, sys.ifthenelse(c.\"type\" in ('decimal','numeric'), 10, null)) as int) as numeric_precision_radix, cast(sys.ifthenelse(c.\"type\" in ('int','smallint','tinyint','bigint','hugeint','float','real','double','decimal','numeric','oid'), c.\"type_scale\", null) as int) as numeric_scale, cast(sys.ifthenelse(c.\"type\" in ('date','timestamp','timestamptz','time','timetz'), c.\"type_scale\" -1, null) as int) as datetime_precision, cast(case c.\"type\" when 'day_interval' then 'interval day' when 'month_interval' then 'interval month' when 'sec_interval' then 'interval second' else null end as varchar(40)) as interval_type, cast(sys.ifthenelse(c.\"type\" in ('day_interval','month_interval','sec_interval'), c.\"type_scale\" -1, null) as int) as interval_precision, cast(null as varchar(1)) as character_set_catalog, cast(null as varchar(1)) as character_set_schema, cast(sys.ifthenelse(c.\"type\" in ('varchar','clob','char','json','url','xml'), 'UTF-8', null) as varchar(16)) as character_set_nam e, cast(null as varchar(1)) as collation_catalog, cast(null as varchar(1)) as collation_schema, cast(null as varchar(1)) as collation_name, cast(null as varchar(1)) as domain_catalog, cast(null as varchar(1)) as domain_schema, cast(null as varchar(1)) as domain_name, cast(null as varchar(1)) as udt_catalog, cast(null as varchar(1)) as udt_schema, cast(null as varchar(1)) as udt_name, cast(null as varchar(1)) as scope_catalog, cast(null as varchar(1)) as scope_schema, cast(null as varchar(1)) as scope_name, cast(null as int) as maximum_cardinality, cast(null as varchar(1)) as dtd_identifier, cast('NO' as varchar(3)) as is_self_referencing, cast(case when c.\"default\" like 'next value for %' then 'YES' else 'NO' end as varchar(3)) as is_identity, cast(null as varchar(10)) as identity_generation, cast(null as int) as identity_start, cast(null as int) as identity_increment, cast(null as int) as identity_maximum, cast(null as int) as identity_minimum, cast(null as varchar(3)) as identit y_cycle, cast('NO' as varchar(3)) as is_generated, cast(null as varchar(1)) as generation_expression, cast('NO' as varchar(3)) as is_system_time_period_start, cast('NO' as varchar(3)) as
MonetDB: default - Approve
Changeset: ab76226dd888 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/ab76226dd888 Modified Files: sql/test/Dependencies/Tests/dependency_owner_schema_3.test Branch: default Log Message: Approve diffs (71 lines): diff --git a/sql/test/Dependencies/Tests/dependency_owner_schema_3.test b/sql/test/Dependencies/Tests/dependency_owner_schema_3.test --- a/sql/test/Dependencies/Tests/dependency_owner_schema_3.test +++ b/sql/test/Dependencies/Tests/dependency_owner_schema_3.test @@ -78,6 +78,9 @@ DEP_VIEW ids DEP_VIEW _tables +table_constraints +DEP_VIEW +_tables tables DEP_VIEW _tables @@ -180,6 +183,9 @@ comments schemata DEP_VIEW comments +sequences +DEP_VIEW +comments tables DEP_VIEW comments @@ -428,6 +434,9 @@ DEP_VIEW keys ids DEP_VIEW +keys +table_constraints +DEP_VIEW objects dependency_columns_on_indexes DEP_VIEW @@ -561,12 +570,18 @@ schemas schemata DEP_VIEW schemas +sequences +DEP_VIEW +schemas statistics DEP_VIEW schemas storage DEP_VIEW schemas +table_constraints +DEP_VIEW +schemas tables DEP_VIEW schemas @@ -581,6 +596,9 @@ DEP_VIEW sequences ids DEP_VIEW +sequences +sequences +DEP_VIEW storage schemastorage DEP_VIEW @@ -820,7 +838,7 @@ DEP_FUNC query TTT rowsort SELECT distinct c.name, v.name, 'DEP_VIEW' from sys.columns as c, sys.tables as v, sys.dependencies as dep where c.id = dep.id AND v.id = dep.depend_id AND dep.depend_type = 5 AND v.type in (1, 11, 21, 31) order by c.name, v.name -1623 values hashing to 6b21bdd80c4e73ef598244a23a31446a +1677 values hashing to f5071174850041be0fdcc4ca508a68f3 query TTT rowsort SELECT c.name, k.name, 'DEP_KEY' from sys.columns as c, sys.objects as kc, sys.keys as k where kc."name" = c.name AND kc.id = k.id AND k.table_id = c.table_id AND k.rkey = -1 order by c.name, k.name ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve output after implementing IFNULL() in...
Changeset: f9d9685ea1d2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/f9d9685ea1d2 Modified Files: sql/test/odbc-escape-sequences/Tests/system-functions.test Branch: default Log Message: Approve output after implementing IFNULL() in parser diffs (25 lines): diff --git a/sql/test/odbc-escape-sequences/Tests/system-functions.test b/sql/test/odbc-escape-sequences/Tests/system-functions.test --- a/sql/test/odbc-escape-sequences/Tests/system-functions.test +++ b/sql/test/odbc-escape-sequences/Tests/system-functions.test @@ -26,8 +26,20 @@ select { fn IFNULL(NULLIF(3,3), -9.0/+4) -2.250 -statement error +query I rowsort +select IFNULL(NULL, 1) + +1 + +query T rowsort select IFNULL('abc', 'def') + +abc + +query R rowsort +select IFNULL(NULLIF(3,3), -9.0/+4) + +-2.250 query T rowsort ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve output after implementing IFNULL() in...
Changeset: 722dc858a546 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/722dc858a546 Modified Files: sql/test/sys-schema/Tests/webExamplesComparisonFunctionsOperators.test Branch: default Log Message: Approve output after implementing IFNULL() in parser diffs (104 lines): diff --git a/sql/test/sys-schema/Tests/webExamplesComparisonFunctionsOperators.test b/sql/test/sys-schema/Tests/webExamplesComparisonFunctionsOperators.test --- a/sql/test/sys-schema/Tests/webExamplesComparisonFunctionsOperators.test +++ b/sql/test/sys-schema/Tests/webExamplesComparisonFunctionsOperators.test @@ -115,20 +115,30 @@ select coalesce('aa', 'b') as aa aa -statement error +query T rowsort select ifnull('aa', 'b') as aa + +aa -statement error +query T rowsort select ifnull(null, 'ams') as ams + +ams -statement error +query T rowsort select ifnull(null, null) as nul + +NULL -statement error +query T rowsort select ifnull('aa', null) as aa + +aa -statement error +query I rowsort select ifnull(true, null) as tru + +1 query T rowsort select {fn IFNULL('aa', 'b')} as aa @@ -164,14 +174,61 @@ create table t6933 (i int, c varchar(8)) statement ok insert into t6933 values (1, 'aa1'), (2, null), (null, 'bb2'), (null, null) -statement error +query ITITT rowsort select i, c, ifnull(i, 2*3) as "ifnull(i,2*3)", ifnull(c, 'has null') as "ifnull(i,'x')", ifnull(i, c) as "ifnull(i,c)" from t6933 + +1 +aa1 +1 +aa1 +1 +2 +NULL +2 +has null +2 +NULL +NULL +6 +has null +NULL +NULL +bb2 +6 +bb2 +bb2 -statement error +query TIT rowsort select c, i, ifnull(c, i) as "ifnull(c,i)" from t6933 + +NULL +2 +2 +NULL +NULL +NULL +aa1 +1 +aa1 +bb2 +NULL +bb2 -statement error +query TIT rowsort select c, i, ifnull(c, cast(i as char)) as "ifnull(c,i)" from t6933 + +NULL +2 +2 +NULL +NULL +NULL +aa1 +1 +aa1 +bb2 +NULL +bb2 query ITITT rowsort select i, c, {fn ifnull(i, 2*3)} as "ifnull(i,2*3)", { fn ifnull(c, 'has null') } as "ifnull(i,'x')", { fn ifnull(i, c)} as "ifnull(i,c)" from t6933 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve file_loader error messages
Changeset: ff714c7a4c36 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/ff714c7a4c36 Modified Files: sql/server/rel_select.c sql/test/file_loader/Tests/file_loader_function.test sql/test/file_loader/Tests/file_loader_string.test Branch: default Log Message: Approve file_loader error messages diffs (95 lines): 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 @@ -541,12 +541,11 @@ file_loader_add_table_column_types(mvc * char *ext = strrchr(filename, '.'), *ep = ext; if (ext) { - ext=ext+1; + ext = ext + 1; ext = mkLower(sa_strdup(sql->sa, ext)); } - if (!ext) - return "extension missing"; + return "Filename extension missing"; file_loader_t *fl = fl_find(ext); if (!fl) { @@ -563,7 +562,7 @@ file_loader_add_table_column_types(mvc * fl = fl_find(ext); } if (!fl) - return sa_message(sql->ta, "extension '%s' missing", ext?ext:""); + return sa_message(sql->ta, "Filename extension '%s' missing", ext?ext:""); } str err = fl->add_types(sql, f, filename, res_exps, tname); if (err) diff --git a/sql/test/file_loader/Tests/file_loader_function.test b/sql/test/file_loader/Tests/file_loader_function.test --- a/sql/test/file_loader/Tests/file_loader_function.test +++ b/sql/test/file_loader/Tests/file_loader_function.test @@ -1,12 +1,28 @@ -statement error 42000!Table expression without table name +statement error 42000!SELECT: file_loader function type resolutions failed 'Filename missing' select * from file_loader('') -statement error 42000!Table expression without table name -select * from file_loader('filenotfound') +statement error 42000!SELECT: file_loader function type resolutions failed 'Filename extension missing' +select * from file_loader('FileNotFound') + +statement error 42000!SELECT: file_loader function type resolutions failed 'File not found' +select * from file_loader('/tmp/FileNotFound.csv') + +statement error 42000!SELECT: file_loader function type resolutions failed 'Filename extension 'gz' missing' +select * from file_loader('/tmp/FileNotFound.gz') -statement error server crash +statement error 42000!SELECT: file_loader function type resolutions failed 'File not found' +select * from file_loader('/tmp/FileNotFound.csv.gz') + +statement error 42000!SELECT: file_loader function type resolutions failed 'File not found' +select * from file_loader(R'C:\temp\FileNotFound.csv.gz') + + +statement error 42000!SELECT: no such table returning function 'sys'.'file_loader'(char) select * from sys.file_loader('') -statement error server crash -select * from sys.file_loader('filenotfound') +statement error 42000!SELECT: no such table returning function 'sys'.'file_loader'(char(12)) +select * from sys.file_loader('FileNotFound') +statement error 42000!SELECT: no such table returning function 'sys'.'file_loader'(char(16)) +select * from sys.file_loader('FileNotFound.csv') + diff --git a/sql/test/file_loader/Tests/file_loader_string.test b/sql/test/file_loader/Tests/file_loader_string.test --- a/sql/test/file_loader/Tests/file_loader_string.test +++ b/sql/test/file_loader/Tests/file_loader_string.test @@ -1,15 +1,21 @@ -statement error 42000!Table expression without table name +statement error 42000!SELECT: file_loader function type resolutions failed 'Filename missing' select * from '' -statement error 42000!Table expression without table name +statement error 42000!SELECT: file_loader function type resolutions failed 'Filename extension missing' select * from 'FileNotFound' -statement error 42000!Table expression without table name +statement error 42000!SELECT: file_loader function type resolutions failed 'Filename extension missing' select * from '/tmp/FileNotFound' -statement error 42000!Table expression without table name +statement error 42000!SELECT: file_loader function type resolutions failed 'File not found' select * from '/tmp/FileNotFound.csv' -statement error 42000!Table expression without table name +statement error 42000!SELECT: file_loader function type resolutions failed 'Filename extension 'gz' missing' +select * from '/tmp/FileNotFound.gz' + +statement error 42000!SELECT: file_loader function type resolutions failed 'File not found' select * from '/tmp/FileNotFound.csv.gz' +statement error 42000!SELECT: file_loader function type resolutions failed 'File not found' +select * from R'C:\temp\FileNotFound.csv.gz' + ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve updated file_loader function info
Changeset: 6734c9d6db44 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/6734c9d6db44 Modified Files: sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 Branch: default Log Message: Approve updated file_loader function info diffs (36 lines): 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 @@ -1754,7 +1754,7 @@ select 'null in fkeys.delete_action', de [ "sys.functions", "sys", "evalalgebra", "SYSTEM", "create procedure sys.evalalgebra(ra_stmt string, opt bool) external name sql.\"evalAlgebra\";","sql", "MAL", "Procedure",true, false, false, true, NULL, "ra_stmt", "clob", 0, 0, "in", "opt", "boolean", 1, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] [ "sys.functions", "sys", "exp", "SYSTEM", "exp", "mmath", "Internal C", "Scalar function", false, false, false, false, NULL, "res_0","double", 53, 0, "out", "arg_1", "double", 53, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] [ "sys.functions", "sys", "exp", "SYSTEM", "exp", "mmath", "Internal C", "Scalar function", false, false, false, false, NULL, "res_0","real", 24, 0, "out", "arg_1","real", 24, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] -[ "sys.functions", "sys", "file_loader", "SYSTEM", "", "", "Internal C", "Function returning a table", false, true, false, true, NULL, "res_0","table",0, 0, "out", "arg_1", "clob", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] +[ "sys.functions", "sys", "file_loader", "SYSTEM", "", "files","Internal C", "Function returning a table", false, true, false, true, NULL, "res_0","table",0, 0, "out", "arg_1","clob", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] [ "sys.functions", "sys", "first_value", "SYSTEM", "first_value", "sql", "Internal C",
MonetDB: default - Approve upgrade for describe_accessible_tables.
Changeset: a151cf4b45d9 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/a151cf4b45d9 Modified Files: 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-chain/Tests/upgrade.stable.out.ppc64.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/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: Approve upgrade for describe_accessible_tables. diffs (truncated from 750 to 300 lines): 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 @@ -416,3 +416,26 @@ GRANT EXECUTE ON AGGREGATE ST_MakeLine(G update sys.functions set system = true where system <> true and schema_id = 2000 and name in ('st_collect', 'st_distancegeographic', 'st_dwithingeographic', 'st_dwithin', 'st_dwithin_noindex', 'st_dwithin2', 'st_intersectsgeographic', 'st_intersects', 'st_intersects_noindex', 'st_makeline'); update sys._tables set system = true where system <> true and schema_id = 2000 and name = 'geometry_columns'; +Running database upgrade commands: +create view sys.describe_accessible_tables as + select + schemas.name as schema, + tables.name as table, + table_types.table_type_name as table_type, + privilege_codes.privilege_code_name as privs, + privileges.privileges as privs_code + from privileges + join sys.roles + on privileges.auth_id = roles.id + join sys.tables + on privileges.obj_id = tables.id + join sys.table_types + on tables.type = table_types.table_type_id + join sys.schemas + on tables.schema_id = schemas.id + join sys.privilege_codes + on privileges.privileges = privilege_codes.privilege_code_id + where roles.name = current_role; +GRANT SELECT ON sys.describe_accessible_tables TO PUBLIC; +update sys._tables set system = true where system <> true and schema_id = 2000 and name = 'describe_accessible_tables'; + 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 @@ -416,3 +416,26 @@ GRANT EXECUTE ON AGGREGATE ST_MakeLine(G update sys.functions set system = true where system <> true and schema_id = 2000 and name in ('st_collect', 'st_distancegeographic', 'st_dwithingeographic', 'st_dwithin', 'st_dwithin_noindex', 'st_dwithin2', 'st_intersectsgeographic', 'st_intersects', 'st_intersects_noindex', 'st_makeline'); update sys._tables set system = true where system <> true and schema_id = 2000 and name = 'geometry_columns'; +Running database upgrade commands: +create view sys.describe_accessible_tables as + select + schemas.name as schema, + tables.name as table, + table_types.table_type_name as table_type, + privilege_codes.privilege_code_name as privs, + privileges.privileges as privs_code + from privileges + join sys.roles + on privileges.auth_id = roles.id + join sys.tables + on privileges.obj_id = tables.id + join sys.table_types + on tables.type = table_types.table_type_id + join sys.schemas + on tables.schema_id = schemas.id + join sys.privilege_codes + on privileges.privileges =
MonetDB: default - approve new function rel_file_loader
Changeset: b8979613b7b8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/b8979613b7b8 Modified Files: sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 Branch: default Log Message: approve new function rel_file_loader diffs (33 lines): 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 @@ -1634,6 +1634,7 @@ select 'null in fkeys.delete_action', de [ "sys.functions", "sys", "evalalgebra", "SYSTEM", "create procedure sys.evalalgebra(ra_stmt string, opt bool) external name sql.\"evalAlgebra\";","sql", "MAL", "Procedure",true, false, false, true, NULL, "ra_stmt", "clob", 0, 0, "in", "opt", "boolean", 1, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] [ "sys.functions", "sys", "exp", "SYSTEM", "exp", "mmath", "Internal C", "Scalar function", false, false, false, false, NULL, "res_0","double", 53, 0, "out", "arg_1", "double", 53, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] [ "sys.functions", "sys", "exp", "SYSTEM", "exp", "mmath", "Internal C", "Scalar function", false, false, false, false, NULL, "res_0","real", 24, 0, "out", "arg_1","real", 24, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] +[ "sys.functions", "sys", "file_loader", "SYSTEM", "", "", "Internal C", "Function returning a table", false, true, false, true, NULL, "res_0","table",0, 0, "out", "arg_1", "clob", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] [ "sys.functions", "sys", "first_value", "SYSTEM", "first_value", "sql", "Internal C", "Analytic function",false, false, false, true, NULL, "res_0","any", 0, 0, "out", "arg_1","any", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] [ "sys.functions", "sys", "fitsattach", "SYSTEM", "create procedure fitsattach(fname string) external name
MonetDB: default - Approve 32 bit output.
Changeset: a5b757b58cd2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/a5b757b58cd2 Modified Files: sql/test/emptydb/Tests/check.stable.out.32bit Branch: default Log Message: Approve 32 bit output. diffs (truncated from 504 to 300 lines): diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit b/sql/test/emptydb/Tests/check.stable.out.32bit --- a/sql/test/emptydb/Tests/check.stable.out.32bit +++ b/sql/test/emptydb/Tests/check.stable.out.32bit @@ -545,6 +545,7 @@ select 'null in fkeys.delete_action', de [ "sys._tables", "sys", "queue","create view sys.queue as select * from sys.queue();", "VIEW", true, "COMMIT", "WRITABLE", NULL] [ "sys._tables", "sys", "range_partitions", NULL, "TABLE", true, "COMMIT", "WRITABLE", NULL] [ "sys._tables", "sys", "rejects", "create view sys.rejects as select * from sys.rejects();", "VIEW", true, "COMMIT", "WRITABLE", NULL] +[ "sys._tables", "sys", "remote_user_info", NULL, "TABLE", true, "COMMIT", "WRITABLE", NULL] [ "sys._tables", "sys", "roles","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);", "VIEW", true, "COMMIT", "WRITABLE", NULL] [ "sys._tables", "sys", "schemas", NULL, "TABLE",true, "COMMIT", "WRITABLE", NULL] [ "sys._tables", "sys", "schemastorage","create view sys.\"schemastorage\" as select \"schema\", count(*) as \"storages\", sum(columnsize) as columnsize, sum(heapsize) as heapsize, sum(hashes) as hashsize, sum(\"imprints\") as imprintsize, sum(orderidx) as orderidxsize from sys.\"storage\" group by \"schema\" order by \"schema\";", "VIEW", true, "COMMIT", "WRITABLE", NULL] @@ -573,7 +574,7 @@ select 'null in fkeys.delete_action', de [ "sys._tables", "tmp", "keys", NULL, "TABLE",true, "PRESERVE", "WRITABLE", NULL] [ "sys._tables", "tmp", "objects", NULL, "TABLE",true, "PRESERVE", "WRITABLE", NULL] [ "sys._tables", "tmp", "triggers", NULL, "TABLE",true, "PRESERVE", "WRITABLE", NULL] -% .%1, sys.t, .c, .c, .c, .c, .c, .c, .c, .c, . # table_name +% .%1, .t, .c, .c, .c, .c, .c, .c, .c, .c, . # table_name % %1, name, name, type, type_digits,type_scale, default, null, number, storage,comment # name % char,varchar,varchar,varchar,int,int, varchar,boolean,int,varchar,varchar # type % 12, 34, 26, 9, 7, 1, 5, 5, 2, 0, 0 # length @@ -1173,6 +1174,9 @@ select 'null in fkeys.delete_action', de [ "sys._columns", "rejects", "fldid","int", 32, 0, NULL, true, 1, NULL, NULL] [ "sys._columns", "rejects", "message", "clob", 0, 0, NULL, true, 2, NULL, NULL] [ "sys._columns", "rejects", "input","clob", 0, 0, NULL, true, 3, NULL, NULL] +[ "sys._columns", "remote_user_info", "table_id", "int", 32, 0, NULL, true, 0, NULL, NULL] +[ "sys._columns", "remote_user_info", "username", "varchar", 1024, 0, NULL, true, 1, NULL, NULL] +[ "sys._columns", "remote_user_info", "password", "varchar", 256,0, NULL, true, 2, NULL, NULL] [ "sys._columns", "roles","id", "int", 32, 0, NULL, true, 0, NULL, NULL] [ "sys._columns", "roles","name", "varchar", 1024, 0, NULL, true, 1, NULL, NULL] [ "sys._columns", "roles","grantor", "int", 32, 0, NULL, true, 2, NULL, NULL] @@ -1429,6 +1433,7 @@ select 'null in fkeys.delete_action', de [ "sys.functions", "sys", "ascii","SYSTEM", "ascii", "str", "Internal C", "Scalar function", false, false, false, true, NULL, "res_0","int", 32, 0, "out", "arg_1","char", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
MonetDB: default - Approve upgrade.
Changeset: fb6f5cac224b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/fb6f5cac224b Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 Branch: default Log Message: Approve upgrade. diffs (90 lines): 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 @@ -339,3 +339,86 @@ create procedure sys.resume(tag bigint, create procedure sys.stop(tag bigint, username string) external name sysmon.stop; update sys.functions set system = true where system <> true and mod = 'sysmon' and name in ('stop', 'pause', 'resume', 'queue'); +Running database upgrade commands: +drop procedure sys.settimeout(bigint) cascade; +drop procedure sys.settimeout(bigint, bigint) cascade; +drop procedure sys.setsession(bigint) cascade; + +Running database upgrade commands: +create function sys.levenshtein(x string, y string) +returns int external name txtsim.levenshtein; +grant execute on function levenshtein(string, string) to public; +create function sys.levenshtein(x string, y string, insdel int, rep int) +returns int external name txtsim.levenshtein; +grant execute on function levenshtein(string, string, int, int) to public; +create function sys.levenshtein(x string, y string, insdel int, rep int, trans int) +returns int external name txtsim.levenshtein; +grant execute on function levenshtein(string, string, int, int, int) to public; +create filter function sys.maxlevenshtein(x string, y string, k int) +external name txtsim."maxlevenshtein"; +create filter function sys.maxlevenshtein(x string, y string, k int, insdel int, rep int) +external name txtsim."maxlevenshtein"; +create filter function minjarowinkler(x string, y string, threshold double) +external name txtsim."minjarowinkler"; +create function sys.dameraulevenshtein(x string, y string) +returns int external name txtsim.dameraulevenshtein; +grant execute on function dameraulevenshtein(string, string) to public; +create function sys.dameraulevenshtein(x string, y string, insdel int, rep int, trans int) +returns int external name txtsim.dameraulevenshtein; +grant execute on function dameraulevenshtein(string, string, int, int, int) to public; +create function sys.editdistance(x string, y string) +returns int external name txtsim.editdistance; +grant execute on function editdistance(string, string) to public; +create function sys.editdistance2(x string, y string) +returns int external name txtsim.editdistance2; +grant execute on function editdistance2(string, string) to public; +create function sys.soundex(x string) +returns string external name txtsim.soundex; +grant execute on function soundex(string) to public; +create function sys.difference(x string, y string) +returns int external name txtsim.stringdiff; +grant execute on function difference(string, string) to public; +create function sys.qgramnormalize(x string) +returns string external name txtsim.qgramnormalize; +grant execute on function qgramnormalize(string) to public; +create function sys.similarity(x string, y string) +returns double external name txtsim.similarity; +grant execute on function similarity(string, string) to public; +create function asciify(x string) +returns string external name str."asciify"; +create function sys.startswith(x string, y string) +returns boolean external name str."startsWith"; +grant execute on function startswith(string, string) to public; +create function sys.startswith(x string, y string, icase boolean) +returns boolean external name str."startsWith"; +grant execute on function startswith(string, string, boolean) to public; +create filter function sys.startswith(x string, y string) +external name str."startsWith"; +create filter function sys.startswith(x string, y string, icase boolean) +external name str."startsWith"; +create function sys.endswith(x string, y string) +returns boolean external name str."endsWith"; +grant execute on function endswith(string, string) to public; +create function sys.endswith(x string, y string, icase boolean) +returns boolean external name str."endsWith"; +grant execute on function endswith(string, string, boolean) to public; +create filter function sys.endswith(s1 string, s2 string) +external name str."endsWith"; +create filter function sys.endswith(s1 string, s2 string, icase boolean) +external name str."endsWith"; +create function sys.contains(x string, y string) +returns boolean external name str."contains"; +grant execute on function contains(string, string) to public; +create function sys.contains(x string, y string, icase boolean) +returns boolean external name str."contains"; +grant execute on function contains(string, string, boolean) to public; +create filter function sys.contains(x string, y string) +external name str."contains";
MonetDB: default - Approve new signatures and new exports.
Changeset: a5a7ab297cbe for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/a5a7ab297cbe Modified Files: clients/Tests/MAL-signatures-hge.test clients/Tests/MAL-signatures.test clients/Tests/exports.stable.out Branch: default Log Message: Approve new signatures and new exports. diffs (102 lines): diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -50934,9 +50934,9 @@ command txtsim.editdistance2(X_0:str, X_ TXTSIMdameraulevenshtein2; Alias for Damerau-Levenshtein(str,str), insdel cost = 1, replace cost = 1 and transpose = 1 txtsim -jaro_winkler_similarity -command txtsim.jaro_winkler_similarity(X_0:str, X_1:str):dbl -jaro_winkler_similarity; +jarowinkler +command txtsim.jarowinkler(X_0:str, X_1:str):dbl +TXTSIMjarowinkler; Calculate Jaro Winkler similarity txtsim levenshtein @@ -50964,6 +50964,21 @@ pattern txtsim.maxlevenshtein(X_0:str, X TXTSIMmaxlevenshtein; Levenshtein distance with variable costs but up to a MAX txtsim +maxlevenshteinjoin +command txtsim.maxlevenshteinjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:oid], X_3:bat[:oid], X_4:bit, X_5:lng, X_6:bit, X_7:any) (X_8:bat[:oid], X_9:bat[:oid]) +TXTSIMmaxlevenshteinjoin; +(empty) +txtsim +minjarowinkler +command txtsim.minjarowinkler(X_0:str, X_1:str, X_2:dbl):bit +TXTSIMminjarowinkler; +(empty) +txtsim +minjarowinklerjoin +command txtsim.minjarowinklerjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:lng, X_7:bit) (X_8:bat[:oid], X_9:bat[:oid]) +TXTSIMminjarowinklerjoin; +(empty) +txtsim qgramnormalize command txtsim.qgramnormalize(X_0:str):str qgram_normalize; diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -39259,9 +39259,9 @@ command txtsim.editdistance2(X_0:str, X_ TXTSIMdameraulevenshtein2; Alias for Damerau-Levenshtein(str,str), insdel cost = 1, replace cost = 1 and transpose = 1 txtsim -jaro_winkler_similarity -command txtsim.jaro_winkler_similarity(X_0:str, X_1:str):dbl -jaro_winkler_similarity; +jarowinkler +command txtsim.jarowinkler(X_0:str, X_1:str):dbl +TXTSIMjarowinkler; Calculate Jaro Winkler similarity txtsim levenshtein @@ -39289,6 +39289,21 @@ pattern txtsim.maxlevenshtein(X_0:str, X TXTSIMmaxlevenshtein; Levenshtein distance with variable costs but up to a MAX txtsim +maxlevenshteinjoin +command txtsim.maxlevenshteinjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:oid], X_3:bat[:oid], X_4:bit, X_5:lng, X_6:bit, X_7:any) (X_8:bat[:oid], X_9:bat[:oid]) +TXTSIMmaxlevenshteinjoin; +(empty) +txtsim +minjarowinkler +command txtsim.minjarowinkler(X_0:str, X_1:str, X_2:dbl):bit +TXTSIMminjarowinkler; +(empty) +txtsim +minjarowinklerjoin +command txtsim.minjarowinklerjoin(X_0:bat[:str], X_1:bat[:str], X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:lng, X_7:bit) (X_8:bat[:oid], X_9:bat[:oid]) +TXTSIMminjarowinklerjoin; +(empty) +txtsim qgramnormalize command txtsim.qgramnormalize(X_0:str):str qgram_normalize; @@ -39302,7 +39317,7 @@ txtsim similarity command txtsim.similarity(X_0:str, X_1:str):dbl fstrcmp0_impl; -"(Deprecated) Normalized edit distance between two strings" +(Deprecated) Normalized edit distance between two strings txtsim similarity command txtsim.similarity(X_0:str, X_1:str, X_2:dbl):dbl 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 @@ -1046,11 +1046,13 @@ const char *mapiRef; const char *maskRef; const char *matRef; const char *maxRef; +const char *maxlevenshteinRef; const char *mdbRef; const char *mergecandRef; const char *mergepackRef; const char *mergetableRef; const char *minRef; +const char *minjarowinklerRef; const char *minusRef; const char *mirrorRef; const char *mitosisRef; ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve power8 upgrade.
Changeset: 68279f272dbc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/68279f272dbc Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 Branch: default Log Message: Approve power8 upgrade. diffs (31 lines): 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 @@ -115,10 +115,15 @@ drop view if exists sys.dump_partition_t drop view if exists sys.dump_create_users cascade; drop view if exists sys.describe_tables cascade; drop function if exists sys.get_remote_table_expressions(string, string) cascade; +drop function if exists sys.remote_table_credentials(string) cascade; drop function if exists sys.sq(string) cascade; +create table sys.remote_user_info (table_id int, username varchar(1024), password varchar(256)); +create function sys.decypher (cypher string) returns string external name sql.decypher; +update sys.functions set system = true where system <> true and name = 'decypher' and schema_id = 2000 and type = 1; +update sys._tables set system = true where system <> true and name = 'remote_user_info' and schema_id = 2000; CREATE FUNCTION sys.SQ (s STRING) RETURNS STRING BEGIN RETURN || sys.replace(s,,'') || ; END; CREATE FUNCTION sys.get_remote_table_expressions(s STRING, t STRING) RETURNS STRING BEGIN - RETURN SELECT ' ON ' || sys.SQ(uri) || ' WITH USER ' || sys.SQ(username) || ' ENCRYPTED PASSWORD ' || sys.SQ("hash") FROM sys.remote_table_credentials(s ||'.' || t); + RETURN SELECT ' ON ' || sys.SQ(tt.query) || ' WITH USER ' || sys.SQ(username) || ' ENCRYPTED PASSWORD ' || sys.SQ(sys.decypher("password")) FROM sys.remote_user_info r, sys._tables tt, sys.schemas ss where tt.name = t and ss.name = s and tt.schema_id = ss.id and r.table_id = tt.id; END; CREATE VIEW sys.describe_tables AS SELECT @@ -327,3 +332,10 @@ external name inspect."getDatabaseName"; grant execute on function sys.database() to public; update sys.functions set system = true where system <> true and name = 'database' and schema_id = 2000 and type = 1; +Running database upgrade commands: +create function sys.queue(username string) returns table("tag" bigint, "sessionid" int, "username" string, "started" timestamp, "status" string, "query" string, "finished" timestamp, "maxworkers" int, "footprint" int) external name sysmon.queue; +create procedure sys.pause(tag bigint, username string) external name sysmon.pause; +create procedure sys.resume(tag bigint, username string) external name sysmon.resume; +create procedure sys.stop(tag bigint, username string) external name sysmon.stop; +update sys.functions set system = true where system <> true and mod = 'sysmon' and name in ('stop', 'pause', 'resume', 'queue'); + ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve upgrade code on no-hge build.
Changeset: cb7e09b86c8b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/cb7e09b86c8b Modified Files: sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb/Tests/check.stable.out sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out Branch: default Log Message: Approve upgrade code on no-hge build. diffs (250 lines): 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 @@ -376,10 +376,15 @@ drop view if exists sys.dump_partition_t drop view if exists sys.dump_create_users cascade; drop view if exists sys.describe_tables cascade; drop function if exists sys.get_remote_table_expressions(string, string) cascade; +drop function if exists sys.remote_table_credentials(string) cascade; drop function if exists sys.sq(string) cascade; +create table sys.remote_user_info (table_id int, username varchar(1024), password varchar(256)); +create function sys.decypher (cypher string) returns string external name sql.decypher; +update sys.functions set system = true where system <> true and name = 'decypher' and schema_id = 2000 and type = 1; +update sys._tables set system = true where system <> true and name = 'remote_user_info' and schema_id = 2000; CREATE FUNCTION sys.SQ (s STRING) RETURNS STRING BEGIN RETURN || sys.replace(s,,'') || ; END; CREATE FUNCTION sys.get_remote_table_expressions(s STRING, t STRING) RETURNS STRING BEGIN - RETURN SELECT ' ON ' || sys.SQ(uri) || ' WITH USER ' || sys.SQ(username) || ' ENCRYPTED PASSWORD ' || sys.SQ("hash") FROM sys.remote_table_credentials(s ||'.' || t); + RETURN SELECT ' ON ' || sys.SQ(tt.query) || ' WITH USER ' || sys.SQ(username) || ' ENCRYPTED PASSWORD ' || sys.SQ(sys.decypher("password")) FROM sys.remote_user_info r, sys._tables tt, sys.schemas ss where tt.name = t and ss.name = s and tt.schema_id = ss.id and r.table_id = tt.id; END; CREATE VIEW sys.describe_tables AS SELECT 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 @@ -370,10 +370,15 @@ drop view if exists sys.dump_partition_t drop view if exists sys.dump_create_users cascade; drop view if exists sys.describe_tables cascade; drop function if exists sys.get_remote_table_expressions(string, string) cascade; +drop function if exists sys.remote_table_credentials(string) cascade; drop function if exists sys.sq(string) cascade; +create table sys.remote_user_info (table_id int, username varchar(1024), password varchar(256)); +create function sys.decypher (cypher string) returns string external name sql.decypher; +update sys.functions set system = true where system <> true and name = 'decypher' and schema_id = 2000 and type = 1; +update sys._tables set system = true where system <> true and name = 'remote_user_info' and schema_id = 2000; CREATE FUNCTION sys.SQ (s STRING) RETURNS STRING BEGIN RETURN || sys.replace(s,,'') || ; END; CREATE FUNCTION sys.get_remote_table_expressions(s STRING, t STRING) RETURNS STRING BEGIN - RETURN SELECT ' ON ' || sys.SQ(uri) || ' WITH USER ' || sys.SQ(username) || ' ENCRYPTED PASSWORD ' || sys.SQ("hash") FROM sys.remote_table_credentials(s ||'.' || t); + RETURN SELECT ' ON ' || sys.SQ(tt.query) || ' WITH USER ' || sys.SQ(username) || ' ENCRYPTED PASSWORD ' || sys.SQ(sys.decypher("password")) FROM sys.remote_user_info r, sys._tables tt, sys.schemas ss where tt.name = t and ss.name = s and tt.schema_id = ss.id and r.table_id = tt.id; END; CREATE VIEW sys.describe_tables AS SELECT 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 @@ -46,10 +46,15 @@ drop view if exists sys.dump_partition_t drop view if exists sys.dump_create_users cascade; drop view if exists sys.describe_tables cascade; drop function if exists sys.get_remote_table_expressions(string, string) cascade; +drop function if exists sys.remote_table_credentials(string) cascade; drop function if exists sys.sq(string) cascade; +create table sys.remote_user_info (table_id int,
MonetDB: default - Approve str -> const char * arguments.
Changeset: 1c16c4ec4617 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/1c16c4ec4617 Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: Approve str -> const char * arguments. diffs (14 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 @@ -1356,8 +1356,8 @@ str SQLengineIntern(Client c, backend *b str SQLescapeString(str s); str SQLexit(Client c); str SQLexitClient(Client c); -str SQLinitClient(Client c, str passwd, str challenge, str algo); -str SQLinitClientFromMAL(Client c, str passwd, str challenge, str algo); +str SQLinitClient(Client c, const char *passwd, const char *challenge, const char *algo); +str SQLinitClientFromMAL(Client c, const char *passwd, const char *challenge, const char *algo); str SQLparser(Client c); str SQLreader(Client c); str SQLresetClient(Client c); ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve powerpc upgrade.
Changeset: cea2aeb6e8f7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/cea2aeb6e8f7 Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 Branch: default Log Message: Approve powerpc upgrade. diffs (92 lines): 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 @@ -70,27 +70,27 @@ update sys.functions set system = true w update sys.functions set system = true where system <> true and name = 'filter' and schema_id = (select id from sys.schemas where name = 'json') and type = 1; Running database upgrade commands: -drop procedure if exists wlc.master(); -drop procedure if exists wlc.master(string); -drop procedure if exists wlc.stop(); -drop procedure if exists wlc.flush(); -drop procedure if exists wlc.beat(int); -drop function if exists wlc.clock(); -drop function if exists wlc.tick(); -drop procedure if exists wlr.master(string); -drop procedure if exists wlr.stop(); -drop procedure if exists wlr.accept(); -drop procedure if exists wlr.replicate(); -drop procedure if exists wlr.replicate(timestamp); -drop procedure if exists wlr.replicate(tinyint); -drop procedure if exists wlr.replicate(smallint); -drop procedure if exists wlr.replicate(integer); -drop procedure if exists wlr.replicate(bigint); -drop procedure if exists wlr.beat(integer); -drop function if exists wlr.clock(); -drop function if exists wlr.tick(); -drop schema if exists wlc; -drop schema if exists wlr; +drop procedure if exists wlc.master() cascade; +drop procedure if exists wlc.master(string) cascade; +drop procedure if exists wlc.stop() cascade; +drop procedure if exists wlc.flush() cascade; +drop procedure if exists wlc.beat(int) cascade; +drop function if exists wlc.clock() cascade; +drop function if exists wlc.tick() cascade; +drop procedure if exists wlr.master(string) cascade; +drop procedure if exists wlr.stop() cascade; +drop procedure if exists wlr.accept() cascade; +drop procedure if exists wlr.replicate() cascade; +drop procedure if exists wlr.replicate(timestamp) cascade; +drop procedure if exists wlr.replicate(tinyint) cascade; +drop procedure if exists wlr.replicate(smallint) cascade; +drop procedure if exists wlr.replicate(integer) cascade; +drop procedure if exists wlr.replicate(bigint) cascade; +drop procedure if exists wlr.beat(integer) cascade; +drop function if exists wlr.clock() cascade; +drop function if exists wlr.tick() cascade; +drop schema if exists wlc cascade; +drop schema if exists wlr cascade; Running database upgrade commands: create function sys.regexp_replace(ori string, pat string, rep string, flg string) @@ -105,17 +105,17 @@ grant execute on function regexp_replace update sys.functions set system = true where system <> true and name = 'regexp_replace' and schema_id = 2000 and type = 1; Running database upgrade commands: -drop function if exists sys.dump_database(boolean); -drop procedure if exists sys.dump_table_data(); -drop procedure if exists sys.dump_table_data(string, string); -drop view if exists sys.dump_tables; -drop view if exists sys.dump_comments; -drop function if exists sys.prepare_esc(string, string); -drop view if exists sys.dump_partition_tables; -drop view if exists sys.dump_create_users; -drop view if exists sys.describe_tables; -drop function if exists sys.get_remote_table_expressions(string, string); -drop function if exists sys.sq(string); +drop function if exists sys.dump_database(boolean) cascade; +drop procedure if exists sys.dump_table_data() cascade; +drop procedure if exists sys.dump_table_data(string, string) cascade; +drop view if exists sys.dump_tables cascade; +drop view if exists sys.dump_comments cascade; +drop function if exists sys.prepare_esc(string, string) cascade; +drop view if exists sys.dump_partition_tables cascade; +drop view if exists sys.dump_create_users cascade; +drop view if exists sys.describe_tables cascade; +drop function if exists sys.get_remote_table_expressions(string, string) cascade; +drop function if exists sys.sq(string) cascade; CREATE FUNCTION sys.SQ (s STRING) RETURNS STRING BEGIN RETURN || sys.replace(s,,'') || ; END; CREATE FUNCTION sys.get_remote_table_expressions(s STRING, t STRING) RETURNS STRING BEGIN RETURN SELECT ' ON ' || sys.SQ(uri) || ' WITH USER ' || sys.SQ(username) || ' ENCRYPTED PASSWORD ' || sys.SQ("hash") FROM sys.remote_table_credentials(s ||'.' || t); @@ -302,8 +302,8 @@ update sys.functions set system = true w GRANT SELECT ON sys.describe_tables TO PUBLIC; Running database upgrade commands: -drop view if exists sys.dependency_tables_on_functions; -drop view if exists sys.dependency_views_on_functions; +drop view if exists sys.dependency_tables_on_functions cascade; +drop view if
MonetDB: default - Approve upgrade output.
Changeset: eea47ad7f7d3 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/eea47ad7f7d3 Modified Files: sql/test/emptydb/Tests/check.stable.out Branch: default Log Message: Approve upgrade output. diffs (11 lines): 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 @@ -4242,6 +4242,7 @@ select 'null in fkeys.delete_action', de [ "grant on function", "sys", "covar_samp", "public", "EXECUTE", "monetdb", 0 ] [ "grant on function", "sys", "covar_samp", "public", "EXECUTE", "monetdb", 0 ] [ "grant on function", "sys", "current_sessionid","public", "EXECUTE", "monetdb", 0 ] +[ "grant on function", "sys", "database", "public", "EXECUTE", "monetdb", 0 ] [ "grant on function", "sys", "date_to_str", "public", "EXECUTE", "monetdb", 0 ] [ "grant on function", "sys", "date_trunc", "public", "EXECUTE", "monetdb", 0 ] [ "grant on function", "sys", "date_trunc", "public", "EXECUTE", "monetdb", 0 ] ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve upgrade.
Changeset: 809fb8a9b884 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/809fb8a9b884 Modified Files: 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-chain/Tests/upgrade.stable.out.ppc64.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/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: Approve upgrade. diffs (truncated from 650 to 300 lines): 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 @@ -562,3 +562,22 @@ update sys.functions set system = true w update sys.functions set system = true where system <> true and name = 'dump_database' and schema_id = 2000 and type = 5; GRANT SELECT ON sys.describe_tables TO PUBLIC; +Running database upgrade commands: +drop view if exists sys.dependency_tables_on_functions; +drop view if exists sys.dependency_views_on_functions; +CREATE VIEW sys.dependency_tables_on_functions AS +SELECT t.schema_id AS table_schema_id, t.id AS table_id, t.name AS table_name, f.id AS function_id, f.name AS function_name, f.type AS function_type, dep.depend_type AS depend_type + FROM sys.functions AS f, sys.tables AS t, sys.dependencies AS dep + WHERE t.id = dep.id AND f.id = dep.depend_id + AND dep.depend_type = 7 AND f.type <> 2 AND t.type NOT IN (1, 11) + ORDER BY t.name, t.schema_id, f.name, f.id; +GRANT SELECT ON sys.dependency_tables_on_functions TO PUBLIC; +CREATE VIEW sys.dependency_views_on_functions AS +SELECT v.schema_id AS view_schema_id, v.id AS view_id, v.name AS view_name, f.id AS function_id, f.name AS function_name, f.type AS function_type, dep.depend_type AS depend_type + FROM sys.functions AS f, sys.tables AS v, sys.dependencies AS dep + WHERE v.id = dep.id AND f.id = dep.depend_id + AND dep.depend_type = 7 AND f.type <> 2 AND v.type IN (1, 11) + ORDER BY v.name, v.schema_id, f.name, f.id; +GRANT SELECT ON sys.dependency_views_on_functions TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('dependency_tables_on_functions','dependency_views_on_functions') and schema_id = 2000; + 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 @@ -562,3 +562,22 @@ update sys.functions set system = true w update sys.functions set system = true where system <> true and name = 'dump_database' and schema_id = 2000 and type = 5; GRANT SELECT ON sys.describe_tables TO PUBLIC; +Running database upgrade commands: +drop view if exists sys.dependency_tables_on_functions; +drop view if exists sys.dependency_views_on_functions; +CREATE VIEW sys.dependency_tables_on_functions AS +SELECT t.schema_id AS table_schema_id, t.id AS table_id, t.name AS table_name, f.id AS function_id, f.name AS function_name, f.type AS function_type, dep.depend_type AS depend_type + FROM sys.functions AS f, sys.tables AS t, sys.dependencies AS dep + WHERE t.id = dep.id AND f.id = dep.depend_id + AND dep.depend_type = 7 AND f.type <> 2 AND t.type
MonetDB: default - Approve output.
Changeset: cbcf99724720 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/cbcf99724720 Modified Files: sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit Branch: default Log Message: Approve output. diffs (24 lines): 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 @@ -1576,7 +1576,7 @@ select 'null in value_partitions.value', [ "sys.functions", "sys", "droporderindex", "SYSTEM", "create procedure sys.droporderindex(sys string, tab string, col string) external name sql.droporderindex;","sql", "MAL", "Procedure",true, false, false, true, NULL, "sys", "clob", 0, 0, "in", "tab", "clob", 0, 0, "in", "col", "clob", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] [ "sys.functions", "sys", "dump_database","SYSTEM", "create function sys.dump_database(describe boolean) returns table(o int, stmt string) begin set schema sys; truncate sys.dump_statements; insert into sys.dump_statements values (1, 'START TRANSACTION;'); insert into sys.dump_statements values (2, 'SET SCHEMA \"sys\";'); insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_create_roles; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_create_users; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_create_schemas; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_user_defined_types; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_add_schemas_to_use rs; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_grant_user_privileges; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_sequences; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(order by stmts.o), stmts.s from (select f.o, f.stmt from sys.dump_functions f union all select t.o, t.stmt from sys.dump_tables t) as stmts(o, s); if not describe then call sys.dump_table_data(); end if; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_start_sequences; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_column_defaults; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_table_constraint_type; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_indices; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_foreign_keys; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_partition_tables; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_triggers; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_comments; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_table_grants; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_column_grants; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() ov er(), stmt from sys.dump_function_grants; insert into sys.dump_statements values ((select count(*) from sys.dump_statements) + 1, 'COMMIT;'); return sys.dump_statements; end;", "sql", "SQL", "Function returning a table", false, false, false, true, NULL, "o","int", 32, 0, "out", "stmt", "clob", 0, 0, "out", "describe", "boolean", 1, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
MonetDB: default - Approve some tests.
Changeset: 48a91df3613e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/48a91df3613e Modified Files: sql/test/BugTracker-2020/Tests/wrong-key-error.Bug-6982.test sql/test/Dependencies/Tests/dependency_owner_schema_3.test sql/test/Tests/regexp.test sql/test/bincopy/Tests/bincopycollist.test.in sql/test/mergetables/Tests/merge-tables-limitations.test Branch: default Log Message: Approve some tests. diffs (108 lines): diff --git a/sql/test/BugTracker-2020/Tests/wrong-key-error.Bug-6982.test b/sql/test/BugTracker-2020/Tests/wrong-key-error.Bug-6982.test --- a/sql/test/BugTracker-2020/Tests/wrong-key-error.Bug-6982.test +++ b/sql/test/BugTracker-2020/Tests/wrong-key-error.Bug-6982.test @@ -19,4 +19,3 @@ insert into c (a, b) values (1, 2) statement ok rollback - diff --git a/sql/test/Dependencies/Tests/dependency_owner_schema_3.test b/sql/test/Dependencies/Tests/dependency_owner_schema_3.test --- a/sql/test/Dependencies/Tests/dependency_owner_schema_3.test +++ b/sql/test/Dependencies/Tests/dependency_owner_schema_3.test @@ -298,6 +298,9 @@ DEP_FUNC ms_trunc ms_round DEP_FUNC +regexp_replace +regexp_replace +DEP_FUNC remote_table_credentials get_remote_table_expressions DEP_FUNC diff --git a/sql/test/Tests/regexp.test b/sql/test/Tests/regexp.test --- a/sql/test/Tests/regexp.test +++ b/sql/test/Tests/regexp.test @@ -59,3 +59,4 @@ query T rowsort select regexp_replace('foo', 'f o o', 'XYZ', 'x') XYZ + diff --git a/sql/test/bincopy/Tests/bincopycollist.test.in b/sql/test/bincopy/Tests/bincopycollist.test.in --- a/sql/test/bincopy/Tests/bincopycollist.test.in +++ b/sql/test/bincopy/Tests/bincopycollist.test.in @@ -25,7 +25,7 @@ statement ok START TRANSACTION statement ok -CREATE TABLE intvals(x INTEGER, y INTEGER); +CREATE TABLE intvals(x INTEGER, y INTEGER) statement ok COPY BIG ENDIAN BINARY INTO intvals FROM (E'$QTSTTRGDIR/be123.bin', E'$QTSTTRGDIR/be456.bin') @@ -76,7 +76,6 @@ COPY BINARY INTO intvals (a) FROM (E'$QT statement ok ROLLBACK - statement ok START TRANSACTION @@ -89,7 +88,6 @@ COPY BINARY INTO intvals FROM (E'$QTSTTR statement ok ROLLBACK - statement ok START TRANSACTION diff --git a/sql/test/mergetables/Tests/merge-tables-limitations.test b/sql/test/mergetables/Tests/merge-tables-limitations.test --- a/sql/test/mergetables/Tests/merge-tables-limitations.test +++ b/sql/test/mergetables/Tests/merge-tables-limitations.test @@ -72,7 +72,6 @@ ALTER TABLE tst.mtbl ADD TABLE tmp.mtbl statement error 42000!ALTER TABLE: a MERGE TABLE can't be a child of itself ALTER TABLE tst.mtbl ADD TABLE tst.mtbl - statement ok CREATE REPLICA TABLE tmp.rtbl (c1 int) -- this succeeds strangely @@ -136,7 +135,6 @@ select * from tst.mtbl statement ok ALTER TABLE tst.mtbl DROP TABLE tst.rtbl - statement ok CREATE UNLOGGED TABLE tmp.utbl (c1 int) -- this succeeds strangely @@ -200,7 +198,6 @@ select * from tst.mtbl statement ok ALTER TABLE tst.mtbl DROP TABLE tst.utbl - statement ok CREATE REMOTE TABLE tmp.rmtbl (c1 int) ON 'mapi:monetdb://localhost:5/demo' -- this succeeds strangely @@ -264,7 +261,6 @@ select * from tst.mtbl statement ok ALTER TABLE tst.mtbl DROP TABLE tst.rmtbl - statement ok CREATE LOCAL TEMP TABLE tmp.lttbl (c1 int) ON COMMIT PRESERVE ROWS @@ -293,7 +289,6 @@ ALTER TABLE tmp.mtbl ADD TABLE tmp.lttbl statement error 42000!ALTER TABLE: can't add/drop a temporary table into a MERGE TABLE ALTER TABLE tst.mtbl ADD TABLE tmp.lttbl - statement ok CREATE GLOBAL TEMP TABLE tmp.gttbl (c1 int) ON COMMIT PRESERVE ROWS @@ -322,7 +317,6 @@ ALTER TABLE tmp.mtbl ADD TABLE tmp.gttbl statement error 42000!ALTER TABLE: can't add/drop a temporary table into a MERGE TABLE ALTER TABLE tst.mtbl ADD TABLE tmp.gttbl - --cleanup query TT rowsort select schema, name from tst.my_tables order by 1,2 ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve some tests.
Changeset: a08134adfa53 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/a08134adfa53 Modified Files: clients/Tests/MAL-signatures-hge.test clients/Tests/MAL-signatures.test sql/test/Dependencies/Tests/dependency_functions.test Branch: default Log Message: Approve some tests. diffs (81 lines): diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -48544,6 +48544,16 @@ unsafe pattern sql.exportResult(X_0:stre mvc_export_result_wrap; Export a result (in order) to stream s sql +export_bin_column +unsafe pattern sql.export_bin_column(X_0:any_1, X_1:bit, X_2:str, X_3:int):lng +mvc_bin_export_column_wrap; +export column as binary +sql +export_bin_column +unsafe pattern sql.export_bin_column(X_0:bat[:any_1], X_1:bit, X_2:str, X_3:int):lng +mvc_bin_export_column_wrap; +export column as binary +sql export_table unsafe pattern sql.export_table(X_0:str, X_1:str, X_2:str, X_3:str, X_4:str, X_5:str, X_6:int, X_7:bat[:str], X_8:bat[:str], X_9:bat[:str], X_10:bat[:int], X_11:bat[:int], X_12:any...):int mvc_export_row_wrap; @@ -48590,7 +48600,7 @@ SQLhot_snapshot_wrap; Write db snapshot to the given tar(.gz/.lz4/.bz/.xz) file on either server or client sql importColumn -pattern sql.importColumn(X_0:str, X_1:bit, X_2:str, X_3:int, X_4:oid) (X_5:bat[:any], X_6:oid) +pattern sql.importColumn(X_0:str, X_1:int, X_2:bit, X_3:str, X_4:int, X_5:oid) (X_6:bat[:any], X_7:oid) mvc_bin_import_column_wrap; Import a column from the given file sql diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -36944,6 +36944,16 @@ unsafe pattern sql.exportResult(X_0:stre mvc_export_result_wrap; Export a result (in order) to stream s sql +export_bin_column +unsafe pattern sql.export_bin_column(X_0:any_1, X_1:bit, X_2:str, X_3:int):lng +mvc_bin_export_column_wrap; +export column as binary +sql +export_bin_column +unsafe pattern sql.export_bin_column(X_0:bat[:any_1], X_1:bit, X_2:str, X_3:int):lng +mvc_bin_export_column_wrap; +export column as binary +sql export_table unsafe pattern sql.export_table(X_0:str, X_1:str, X_2:str, X_3:str, X_4:str, X_5:str, X_6:int, X_7:bat[:str], X_8:bat[:str], X_9:bat[:str], X_10:bat[:int], X_11:bat[:int], X_12:any...):int mvc_export_row_wrap; @@ -36990,7 +37000,7 @@ SQLhot_snapshot_wrap; Write db snapshot to the given tar(.gz/.lz4/.bz/.xz) file on either server or client sql importColumn -pattern sql.importColumn(X_0:str, X_1:bit, X_2:str, X_3:int, X_4:oid) (X_5:bat[:any], X_6:oid) +pattern sql.importColumn(X_0:str, X_1:int, X_2:bit, X_3:str, X_4:int, X_5:oid) (X_6:bat[:any], X_7:oid) mvc_bin_import_column_wrap; Import a column from the given file sql diff --git a/sql/test/Dependencies/Tests/dependency_functions.test b/sql/test/Dependencies/Tests/dependency_functions.test --- a/sql/test/Dependencies/Tests/dependency_functions.test +++ b/sql/test/Dependencies/Tests/dependency_functions.test @@ -76,6 +76,9 @@ DEP_FUNC ms_trunc ms_round DEP_FUNC +regexp_replace +regexp_replace +DEP_FUNC remote_table_credentials get_remote_table_expressions DEP_FUNC @@ -128,6 +131,9 @@ DEP_FUNC ms_trunc ms_round DEP_FUNC +regexp_replace +regexp_replace +DEP_FUNC remote_table_credentials get_remote_table_expressions DEP_FUNC ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve dependency test.
Changeset: 6dd6cca713d4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/6dd6cca713d4 Modified Files: sql/test/Dependencies/Tests/dependency_DBobjects.test Branch: default Log Message: Approve dependency test. diffs (13 lines): diff --git a/sql/test/Dependencies/Tests/dependency_DBobjects.test b/sql/test/Dependencies/Tests/dependency_DBobjects.test --- a/sql/test/Dependencies/Tests/dependency_DBobjects.test +++ b/sql/test/Dependencies/Tests/dependency_DBobjects.test @@ -424,6 +424,9 @@ DEP_FUNC ms_trunc ms_round DEP_FUNC +regexp_replace +regexp_replace +DEP_FUNC remote_table_credentials get_remote_table_expressions DEP_FUNC ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve output for 32bit windows
Changeset: b498aa35f0e5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/b498aa35f0e5 Modified Files: sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit Branch: default Log Message: Approve output for 32bit windows diffs (16 lines): diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit --- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit +++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit @@ -2602,12 +2602,6 @@ insert into sys.functions values (904, ' insert into sys.functions values (905, 'sys_update_tables', 'update_tables', 'sql', 0, 2, true, false, false, 2000, true, true); Running database upgrade commands: -create procedure SHPattach(fname string) external name shp.attach; -create procedure SHPload(fid integer) external name shp.import; -create procedure SHPload(fid integer, filter geometry) external name shp.import; -update sys.functions set system = true where schema_id = 2000 and name in ('shpattach', 'shpload'); - -Running database upgrade commands: drop function sys.dump_database(boolean); drop procedure sys.dump_table_data(); drop procedure sys.dump_table_data(string, string); ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve upgrade.
Changeset: 390850340c7c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/390850340c7c Modified Files: sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.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.32bit 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-hge/Tests/upgrade.stable.out.ppc64.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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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-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.32bit 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.32bit 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.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: Approve upgrade. diffs (truncated from 3724 to 300 lines): 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 @@ -4088,6 +4088,8 @@ update sys.functions set system = true w Running database upgrade commands: drop function sys.dump_database(boolean); +drop procedure sys.dump_table_data(); +drop procedure sys.dump_table_data(string, string); drop view sys.dump_partition_tables; drop view sys.describe_partition_tables; drop view sys.dump_sequences; @@ -4183,14 +4185,65 @@ CREATE VIEW sys.dump_start_sequences AS sch schema_name, seq sequence_name FROM sys.describe_sequences; +CREATE PROCEDURE sys.dump_table_data(sch STRING, tbl STRING) +BEGIN + DECLARE tid INT; + SET tid = (SELECT MIN(t.id) FROM sys.tables t, sys.schemas s WHERE t.name = tbl AND t.schema_id = s.id AND s.name = sch); + IF tid IS NOT NULL THEN +DECLARE k INT; +DECLARE m INT; +SET k = (SELECT MIN(c.id) FROM sys.columns c WHERE c.table_id = tid); +SET m = (SELECT MAX(c.id) FROM sys.columns c WHERE c.table_id = tid); +IF k IS NOT NULL AND m IS NOT NULL THEN + DECLARE cname STRING; + DECLARE ctype STRING; + DECLARE _cnt INT; + SET cname = (SELECT c.name FROM sys.columns c WHERE c.id = k); + SET ctype = (SELECT c.type FROM sys.columns c WHERE c.id = k); + SET _cnt = (SELECT count FROM sys.storage(sch, tbl, cname)); + IF _cnt > 0 THEN +DECLARE COPY_INTO_STMT STRING; +DECLARE SELECT_DATA_STMT STRING; +SET COPY_INTO_STMT = 'COPY ' || _cnt || ' RECORDS INTO ' || sys.FQN(sch, tbl) || '(' || sys.DQ(cname); +SET SELECT_DATA_STMT = 'SELECT (SELECT COUNT(*) FROM sys.dump_statements) + RANK() OVER(), ' || sys.prepare_esc(cname, ctype); +WHILE (k < m) DO + SET k = (SELECT MIN(c.id) FROM sys.columns c WHERE
MonetDB: default - Approve changes.
Changeset: 3e33256c30d8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/3e33256c30d8 Modified Files: sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 Branch: default Log Message: Approve changes. diffs (48 lines): 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 @@ -1567,9 +1567,9 @@ select 'null in value_partitions.value', [ "sys.functions", "sys", "difference", "SYSTEM", "stringdiff", "txtsim", "Internal C", "Scalar function", false, false, false, true, NULL, "res_0","int", 32, 0, "out", "arg_1", "varchar", 0, 0, "in", "arg_2","varchar", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] [ "sys.functions", "sys", "dq", "SYSTEM", "create function sys.dq (s string) returns string begin return '\"' || sys.replace(s,'\"','\"\"') || '\"'; end;", "sql", "SQL", "Scalar function", false, false, false, true, NULL, "result", "clob", 0, 0, "out", "s", "clob", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] [ "sys.functions", "sys", "droporderindex", "SYSTEM", "create procedure sys.droporderindex(sys string, tab string, col string) external name sql.droporderindex;","sql", "MAL", "Procedure",true, false, false, true, NULL, "sys", "clob", 0, 0, "in", "tab", "clob", 0, 0, "in", "col", "clob", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] -[ "sys.functions", "sys", "dump_database","SYSTEM", "create function sys.dump_database(describe boolean) returns table(o int, stmt string) begin set schema sys; truncate sys.dump_statements; insert into sys.dump_statements values (1, 'START TRANSACTION;'); insert into sys.dump_statements values ((select count(*) from sys.dump_statements) + 1, 'SET SCHEMA \"sys\";'); insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_create_roles; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_create_users; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_create_schemas; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_user_defined_types; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_add_schemas_to_users; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_grant_user_privileges; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_sequences; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(order by stmts.o), stmts.s from (select f.o, f.stmt from sys.dump_functions f union select t.o, t.stmt from sys.dump_tables t) as stmts(o, s); if not describe then call sys.dump_table_data(); end if; insert into sys.dump_statements select (select count(*) from
MonetDB: default - Approve 32-bit and power upgrades
Changeset: b014a51863a0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/b014a51863a0 Modified Files: clients/Tests/MAL-signatures.test sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.32bit sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit Branch: default Log Message: Approve 32-bit and power upgrades diffs (223 lines): diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -33008,6 +33008,11 @@ similarity command battxtsim.similarity(X_0:bat[:str], X_1:bat[:str]):bat[:dbl] fstrcmp0_impl_bulk; Normalized edit distance between two strings +baturl +extractURLHost +command baturl.extractURLHost(X_0:bat[:str], X_1:bit):bat[:str] +BATextractURLHost; +Extract host from BAT of URLs batuuid isaUUID command batuuid.isaUUID(X_0:bat[:str]):bat[:bit] @@ -47999,6 +48004,11 @@ command txtsim.stringdiff(X_0:str, X_1:s stringdiff_impl; calculate the soundexed editdistance url +extractURLHost +command url.extractURLHost(X_0:str, X_1:bit):str +extractURLHost; +Extract host from a URL relaxed version +url getAnchor command url.getAnchor(X_0:url):str URLgetAnchor; @@ -48032,7 +48042,7 @@ url getHost command url.getHost(X_0:url):str URLgetHost; -Extract the server name from the URL +Extract the server name from the URL strict version url getPort command url.getPort(X_0:url):str diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 @@ -4234,4 +4234,7 @@ RETURN sys.dump_statements; END; update sys._tables set system = true where name in ('describe_partition_tables', 'dump_partition_tables', 'dump_sequences', 'dump_start_sequences') AND schema_id = 2000; update sys.functions set system = true where system <> true and name in ('dump_database') and schema_id = 2000 and type = 5; - +CREATE function sys.url_extract_host(url string, no_www bool) RETURNS STRING +EXTERNAL NAME url."extractURLHost"; +GRANT EXECUTE ON FUNCTION url_extract_host(string, bool) TO PUBLIC; +update sys.functions set system = true where system <> true and name = 'url_extract_host' and schema_id = 2000 and type = 1; diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit --- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit +++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit @@ -3887,4 +3887,7 @@ RETURN sys.dump_statements; END; update sys._tables set system = true where name in ('describe_partition_tables', 'dump_partition_tables', 'dump_sequences', 'dump_start_sequences') AND schema_id = 2000; update sys.functions set system = true where system <> true and name in ('dump_database') and schema_id = 2000 and type = 5; - +CREATE function sys.url_extract_host(url string, no_www bool) RETURNS STRING +EXTERNAL NAME url."extractURLHost"; +GRANT EXECUTE ON FUNCTION url_extract_host(string, bool) TO PUBLIC; +update sys.functions set system = true where system <> true and name = 'url_extract_host' and schema_id = 2000 and type = 1; diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 --- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 +++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 @@ -3887,4 +3887,7 @@ RETURN sys.dump_statements; END; update sys._tables set system = true where name in ('describe_partition_tables', 'dump_partition_tables', 'dump_sequences', 'dump_start_sequences') AND schema_id = 2000; update
MonetDB: default - approve test
Changeset: 06d8caeb41cb for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/06d8caeb41cb Modified Files: clients/Tests/MAL-signatures-hge.test Branch: default Log Message: approve test diffs (36 lines): diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -45798,6 +45798,11 @@ similarity command battxtsim.similarity(X_0:bat[:str], X_1:bat[:str]):bat[:dbl] fstrcmp0_impl_bulk; Normalized edit distance between two strings +baturl +extractURLHost +command baturl.extractURLHost(X_0:bat[:str], X_1:bit):bat[:str] +BATextractURLHost; +Extract host from BAT of URLs batuuid isaUUID command batuuid.isaUUID(X_0:bat[:str]):bat[:bit] @@ -64589,6 +64594,11 @@ command txtsim.stringdiff(X_0:str, X_1:s stringdiff_impl; calculate the soundexed editdistance url +extractURLHost +command url.extractURLHost(X_0:str, X_1:bit):str +extractURLHost; +Extract host from a URL relaxed version +url getAnchor command url.getAnchor(X_0:url):str URLgetAnchor; @@ -64622,7 +64632,7 @@ url getHost command url.getHost(X_0:url):str URLgetHost; -Extract the server name from the URL +Extract the server name from the URL strict version url getPort command url.getPort(X_0:url):str ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve function renumbering.
Changeset: 48664ddf44ba for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/48664ddf44ba Modified Files: sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.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.32bit 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-hge/Tests/upgrade.stable.out.ppc64.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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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-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.32bit 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.32bit 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.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: Approve function renumbering. diffs (truncated from 178576 to 300 lines): 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 @@ -399,2582 +399,2554 @@ insert into sys.functions values (165, ' insert into sys.args values (45068, 165, 'res_0', 'clob', 0, 0, 0, 0); insert into sys.args values (45069, 165, 'arg_1', 'clob', 0, 0, 1, 1); insert into sys.args values (45070, 165, 'arg_2', 'clob', 0, 0, 1, 2); -insert into sys.functions values (166, 'listagg', 'str_group_concat', 'aggr', 0, 3, false, false, false, 2000, true, true); -insert into sys.args values (45071, 166, 'res_0', 'varchar', 0, 0, 0, 0); -insert into sys.args values (45072, 166, 'arg_1', 'varchar', 0, 0, 1, 1); -insert into sys.functions values (167, 'listagg', 'str_group_concat', 'aggr', 0, 3, false, false, false, 2000, true, true); -insert into sys.args values (45073, 167, 'res_0', 'varchar', 0, 0, 0, 0); -insert into sys.args values (45074, 167, 'arg_1', 'varchar', 0, 0, 1, 1); -insert into sys.args values (45075, 167, 'arg_2', 'varchar', 0, 0, 1, 2); -insert into sys.functions values (168, 'listagg', 'str_group_concat', 'aggr', 0, 3, false, false, false, 2000, true, true); -insert into sys.args values (45076, 168, 'res_0', 'char', 0, 0, 0, 0); -insert into sys.args values (45077, 168, 'arg_1', 'char', 0, 0, 1, 1); -insert into sys.functions values (169, 'listagg', 'str_group_concat', 'aggr', 0, 3, false, false, false, 2000, true, true); -insert into sys.args values (45078, 169, 'res_0', 'char', 0, 0, 0, 0); -insert into sys.args values (45079, 169, 'arg_1', 'char', 0, 0, 1, 1); -insert into sys.args values (45080, 169, 'arg_2', 'char', 0, 0, 1, 2); -insert into sys.functions values (202, 'rank', 'rank', 'sql', 0, 6, false, false, false, 2000, true, true); -insert into sys.args values (45081, 202, 'res_0',
MonetDB: default - Approve upgrades.
Changeset: 6634b00e193c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/6634b00e193c Modified Files: clients/Tests/MAL-signatures.test sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.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.32bit 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-hge/Tests/upgrade.stable.out.ppc64.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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit 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.32bit 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.32bit 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.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: Approve upgrades. diffs (truncated from 214332 to 300 lines): diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -1,4 +1,5 @@ hash-threshold 10 + query T nosort select * from sys.malfunctions() order by module, "function", address, signature, comment 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 @@ -161,3833 +161,2818 @@ insert into sys.functions values (64, 'r insert into sys.args values (44899, 64, 'res_0', 'boolean', 1, 0, 0, 0); insert into sys.args values (44900, 64, 'arg_1', 'mbr', 0, 0, 1, 1); insert into sys.args values (44901, 64, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (65, 'grouping', '', '', 0, 3, false, false, false, 2000, true, true); -insert into sys.args values (44902, 65, 'res_0', 'tinyint', 8, 0, 0, 0); -insert into sys.args values (44903, 65, 'arg_1', 'any', 0, 0, 1, 1); -insert into sys.functions values (66, 'grouping', '', '', 0, 3, false, false, false, 2000, true, true); -insert into sys.args values (44904, 66, 'res_0', 'smallint', 16, 0, 0, 0); -insert into sys.args values (44905, 66, 'arg_1', 'any', 0, 0, 1, 1); -insert into sys.functions values (67, 'grouping', '', '', 0, 3, false, false, false, 2000, true, true); -insert into sys.args values (44906, 67, 'res_0', 'int', 32, 0, 0, 0); -insert into sys.args values (44907, 67, 'arg_1', 'any', 0, 0, 1, 1); -insert into sys.functions values (68, 'grouping', '', '', 0, 3, false, false, false, 2000, true, true); -insert into sys.args values (44908, 68,
MonetDB: default - Approve tests.
Changeset: 4ad212341d73 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/4ad212341d73 Modified Files: clients/Tests/MAL-signatures-hge.test sql/test/Dependencies/Tests/dependency_owner_schema_3.test sql/test/Dump/Tests/dump-again.stable.out sql/test/Dump/Tests/dump.stable.out sql/test/Tests/comment-dump.test sql/test/UserDump/Tests/dump.stable.out sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.py sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.py sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.py sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade/Tests/upgrade.py sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.py sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.py 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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.py sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.py sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.stable.out.int128 sql/test/emptydb/Tests/dump.SQL.py sql/test/sql_dump/Tests/dump.test sql/test/testdb-previous-upgrade-chain-hge/Tests/dump.stable.out sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-chain/Tests/dump.stable.out sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade-hge/Tests/dump.stable.out sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-previous-upgrade/Tests/dump.stable.out sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/dump.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/dump.stable.out sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/dump.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb/Tests/dump-nogeom.stable.out sql/test/testdb/Tests/dump.stable.out testing/sqllogictest.py Branch: default Log Message: Approve tests. diffs (truncated from 204896 to 300 lines): diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -1,4 +1,5 @@ hash-threshold 10 + query T nosort select * from sys.malfunctions() order by module, "function", address, signature, comment diff --git a/sql/test/Dependencies/Tests/dependency_owner_schema_3.test b/sql/test/Dependencies/Tests/dependency_owner_schema_3.test --- a/sql/test/Dependencies/Tests/dependency_owner_schema_3.test +++ b/sql/test/Dependencies/Tests/dependency_owner_schema_3.test @@ -126,7 +126,7 @@ DEP_FUNC query TTT rowsort SELECT c.name, v.name, 'DEP_VIEW' from sys.columns as c, sys.tables as v, sys.dependencies as dep where c.id = dep.id AND v.id = dep.depend_id AND dep.depend_type = 5 AND v.type in (1, 11, 21, 31) order by c.name, v.name -2277 values hashing to be0394cfd4bbe2f3fb9af9fb43087e76 +2274 values hashing to f4b96600fba0faf630ad83449eaa46b0 query TTT
MonetDB: default - Approve upgrade.
Changeset: 2a60b88782f9 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/2a60b88782f9 Modified Files: sql/backends/monet5/sql_upgrades.c sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.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.32bit 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-hge/Tests/upgrade.stable.out.ppc64.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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit 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.32bit 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.32bit 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.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: Approve upgrade. diffs (truncated from 5330 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 @@ -4624,36 +4624,36 @@ sql_update_default(Client c, mvc *sql) pos += snprintf(buf + pos, bufsize - pos, "CREATE VIEW sys.describe_partition_tables AS\n" - " SELECT \n" + " SELECT\n" " m_sch,\n" " m_tbl,\n" " p_sch,\n" " p_tbl,\n" - " CASE \n" + " CASE\n" " WHEN p_raw_type IS NULL THEN 'READ ONLY'\n" " WHEN (p_raw_type = 'VALUES' AND pvalues IS NULL) OR (p_raw_type = 'RANGE' AND minimum IS NULL AND maximum IS NULL AND with_nulls) THEN 'FOR NULLS'\n" - " ELSE p_raw_type \n" + " ELSE p_raw_type\n" " END AS tpe,\n" " pvalues,\n" " minimum,\n" " maximum,\n" - " with_nulls \n" + " with_nulls\n" " FROM\n" " (WITH\n" - " tp(\"type\", table_id) AS \n" + " tp(\"type\", table_id) AS\n" " (SELECT ifthenelse((table_partitions.\"type\" & 2) = 2, 'VALUES', 'RANGE'),
MonetDB: default - Approve upgrades.
Changeset: a9e684a02df1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/a9e684a02df1 Modified Files: sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.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.32bit 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-hge/Tests/upgrade.stable.out.ppc64.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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit 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.32bit 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.32bit 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.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: Approve upgrades. diffs (truncated from 153903 to 300 lines): 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 @@ -1811,2289 +1811,2174 @@ insert into sys.functions values (482, ' insert into sys.args values (46130, 482, 'res_0', 'decimal', 2, 0, 0, 0); insert into sys.args values (46131, 482, 'arg_1', 'decimal', 2, 0, 1, 1); insert into sys.args values (46132, 482, 'arg_2', 'decimal', 2, 0, 1, 2); -insert into sys.functions values (483, 'bit_and', 'and', 'calc', 0, 1, false, false, false, 2000, true, false); +insert into sys.functions values (483, 'sql_neg', '-', 'calc', 0, 1, false, false, false, 2000, true, false); insert into sys.args values (46133, 483, 'res_0', 'decimal', 2, 0, 0, 0); insert into sys.args values (46134, 483, 'arg_1', 'decimal', 2, 0, 1, 1); -insert into sys.args values (46135, 483, 'arg_2', 'decimal', 2, 0, 1, 2); -insert into sys.functions values (484, 'bit_or', 'or', 'calc', 0, 1, false, false, false, 2000, true, false); -insert into sys.args values (46136, 484, 'res_0', 'decimal', 2, 0, 0, 0); -insert into sys.args values (46137, 484, 'arg_1', 'decimal', 2, 0, 1, 1); -insert into sys.args values (46138, 484, 'arg_2', 'decimal', 2, 0, 1, 2); -insert into sys.functions values (485, 'bit_xor', 'xor', 'calc', 0, 1, false, false, false, 2000, true, false); -insert into sys.args values (46139, 485, 'res_0', 'decimal', 2, 0, 0, 0); -insert into sys.args values (46140, 485, 'arg_1', 'decimal', 2, 0, 1, 1); -insert into sys.args values (46141, 485, 'arg_2', 'decimal', 2, 0, 1, 2); -insert into sys.functions values (486, 'bit_not', 'not', 'calc', 0, 1, false, false, false, 2000, true, false); -insert
MonetDB: default - Approve output.
Changeset: b5a0022fda6b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/b5a0022fda6b Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 Branch: default Log Message: Approve output. diffs (85 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -6248,6 +6248,7 @@ [ "batmtime", "year", "pattern batmtime.year(X_0:bat[:timestamp], X_1:bat[:oid]):bat[:int] ", "MTIMEtimestamp_year_bulk;","" ] [ "batpcre", "replace", "command batpcre.replace(X_0:bat[:str], X_1:str, X_2:str, X_3:str):bat[:str] ", "PCREreplace_bat_wrap;","" ] [ "batpcre", "replace_first","command batpcre.replace_first(X_0:bat[:str], X_1:str, X_2:str, X_3:str):bat[:str] ", "PCREreplacefirst_bat_wrap;", "" ] +[ "batpyapi3", "eval", "unsafe pattern batpyapi3.eval(X_0:lng, X_1:ptr, X_2:str):any... ", "PYAPI3PyAPIevalStd;", "Execute a simple Python script value" ] [ "batpyapi3", "eval", "unsafe pattern batpyapi3.eval(X_0:ptr, X_1:str, X_2:any...):any... ", "PYAPI3PyAPIevalStd;", "Execute a simple Python script value" ] [ "batpyapi3", "eval_aggr","unsafe pattern batpyapi3.eval_aggr(X_0:ptr, X_1:str, X_2:any...):any... ", "PYAPI3PyAPIevalAggr;", "grouped aggregates through Python" ] [ "batpyapi3", "eval_loader", "unsafe pattern batpyapi3.eval_loader(X_0:ptr, X_1:str):any... ", "PYAPI3PyAPIevalLoader;", "loader functions through Python" ] @@ -6256,6 +6257,7 @@ [ "batpyapi3map", "eval", "pattern batpyapi3map.eval(X_0:ptr, X_1:str, X_2:any...):any... ", "PYAPI3PyAPIevalStdMap;", "Execute a simple Python script value" ] [ "batpyapi3map", "eval_aggr","pattern batpyapi3map.eval_aggr(X_0:ptr, X_1:str, X_2:any...):any... ", "PYAPI3PyAPIevalAggrMap;", "grouped aggregates through Python" ] [ "batpyapi3map", "subeval_aggr", "pattern batpyapi3map.subeval_aggr(X_0:ptr, X_1:str, X_2:any...):any... ", "PYAPI3PyAPIevalAggrMap;", "grouped aggregates through Python" ] +[ "batrapi", "eval", "pattern batrapi.eval(X_0:lng, X_1:ptr, X_2:str):any... ", "RAPIevalStd;", "Execute a simple R script value" ] [ "batrapi", "eval", "pattern batrapi.eval(X_0:ptr, X_1:str, X_2:any...):any... ", "RAPIevalStd;", "Execute a simple R script value" ] [ "batrapi", "eval_aggr","pattern batrapi.eval_aggr(X_0:ptr, X_1:str, X_2:any...):any... ", "RAPIevalAggr;","grouped aggregates through R" ] [ "batrapi", "subeval_aggr", "pattern batrapi.subeval_aggr(X_0:ptr, X_1:str, X_2:any...):any... ", "RAPIevalAggr;","grouped aggregates through R" ] @@ -6375,7 +6377,7 @@ [ "batsql","lead", "pattern batsql.lead(X_0:bat[:any_1], X_1:bat[:any], X_2:bat[:any_1], X_3:any_2, X_4:any_3):bat[:any_1] ", "SQLlead;", "return the value in the next 'l' row in the partition or 'd' if non existent" ] [ "batsql","max", "pattern batsql.max(X_0:bat[:any_1], X_1:any, X_2:any, X_3:int, X_4:any, X_5:any):bat[:any_1] ","SQLmax;", "return the maximum of groups" ] [ "batsql","min", "pattern batsql.min(X_0:bat[:any_1], X_1:any, X_2:any, X_3:int, X_4:any, X_5:any):bat[:any_1] ","SQLmin;", "return the minimum of groups" ] -[ "batsql","next_value", "pattern batsql.next_value(X_0:lng, X_1:str, X_2:str):bat[:lng] ", "mvc_next_value_bulk;", "return the next value of the sequence" +[ "batsql","next_value", "unsafe pattern batsql.next_value(X_0:lng, X_1:str, X_2:str):bat[:lng] ", "mvc_next_value_bulk;", "return the next value of the sequence" ] [ "batsql","nth_value","pattern batsql.nth_value(X_0:any_1, X_1:bat[:lng], X_2:any, X_3:any, X_4:int, X_5:any, X_6:any):bat[:any_1] ", "SQLnth_value;","return the nth value of each group"] [ "batsql","nth_value","pattern batsql.nth_value(X_0:bat[:any_1], X_1:bat[:lng], X_2:any, X_3:any, X_4:int, X_5:any, X_6:any):bat[:any_1] ", "SQLnth_value;","return the nth value of each group"] [ "batsql","nth_value","pattern batsql.nth_value(X_0:bat[:any_1], X_1:lng, X_2:any, X_3:any, X_4:int, X_5:any, X_6:any):bat[:any_1] ", "SQLnth_value;","return the nth value of each group"] @@ -8458,7 +8460,7 @@ [ "fits", "listdir", "unsafe pattern fits.listdir(X_0:str):void ", "FITSdir;", "Attach all FITS files in the directory"] [ "fits", "listdirpattern", "unsafe pattern fits.listdirpattern(X_0:str, X_1:str):void ", "FITSdirpat;", "Attach all FITS file in the directory, giving a pattern" ] [ "fits", "load", "unsafe pattern fits.load(X_0:str):void ", "FITSloadTable;", "Load a FITS table from an attached file" ] -[ "for", "compress",
MonetDB: default - Approve upgrade: drop systemfunctions.
Changeset: c4840f4eae31 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/c4840f4eae31 Modified Files: sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 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.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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/emptydb/Tests/check.SQL.py sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 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.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: Approve upgrade: drop systemfunctions. diffs (254 lines): 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 @@ -5780,4 +5780,5 @@ JOIN sys.fkey_actions upd ON fks.update_ JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id; GRANT SELECT ON sys.fkeys TO PUBLIC; update sys._tables set system = true where name in ('fkey_actions', 'fkeys') AND schema_id = 2000; +drop view sys.systemfunctions; 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 @@ -5851,4 +5851,5 @@ JOIN sys.fkey_actions upd ON fks.update_ JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id; GRANT SELECT ON sys.fkeys TO PUBLIC; update sys._tables set system = true where name in ('fkey_actions', 'fkeys') AND schema_id = 2000; +drop view sys.systemfunctions; 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 @@ -5780,4 +5780,5 @@ JOIN sys.fkey_actions upd ON fks.update_ JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id; GRANT SELECT ON sys.fkeys TO PUBLIC; update sys._tables set system = true where name in ('fkey_actions', 'fkeys') AND schema_id = 2000; +drop view sys.systemfunctions; 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 @@ -5851,4 +5851,5 @@ JOIN sys.fkey_actions upd ON fks.update_ JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id; GRANT SELECT ON sys.fkeys TO PUBLIC; update sys._tables set system = true where name in ('fkey_actions', 'fkeys') AND schema_id = 2000; +drop view sys.systemfunctions; 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 @@ -664,4 +664,5 @@ JOIN sys.fkey_actions upd ON fks.update_ JOIN
MonetDB: default - Approve upgrade outputs for new system table ...
Changeset: 43b1645251ff for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/43b1645251ff Modified Files: sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.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.32bit 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-hge/Tests/upgrade.stable.out.ppc64.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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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-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.32bit 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.32bit 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.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: Approve upgrade outputs for new system table sys.fkey_actions and view sys.fkeys diffs (truncated from 1102 to 300 lines): 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 @@ -5756,4 +5756,25 @@ create procedure sys.vacuum(sname string create procedure sys.stop_vacuum(sname string, tname string, cname string) external name sql.stop_vacuum; update sys.functions set system = true where system <> true and name in ('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2; +CREATE TABLE sys.fkey_actions ( +action_id SMALLINT NOT NULL PRIMARY KEY, +action_name VARCHAR(15) NOT NULL); +INSERT INTO sys.fkey_actions (action_id, action_name) VALUES + (0, 'NO ACTION'), + (1, 'CASCADE'), + (2, 'RESTRICT'), + (3, 'SET NULL'), + (4, 'SET DEFAULT'); +ALTER TABLE sys.fkey_actions SET READ ONLY; +GRANT SELECT ON sys.fkey_actions TO PUBLIC; +CREATE VIEW sys.fkeys AS +SELECT id, table_id, type, name, rkey, update_action_id, upd.action_name as update_action, delete_action_id, del.action_name as delete_action FROM ( + SELECT id, table_id, type, name, rkey, cast((("action" >> 8) & 255) as smallint) as update_action_id, cast(("action" & 255) as smallint) AS delete_action_id FROM sys.keys WHERE type = 2 + UNION ALL + SELECT id, table_id, type, name, rkey, cast((("action" >> 8) & 255) as smallint) as update_action_id, cast(("action" & 255) as smallint) AS delete_action_id FROM tmp.keys WHERE type = 2 +) AS fks +JOIN sys.fkey_actions upd ON fks.update_action_id = upd.action_id +JOIN sys.fkey_actions del ON fks.delete_action_id = del.action_id; +GRANT SELECT ON sys.fkeys TO PUBLIC; +update sys._tables set system = true where name in ('fkey_actions', 'fkeys') AND schema_id = 2000; diff --git
MonetDB: default - Approve new check outputs for new system tabl...
Changeset: 3239e74170fc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/3239e74170fc Modified Files: sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 Branch: default Log Message: Approve new check outputs for new system table sys.fkey_actions and view sys.fkeys diffs (truncated from 477 to 300 lines): 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 @@ -24,6 +24,7 @@ \dSt sys.dependencies \dSt sys.dependency_types \dSt sys.dump_statements +\dSt sys.fkey_actions \dSt sys.function_languages \dSt sys.function_types \dSt sys.functions @@ -119,6 +120,7 @@ \dSv sys.dump_triggers \dSv sys.dump_user_defined_types \dSv sys.environment +\dSv sys.fkeys \dSv sys.fully_qualified_functions \dSv sys.geometry_columns \dSv sys.ids @@ -397,6 +399,7 @@ SYSTEM TABLE sys.db_user_info SYSTEM TABLE sys.dependencies SYSTEM TABLE sys.dependency_types SYSTEM TABLE sys.dump_statements +SYSTEM TABLE sys.fkey_actions SYSTEM TABLE sys.function_languages SYSTEM TABLE sys.function_types SYSTEM TABLE sys.functions @@ -485,6 +488,7 @@ SYSTEM VIEW sys.dump_tables SYSTEM VIEW sys.dump_triggers SYSTEM VIEW sys.dump_user_defined_types SYSTEM VIEW sys.environment +SYSTEM VIEW sys.fkeys SYSTEM VIEW sys.fully_qualified_functions SYSTEM VIEW sys.geometry_columns SYSTEM VIEW sys.ids @@ -968,6 +972,7 @@ CREATE TABLE "sys"."db_user_info" ("name CREATE TABLE "sys"."dependencies" ("id" INTEGER, "depend_id" INTEGER, "depend_type" SMALLINT); CREATE TABLE "sys"."dependency_types" ("dependency_type_id" SMALLINT NOT NULL, "dependency_type_name" VARCHAR(15) NOT NULL, CONSTRAINT "dependency_types_dependency_type_id_pkey" PRIMARY KEY ("dependency_type_id"), CONSTRAINT "dependency_types_dependency_type_name_unique" UNIQUE ("dependency_type_name")); CREATE TABLE "sys"."dump_statements" ("o" INTEGER, "s" CHARACTER LARGE OBJECT); +CREATE TABLE "sys"."fkey_actions" ("action_id" SMALLINT NOT NULL, "action_name" VARCHAR(15) NOT NULL, CONSTRAINT "fkey_actions_action_id_pkey" PRIMARY KEY ("action_id")); CREATE TABLE "sys"."function_languages" ("language_id" SMALLINT NOT NULL, "language_name" VARCHAR(20) NOT NULL, "language_keyword" VARCHAR(20), CONSTRAINT "function_languages_language_id_pkey" PRIMARY KEY ("language_id"), CONSTRAINT "function_languages_language_name_unique" UNIQUE ("language_name")); CREATE TABLE "sys"."function_types" ("function_type_id" SMALLINT NOT NULL, "function_type_name" VARCHAR(30) NOT NULL, "function_type_keyword" VARCHAR(30) NOT NULL, CONSTRAINT "function_types_function_type_id_pkey" PRIMARY KEY ("function_type_id"), CONSTRAINT "function_types_function_type_name_unique" UNIQUE ("function_type_name")); CREATE TABLE "sys"."functions" ("id" INTEGER, "name" VARCHAR(256), "func" VARCHAR(8196), "mod" VARCHAR(8196), "language" INTEGER, "type" INTEGER, "side_effect" BOOLEAN, "varres" BOOLEAN, "vararg" BOOLEAN, "schema_id" INTEGER, "system" BOOLEAN, "semantics" BOOLEAN); @@ -1063,6 +1068,7 @@ create view sys.dump_tables as select t. create view sys.dump_triggers as select sys.schema_guard(sch, tab, def) stmt, sch schema_name, tab table_name, tri trigger_name from sys.describe_triggers; create view sys.dump_user_defined_types as select 'CREATE TYPE ' || sys.fqn(sch, sql_tpe) || ' EXTERNAL NAME ' || sys.dq(ext_tpe) || ';' stmt, sch schema_name, sql_tpe type_name from sys.describe_user_defined_types; create view sys.environment as select * from sys.env(); +create view sys.fkeys as select id, table_id, type, name, rkey, update_action_id, upd.action_name as update_action, delete_action_id, del.action_name as delete_action from (select id, table_id, type, name, rkey, cast((("action" >> 8) & 255) as smallint) as update_action_id, cast(("action" & 255) as smallint) as delete_action_id from sys.keys where type = 2 union all select id, table_id, type, name, rkey, cast((("action" >> 8) & 255) as smallint) as update_action_id, cast(("action" & 255) as smallint) as delete_action_id from tmp.keys where type = 2) as fks join sys.fkey_actions upd on fks.update_action_id = upd.action_id join sys.fkey_actions del on fks.delete_action_id = del.action_id; create view sys.fully_qualified_functions as with fqn(id, tpe, sig, num) as (select f.id, ft.function_type_keyword, case when a.type is null then s.name || '.' || f.name || '()' else s.name || '.' || f.name || '(' || group_concat(sys.describe_type(a.type, a.type_digits, a.type_scale), ',') over (partition by f.id order by a.number) || ')' end, a.number from sys.schemas s, sys.function_types ft, sys.functions f left join sys.args a on f.id = a.func_id where s.id= f.schema_id and f.type = ft.function_type_id) select fqn1.id id, fqn1.tpe tpe, fqn1.sig nme from fqn fqn1 join (select
MonetDB: default - Approve length
Changeset: 9b268809c28c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/9b268809c28c Modified Files: sql/test/miscellaneous/Tests/rel_push_count_down.stable.out Branch: default Log Message: Approve length diffs (12 lines): diff --git a/sql/test/miscellaneous/Tests/rel_push_count_down.stable.out b/sql/test/miscellaneous/Tests/rel_push_count_down.stable.out --- a/sql/test/miscellaneous/Tests/rel_push_count_down.stable.out +++ b/sql/test/miscellaneous/Tests/rel_push_count_down.stable.out @@ -2,7 +2,7 @@ % .plan # table_name % rel # name % clob # type -% 106 # length +% 85 # length project ( | project ( | | crossproduct ( ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve optimizer changes
Changeset: dcd983f52b9f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/dcd983f52b9f Added Files: sql/test/miscellaneous/Tests/rel_push_count_down.py sql/test/miscellaneous/Tests/rel_push_count_down.sql sql/test/miscellaneous/Tests/rel_push_count_down.stable.err sql/test/miscellaneous/Tests/rel_push_count_down.stable.out sql/test/miscellaneous/Tests/rel_push_count_down.stable.out.int128 Modified Files: sql/test/BugTracker-2017/Tests/All sql/test/miscellaneous/Tests/All sql/test/miscellaneous/Tests/simple_plans.test Branch: default Log Message: Approve optimizer changes diffs (116 lines): diff --git a/sql/test/BugTracker-2017/Tests/All b/sql/test/BugTracker-2017/Tests/All --- a/sql/test/BugTracker-2017/Tests/All +++ b/sql/test/BugTracker-2017/Tests/All @@ -80,7 +80,7 @@ exists.Bug-6392 case.Bug-6386 sqllitelogistest_case.Bug-6335 udf_crash_subquery_scalar_paramters.Bug-6399 -side-effect.Bug-6397 +HAVE_HGE?side-effect.Bug-6397 copy_into_crash.Bug-6404 null_matches_in_outer.Bug-6398 corr_coersion.Bug-6287 diff --git a/sql/test/miscellaneous/Tests/All b/sql/test/miscellaneous/Tests/All --- a/sql/test/miscellaneous/Tests/All +++ b/sql/test/miscellaneous/Tests/All @@ -19,3 +19,4 @@ create_func_temp simple_plans vessels prepare +rel_push_count_down diff --git a/sql/test/miscellaneous/Tests/rel_push_count_down.py b/sql/test/miscellaneous/Tests/rel_push_count_down.py new file mode 100644 --- /dev/null +++ b/sql/test/miscellaneous/Tests/rel_push_count_down.py @@ -0,0 +1,20 @@ +from MonetDBtesting.sqltest import SQLTestCase +import pymonetdb, os + +conn1 = pymonetdb.connect(database=os.getenv("TSTDB"), port=int(os.getenv("MAPIPORT")), autocommit=True) +cur1 = conn1.cursor() +try: +cur1.execute('select cast(1 as hugeint)') +suffix = '.int128' +except pymonetdb.DatabaseError as e: +suffix = '' +cur1.close() +conn1.close() + +with SQLTestCase() as tc: +# optional or default connection +tc.connect() +with open('rel_push_count_down.sql') as f: +tc.execute(query=None, client='mclient', stdin=f)\ +.assertMatchStableOut(fout='rel_push_count_down.stable.out%s' % (suffix))\ +.assertMatchStableError(ferr='rel_push_count_down.stable.err') diff --git a/sql/test/miscellaneous/Tests/rel_push_count_down.sql b/sql/test/miscellaneous/Tests/rel_push_count_down.sql new file mode 100644 --- /dev/null +++ b/sql/test/miscellaneous/Tests/rel_push_count_down.sql @@ -0,0 +1,5 @@ +START TRANSACTION; +CREATE TABLE another_T (col1 INT, col2 INT, col3 INT, col4 INT, col5 INT, col6 INT, col7 INT, col8 INT); +INSERT INTO another_T VALUES (1,2,3,4,5,6,7,8), (11,22,33,44,55,66,77,88), (111,222,333,444,555,666,777,888), (,,,,,,,); +plan select count(*) from another_t t1, another_t t2; +ROLLBACK; diff --git a/sql/test/miscellaneous/Tests/rel_push_count_down.stable.err b/sql/test/miscellaneous/Tests/rel_push_count_down.stable.err new file mode 100644 diff --git a/sql/test/miscellaneous/Tests/rel_push_count_down.stable.out b/sql/test/miscellaneous/Tests/rel_push_count_down.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/miscellaneous/Tests/rel_push_count_down.stable.out @@ -0,0 +1,13 @@ +[ 4] +% .plan # table_name +% rel # name +% clob # type +% 106 # length +project ( +| project ( +| | crossproduct ( +| | | [ "sys"."cnt"(clob "sys", clob "another_t") NOT NULL as "%2"."%2" ], +| | | [ "sys"."cnt"(clob "sys", clob "another_t") NOT NULL as "%3"."%3" ] +| | ) [ ] +| ) [ "sys"."sql_mul"("%2"."%2" NOT NULL, "%3"."%3" NOT NULL) NOT NULL as "%1"."%1" ] +) [ "%1"."%1" NOT NULL ] diff --git a/sql/test/miscellaneous/Tests/rel_push_count_down.stable.out.int128 b/sql/test/miscellaneous/Tests/rel_push_count_down.stable.out.int128 new file mode 100644 --- /dev/null +++ b/sql/test/miscellaneous/Tests/rel_push_count_down.stable.out.int128 @@ -0,0 +1,13 @@ +[ 4] +% .plan # table_name +% rel # name +% clob # type +% 106 # length +project ( +| project ( +| | crossproduct ( +| | | [ "sys"."cnt"(clob "sys", clob "another_t") NOT NULL as "%2"."%2" ], +| | | [ "sys"."cnt"(clob "sys", clob "another_t") NOT NULL as "%3"."%3" ] +| | ) [ ] +| ) [ bigint(64)["sys"."sql_mul"("%2"."%2" NOT NULL, "%3"."%3" NOT NULL) NOT NULL] NOT NULL as "%1"."%1" ] +) [ "%1"."%1" NOT NULL ] diff --git a/sql/test/miscellaneous/Tests/simple_plans.test b/sql/test/miscellaneous/Tests/simple_plans.test --- a/sql/test/miscellaneous/Tests/simple_plans.test +++ b/sql/test/miscellaneous/Tests/simple_plans.test @@ -467,19 +467,6 @@ project ( | table("sys"."another_t") [ "another_t"."col1" ] ) [ "sys"."sql_mul"("another_t"."col1", "sys"."sql_mul"(tinyint(6) "34", tinyint(2) "3") NOT NULL) ] -# testing rel_push_count_down optimizer -query T nosort -plan select count(*) from another_t t1, another_t t2 - -project ( -| project ( -| | crossproduct ( -| | | [ "sys"."cnt"(clob "sys", clob
MonetDB: default - Approve power8 upgrade.
Changeset: cacb4289473c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/cacb4289473c Modified Files: sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 Branch: default Log Message: Approve power8 upgrade. diffs (90 lines): diff --git a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 @@ -5749,4 +5749,11 @@ update sys.functions set system = true w update sys._tables set system = true where name in ('dump_create_roles', 'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users', 'dump_grant_user_privileges', 'dump_table_constraint_type', 'dump_table_grants', 'dump_column_grants', 'dump_function_grants', 'dump_indices', 'dump_column_defaults', 'dump_foreign_keys', 'dump_partition_tables', 'dump_sequences', 'dump_start_sequences', 'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments', 'dump_user_defined_types') AND schema_id = 2000; drop function sys.reverse(string); drop all function sys.fuse; +create procedure sys.vacuum(sname string, tname string, cname string) + external name sql.vacuum; +create procedure sys.vacuum(sname string, tname string, cname string, interval int) + external name sql.vacuum; +create procedure sys.stop_vacuum(sname string, tname string, cname string) + external name sql.stop_vacuum; +update sys.functions set system = true where system <> true and name in ('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2; diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 --- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 +++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64 @@ -5154,4 +5154,11 @@ update sys.functions set system = true w update sys._tables set system = true where name in ('dump_create_roles', 'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users', 'dump_grant_user_privileges', 'dump_table_constraint_type', 'dump_table_grants', 'dump_column_grants', 'dump_function_grants', 'dump_indices', 'dump_column_defaults', 'dump_foreign_keys', 'dump_partition_tables', 'dump_sequences', 'dump_start_sequences', 'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments', 'dump_user_defined_types') AND schema_id = 2000; drop function sys.reverse(string); drop all function sys.fuse; +create procedure sys.vacuum(sname string, tname string, cname string) + external name sql.vacuum; +create procedure sys.vacuum(sname string, tname string, cname string, interval int) + external name sql.vacuum; +create procedure sys.stop_vacuum(sname string, tname string, cname string) + external name sql.stop_vacuum; +update sys.functions set system = true where system <> true and name in ('vacuum', 'stop_vacuum') and schema_id = 2000 and type = 2; diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 @@ -5820,4 +5820,11 @@ update sys.functions set system = true w update sys._tables set system = true where name in ('dump_create_roles', 'dump_create_users', 'dump_create_schemas', 'dump_add_schemas_to_users', 'dump_grant_user_privileges', 'dump_table_constraint_type', 'dump_table_grants', 'dump_column_grants', 'dump_function_grants', 'dump_indices', 'dump_column_defaults', 'dump_foreign_keys', 'dump_partition_tables', 'dump_sequences', 'dump_start_sequences', 'dump_functions', 'dump_tables', 'dump_triggers', 'dump_comments', 'dump_user_defined_types') AND schema_id = 2000; drop function sys.reverse(string); drop all function sys.fuse; +create procedure sys.vacuum(sname string, tname string, cname string) + external name sql.vacuum; +create procedure sys.vacuum(sname string, tname string, cname string, interval int) + external name sql.vacuum; +create procedure sys.stop_vacuum(sname string, tname string, cname string) + external name sql.stop_vacuum; +update sys.functions set system = true where system <>
MonetDB: default - Approve new functions.
Changeset: 4311042c116b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/4311042c116b Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: Approve new functions. diffs (12 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 @@ -514,6 +514,8 @@ size_t escapedStrlen(const char *restric ssize_t fltFromStr(const char *src, size_t *len, flt **dst, bool external); ssize_t fltToStr(str *dst, size_t *len, const flt *src, bool external); const flt flt_nil; +gdk_return gdk_add_callback(char *name, gdk_callback_func *f, int argc, void *argv[], int interval); +gdk_return gdk_remove_callback(char *, gdk_callback_func *f); geomcatalogfix_fptr geomcatalogfix_get(void); void geomcatalogfix_set(geomcatalogfix_fptr); geomsqlfix_fptr geomsqlfix_get(void); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve upgrade.
Changeset: 692e1d90e121 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/692e1d90e121 Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit Branch: default Log Message: Approve upgrade. diffs (294 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 @@ -21,6 +21,38 @@ update sys.functions set system = true w set schema "sys"; create view sys.malfunctions as select * from sys.malfunctions(); update sys._tables set system = true where system <> true and schema_id = 2000 and name = 'malfunctions'; +drop view sys.dependencies_vw; +drop view sys.ids; +CREATE VIEW sys.ids (id, name, schema_id, table_id, table_name, obj_type, sys_table, system) AS +SELECT id, name, cast(null as int) as schema_id, cast(null as int) as table_id, cast(null as varchar(124)) as table_name, 'author' AS obj_type, 'sys.auths' AS sys_table, (name in ('public','sysadmin','monetdb','.snapshot')) AS system FROM sys.auths UNION ALL +SELECT id, name, cast(null as int) as schema_id, cast(null as int) as table_id, cast(null as varchar(124)) as table_name, ifthenelse(system, 'system schema', 'schema'), 'sys.schemas', system FROM sys.schemas UNION ALL +SELECT t.id, name, t.schema_id, t.id as table_id, t.name as table_name, cast(lower(tt.table_type_name) as varchar(40)), 'sys.tables', t.system FROM sys.tables t left outer join sys.table_types tt on t.type = tt.table_type_id UNION ALL +SELECT c.id, c.name, t.schema_id, c.table_id, t.name as table_name, ifthenelse(t.system, 'system column', 'column'), 'sys._columns', t.system FROM sys._columns c JOIN sys._tables t ON c.table_id = t.id UNION ALL +SELECT c.id, c.name, t.schema_id, c.table_id, t.name as table_name, 'column', 'tmp._columns', t.system FROM tmp._columns c JOIN tmp._tables t ON c.table_id = t.id UNION ALL +SELECT k.id, k.name, t.schema_id, k.table_id, t.name as table_name, ifthenelse(t.system, 'system key', 'key'), 'sys.keys', t.system FROM sys.keys k JOIN sys._tables t ON k.table_id = t.id UNION ALL +SELECT k.id, k.name, t.schema_id, k.table_id, t.name as table_name, 'key', 'tmp.keys', t.system FROM tmp.keys k JOIN tmp._tables t ON k.table_id = t.id UNION ALL +SELECT i.id, i.name, t.schema_id, i.table_id, t.name as table_name, ifthenelse(t.system, 'system index', 'index'), 'sys.idxs', t.system FROM sys.idxs i JOIN sys._tables t ON i.table_id = t.id UNION ALL +SELECT i.id, i.name, t.schema_id, i.table_id, t.name as table_name, 'index' , 'tmp.idxs', t.system FROM tmp.idxs i JOIN tmp._tables t ON i.table_id = t.id UNION ALL +SELECT g.id, g.name, t.schema_id, g.table_id, t.name as table_name, ifthenelse(t.system, 'system trigger', 'trigger'), 'sys.triggers', t.system FROM sys.triggers g JOIN sys._tables t ON g.table_id = t.id UNION ALL +SELECT g.id, g.name, t.schema_id, g.table_id, t.name as table_name, 'trigger', 'tmp.triggers', t.system FROM tmp.triggers g JOIN tmp._tables t ON g.table_id = t.id UNION ALL +SELECT f.id, f.name, f.schema_id, cast(null as int) as table_id, cast(null as varchar(124)) as table_name, cast(ifthenelse(f.system, 'system ', '') || lower(ft.function_type_keyword) as varchar(40)), 'sys.functions', f.system FROM sys.functions f left outer join sys.function_types ft on f.type = ft.function_type_id UNION ALL +SELECT a.id, a.name, f.schema_id, a.func_id as table_id, f.name as table_name, cast(ifthenelse(f.system, 'system ', '') || lower(ft.function_type_keyword) || ' arg' as varchar(44)), 'sys.args', f.system FROM sys.args a JOIN sys.functions f ON a.func_id = f.id left outer join sys.function_types ft on f.type = ft.function_type_id UNION ALL +SELECT id, name, schema_id, cast(null as int) as table_id, cast(null as varchar(124)) as table_name, 'sequence', 'sys.sequences', false FROM sys.sequences UNION ALL +SELECT o.id, o.name, pt.schema_id, pt.id, pt.name, 'partition of merge table', 'sys.objects', false FROM sys.objects o JOIN sys._tables pt ON o.sub = pt.id JOIN sys._tables mt ON o.nr = mt.id WHERE mt.type = 3 UNION ALL +SELECT id, sqlname, schema_id, cast(null as int) as table_id, cast(null as varchar(124)) as table_name, 'type', 'sys.types', (sqlname in ('inet','json','url','uuid')) FROM sys.types WHERE id > 2000 + ORDER BY id; +GRANT SELECT ON sys.ids TO PUBLIC; +CREATE VIEW sys.dependencies_vw
MonetDB: default - Approve output, and add some --loadmodule udf...
Changeset: 6576b532b612 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/6576b532b612 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 sql/backends/monet5/UDF/udf/Tests/SingleServer sql/test/BugTracker-2016/Tests/SingleServer sql/test/SQLancer/Tests/SingleServer sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 Branch: default Log Message: Approve output, and add some --loadmodule udf options. diffs (truncated from 19729 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -1,697 +1,694 @@ -stdout of test 'MAL-signatures` in directory 'clients` itself: - -#select * from sys.malfunctions() order by module, "function", address, signature, comment; % .%1, .%1,.%1,.%1,.%1 # table_name % module, function, signature, address,comment # name % clob,clob, clob, clob, clob # type -% 12, 28, 313,42, 0 # length -[ "aggr", "all", "command aggr.all(X_0:bat[:any_1]):any_1 ", "SQLall;", "" ] -[ "aggr", "allnotequal", "pattern aggr.allnotequal(X_0:bat[:any_1], X_1:bat[:any_1]):bit ", "SQLallnotequal;", "" ] +% 12, 28, 313,42, 860 # length +[ "aggr", "all", "command aggr.all(X_0:bat[:any_1]):any_1 ", "SQLall;", "if all values in b are equal return this, else nil"] +[ "aggr", "allnotequal", "pattern aggr.allnotequal(X_0:bat[:any_1], X_1:bat[:any_1]):bit ", "SQLallnotequal;", "if all values in r are not equal to l return true, else if r has nil nil else false" ] [ "aggr", "anyequal", "pattern aggr.anyequal(X_0:any_1, X_1:any_1):bit ", "CMDvarEQ;","" ] -[ "aggr", "anyequal", "pattern aggr.anyequal(X_0:bat[:any_1], X_1:bat[:any_1]):bit ", "SQLanyequal;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] ", "AGGRavg14_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] ", "AGGRavg14_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] ", "AGGRavg14_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] ", "AGGRavg14_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] ", "AGGRavg14_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] ", "AGGRavg14_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) ", "AGGRavg23_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) ", "AGGRavg23_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) ", "AGGRavg23_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) ", "AGGRavg23_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) ", "AGGRavg23_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) ", "AGGRavg23_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:int) (X_4:bat[:dbl], X_5:bat[:lng]) ", "AGGRavg24_dbl;", ""
MonetDB: default - Approve dump.
Changeset: 65f8975487ba for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/65f8975487ba Modified Files: sql/test/sql_dump/Tests/dump.test Branch: default Log Message: Approve dump. diffs (43 lines): diff --git a/sql/test/sql_dump/Tests/dump.test b/sql/test/sql_dump/Tests/dump.test --- a/sql/test/sql_dump/Tests/dump.test +++ b/sql/test/sql_dump/Tests/dump.test @@ -348,6 +348,10 @@ create function "sys"."f1" () returns in create procedure "sys"."f1" (i int) begin declare x int; end@; create procedure "sys"."f1" () begin declare x int; end@; CREATE TABLE "sys"."tbl_with_data" ("c1" INTEGER, "c2" BIGINT, "c3" BINARY LARGE OBJECT, "c4" BOOLEAN, "c5" CHARACTER LARGE OBJECT, "c6" DATE, "c7" INTERVAL DAY, "c8" DECIMAL(18,3), "c9" DECIMAL(5), "c10" DECIMAL(5,2), "c11" DOUBLE, "c12" FLOAT(5), "c13" FLOAT(5,4), "c14" GEOMETRY(POINT), "c18" INTERVAL YEAR, "c19" INTERVAL YEAR TO MONTH, "c20" INTERVAL MONTH, "c21" REAL, "c22" INTERVAL DAY, "c23" INTERVAL DAY TO HOUR, "c24" INTERVAL HOUR, "c25" INTERVAL HOUR TO MINUTE, "c26" TIME, "c27" TIMESTAMP, "c28" TIMESTAMP(2), "c29" TIMESTAMP WITH TIME ZONE, "c30" JSON, "c31" INET, "c32" URL, "c33" UUID); +COPY 3 RECORDS INTO "sys"."tbl_with_data"("c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12", "c13", "c14", "c18", "c19", "c20", "c21", "c22", "c23", "c24", "c25", "c26", "c27", "c28", "c29", "c30", "c31", "c32", "c33") FROM STDIN USING DELIMITERS '|',E'\n','"'; +1234|5678|90|true|"Hello\n \\|\" World"|2020-12-20|10.000|1023.345|12345|123.45|1123.455|1122133.5|121233.45|"POINT (5.1 34.5)"|2000|4000|8000|65333.414|8000.000|4000.000|2000.000|1000.000|14:18:18|2015-05-22 14:18:17.780331|2015-05-22 00:00:00.00|2015-05-22 12:18:17.780331+00:00|"{\"price\":9}"|10.1.0.0/16|"https://m...@www.monetdb.org:458/Doc/Abc.html?lang=nl=asc#example;|65950c76-a2f6-4543-660a-b849cf5f2453 +null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null +null|null|null|null|"null"|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null|null UPDATE sys.sequences seq SET start = 5 WHERE name = 'seq1' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = 'sys'); UPDATE sys.sequences seq SET start = 4 WHERE name = 'seq2' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = 'sys'); UPDATE sys.sequences seq SET start = 4 WHERE name = 'seq3' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = 'sys'); @@ -368,12 +372,12 @@ CREATE INDEX "ind1" ON "sys"."ungolo"(x, CREATE IMPRINTS INDEX "ind2" ON "sys"."ungolo"(y,z); CREATE ORDERED INDEX "ind3" ON "sys"."ungolo"(x,z); ALTER TABLE "sfoo"."foo" ADD CONSTRAINT "fk_foo_to_bar" FOREIGN KEY("fi","fs") REFERENCES "sbar"."bar"("bi","bs") ON DELETE SET NULL ON UPDATE CASCADE; -ALTER TABLE "sys"."scorers" ADD TABLE "sys"."unknown_scorers" AS PARTITION FOR NULL VALUES; -ALTER TABLE "sys"."scorers" ADD TABLE "sys"."lower_scorers" AS PARTITION IN (0,1,2,3,4); -ALTER TABLE "sys"."scorers" ADD TABLE "sys"."higher_scorers" AS PARTITION IN (5,6,7,8,9); -ALTER TABLE "sys"."splitted" ADD TABLE "sys"."first_decade" AS PARTITION FROM RANGE MINVALUE TO '2010-01-01 00:00:00.00' WITH NULL VALUES; -ALTER TABLE "sys"."splitted" ADD TABLE "sys"."second_decade" AS PARTITION FROM '2010-01-01 00:00:00.00' TO '2020-01-01 00:00:00.00'; -ALTER TABLE "sys"."m1" ADD TABLE "sys"."p1"; +ALTER TABLE "sys"."scorers" ADD TABLE "sys"."unknown_scorers" AS PARTITION FOR NULL VALUES; +ALTER TABLE "sys"."scorers" ADD TABLE "sys"."lower_scorers" AS PARTITION IN (0,1,2,3,4); +ALTER TABLE "sys"."scorers" ADD TABLE "sys"."higher_scorers" AS PARTITION IN (5,6,7,8,9); +ALTER TABLE "sys"."splitted" ADD TABLE "sys"."first_decade" AS PARTITION FROM RANGE MINVALUE TO '2010-01-01 00:00:00.00' WITH NULL VALUES; +ALTER TABLE "sys"."splitted" ADD TABLE "sys"."second_decade" AS PARTITION FROM '2010-01-01 00:00:00.00' TO '2020-01-01 00:00:00.00'; +ALTER TABLE "sys"."m1" ADD TABLE "sys"."p1"; create trigger extra_insert after insert on "sfoo"."tfoo1" referencing new row as new_row for each statement insert into tfoo2(i) values (new_row.i)@; COMMENT ON SCHEMA "sbar" IS 'This is a comment on a schema'; COMMENT ON COLUMN "sfoo"."tfoo1"."i" IS 'This is a comment on a column.'; @@ -385,9 +389,5 @@ GRANT UPDATE("i") ON "sys"."foo" TO "voc GRANT EXECUTE ON PROCEDURE "sys"."f1"(INTEGER) TO "voc"; GRANT EXECUTE ON FUNCTION "sys"."f1"() TO "voc"; GRANT EXECUTE ON PROCEDURE "sys"."f1"() TO "voc" WITH GRANT OPTION; -COPY 3 RECORDS INTO "sys"."tbl_with_data"("c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12", "c13", "c14", "c18", "c19", "c20", "c21", "c22", "c23", "c24", "c25", "c26", "c27", "c28", "c29", "c30", "c31", "c32", "c33") FROM STDIN USING DELIMITERS '|',E'\n','"'; -1234|5678|90|true|"Hello\n \\|\"
MonetDB: default - Approve output.
Changeset: 468848218b68 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/468848218b68 Modified Files: sql/test/sql_dump/Tests/dump.test Branch: default Log Message: Approve output. diffs (94 lines): diff --git a/sql/test/sql_dump/Tests/dump.test b/sql/test/sql_dump/Tests/dump.test --- a/sql/test/sql_dump/Tests/dump.test +++ b/sql/test/sql_dump/Tests/dump.test @@ -296,10 +296,10 @@ SELECT stmt FROM sys.dump_database(FALSE START TRANSACTION; SET SCHEMA "sys"; CREATE ROLE "king"; -CREATE USER "voc" WITH ENCRYPTED PASSWORD 'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e' NAME 'VOC Explorer' SCHEMA sys; -CREATE USER "voc2" WITH ENCRYPTED PASSWORD 'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e' NAME 'VOC Explorer' SCHEMA sys; -CREATE SCHEMA "sbar" AUTHORIZATION monetdb; -CREATE SCHEMA "sfoo" AUTHORIZATION monetdb; +CREATE USER "voc" WITH ENCRYPTED PASSWORD 'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e' NAME 'VOC Explorer' SCHEMA sys; +CREATE USER "voc2" WITH ENCRYPTED PASSWORD 'ea45cf4e124b215a28631ec7ff0bf06e82fc26b2be7a066c9594855690fb5d42438be58d6523132384a1738cb4e5139caa1f970ebdfb422d65834d9a4ef61c0e' NAME 'VOC Explorer' SCHEMA sys; +CREATE SCHEMA "sbar" AUTHORIZATION "monetdb"; +CREATE SCHEMA "sfoo" AUTHORIZATION "monetdb"; CREATE TYPE "sfoo"."json" EXTERNAL NAME "json"; CREATE TYPE "sys"."t1" EXTERNAL NAME "json"; ALTER USER "voc" SET SCHEMA "sfoo"; @@ -312,15 +312,6 @@ CREATE SEQUENCE "sys"."seq6" AS BIGINT S CREATE SEQUENCE "sys"."seq7" AS BIGINT START WITH 10; CREATE SEQUENCE "sys"."seq8" AS BIGINT START WITH -5 INCREMENT BY -1 MINVALUE -10 MAXVALUE -1; CREATE SEQUENCE "sys"."seq9" AS BIGINT START WITH 10 MINVALUE 10 MAXVALUE 10; -UPDATE sys.sequences seq SET start = 5 WHERE name = 'seq1' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' ); -UPDATE sys.sequences seq SET start = 4 WHERE name = 'seq2' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' ); -UPDATE sys.sequences seq SET start = 4 WHERE name = 'seq3' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' ); -UPDATE sys.sequences seq SET start = 1 WHERE name = 'seq4' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' ); -UPDATE sys.sequences seq SET start = 1 WHERE name = 'seq5' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' ); -UPDATE sys.sequences seq SET start = 1 WHERE name = 'seq6' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' ); -UPDATE sys.sequences seq SET start = 1 WHERE name = 'seq7' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' ); -UPDATE sys.sequences seq SET start = -1 WHERE name = 'seq8' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' ); -UPDATE sys.sequences seq SET start = 10 WHERE name = 'seq9' AND schema_id = (SELECT s.id FROM sys.schemas s WHERE s.name = 'sys' ); CREATE TABLE "sys"."test" ("s" CHARACTER LARGE OBJECT); CREATE TABLE "sys"."bla" ("s" CHARACTER LARGE OBJECT(10)); CREATE TABLE "sys"."bob" ("ts" TIMESTAMP(3)); @@ -342,7 +333,7 @@ CREATE TABLE "sys"."higher_scorers" ("na CREATE TABLE "sys"."unknown_scorers" ("name" CHARACTER LARGE OBJECT, "first_score" INTEGER, "second_score" INTEGER); CREATE TABLE "sfoo"."foo" ("fi" INTEGER NOT NULL, "fs" CHARACTER LARGE OBJECT NOT NULL); CREATE TABLE "sbar"."bar" ("bi" INTEGER NOT NULL, "bs" CHARACTER LARGE OBJECT NOT NULL); -CREATE REMOTE TABLE "sys"."rfoo" ("i" INTEGER) ON 'mapi:monetdb://remote.host.url:5/dbname' WITH USER 'bob' ENCRYPTED PASSWORD 'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3' ; +CREATE REMOTE TABLE "sys"."rfoo" ("i" INTEGER) ON 'mapi:monetdb://remote.host.url:5/dbname' WITH USER 'bob' ENCRYPTED PASSWORD 'f8e3183d38e6c51889582cb260ab825252f395b4ac8fb0e6b13e9a71f7c10a80d5301e4a949f2783cb0c20205f1d850f87045f4420ad2271c8fd5f0cd8944be3'; CREATE MERGE TABLE "sys"."scorers" ("name" CHARACTER LARGE OBJECT, "first_score" INTEGER, "second_score" INTEGER) PARTITION BY VALUES USING ("sys"."mod"("sys"."greatest"("first_score","second_score"),10)); CREATE MERGE TABLE "sys"."splitted" ("stamp" TIMESTAMP, "val" INTEGER) PARTITION BY RANGE ON ("stamp"); CREATE MERGE TABLE "sys"."m1" ("i" INTEGER); @@ -357,6 +348,15 @@ create function "sys"."f1" () returns in create procedure "sys"."f1" (i int) begin declare x int; end@; create procedure "sys"."f1" () begin declare x int; end@; CREATE TABLE "sys"."tbl_with_data" ("c1" INTEGER, "c2" BIGINT, "c3" BINARY LARGE OBJECT, "c4" BOOLEAN, "c5" CHARACTER LARGE OBJECT, "c6" DATE, "c7" INTERVAL DAY, "c8" DECIMAL(18,3), "c9" DECIMAL(5),
MonetDB: default - Approve output.
Changeset: ce8ddcc3d014 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/ce8ddcc3d014 Modified Files: sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 Branch: default Log Message: Approve output. diffs (truncated from 1989 to 300 lines): 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 @@ -100,19 +100,21 @@ \dSv sys.describe_user_defined_types \dSv sys.dump_add_schemas_to_users \dSv sys.dump_column_defaults +\dSv sys.dump_column_grants \dSv sys.dump_comments \dSv sys.dump_create_roles \dSv sys.dump_create_schemas \dSv sys.dump_create_users \dSv sys.dump_foreign_keys +\dSv sys.dump_function_grants \dSv sys.dump_functions \dSv sys.dump_grant_user_privileges \dSv sys.dump_indices \dSv sys.dump_partition_tables -\dSv sys.dump_privileges \dSv sys.dump_sequences \dSv sys.dump_start_sequences \dSv sys.dump_table_constraint_type +\dSv sys.dump_table_grants \dSv sys.dump_tables \dSv sys.dump_triggers \dSv sys.dump_user_defined_types @@ -140,7 +142,6 @@ \dSv sys.tracelog \dSv sys.users \dSv sys.var_values -\dSf sys."_dump_table_data" \dSf sys."abbrev" \dSf sys."alpha" \dSf sys."alter_table" @@ -464,19 +465,21 @@ SYSTEM VIEW sys.describe_triggers SYSTEM VIEW sys.describe_user_defined_types SYSTEM VIEW sys.dump_add_schemas_to_users SYSTEM VIEW sys.dump_column_defaults +SYSTEM VIEW sys.dump_column_grants SYSTEM VIEW sys.dump_comments SYSTEM VIEW sys.dump_create_roles SYSTEM VIEW sys.dump_create_schemas SYSTEM VIEW sys.dump_create_users SYSTEM VIEW sys.dump_foreign_keys +SYSTEM VIEW sys.dump_function_grants SYSTEM VIEW sys.dump_functions SYSTEM VIEW sys.dump_grant_user_privileges SYSTEM VIEW sys.dump_indices SYSTEM VIEW sys.dump_partition_tables -SYSTEM VIEW sys.dump_privileges SYSTEM VIEW sys.dump_sequences SYSTEM VIEW sys.dump_start_sequences SYSTEM VIEW sys.dump_table_constraint_type +SYSTEM VIEW sys.dump_table_grants SYSTEM VIEW sys.dump_tables SYSTEM VIEW sys.dump_triggers SYSTEM VIEW sys.dump_user_defined_types @@ -510,7 +513,6 @@ SYSTEM FUNCTION sys.<> SYSTEM FUNCTION sys.= SYSTEM FUNCTION sys.> SYSTEM FUNCTION sys.>= -SYSTEM PROCEDUREsys._dump_table_data SYSTEM FUNCTION sys.abbrev SYSTEM FUNCTION sys.abs SYSTEM FUNCTION sys.acos @@ -1030,7 +1032,7 @@ create view sys.describe_column_defaults create view sys.describe_comments as select o.id id, o.tpe tpe, o.nme fqn, c.remark rem from (select id, 'SCHEMA', sys.dq(name) from sys.schemas union all select t.id, case when ts.table_type_name = 'VIEW' then 'VIEW' else 'TABLE' end, sys.fqn(s.name, t.name) from sys.schemas s join sys.tables t on s.id = t.schema_id join sys.table_types ts on t.type = ts.table_type_id where not s.name <> 'tmp' union all select c.id, 'COLUMN', sys.fqn(s.name, t.name) || '.' || sys.dq(c.name) from sys.columns c, sys.tables t, sys.schemas s where c.table_id = t.id and t.schema_id = s.id union all select idx.id, 'INDEX', sys.fqn(s.name, idx.name) from sys.idxs idx, sys._tables t, sys.schemas s where idx.table_id = t.id and t.schema_id = s.id union all select seq.id, 'SEQUENCE', sys.fqn(s.name, seq.name) from sys.sequences seq, sys.schemas s where seq.schema_id = s.id union all select f.id, ft.function_type_keyword, sys.fqn(s.name, f.name) from sys.functions f, sys.function_types ft, sys.schemas s where f.type = ft.function_type_id and f.schema_id = s.id) as o(id, tpe, nme) join sys.comments c on c.id = o.id; create view sys.describe_constraints as select s.name sch, t.name tbl, kc.name col, k.name con, case when k.type = 0 then 'PRIMARY KEY' when k.type = 1 then 'UNIQUE' end tpe from sys.schemas s, sys._tables t, sys.objects kc, sys.keys k where kc.id = k.id and k.table_id = t.id and s.id = t.schema_id and t.system = false and k.type in (0, 1) and t.type in (0, 6); create view sys.describe_foreign_keys as with action_type (id, act) as (values (0, 'NO ACTION'), (1, 'CASCADE'), (2, 'RESTRICT'), (3, 'SET NULL'), (4, 'SET DEFAULT')) select fs.name fk_s, fkt.name fk_t, fkkc.name fk_c, fkkc.nr o, fkk.name fk, ps.name pk_s, pkt.name pk_t, pkkc.name pk_c, ou.act on_update, od.act on_delete from sys._tables fkt, sys.objects fkkc, sys.keys fkk, sys._tables pkt, sys.objects pkkc, sys.keys pkk, sys.schemas ps, sys.schemas fs, action_type ou, action_type od where fkt.id = fkk.table_id and pkt.id = pkk.table_id and fkk.id = fkkc.id and pkk.id = pkkc.id and fkk.rkey = pkk.id and fkkc.nr = pkkc.nr and pkt.schema_id = ps.id and fkt.schema_id = fs.id and (fkk."action" & 255) = od.id and ((fkk."action" >> 8) & 255) = ou.id order by fkk.name, fkkc.nr; -create view sys.describe_functions as select f.id o, s.name sch, f.name fun, f.func def from
MonetDB: default - Approve after merge.
Changeset: 9047b63e34ef for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/9047b63e34ef Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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: Approve after merge. diffs (truncated from 107002 to 300 lines): 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 @@ -1,5119 +1,3 @@ -Running database upgrade commands: -set schema "sys"; -delete from sys.dependencies where id < 2000; -delete from sys.types where id < 2000; -insert into sys.types values (1, 'void', 'any', 0, 0, 0, 0, 2000); -insert into sys.types values (2, 'bat', 'table', 0, 0, 0, 1, 2000); -insert into sys.types values (3, 'ptr', 'ptr', 0, 0, 0, 1, 2000); -insert into sys.types values (4, 'bit', 'boolean', 1, 0, 2, 2, 2000); -insert into sys.types values (5, 'str', 'clob', 0, 0, 0, 4, 2000); -insert into sys.types values (6, 'str', 'varchar', 0, 0, 0, 4, 2000); -insert into sys.types values (7, 'str', 'char', 0, 0, 0, 3, 2000); -insert into sys.types values (8, 'oid', 'oid', 63, 0, 2, 6, 2000); -insert into sys.types values (9, 'bte', 'tinyint', 8, 1, 2, 7, 2000); -insert into sys.types values (10, 'sht', 'smallint', 16, 1, 2, 7, 2000); -insert into sys.types values (11, 'int', 'int', 32, 1, 2, 7, 2000); -insert into sys.types values (12, 'lng', 'bigint', 64, 1, 2, 7, 2000); -insert into sys.types values (13, 'hge', 'hugeint', 128, 1, 2, 7, 2000); -insert into sys.types values (14, 'bte', 'decimal', 2, 1, 10, 10, 2000); -insert into sys.types values (15, 'sht', 'decimal', 4, 1, 10, 10, 2000); -insert into sys.types values (16, 'int', 'decimal', 9, 1, 10, 10, 2000); -insert into sys.types values (17, 'lng', 'decimal', 18, 1, 10, 10, 2000); -insert into sys.types values (18, 'hge', 'decimal', 38, 1, 10, 10, 2000); -insert into sys.types values (19, 'flt', 'real', 24, 2, 2, 11, 2000); -insert into sys.types values (20, 'dbl', 'double', 53, 2, 2, 11, 2000); -insert into sys.types values (21, 'int', 'month_interval', 3, 0, 10, 8, 2000); -insert into sys.types values (22, 'lng', 'day_interval', 4, 0, 10, 9, 2000); -insert into sys.types values (23, 'lng', 'sec_interval', 13, 1, 10, 9, 2000); -insert into sys.types values (24, 'daytime', 'time', 7, 0, 0, 12, 2000); -insert into sys.types values (25, 'daytime', 'timetz', 7, 1, 0, 13, 2000); -insert into sys.types values (26, 'date', 'date', 0, 0, 0, 14, 2000); -insert into sys.types values (27, 'timestamp', 'timestamp', 7, 0, 0, 15, 2000); -insert into sys.types values (28, 'timestamp', 'timestamptz', 7, 1, 0, 16, 2000); -insert into sys.types values (29, 'blob', 'blob', 0, 0, 0, 5, 2000); -insert into sys.types values (32, 'wkb', 'geometry', 0, 0, 0, 17, 2000); -insert into sys.types values (33, 'wkba', 'geometrya', 0, 0, 0, 18, 2000); -insert into sys.types values (34, 'mbr', 'mbr', 0, 0, 0, 18, 2000); -delete from sys.functions where id < 2000; -delete from sys.args where func_id not in (select id from sys.functions); -insert into sys.functions values (30, 'length', 'nitems', 'blob', 0, 1, false, false, false, 2000, true, false); -insert into sys.args values (41396, 30, 'res_0', 'int', 32, 0, 0, 0); -insert into sys.args values (41397, 30, 'arg_1', 'blob', 0, 0, 1, 1); -insert into sys.functions values (31, 'octet_length', 'nitems', 'blob', 0, 1, false, false, false, 2000, true, false); -insert into sys.args values (41398, 31, 'res_0', 'int', 32, 0, 0, 0); -insert into sys.args values (41399, 31, 'arg_1', 'blob', 0, 0, 1, 1); -insert into sys.functions values (35, 'mbr_overlap',
MonetDB: default - "Approve" after changeset 8e968b9a4945.
Changeset: 83ec245ac136 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/83ec245ac136 Modified Files: sql/test/bincopy/Tests/bincopy_support.py Branch: default Log Message: "Approve" after changeset 8e968b9a4945. diffs (188 lines): diff --git a/sql/test/bincopy/Tests/bincopy_support.py b/sql/test/bincopy/Tests/bincopy_support.py --- a/sql/test/bincopy/Tests/bincopy_support.py +++ b/sql/test/bincopy/Tests/bincopy_support.py @@ -94,19 +94,19 @@ INTS = (""" CREATE TABLE foo(id INT NOT NULL); COPY BINARY INTO foo(id) FROM @ints@ @ON@; SELECT COUNT(DISTINCT id) FROM foo; -""", [f"{NRECS} affected rows", f"{NRECS}"]) +""", [f"{NRECS}"]) MORE_INTS = (""" CREATE TABLE foo(id INT NOT NULL, i INT); COPY BINARY INTO foo(id, i) FROM @ints@, @more_ints@ @ON@; SELECT COUNT(id) FROM foo WHERE i = id + 1; -""", [f"{NRECS} affected rows", f"{NRECS}"]) +""", [f"{NRECS}"]) STRINGS = (""" CREATE TABLE foo(id INT NOT NULL, s VARCHAR(20)); COPY BINARY INTO foo(id, s) FROM @ints@, @strings@ @ON@; SELECT COUNT(id) FROM foo WHERE s = ('int' || id); -""", [f"{NRECS} affected rows", f"{NRECS}"]) +""", [f"{NRECS}"]) NULL_INTS = (""" CREATE TABLE foo(id INT NOT NULL, i INT); @@ -114,7 +114,7 @@ COPY BINARY INTO foo(id, i) FROM @ints@, SELECT COUNT(id) FROM foo WHERE (id % 2 = 0 AND i IS NULL) OR(id % 2 = 1 AND i = id); -""", [f"{NRECS} affected rows", f"{NRECS}"]) +""", [f"{NRECS}"]) LARGE_STRINGS = (""" CREATE TABLE foo(id INT NOT NULL, s TEXT); @@ -122,7 +122,7 @@ COPY BINARY INTO foo(id, s) FROM @ints@, SELECT COUNT(id) FROM foo WHERE (id % 1 <> 0 AND LENGTH(s) = 9) OR(id % 1 = 0 AND LENGTH(s) = 28 + 9); -""", [f"{NRECS} affected rows", f"{NRECS}"]) +""", [f"{NRECS}"]) BROKEN_STRINGS = (""" CREATE TABLE foo(id INT NOT NULL, s TEXT); @@ -135,7 +135,7 @@ NEWLINE_STRINGS = (r""" CREATE TABLE foo(id INT NOT NULL, s TEXT); COPY BINARY INTO foo(id, s) FROM @ints@, @newline_strings@ @ON@; SELECT COUNT(id) FROM foo WHERE s = (E'RN\nR\r' || id); -""", [f"{NRECS} affected rows", f"{NRECS}"]) +""", [f"{NRECS}"]) NULL_STRINGS = (""" CREATE TABLE foo(id INT NOT NULL, s TEXT); @@ -143,7 +143,7 @@ COPY BINARY INTO foo(id, s) FROM @ints@, SELECT COUNT(id) FROM foo WHERE (id % 2 = 0 AND s IS NULL) OR(id % 2 = 1 AND s = 'banana'); -""", [f"{NRECS} affected rows", f"{NRECS}"]) +""", [f"{NRECS}"]) TIMESTAMPS = (""" CREATE TABLE foo( @@ -212,19 +212,19 @@ SELECT * FROM foo WHERE 100 * CAST(EXTRACT(SECOND FROM tm) AS DECIMAL(13,6)) <> 100 * "second" + ms LIMIT 4; -""", [f"{NRECS} affected rows"]) +""", []) PARTIAL = (""" CREATE TABLE foo(id INT NOT NULL, i INT, j INT NULL); COPY BINARY INTO foo(id, i) FROM @ints@, @more_ints@ @ON@; SELECT COUNT(id) FROM foo WHERE i = id + 1 AND j IS NULL; -""", [f"{NRECS} affected rows", f"{NRECS}"]) +""", [f"{NRECS}"]) BOOLS = (""" CREATE TABLE foo(id INT NOT NULL, b BOOL); COPY BINARY INTO foo(id, b) FROM @ints@, @bools@ @ON@; SELECT COUNT(id) FROM foo WHERE b = (id % 2 <> 0); -""", [f"{NRECS} affected rows", f"{NRECS}"]) +""", [f"{NRECS}"]) INCONSISTENT_LENGTH = (""" CREATE TABLE foo(id INT NOT NULL, i INT); @@ -237,13 +237,13 @@ FLOATS = (""" CREATE TABLE foo(id INT NOT NULL, r REAL); COPY BINARY INTO foo(id, r) FROM @ints@, @floats@ @ON@; SELECT COUNT(id) FROM foo WHERE CAST(id AS REAL) + 0.5 = r; -""", [f"{NRECS} affected rows", f"{NRECS}"]) +""", [f"{NRECS}"]) DOUBLES = (""" CREATE TABLE foo(id INT NOT NULL, d DOUBLE); COPY BINARY INTO foo(id, d) FROM @ints@, @doubles@ @ON@; SELECT COUNT(id) FROM foo WHERE CAST(id AS REAL) + 0.5 = d; -""", [f"{NRECS} affected rows", f"{NRECS}"]) +""", [f"{NRECS}"]) INTEGER_TYPES = (""" CREATE TABLE foo(t TINYINT, s SMALLINT, i INT, b BIGINT); @@ -281,7 +281,7 @@ FROM verified GROUP BY t_s, s_i, i_b ORDER BY t_s, s_i, i_b ; -""", [f"{NRECS} affected rows", f"true,true,true,{NRECS}"]) +""", [f"true,true,true,{NRECS}"]) HUGE_INTS = (""" CREATE TABLE foo(b BIGINT, h HUGEINT); @@ -314,7 +314,7 @@ FROM verified GROUP BY b_h ORDER BY b_h ; -""", [f"{NRECS} affected rows", f"true,{NRECS}"]) +""", [f"true,{NRECS}"]) DECIMALS = (""" -- 1..2 TINYINT @@ -366,7 +366,7 @@ SELECT FROM verified GROUP BY d1_1_ok, d2_1_ok, d3_2_ok, d4_2_ok, d5_2_ok, d9_2_ok, d10_2_ok, d18_2_ok ; -""", [f"{NRECS} affected rows", f"true,true,true,true,true,true,true,true,{NRECS}"]) +""", [f"true,true,true,true,true,true,true,true,{NRECS}"]) HUGE_DECIMALS = (""" -- 19..38 HUGEINT @@ -385,7 +385,7 @@ SELECT FROM foo GROUP BY d19_ok, d38_ok ; -""", [f"{NRECS} affected rows", f"true,true{NRECS}"]) +""", [f"true,true{NRECS}"]) URLS = (""" -- currently every string is accepted as a url @@ -393,7 +393,7 @@ URLS = (""" CREATE TABLE foo(u URL); COPY BINARY INTO foo FROM @strings@ @ON@; SELECT COUNT(*) FROM foo; -""", [f"{NRECS} affected rows", f"{NRECS}"]) +""", [f"{NRECS}"]) JSON_OBJECTS = (""" CREATE TABLE foo(i INT, j JSON); @@ -402,7 +402,7 @@
MonetDB: default - Approve 32 bit output after merge.
Changeset: 64dd931b42d0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/64dd931b42d0 Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit Branch: default Log Message: Approve 32 bit output after merge. diffs (138 lines): 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 @@ -4519,3 +4519,24 @@ GRANT SELECT ON sys.dependencies_vw TO P UPDATE sys._tables SET system = true WHERE name in ('ids', 'dependencies_vw') AND schema_id = 2000; set schema "sys"; +Running database upgrade commands: +set schema "sys"; +drop function sys.epoch(bigint); +create function sys.epoch(sec DECIMAL(18,3)) returns TIMESTAMP WITH TIME ZONE +external name mtime.epoch; +grant execute on function sys.epoch (DECIMAL(18,3)) to public; +update sys.functions set system = true where system <> true and name in ('epoch') and schema_id = 2000 and type = 1; +set schema "sys"; +drop view sys.tracelog; +drop function sys.tracelog(); +create function sys.tracelog() + returns table ( + ticks bigint, -- time in microseconds + stmt string, -- actual statement executed + event string -- profiler event executed + ) + external name sql.dump_trace; +create view sys.tracelog as select * from sys.tracelog(); +update sys._tables set system = true where system <> true and schema_id = 2000 and name = 'tracelog'; +update sys.functions set system = true where system <> true and schema_id = 2000 and name = 'tracelog' and type = 5; + diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit --- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit +++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit @@ -4519,3 +4519,24 @@ GRANT SELECT ON sys.dependencies_vw TO P UPDATE sys._tables SET system = true WHERE name in ('ids', 'dependencies_vw') AND schema_id = 2000; set schema "sys"; +Running database upgrade commands: +set schema "sys"; +drop function sys.epoch(bigint); +create function sys.epoch(sec DECIMAL(18,3)) returns TIMESTAMP WITH TIME ZONE +external name mtime.epoch; +grant execute on function sys.epoch (DECIMAL(18,3)) to public; +update sys.functions set system = true where system <> true and name in ('epoch') and schema_id = 2000 and type = 1; +set schema "sys"; +drop view sys.tracelog; +drop function sys.tracelog(); +create function sys.tracelog() + returns table ( + ticks bigint, -- time in microseconds + stmt string, -- actual statement executed + event string -- profiler event executed + ) + external name sql.dump_trace; +create view sys.tracelog as select * from sys.tracelog(); +update sys._tables set system = true where system <> true and schema_id = 2000 and name = 'tracelog'; +update sys.functions set system = true where system <> true and schema_id = 2000 and name = 'tracelog' and type = 5; + diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit b/sql/test/emptydb/Tests/check.stable.out.32bit --- a/sql/test/emptydb/Tests/check.stable.out.32bit +++ b/sql/test/emptydb/Tests/check.stable.out.32bit @@ -7634,14 +7634,14 @@ select 'null in value_partitions.value', % %12, temporary, id, name, schema_id, query, type, system, commit_action, access, temporary # name % char,tinyint,int,varchar,int,varchar, smallint, boolean,smallint, smallint, tinyint # type % 24, 1, 1, 0, 1, 0, 1, 5, 1, 1, 1 # length -% .%2, .tracelog, .tracelog, .tracelog # table_name -% %2, ticks, ticks, stmt # name -% char,bigint, bigint, clob # type -% 22, 1, 1, 0 # length -% .%2, .tracelog, .tracelog, .tracelog # table_name -% %2, stmt, ticks, stmt # name -% char,clob, bigint, clob # type -% 21, 0, 1, 0 # length +% .%2, .tracelog, .tracelog, .tracelog, .tracelog # table_name +% %2, ticks, ticks, stmt, event # name +% char,bigint, bigint, clob, clob # type +% 22, 1, 1, 0, 0 # length +% .%2, .tracelog, .tracelog, .tracelog, .tracelog # table_name +% %2, stmt, ticks, stmt, event # name +% char,clob, bigint, clob, clob # type +% 21, 0, 1, 0, 0 # length % .%1, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers, sys.triggers # table_name % %1, id, id, name,
MonetDB: default - Approve 32 bit output.
Changeset: 48eb5cc65564 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/48eb5cc65564 Modified Files: sql/test/emptydb/Tests/check.stable.out.32bit Branch: default Log Message: Approve 32 bit output. diffs (226 lines): diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit b/sql/test/emptydb/Tests/check.stable.out.32bit --- a/sql/test/emptydb/Tests/check.stable.out.32bit +++ b/sql/test/emptydb/Tests/check.stable.out.32bit @@ -154,6 +154,7 @@ \dSf sys."covar_pop" \dSf sys."covar_samp" \dSf sys."createorderindex" +\dSf sys."current_sessionid" \dSf sys."date_to_str" \dSf sys."date_trunc" \dSf sys."db_users" @@ -567,6 +568,7 @@ SYSTEM PROCEDUREsys.createorderi SYSTEM WINDOW sys.cume_dist SYSTEM FUNCTION sys.curdate SYSTEM FUNCTION sys.current_date +SYSTEM FUNCTION sys.current_sessionid SYSTEM FUNCTION sys.current_time SYSTEM FUNCTION sys.current_timestamp SYSTEM FUNCTION sys.curtime @@ -643,7 +645,6 @@ SYSTEM PROCEDUREsys.hot_snapshot SYSTEM FUNCTION sys.hour SYSTEM FUNCTION sys.identity SYSTEM FUNCTION sys.ifthenelse -SYSTEM FILTER FUNCTION sys.ilike SYSTEM FUNCTION sys.imprintsize SYSTEM FUNCTION sys.index SYSTEM FUNCTION sys.insert @@ -716,7 +717,6 @@ SYSTEM FUNCTION sys.newurl SYSTEM FUNCTION sys.next_value_for SYSTEM FUNCTION sys.not SYSTEM AGGREGATEsys.not_exist -SYSTEM FILTER FUNCTION sys.not_ilike SYSTEM FILTER FUNCTION sys.not_like SYSTEM AGGREGATEsys.not_unique SYSTEM WINDOW sys.nth_value @@ -1130,6 +1130,7 @@ create window covar_samp(e1 real, e2 rea create window covar_samp(e1 smallint, e2 smallint) returns double external name "sql"."covariance"; create window covar_samp(e1 tinyint, e2 tinyint) returns double external name "sql"."covariance"; create procedure sys.createorderindex(sys string, tab string, col string) external name sql.createorderindex; +create function sys.current_sessionid() returns int external name clients.current_sessionid; create function date_to_str(d date, format string) returns string external name mtime."date_to_str"; create function sys.date_trunc(txt string, t timestamp with time zone) returns timestamp with time zone external name sql.date_trunc; create function sys.date_trunc(txt string, t timestamp) returns timestamp external name sql.date_trunc; @@ -1150,7 +1151,7 @@ create procedure sys.droporderindex(sys create function sys.dump_database(describe boolean) returns table(o int, stmt string) begin set schema sys; truncate sys.dump_statements; insert into sys.dump_statements values (1, 'START TRANSACTION;'); insert into sys.dump_statements values ((select count(*) from sys.dump_statements) + 1, 'SET SCHEMA "sys";'); insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_create_roles; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_create_users; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_create_schemas; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_user_defined_types; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_add_schemas_to_users; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_grant_user_privileges; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_sequences; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_start_sequences; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(order by stmts.o), stmts.s from (select * from sys.dump_functions f union select * from sys.dump_tables t) as stmts(o, s); insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_column_defaults; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_table_constraint_type; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_indices; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_foreign_keys; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_partition_tables; insert into sys.dump_statements select (select count(*) from sys.dump_statements) + rank() over(), stmt from sys.dump_triggers; insert into
MonetDB: default - Approve upgrades.
Changeset: 7ff55a602c6b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/7ff55a602c6b Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.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: Approve upgrades. diffs (truncated from 24707 to 300 lines): 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 @@ -3520,689 +3520,617 @@ insert into sys.functions values (944, ' insert into sys.args values (43965, 944, 'res_0', 'boolean', 1, 0, 0, 0); insert into sys.args values (43966, 944, 'arg_1', 'clob', 0, 0, 1, 1); insert into sys.args values (43967, 944, 'arg_2', 'clob', 0, 0, 1, 2); -insert into sys.functions values (945, 'like', 'like', 'algebra', 0, 4, false, false, false, 2000, true, false); -insert into sys.args values (43968, 945, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (43969, 945, 'arg_1', 'clob', 0, 0, 1, 1); -insert into sys.args values (43970, 945, 'arg_2', 'clob', 0, 0, 1, 2); -insert into sys.args values (43971, 945, 'arg_3', 'clob', 0, 0, 1, 3); -insert into sys.functions values (946, 'ilike', 'ilike', 'algebra', 0, 4, false, false, false, 2000, true, false); -insert into sys.args values (43972, 946, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (43973, 946, 'arg_1', 'clob', 0, 0, 1, 1); -insert into sys.args values (43974, 946, 'arg_2', 'clob', 0, 0, 1, 2); -insert into sys.functions values (947, 'ilike', 'ilike', 'algebra', 0, 4, false, false, false, 2000, true, false); -insert into sys.args values (43975, 947, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (43976, 947, 'arg_1', 'clob', 0, 0, 1, 1); -insert into sys.args values (43977, 947, 'arg_2', 'clob', 0, 0, 1, 2); -insert into sys.args values (43978, 947, 'arg_3', 'clob', 0, 0, 1, 3); -insert into sys.functions values (948, 'not_like', 'not_like', 'algebra', 0, 4, false, false, false, 2000, true, false); -insert into sys.args values (43979, 948, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (43980, 948, 'arg_1', 'clob', 0, 0, 1, 1); -insert into sys.args values (43981, 948, 'arg_2', 'clob', 0, 0, 1, 2); -insert into sys.functions values (949, 'not_like', 'not_like', 'algebra', 0, 4, false, false, false, 2000, true, false); -insert into sys.args values (43982, 949, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (43983, 949, 'arg_1', 'clob', 0, 0, 1, 1); -insert into sys.args values (43984, 949, 'arg_2', 'clob', 0, 0, 1, 2); -insert into sys.args values (43985, 949, 'arg_3', 'clob', 0, 0, 1, 3); -insert into sys.functions values (950, 'not_ilike', 'not_ilike', 'algebra', 0, 4, false, false, false, 2000, true, false); -insert into sys.args values (43986, 950, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (43987, 950, 'arg_1', 'clob', 0, 0, 1, 1); -insert into sys.args values (43988, 950, 'arg_2', 'clob', 0, 0, 1, 2); -insert into sys.functions values (951, 'not_ilike', 'not_ilike', 'algebra', 0, 4, false, false, false, 2000, true, false); -insert into sys.args values (43989, 951, 'res_0', 'boolean', 1, 0, 0, 0); -insert into sys.args values (43990, 951, 'arg_1', 'clob', 0, 0, 1, 1); -insert into sys.args values (43991, 951, 'arg_2', 'clob', 0, 0, 1, 2); -insert into sys.args values (43992, 951, 'arg_3', 'clob', 0, 0, 1, 3); -insert into sys.functions values (952, 'patindex', 'patindex', 'pcre', 0, 1, false, false,
MonetDB: default - Approve.
Changeset: 74f3c4533089 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/74f3c4533089 Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: Approve. diffs (11 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 @@ -1278,6 +1278,7 @@ const char *remapRef; const char *remoteRef; void removeInstruction(MalBlkPtr mb, InstrPtr p); void removeInstructionBlock(MalBlkPtr mb, int pc, int cnt); +void removeMalBlkHistory(MalBlkPtr mb); void renameVariables(MalBlkPtr mb); const char *rename_columnRef; const char *rename_schemaRef; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve change.
Changeset: ceec4384ef5f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/ceec4384ef5f Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: Approve change. diffs (12 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 @@ -182,7 +182,7 @@ gdk_return BATrangejoin(BAT **r1p, BAT * gdk_return BATreplace(BAT *b, BAT *p, BAT *n, bool force) __attribute__((__warn_unused_result__)); gdk_return BATroles(BAT *b, const char *tnme); BAT *BATsample(BAT *b, BUN n); -BAT *BATsample_with_seed(BAT *b, BUN n, unsigned seed); +BAT *BATsample_with_seed(BAT *b, BUN n, uint64_t seed); gdk_return BATsave(BAT *b) __attribute__((__warn_unused_result__)); BAT *BATselect(BAT *b, BAT *s, const void *tl, const void *th, bool li, bool hi, bool anti); gdk_return BATsemijoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, bool nil_matches, bool max_one, BUN estimate) __attribute__((__warn_unused_result__)); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output.
Changeset: d48c8db4edfe for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/d48c8db4edfe Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: Approve output. diffs (11 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 @@ -450,6 +450,7 @@ const bte bte_nil; oid canditer_idx(const struct canditer *ci, BUN p); BUN canditer_init(struct canditer *ci, BAT *b, BAT *s); oid canditer_last(const struct canditer *ci); +oid canditer_mask_next(const struct canditer *ci, oid o, bool next); oid canditer_peek(struct canditer *ci); oid canditer_peekprev(struct canditer *ci); oid canditer_prev(struct canditer *ci); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve.
Changeset: 594179b520d9 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=594179b520d9 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 Branch: default Log Message: Approve. diffs (62 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -9173,8 +9173,6 @@ stdout of test 'MAL-signatures` in direc [ "optimizer", "optimize", "pattern optimizer.optimize(X_0:str, X_1:str):void ", "QOToptimize;", "" ] [ "optimizer", "orcam","pattern optimizer.orcam(X_0:str, X_1:str):void ", "OPTorcam;","" ] [ "optimizer", "orcam","pattern optimizer.orcam(X_0:str, X_1:str, X_2:str, X_3:str):void ","OPTorcam;","" ] -[ "optimizer", "parappend","pattern optimizer.parappend():str ", "OPTwrapper;", "" ] -[ "optimizer", "parappend","pattern optimizer.parappend(X_0:str, X_1:str):str ", "OPTwrapper;", "" ] [ "optimizer", "postfix", "pattern optimizer.postfix():str ", "OPTwrapper;", "" ] [ "optimizer", "postfix", "pattern optimizer.postfix(X_0:str, X_1:str):str ", "OPTwrapper;", "" ] [ "optimizer", "prelude", "pattern optimizer.prelude():void ", "optimizer_prelude;", "" ] @@ -9293,9 +9291,6 @@ stdout of test 'MAL-signatures` in direc [ "sql", "analyze", "unsafe pattern sql.analyze(X_0:int, X_1:lng, X_2:str, X_3:str, X_4:str):void ","sql_analyze;", "" ] [ "sql", "any", "pattern sql.any(X_0:bit, X_1:bit, X_2:bit):bit ", "SQLany_cmp;", "" ] [ "sql", "append", "pattern sql.append(X_0:int, X_1:str, X_2:str, X_3:str, X_4:lng, X_5:any):int ","mvc_append_wrap;", "" ] -[ "sql", "append_exec", "pattern sql.append_exec(X_0:ptr, X_1:lng, X_2:any_1):ptr ","mvc_append_exec_wrap;","" ] -[ "sql", "append_finish","pattern sql.append_finish(X_0:int, X_1:ptr...):int ", "mvc_append_finish_wrap;", "" ] -[ "sql", "append_prep", "pattern sql.append_prep(X_0:int, X_1:str, X_2:str, X_3:str...) (X_4:int, X_5:ptr...) ","mvc_append_prep_wrap;", "" ] [ "sql", "argRecord","pattern sql.argRecord():str ", "SQLargRecord;","" ] [ "sql", "argRecord","pattern sql.argRecord(X_0:any...):str ", "SQLargRecord;","" ] [ "sql", "assert", "pattern sql.assert(X_0:bit, X_1:str):void ", "SQLassert;", "" ] @@ -9492,8 +9487,6 @@ stdout of test 'MAL-signatures` in direc [ "sql", "transaction_rollback", "unsafe pattern sql.transaction_rollback(X_0:int, X_1:str):void ", "SQLtransaction_rollback;", "" ] [ "sql", "unionfunc","pattern sql.unionfunc(X_0:str, X_1:str, X_2:any...):any... ", "SQLunionfunc;","" ] [ "sql", "update", "pattern sql.update(X_0:int, X_1:str, X_2:str, X_3:str, X_4:any, X_5:any):int ","mvc_update_wrap;", "" ] -[ "sql", "update_exec", "pattern sql.update_exec(X_0:ptr, X_1:bat[:oid], X_2:bat[:any_1]):ptr ","mvc_update_exec_wrap;", "" ] -[ "sql", "update_prep", "pattern sql.update_prep(X_0:int, X_1:str, X_2:str, X_3:str...) (X_4:int, X_5:ptr...) ","mvc_update_prep_wrap;", "" ] [ "sql", "update_schemas", "unsafe pattern sql.update_schemas():void ","SYSupdate_schemas;", "" ] [ "sql", "update_tables","unsafe pattern sql.update_tables():void ", "SYSupdate_tables;","" ] [ "sql", "variance", "pattern sql.variance(X_0:bte, X_1:bit, X_2:bit, X_3:int, X_4:oid, X_5:oid):dbl ", "SQLvar_samp;", "" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -12478,8 +12478,6 @@ stdout of test 'MAL-signatures` in direc [ "optimizer", "optimize", "pattern optimizer.optimize(X_0:str, X_1:str):void ", "QOToptimize;", "" ] [ "optimizer", "orcam","pattern optimizer.orcam(X_0:str, X_1:str):void ", "OPTorcam;","" ] [ "optimizer", "orcam","pattern optimizer.orcam(X_0:str, X_1:str, X_2:str, X_3:str):void ","OPTorcam;","" ] -[ "optimizer", "parappend","pattern optimizer.parappend():str ", "OPTwrapper;", "" ] -[ "optimizer", "parappend","pattern optimizer.parappend(X_0:str, X_1:str):str ", "OPTwrapper;", "" ] [ "optimizer", "postfix", "pattern optimizer.postfix():str ", "OPTwrapper;", "" ] [ "optimizer", "postfix", "pattern optimizer.postfix(X_0:str, X_1:str):str ", "OPTwrapper;", "" ] [ "optimizer",
MonetDB: default - Approve clients/exports
Changeset: 68913e9fcd06 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68913e9fcd06 Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: Approve clients/exports diffs (21 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 @@ -824,9 +824,6 @@ const char *alter_viewRef; const char *andRef; const char *appendBulkRef; const char *appendRef; -const char *append_execRef; -const char *append_finishRef; -const char *append_prepRef; const char *appendidxRef; const char *arrayRef; const char *assertRef; @@ -1393,7 +1390,6 @@ const char *unpackRef; const char *unpinRef; const char *updateRef; void updateScenario(str scen, str nme, MALfcn fcn); -const char *update_execRef; Module userModule(void); const char *userRef; size_t usrstatscnt; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve the output
Changeset: 2e0be55dd976 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2e0be55dd976 Modified Files: sql/test/Tests/setoptimizer.test sql/test/Triggers/Tests/trigger_action.test sql/test/mapi/Tests/sql_int128.test sql/test/miscellaneous/Tests/simple_plans.test Branch: default Log Message: Approve the output diffs (154 lines): diff --git a/sql/test/Tests/setoptimizer.test b/sql/test/Tests/setoptimizer.test --- a/sql/test/Tests/setoptimizer.test +++ b/sql/test/Tests/setoptimizer.test @@ -29,22 +29,22 @@ query TTT rowsort select * from optimizers() default_pipe -optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.aliases();optimizer.evaluate();optimizer.emptybind();optimizer.deadcode();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.bincopyfrom();optimizer.parappend();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.deadcode();optimizer.postfix();optimizer.wlc();optimizer.garbageCollector(); +optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.aliases();optimizer.evaluate();optimizer.emptybind();optimizer.deadcode();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.bincopyfrom();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.deadcode();optimizer.postfix();optimizer.wlc();optimizer.garbageCollector(); stable minimal_pipe -optimizer.inline();optimizer.remap();optimizer.bincopyfrom();optimizer.parappend();optimizer.deadcode();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector(); +optimizer.inline();optimizer.remap();optimizer.bincopyfrom();optimizer.deadcode();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector(); stable no_mitosis_pipe -optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.aliases();optimizer.evaluate();optimizer.emptybind();optimizer.deadcode();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.bincopyfrom();optimizer.parappend();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.deadcode();optimizer.postfix();optimizer.wlc();optimizer.garbageCollector(); +optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.aliases();optimizer.evaluate();optimizer.emptybind();optimizer.deadcode();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.bincopyfrom();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.deadcode();optimizer.postfix();optimizer.wlc();optimizer.garbageCollector(); stable oltp_pipe -optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.deadcode();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.bincopyfrom();optimizer.parappend();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.deadcode();optimizer.postfix();optimizer.oltp();optimizer.wlc();optimizer.garbageCollector();
MonetDB: default - Approve 32 bit output.
Changeset: 6ad1d677db33 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ad1d677db33 Modified Files: sql/test/emptydb/Tests/check.stable.out.32bit Branch: default Log Message: Approve 32 bit output. diffs (132 lines): diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit b/sql/test/emptydb/Tests/check.stable.out.32bit --- a/sql/test/emptydb/Tests/check.stable.out.32bit +++ b/sql/test/emptydb/Tests/check.stable.out.32bit @@ -1500,7 +1500,7 @@ create window var_samp(val tinyint) retu -- helper function create function pcre_replace(origin string, pat string, repl string, flags string) returns string external name pcre.replace; -- schemas -select 'sys.schemas', name, authorization, owner, system from sys.schemas order by name; +select 'sys.schemas', s.name, a1.name as authorization, a2.name as owner, system from sys.schemas s left outer join sys.auths a1 on s.authorization = a1.id left outer join sys.auths a2 on s.owner = a2.id order by s.name; -- _tables select 'sys._tables', s.name, t.name, replace(replace(pcre_replace(pcre_replace(t.query, E'--.*\n*', '', ''), E'[ \t\n]+', ' ', ''), '( ', '('), ' )', ')') as query, tt.table_type_name as type, t.system, ca.action_name as commit_action, at.value as access from sys._tables t left outer join sys.schemas s on t.schema_id = s.id left outer join sys.table_types tt on t.type = tt.table_type_id left outer join (values (0, 'COMMIT'), (1, 'DELETE'), (2, 'PRESERVE'), (3, 'DROP'), (4, 'ABORT')) as ca (action_id, action_name) on t.commit_action = ca.action_id left outer join (values (0, 'WRITABLE'), (1, 'READONLY'), (2, 'APPENDONLY')) as at (id, value) on t.access = at.id order by s.name, t.name; -- _columns @@ -1539,7 +1539,7 @@ select 'sys.idxs', t.name, i.name, it.in -- keys select 'sys.keys', t.name, k.name, kt.key_type_name, k2.name, k.action from sys.keys k left outer join sys.keys k2 on k.rkey = k2.id left outer join sys._tables t on k.table_id = t.id left outer join sys.key_types kt on k.type = kt.key_type_id order by t.name, k.name; -- objects -select 'sys.objects', name, nr from sys.objects order by name, nr; +select 'sys.objects', o.name, case when nr < 2000 then cast(nr as string) else s1.name || '.' || t1.name end as nr, s2.name || '.' || t2.name as sub from sys.objects o left outer join sys._tables t1 on o.nr = t1.id left outer join sys.schemas s1 on t1.schema_id = s1.id left outer join sys._tables t2 on o.sub = t2.id left outer join sys.schemas s2 on t2.schema_id = s2.id order by name, nr, sub; -- privileges -- schemas select 'default schema of user', s.name, u.name from sys.schemas s, sys.users u where s.id = u.default_schema order by s.name, u.name; @@ -1579,17 +1579,17 @@ select 'sys.privilege_codes', privilege_ select 'sys.dependency_types', dependency_type_id, dependency_type_name from sys.dependency_types order by dependency_type_id, dependency_type_name; -- drop helper function drop function pcre_replace(string, string, string, string); -% .%1, sys.schemas,sys.schemas,sys.schemas,sys.schemas # table_name +% .%1, .s, ., ., .s # table_name % %1, name, authorization, owner, system # name -% char,varchar,int,int,boolean # type -% 11, 8, 1, 1, 5 # length -[ "sys.schemas", "json", 3, 3, true] -[ "sys.schemas", "logging", 3, 3, true] -[ "sys.schemas", "profiler", 3, 3, true] -[ "sys.schemas", "sys", 2, 3, true] -[ "sys.schemas", "tmp", 2, 3, true] -[ "sys.schemas", "wlc", 3, 3, true] -[ "sys.schemas", "wlr", 3, 3, true] +% char,varchar,varchar,varchar,boolean # type +% 11, 8, 8, 7, 5 # length +[ "sys.schemas", "json", "monetdb", "monetdb", true] +[ "sys.schemas", "logging", "monetdb", "monetdb", true ] +[ "sys.schemas", "profiler", "monetdb", "monetdb", true ] +[ "sys.schemas", "sys", "sysadmin", "monetdb", true] +[ "sys.schemas", "tmp", "sysadmin", "monetdb", true] +[ "sys.schemas", "wlc", "monetdb", "monetdb", true] +[ "sys.schemas", "wlr", "monetdb", "monetdb", true] % .%25,.s, .t, ., ., .t, ., . # table_name % %25, name, name, query, type, system, commit_action, access # name % char,varchar,varchar,clob, varchar, boolean,char, char # type @@ -5240,44 +5240,44 @@ drop function pcre_replace(string, strin [ "sys.keys", "spatial_ref_sys", "spatial_ref_sys_srid_pkey", "Primary Key", NULL, -1 ] [ "sys.keys", "table_types", "table_types_table_type_id_pkey", "Primary Key", NULL, -1 ] [ "sys.keys", "table_types",
MonetDB: default - approve output
Changeset: 3cb0f81c1d20 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3cb0f81c1d20 Modified Files: clients/Tests/MAL-signatures.stable.out.int128 Branch: default Log Message: approve output diffs (11 lines): diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -859,6 +859,7 @@ stdout of test 'MAL-signatures` in direc [ "bat", "isaKey", "command bat.isaKey(X_0:bat[:any_1]):bit ", "BKCgetKey;", "" ] [ "bat", "mergecand","command bat.mergecand(X_0:bat[:oid], X_1:bat[:oid]):bat[:oid] ", "BKCmergecand;","" ] [ "bat", "mirror", "command bat.mirror(X_0:bat[:any_2]):bat[:oid] ", "BKCmirror;", "" ] +[ "bat","new", "pattern bat.new(X_0:any_1, X_1:bat[:any_2]):bat[:any_1] ", "CMDBATdup;", "" ] [ "bat", "new", "pattern bat.new(X_0:any_1):bat[:any_1] ", "CMDBATnew;", "" ] [ "bat", "new", "pattern bat.new(X_0:any_1, X_1:int):bat[:any_1] ", "CMDBATnew;", "" ] [ "bat", "new", "pattern bat.new(X_0:any_1, X_1:int, X_2:bit):bat[:any_1] ","CMDBATnew;", "" ] ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve ppc64 output.
Changeset: b7eeaac5e423 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b7eeaac5e423 Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 Branch: default Log Message: Approve ppc64 output. diffs (truncated from 1458 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 @@ -4365,19 +4365,16 @@ BEGIN END END; END; - CREATE FUNCTION sys.SQ (s STRING) RETURNS STRING BEGIN RETURN ' ''' || sys.replace(s,,'') || ''' '; END; CREATE FUNCTION sys.DQ (s STRING) RETURNS STRING BEGIN RETURN '"' || sys.replace(s,'"','""') || '"'; END; --TODO: Figure out why this breaks with the space CREATE FUNCTION sys.FQN(s STRING, t STRING) RETURNS STRING BEGIN RETURN sys.DQ(s) || '.' || sys.DQ(t); END; CREATE FUNCTION sys.ALTER_TABLE(s STRING, t STRING) RETURNS STRING BEGIN RETURN 'ALTER TABLE ' || sys.FQN(s, t) || ' '; END; - --We need pcre to implement a header guard which means adding the schema of an object explicitely to its identifier. CREATE FUNCTION sys.replace_first(ori STRING, pat STRING, rep STRING, flg STRING) RETURNS STRING EXTERNAL NAME "pcre"."replace_first"; CREATE FUNCTION sys.schema_guard(sch STRING, nme STRING, stmt STRING) RETURNS STRING BEGIN RETURN SELECT sys.replace_first(stmt, '(\\s*"?' || sch || '"?\\s*\\.|)\\s*"?' || nme || '"?\\s*', ' ' || sys.FQN(sch, nme) || ' ', 'imsx'); END; - CREATE VIEW sys.describe_constraints AS SELECT s.name sch, @@ -4392,7 +4389,6 @@ CREATE VIEW sys.describe_constraints AS AND t.system = FALSE AND k.type in (0, 1) AND t.type IN (0, 6); - CREATE VIEW sys.describe_indices AS WITH it (id, idx) AS (VALUES (0, 'INDEX'), (4, 'IMPRINTS INDEX'), (5, 'ORDERED INDEX')) --UNIQUE INDEX wraps to INDEX. SELECT @@ -4417,7 +4413,6 @@ CREATE VIEW sys.describe_indices AS AND k.type IS NULL AND i.type = it.id ORDER BY i.name, kc.nr; - CREATE VIEW sys.describe_column_defaults AS SELECT s.name sch, @@ -4431,7 +4426,6 @@ CREATE VIEW sys.describe_column_defaults s.name <> 'tmp' AND NOT t.system AND c."default" IS NOT NULL; - CREATE VIEW sys.describe_foreign_keys AS WITH action_type (id, act) AS (VALUES (0, 'NO ACTION'), @@ -4471,7 +4465,6 @@ CREATE VIEW sys.describe_foreign_keys AS AND (fkk."action" & 255) = od.id AND ((fkk."action" >> 8) & 255) = ou.id ORDER BY fkk.name, fkkc.nr; - --TODO: CRASHES when this function gets inlined into describe_tables CREATE FUNCTION sys.get_merge_table_partition_expressions(tid INT) RETURNS STRING BEGIN @@ -4494,12 +4487,10 @@ BEGIN END FROM (VALUES (tid)) t(id) LEFT JOIN sys.table_partitions tp ON t.id = tp.table_id; END; - --TODO: gives mergejoin errors when inlined CREATE FUNCTION sys.get_remote_table_expressions(s STRING, t STRING) RETURNS STRING BEGIN RETURN SELECT ' ON ' || sys.SQ(uri) || ' WITH USER ' || sys.SQ(username) || ' ENCRYPTED PASSWORD ' || sys.SQ("hash") FROM sys.remote_table_credentials(s ||'.' || t); END; - CREATE VIEW sys.describe_tables AS SELECT t.id o, @@ -4531,7 +4522,6 @@ CREATE VIEW sys.describe_tables AS AND s.id = t.schema_id AND ts.table_type_id = t.type AND s.name <> 'tmp'; - CREATE VIEW sys.describe_triggers AS SELECT s.name sch, @@ -4540,7 +4530,6 @@ CREATE VIEW sys.describe_triggers AS tr.statement def FROM sys.schemas s, sys.tables t, sys.triggers tr WHERE s.id = t.schema_id AND t.id = tr.table_id AND NOT t.system; - CREATE VIEW sys.describe_comments AS SELECT o.id id, @@ -4549,32 +4538,20 @@ CREATE VIEW sys.describe_comments AS c.remark rem FROM ( SELECT id, 'SCHEMA', sys.DQ(name) FROM sys.schemas - UNION ALL - SELECT t.id, CASE WHEN ts.table_type_name = 'VIEW' THEN 'VIEW' ELSE 'TABLE' END, sys.FQN(s.name, t.name) FROM sys.schemas s JOIN sys.tables t ON s.id = t.schema_id JOIN sys.table_types ts ON t.type = ts.table_type_id WHERE NOT s.name <> 'tmp' - UNION ALL - SELECT c.id, 'COLUMN', sys.FQN(s.name, t.name) || '.' || sys.DQ(c.name) FROM sys.columns c, sys.tables t, sys.schemas s WHERE c.table_id = t.id AND t.schema_id = s.id - UNION ALL - SELECT idx.id, 'INDEX', sys.FQN(s.name, idx.name) FROM sys.idxs idx, sys._tables t,
MonetDB: default - Approve 32 bit output.
Changeset: 230f620cb00b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=230f620cb00b Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit Branch: default Log Message: Approve 32 bit output. diffs (truncated from 2644 to 300 lines): 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 @@ -3770,19 +3770,16 @@ BEGIN END END; END; - CREATE FUNCTION sys.SQ (s STRING) RETURNS STRING BEGIN RETURN ' ''' || sys.replace(s,,'') || ''' '; END; CREATE FUNCTION sys.DQ (s STRING) RETURNS STRING BEGIN RETURN '"' || sys.replace(s,'"','""') || '"'; END; --TODO: Figure out why this breaks with the space CREATE FUNCTION sys.FQN(s STRING, t STRING) RETURNS STRING BEGIN RETURN sys.DQ(s) || '.' || sys.DQ(t); END; CREATE FUNCTION sys.ALTER_TABLE(s STRING, t STRING) RETURNS STRING BEGIN RETURN 'ALTER TABLE ' || sys.FQN(s, t) || ' '; END; - --We need pcre to implement a header guard which means adding the schema of an object explicitely to its identifier. CREATE FUNCTION sys.replace_first(ori STRING, pat STRING, rep STRING, flg STRING) RETURNS STRING EXTERNAL NAME "pcre"."replace_first"; CREATE FUNCTION sys.schema_guard(sch STRING, nme STRING, stmt STRING) RETURNS STRING BEGIN RETURN SELECT sys.replace_first(stmt, '(\\s*"?' || sch || '"?\\s*\\.|)\\s*"?' || nme || '"?\\s*', ' ' || sys.FQN(sch, nme) || ' ', 'imsx'); END; - CREATE VIEW sys.describe_constraints AS SELECT s.name sch, @@ -3797,7 +3794,6 @@ CREATE VIEW sys.describe_constraints AS AND t.system = FALSE AND k.type in (0, 1) AND t.type IN (0, 6); - CREATE VIEW sys.describe_indices AS WITH it (id, idx) AS (VALUES (0, 'INDEX'), (4, 'IMPRINTS INDEX'), (5, 'ORDERED INDEX')) --UNIQUE INDEX wraps to INDEX. SELECT @@ -3822,7 +3818,6 @@ CREATE VIEW sys.describe_indices AS AND k.type IS NULL AND i.type = it.id ORDER BY i.name, kc.nr; - CREATE VIEW sys.describe_column_defaults AS SELECT s.name sch, @@ -3836,7 +3831,6 @@ CREATE VIEW sys.describe_column_defaults s.name <> 'tmp' AND NOT t.system AND c."default" IS NOT NULL; - CREATE VIEW sys.describe_foreign_keys AS WITH action_type (id, act) AS (VALUES (0, 'NO ACTION'), @@ -3876,7 +3870,6 @@ CREATE VIEW sys.describe_foreign_keys AS AND (fkk."action" & 255) = od.id AND ((fkk."action" >> 8) & 255) = ou.id ORDER BY fkk.name, fkkc.nr; - --TODO: CRASHES when this function gets inlined into describe_tables CREATE FUNCTION sys.get_merge_table_partition_expressions(tid INT) RETURNS STRING BEGIN @@ -3899,12 +3892,10 @@ BEGIN END FROM (VALUES (tid)) t(id) LEFT JOIN sys.table_partitions tp ON t.id = tp.table_id; END; - --TODO: gives mergejoin errors when inlined CREATE FUNCTION sys.get_remote_table_expressions(s STRING, t STRING) RETURNS STRING BEGIN RETURN SELECT ' ON ' || sys.SQ(uri) || ' WITH USER ' || sys.SQ(username) || ' ENCRYPTED PASSWORD ' || sys.SQ("hash") FROM sys.remote_table_credentials(s ||'.' || t); END; - CREATE VIEW sys.describe_tables AS SELECT t.id o, @@ -3936,7 +3927,6 @@ CREATE VIEW sys.describe_tables AS AND s.id = t.schema_id AND ts.table_type_id = t.type AND s.name <> 'tmp'; - CREATE VIEW sys.describe_triggers AS SELECT s.name sch, @@ -3945,7 +3935,6 @@ CREATE VIEW sys.describe_triggers AS tr.statement def FROM sys.schemas s, sys.tables t, sys.triggers tr WHERE s.id = t.schema_id AND t.id = tr.table_id AND NOT t.system; - CREATE VIEW sys.describe_comments AS SELECT o.id id, @@ -3954,32 +3943,20 @@ CREATE VIEW sys.describe_comments AS c.remark rem FROM ( SELECT id, 'SCHEMA', sys.DQ(name) FROM sys.schemas - UNION ALL - SELECT t.id, CASE WHEN ts.table_type_name = 'VIEW' THEN 'VIEW' ELSE 'TABLE' END, sys.FQN(s.name, t.name) FROM sys.schemas s JOIN sys.tables t ON s.id = t.schema_id JOIN sys.table_types ts ON t.type = ts.table_type_id WHERE NOT s.name <> 'tmp' - UNION ALL - SELECT c.id, 'COLUMN', sys.FQN(s.name, t.name) || '.' || sys.DQ(c.name) FROM sys.columns c, sys.tables t, sys.schemas s WHERE c.table_id = t.id AND t.schema_id = s.id - UNION ALL - SELECT idx.id, 'INDEX', sys.FQN(s.name,
MonetDB: default - Approve ppc64 upgrades.
Changeset: 9100cdc12799 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9100cdc12799 Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 Branch: default Log Message: Approve ppc64 upgrades. diffs (truncated from 24979 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 @@ -2,4208 +2,4222 @@ Running database upgrade commands: set schema "sys"; delete from sys.dependencies where id < 2000; delete from sys.types where id < 2000; -insert into sys.types values (0, 'void', 'any', 0, 0, 0, 0, 2000); -insert into sys.types values (1, 'bat', 'table', 0, 0, 0, 1, 2000); -insert into sys.types values (2, 'ptr', 'ptr', 0, 0, 0, 1, 2000); -insert into sys.types values (3, 'bit', 'boolean', 1, 0, 2, 2, 2000); -insert into sys.types values (4, 'str', 'char', 0, 0, 0, 3, 2000); -insert into sys.types values (5, 'str', 'varchar', 0, 0, 0, 4, 2000); -insert into sys.types values (6, 'str', 'clob', 0, 0, 0, 4, 2000); -insert into sys.types values (7, 'oid', 'oid', 63, 0, 2, 6, 2000); -insert into sys.types values (8, 'bte', 'tinyint', 8, 1, 2, 7, 2000); -insert into sys.types values (9, 'sht', 'smallint', 16, 1, 2, 7, 2000); -insert into sys.types values (10, 'int', 'int', 32, 1, 2, 7, 2000); -insert into sys.types values (11, 'lng', 'bigint', 64, 1, 2, 7, 2000); -insert into sys.types values (12, 'hge', 'hugeint', 128, 1, 2, 7, 2000); -insert into sys.types values (13, 'bte', 'decimal', 2, 1, 10, 10, 2000); -insert into sys.types values (14, 'sht', 'decimal', 4, 1, 10, 10, 2000); -insert into sys.types values (15, 'int', 'decimal', 9, 1, 10, 10, 2000); -insert into sys.types values (16, 'lng', 'decimal', 18, 1, 10, 10, 2000); -insert into sys.types values (17, 'hge', 'decimal', 38, 1, 10, 10, 2000); -insert into sys.types values (18, 'flt', 'real', 24, 2, 2, 11, 2000); -insert into sys.types values (19, 'dbl', 'double', 53, 2, 2, 11, 2000); -insert into sys.types values (20, 'int', 'month_interval', 3, 0, 10, 8, 2000); -insert into sys.types values (21, 'lng', 'day_interval', 4, 0, 10, 9, 2000); -insert into sys.types values (22, 'lng', 'sec_interval', 13, 1, 10, 9, 2000); -insert into sys.types values (23, 'daytime', 'time', 7, 0, 0, 12, 2000); -insert into sys.types values (24, 'daytime', 'timetz', 7, 1, 0, 13, 2000); -insert into sys.types values (25, 'date', 'date', 0, 0, 0, 14, 2000); -insert into sys.types values (26, 'timestamp', 'timestamp', 7, 0, 0, 15, 2000); -insert into sys.types values (27, 'timestamp', 'timestamptz', 7, 1, 0, 16, 2000); -insert into sys.types values (28, 'blob', 'blob', 0, 0, 0, 5, 2000); -insert into sys.types values (31, 'wkb', 'geometry', 0, 0, 0, 17, 2000); -insert into sys.types values (32, 'wkba', 'geometrya', 0, 0, 0, 18, 2000); -insert into sys.types values (33, 'mbr', 'mbr', 0, 0, 0, 18, 2000); +insert into sys.types values (1, 'void', 'any', 0, 0, 0, 0, 2000); +insert into sys.types values (2, 'bat', 'table', 0, 0, 0, 1, 2000); +insert into sys.types values (3, 'ptr', 'ptr', 0, 0, 0, 1, 2000); +insert into sys.types values (4, 'bit', 'boolean', 1, 0, 2, 2, 2000); +insert into sys.types values (5, 'str', 'clob', 0, 0, 0, 4, 2000); +insert into sys.types values (6, 'str', 'varchar', 0, 0, 0, 4, 2000); +insert into sys.types values (7, 'str', 'char', 0, 0, 0, 3, 2000); +insert into sys.types values (8, 'oid', 'oid', 63, 0, 2, 6, 2000); +insert into sys.types values (9, 'bte', 'tinyint', 8, 1, 2, 7, 2000); +insert into sys.types values (10, 'sht', 'smallint', 16, 1, 2, 7, 2000); +insert into sys.types values (11, 'int', 'int', 32, 1, 2, 7, 2000); +insert into sys.types values (12, 'lng', 'bigint', 64, 1, 2, 7, 2000); +insert into sys.types values (13, 'hge', 'hugeint', 128, 1, 2, 7, 2000); +insert into sys.types values (14, 'bte', 'decimal', 2, 1, 10, 10, 2000); +insert into sys.types values (15, 'sht', 'decimal', 4, 1, 10, 10, 2000); +insert into sys.types values (16, 'int', 'decimal', 9, 1, 10, 10, 2000); +insert into sys.types values (17, 'lng', 'decimal', 18, 1, 10, 10, 2000); +insert into sys.types values (18, 'hge', 'decimal', 38, 1, 10, 10, 2000); +insert into sys.types values (19, 'flt', 'real', 24, 2, 2, 11, 2000); +insert into sys.types values (20, 'dbl', 'double', 53, 2, 2, 11, 2000); +insert into sys.types values (21, 'int', 'month_interval', 3, 0, 10, 8, 2000); +insert into sys.types values (22, 'lng', 'day_interval', 4, 0, 10, 9, 2000); +insert into sys.types values (23, 'lng', 'sec_interval', 13, 1, 10, 9, 2000); +insert into sys.types values (24, 'daytime', 'time', 7, 0, 0,
MonetDB: default - Approve upgrade.
Changeset: 66794e0b06dc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66794e0b06dc Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit Branch: default Log Message: Approve upgrade. diffs (truncated from 31200 to 300 lines): 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 @@ -2,3613 +2,3627 @@ Running database upgrade commands: set schema "sys"; delete from sys.dependencies where id < 2000; delete from sys.types where id < 2000; -insert into sys.types values (0, 'void', 'any', 0, 0, 0, 0, 2000); -insert into sys.types values (1, 'bat', 'table', 0, 0, 0, 1, 2000); -insert into sys.types values (2, 'ptr', 'ptr', 0, 0, 0, 1, 2000); -insert into sys.types values (3, 'bit', 'boolean', 1, 0, 2, 2, 2000); -insert into sys.types values (4, 'str', 'char', 0, 0, 0, 3, 2000); -insert into sys.types values (5, 'str', 'varchar', 0, 0, 0, 4, 2000); -insert into sys.types values (6, 'str', 'clob', 0, 0, 0, 4, 2000); -insert into sys.types values (7, 'oid', 'oid', 31, 0, 2, 6, 2000); -insert into sys.types values (8, 'bte', 'tinyint', 8, 1, 2, 7, 2000); -insert into sys.types values (9, 'sht', 'smallint', 16, 1, 2, 7, 2000); -insert into sys.types values (10, 'int', 'int', 32, 1, 2, 7, 2000); -insert into sys.types values (11, 'lng', 'bigint', 64, 1, 2, 7, 2000); -insert into sys.types values (12, 'bte', 'decimal', 2, 1, 10, 10, 2000); -insert into sys.types values (13, 'sht', 'decimal', 4, 1, 10, 10, 2000); -insert into sys.types values (14, 'int', 'decimal', 9, 1, 10, 10, 2000); -insert into sys.types values (15, 'lng', 'decimal', 18, 1, 10, 10, 2000); -insert into sys.types values (16, 'flt', 'real', 24, 2, 2, 11, 2000); -insert into sys.types values (17, 'dbl', 'double', 53, 2, 2, 11, 2000); -insert into sys.types values (18, 'int', 'month_interval', 3, 0, 10, 8, 2000); -insert into sys.types values (19, 'lng', 'day_interval', 4, 0, 10, 9, 2000); -insert into sys.types values (20, 'lng', 'sec_interval', 13, 1, 10, 9, 2000); -insert into sys.types values (21, 'daytime', 'time', 7, 0, 0, 12, 2000); -insert into sys.types values (22, 'daytime', 'timetz', 7, 1, 0, 13, 2000); -insert into sys.types values (23, 'date', 'date', 0, 0, 0, 14, 2000); -insert into sys.types values (24, 'timestamp', 'timestamp', 7, 0, 0, 15, 2000); -insert into sys.types values (25, 'timestamp', 'timestamptz', 7, 1, 0, 16, 2000); -insert into sys.types values (26, 'blob', 'blob', 0, 0, 0, 5, 2000); -insert into sys.types values (29, 'wkb', 'geometry', 0, 0, 0, 17, 2000); -insert into sys.types values (30, 'wkba', 'geometrya', 0, 0, 0, 18, 2000); -insert into sys.types values (31, 'mbr', 'mbr', 0, 0, 0, 18, 2000); +insert into sys.types values (1, 'void', 'any', 0, 0, 0, 0, 2000); +insert into sys.types values (2, 'bat', 'table', 0, 0, 0, 1, 2000); +insert into sys.types values (3, 'ptr', 'ptr', 0, 0, 0, 1, 2000); +insert into sys.types values (4, 'bit', 'boolean', 1, 0, 2, 2, 2000); +insert into sys.types values (5, 'str', 'clob', 0, 0, 0, 4, 2000); +insert into sys.types values (6, 'str', 'varchar', 0, 0, 0, 4, 2000); +insert into sys.types values (7, 'str', 'char', 0, 0, 0, 3, 2000); +insert into sys.types values (8, 'oid', 'oid', 31, 0, 2, 6, 2000); +insert into sys.types values (9, 'bte', 'tinyint', 8, 1, 2, 7, 2000); +insert into sys.types values (10, 'sht', 'smallint', 16, 1, 2, 7, 2000); +insert into sys.types values (11, 'int', 'int', 32, 1, 2, 7, 2000); +insert into sys.types values (12, 'lng', 'bigint', 64, 1, 2, 7, 2000); +insert into sys.types values (13, 'bte', 'decimal', 2, 1, 10, 10, 2000); +insert into sys.types values (14, 'sht', 'decimal', 4, 1, 10, 10, 2000); +insert into sys.types values (15, 'int', 'decimal', 9, 1, 10, 10, 2000); +insert into sys.types values (16, 'lng', 'decimal', 18, 1, 10, 10, 2000); +insert into sys.types values (17, 'flt', 'real', 24, 2, 2, 11, 2000); +insert into sys.types values (18, 'dbl', 'double', 53, 2, 2, 11, 2000); +insert into sys.types values (19, 'int', 'month_interval', 3, 0, 10, 8, 2000); +insert into sys.types values (20, 'lng', 'day_interval', 4, 0, 10, 9, 2000); +insert into sys.types values (21, 'lng', 'sec_interval', 13, 1, 10, 9, 2000); +insert into sys.types values (22, 'daytime', 'time', 7, 0, 0, 12, 2000); +insert into sys.types values (23, 'daytime', 'timetz', 7, 1, 0, 13, 2000); +insert into sys.types values (24, 'date', 'date', 0, 0, 0, 14, 2000); +insert into sys.types values (25, 'timestamp', 'timestamp', 7, 0, 0, 15, 2000); +insert into
MonetDB: default - Approve tests.
Changeset: 47e839da1c6e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47e839da1c6e Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out Branch: default Log Message: Approve tests. diffs (truncated from 45245 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -64,5875 +64,5875 @@ stdout of test 'MAL-signatures` in direc % .%1, .%1,.%1,.%1,.%1 # table_name % module, function, signature, address,comment # name % clob,clob, clob, clob, clob # type -% 12, 28, 313,42, 0 # length -[ "aggr", "all", "command aggr.all(X_1:bat[:any_1]):any_1 ", "SQLall;", "" ] -[ "aggr", "allnotequal", "pattern aggr.allnotequal(X_1:bat[:any_1], X_2:bat[:any_1]):bit ", "SQLallnotequal;", "" ] -[ "aggr", "anyequal", "pattern aggr.anyequal(X_1:any_1, X_2:any_1):bit ", "CMDvarEQ;","" ] -[ "aggr", "anyequal", "pattern aggr.anyequal(X_1:bat[:any_1], X_2:bat[:any_1]):bit ", "SQLanyequal;", "" ] -[ "aggr", "avg", "command aggr.avg(X_1:bat[:bte], X_2:bat[:oid], X_3:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_1:bat[:dbl], X_2:bat[:oid], X_3:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_1:bat[:flt], X_2:bat[:oid], X_3:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_1:bat[:int], X_2:bat[:oid], X_3:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_1:bat[:lng], X_2:bat[:oid], X_3:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_1:bat[:sht], X_2:bat[:oid], X_3:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_1:bat[:bte], X_2:bat[:oid], X_3:bat[:any_1], X_4:int):bat[:dbl] ", "AGGRavg14_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_1:bat[:dbl], X_2:bat[:oid], X_3:bat[:any_1], X_4:int):bat[:dbl] ", "AGGRavg14_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_1:bat[:flt], X_2:bat[:oid], X_3:bat[:any_1], X_4:int):bat[:dbl] ", "AGGRavg14_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_1:bat[:int], X_2:bat[:oid], X_3:bat[:any_1], X_4:int):bat[:dbl] ", "AGGRavg14_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_1:bat[:lng], X_2:bat[:oid], X_3:bat[:any_1], X_4:int):bat[:dbl] ", "AGGRavg14_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_1:bat[:sht], X_2:bat[:oid], X_3:bat[:any_1], X_4:int):bat[:dbl] ", "AGGRavg14_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:any_1]) (X_0:bat[:dbl], X_1:bat[:lng]) ", "AGGRavg23_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:any_1]) (X_0:bat[:dbl], X_1:bat[:lng]) ", "AGGRavg23_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:any_1]) (X_0:bat[:dbl], X_1:bat[:lng]) ", "AGGRavg23_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_2:bat[:int], X_3:bat[:oid], X_4:bat[:any_1]) (X_0:bat[:dbl], X_1:bat[:lng]) ", "AGGRavg23_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_2:bat[:lng], X_3:bat[:oid], X_4:bat[:any_1]) (X_0:bat[:dbl], X_1:bat[:lng]) ", "AGGRavg23_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_2:bat[:sht], X_3:bat[:oid], X_4:bat[:any_1]) (X_0:bat[:dbl], X_1:bat[:lng]) ", "AGGRavg23_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:any_1], X_5:int) (X_0:bat[:dbl], X_1:bat[:lng]) ", "AGGRavg24_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:any_1], X_5:int) (X_0:bat[:dbl], X_1:bat[:lng]) ", "AGGRavg24_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:any_1], X_5:int) (X_0:bat[:dbl], X_1:bat[:lng]) ", "AGGRavg24_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_2:bat[:int], X_3:bat[:oid], X_4:bat[:any_1], X_5:int) (X_0:bat[:dbl], X_1:bat[:lng]) ", "AGGRavg24_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_2:bat[:lng], X_3:bat[:oid], X_4:bat[:any_1], X_5:int) (X_0:bat[:dbl], X_1:bat[:lng]) ", "AGGRavg24_dbl;", "" ] -[ "aggr", "avg", "command aggr.avg(X_2:bat[:sht], X_3:bat[:oid], X_4:bat[:any_1], X_5:int) (X_0:bat[:dbl],
MonetDB: default - Approve new output.
Changeset: ae83886b10d4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ae83886b10d4 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 Branch: default Log Message: Approve new output. diffs (44 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -8010,7 +8010,6 @@ stdout of test 'MAL-signatures` in direc [ "calc", "iszero", "pattern calc.iszero(X_1:int):bit ", "CMDvarISZERO;","" ] [ "calc", "iszero", "pattern calc.iszero(X_1:lng):bit ", "CMDvarISZERO;","" ] [ "calc", "iszero", "pattern calc.iszero(X_1:sht):bit ", "CMDvarISZERO;","" ] -[ "calc", "json", "command calc.json(X_1:json):json ", "JSONstr2json;","" ] [ "calc", "json", "command calc.json(X_1:str):json ", "JSONstr2json;","" ] [ "calc", "length", "command calc.length(X_1:str):int ", "CMDstrlength;","" ] [ "calc", "lng", "pattern calc.lng(X_1:bit):lng ", "CMDvarCONVERT;", "" ] @@ -8814,10 +8813,7 @@ stdout of test 'MAL-signatures` in direc [ "json", "fold", "pattern json.fold(X_1:bat[:str], X_2:bat[:any]):json ","JSONfold;","" ] [ "json", "integer", "command json.integer(X_1:json):lng ", "JSONjson2integer;","" ] [ "json", "isarray", "command json.isarray(X_1:json):bit ", "JSONisarray;", "" ] -[ "json", "isarray", "command json.isarray(X_1:str):bit ", "JSONisarray;", "" ] [ "json", "isobject", "command json.isobject(X_1:json):bit ", "JSONisobject;","" ] -[ "json", "isobject", "command json.isobject(X_1:str):bit ", "JSONisobject;","" ] -[ "json", "isvalid", "command json.isvalid(X_1:json):bit ", "JSONisvalid;", "" ] [ "json", "isvalid", "command json.isvalid(X_1:str):bit ", "JSONisvalid;", "" ] [ "json", "keyarray", "command json.keyarray(X_1:json):json ", "JSONkeyArray;","" ] [ "json", "keys", "command json.keys(X_1:json):bat[:str] ", "JSONkeyTable;","" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -11149,7 +11149,6 @@ stdout of test 'MAL-signatures` in direc [ "calc", "iszero", "pattern calc.iszero(X_1:int):bit ", "CMDvarISZERO;","" ] [ "calc", "iszero", "pattern calc.iszero(X_1:lng):bit ", "CMDvarISZERO;","" ] [ "calc", "iszero", "pattern calc.iszero(X_1:sht):bit ", "CMDvarISZERO;","" ] -[ "calc", "json", "command calc.json(X_1:json):json ", "JSONstr2json;","" ] [ "calc", "json", "command calc.json(X_1:str):json ", "JSONstr2json;","" ] [ "calc", "length", "command calc.length(X_1:str):int ", "CMDstrlength;","" ] [ "calc", "lng", "pattern calc.lng(X_1:bit):lng ", "CMDvarCONVERT;", "" ] @@ -12112,10 +12111,7 @@ stdout of test 'MAL-signatures` in direc [ "json", "fold", "pattern json.fold(X_1:bat[:str], X_2:bat[:any]):json ","JSONfold;","" ] [ "json", "integer", "command json.integer(X_1:json):lng ", "JSONjson2integer;","" ] [ "json", "isarray", "command json.isarray(X_1:json):bit ", "JSONisarray;", "" ] -[ "json", "isarray", "command json.isarray(X_1:str):bit ", "JSONisarray;", "" ] [ "json", "isobject", "command json.isobject(X_1:json):bit ", "JSONisobject;","" ] -[ "json", "isobject", "command json.isobject(X_1:str):bit ", "JSONisobject;","" ] -[ "json", "isvalid", "command json.isvalid(X_1:json):bit ", "JSONisvalid;", "" ] [ "json", "isvalid", "command json.isvalid(X_1:str):bit ", "JSONisvalid;", "" ] [ "json", "keyarray", "command json.keyarray(X_1:json):json ", "JSONkeyArray;","" ] [ "json", "keys", "command json.keys(X_1:json):bat[:str] ", "JSONkeyTable;","" ] ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve
Changeset: 12751a4640cf for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=12751a4640cf Modified Files: monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows sql/test/mapi/Tests/sql_int128.test Branch: default Log Message: Approve diffs (190 lines): diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out --- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out +++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out @@ -24,8 +24,8 @@ function user.main():void; X_88:ptr := sql.append_exec(X_85:ptr, X_28:bat[:int]); X_91:ptr := sql.append_exec(X_90:ptr, X_29:bat[:int]); X_94:ptr := sql.append_exec(X_93:ptr, X_30:bat[:int]); +X_40:int := sql.append_finish(X_86:int, X_88:ptr, X_91:ptr, X_94:ptr); X_42:lng := aggr.count(X_30:bat[:int]); -X_40:int := sql.append_finish(X_86:int, X_88:ptr, X_91:ptr, X_94:ptr); sql.affectedRows(X_40:int, X_42:lng); end user.main; #inline actions= 0 time=1 usec @@ -87,8 +87,8 @@ function user.main():void; X_89:ptr := sql.append_exec(X_86:ptr, X_28:bat[:int]); X_92:ptr := sql.append_exec(X_91:ptr, X_29:bat[:int]); X_95:ptr := sql.append_exec(X_94:ptr, X_30:bat[:int]); +X_40:int := sql.append_finish(X_87:int, X_89:ptr, X_92:ptr, X_95:ptr); X_42:lng := aggr.count(X_30:bat[:int]); -X_40:int := sql.append_finish(X_87:int, X_89:ptr, X_92:ptr, X_95:ptr); sql.affectedRows(X_40:int, X_42:lng); end user.main; #inline actions= 0 time=0 usec diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows --- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows +++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows @@ -25,8 +25,8 @@ function user.main():void; X_88:ptr := sql.append_exec(X_85:ptr, X_28:bat[:int]); X_91:ptr := sql.append_exec(X_90:ptr, X_29:bat[:int]); X_94:ptr := sql.append_exec(X_93:ptr, X_30:bat[:int]); +X_40:int := sql.append_finish(X_86:int, X_88:ptr, X_91:ptr, X_94:ptr); X_42:lng := aggr.count(X_30:bat[:int]); -X_40:int := sql.append_finish(X_86:int, X_88:ptr, X_91:ptr, X_94:ptr); sql.affectedRows(X_40:int, X_42:lng); end user.main; #inline actions= 0 time=0 usec @@ -68,8 +68,8 @@ function user.main():void; X_88:ptr := sql.append_exec(X_85:ptr, X_28:bat[:int]); X_91:ptr := sql.append_exec(X_90:ptr, X_29:bat[:int]); X_94:ptr := sql.append_exec(X_93:ptr, X_30:bat[:int]); +X_40:int := sql.append_finish(X_86:int, X_88:ptr, X_91:ptr, X_94:ptr); X_42:lng := aggr.count(X_30:bat[:int]); -X_40:int := sql.append_finish(X_86:int, X_88:ptr, X_91:ptr, X_94:ptr); sql.affectedRows(X_40:int, X_42:lng); end user.main; #inline actions= 0 time=1 usec @@ -128,8 +128,8 @@ function user.main():void; X_89:ptr := sql.append_exec(X_86:ptr, X_28:bat[:int]); X_92:ptr := sql.append_exec(X_91:ptr, X_29:bat[:int]); X_95:ptr := sql.append_exec(X_94:ptr, X_30:bat[:int]); +X_40:int := sql.append_finish(X_87:int, X_89:ptr, X_92:ptr, X_95:ptr); X_42:lng := aggr.count(X_30:bat[:int]); -X_40:int := sql.append_finish(X_87:int, X_89:ptr, X_92:ptr, X_95:ptr); sql.affectedRows(X_40:int, X_42:lng); end user.main; #inline actions= 0 time=0 usec @@ -172,8 +172,8 @@ function user.main():void; X_89:ptr := sql.append_exec(X_86:ptr, X_28:bat[:int]); X_92:ptr := sql.append_exec(X_91:ptr, X_29:bat[:int]); X_95:ptr := sql.append_exec(X_94:ptr, X_30:bat[:int]); +X_40:int := sql.append_finish(X_87:int, X_89:ptr, X_92:ptr, X_95:ptr); X_42:lng := aggr.count(X_30:bat[:int]); -X_40:int := sql.append_finish(X_87:int, X_89:ptr, X_92:ptr, X_95:ptr); sql.affectedRows(X_40:int, X_42:lng); end user.main; #inline actions= 0 time=0 usec diff --git a/sql/test/mapi/Tests/sql_int128.test b/sql/test/mapi/Tests/sql_int128.test --- a/sql/test/mapi/Tests/sql_int128.test +++ b/sql/test/mapi/Tests/sql_int128.test @@ -16,18 +16,18 @@ querylog.define 1 sql.mvc 1 -sql.update_prep -1 sql.tid 1 algebra.project 1 +sql.update_prep +1 sql.update_exec 1 +sql.append_finish +1 aggr.count 1 -sql.append_finish -1 sql.affectedRows 1 @@ -40,18 +40,18 @@ querylog.define 1 sql.mvc 1 -sql.update_prep -1 sql.tid 1 algebra.project 1 +sql.update_prep +1 sql.update_exec 1 +sql.append_finish +1 aggr.count 1 -sql.append_finish -1 sql.affectedRows 1 @@ -64,20 +64,20 @@ querylog.define 1 sql.mvc 1 -sql.update_prep -1 sql.tid 1 sql.bind 2 algebra.projection 2 +sql.update_prep +1
MonetDB: default - Approve upgrade.
Changeset: e07f21762cde for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e07f21762cde Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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/sql_dump/Tests/dump.test 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: Approve upgrade. diffs (221 lines): 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 @@ -4206,6 +4206,7 @@ Running database upgrade commands: set schema "sys"; ALTER TABLE sys.keywords SET READ WRITE; DELETE FROM sys.keywords where keyword = 'STREAM'; +INSERT INTO sys.keywords VALUES ('BIG'), ('LITTLE'), ('NATIVE'), ('ENDIAN'); ALTER TABLE sys.table_types SET READ WRITE; DELETE FROM sys.table_types where table_type_id = 4; ALTER TABLE sys.function_types SET READ WRITE; diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 @@ -4206,6 +4206,7 @@ Running database upgrade commands: set schema "sys"; ALTER TABLE sys.keywords SET READ WRITE; DELETE FROM sys.keywords where keyword = 'STREAM'; +INSERT INTO sys.keywords VALUES ('BIG'), ('LITTLE'), ('NATIVE'), ('ENDIAN'); ALTER TABLE sys.table_types SET READ WRITE; DELETE FROM sys.table_types where table_type_id = 4; ALTER TABLE sys.function_types SET READ WRITE; 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 @@ -3611,6 +3611,7 @@ Running database upgrade commands: set schema "sys"; ALTER TABLE sys.keywords SET READ WRITE; DELETE FROM sys.keywords where keyword = 'STREAM'; +INSERT INTO sys.keywords VALUES ('BIG'), ('LITTLE'), ('NATIVE'), ('ENDIAN'); ALTER TABLE sys.table_types SET READ WRITE; DELETE FROM sys.table_types where table_type_id = 4; ALTER TABLE sys.function_types SET READ WRITE; 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 @@ -3611,6 +3611,7 @@ Running database upgrade commands: set schema "sys"; ALTER TABLE sys.keywords SET READ WRITE; DELETE FROM sys.keywords where keyword = 'STREAM'; +INSERT INTO sys.keywords VALUES ('BIG'), ('LITTLE'), ('NATIVE'), ('ENDIAN'); ALTER TABLE sys.table_types SET READ WRITE; DELETE FROM sys.table_types where table_type_id = 4; ALTER TABLE sys.function_types SET READ WRITE; 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 @@ -4280,6 +4280,7 @@ Running database upgrade commands: set schema "sys"; ALTER TABLE sys.keywords SET READ WRITE; DELETE FROM sys.keywords where keyword = 'STREAM'; +INSERT INTO sys.keywords VALUES ('BIG'), ('LITTLE'), ('NATIVE'), ('ENDIAN'); ALTER TABLE sys.table_types SET READ WRITE; DELETE FROM sys.table_types where table_type_id = 4; ALTER TABLE sys.function_types SET READ WRITE; diff --git
MonetDB: default - Approve recent changes.
Changeset: a6ac132bb75b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6ac132bb75b Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.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: Approve recent changes. diffs (291 lines): 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 @@ -5019,6 +5019,8 @@ BEGIN CALL dump_table_data(); END IF; +INSERT INTO dump_statements VALUES (current_size_dump_statements() + 1, 'COMMIT;'); + RETURN dump_statements; END; UPDATE sys.functions f SET system = true WHERE diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 @@ -5019,6 +5019,8 @@ BEGIN CALL dump_table_data(); END IF; +INSERT INTO dump_statements VALUES (current_size_dump_statements() + 1, 'COMMIT;'); + RETURN dump_statements; END; UPDATE sys.functions f SET system = true WHERE 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 @@ -4424,6 +4424,8 @@ BEGIN CALL dump_table_data(); END IF; +INSERT INTO dump_statements VALUES (current_size_dump_statements() + 1, 'COMMIT;'); + RETURN dump_statements; END; UPDATE sys.functions f SET system = true WHERE 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 @@ -4424,6 +4424,8 @@ BEGIN CALL dump_table_data(); END IF; +INSERT INTO dump_statements VALUES (current_size_dump_statements() + 1, 'COMMIT;'); + RETURN dump_statements; END; UPDATE sys.functions f SET system = true WHERE 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 @@ -5093,6 +5093,8 @@ BEGIN CALL dump_table_data(); END IF; +INSERT INTO dump_statements VALUES (current_size_dump_statements() + 1, 'COMMIT;'); + RETURN dump_statements; END; UPDATE sys.functions f SET system = true WHERE diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 @@ -4424,6 +4424,8 @@ BEGIN CALL dump_table_data(); END IF; +INSERT INTO dump_statements VALUES (current_size_dump_statements() + 1, 'COMMIT;'); + RETURN dump_statements; END; UPDATE sys.functions f SET system = true WHERE diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
MonetDB: default - Approve dump output.
Changeset: 83184459660e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83184459660e Modified Files: sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out sql/test/testdb-upgrade-chain/Tests/dump.stable.out sql/test/testdb-upgrade-hge/Tests/dump.stable.out sql/test/testdb-upgrade/Tests/dump.stable.out sql/test/testdb/Tests/dump-nogeom.stable.out Branch: default Log Message: Approve dump output. diffs (50 lines): diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out --- a/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out +++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out @@ -1,5 +1,5 @@ START TRANSACTION; -CREATE USER "testuser" WITH ENCRYPTED PASSWORD 'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00' NAME 'Test User' SCHEMA "sys"; +CREATE USER "testuser" WITH ENCRYPTED PASSWORD 'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00' NAME 'Test User' SCHEMA "sys" SCHEMA PATH '"sys"'; CREATE SCHEMA "testschema" AUTHORIZATION "testuser"; ALTER USER "testuser" SET SCHEMA "testschema"; CREATE SEQUENCE "testschema"."selfref_seq" AS INTEGER; diff --git a/sql/test/testdb-upgrade-chain/Tests/dump.stable.out b/sql/test/testdb-upgrade-chain/Tests/dump.stable.out --- a/sql/test/testdb-upgrade-chain/Tests/dump.stable.out +++ b/sql/test/testdb-upgrade-chain/Tests/dump.stable.out @@ -1,5 +1,5 @@ START TRANSACTION; -CREATE USER "testuser" WITH ENCRYPTED PASSWORD 'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00' NAME 'Test User' SCHEMA "sys"; +CREATE USER "testuser" WITH ENCRYPTED PASSWORD 'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00' NAME 'Test User' SCHEMA "sys" SCHEMA PATH '"sys"'; CREATE SCHEMA "testschema" AUTHORIZATION "testuser"; ALTER USER "testuser" SET SCHEMA "testschema"; CREATE SEQUENCE "testschema"."selfref_seq" AS INTEGER; diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out --- a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out +++ b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out @@ -1,5 +1,5 @@ START TRANSACTION; -CREATE USER "testuser" WITH ENCRYPTED PASSWORD 'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00' NAME 'Test User' SCHEMA "sys"; +CREATE USER "testuser" WITH ENCRYPTED PASSWORD 'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00' NAME 'Test User' SCHEMA "sys" SCHEMA PATH '"sys"'; CREATE SCHEMA "testschema" AUTHORIZATION "testuser"; COMMENT ON SCHEMA "testschema" IS 'a schema used for testing'; ALTER USER "testuser" SET SCHEMA "testschema"; diff --git a/sql/test/testdb-upgrade/Tests/dump.stable.out b/sql/test/testdb-upgrade/Tests/dump.stable.out --- a/sql/test/testdb-upgrade/Tests/dump.stable.out +++ b/sql/test/testdb-upgrade/Tests/dump.stable.out @@ -1,5 +1,5 @@ START TRANSACTION; -CREATE USER "testuser" WITH ENCRYPTED PASSWORD 'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00' NAME 'Test User' SCHEMA "sys"; +CREATE USER "testuser" WITH ENCRYPTED PASSWORD 'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00' NAME 'Test User' SCHEMA "sys" SCHEMA PATH '"sys"'; CREATE SCHEMA "testschema" AUTHORIZATION "testuser"; COMMENT ON SCHEMA "testschema" IS 'a schema used for testing'; ALTER USER "testuser" SET SCHEMA "testschema"; diff --git a/sql/test/testdb/Tests/dump-nogeom.stable.out b/sql/test/testdb/Tests/dump-nogeom.stable.out --- a/sql/test/testdb/Tests/dump-nogeom.stable.out +++ b/sql/test/testdb/Tests/dump-nogeom.stable.out @@ -1,5 +1,5 @@ START TRANSACTION; -CREATE USER "testuser" WITH ENCRYPTED PASSWORD 'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00' NAME 'Test User' SCHEMA "sys"; +CREATE USER "testuser" WITH ENCRYPTED PASSWORD 'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00' NAME 'Test User' SCHEMA "sys" SCHEMA PATH '"sys"'; CREATE SCHEMA "testschema" AUTHORIZATION "testuser"; COMMENT ON SCHEMA "testschema" IS 'a schema used for testing'; ALTER USER "testuser" SET SCHEMA "testschema"; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve upgrade.
Changeset: 7b4c6037b13f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b4c6037b13f Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.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: Approve upgrade. diffs (truncated from 656 to 300 lines): 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 @@ -4385,6 +4385,22 @@ BEGIN WHERE f.name=functionName AND s.name = schemaName; END; update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and ((name = 'describe_type' and type = 1) or (name in ('describe_table', 'describe_columns', 'describe_function') and type = 5)); +DROP VIEW sys.dependency_schemas_on_users; +DROP VIEW sys.users; +ALTER TABLE sys.db_user_info ADD COLUMN schema_path CLOB; +UPDATE sys.db_user_info SET schema_path = '"sys"'; +CREATE VIEW sys.users AS +SELECT u."name" AS "name", ui."fullname", ui."default_schema", ui."schema_path" + FROM db_users() AS u + LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name"; +GRANT SELECT ON sys.users TO PUBLIC; +CREATE VIEW sys.dependency_schemas_on_users AS + SELECT s.id AS schema_id, s.name AS schema_name, u.name AS user_name, CAST(6 AS smallint) AS depend_type + FROM sys.users AS u, sys.schemas AS s + WHERE u.default_schema = s.id + ORDER BY s.name, u.name; +GRANT SELECT ON sys.dependency_schemas_on_users TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('users','dependency_schemas_on_users') and schema_id = (select id from sys.schemas where name = 'sys') and type = 1; commit; set schema "sys"; diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 @@ -4385,6 +4385,22 @@ BEGIN WHERE f.name=functionName AND s.name = schemaName; END; update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and ((name = 'describe_type' and type = 1) or (name in ('describe_table', 'describe_columns', 'describe_function') and type = 5)); +DROP VIEW sys.dependency_schemas_on_users; +DROP VIEW sys.users; +ALTER TABLE sys.db_user_info ADD COLUMN schema_path CLOB; +UPDATE sys.db_user_info SET schema_path = '"sys"'; +CREATE VIEW sys.users AS +SELECT u."name" AS "name", ui."fullname", ui."default_schema", ui."schema_path" + FROM db_users() AS u + LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name"; +GRANT SELECT ON sys.users TO PUBLIC; +CREATE VIEW sys.dependency_schemas_on_users AS + SELECT s.id AS schema_id, s.name AS schema_name, u.name AS user_name, CAST(6 AS smallint) AS depend_type + FROM sys.users AS u, sys.schemas AS s + WHERE u.default_schema = s.id + ORDER BY s.name, u.name; +GRANT SELECT ON sys.dependency_schemas_on_users TO PUBLIC; +update sys._tables set system = true where system <> true and name in ('users','dependency_schemas_on_users') and schema_id = (select id from sys.schemas where name = 'sys') and type = 1; 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
MonetDB: default - Approve interface changes.
Changeset: 2b419b9b064b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2b419b9b064b Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: Approve interface changes. diffs (21 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 @@ -204,7 +204,7 @@ void BATtseqbase(BAT *b, oid o); void BATundo(BAT *b); BAT *BATunique(BAT *b, BAT *s); BBPrec *BBP[N_BBPINIT]; -gdk_return BBPaddfarm(const char *dirname, int rolemask, bool logerror); +gdk_return BBPaddfarm(const char *dirname, uint32_t rolemask, bool logerror); void BBPclear(bat bid); BAT *BBPdescriptor(bat b); int BBPfix(bat b); @@ -283,7 +283,7 @@ gdk_return GDKgetsem(int sem_id, int cou gdk_return GDKgetsemval(int sem_id, int number, int *semval); gdk_return GDKinit(struct opt *set, int setlen, bool embedded); void *GDKinitmmap(size_t id, size_t size, size_t *return_size); -bool GDKinmemory(void); +bool GDKinmemory(int farmid); ATOMIC_TYPE GDKlockcnt; ATOMIC_TYPE GDKlockcontentioncnt; MT_Lock *volatile GDKlocklist; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve.
Changeset: dfde8f5c5eb6 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dfde8f5c5eb6 Modified Files: sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 Branch: default Log Message: Approve. diffs (212 lines): diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out b/sql/test/sys-schema/Tests/systemfunctions.stable.out --- a/sql/test/sys-schema/Tests/systemfunctions.stable.out +++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out @@ -28,7 +28,7 @@ stdout of test 'systemfunctions` in dire % sys.,sys., sys., sys., . # table_name % schema, function, argno, argtype,definition # name % varchar, varchar,int,varchar,varchar # type -% 8, 24, 2, 14, 681 # length +% 8, 24, 2, 14, 679 # length [ "json", "filter", 0, "json", "create function json.filter(js json, pathexpr string)\nreturns json external name json.filter;"] [ "json", "filter", 1, "json", "" ] [ "json", "filter", 2, "clob", "" ] @@ -419,7 +419,7 @@ stdout of test 'systemfunctions` in dire [ "sys", "code", 1, "int", "" ] [ "sys", "code", 0, "clob", "unicode" ] [ "sys", "code", 1, "int", "" ] -[ "sys", "columnsize", 0, "bigint", "create function sys.columnsize(tpe varchar(1024), count bigint)\nreturns bigint\nbegin\n if tpe in ('tinyint', 'boolean')\nthen return count;\nend if;\nif tpe = 'smallint'\nthen return 2 * count;\nend if;\nif tpe in ('int', 'real', 'date', 'time', 'timetz', 'sec_interval', 'month_interval')\nthen return 4 * count;\nend if;\nif tpe in ('bigint', 'double', 'timestamp', 'timestamptz', 'inet', 'oid')\nthen return 8 * count;\nend if;\nif tpe in ('hugeint', 'decimal', 'uuid', 'mbr')\nthen return 16 * count;\nend if;\n if tpe in ('varchar', 'char', 'clob', 'json', 'url')\nthen return 4 * count;\nend if;\nif tpe in ('blob', 'geometry', 'geometrya')\nthen return 8 * count;\nend if;\nreturn 8 * count;\nend;"] +[ "sys", "columnsize", 0, "bigint", "create function sys.columnsize(tpe varchar(1024), count bigint)\nreturns bigint\nbegin\nif tpe in ('tinyint', 'boolean')\nthen return count;\nend if;\nif tpe = 'smallint'\nthen return 2 * count;\nend if;\nif tpe in ('int', 'real', 'date', 'time', 'timetz', 'sec_interval', 'month_interval')\nthen return 4 * count;\nend if;\nif tpe in ('bigint', 'double', 'timestamp', 'timestamptz', 'inet', 'oid')\nthen return 8 * count;\nend if;\nif tpe in ('hugeint', 'decimal', 'uuid', 'mbr')\nthen return 16 * count;\nend if;\nif tpe in ('varchar', 'char', 'clob', 'json', 'url')\nthen return 4 * count;\nend if;\nif tpe in ('blob', 'geometry', 'geometrya')\nthen return 8 * count;\nend if;\nreturn 8 * count;\nend;" ] [ "sys", "columnsize", 1, "varchar", "" ] [ "sys", "columnsize", 2, "bigint", "" ] [ "sys", "concat", 0, "char", "+" ] @@ -871,10 +871,10 @@ stdout of test 'systemfunctions` in dire [ "sys", "has_z",1, "int", "" ] [ "sys", "hash", 0, "bigint", "hash" ] [ "sys", "hash", 1, "any", "" ] -[ "sys", "hashsize", 0, "bigint", "create function sys.hashsize(b boolean, count bigint)\nreturns bigint\nbegin\n if b = true\nthen return 8 * count;\nend if;\nreturn 0;\nend;" ] +[ "sys", "hashsize", 0, "bigint", "create function sys.hashsize(b boolean, count bigint)\nreturns bigint\nbegin\nif b = true\nthen return 8 * count;\nend if;\nreturn 0;\nend;" ] [ "sys", "hashsize", 1, "boolean", "" ] [ "sys", "hashsize", 2, "bigint", "" ] -[ "sys", "heapsize", 0, "bigint", "create function sys.heapsize(tpe varchar(1024), count bigint, distincts bigint, avgwidth int)\nreturns bigint\nbegin\n if tpe in ('varchar', 'char', 'clob', 'json', 'url')\nthen return 8192 + ((avgwidth + 8) * distincts);\nend if;\nif tpe in ('blob', 'geometry', 'geometrya')\nthen return 32 + (avgwidth * count);\nend if;\nreturn 0;\nend;" ] +[ "sys", "heapsize", 0, "bigint", "create function sys.heapsize(tpe varchar(1024), count bigint, distincts bigint, avgwidth int)\nreturns bigint\nbegin\nif tpe in ('varchar', 'char', 'clob', 'json', 'url')\nthen return 8192 + ((avgwidth + 8) * distincts);\nend if;\nif tpe in ('blob', 'geometry', 'geometrya')\nthen return 32 + (avgwidth * count);\nend if;\nreturn 0;\nend;"] [ "sys", "heapsize", 1, "varchar", "" ] [ "sys", "heapsize", 2, "bigint", "" ] [ "sys", "heapsize", 3, "bigint", "" ] @@ -907,7 +907,7 @@ stdout of test 'systemfunctions` in dire [ "sys",
MonetDB: default - Approve.
Changeset: 14656d5a512b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=14656d5a512b Modified Files: sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 Branch: default Log Message: Approve. diffs (212 lines): diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out b/sql/test/sys-schema/Tests/systemfunctions.stable.out --- a/sql/test/sys-schema/Tests/systemfunctions.stable.out +++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out @@ -28,7 +28,7 @@ stdout of test 'systemfunctions` in dire % sys.,sys., sys., sys., . # table_name % schema, function, argno, argtype,definition # name % varchar, varchar,int,varchar,varchar # type -% 8, 24, 2, 14, 681 # length +% 8, 24, 2, 14, 679 # length [ "json", "filter", 0, "json", "create function json.filter(js json, pathexpr string)\nreturns json external name json.filter;"] [ "json", "filter", 1, "json", "" ] [ "json", "filter", 2, "clob", "" ] @@ -419,7 +419,7 @@ stdout of test 'systemfunctions` in dire [ "sys", "code", 1, "int", "" ] [ "sys", "code", 0, "clob", "unicode" ] [ "sys", "code", 1, "int", "" ] -[ "sys", "columnsize", 0, "bigint", "create function sys.columnsize(tpe varchar(1024), count bigint)\nreturns bigint\nbegin\n if tpe in ('tinyint', 'boolean')\nthen return count;\nend if;\nif tpe = 'smallint'\nthen return 2 * count;\nend if;\nif tpe in ('int', 'real', 'date', 'time', 'timetz', 'sec_interval', 'month_interval')\nthen return 4 * count;\nend if;\nif tpe in ('bigint', 'double', 'timestamp', 'timestamptz', 'inet', 'oid')\nthen return 8 * count;\nend if;\nif tpe in ('hugeint', 'decimal', 'uuid', 'mbr')\nthen return 16 * count;\nend if;\n if tpe in ('varchar', 'char', 'clob', 'json', 'url')\nthen return 4 * count;\nend if;\nif tpe in ('blob', 'geometry', 'geometrya')\nthen return 8 * count;\nend if;\nreturn 8 * count;\nend;"] +[ "sys", "columnsize", 0, "bigint", "create function sys.columnsize(tpe varchar(1024), count bigint)\nreturns bigint\nbegin\nif tpe in ('tinyint', 'boolean')\nthen return count;\nend if;\nif tpe = 'smallint'\nthen return 2 * count;\nend if;\nif tpe in ('int', 'real', 'date', 'time', 'timetz', 'sec_interval', 'month_interval')\nthen return 4 * count;\nend if;\nif tpe in ('bigint', 'double', 'timestamp', 'timestamptz', 'inet', 'oid')\nthen return 8 * count;\nend if;\nif tpe in ('hugeint', 'decimal', 'uuid', 'mbr')\nthen return 16 * count;\nend if;\nif tpe in ('varchar', 'char', 'clob', 'json', 'url')\nthen return 4 * count;\nend if;\nif tpe in ('blob', 'geometry', 'geometrya')\nthen return 8 * count;\nend if;\nreturn 8 * count;\nend;" ] [ "sys", "columnsize", 1, "varchar", "" ] [ "sys", "columnsize", 2, "bigint", "" ] [ "sys", "concat", 0, "char", "+" ] @@ -870,10 +870,10 @@ stdout of test 'systemfunctions` in dire [ "sys", "has_z",1, "int", "" ] [ "sys", "hash", 0, "bigint", "hash" ] [ "sys", "hash", 1, "any", "" ] -[ "sys", "hashsize", 0, "bigint", "create function sys.hashsize(b boolean, count bigint)\nreturns bigint\nbegin\n if b = true\nthen return 8 * count;\nend if;\nreturn 0;\nend;" ] +[ "sys", "hashsize", 0, "bigint", "create function sys.hashsize(b boolean, count bigint)\nreturns bigint\nbegin\nif b = true\nthen return 8 * count;\nend if;\nreturn 0;\nend;" ] [ "sys", "hashsize", 1, "boolean", "" ] [ "sys", "hashsize", 2, "bigint", "" ] -[ "sys", "heapsize", 0, "bigint", "create function sys.heapsize(tpe varchar(1024), count bigint, distincts bigint, avgwidth int)\nreturns bigint\nbegin\n if tpe in ('varchar', 'char', 'clob', 'json', 'url')\nthen return 8192 + ((avgwidth + 8) * distincts);\nend if;\nif tpe in ('blob', 'geometry', 'geometrya')\nthen return 32 + (avgwidth * count);\nend if;\nreturn 0;\nend;" ] +[ "sys", "heapsize", 0, "bigint", "create function sys.heapsize(tpe varchar(1024), count bigint, distincts bigint, avgwidth int)\nreturns bigint\nbegin\nif tpe in ('varchar', 'char', 'clob', 'json', 'url')\nthen return 8192 + ((avgwidth + 8) * distincts);\nend if;\nif tpe in ('blob', 'geometry', 'geometrya')\nthen return 32 + (avgwidth * count);\nend if;\nreturn 0;\nend;"] [ "sys", "heapsize", 1, "varchar", "" ] [ "sys", "heapsize", 2, "bigint", "" ] [ "sys", "heapsize", 3, "bigint", "" ] @@ -906,7 +906,7 @@ stdout of test 'systemfunctions` in dire [ "sys",
MonetDB: default - Approve.
Changeset: 59a35c3a00be for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=59a35c3a00be Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.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: Approve. diffs (truncated from 88028 to 300 lines): 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 @@ -2515,3371 +2515,1523 @@ insert into sys.args values (36624, 642, insert into sys.args values (36625, 642, 'arg_1', 'double', 53, 0, 1, 1); insert into sys.args values (36626, 642, 'arg_2', 'tinyint', 8, 0, 1, 2); insert into sys.functions values (643, 'scale_up', '*', 'calc', 0, 1, false, false, false, 2000, true, false); -insert into sys.args values (36627, 643, 'res_0', 'oid', 63, 0, 0, 0); -insert into sys.args values (36628, 643, 'arg_1', 'oid', 63, 0, 1, 1); -insert into sys.args values (36629, 643, 'arg_2', 'oid', 63, 0, 1, 2); +insert into sys.args values (36627, 643, 'res_0', 'smallint', 16, 0, 0, 0); +insert into sys.args values (36628, 643, 'arg_1', 'smallint', 16, 0, 1, 1); +insert into sys.args values (36629, 643, 'arg_2', 'tinyint', 8, 0, 1, 2); insert into sys.functions values (644, 'scale_up', '*', 'calc', 0, 1, false, false, false, 2000, true, false); -insert into sys.args values (36630, 644, 'res_0', 'oid', 63, 0, 0, 0); +insert into sys.args values (36630, 644, 'res_0', 'smallint', 16, 0, 0, 0); insert into sys.args values (36631, 644, 'arg_1', 'tinyint', 8, 0, 1, 1); -insert into sys.args values (36632, 644, 'arg_2', 'oid', 63, 0, 1, 2); +insert into sys.args values (36632, 644, 'arg_2', 'smallint', 16, 0, 1, 2); insert into sys.functions values (645, 'scale_up', '*', 'calc', 0, 1, false, false, false, 2000, true, false); -insert into sys.args values (36633, 645, 'res_0', 'oid', 63, 0, 0, 0); +insert into sys.args values (36633, 645, 'res_0', 'smallint', 16, 0, 0, 0); insert into sys.args values (36634, 645, 'arg_1', 'smallint', 16, 0, 1, 1); -insert into sys.args values (36635, 645, 'arg_2', 'oid', 63, 0, 1, 2); +insert into sys.args values (36635, 645, 'arg_2', 'decimal', 2, 0, 1, 2); insert into sys.functions values (646, 'scale_up', '*', 'calc', 0, 1, false, false, false, 2000, true, false); -insert into sys.args values (36636, 646, 'res_0', 'oid', 63, 0, 0, 0); -insert into sys.args values (36637, 646, 'arg_1', 'int', 32, 0, 1, 1); -insert into sys.args values (36638, 646, 'arg_2', 'oid', 63, 0, 1, 2); +insert into sys.args values (36636, 646, 'res_0', 'smallint', 16, 0, 0, 0); +insert into sys.args values (36637, 646, 'arg_1', 'decimal', 2, 0, 1, 1); +insert into sys.args values (36638, 646, 'arg_2', 'smallint', 16, 0, 1, 2); insert into sys.functions values (647, 'scale_up', '*', 'calc', 0, 1, false, false, false, 2000, true, false); -insert into sys.args values (36639, 647, 'res_0', 'oid', 63, 0, 0, 0); -insert into sys.args values (36640, 647, 'arg_1', 'bigint', 64, 0, 1, 1); -insert into sys.args values (36641, 647, 'arg_2', 'oid', 63, 0, 1, 2); +insert into sys.args values (36639, 647, 'res_0', 'int', 32, 0, 0, 0); +insert into sys.args values (36640, 647, 'arg_1', 'int', 32, 0, 1, 1); +insert into sys.args values (36641, 647, 'arg_2', 'tinyint', 8, 0, 1, 2); insert into sys.functions values (648, 'scale_up', '*', 'calc', 0, 1, false, false, false, 2000, true, false); -insert into sys.args values (36642, 648, 'res_0', 'oid', 63, 0, 0, 0);
MonetDB: default - Approve upgrade.
Changeset: 6cfe97b5dd88 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6cfe97b5dd88 Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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: Approve upgrade. diffs (truncated from 183364 to 300 lines): 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 @@ -336,5542 +336,5550 @@ insert into sys.functions values (104, ' insert into sys.args values (34984, 104, 'res_0', 'any', 0, 0, 0, 0); insert into sys.args values (34985, 104, 'arg_1', 'any', 0, 0, 1, 1); insert into sys.args values (34986, 104, 'arg_2', 'any', 0, 0, 1, 2); -insert into sys.functions values (105, 'sum', 'sum', 'aggr', 0, 3, false, false, false, 2000, true, false); -insert into sys.args values (34987, 105, 'res_0', 'hugeint', 128, 0, 0, 0); -insert into sys.args values (34988, 105, 'arg_1', 'tinyint', 8, 0, 1, 1); +insert into sys.functions values (105, 'star', '', '', 0, 1, false, false, false, 2000, true, true); +insert into sys.args values (34987, 105, 'res_0', 'any', 0, 0, 0, 0); insert into sys.functions values (106, 'sum', 'sum', 'aggr', 0, 3, false, false, false, 2000, true, false); -insert into sys.args values (34989, 106, 'res_0', 'hugeint', 128, 0, 0, 0); -insert into sys.args values (34990, 106, 'arg_1', 'smallint', 16, 0, 1, 1); +insert into sys.args values (34988, 106, 'res_0', 'hugeint', 128, 0, 0, 0); +insert into sys.args values (34989, 106, 'arg_1', 'tinyint', 8, 0, 1, 1); insert into sys.functions values (107, 'sum', 'sum', 'aggr', 0, 3, false, false, false, 2000, true, false); -insert into sys.args values (34991, 107, 'res_0', 'hugeint', 128, 0, 0, 0); -insert into sys.args values (34992, 107, 'arg_1', 'int', 32, 0, 1, 1); +insert into sys.args values (34990, 107, 'res_0', 'hugeint', 128, 0, 0, 0); +insert into sys.args values (34991, 107, 'arg_1', 'smallint', 16, 0, 1, 1); insert into sys.functions values (108, 'sum', 'sum', 'aggr', 0, 3, false, false, false, 2000, true, false); -insert into sys.args values (34993, 108, 'res_0', 'hugeint', 128, 0, 0, 0); -insert into sys.args values (34994, 108, 'arg_1', 'hugeint', 128, 0, 1, 1); +insert into sys.args values (34992, 108, 'res_0', 'hugeint', 128, 0, 0, 0); +insert into sys.args values (34993, 108, 'arg_1', 'int', 32, 0, 1, 1); insert into sys.functions values (109, 'sum', 'sum', 'aggr', 0, 3, false, false, false, 2000, true, false); -insert into sys.args values (34995, 109, 'res_0', 'bigint', 64, 0, 0, 0); -insert into sys.args values (34996, 109, 'arg_1', 'bigint', 64, 0, 1, 1); +insert into sys.args values (34994, 109, 'res_0', 'hugeint', 128, 0, 0, 0); +insert into sys.args values (34995, 109, 'arg_1', 'hugeint', 128, 0, 1, 1); insert into sys.functions values (110, 'sum', 'sum', 'aggr', 0, 3, false, false, false, 2000, true, false); -insert into sys.args values (34997, 110, 'res_0', 'decimal', 38, 0, 0, 0); -insert into sys.args values (34998, 110, 'arg_1', 'decimal', 2, 0, 1, 1); +insert into sys.args values (34996, 110, 'res_0', 'bigint', 64, 0, 0, 0); +insert into sys.args values (34997, 110, 'arg_1', 'bigint', 64, 0, 1, 1); insert into sys.functions values (111, 'sum', 'sum', 'aggr', 0, 3, false, false, false, 2000, true, false); -insert into sys.args values (34999, 111, 'res_0', 'decimal', 38, 0, 0, 0); -insert into sys.args values (35000, 111, 'arg_1', 'decimal', 4, 0, 1, 1); +insert into sys.args values (34998, 111, 'res_0', 'decimal', 38, 0, 0, 0); +insert into sys.args values (34999, 111, 'arg_1', 'decimal', 2, 0, 1,
MonetDB: default - Approve upgrades.
Changeset: 2086acbe81c4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2086acbe81c4 Modified Files: sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.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.ppc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.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: Approve upgrades. diffs (247 lines): 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 @@ -5778,6 +5778,9 @@ create user ".snapshot" schema sys; grant execute on procedure sys.hot_snapshot(string) to ".snapshot"; grant execute on procedure sys.hot_snapshot(string, bool) to ".snapshot"; +create procedure sys.hot_snapshot(tarfile string, onserver bool) + external name sql.hot_snapshot; +update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and name in ('hot_snapshot') and type = 2; update sys.functions set system = true, language = 2, side_effect = false where name = 'var' and schema_id = (select id from sys.schemas where name = 'sys') and type = 5; update sys.args set type = 'char' where func_id = (select id from sys.functions where name = 'var' and schema_id = (select id from sys.schemas where name = 'sys') and type = 5) and type = 'clob'; update sys.privileges set grantor = 0 where obj_id = (select id from sys.functions where name = 'var' and schema_id = (select id from sys.schemas where name = 'sys') and type = 5); diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 @@ -5778,6 +5778,9 @@ create user ".snapshot" schema sys; grant execute on procedure sys.hot_snapshot(string) to ".snapshot"; grant execute on procedure sys.hot_snapshot(string, bool) to ".snapshot"; +create procedure sys.hot_snapshot(tarfile string, onserver bool) + external name sql.hot_snapshot; +update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and name in ('hot_snapshot') and type = 2; update sys.functions set system = true, language = 2, side_effect = false where name = 'var' and schema_id = (select id from sys.schemas where name = 'sys') and type = 5; update sys.args set type = 'char' where func_id = (select id from sys.functions where name = 'var' and schema_id = (select id from sys.schemas where name = 'sys') and type = 5) and type = 'clob'; update sys.privileges set grantor = 0 where obj_id = (select id from sys.functions where name = 'var' and schema_id = (select id from sys.schemas where name = 'sys') and type = 5); 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 @@ -5020,6 +5020,9 @@ create user ".snapshot" schema sys; grant execute on procedure sys.hot_snapshot(string) to ".snapshot"; grant execute on procedure sys.hot_snapshot(string, bool) to ".snapshot"; +create procedure sys.hot_snapshot(tarfile string, onserver bool) + external name sql.hot_snapshot; +update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and name in ('hot_snapshot') and type = 2; update sys.functions set system = true, language = 2, side_effect = false where name = 'var' and
MonetDB: default - Approve snapshot related changes to testdb-up...
Changeset: a39660641ab5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a39660641ab5 Modified Files: sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 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.int128 Branch: default Log Message: Approve snapshot related changes to testdb-upgrade[-chain][-hge] Edited the file manually, hope I got it right. diffs (60 lines): diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -54,6 +54,11 @@ update sys._tables set system = true whe drop function "sys"."var"(); create function "sys"."var"() returns table("schema" string, "name" string, "type" string, "value" string) external name "sql"."sql_variables"; grant execute on function "sys"."var" to public; +create user ".snapshot" with encrypted password '' name 'Snapshot User' schema sys; +grant execute on procedure sys.hot_snapshot to ".snapshot"; +create procedure sys.hot_snapshot(tarfile string, onserver bool) + external name sql.hot_snapshot; +update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and name in ('hot_snapshot') and type = 2; update sys.functions set system = true, language = 2, side_effect = false where name = 'var' and schema_id = (select id from sys.schemas where name = 'sys') and type = 5; update sys.args set type = 'char' where func_id = (select id from sys.functions where name = 'var' and schema_id = (select id from sys.schemas where name = 'sys') and type = 5) and type = 'clob'; update sys.privileges set grantor = 0 where obj_id = (select id from sys.functions where name = 'var' and schema_id = (select id from sys.schemas where name = 'sys') and type = 5); diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 --- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 +++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 @@ -6014,6 +6014,11 @@ update sys._tables set system = true whe drop function "sys"."var"(); create function "sys"."var"() returns table("schema" string, "name" string, "type" string, "value" string) external name "sql"."sql_variables"; grant execute on function "sys"."var" to public; +create user ".snapshot" with encrypted password '' name 'Snapshot User' schema sys; +grant execute on procedure sys.hot_snapshot to ".snapshot"; +create procedure sys.hot_snapshot(tarfile string, onserver bool) + external name sql.hot_snapshot; +update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and name in ('hot_snapshot') and type = 2; update sys.functions set system = true, language = 2, side_effect = false where name = 'var' and schema_id = (select id from sys.schemas where name = 'sys') and type = 5; update sys.args set type = 'char' where func_id = (select id from sys.functions where name = 'var' and schema_id = (select id from sys.schemas where name = 'sys') and type = 5) and type = 'clob'; update sys.privileges set grantor = 0 where obj_id = (select id from sys.functions where name = 'var' and schema_id = (select id from sys.schemas where name = 'sys') and type = 5); diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 @@ -59,6 +59,11 @@ update sys._tables set system = true whe drop function "sys"."var"(); create function "sys"."var"() returns table("schema" string, "name" string, "type" string, "value" string) external name "sql"."sql_variables"; grant execute on function "sys"."var" to public; +create user ".snapshot" with encrypted password '' name 'Snapshot User' schema sys; +grant execute on procedure sys.hot_snapshot to ".snapshot"; +create procedure sys.hot_snapshot(tarfile string, onserver bool) + external name sql.hot_snapshot; +update sys.functions set system = true where system <> true and schema_id = (select id from sys.schemas where name = 'sys') and name in ('hot_snapshot')
MonetDB: default - Approve output.
Changeset: 8df752703b48 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8df752703b48 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 Branch: default Log Message: Approve output. diffs (truncated from 2450 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -790,14 +790,6 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:any_1], X_2:bat[:any_1], X_3:bat[:oid], X_4:bat[:oid], X_5:bat[:bit], X_6:bit):bat[:bit] ", "CMDbatNE;","" ] [ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:any_1], X_2:bat[:any_1], X_3:bat[:oid], X_4:bat[:oid], X_5:bit):bat[:bit] ", "CMDbatNE;","" ] [ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:any_1], X_2:bat[:any_1], X_3:bit):bat[:bit] ", "CMDbatNE;","" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:bat[:hge]):bat[:bit] ", "CMDbatNE;","" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:bat[:hge]):bat[:bit] ", "CMDbatNE;","" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:bat[:hge], X_3:bat[:bit]):bat[:bit] ", "CMDbatNE;","" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:bat[:hge], X_3:bat[:bit]):bat[:bit] ", "CMDbatNE;","" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:bat[:hge], X_3:bat[:oid], X_4:bat[:oid]):bat[:bit] ","CMDbatNE;","" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:bat[:hge], X_3:bat[:oid], X_4:bat[:oid]):bat[:bit] ","CMDbatNE;","" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:bat[:hge], X_3:bat[:oid], X_4:bat[:oid], X_5:bat[:bit]):bat[:bit] ", "CMDbatNE;", "" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:bat[:hge], X_3:bat[:oid], X_4:bat[:oid], X_5:bat[:bit]):bat[:bit] ", "CMDbatNE;", "" ] [ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:bat[:int]):bat[:bit] ", "CMDbatNE;","" ] [ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:bat[:int]):bat[:bit] ", "CMDbatNE;","" ] [ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:bat[:int], X_3:bat[:bit]):bat[:bit] ", "CMDbatNE;","" ] @@ -822,14 +814,6 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:bat[:sht], X_3:bat[:oid], X_4:bat[:oid]):bat[:bit] ","CMDbatNE;","" ] [ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:bat[:sht], X_3:bat[:oid], X_4:bat[:oid], X_5:bat[:bit]):bat[:bit] ", "CMDbatNE;", "" ] [ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:bat[:sht], X_3:bat[:oid], X_4:bat[:oid], X_5:bat[:bit]):bat[:bit] ", "CMDbatNE;", "" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:hge):bat[:bit] ","CMDbatNE;","" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:hge):bat[:bit] ","CMDbatNE;","" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:hge, X_3:bat[:bit]):bat[:bit] ", "CMDbatNE;","" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:hge, X_3:bat[:bit]):bat[:bit] ", "CMDbatNE;","" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:hge, X_3:bat[:oid]):bat[:bit] ", "CMDbatNE;","" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:hge, X_3:bat[:oid]):bat[:bit] ", "CMDbatNE;","" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:hge, X_3:bat[:oid], X_4:bat[:bit]):bat[:bit] ", "CMDbatNE;","" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:hge, X_3:bat[:oid], X_4:bat[:bit]):bat[:bit] ", "CMDbatNE;","" ] [ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:int):bat[:bit] ","CMDbatNE;","" ] [ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:int):bat[:bit] ","CMDbatNE;","" ] [ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:bte], X_2:int, X_3:bat[:bit]):bat[:bit] ", "CMDbatNE;","" ] @@ -886,70 +870,6 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:daytime], X_2:daytime, X_3:bat[:oid], X_4:bat[:bit], X_5:bit):bat[:bit] ", "CMDbatNE;","" ] [ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:daytime], X_2:daytime, X_3:bat[:oid], X_4:bit):bat[:bit] ","CMDbatNE;","" ] [ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:daytime], X_2:daytime, X_3:bit):bat[:bit] ", "CMDbatNE;","" ] -[ "batcalc", "!=", "pattern batcalc.!=(X_1:bat[:hge], X_2:bat[:bte]):bat[:bit] ",
MonetDB: default - Approve non-128 bit output.
Changeset: e73b64ba2882 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e73b64ba2882 Modified Files: clients/Tests/MAL-signatures.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out Branch: default Log Message: Approve non-128 bit output. diffs (156 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -94,12 +94,10 @@ stdout of test 'MAL-signatures` in direc [ "aggr", "avg", "command aggr.avg(X_2:bat[:lng], X_3:bat[:oid], X_4:bat[:any_1], X_5:int) (X_0:bat[:dbl], X_1:bat[:lng]) ", "AGGRavg24_dbl;", "" ] [ "aggr", "avg", "command aggr.avg(X_2:bat[:sht], X_3:bat[:oid], X_4:bat[:any_1], X_5:int) (X_0:bat[:dbl], X_1:bat[:lng]) ", "AGGRavg24_dbl;", "" ] [ "aggr", "avg", "pattern aggr.avg(X_3:bat[:bte], X_4:bat[:oid], X_5:bit) (X_0:bte, X_1:lng, X_2:lng) ", "CMDBATavg3;", "" ] -[ "aggr", "avg", "pattern aggr.avg(X_3:bat[:hge], X_4:bat[:oid], X_5:bit) (X_0:hge, X_1:lng, X_2:lng) ", "CMDBATavg3;", "" ] [ "aggr", "avg", "pattern aggr.avg(X_3:bat[:int], X_4:bat[:oid], X_5:bit) (X_0:int, X_1:lng, X_2:lng) ", "CMDBATavg3;", "" ] [ "aggr", "avg", "pattern aggr.avg(X_3:bat[:lng], X_4:bat[:oid], X_5:bit) (X_0:lng, X_1:lng, X_2:lng) ", "CMDBATavg3;", "" ] [ "aggr", "avg", "pattern aggr.avg(X_3:bat[:sht], X_4:bat[:oid], X_5:bit) (X_0:sht, X_1:lng, X_2:lng) ", "CMDBATavg3;", "" ] [ "aggr", "avg", "pattern aggr.avg(X_1:bat[:bte], X_2:bat[:lng], X_3:bat[:lng]):bte ", "CMDBATavg3comb;", "" ] -[ "aggr", "avg", "pattern aggr.avg(X_1:bat[:hge], X_2:bat[:lng], X_3:bat[:lng]):hge ", "CMDBATavg3comb;", "" ] [ "aggr", "avg", "pattern aggr.avg(X_1:bat[:int], X_2:bat[:lng], X_3:bat[:lng]):int ", "CMDBATavg3comb;", "" ] [ "aggr", "avg", "pattern aggr.avg(X_1:bat[:lng], X_2:bat[:lng], X_3:bat[:lng]):lng ", "CMDBATavg3comb;", "" ] [ "aggr", "avg", "pattern aggr.avg(X_1:bat[:sht], X_2:bat[:lng], X_3:bat[:lng]):sht ", "CMDBATavg3comb;", "" ] diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out b/monetdb5/modules/mal/Tests/inspect05.stable.out --- a/monetdb5/modules/mal/Tests/inspect05.stable.out +++ b/monetdb5/modules/mal/Tests/inspect05.stable.out @@ -34,70 +34,72 @@ stdout of test 'inspect05` in directory [ 3@0, "append", "command", "bat", "(X_1:bat[:any_1], X_2:bat[:any_1], X_3:bat[:oid]):bat[:any_1] "] [ 4@0, "append", "command", "bat", "(X_1:bat[:any_1], X_2:bat[:any_1], X_3:bit):bat[:any_1] " ] [ 5@0, "append", "command", "bat", "(X_1:bat[:any_1], X_2:bat[:any_1]):bat[:any_1] " ] -[ 6@0, "attach", "command", "bat", "(X_1:int, X_2:str):bat[:any_1] " ] -[ 7@0, "delete", "command", "bat", "(X_1:bat[:any_1]):bat[:any_1] "] -[ 8@0, "delete", "command", "bat", "(X_1:bat[:any_1], X_2:bat[:oid]):bat[:any_1] " ] -[ 9@0, "delete", "command", "bat", "(X_1:bat[:any_1], X_2:oid):bat[:any_1] " ] -[ 10@0,"densebat", "command", "bat", "(X_1:lng):bat[:oid] " ] -[ 11@0,"diffcand", "command", "bat", "(X_1:bat[:oid], X_2:bat[:oid]):bat[:oid] " ] -[ 12@0,"getAccess","command", "bat", "(X_1:bat[:any_1]):str "] -[ 13@0,"getCapacity", "command", "bat", "(X_1:bat[:any_1]):lng "] -[ 14@0,"getColumnType","command", "bat", "(X_1:bat[:any_1]):str "] -[ 15@0,"getName", "command", "bat", "(X_1:bat[:any_1]):str "] -[ 16@0,"getRole", "command", "bat", "(X_1:bat[:any_1]):str "] -[ 17@0,"getSequenceBase", "command", "bat", "(X_1:bat[:any_1]):oid "] -[ 18@0,"getSize", "command", "bat", "(X_1:bat[:any_1]):lng "] -[ 19@0,"getorderidx", "pattern", "bat", "(X_1:bat[:any_1]):bat[:oid] " ] -[ 20@0,"hasorderidx", "pattern", "bat", "(X_1:bat[:any_1]):bit "] -[ 21@0,"imprints", "command", "bat", "(X_1:bat[:dbl]):void " ] -[ 22@0,"imprints", "command", "bat", "(X_1:bat[:flt]):void " ] -[ 23@0,"imprints", "command", "bat", "(X_1:bat[:lng]):void " ] -[ 24@0,"imprints", "command", "bat", "(X_1:bat[:int]):void " ] -[ 25@0,"imprints", "command", "bat", "(X_1:bat[:sht]):void " ] -[ 26@0,"imprints", "command", "bat", "(X_1:bat[:bte]):void " ] -[ 27@0,"imprintsize", "command", "bat", "(X_1:bat[:dbl]):lng " ] -[ 28@0,"imprintsize", "command", "bat", "(X_1:bat[:flt]):lng " ] -[ 29@0,"imprintsize", "command",
MonetDB: default - Approve
Changeset: a47afe254296 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a47afe254296 Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: Approve diffs (11 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 @@ -342,6 +342,7 @@ lng IMPSimprintsize(BAT *b); int MT_check_nr_cores(void); int MT_create_thread(MT_Id *t, void (*function)(void *), void *arg, enum MT_thr_detach d, const char *threadname); void MT_exiting_thread(void); +pid_t MT_get_locking_pid(char *filename); MT_Id MT_getpid(void); size_t MT_getrss(void); void MT_init(void); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve.
Changeset: 36ddfbe8fe40 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=36ddfbe8fe40 Modified Files: sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: default Log Message: Approve. diffs (24 lines): diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 --- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 +++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 @@ -1020,7 +1020,7 @@ insert into sys.functions values (251, ' insert into sys.args values (32360, 251, 'res_0', 'boolean', 1, 0, 0, 0); insert into sys.args values (32361, 251, 'arg_1', 'boolean', 1, 0, 1, 1); insert into sys.args values (32362, 251, 'arg_2', 'boolean', 1, 0, 1, 2); -insert into sys.functions values (252, 'or', 'or', 'calc', 0, 1, false, false, false, 2000, true, false); +insert into sys.functions values (252, 'or', 'or', 'calc', 0, 1, false, false, false, 2000, true, true); insert into sys.args values (32363, 252, 'res_0', 'boolean', 1, 0, 0, 0); insert into sys.args values (32364, 252, 'arg_1', 'boolean', 1, 0, 1, 1); insert into sys.args values (32365, 252, 'arg_2', 'boolean', 1, 0, 1, 2); diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 --- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 +++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 @@ -1021,7 +1021,7 @@ insert into sys.functions values (251, ' insert into sys.args values (9821, 251, 'res_0', 'boolean', 1, 0, 0, 0); insert into sys.args values (9822, 251, 'arg_1', 'boolean', 1, 0, 1, 1); insert into sys.args values (9823, 251, 'arg_2', 'boolean', 1, 0, 1, 2); -insert into sys.functions values (252, 'or', 'or', 'calc', 0, 1, false, false, false, 2000, true, false); +insert into sys.functions values (252, 'or', 'or', 'calc', 0, 1, false, false, false, 2000, true, true); insert into sys.args values (9824, 252, 'res_0', 'boolean', 1, 0, 0, 0); insert into sys.args values (9825, 252, 'arg_1', 'boolean', 1, 0, 1, 1); insert into sys.args values (9826, 252, 'arg_2', 'boolean', 1, 0, 1, 2); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output.
Changeset: e83e4677adb8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e83e4677adb8 Modified Files: sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/testdb-upgrade/Tests/dump.stable.out Branch: default Log Message: Approve output. diffs (233 lines): 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 @@ -1382,7 +1382,7 @@ create function timestamp_to_str(d times create function sys.tracelog() returns table (ticks bigint, stmt string) external name sql.dump_trace; create function sys.uuid() returns uuid external name uuid."new"; create procedure vacuum(sys string, tab string) external name sql.vacuum; -CREATE FUNCTION var() RETURNS TABLE(name varchar(1024)) EXTERNAL NAME sql.sql_variables; +CREATE FUNCTION "sys"."var"() RETURNS TABLE("schema" string, "name" string, "type" string, "value" string) EXTERNAL NAME "sql"."sql_variables"; create aggregate var_pop(val bigint) returns double external name "aggr"."variancep"; create aggregate var_pop(val double) returns double external name "aggr"."variancep"; create aggregate var_pop(val integer) returns double external name "aggr"."variancep"; @@ -1447,12 +1447,12 @@ select 'sys.db_user_info', u.name, u.ful select 'function used by function', s1.name, f1.name, s2.name, f2.name, dt.dependency_type_name from sys.dependencies d left outer join sys.dependency_types dt on d.depend_type = dt.dependency_type_id, sys.functions f1, sys.functions f2, sys.schemas s1, sys.schemas s2 where d.id = f1.id and d.depend_id = f2.id and f1.schema_id = s1.id and f2.schema_id = s2.id order by s2.name, f2.name, s1.name, f1.name; select 'table used by function', s1.name, t.name, s2.name, f.name, dt.dependency_type_name from sys.dependencies d left outer join sys.dependency_types dt on d.depend_type = dt.dependency_type_id, sys._tables t, sys.schemas s1, sys.functions f, sys.schemas s2 where d.id = t.id and d.depend_id = f.id and t.schema_id = s1.id and f.schema_id = s2.id order by s2.name, f.name, s1.name, t.name; select 'column used by function', s1.name, t.name, c.name, s2.name, f.name, dt.dependency_type_name from sys.dependencies d left outer join sys.dependency_types dt on d.depend_type = dt.dependency_type_id, sys._columns c, sys._tables t, sys.schemas s1, sys.functions f, sys.schemas s2 where d.id = c.id and d.depend_id = f.id and c.table_id = t.id and t.schema_id = s1.id and f.schema_id = s2.id order by s2.name, f.name, s1.name, t.name, c.name; -select 'function used by view', s1.name, f1.name, s2.name, t2.name, dt.dependency_type_name from sys.dependencies d left outer join sys.dependency_types dt on d.depend_type = dt.dependency_type_id, schemas s1, functions f1, schemas s2, _tables t2 where d.id = f1.id and f1.schema_id = s1.id and d.depend_id = t2.id and t2.schema_id = s2.id order by s2.name, t2.name, s1.name, f1.name; -select 'table used by view', s1.name, t1.name, s2.name, t2.name, dt.dependency_type_name from sys.dependencies d left outer join sys.dependency_types dt on d.depend_type = dt.dependency_type_id, schemas s1, _tables t1, schemas s2, _tables t2 where d.id = t1.id and t1.schema_id = s1.id and d.depend_id = t2.id and t2.schema_id = s2.id order by s2.name, t2.name, s1.name, t1.name; -select 'column used by view', s1.name, t1.name, c1.name, s2.name, t2.name, dt.dependency_type_name from sys.dependencies d left outer join sys.dependency_types dt on d.depend_type = dt.dependency_type_id, schemas s1, _tables t1, _columns c1, schemas s2, _tables t2 where d.id = c1.id and c1.table_id = t1.id and t1.schema_id = s1.id and d.depend_id = t2.id and t2.schema_id = s2.id order by s2.name, t2.name, s1.name, t1.name, c1.name; -select 'column used by key', s1.name, t1.name, c1.name, s2.name, t2.name, k2.name, dt.dependency_type_name from sys.dependencies d left outer join sys.dependency_types dt on d.depend_type = dt.dependency_type_id, _tables t1, _tables t2, schemas s1, schemas s2, _columns c1, keys k2 where d.id = c1.id and d.depend_id = k2.id and c1.table_id = t1.id and t1.schema_id = s1.id and k2.table_id = t2.id and t2.schema_id = s2.id order by s2.name, t2.name, k2.name, s1.name, t1.name, c1.name; -select 'column used by index', s1.name, t1.name, c1.name, s2.name, t2.name, i2.name, dt.dependency_type_name from sys.dependencies d left outer join sys.dependency_types dt on d.depend_type = dt.dependency_type_id, _tables t1, _tables t2, schemas s1, schemas s2, _columns c1, idxs i2 where d.id = c1.id and d.depend_id = i2.id and c1.table_id = t1.id and t1.schema_id = s1.id and i2.table_id = t2.id and t2.schema_id = s2.id order by s2.name, t2.name, i2.name, s1.name, t1.name, c1.name; -select 'type used by function', t.systemname, t.sqlname,
MonetDB: default - Approve upgrade (missed part of merge).
Changeset: 6af351f2b2f2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6af351f2b2f2 Modified Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out Branch: default Log Message: Approve upgrade (missed part of merge). diffs (172 lines): 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 @@ -16,6 +16,39 @@ stdout of test 'upgrade` in directory 's # Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660 # MonetDB/GIS module loaded +Running database upgrade commands: +set schema "sys"; +drop view sys.queue; +drop function sys.queue; +create function sys.queue() +returns table( +"tag" bigint, +"sessionid" int, +"username" string, +"started" timestamp, +"status" string, +"query" string, +"finished" timestamp, +"workers" int, +"memory" int) + external name sql.sysmon_queue; +grant execute on function sys.queue to public; +create view sys.queue as select * from sys.queue(); +grant select on sys.queue to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue' and type = 5; +update sys._tables set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue'; +drop function "sys"."var"(); +create function "sys"."var"() +returns table( +"schema" string, +"name" string, +"type" string, +"value" string) + external name "sql"."sql_variables"; +grant execute on function "sys"."var" to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'var' and type = 5; +set schema "sys"; + # MonetDB/SQL module loaded # 15:55:37 > 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 @@ -16,6 +16,39 @@ stdout of test 'upgrade` in directory 's # Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/ # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660 # MonetDB/GIS module loaded +Running database upgrade commands: +set schema "sys"; +drop view sys.queue; +drop function sys.queue; +create function sys.queue() +returns table( +"tag" bigint, +"sessionid" int, +"username" string, +"started" timestamp, +"status" string, +"query" string, +"finished" timestamp, +"workers" int, +"memory" int) + external name sql.sysmon_queue; +grant execute on function sys.queue to public; +create view sys.queue as select * from sys.queue(); +grant select on sys.queue to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue' and type = 5; +update sys._tables set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue'; +drop function "sys"."var"(); +create function "sys"."var"() +returns table( +"schema" string, +"name" string, +"type" string, +"value" string) + external name "sql"."sql_variables"; +grant execute on function "sys"."var" to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'var' and type = 5; +set schema "sys"; + # MonetDB/SQL module loaded # 21:10:45 > diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out --- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out +++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out @@ -15,6 +15,39 @@ stdout of test 'upgrade` in directory 's # Visit http://www.monetdb.org/ for further information # Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:36250/ # MonetDB/GIS module loaded +Running database upgrade commands: +set schema "sys"; +drop view sys.queue; +drop function sys.queue; +create function sys.queue() +returns table( +"tag" bigint, +"sessionid" int, +"username" string, +"started" timestamp, +"status" string, +"query" string, +"finished" timestamp, +"workers" int, +"memory" int) + external name sql.sysmon_queue; +grant execute on function sys.queue to public; +create view sys.queue as select * from sys.queue(); +grant select on sys.queue to public; +update sys.functions set system = true where schema_id = (select id from sys.schemas where name = 'sys') and name = 'queue' and type = 5; +update sys._tables set system =
MonetDB: default - Approve.
Changeset: 45c85efe5eb3 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=45c85efe5eb3 Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: Approve. diffs (12 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 @@ -485,7 +485,7 @@ geomcatalogfix_fptr geomcatalogfix_get(v void geomcatalogfix_set(geomcatalogfix_fptr); geomsqlfix_fptr geomsqlfix_get(void); void geomsqlfix_set(geomsqlfix_fptr); -int geomversion_get(void); +bool geomversion_get(void); void geomversion_set(void); bat getBBPsize(void); char *get_bin_path(void); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve after changeset 9da7ad49ac99.
Changeset: cdf9cf3e6444 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cdf9cf3e6444 Modified Files: sql/test/BugConstraints/Tests/delete_primarykey_1643845.stable.err sql/test/BugConstraints/Tests/update_primarykey_1643375.stable.err sql/test/BugDay_2005-10-06_2.9.3/Tests/inserts_with_defaults.SF-921977.stable.err sql/test/BugTracker-2008/Tests/OOM_query.SF-2457195.stable.out sql/test/BugTracker-2008/Tests/alter_add_constraint_should_check_existing_data.SF-2075241.stable.err sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out sql/test/BugTracker-2008/Tests/insert_into_unique_column.SF-2075180.stable.err sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out sql/test/BugTracker-2009/Tests/unique_constraint_on_char.SF-2873564.stable.err sql/test/BugTracker-2011/Tests/UNIQUE_Constraint_reference.Bug-2835.stable.err sql/test/BugTracker-2011/Tests/crash_in_push_exp_down.Bug-2811.stable.out sql/test/BugTracker-2011/Tests/multicolumn_constraints.Bug-2849.stable.err sql/test/BugTracker-2011/Tests/perl-table_info.Bug-2885.stable.err sql/test/BugTracker-2012/Tests/foreign_key.Bug-3114.stable.err sql/test/BugTracker-2014/Tests/duplicate_primary_keys.Bug-3474.stable.err sql/test/BugTracker-2014/Tests/unsafe_project_push_down.Bug-3523.stable.out sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.out sql/test/BugTracker-2015/Tests/mserver-crashes-under-specific-combination-of-JOIN-and-WHERE-conditions.Bug-3872.stable.out sql/test/BugTracker-2015/Tests/null_is_null.Bug-3739.stable.out sql/test/BugTracker-2015/Tests/ukey_check_unaligned.Bug-3669.stable.err sql/test/BugTracker-2016/Tests/column_not_found.Bug-4064.stable.out sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128 sql/test/BugTracker-2016/Tests/foreign_key.Bug-3938.stable.err sql/test/BugTracker-2016/Tests/name_conflict_in_union.Bug-6065.stable.out sql/test/BugTracker-2016/Tests/null_in_null.Bug-3900.stable.out sql/test/BugTracker-2016/Tests/select-in-from.Bug-6119.stable.out sql/test/BugTracker-2016/Tests/select-in-from.Bug-6121.stable.out sql/test/BugTracker-2017/Tests/drop_not_null_on_pkey.Bug-6189.stable.err sql/test/BugTracker-2017/Tests/python_loader_clobbers_default_with_null.Bug-6464.stable.err sql/test/BugTracker-2018/Tests/create_table_empty_column_name.Bug-6653.stable.err sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.err sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.out sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-case-coalesce.Bug-6550.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-extra-columns.Bug-6555.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case-nullif-coalesce.Bug-6565.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case.Bug-6552.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-count-not-in.Bug-6518.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in-cast.Bug-6561.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-in.Bug-6560.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-having-not-null-not-in.Bug-6562.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-nested-case.Bug-6554.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-overflow-in-conversion.Bug-6517.stable.out sql/test/BugTracker/Tests/alter_table_add_fkey.SF-1737668.stable.err sql/test/BugTracker/Tests/auto_increment.SF-1834820.stable.err sql/test/BugTracker/Tests/crash_on_fkey_update.SF-1703497.stable.err sql/test/BugTracker/Tests/crash_on_fkey_update2.SF-1703497.stable.err sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/multivalue_insert.SF-1509864.stable.err sql/test/BugTracker/Tests/number_null_first_row.SF-1833286.stable.err sql/test/BugTracker/Tests/update_fkey_with_value_not_in_the_pkey.SF-1734143.stable.err
MonetDB: default - Approve after changeset 10da10469b8c.
Changeset: b0124bb64999 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b0124bb64999 Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: Approve after changeset 10da10469b8c. diffs (37 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 @@ -826,7 +826,6 @@ str AUTHgetUsername(str *ret, Client c); str AUTHgetUsers(BAT **ret1, BAT **ret2, Client c); str AUTHinitTables(const char *passwd); str AUTHremoveUser(Client c, const char *username); -void AUTHreset(void) __attribute__((__visibility__("hidden"))); str AUTHresolveUser(str *ret, oid uid); str AUTHsetPassword(Client c, const char *username, const char *passwd); str AUTHunlockVault(const char *password); @@ -2379,25 +2378,17 @@ char *malLibraryHowToEnable(str name); int malProfileMode; str malRef; void mal_atom_reset(void); -void mal_client_reset(void) __attribute__((__visibility__("hidden"))); ClientRec *mal_clients; MT_Lock mal_contextLock; MT_Lock mal_copyLock; -void mal_dataflow_reset(void) __attribute__((__visibility__("hidden"))); MT_Lock mal_delayLock; _Noreturn void mal_exit(int status); -void mal_factory_reset(void) __attribute__((__visibility__("hidden"))); int mal_init(void); void mal_instruction_reset(void); -void mal_linker_reset(void) __attribute__((__visibility__("hidden"))); -void mal_module_reset(void) __attribute__((__visibility__("hidden"))); -void mal_namespace_reset(void) __attribute__((__visibility__("hidden"))); MT_Lock mal_oltpLock; MT_Lock mal_profileLock; str mal_quote(const char *msg, size_t size); MT_Lock mal_remoteLock; -void mal_resource_reset(void) __attribute__((__visibility__("hidden"))); -void mal_runtime_reset(void) __attribute__((__visibility__("hidden"))); void mal_unquote(char *msg); stream *maleventstream; str manifoldRef; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve after changeset 4ca6ec77e5e9.
Changeset: 9aaa1cf7b525 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9aaa1cf7b525 Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: Approve after changeset 4ca6ec77e5e9. diffs (12 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 @@ -302,7 +302,7 @@ str GDKstrndup(const char *s, size_t n) void GDKsyserror(_In_z_ _Printf_format_string_ const char *format, ...) __attribute__((__format__(__printf__, 1, 2))); gdk_return GDKtracer_fill_comp_info(BAT *id, BAT *component, BAT *log_Level); gdk_return GDKtracer_flush_buffer(void); -char *GDKtracer_get_timestamp(const char *fmt); +char *GDKtracer_get_timestamp(const char *fmt, char *buf, size_t sz); gdk_return GDKtracer_log(LOG_LEVEL level, const char *fmt, ...) __attribute__((format(printf, 2, 3))); gdk_return GDKtracer_reset_adapter(void); gdk_return GDKtracer_reset_component_level(int comp); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve.
Changeset: 4b4ec54a8934 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b4ec54a8934 Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: Approve. diffs (11 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 @@ -302,7 +302,6 @@ str GDKstrndup(const char *s, size_t n) void GDKsyserror(_In_z_ _Printf_format_string_ const char *format, ...) __attribute__((__format__(__printf__, 1, 2))); gdk_return GDKtracer_flush_buffer(void); char *GDKtracer_get_timestamp(const char *fmt); -gdk_return GDKtracer_init(void); gdk_return GDKtracer_log(LOG_LEVEL level, const char *fmt, ...) __attribute__((format(printf, 2, 3))); gdk_return GDKtracer_reset_adapter(void); gdk_return GDKtracer_reset_component_level(int comp); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve upgrade.
Changeset: 8e3f9b40b207 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8e3f9b40b207 Modified Files: 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: Approve upgrade. diffs (truncated from 188602 to 300 lines): 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 @@ -179,5737 +179,5727 @@ insert into sys.functions values (62, 'r insert into sys.args values (29851, 62, 'res_0', 'boolean', 1, 0, 0, 0); insert into sys.args values (29852, 62, 'arg_1', 'mbr', 0, 0, 1, 1); insert into sys.args values (29853, 62, 'arg_2', 'mbr', 0, 0, 1, 2); -insert into sys.functions values (63, 'grouping', 'grouping', 'sql', 0, 3, false, false, false, 2000, true); +insert into sys.functions values (63, 'grouping', '', '', 0, 3, false, false, false, 2000, true); insert into sys.args values (29854, 63, 'res', 'tinyint', 8, 0, 0, 0); insert into sys.args values (29855, 63, 'arg', 'any', 0, 0, 1, 1); -insert into sys.functions values (64, 'grouping', 'grouping', 'sql', 0, 3, false, false, false, 2000, true); +insert into sys.functions values (64, 'grouping', '', '', 0, 3, false, false, false, 2000, true); insert into sys.args values (29856, 64, 'res', 'smallint', 16, 0, 0, 0); insert into sys.args values (29857, 64, 'arg', 'any', 0, 0, 1, 1); -insert into sys.functions values (65, 'grouping', 'grouping', 'sql', 0, 3, false, false, false, 2000, true); +insert into sys.functions values (65, 'grouping', '', '', 0, 3, false, false, false, 2000, true); insert into sys.args values (29858, 65, 'res', 'int', 32, 0, 0, 0); insert into sys.args values (29859, 65, 'arg', 'any', 0, 0, 1, 1); -insert into sys.functions values (66, 'grouping', 'grouping', 'sql', 0, 3, false, false, false, 2000, true); +insert into sys.functions values (66, 'grouping', '', '', 0, 3, false, false, false, 2000, true); insert into sys.args values (29860, 66, 'res', 'bigint', 64, 0, 0, 0); insert into sys.args values (29861, 66, 'arg', 'any', 0, 0, 1, 1); -insert into sys.functions values (67, 'grouping', 'grouping', 'sql', 0, 3, false, false, false, 2000, true); +insert into sys.functions values (67, 'grouping', '', '', 0, 3, false, false, false, 2000, true); insert into sys.args values (29862, 67, 'res', 'hugeint', 128, 0, 0, 0); insert into sys.args values (29863, 67, 'arg', 'any', 0, 0, 1, 1); insert into sys.functions values (68, 'not_unique', 'not_unique', 'sql', 0, 3, false, false, false, 2000, true); insert into sys.args values (29864, 68, 'res', 'boolean', 1, 0, 0, 0); insert into sys.args values (29865, 68, 'arg', 'oid', 63, 0, 1, 1); -insert into sys.functions values (69, 'not_uniques', 'not_uniques', 'sql', 0, 1, false, false, false, 2000, true); -insert into sys.args values (29866, 69, 'res_0', 'oid', 63, 0, 0, 0); -insert into sys.args values (29867, 69, 'arg_1', 'bigint', 64, 0, 1, 1); -insert into sys.functions values (70, 'not_uniques', 'not_uniques', 'sql', 0, 1, false, false, false, 2000, true); -insert into sys.args values (29868, 70, 'res_0', 'oid', 63, 0, 0, 0); -insert into sys.args values (29869, 70, 'arg_1', 'oid', 63, 0, 1, 1); -insert into sys.functions values (71, 'hash', 'hash', 'mkey', 0, 1, false, false, false, 2000, true); -insert into sys.args values (29870, 71, 'res_0', 'bigint', 64, 0, 0, 0); -insert into sys.args values (29871, 71, 'arg_1', 'any', 0, 0, 1, 1); -insert into sys.functions values (72, 'rotate_xor_hash', 'rotate_xor_hash', 'calc', 0, 1, false, false, false,