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 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 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 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 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 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 32 bit output.
Changeset: 62eb70e309c7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=62eb70e309c7
Modified Files:
sql/test/emptydb/Tests/check.stable.out.32bit
Branch: default
Log Message:
Approve 32 bit output.
diffs (198 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
@@ -226,6 +226,7 @@ stdout of test 'check` in directory 'sql
\dSf sys."querylog_disable"
\dSf sys."querylog_empty"
\dSf sys."querylog_enable"
+\dSf sys."querytimeout"
\dSf sys."queue"
\dSf sys."radians"
\dSf sys."rejects"
@@ -237,6 +238,7 @@ stdout of test 'check` in directory 'sql
\dSf sys."right_shift"
\dSf sys."right_shift_assign"
\dSf sys."sessions"
+\dSf sys."sessiontimeout"
\dSf sys."setmasklen"
\dSf sys."setprinttimeout"
\dSf sys."setsession"
@@ -341,6 +343,7 @@ stdout of test 'check` in directory 'sql
\dSf sys."stddev_pop"
\dSf sys."stddev_samp"
\dSf sys."stop"
+\dSf sys."stopsession"
\dSf sys."storage"
\dSf sys."storagemodelinit"
\dSf sys."str_to_date"
@@ -666,6 +669,7 @@ SYSTEM FUNCTION sys.querylog_cat
SYSTEM PROCEDUREsys.querylog_disable
SYSTEM PROCEDUREsys.querylog_empty
SYSTEM PROCEDUREsys.querylog_enable
+SYSTEM PROCEDUREsys.querytimeout
SYSTEM FUNCTION sys.queue
SYSTEM FUNCTION sys.radians
SYSTEM FUNCTION sys.rand
@@ -692,6 +696,7 @@ SYSTEM FUNCTION sys.scale_down
SYSTEM FUNCTION sys.scale_up
SYSTEM FUNCTION sys.second
SYSTEM FUNCTION sys.sessions
+SYSTEM PROCEDUREsys.sessiontimeout
SYSTEM FUNCTION sys.setmasklen
SYSTEM PROCEDUREsys.setprinttimeout
SYSTEM PROCEDUREsys.setsession
@@ -816,6 +821,7 @@ SYSTEM FUNCTION sys.st_z
SYSTEM AGGREGATEsys.stddev_pop
SYSTEM AGGREGATEsys.stddev_samp
SYSTEM PROCEDUREsys.stop
+SYSTEM PROCEDUREsys.stopsession
SYSTEM FUNCTION sys.storage
SYSTEM PROCEDUREsys.storagemodelinit
SYSTEM FUNCTION sys.str_to_date
@@ -1081,6 +1087,7 @@ create function sys.optimizers () return
create function sys.password_hash (username string) returns string external
name sql.password;
create procedure sys.pause(tag bigint) external name sql.sysmon_pause;
create procedure sys.pause(tag int) external name sql.sysmon_pause;
+create procedure sys.pause(tag tinyint) external name sql.sysmon_pause;
create aggregate quantile(val bigint, q double) returns bigint external name
"aggr"."quantile";
create aggregate quantile(val date, q double) returns date external name
"aggr"."quantile";
create aggregate quantile(val decimal, q double) returns decimal external name
"aggr"."quantile";
@@ -1106,23 +1113,25 @@ create procedure sys.querylog_disable()
create procedure sys.querylog_empty() external name sql.querylog_empty;
create procedure sys.querylog_enable() external name sql.querylog_enable;
create procedure sys.querylog_enable(threshold integer) external name
sql.querylog_enable;
-create function sys.queue() returns table(qtag bigint, "user" string, started
timestamp, estimate timestamp, progress int, status string, tag oid, query
string) external name sql.sysmon_queue;
+create procedure sys.querytimeout("sessionid" int, "query" bigint) external
name clients.querytimeout;
+create function sys.queue() returns table(qtag bigint, sessionid int, "user"
string, started timestamp, estimate timestamp, progress int, status string, tag
oid, query string) external name sql.sysmon_queue;
create function radians(d double) returns double return d*pi()/180;
create function sys.rejects() returns table(rowid bigint, fldid int, "message"
string, "input" string) external name sql.copy_rejects;
create function sys.remote_table_credentials (tablename string) returns table
("uri" string, "username" string, "hash" string) external name
sql.rt_credentials;
create procedure sys.resume(tag bigint) external name sql.sysmon_resume;
create procedure sys.resume(tag int) external name sql.sysmon_resume;
+create procedure sys.resume(tag tinyint) external name sql.sysmon_resume;
create procedure resume_log_flushing() external name sql.resume_log_flushing;
create procedure reuse(sys string, tab string) external name sql.reuse;
create function reverse(src string) returns string external name udf.reverse;
create function "right_shift"(i1 inet, i2 inet) returns boolean external name
inet.">>";
create function "right_shift_assign"(i1 inet, i2 inet) returns boolean
external name inet.">>=";
-create function sys.sessions() returns table("user" string, "login" timestamp,
"sessiontimeout" bigint, "lastcommand" timestamp, "querytimeout" bigint,
"active" bool) external name sql.sessions;
+create function sys.sessions() returns table("sessionid" int, "user" string,
"login" timestamp, "sessiontimeout" bigint,
MonetDB: default - Approve 32 bit output.
Changeset: d2e5824e0759 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d2e5824e0759
Added Files:
sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.err.32bit
sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.32bit
Branch: default
Log Message:
Approve 32 bit output.
diffs (136 lines):
diff --git
a/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.err.32bit
b/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.err.32bit
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.err.32bit
@@ -0,0 +1,89 @@
+stderr of test 'offset_limited_32bit.SF-2950579` in directory
'sql/test/BugTracker-2010` itself:
+
+
+# 09:37:07 >
+# 09:37:07 > mserver5
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=33568 --set
xrpc_port=42121 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
+# 09:37:07 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.36.0
+# builtin opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = tst
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
+# builtin opt gdk_debug = 8
+# builtin opt gdk_alloc_map = yes
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${exec_prefix}/lib/MonetDB
+# builtin opt monet_daemon = yes
+# builtin opt host = localhost
+# builtin opt mapi_port = 5
+# builtin opt mapi_noheaders = no
+# builtin opt mapi_debug = 0
+# builtin opt mapi_clients = 2
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt gdk_dbname = demo
+# config opt gdk_alloc_map = no
+# config opt gdk_embedded = no
+# config opt gdk_debug = 0
+# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
+# config opt monet_daemon = no
+# config opt monet_welcome = yes
+# config opt mero_msglog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt mero_errlog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
+# config opt mal_listing = 2
+# config opt mapi_port = 5
+# config opt mapi_autosense = false
+# config opt mapi_open = false
+# config opt sql_optimizer = default_pipe
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,replication,multiplex
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,garbageCollector,dataflow,history,multiplex
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,garbageCollector,dataflow,history,multiplex
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# config opt octopus_pipe =
MonetDB: default - approve 32-bit output
Changeset: 269ebc371345 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=269ebc371345
Modified Files:
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
Branch: default
Log Message:
approve 32-bit output
diffs (truncated from 832 to 300 lines):
diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
@@ -50,30 +50,30 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 78 # length
-function user.s0_1{autoCommit=true}(A0:bte,A1:bte,A2:bte,A3:date,A4:lng):void;
+% 602 # length
+function user.s2_1{autoCommit=true}(A0:bte,A1:bte,A2:bte,A3:date,A4:lng):void;
X_7 := sql.mvc();
X_11 := sql.bind(X_7,sys,lineitem,l_shipdate,0);
X_8:bat[:oid,:oid] := sql.tid(X_7,sys,lineitem);
X_19 := mtime.date_sub_msec_interval(A3,A4);
-X_199 := algebra.thetasubselect(X_11,X_8,X_19,=);
+X_183 := algebra.thetasubselect(X_11,X_8,X_19,=);
(X_14,r1_14) := sql.bind(X_7,sys,lineitem,l_shipdate,2);
-X_200 := algebra.thetasubselect(r1_14,X_19,=);
+X_184 := algebra.thetasubselect(r1_14,X_19,=);
X_17 := sql.bind(X_7,sys,lineitem,l_shipdate,1);
-X_201 := algebra.thetasubselect(X_17,X_8,X_19,=);
-X_20 := sql.subdelta(X_199,X_8,X_14,X_200,X_201);
-X_22 := sql.bind(X_7,sys,lineitem,l_linestatus,0);
-(X_24,r1_28) := sql.bind(X_7,sys,lineitem,l_linestatus,2);
-X_26 := sql.bind(X_7,sys,lineitem,l_linestatus,1);
+X_185 := algebra.thetasubselect(X_17,X_8,X_19,=);
+X_20 := sql.subdelta(X_183,X_8,X_14,X_184,X_185);
+X_22 := sql.bind(X_7,sys,lineitem,l_returnflag,0);
+(X_24,r1_28) := sql.bind(X_7,sys,lineitem,l_returnflag,2);
+X_26 := sql.bind(X_7,sys,lineitem,l_returnflag,1);
X_27 := sql.projectdelta(X_20,X_22,X_24,r1_28,X_26);
-X_28 := sql.bind(X_7,sys,lineitem,l_returnflag,0);
-(X_30,r1_36) := sql.bind(X_7,sys,lineitem,l_returnflag,2);
-X_32 := sql.bind(X_7,sys,lineitem,l_returnflag,1);
+X_28 := sql.bind(X_7,sys,lineitem,l_linestatus,0);
+(X_30,r1_36) := sql.bind(X_7,sys,lineitem,l_linestatus,2);
+X_32 := sql.bind(X_7,sys,lineitem,l_linestatus,1);
X_33 := sql.projectdelta(X_20,X_28,X_30,r1_36,X_32);
(X_34,r1_42,r2_42) := group.subgroup(X_33);
(X_37,r1_45,r2_45) := group.subgroupdone(X_27,X_34);
-X_40 := algebra.leftfetchjoin(r1_45,X_27);
-X_41 := algebra.leftfetchjoin(r1_45,X_33);
+X_40 := algebra.leftfetchjoin(r1_45,X_33);
+X_41 := algebra.leftfetchjoin(r1_45,X_27);
X_51 := sql.bind(X_7,sys,lineitem,l_quantity,0);
(X_56,r1_64) := sql.bind(X_7,sys,lineitem,l_quantity,2);
X_59 := sql.bind(X_7,sys,lineitem,l_quantity,1);
@@ -104,53 +104,39 @@ function user.s0_1{autoCommit=true}(A0:b
X_101:bat[:oid,:lng] := batcalc.*(X_90,X_100);
X_102:bat[:oid,:lng] := aggr.subsum(X_101,X_37,r1_45,true,true);
X_105 := batcalc.dbl(X_61);
-X_106:bat[:oid,:dbl] := aggr.subsum(X_105,X_37,r1_45,true,true);
-X_107:bat[:oid,:wrd] := aggr.subcount(X_105,X_37,r1_45,true);
-X_115:bat[:oid,:dbl] := batcalc.dbl(2,X_70);
-X_117:bat[:oid,:dbl] := aggr.subsum(X_115,X_37,r1_45,true,true);
-X_118:bat[:oid,:wrd] := aggr.subcount(X_115,X_37,r1_45,true);
-X_124:bat[:oid,:dbl] := batcalc.dbl(2,X_82);
-X_125:bat[:oid,:dbl] := aggr.subsum(X_124,X_37,r1_45,true,true);
-X_127:bat[:oid,:wrd] := aggr.subcount(X_124,X_37,r1_45,true);
-X_133:bat[:oid,:wrd] := aggr.subcount(X_37,X_37,r1_45,false);
+X_106:bat[:oid,:dbl] := aggr.subavg(X_105,X_37,r1_45,true,true);
+X_108:bat[:oid,:dbl] := batcalc.dbl(2,X_70);
+X_109:bat[:oid,:dbl] := aggr.subavg(X_108,X_37,r1_45,true,true);
+X_111:bat[:oid,:dbl] := batcalc.dbl(2,X_82);
+X_112:bat[:oid,:dbl] := aggr.subavg(X_111,X_37,r1_45,true,true);
+X_114:bat[:oid,:wrd] := aggr.subcount(X_37,X_37,r1_45,false);
(X_42,r1_50,r2_50) := algebra.subsort(X_41,false,false);
(X_46,r1_54,r2_54) := algebra.subsort(X_40,r1_50,r2_50,false,false);
X_49 := algebra.leftfetchjoin(r1_54,X_41);
-X_135 := algebra.leftfetchjoin(r1_54,X_133);
-X_128:bat[:oid,:bit] := batcalc.==(X_127,0:wrd);
-X_129 := batcalc.dbl(X_127);
-X_130:bat[:oid,:dbl] := batcalc.ifthenelse(X_128,nil:dbl,X_129);
-X_131:bat[:oid,:dbl] := batcalc./(X_125,X_130);
-X_132 := algebra.leftfetchjoin(r1_54,X_131);
-X_119:bat[:oid,:bit] := batcalc.==(X_118,0:wrd);
-X_120 := batcalc.dbl(X_118);
-X_121:bat[:oid,:dbl] :=
