MonetDB: default - Approve output.
Changeset: 3824f6537ff9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3824f6537ff9
Modified Files:
sql/test/rel-optimizers/Tests/merge-ors-multi-col-eq-to-cmp_in.test
Branch: default
Log Message:
Approve output.
diffs (27 lines):
diff --git
a/sql/test/rel-optimizers/Tests/merge-ors-multi-col-eq-to-cmp_in.test
b/sql/test/rel-optimizers/Tests/merge-ors-multi-col-eq-to-cmp_in.test
--- a/sql/test/rel-optimizers/Tests/merge-ors-multi-col-eq-to-cmp_in.test
+++ b/sql/test/rel-optimizers/Tests/merge-ors-multi-col-eq-to-cmp_in.test
@@ -114,9 +114,9 @@ plan select * from b where (m = 40 and k
project (
| select (
-| | table("sys"."b") [ "b"."n", "b"."m", "b"."k" UNIQUE ]
-| ) [ (( [ "b"."m", "b"."k" UNIQUE ]) in ( [ int(8) "20", int(11) "200" ], [
int(8) "60", int(11) "600" ])) or (("b"."m") = (int(8) "40"), ("b"."k" UNIQUE)
> (int(11) "0")) ]
-) [ "b"."n", "b"."m", "b"."k" UNIQUE ]
+| | table("sys"."b") [ "b"."n" NOT NULL, "b"."m" NOT NULL, "b"."k" NOT NULL ]
+| ) [ (( [ "b"."m" NOT NULL, "b"."k" NOT NULL ]) in ( [ int(8) "20", int(11)
"200" ], [ int(8) "60", int(11) "600" ])) or (("b"."m" NOT NULL) = (int(8)
"40"), ("b"."k" NOT NULL) > (int(11) "0")) ]
+) [ "b"."n" NOT NULL, "b"."m" NOT NULL, "b"."k" NOT NULL ]
query II rowsort
select m, k from b where (m = 40) or (m = 20 and k = 200) or (m = 0) or (m =
60 and k = 600) or (m = 180)
@@ -148,7 +148,7 @@ plan select m, k from b where (m = 40) o
project (
| select (
-| | table("sys"."b") [ "b"."m", "b"."k" UNIQUE ]
-| ) [ (("b"."m") in (int(8) "40", int(8) "0", int(8) "180")) or (( [ "b"."m",
"b"."k" UNIQUE ]) in ( [ int(8) "20", int(11) "200" ], [ int(8) "60", int(11)
"600" ])) ]
-) [ "b"."m", "b"."k" UNIQUE ]
+| | table("sys"."b") [ "b"."m" NOT NULL, "b"."k" NOT NULL ]
+| ) [ (("b"."m" NOT NULL) in (int(8) "40", int(8) "0", int(8) "180")) or (( [
"b"."m" NOT NULL, "b"."k" NOT NULL ]) in ( [ int(8) "20", int(11) "200" ], [
int(8) "60", int(11) "600" ])) ]
+) [ "b"."m" NOT NULL, "b"."k" NOT NULL ]
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Approve output now that imprints have again b...
Changeset: 99f781b19c21 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/99f781b19c21 Modified Files: sql/test/BugTracker-2016/Tests/storagemodel.test Branch: default Log Message: Approve output now that imprints have again been disabled. diffs (12 lines): diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.test b/sql/test/BugTracker-2016/Tests/storagemodel.test --- a/sql/test/BugTracker-2016/Tests/storagemodel.test +++ b/sql/test/BugTracker-2016/Tests/storagemodel.test @@ -173,7 +173,7 @@ smallint writable 2 0 -1 +0 statement ok call sys.storagemodelinit() ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
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 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 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, NULL,
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 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 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 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), "c
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 sy
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 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 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] ", "CMDbat
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, s.
MonetDB: default - approve output
Changeset: 63956e923864 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=63956e923864 Modified Files: monetdb5/mal/Tests/tst161.stable.err Branch: default Log Message: approve output diffs (11 lines): diff --git a/monetdb5/mal/Tests/tst161.stable.err b/monetdb5/mal/Tests/tst161.stable.err --- a/monetdb5/mal/Tests/tst161.stable.err +++ b/monetdb5/mal/Tests/tst161.stable.err @@ -42,7 +42,6 @@ QUERY = # testing definition of new atom z:= mytype.l(); io.print(z); ERROR = !TypeException:mytype.l[0]:constant coercion error from int to mytype -!TypeException:mytype.l[0]:improper variable id # 13:20:34 > # 13:20:34 > "Done." ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 4e89e4e893b8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4e89e4e893b8 Modified Files: sql/test/scanner/Tests/raw_strings.stable.err sql/test/scanner/Tests/raw_strings.stable.out Branch: default Log Message: Approve output diffs (123 lines): diff --git a/sql/test/scanner/Tests/raw_strings.stable.err b/sql/test/scanner/Tests/raw_strings.stable.err --- a/sql/test/scanner/Tests/raw_strings.stable.err +++ b/sql/test/scanner/Tests/raw_strings.stable.err @@ -0,0 +1,30 @@ +stderr of test 'raw_strings` in directory 'sql/test/scanner` itself: + + +# 13:58:26 > +# 13:58:26 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37621" "--set" "mapi_usock=/var/tmp/mtest-27871/.s.monetdb.37621" "--forcemito" "--dbpath=/home/kutsurak/work/src/monet/worktrees/master/build/install/var/MonetDB/mTests_sql_test_scanner" "--set" "embedded_c=true" +# 13:58:26 > + +# builtin opt gdk_dbpath = /home/kutsurak/work/src/monet/worktrees/master/build/install/var/monetdb5/dbfarm/demo +# builtin opt mapi_port = 5 +# builtin opt mapi_open = false +# builtin opt mapi_ipv6 = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 37621 +# cmdline opt mapi_usock = /var/tmp/mtest-27871/.s.monetdb.37621 +# cmdline opt gdk_dbpath = /home/kutsurak/work/src/monet/worktrees/master/build/install/var/MonetDB/mTests_sql_test_scanner +# cmdline opt embedded_c = true + +# 13:58:26 > +# 13:58:26 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-27871" "--port=37621" +# 13:58:26 > + + +# 13:58:26 > +# 13:58:26 > "Done." +# 13:58:26 > + diff --git a/sql/test/scanner/Tests/raw_strings.stable.out b/sql/test/scanner/Tests/raw_strings.stable.out --- a/sql/test/scanner/Tests/raw_strings.stable.out +++ b/sql/test/scanner/Tests/raw_strings.stable.out @@ -0,0 +1,85 @@ +stdout of test 'raw_strings` in directory 'sql/test/scanner` itself: + + +# 13:58:26 > +# 13:58:26 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37621" "--set" "mapi_usock=/var/tmp/mtest-27871/.s.monetdb.37621" "--forcemito" "--dbpath=/home/kutsurak/work/src/monet/worktrees/master/build/install/var/MonetDB/mTests_sql_test_scanner" "--set" "embedded_c=true" +# 13:58:26 > + +# MonetDB 5 server v11.36.0 (hg id: b0c3d06a15 (git)) +# This is an unreleased version +# Serving database 'mTests_sql_test_scanner', using 4 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers +# Found 15.488 GiB available main-memory of which we use 12.622 GiB +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://zarquon.zarniwoop.org:37621/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-27871/.s.monetdb.37621 +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_querylog.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_temporal.sql +# loading sql script: 18_index.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_views.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 25_debug.sql +# loading sql script: 26_sysmon.sql +# loading sql script: 27_rejects.sql +# loading sql script: 39_analytics.sql +# loading sql script: 39_analytics_hge.sql +# loading sql script: 40_json.sql +# loading sql script: 40_json_hge.sql +# loading sql script: 41_md5sum.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_profiler.sql +# loading sql script: 51_sys_schema_extension.sql +# loading sql script: 58_hot_snapshot.sql +# loading sql script: 60_wlcr.sql +# loading sql script: 61_wlcr.sql +# loading sql script: 72_fits.sql +# loading sql script: 74_netcdf.sql +# loading sql script: 75_lidar.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 80_udf_hge.sql +# loading sql script: 85_bam.sql +# loading sql script: 90_generator.sql +# loading sql script: 90_generator_hge.sql +# loading sql script: 99_system.sql +# MonetDB/SQL module loaded + +# 13:58:26 > +# 13:58:26 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-27871" "--port=37621" +# 13:58:26 > + +#SELECT r'\"'; +% . # table_name +% single_value # name +% char # type +% 2 # length +[ "\\\"" ] +#SELECT r; +% . # table_name +% single_value # name +% char # t
MonetDB: default - Approve output
Changeset: b7748b51b521 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b7748b51b521 Modified Files: sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 Branch: default Log Message: Approve output diffs (22 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 @@ -737,7 +737,6 @@ stdout of test 'systemfunctions` in dire [ "sys", "host", 1, "inet", "" ] [ "sys", "hostmask", 0, "inet", "create function \"hostmask\" (p inet) returns inet\n external name inet.\"hostmask\";" ] [ "sys", "hostmask", 1, "inet", "" ] -[ "sys", "hot_snapshot", 0, "clob", "create procedure hot_snapshot(tarfile string)\n external name sql.hot_snapshot;" ] [ "sys", "hour", 0, "int", "hours" ] [ "sys", "hour", 1, "time", "" ] [ "sys", "hour", 0, "int", "hours" ] diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 --- a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 +++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 @@ -783,7 +783,6 @@ stdout of test 'systemfunctions` in dire [ "sys", "host", 1, "inet", "" ] [ "sys", "hostmask", 0, "inet", "create function \"hostmask\" (p inet) returns inet\n external name inet.\"hostmask\";" ] [ "sys", "hostmask", 1, "inet", "" ] -[ "sys", "hot_snapshot", 0, "clob", "create procedure hot_snapshot(tarfile string)\n external name sql.hot_snapshot;" ] [ "sys", "hour", 0, "int", "hours" ] [ "sys", "hour", 1, "time", "" ] [ "sys", "hour", 0, "int", "hours" ] ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 4bd393d1b4e8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4bd393d1b4e8 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 output diffs (45 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 @@ -11138,7 +11138,7 @@ stdout of test 'MAL-signatures` in direc [ "iterator", "next", "command iterator.next(step:sht, last:sht):sht ", "ITRnext_sht;", "" ] [ "json", "#fromstr", "command json.#fromstr():void ", "JSONfromString;", "Validate a string to be JSON compliant. A NOOP if valid json, NULL otherwise." ] [ "json", "#tostr", "command json.#tostr():void ", "JSONtoString;","Convert JSON to its string equivalent. Dealing with escape characters" ] -[ "json", "dump", "command json.dump(j:json):void ", "JSONdump;", "" ] +[ "json", "dump", "pattern json.dump(j:json):void ", "JSONdump;", "" ] [ "json", "filter", "command json.filter(name:json, pathexpr:str):json ", "JSONfilter;", "Filter all members of an object by a path expression, returning an array.\nNon-matching elements are skipped." ] [ "json", "filter", "command json.filter(name:json, idx:bte, other:str):json ", "JSONfilterArrayDefault_bte;", "" ] [ "json", "filter", "command json.filter(name:json, idx:int, other:str):json ", "JSONfilterArrayDefault_int;", "" ] 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 @@ -15539,7 +15539,7 @@ stdout of test 'MAL-signatures` in direc [ "iterator", "next", "command iterator.next(step:sht, last:sht):sht ", "ITRnext_sht;", "" ] [ "json", "#fromstr", "command json.#fromstr():void ", "JSONfromString;", "Validate a string to be JSON compliant. A NOOP if valid json, NULL otherwise." ] [ "json", "#tostr", "command json.#tostr():void ", "JSONtoString;","Convert JSON to its string equivalent. Dealing with escape characters" ] -[ "json", "dump", "command json.dump(j:json):void ", "JSONdump;", "" ] +[ "json", "dump", "pattern json.dump(j:json):void ", "JSONdump;", "" ] [ "json", "filter", "command json.filter(name:json, pathexpr:str):json ", "JSONfilter;", "Filter all members of an object by a path expression, returning an array.\nNon-matching elements are skipped." ] [ "json", "filter", "command json.filter(name:json, idx:bte, other:str):json ", "JSONfilterArrayDefault_bte;", "" ] [ "json", "filter", "command json.filter(name:json, idx:int, other:str):json ", "JSONfilterArrayDefault_int;", "" ] 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 @@ -161,7 +161,7 @@ bool BATordered(BAT *b); bool BATordered_rev(BAT *b); gdk_return BATorderidx(BAT *b, bool stable); gdk_return BATouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, bool nil_matches, BUN estimate) __attribute__((__warn_unused_result__)); -gdk_return BATprint(BAT *b); +gdk_return BATprint(stream *s, BAT *b); gdk_return BATprintcolumns(stream *s, int argc, BAT *argv[]); gdk_return BATprod(void *res, int tp, BAT *b, BAT *s, bool skip_nils, bool abort_on_error, bool nil_if_empty); BAT *BATproject(BAT *l, BAT *r); @@ -1300,7 +1300,7 @@ str ITRnext_int(int *i, int *step, int * str ITRnext_lng(lng *i, lng *step, lng *last); str ITRnext_oid(oid *i, oid *step, oid *last); str ITRnext_sht(sht *i, sht *step, sht *last); -str JSONdump(void *ret, json *val); +str JSONdump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str JSONfilter(json *ret, json *js, str *expr); str JSONfilterArrayDefault_bte(json *ret, json *j, bte *index, str *other); str JSONfilterArrayDefault_hge(json *ret, json *j, hge *index, str *other); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 8bf6f20889e1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8bf6f20889e1
Modified Files:
sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
Branch: default
Log Message:
Approve output
diffs (40 lines):
diff --git
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
---
a/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
+++
b/sql/test/BugTracker-2018/Tests/sqlitelogictest-having-not-null-not-in.Bug-6557.stable.out
@@ -40,27 +40,23 @@ stdout of test 'sqlitelogictest-having-n
[ 0, 79, 26 ]
[ 81, 24, 43 ]
#SELECT CAST(SUM(col0) AS BIGINT) FROM tab0 WHERE + + col0 BETWEEN NULL AND +
col2;
-% sys.L4 # table_name
-% L4 # name
+% sys.L3 # table_name
+% L3 # name
% bigint # type
% 1 # length
[ NULL ]
#SELECT CAST(SUM(col0) AS BIGINT) FROM tab0 WHERE + + col0 NOT BETWEEN NULL
AND + col2;
-% sys.L4 # table_name
-% L4 # name
+% sys.L3 # table_name
+% L3 # name
% bigint # type
% 1 # length
-[ NULL ]
-#debug SELECT CAST(SUM(col0) AS BIGINT) FROM tab0 WHERE + + col0 NOT BETWEEN
NULL AND + col2;
-mdb>#X_2=0@0:void := querylog.define("debug select cast(sum(col0) as bigint)
from tab0 where + + col0 not between null and + col2;", "default_pipe", 24:int);
-mdb>#barrier X_137=false := language.dataflow();
-mdb>#X_5=0 := sql.mvc();
-mdb>#X_92=nil:bat[:int] := sql.bind(X_5=0, "sys", "tab0", "col0", 0:int,
0:int, 3:int);
-% sys.L4 # table_name
-% L4 # name
+[ 126 ]
+#finish
+% sys.L3 # table_name
+% L3 # name
% bigint # type
% 1 # length
-[ NULL ]
+[ 126 ]
mdb>#EOD
#DROP TABLE tab0;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output.
Changeset: cf69fc978781 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf69fc978781 Modified Files: sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out Branch: default Log Message: Approve output. diffs (14 lines): diff --git a/sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out b/sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out --- a/sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out +++ b/sql/jdbc/tests/Tests/Bug_LargeQueries_6571_6693.stable.out @@ -18,7 +18,9 @@ stdout of test 'Bug_LargeQueries_6571_66 # MonetDB/GIS module loaded # MonetDB/SQL module loaded -Ready. +# 09:56:55 > +# 09:56:55 > "./Bug_LargeQueries_6571_6693.SQL.sh" "Bug_LargeQueries_6571_6693" +# 09:56:55 > # 18:48:54 > # 18:48:54 > "./Bug_LargeQueries_6571_6693.SQL.sh" "Bug_LargeQueries_6571_6693" ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output.
Changeset: 2df3d7626e88 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2df3d7626e88
Modified Files:
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out
sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out
Branch: default
Log Message:
Approve output.
diffs (147 lines):
diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
--- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
@@ -29,19 +29,19 @@ stdout of test 'crash_on_alias.Bug-2798`
% .plan # table_name
% rel # name
% clob # type
-% 105 # length
+% 109 # length
project (
| project (
| | group by (
| | | table(sys.dbg) [ "dbg"."a", "dbg"."b" ] COUNT
-| | ) [ "dbg"."a" as "d" ] [ "dbg"."d", sys.sum no nil ("dbg"."b") as
"L1"."L1", "L1"."L1" as "L2"."L2" ]
-| ) [ "dbg"."d", "L1"."L1", sys.sql_mul(sys.sql_div("L2"."L2", tinyint "2"),
tinyint "2") as "L3"."f" ]
-) [ "dbg"."d", "L1"."L1", "L3"."f" ]
+| | ) [ "dbg"."a" as "d" ] [ "d", sys.sum no nil ("dbg"."b") as "L2"."L2",
"L2"."L2" as "L3"."L3" ]
+| ) [ "d" as "L1"."d", "L2"."L2", sys.sql_mul(sys.sql_div("L3"."L3", tinyint
"2"), tinyint "2") as "L4"."f" ]
+) [ "L1"."d", "L2"."L2", "L4"."f" ]
#set optimizer = 'sequential_pipe';
#set optimizer = 'default_pipe';
#SELECT a as d, SUM(b), (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP BY d;
-% sys.dbg, sys.L1, sys.L3 # table_name
-% d, L1, f # name
+% sys.L1, sys.L2, sys.L4 # table_name
+% d, L2, f # name
% int, bigint, bigint # type
% 2,2, 2 # length
[ 10, 10, 10 ]
diff --git
a/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
b/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
---
a/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
+++
b/sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
@@ -138,21 +138,21 @@ stdout of test 'column_alias_in_where_cl
% char,int,varchar # type
% 1, 1, 0 # length
#SELECT a AS "A", b AS "B", c AS "C" FROM t_alias ORDER BY "C", "A", "B";
-% sys.L2, sys.L4, sys.L6 # table_name
+% sys.L1, sys.L2, sys.L3 # table_name
% A, B, C # name
% int, int,varchar # type
% 2, 2, 4 # length
[ 11, 2, "elf" ]
[ 1, 10, "tien" ]
#SELECT a*b AS "A*B", c AS "C" FROM t_alias GROUP BY "C", "A*B";
-% sys.L2, sys.t_alias # table_name
+% sys.L1, sys.L2 # table_name
% A*B, C # name
% bigint, varchar # type
% 2, 4 # length
[ 10, "tien" ]
[ 22, "elf" ]
#SELECT a*b*b AS "A*B", c AS "C" FROM t_alias GROUP BY "C", "A*B" HAVING "A*B"
IS NOT NULL ORDER BY -"A*B";
-% sys.L2, sys.t_alias # table_name
+% sys.L1, sys.L2 # table_name
% A*B, C # name
% bigint, varchar # type
% 3, 4 # length
diff --git
a/sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out
b/sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out
--- a/sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out
+++ b/sql/test/BugTracker-2019/Tests/view-too-few-rows.Bug-6736.stable.out
@@ -57,11 +57,9 @@ stdout of test 'view-too-few-rows.Bug-67
# loading sql script: 99_system.sql
# MonetDB/SQL module loaded
-Ready.
-
-# 11:46:36 >
-# 11:46:36 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25842" "--port=36855"
-# 11:46:36 >
+# 09:25:08 >
+# 09:25:08 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20368" "--port=37000"
+# 09:25:08 >
#start transaction;
#CREATE SCHEMA "dw_hospital";
@@ -298,7 +296,7 @@ Ready.
#where "facts_costi"."periodo_id" = "dim_periodi"."id"
#and "facts_costi"."classe_movimento_id" = "classi"."id"
#and "classi"."id" = "bri_classi_gruppi_movimenti"."classe_movimento_id"
-% .L72,.L74, .L77 # table_name
+% .L37,.L40, .L42 # table_name
% c0, c1, m0 # name
% int, varchar,bigint # type
% 4, 4, 1 # length
diff --git a/sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out
b/sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out
--- a/sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out
+++ b/sql/test/BugTracker/Tests/groupby_with_alias.SF-1520575.stable.out
@@ -1,36 +1,37 @@
stdout of test 'groupby_with_alias.SF-1520575` in directory
'sql/test/BugTracker` itself:
-# 14:11:48 >
-# 14:11:48 > Mtimeout -timeout 180 mserver5
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib
MonetDB: default - Approve output.
Changeset: a6e276f97268 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6e276f97268 Modified Files: sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 Branch: default Log Message: Approve output. diffs (46 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 @@ -25,7 +25,7 @@ stdout of test 'systemfunctions` in dire # and f.id = a.func_id # and f.system # order by s.name, f.name, f.id, a.number; -% sys.L2, sys.L4, sys.L6, sys.L10,sys.L12 # table_name +% sys.L1, sys.L2, sys.L3, sys.L4, sys.L5 # table_name % schema, function, argno, argtype,definition # name % varchar, varchar,int,varchar,varchar # type % 8, 24, 2, 14, 705 # length @@ -517,6 +517,10 @@ stdout of test 'systemfunctions` in dire [ "sys", "decade", 1, "timestamptz", "" ] [ "sys", "degrees", 0, "double", "create function degrees(r double)\nreturns double\n return r*180/pi();"] [ "sys", "degrees", 1, "double", "" ] +[ "sys", "deltas", 0, "bigint", "create function sys.deltas (\"schema\" string, \"table\" string, \"column\" string)\n returns table (\"values\" bigint)\n external name \"sql\".\"deltas\";" ] +[ "sys", "deltas", 1, "clob", "" ] +[ "sys", "deltas", 2, "clob", "" ] +[ "sys", "deltas", 3, "clob", "" ] [ "sys", "dense_rank", 0, "int", "dense_rank"] [ "sys", "dense_rank", 1, "any", "" ] [ "sys", "dense_rank", 2, "boolean", "" ] diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 --- a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 +++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 @@ -25,7 +25,7 @@ stdout of test 'systemfunctions` in dire # and f.id = a.func_id # and f.system # order by s.name, f.name, f.id, a.number; -% sys.L2, sys.L4, sys.L6, sys.L10,sys.L12 # table_name +% sys.L1, sys.L2, sys.L3, sys.L4, sys.L5 # table_name % schema, function, argno, argtype,definition # name % varchar, varchar,int,varchar,varchar # type % 8, 24, 2, 14, 705 # length @@ -553,6 +553,10 @@ stdout of test 'systemfunctions` in dire [ "sys", "decade", 1, "timestamptz", "" ] [ "sys", "degrees", 0, "double", "create function degrees(r double)\nreturns double\n return r*180/pi();"] [ "sys", "degrees", 1, "double", "" ] +[ "sys", "deltas", 0, "bigint", "create function sys.deltas (\"schema\" string, \"table\" string, \"column\" string)\n returns table (\"values\" bigint)\n external name \"sql\".\"deltas\";" ] +[ "sys", "deltas", 1, "clob", "" ] +[ "sys", "deltas", 2, "clob", "" ] +[ "sys", "deltas", 3, "clob", "" ] [ "sys", "dense_rank", 0, "int", "dense_rank"] [ "sys", "dense_rank", 1, "any", "" ] [ "sys", "dense_rank", 2, "boolean", "" ] ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output.
Changeset: b20393b055a2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b20393b055a2
Modified Files:
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
Branch: default
Log Message:
Approve output.
diffs (25 lines):
diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
--- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
@@ -34,16 +34,14 @@ project (
| project (
| | group by (
| | | table(sys.dbg) [ "dbg"."a", "dbg"."b" ] COUNT
-| | ) [ "dbg"."a" as "d" ] [ "dbg"."d", sys.sum no nil ("dbg"."b") as
"L3"."L3", "L3"."L3" as "L5"."L5" ]
-| ) [ "dbg"."d", "L3"."L3", sys.sql_mul(sys.sql_div("L5"."L5", tinyint "2"),
tinyint "2") as "L6"."f" ]
-) [ "dbg"."d", "L3"."L3", "L6"."f" ]
+| | ) [ "dbg"."a" as "d" ] [ "dbg"."d", sys.sum no nil ("dbg"."b") as
"L1"."L1", "L1"."L1" as "L2"."L2" ]
+| ) [ "dbg"."d", "L1"."L1", sys.sql_mul(sys.sql_div("L2"."L2", tinyint "2"),
tinyint "2") as "L3"."f" ]
+) [ "dbg"."d", "L1"."L1", "L3"."f" ]
#set optimizer = 'sequential_pipe';
#set optimizer = 'default_pipe';
#SELECT a as d, SUM(b), (2 * (SUM(b) / (SELECT 2))) as f FROM dbg GROUP BY d;
-% sys.dbg, sys., sys. # table_name
-# sys.dbg, sys.L3, sys.L6 # table_name
-% d,L, f # name
-# d,L3, f # name
+% sys.dbg, sys.L1, sys.L3 # table_name
+% d, L1, f # name
% int, bigint, bigint # type
% 2,2, 2 # length
[ 10, 10, 10 ]
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output.
Changeset: a39bf56884af for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a39bf56884af Modified Files: monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.int128 Branch: default Log Message: Approve output. diffs (274 lines): 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 @@ -35,68 +35,69 @@ stdout of test 'inspect05` in directory [ 4@0, "append", "command", "bat", "(i:bat[:any_1], u:bat[:any_1], s:bat[:oid]):bat[:any_1] ", "BKCappend_cand_wrap;" ] [ 5@0, "append", "command", "bat", "(i:bat[:any_1], u:bat[:any_1], force:bit):bat[:any_1] ", "BKCappend_force_wrap;" ] [ 6@0, "attach", "command", "bat", "(i:bat[:any_1], u:bat[:any_1]):bat[:any_1] ", "BKCappend_wrap;" ] -[ 7@0, "delete", "command", "bat", "(sz:lng):bat[:oid] ", "BKCdensebat;" ] -[ 8@0, "delete", "command", "bat", "(b:bat[:any_1]):bat[:any_1] ", "BKCdelete_all;"] -[ 9@0, "delete", "command", "bat", "(b:bat[:any_1], d:bat[:oid]):bat[:any_1] ","BKCdelete_multi;" ] -[ 10@0,"densebat", "command", "bat", "(b:bat[:any_1], h:oid):bat[:any_1] ", "BKCdelete;"] -[ 11@0,"getAccess","pattern", "bat", "(bv:bat[:any_1]):bat[:oid] ", "OIDXgetorderidx;" ] -[ 12@0,"getCapacity", "command", "bat", "(b:bat[:any_1]):str ", "BKCgetBBPname;"] -[ 13@0,"getColumnType","command", "bat", "(b:bat[:any_1]):oid ", "BKCgetSequenceBase;" ] -[ 14@0,"getName", "command", "bat", "(b:bat[:any_1]):str ", "BKCgetAccess;" ] -[ 15@0,"getRole", "command", "bat", "(bid:bat[:any_1]):str ", "BKCgetRole;" ] -[ 16@0,"getSequenceBase", "command", "bat", "(b:bat[:any_1]):str ", "BKCgetColumnType;" ] -[ 17@0,"getSize", "command", "bat", "(b:bat[:any_1]):lng ", "BKCgetCapacity;" ] -[ 18@0,"getorderidx", "command", "bat", "(b:bat[:any_1]):lng ", "BKCgetSize;" ] -[ 19@0,"hasorderidx", "pattern", "bat", "(bv:bat[:any_1]):bit ","OIDXhasorderidx;" ] -[ 20@0,"imprints", "command", "bat", "(b:bat[:dbl]):lng ", "CMDBATimprintsize;"] -[ 21@0,"imprints", "command", "bat", "(b:bat[:flt]):lng ", "CMDBATimprintsize;"] -[ 22@0,"imprints", "command", "bat", "(b:bat[:lng]):lng ", "CMDBATimprintsize;"] -[ 23@0,"imprints", "command", "bat", "(b:bat[:int]):lng ", "CMDBATimprintsize;"] -[ 24@0,"imprints", "command", "bat", "(b:bat[:sht]):lng ", "CMDBATimprintsize;"] -[ 25@0,"imprints", "command", "bat", "(b:bat[:bte]):lng ", "CMDBATimprintsize;"] -[ 26@0,"imprintsize", "command", "bat", "(b:bat[:dbl]):void ", "CMDBATimprints;" ] -[ 27@0,"imprintsize", "command", "bat", "(b:bat[:flt]):void ", "CMDBATimprints;" ] -[ 28@0,"imprintsize", "command", "bat", "(b:bat[:lng]):void ", "CMDBATimprints;" ] -[ 29@0,"imprintsize", "command", "bat", "(b:bat[:int]):void ", "CMDBATimprints;" ] -[ 30@0,"imprintsize", "command", "bat", "(b:bat[:sht]):void ", "CMDBATimprints;" ] -[ 31@0,"imprintsize", "command", "bat", "(b:bat[:bte]):void ", "CMDBATimprints;" ] -[ 32@0,"info", "command", "bat", "(a:bat[:oid], b:bat[:oid]):bat[:oid] ","BKCintersectcand;" ] -[ 33@0,"intersectcand","command", "bat", "(b1:bat[:any_1], b2:bat[:any_2]):bit ","BKCisSynced;" ] -[ 34@0,"isPersistent", "command", "bat", "(b:bat[:any_1]):bit ", "BKCisPersistent;" ] -[ 35@0,"isSorted", "command", "bat", "(b:bat[:any_1]):bit ", "BKCisTransient;" ] -[ 36@0,"isSortedReverse", "command", "bat", "(b:bat[:any_1]):bit ", "BKCisSortedReverse;" ] -[ 37@0,"isSynced", "command", "bat", "(b:bat[:any_1]):bit ", "BKCisSorted;" ] -[ 38@0,"isTransient", "command", "bat", "(b:bat[:any_1]):bit ", "BKCgetKey;"] -[ 39@0,"isaKey", "command", "bat", "(b:bat[:any_1]) (X_0:bat[:str], X_1:bat[:str]) ", "BKCinfo;" ] -[ 40@0,"mergecand","command", "bat", "(a:bat[:oid], b:bat[:oid]):bat[:oid] ","BKCmergecand;" ] -[ 41@0,"mirror", "command", "bat", "(b:bat[:any_2]):bat[:oid] ", "BKCmirror;"] -[ 42@0,"new", "pattern", "bat", "(tt:any_1, size:lng):bat[:any_1] ","CMDBATnew;"] -[ 43@0,"new", "pattern", "bat", "(tt:any_1
MonetDB: default - approve output
Changeset: 737c03680baa for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=737c03680baa Modified Files: sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out Branch: default Log Message: approve output diffs (15 lines): diff --git a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out --- a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out +++ b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out @@ -528,6 +528,11 @@ stdout of test 'check_ForeignKey_referen % id, table_id, column_id, expression, type # name % int, int,int,varchar,tinyint # type % 1, 1, 1, 0, 1 # length +#SELECT * FROM sys.table_partitions WHERE "type" NOT IN (5,6,9,10);-- 5=By Column Range (1+4), 6=By Expression Range (2+4), 9=By Column Value (1+8), 10=By Expression Value (2+8), see sql_catalog.h #define PARTITION_* +% sys.table_partitions,sys.table_partitions, sys.table_partitions, sys.table_partitions, sys.table_partitions # table_name +% id, table_id, column_id, expression, type # name +% int, int,int,varchar,tinyint # type +% 1, 1, 1, 0, 1 # length #SELECT * FROM sys.range_partitions WHERE "table_id" NOT IN (SELECT id FROM sys._tables); % sys.range_partitions,sys.range_partitions, sys.range_partitions, sys.range_partitions, sys.range_partitions # table_name % table_id,partition_id, minimum,maximum,with_nulls # name ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 438489fc0ec4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=438489fc0ec4 Modified Files: sql/test/analytics/Tests/analytics09.sql sql/test/analytics/Tests/analytics09.stable.err sql/test/analytics/Tests/analytics09.stable.out Branch: default Log Message: Approve output diffs (144 lines): diff --git a/sql/test/analytics/Tests/analytics09.sql b/sql/test/analytics/Tests/analytics09.sql --- a/sql/test/analytics/Tests/analytics09.sql +++ b/sql/test/analytics/Tests/analytics09.sql @@ -43,7 +43,7 @@ select cast(sum(aa) * count(aa) / avg(aa select avg(sum(aa)) over (), avg(sum(aa)) over (rows unbounded preceding), cast(sum(aa) * count(aa) / avg(aa) over (rows between current row and unbounded following) as bigint), - avg(sum(aa)) over (range unbounded preceding) from analytics group by aa; --TODO support multiple aggregations within the same projection + avg(sum(aa)) over (range unbounded preceding) from analytics group by aa; select cast(sum(aa) * count(aa) over () as bigint), cast(sum(aa) over () as bigint) from analytics group by aa; @@ -52,15 +52,15 @@ select cast(sum(sum(aa)) over () as bigi cast(sum(aa) * count(count(aa)) over () as bigint) from analytics group by aa; select count(aa) over (), - avg(aa) over () * count(aa) from analytics group by aa; --TODO + avg(aa) over () * count(aa) from analytics group by aa; select cast(sum(aa) over () as bigint), cast(sum(aa) over () as bigint), - cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; --TODO + cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; select 21 - avg(sum(aa)) over (), avg(45 * count(aa) + sum(aa)) over (), - cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; --TODO + cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; select avg(sum(aa)) over (partition by bb) from analytics group by bb; diff --git a/sql/test/analytics/Tests/analytics09.stable.err b/sql/test/analytics/Tests/analytics09.stable.err --- a/sql/test/analytics/Tests/analytics09.stable.err +++ b/sql/test/analytics/Tests/analytics09.stable.err @@ -28,31 +28,7 @@ stderr of test 'analytics09` in director # 13:13:17 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1389" "--port=37694" # 13:13:17 > -MAPI = (monetdb) /var/tmp/mtest-7775/.s.monetdb.35563 -QUERY = select avg(sum(aa)) over (), - avg(sum(aa)) over (rows unbounded preceding), - cast(sum(aa) * count(aa) / avg(aa) over (rows between current row and unbounded following) as bigint), - avg(sum(aa)) over (range unbounded preceding) from analytics group by aa; --TODO support multiple aggregations within the same projection -ERROR = !Cannot use non GROUP BY column 'L3' in query results without an aggregate function -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-2883/.s.monetdb.36767 -QUERY = select count(aa) over (), - avg(aa) over () * count(aa) from analytics group by aa; --TODO -ERROR = !Cannot use non GROUP BY column 'L2' in query results without an aggregate function -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-2883/.s.monetdb.36767 -QUERY = select cast(sum(aa) over () as bigint), - cast(sum(aa) over () as bigint), - cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; --TODO -ERROR = !Cannot use non GROUP BY column in query results without an aggregate function -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-2883/.s.monetdb.36767 -QUERY = select 21 - avg(sum(aa)) over (), - avg(45 * count(aa) + sum(aa)) over (), - cast(sum(aa) * count(aa) over () as bigint) from analytics group by aa; --TODO -ERROR = !Cannot use non GROUP BY column in query results without an aggregate function -CODE = 42000 -MAPI = (monetdb) /var/tmp/mtest-4999/.s.monetdb.31453 +MAPI = (monetdb) /var/tmp/mtest-17924/.s.monetdb.36475 QUERY = select cast(sum(aa) * 100 / sum(sum(aa)) over (partition by bb) as bigint) from analytics; --error, nesting aggregation functions ERROR = !SELECT: identifier 'bb' unknown CODE = 42000 diff --git a/sql/test/analytics/Tests/analytics09.stable.out b/sql/test/analytics/Tests/analytics09.stable.out --- a/sql/test/analytics/Tests/analytics09.stable.out +++ b/sql/test/analytics/Tests/analytics09.stable.out @@ -179,6 +179,22 @@ Ready. [ 1] [ 1] [ 1] +#select avg(sum(aa)) over (), +# avg(sum(aa)) over (rows unbounded preceding), +# cast(sum(aa) * count(aa) / avg(aa) over (rows between current row and unbounded following) as bigint), +# avg(sum(aa)) over (range unbounded preceding) from analytics group by aa; +% sys.L3, sys.L7, sys.L16,sys.L21 # table_name +% L3, L7, L16,L21 # name +% double, double, bigint, double # type
MonetDB: default - Approve output.
Changeset: 0e0dff03be95 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0e0dff03be95 Modified Files: sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out Branch: default Log Message: Approve output. diffs (32 lines): diff --git a/sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out b/sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out --- a/sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out +++ b/sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out @@ -263,7 +263,7 @@ Ready. #select * from system_tables #ORDER BY system, query, name DESC #LIMIT 10; -% .L57,.L57, .L57, .L57, .L57, .L57, .L57, .L57 # table_name +% .L61,.L61, .L61, .L61, .L61, .L61, .L61, .L61 # table_name % name,schema_id, query, type, system, commit_action, access, temporary # name % varchar, int,varchar,smallint, boolean, smallint, smallint, tinyint # type % 13, 4, 177,2, 5, 1, 1, 1 # length @@ -281,7 +281,7 @@ Ready. #INTERSECT #(select * from system_tables UNION select * from system_views) #ORDER BY name DESC; -% .L57,.L57, .L57, .L57, .L57, .L57, .L57, .L57 # table_name +% .L61,.L61, .L61, .L61, .L61, .L61, .L61, .L61 # table_name % name,schema_id, query, type, system, commit_action, access, temporary # name % varchar, int,varchar,smallint, boolean, smallint, smallint, tinyint # type % 0, 1, 0, 1, 5, 1, 1, 1 # length @@ -292,9 +292,7 @@ Ready. % .L53,.L53, .L53, .L53, .L53, .L53, .L53, .L53 # table_name % name,schema_id, query, type, system, commit_action, access, temporary # name % varchar, int,varchar,smallint, boolean, smallint, smallint, tinyint # type -% 9, 4, 0, 1, 5, 1, 1, 1 # length -[ "test10",2000, NULL, 0, false, 0, 0, 0 ] -[ "my_tables", 2000, NULL, 0, false, 0, 0, 0 ] +% 0, 1, 0, 1, 5, 1, 1, 1 # length #DROP VIEW all_tbl_objs; #DROP VIEW all_tables; #DROP VIEW all_views; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output.
Changeset: e72729b7b8dd for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e72729b7b8dd Modified Files: sql/test/Tests/systemfunctions.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128 Branch: default Log Message: Approve output. diffs (truncated from 46346 to 300 lines): diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -249,17 +249,7 @@ Ready. [ "sys", "avg", 0, "double", "avg" ] [ "sys", "avg", 1, "bigint", "" ] [ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "decimal", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "decimal", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "decimal", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "decimal", "" ] -[ "sys", "avg", 0, "double", "avg" ] [ "sys", "avg", 1, "real", "" ] -[ "sys", "avg", 0, "double", "avg" ] -[ "sys", "avg", 1, "double", "" ] [ "sys", "bbp", 0, "int", "create function sys.bbp ()\n returns table (id int, name string,\n ttype string, count bigint, refcnt int, lrefcnt int,\n location string, heat int, dirty string,\n status string, kind string)\n external name bbp.get;" ] [ "sys", "bbp", 1, "clob", "" ] [ "sys", "bbp", 2, "clob", "" ] 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 @@ -828,5009 +828,4994 @@ insert into sys.args values (19200, 233, insert into sys.args values (19201, 233, 'arg_1', 'sec_interval', 13, 0, 1, 1); insert into sys.functions values (234, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); insert into sys.args values (19202, 234, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19203, 234, 'arg_1', 'tinyint', 8, 0, 1, 1); +insert into sys.args values (19203, 234, 'arg_1', 'double', 53, 0, 1, 1); insert into sys.functions values (235, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); insert into sys.args values (19204, 235, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19205, 235, 'arg_1', 'smallint', 16, 0, 1, 1); +insert into sys.args values (19205, 235, 'arg_1', 'tinyint', 8, 0, 1, 1); insert into sys.functions values (236, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); insert into sys.args values (19206, 236, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19207, 236, 'arg_1', 'int', 32, 0, 1, 1); +insert into sys.args values (19207, 236, 'arg_1', 'smallint', 16, 0, 1, 1); insert into sys.functions values (237, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); insert into sys.args values (19208, 237, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19209, 237, 'arg_1', 'bigint', 64, 0, 1, 1); +insert into sys.args values (19209, 237, 'arg_1', 'int', 32, 0, 1, 1); insert into sys.functions values (238, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); insert into sys.args values (19210, 238, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19211, 238, 'arg_1', 'hugeint', 128, 0, 1, 1); +insert into sys.args values (19211, 238, 'arg_1', 'bigint', 64, 0, 1, 1); insert into sys.functions values (239, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); insert into sys.args values (19212, 239, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19213, 239, 'arg_1', 'decimal', 2, 0, 1, 1); +insert into sys.args values (19213, 239, 'arg_1', 'hugeint', 128, 0, 1, 1); insert into sys.functions values (240, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); insert into sys.args values (19214, 240, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19215, 240, 'arg_1', 'decimal', 4, 0, 1, 1); -insert into sys.functions values (241, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, true); -insert into sys.args values (19216, 241, 'res_0', 'double', 53, 0, 0, 0); -insert into sys.args values (19217, 241, 'arg_1', 'decimal', 9, 0, 1, 1); -insert into sys.functions values (242, 'avg', 'avg', 'sql', 0, 6, false, false, false, 2000, t
MonetDB: default - Approve output after changeset f4fd43daab84.
Changeset: 89ebef622a2c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=89ebef622a2c
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 after changeset f4fd43daab84.
diffs (truncated from 1332 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
@@ -123,11 +123,13 @@ Ready.
\dSv sys.queue
\dSv sys.rejects
\dSv sys.roles
+\dSv sys.schemastorage
\dSv sys.sessions
\dSv sys.storage
\dSv sys.storagemodel
\dSv sys.systemfunctions
\dSv sys.tables
+\dSv sys.tablestorage
\dSv sys.tablestoragemodel
\dSv sys.tracelog
\dSv sys.users
@@ -340,7 +342,6 @@ Ready.
\dSf sys."stop"
\dSf sys."stopmaster"
\dSf sys."storage"
-\dSf sys."storagemodel"
\dSf sys."storagemodelinit"
\dSf sys."str_to_date"
\dSf sys."str_to_time"
@@ -433,11 +434,13 @@ SYSTEM VIEW sys.querylog_history
SYSTEM VIEW sys.queue
SYSTEM VIEW sys.rejects
SYSTEM VIEW sys.roles
+SYSTEM VIEW sys.schemastorage
SYSTEM VIEW sys.sessions
SYSTEM VIEW sys.storage
SYSTEM VIEW sys.storagemodel
SYSTEM VIEW sys.systemfunctions
SYSTEM VIEW sys.tables
+SYSTEM VIEW sys.tablestorage
SYSTEM VIEW sys.tablestoragemodel
SYSTEM VIEW sys.tracelog
SYSTEM VIEW sys.users
@@ -788,7 +791,6 @@ SYSTEM AGGREGATEsys.stddev_samp
SYSTEM PROCEDUREsys.stop
SYSTEM PROCEDUREsys.stopmaster
SYSTEM FUNCTION sys.storage
-SYSTEM FUNCTION sys.storagemodel
SYSTEM PROCEDUREsys.storagemodelinit
SYSTEM FUNCTION sys.str_to_date
SYSTEM FUNCTION sys.str_to_time
@@ -859,7 +861,7 @@ CREATE TABLE "sys"."schemas" ("id" INTEG
CREATE TABLE "sys"."sequences" ("id" INTEGER, "schema_id" INTEGER, "name"
VARCHAR(256), "start" BIGINT, "minvalue" BIGINT, "maxvalue" BIGINT, "increment"
BIGINT, "cacheinc" BIGINT, "cycle" BOOLEAN);
CREATE TABLE "sys"."spatial_ref_sys" ("srid" INTEGER NOT NULL, "auth_name"
VARCHAR(256), "auth_srid" INTEGER, "srtext" VARCHAR(2048), "proj4text"
VARCHAR(2048), CONSTRAINT "spatial_ref_sys_srid_pkey" PRIMARY KEY ("srid"));
CREATE TABLE "sys"."statistics" ("column_id" INTEGER, "type" CHARACTER LARGE
OBJECT, "width" INTEGER, "stamp" TIMESTAMP, "sample" BIGINT, "count" BIGINT,
"unique" BIGINT, "nils" BIGINT, "minval" CHARACTER LARGE OBJECT, "maxval"
CHARACTER LARGE OBJECT, "sorted" BOOLEAN, "revsorted" BOOLEAN);
-CREATE TABLE "sys"."storagemodelinput" ("schema" CHARACTER LARGE OBJECT,
"table" CHARACTER LARGE OBJECT, "column" CHARACTER LARGE OBJECT, "type"
CHARACTER LARGE OBJECT, "typewidth" INTEGER, "count" BIGINT, "distinct" BIGINT,
"atomwidth" INTEGER, "reference" BOOLEAN, "sorted" BOOLEAN, "revsorted"
BOOLEAN, "unique" BOOLEAN, "orderidx" BIGINT);
+CREATE TABLE "sys"."storagemodelinput" ("schema" VARCHAR(1024) NOT NULL,
"table" VARCHAR(1024) NOT NULL, "column" VARCHAR(1024) NOT NULL, "type"
VARCHAR(1024) NOT NULL, "typewidth" INTEGER NOT NULL, "count" BIGINT NOT NULL,
"distinct" BIGINT NOT NULL, "atomwidth" INTEGER NOT NULL, "reference" BOOLEAN
NOT NULL, "sorted" BOOLEAN, "revsorted" BOOLEAN, "unique" BOOLEAN,
"orderidxsize" BIGINT NOT NULL);
CREATE TABLE "sys"."table_partitions" ("id" INTEGER, "table_id" INTEGER,
"column_id" INTEGER, "expression" VARCHAR(2048), "type" TINYINT);
CREATE TABLE "sys"."table_types" ("table_type_id" SMALLINT NOT NULL,
"table_type_name" VARCHAR(25) NOT NULL, CONSTRAINT
"table_types_table_type_id_pkey" PRIMARY KEY ("table_type_id"), CONSTRAINT
"table_types_table_type_name_unique" UNIQUE ("table_type_name"));
CREATE TABLE "sys"."triggers" ("id" INTEGER, "name" VARCHAR(1024), "table_id"
INTEGER, "time" SMALLINT, "orientation" SMALLINT, "event" SMALLINT, "old_name"
VARCHAR(1024), "new_name" VARCHAR(1024), "condition" VARCHAR(2048), "statement"
VARCHAR(2048));
@@ -909,12 +911,14 @@ create view sys.querylog_history as sele
create view sys.queue as select * from sys.queue();
create view sys.rejects as select * from sys.rejects();
create view sys.roles as select id, name, grantor from sys.auths a where
a.name not in (select u.name from sys.db_users() u);
+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";
create view sys.sessions as select * from sys.sessions();
-create view sys."storage" as select * from sys."storage"();
-create view sys.storagemodel as select * from sys.storagemodel();
+create view sys."storage" as select * from sys."storage"() order by "schema",
"table", "column";
+create view sys.storagemodel as select "schema", "table", "column", "type",
"count", col
MonetDB: default - approve output
Changeset: 13a8d7ac30bf for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=13a8d7ac30bf Modified Files: sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out Branch: default Log Message: approve output diffs (53 lines): diff --git a/sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out b/sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out --- a/sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out +++ b/sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out @@ -75,7 +75,7 @@ Ready. #SELECT ALL + - 32 * - 32 + - - 76 - - - 43 * COUNT ( * ) + - + 84 * 0 * + + 39 + + 44 * + 76; -- 4401 % .L4 # table_name % L4 # name -% bigint # type +% hugeint # type % 4 # length [ 4401 ] #SELECT 38 + - 63 * 0 * - 13 AS col2; -- 38 @@ -112,13 +112,13 @@ Ready. #SELECT - 13 * - ( + 0 ) + 39 * - COUNT ( * ) * - COUNT ( * ) col1; -- 39 % .L5 # table_name % col1 # name -% bigint # type +% hugeint # type % 2 # length [ 39 ] #SELECT COUNT ( - + 70 ) - - 99 * - 0 AS col2; -- 1 % .L4 # table_name % col2 # name -% bigint # type +% hugeint # type % 1 # length [ 1] #SELECT - ( - - 15 ) + - 53 * - 0; -- -15 @@ -130,7 +130,7 @@ Ready. #SELECT - + 22 * + COUNT ( * ) + - - 58 - + 83 * + MAX ( - 94 * 0 ); -- 36 % .L5 # table_name % L5 # name -% bigint # type +% hugeint # type % 2 # length [ 36 ] #SELECT DISTINCT - 16 + ( + 37 ) - - 56 * - - 11 * - 0 + + MAX ( + 29 ) AS col2; -- 50 @@ -148,13 +148,13 @@ Ready. #SELECT ALL - 30 + + 85, - ( - + 43 ) - 71 + - 0 * - - 78 + - 78 + - - 47 * - 93 + 32 * + SUM ( 90 ) AS col0; -- 55, -1597 % .L2, .L6 # table_name % L2, col0 # name -% smallint,bigint # type +% smallint,hugeint # type % 2, 5 # length [ 55, -1597 ] #SELECT ALL + COUNT ( * ) - - + 0 * - 32; -- 1 % .L4 # table_name % L4 # name -% bigint # type +% hugeint # type % 1 # length [ 1] ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 526859e31e24 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=526859e31e24 Modified Files: sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows Branch: default Log Message: Approve output diffs (24 lines): diff --git a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD --- a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD +++ b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD @@ -37,7 +37,7 @@ Ready. [ 1, "one" ] [ 2, "two" ] #DELETE FROM sys.statistics; -[ 185 ] +[ 199 ] #SELECT /* column_id, */ type, width, /* stamp, */ "sample", "count", "unique", nils, minval, maxval, sorted, revsorted FROM sys.statistics; % sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics # table_name % type,width, sample, count, unique, nils, minval, maxval, sorted, revsorted # name diff --git a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows --- a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows +++ b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows @@ -37,7 +37,7 @@ Ready. [ 1, "one" ] [ 2, "two" ] #DELETE FROM sys.statistics; -[ 185 ] +[ 199 ] #SELECT /* column_id, */ type, width, /* stamp, */ "sample", "count", "unique", nils, minval, maxval, sorted, revsorted FROM sys.statistics; % sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics # table_name % type,width, sample, count, unique, nils, minval, maxval, sorted, revsorted # name ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output for Windows version.
Changeset: a2104265e123 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a2104265e123
Modified Files:
clients/mapiclient/Tests/mclient--help.stable.err
clients/mapiclient/Tests/mclient--help.stable.err.Windows
Branch: default
Log Message:
Approve output for Windows version.
diffs (51 lines):
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err
b/clients/mapiclient/Tests/mclient--help.stable.err
--- a/clients/mapiclient/Tests/mclient--help.stable.err
+++ b/clients/mapiclient/Tests/mclient--help.stable.err
@@ -17,16 +17,16 @@ Options are:
-p portnr | --port=portnr port to connect to
-u user | --user=useruser id
-d database | --database=database database to connect to (may be URI)
- -e | --echoecho the query
+ -e | --echo echo the query
-E charset | --encoding=charset specify encoding (character set) of the
terminal
-f kind | --format=kind specify output format
{csv,tab,raw,sql,xml,trash}
- -H | --history load/save cmdline history (default off)
+ -H | --history load/save cmdline history (default off)
-i | --interactive interpret `\' commands on stdin
-t | --timer=format use time formatting
{clock,minutes,seconds,milliseconds,microseconds,none}
-l language | --language=lang{sql,mal}
- -L logfile | --log=logfile save client/server interaction
- -s stmt | --statement=stmt run single statement
- -X | --Xdebug trace mapi network interaction
+ -L logfile | --log=logfile save client/server interaction
+ -s stmt | --statement=stmt run single statement
+ -X | --Xdebug trace mapi network interaction
-z | --timezone do not tell server our timezone
-| cmd | --pager=cmdfor pagination
-v | --version show version information and exit
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
--- a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
+++ b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
@@ -17,15 +17,16 @@ Options are:
-p portnr | --port=portnr port to connect to
-u user | --user=useruser id
-d database | --database=database database to connect to (may be URI)
- -e | --echoecho the query
+ -e | --echo echo the query
-E charset | --encoding=charset specify encoding (character set) of the
terminal
- -f kind | --format=kind specify output format {csv,tab,raw,sql,xml}
+ -f kind | --format=kind specify output format
{csv,tab,raw,sql,xml,trash}
-H | --history load/save cmdline history (default off)
- -i | --interactive[=tm] interpret `\' commands on stdin, use time
formatting {ms,s,m}
+ -i | --interactive interpret `\' commands on stdin
+ -t | --timer=format use time formatting
{clock,minutes,seconds,milliseconds,microseconds,none}
-l language | --language=lang{sql,mal}
- -L logfile | --log=logfile save client/server interaction
- -s stmt | --statement=stmt run single statement
- -X | --Xdebug trace mapi network interaction
+ -L logfile | --log=logfile save client/server interaction
+ -s stmt | --statement=stmt run single statement
+ -X | --Xdebug trace mapi network interaction
-z | --timezone do not tell server our timezone
-v | --version show version information and exit
-? | --help show this usage message
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output (column coord_dimension from s...
Changeset: a95ff25f58d7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a95ff25f58d7 Modified Files: sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.out sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.out.int128 Branch: default Log Message: Approve output (column coord_dimension from sys.geometry_columns is defined as int in view sys.geometry_columns) diffs (42 lines): diff --git a/sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.out b/sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.out --- a/sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.out +++ b/sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.out @@ -47,7 +47,7 @@ Ready. #where false) then ref_4.auth_srid else ref_4.auth_srid end % .L154 # table_name % c0 # name -% bigint # type +% int # type % 1 # length #select # subq_0.c0 as c0 @@ -73,7 +73,7 @@ Ready. # select % .L364 # table_name % c0 # name -% bigint # type +% int # type % 1 # length #select # cast(coalesce(cast(coalesce(subq_0.c0, diff --git a/sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.out.int128 b/sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.out.int128 --- a/sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.out.int128 +++ b/sql/test/mergetables/Tests/sqlsmith.Bug-6459.stable.out.int128 @@ -47,7 +47,7 @@ Ready. #where false) then ref_4.auth_srid else ref_4.auth_srid end % .L154 # table_name % c0 # name -% hugeint # type +% int # type % 1 # length #select # subq_0.c0 as c0 @@ -73,7 +73,7 @@ Ready. # select % .L364 # table_name % c0 # name -% hugeint # type +% int # type % 1 # length #select # cast(coalesce(cast(coalesce(subq_0.c0, ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 89072f6557fa for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=89072f6557fa Modified Files: monetdb5/optimizer/Tests/GCexample01.stable.out monetdb5/optimizer/Tests/dataflow.stable.out sql/storage/bat/bat_storage.c Branch: default Log Message: Approve output diffs (199 lines): diff --git a/monetdb5/optimizer/Tests/GCexample01.stable.out b/monetdb5/optimizer/Tests/GCexample01.stable.out --- a/monetdb5/optimizer/Tests/GCexample01.stable.out +++ b/monetdb5/optimizer/Tests/GCexample01.stable.out @@ -29,44 +29,44 @@ Ready. # 06:41:05 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-8837" "--port=33343" # 06:41:05 > -function user.qry():void; #[0] (0) 0 type check needed -b:bat[:int] := bat.new(:int); #[1] (0) CMDBATnew 1 <- 2 type check needed -c:bat[:int] := bat.new(:int); #[2] (0) CMDBATnew 3 <- 2 type check needed -d:bat[:int] := bat.new(:int); #[3] (0) CMDBATnew 4 <- 2 type check needed -bat.append(b:bat[:int], 1:int);#[4] (0) BKCappend_val_wrap 5 <- 1 6 type check needed -barrier (x:oid, z:int) := iterator.new(b:bat[:int]); #[5] (0) ITRbunIterator 7 8 <- 1 type check needed -io.print(x:oid); #[6] (0) IOprint_val 9 <- 7 type check needed -exit (x:oid, z:int); #[7] (0) 7 8 type check needed -barrier (x:oid, z:int) := iterator.new(c:bat[:int]); #[8] (0) ITRbunIterator 7 8 <- 3 type check needed -io.print(x:oid); #[9] (0) IOprint_val 10 <- 7 type check needed -redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[10] (0) ITRbunNext 7 8 <- 3 type check needed -exit (x:oid, z:int); #[11] (0) 7 8 type check needed +function user.qry():void; #[0] (0) 0 +b:bat[:int] := bat.new(:int); #[1] (0) CMDBATnew 1 <- 2 +c:bat[:int] := bat.new(:int); #[2] (0) CMDBATnew 3 <- 2 +d:bat[:int] := bat.new(:int); #[3] (0) CMDBATnew 4 <- 2 +bat.append(b:bat[:int], 1:int);#[4] (0) BKCappend_val_wrap 5 <- 1 6 +barrier (x:oid, z:int) := iterator.new(b:bat[:int]); #[5] (0) ITRbunIterator 7 8 <- 1 +io.print(x:oid); #[6] (0) IOprint_val 9 <- 7 +exit (x:oid, z:int); #[7] (0) 7 8 +barrier (x:oid, z:int) := iterator.new(c:bat[:int]); #[8] (0) ITRbunIterator 7 8 <- 3 +io.print(x:oid); #[9] (0) IOprint_val 10 <- 7 +redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[10] (0) ITRbunNext 7 8 <- 3 +exit (x:oid, z:int); #[11] (0) 7 8 # do not close d, it may be reused -barrier go:bit := true:bit;#[13] (0) 12 <- 13 type check needed -io.print(d:bat[:int]); #[14] (0) IOprint_val 14 <- 4 type check needed -redo go:bit := true:bit; #[15] (0) 12 <- 13 type check needed -exit go:bit; #[16] (0) 12 type check needed -end user.qry; #[17] (0) type check needed -#garbagecollector actions= 0 time=12 usec -function user.qry():void; #[0] (0) 0 type check needed -b:bat[:int] := bat.new(:int); #[1] (0) CMDBATnew 1 <- 2 type check needed -c:bat[:int] := bat.new(:int); #[2] (0) CMDBATnew 3 <- 2 type check needed -d:bat[:int] := bat.new(:int); #[3] (0) CMDBATnew 4 <- 2 type check needed -bat.append(b:bat[:int], 1:int);#[4] (0) BKCappend_val_wrap 5 <- 1 6 type check needed -barrier (x:oid, z:int) := iterator.new(b:bat[:int]); #[5] (0) ITRbunIterator 7 8 <- 1 type check needed -io.print(x:oid); #[6] (0) IOprint_val 9 <- 7 type check needed -exit (x:oid, z:int); #[7] (0) 7 8 type check needed -barrier (x:oid, z:int) := iterator.new(c:bat[:int]); #[8] (0) ITRbunIterator 7 8 <- 3 type check needed -io.print(x:oid); #[9] (0) IOprint_val 10 <- 7 type check needed -redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[10] (0) ITRbunNext 7 8 <- 3 type check needed -exit (x:oid, z:int); #[11] (0) 7 8 type check needed +barrier go:bit := true:bit;#[13] (0) 12 <- 13 +io.print(d:bat[:int]); #[14] (0) IOprint_val 14 <- 4 +redo go:bit := true:bit; #[15] (0) 12 <- 13 +exit go:bit; #[16] (0) 12 +end user.qry; #[17] (0) +#garbagecollector actions= 0 time=18 usec +function user.qry():void; #[0] (0) 0 +b:bat[:int] := bat.new(:int); #[1] (0) CMDBATnew 1 <-
MonetDB: default - Approve output
Changeset: 1f86f9524289 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f86f9524289 Modified Files: monetdb5/mal/Tests/tst019.stable.err monetdb5/mal/Tests/tst036.stable.err monetdb5/mal/Tests/tst054.stable.err monetdb5/mal/Tests/tst058.stable.err monetdb5/mal/Tests/tst070.stable.err monetdb5/mal/Tests/tst804.stable.err Branch: default Log Message: Approve output diffs (67 lines): diff --git a/monetdb5/mal/Tests/tst019.stable.err b/monetdb5/mal/Tests/tst019.stable.err --- a/monetdb5/mal/Tests/tst019.stable.err +++ b/monetdb5/mal/Tests/tst019.stable.err @@ -79,7 +79,6 @@ ERROR = !TypeException:user.welcome[3]:t !TypeException:user.welcome0[3]:Multiple assignment mismatch !MALException:user.welcome3[2]:invalid return target! !TypeException:user.welcome4[2]:Multiple assignment mismatch -!TypeException:user.main[5]:'user.welcome2' undefined in: (x:any, y:str) := user.welcome2(1:int); # 13:48:26 > # 13:48:26 > "Done." diff --git a/monetdb5/mal/Tests/tst036.stable.err b/monetdb5/mal/Tests/tst036.stable.err --- a/monetdb5/mal/Tests/tst036.stable.err +++ b/monetdb5/mal/Tests/tst036.stable.err @@ -83,8 +83,6 @@ QUERY = # test for proper use of list as (l2,l3):= 3; (l4,l5) := (4,5,6); ERROR = !TypeException:user.main[6]:Multiple assignment mismatch -!TypeException:user.main[7]:Multiple assignment mismatch -!TypeException:user.main[8]:Multiple assignment mismatch # 17:28:20 > # 17:28:20 > Done. diff --git a/monetdb5/mal/Tests/tst054.stable.err b/monetdb5/mal/Tests/tst054.stable.err --- a/monetdb5/mal/Tests/tst054.stable.err +++ b/monetdb5/mal/Tests/tst054.stable.err @@ -79,7 +79,6 @@ QUERY = function z()( :int,:int,:int,:in ERROR = !SyntaxException:parseError:return (1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0); !SyntaxException:parseError:^ expected !MALException:user.z[2]:invalid return target! -!TypeException:user.main[1]:'user.z' undefined in: user.z(); # 11:11:08 > # 11:11:08 > Done. diff --git a/monetdb5/mal/Tests/tst058.stable.err b/monetdb5/mal/Tests/tst058.stable.err --- a/monetdb5/mal/Tests/tst058.stable.err +++ b/monetdb5/mal/Tests/tst058.stable.err @@ -83,7 +83,6 @@ ERROR = !SyntaxException:parseError:-- s !SyntaxException:parseError: ^';' expected !SyntaxException:parseError:j:= 1 + + 1; !SyntaxException:parseError:^ expected -!TypeException:user.main[3]:'calc.+' undefined in: j:any := calc.+(1:int); # 20:18:21 > # 20:18:21 > Done. diff --git a/monetdb5/mal/Tests/tst070.stable.err b/monetdb5/mal/Tests/tst070.stable.err --- a/monetdb5/mal/Tests/tst070.stable.err +++ b/monetdb5/mal/Tests/tst070.stable.err @@ -38,7 +38,6 @@ QUERY = # parsing operations with multi- (initial:str,surname:str):= user.getName(); end foo; ERROR = !TypeException:user.foo[1]:'user.point' undefined in: (x:any, y:any) := user.point(1:int); -!TypeException:user.foo[2]:'user.getName' undefined in: (initial:str, surname:str) := user.getName(); # 13:02:34 > diff --git a/monetdb5/mal/Tests/tst804.stable.err b/monetdb5/mal/Tests/tst804.stable.err --- a/monetdb5/mal/Tests/tst804.stable.err +++ b/monetdb5/mal/Tests/tst804.stable.err @@ -45,7 +45,6 @@ ERROR = !SyntaxException:parseError:func !SyntaxException:parseError:end message; !SyntaxException:parseError: ^non matching end label !TypeException:user.foo[1]:'wrong.message' undefined in: wrong.message(); -!TypeException:user.foo[2]:'wrongTo.message' undefined in: wrongTo.message(); # 15:26:53 > # 15:26:53 > "Done." ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: e81b2c371bae for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e81b2c371bae Modified Files: sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out Branch: default Log Message: Approve output diffs (40 lines): diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out --- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out +++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out @@ -94,12 +94,12 @@ Operation successful | X_4 := sql.mvc(); | | X_18:bat[:sht] := sql.bind(X_4, "sys", "_tables", "type", 0:int); | | C_5:bat[:oid] := sql.tid(X_4, "sys", "_tables"); | -| C_89 := algebra.thetaselect(X_18, C_5, 2:sht, "!="); | +| C_90 := algebra.thetaselect(X_18, C_5, 2:sht, "!="); | | (C_21:bat[:oid], X_22:bat[:sht]) := sql.bind(X_4, "sys", "_tables", "type", 2:int); | -| C_90 := algebra.thetaselect(X_22, nil:bat[:oid], 2:sht, "!="); | +| C_91 := algebra.thetaselect(X_22, nil:bat[:oid], 2:sht, "!="); | | X_20:bat[:sht] := sql.bind(X_4, "sys", "_tables", "type", 1:int); | -| C_92 := algebra.thetaselect(X_20, C_5, 2:sht, "!="); | -| C_27 := sql.subdelta(C_89, C_5, C_21, C_90, C_92); | +| C_93 := algebra.thetaselect(X_20, C_5, 2:sht, "!="); | +| C_27 := sql.subdelta(C_90, C_5, C_21, C_91, C_93); | | X_8:bat[:str] := sql.bind(X_4, "sys", "_tables", "name", 0:int); | | (C_13:bat[:oid], X_14:bat[:str]) := sql.bind(X_4, "sys", "_tables", "name", 2:int); | | X_11:bat[:str] := sql.bind(X_4, "sys", "_tables", "name", 1:int); | diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out --- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out +++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out @@ -52,12 +52,12 @@ Operation successful | X_4 := sql.mvc(); | | X_18:bat[:sht] := sql.bind(X_4, "sys", "_tables", "type", 0:int); | | C_5:bat[:oid] := sql.tid(X_4, "sys", "_tables"); | -| C_84 := algebra.thetaselect(X_18, C_5, 2:sht, "!="); | +| C_85 := algebra.thetaselect(X_18, C_5, 2:sht, "!="); | | (C_21:bat[:oid], X_22:bat[:sht]) := sql.bind(X_4, "sys", "_tables", "type", 2:int); | -| C_85 := algebra.thetaselect(X_22, nil:bat[:oid], 2:sht, "!="); | +| C_86 := algebra.thetaselect(X_22, nil:bat[:oid], 2:sht, "!="); | | X_20:bat[:sht] := sql.bind(X_4, "sys", "_tables", "type", 1:int); | -| C_87 := algebra.thetaselect(X_20, C_5, 2:sht, "!="); | -| C_27 := sql.subdelta(C_84, C_5, C_21, C_85, C_87); | +| C_88 := algebra.thetaselect(X_20, C_5, 2:sht, "!="); | +| C_27 := sql.subdelta(C_85, C_5, C_21, C_86, C_88); | | X_8:bat[:int] := sql.bind(X_4, "sys", "_tables", "id", 0:int); | | (C_13:bat[:oid], X_14:bat[:int]) := sql.bind(X_4, "sys", "_tables", "id", 2:int); | | X_11:bat[:int] := sql.bind(X_4, "sys", "_tables", "id", 1:int); | ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 72de238f68da for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72de238f68da 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 @@ -2402,6 +2402,7 @@ str putNameLen(const char *nme, size_t l str putRef; str pyapiRef; str pyapimapRef; +int qtop; str queryRef; str querylogRef; str raiseRef; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output.
Changeset: 8d69836baeb6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d69836baeb6 Modified Files: sql/test/quantiles/Tests/quantiles.stable.out Branch: default Log Message: Approve output. diffs (14 lines): diff --git a/sql/test/quantiles/Tests/quantiles.stable.out b/sql/test/quantiles/Tests/quantiles.stable.out --- a/sql/test/quantiles/Tests/quantiles.stable.out +++ b/sql/test/quantiles/Tests/quantiles.stable.out @@ -173,8 +173,8 @@ Ready. % decimal, decimal,decimal # type % 20, 20, 20 # length [ 4424.440,36960.680, 80045.910 ] -[ 3885.880,37144.200, 79010.100 ] -[ 4171.320,35937.880, 78572.760 ] +[ 3889.960,37144.200, 79010.100 ] +[ 4204.470,35937.880, 78572.760 ] #select quantile(l_extendedprice,1) from lit group by l_returnflag; % sys.L3 # table_name % L2 # name ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 73f3c2ad21cd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=73f3c2ad21cd
Modified Files:
monetdb5/optimizer/Tests/dataflow.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:
Approve output
diffs (271 lines):
diff --git a/monetdb5/optimizer/Tests/dataflow.stable.out
b/monetdb5/optimizer/Tests/dataflow.stable.out
--- a/monetdb5/optimizer/Tests/dataflow.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow.stable.out
@@ -40,17 +40,18 @@ barrier X_27:bit := language.dataflow();
t6:bat[:oid] := algebra.select(s:bat[:int], l:int, h:int, true:bit,
true:bit, false:bit); #[13] (0) ALGselect1 19 <- 1 5 6 12 12 14
t7:bat[:oid] := algebra.select(s:bat[:int], l:int, h:int, true:bit,
true:bit, false:bit); #[14] (0) ALGselect1 20 <- 1 5 6 12 12 14
t8:bat[:oid] := algebra.select(s:bat[:int], l:int, h:int, true:bit,
true:bit, false:bit); #[15] (0) ALGselect1 21 <- 1 5 6 12 12 14
-exit X_27:bit; #[16] (0) 27
-z:bat[:oid] := mat.pack(t1:bat[:oid], t2:bat[:oid], t3:bat[:oid],
t4:bat[:oid], t5:bat[:oid], t6:bat[:oid], t7:bat[:oid], t8:bat[:oid]); #[17]
(0) MATpack 9 <- 11 15 16 17 18 19 20 21
-mdb.var(); #[18] (0) MDBvar 22
-c:lng := aggr.count(z:bat[:oid]); #[19] (0) ALGcount_bat 23 <- 9
-io.print(c:lng); #[20] (0) IOprint_val 24 <- 23
-io.print("done":str); #[21] (0) IOprint_val 25 <- 26
-end user.tst; #[22] (0)
-#dataflow actions= 1 time=19 usec
-#garbagecollector actions= 1 time=19 usec
-#Stack 'tst' size=40 top=32
-#[ 1] s (2,2,15) = :bat[:int] rows=10
+language.pass(s:bat[:int]);#[16] (0) MALpass 29 <- 1
+exit X_27:bit; #[17] (0) 27
+z:bat[:oid] := mat.pack(t1:bat[:oid], t2:bat[:oid], t3:bat[:oid],
t4:bat[:oid], t5:bat[:oid], t6:bat[:oid], t7:bat[:oid], t8:bat[:oid]); #[18]
(0) MATpack 9 <- 11 15 16 17 18 19 20 21
+mdb.var(); #[19] (0) MDBvar 22
+c:lng := aggr.count(z:bat[:oid]); #[20] (0) ALGcount_bat 23 <- 9
+io.print(c:lng); #[21] (0) IOprint_val 24 <- 23
+io.print("done":str); #[22] (0) IOprint_val 25 <- 26
+end user.tst; #[23] (0)
+#dataflow actions= 1 time=22 usec
+#garbagecollector actions= 1 time=18 usec
+#Stack 'tst' size=40 top=33
+#[ 1] s (2,2,16) = :bat[:int] rows=10
#[ 2] X_2 (2,2,2) = 0@0 :oid constant
#[ 3] X_3 (2,2,2) = 10 :lng constant
#[ 4] X_4 (2,2,2) = 10 :int constant
diff --git a/sql/test/remote/Tests/partition_elim.stable.out
b/sql/test/remote/Tests/partition_elim.stable.out
--- a/sql/test/remote/Tests/partition_elim.stable.out
+++ b/sql/test/remote/Tests/partition_elim.stable.out
@@ -137,7 +137,7 @@ Ready.
% 117 # length
function user.main():void;
X_5:void := querylog.define("explain select x,y from test where x between
4.0 and 6.0;", "default_pipe", 49:int);
-barrier X_149 := language.dataflow();
+barrier X_143 := language.dataflow();
X_40:bat[:dbl] := bat.new(nil:dbl);
X_8 := sql.mvc();
X_119:bat[:dbl] := sql.bind(X_8, "sys", "test2", "x", 0:int, 0:int, 2:int);
@@ -160,29 +160,18 @@ barrier X_149 := language.dataflow();
X_129 := algebra.projection(C_125, X_122);
X_121:bat[:dbl] := sql.bind(X_8, "sys", "test2", "y", 0:int, 0:int, 2:int);
X_128 := algebra.projection(C_124, X_121);
-language.pass(X_119);
-language.pass(X_120);
-language.pass(C_36);
-language.pass(X_30);
-language.pass(C_125);
-language.pass(C_124);
-exit X_149;
X_42 := bat.append(X_40, X_25, true);
X_43 := bat.append(X_42, X_37, true);
-barrier X_152 := language.dataflow();
X_44:bat[:dbl] := bat.new(nil:dbl);
X_140 := mat.packIncrement(X_128, 2:int);
X_26 := mat.packIncrement(X_140, X_129);
-exit X_152;
X_45 := bat.append(X_44, X_26, true);
X_46 := bat.append(X_45, X_38, true);
-barrier X_155 := language.dataflow();
X_48 := bat.new(nil:str);
X_54 := bat.new(nil:int);
X_52 := bat.new(nil:int);
X_51 := bat.new(nil:str);
X_50 := bat.new(nil:str);
-exit X_155;
X_55 := bat.append(X_48, ".test");
X_57 := bat.append(X_50, "x");
X_59 := bat.append(X_51, "double");
@@ -193,6 +182,13 @@ exit X_155;
X_68 := bat.append(X_59, "double");
X_69 := bat.append(X_61, 53:int);
X_70 := bat.append(X_63, 0:int);
+language.pass(X_119);
+language.pass(X_120);
+language.pass(C_36);
+language.pass(X_30);
+language.pass(C_125);
+language.pass(C_124);
+exit X_143;
sql.resultSet(X_65, X_66, X_68, X_69, X_70, X_43, X_46);
end user.main;
#inline actions= 0 time=3 usec
@@ -226,7 +222,7 @@
MonetDB: default - Approve output
Changeset: 8ed17956f2f4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ed17956f2f4
Modified Files:
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
Branch: default
Log Message:
Approve output
diffs (37 lines):
diff --git
a/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
--- a/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
+++ b/sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
@@ -38,9 +38,7 @@ Ready.
% 112 # length
function user.s4_1():void;
X_2:void := querylog.define("explain select count(*) from tmp where i =
20160222;", "default_pipe", 12:int);
-X_12 := bat.new(nil:int);
-C_14 := algebra.thetaselect(X_12, 20160222:int, "==");
-X_16 := algebra.projection(C_14, X_12);
+X_16 := bat.new(nil:int);
X_17 := aggr.count(X_16);
sql.resultSet("sys.L4", "L3", "bigint", 64:int, 0:int, 7:int, X_17);
end user.s4_1;
@@ -53,9 +51,7 @@ end user.s4_1;
% 118 # length
function user.s6_1():void;
X_2:void := querylog.define("explain select count(*) from tmp where i =
\\'20160222\\';", "default_pipe", 13:int);
-X_12 := bat.new(nil:int);
-C_16 := algebra.thetaselect(X_12, 20160222:int, "==");
-X_18 := algebra.projection(C_16, X_12);
+X_18 := bat.new(nil:int);
X_19 := aggr.count(X_18);
sql.resultSet("sys.L4", "L3", "bigint", 64:int, 0:int, 7:int, X_19);
end user.s6_1;
@@ -68,10 +64,7 @@ end user.s6_1;
% 113 # length
function user.s8_1():void;
X_2:void := querylog.define("explain select count(*) from tmp where i =
201602221;", "default_pipe", 13:int);
-X_12 := bat.new(nil:int);
-X_13:bat[:int] := batcalc.int(0:int, X_12, 9:int, 0:int);
-C_18 := algebra.thetaselect(X_13, 201602221:int, "==");
-X_20 := algebra.projection(C_18, X_12);
+X_20 := bat.new(nil:int);
X_21 := aggr.count(X_20);
sql.resultSet("sys.L4", "L3", "bigint", 64:int, 0:int, 7:int, X_21);
end user.s8_1;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: b297a9fcaa44 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b297a9fcaa44 Modified Files: monetdb5/optimizer/Tests/GCexample01.stable.out monetdb5/optimizer/Tests/tst4006.stable.out Branch: default Log Message: Approve output diffs (102 lines): diff --git a/monetdb5/optimizer/Tests/GCexample01.stable.out b/monetdb5/optimizer/Tests/GCexample01.stable.out --- a/monetdb5/optimizer/Tests/GCexample01.stable.out +++ b/monetdb5/optimizer/Tests/GCexample01.stable.out @@ -37,20 +37,17 @@ function user.qry():void; barrier (x:oid, z:int) := iterator.new(b:bat[:int]); #[5] (0) ITRbunIterator 7 8 <- 1 io.print(x:oid); #[6] (0) IOprint_val 9 <- 7 exit (x:oid, z:int); #[7] (0) 7 8 -b:bat[:int] := nil:bat[:int]; #[8] (0) 1 <- 16 -barrier (x:oid, z:int) := iterator.new(c:bat[:int]); #[9] (0) ITRbunIterator 7 8 <- 3 -io.print(x:oid); #[10] (0) IOprint_val 10 <- 7 -redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[11] (0) ITRbunNext 7 8 <- 3 -exit (x:oid, z:int); #[12] (0) 7 8 -c:bat[:int] := nil:bat[:int]; #[13] (0) 3 <- 18 +barrier (x:oid, z:int) := iterator.new(c:bat[:int]); #[8] (0) ITRbunIterator 7 8 <- 3 +io.print(x:oid); #[9] (0) IOprint_val 10 <- 7 +redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[10] (0) ITRbunNext 7 8 <- 3 +exit (x:oid, z:int); #[11] (0) 7 8 # do not close d, it may be reused -barrier go:bit := true:bit;#[15] (0) 12 <- 13 -io.print(d:bat[:int]); #[16] (0) IOprint_val 14 <- 4 -redo go:bit := true:bit; #[17] (0) 12 <- 13 -exit go:bit; #[18] (0) 12 -d:bat[:int] := nil:bat[:int]; #[19] (0) 4 <- 20 -end user.qry; #[20] (0) -#garbagecollector actions= 4 time=31 usec +barrier go:bit := true:bit;#[13] (0) 12 <- 13 +io.print(d:bat[:int]); #[14] (0) IOprint_val 14 <- 4 +redo go:bit := true:bit; #[15] (0) 12 <- 13 +exit go:bit; #[16] (0) 12 +end user.qry; #[17] (0) +#garbagecollector actions= 1 time=21 usec function user.qry():void; #[0] (0) 0 b:bat[:int] := bat.new(:int); #[1] (0) CMDBATnew 1 <- 2 c:bat[:int] := bat.new(:int); #[2] (0) CMDBATnew 3 <- 2 @@ -59,20 +56,17 @@ function user.qry():void; barrier (x:oid, z:int) := iterator.new(b:bat[:int]); #[5] (0) ITRbunIterator 7 8 <- 1 io.print(x:oid); #[6] (0) IOprint_val 9 <- 7 exit (x:oid, z:int); #[7] (0) 7 8 -b:bat[:int] := nil:bat[:int]; #[8] (0) 1 <- 16 -barrier (x:oid, z:int) := iterator.new(c:bat[:int]); #[9] (0) ITRbunIterator 7 8 <- 3 -io.print(x:oid); #[10] (0) IOprint_val 10 <- 7 -redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[11] (0) ITRbunNext 7 8 <- 3 -exit (x:oid, z:int); #[12] (0) 7 8 -c:bat[:int] := nil:bat[:int]; #[13] (0) 3 <- 18 +barrier (x:oid, z:int) := iterator.new(c:bat[:int]); #[8] (0) ITRbunIterator 7 8 <- 3 +io.print(x:oid); #[9] (0) IOprint_val 10 <- 7 +redo (x:oid, z:int) := iterator.next(c:bat[:int]); #[10] (0) ITRbunNext 7 8 <- 3 +exit (x:oid, z:int); #[11] (0) 7 8 # do not close d, it may be reused -barrier go:bit := true:bit;#[15] (0) 12 <- 13 -io.print(d:bat[:int]); #[16] (0) IOprint_val 14 <- 4 -redo go:bit := true:bit; #[17] (0) 12 <- 13 -exit go:bit; #[18] (0) 12 -d:bat[:int] := nil:bat[:int]; #[19] (0) 4 <- 20 -end user.qry; #[20] (0) -#garbagecollector actions= 4 time=31 usec +barrier go:bit := true:bit;#[13] (0) 12 <- 13 +io.print(d:bat[:int]); #[14] (0) IOprint_val 14 <- 4 +redo go:bit := true:bit; #[15] (0) 12 <- 13 +exit go:bit; #[16] (0) 12 +end user.qry; #[17] (0) +#garbagecollector actions= 1 time=21 usec # 23:17:49 > # 23:17:49 > Done. diff --git a/monetdb5/optimizer/Tests/tst4006.stable.out b/monetdb5/optimizer/Tests/tst4006.stable.out --- a/monetdb5/optimizer/Tests/tst4006.stable.out +++ b/monetdb5/optimizer/Tests/tst4006.stable.out @@ -34,12 +34,10 @@ barrier V12:bit := true:bit; V13:any := algebra.union(x:bat[:int], z:bat[:int]);
MonetDB: default - approve output after merge from Dec2016
Changeset: 18171040fc72 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=18171040fc72
Added Files:
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.out
Modified Files:
geom/sql/functions/Tests/ST_NumInteriorRings.stable.out
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: default
Log Message:
approve output after merge from Dec2016
diffs (258 lines):
diff --git a/geom/sql/functions/Tests/ST_NumInteriorRings.stable.out
b/geom/sql/functions/Tests/ST_NumInteriorRings.stable.out
--- a/geom/sql/functions/Tests/ST_NumInteriorRings.stable.out
+++ b/geom/sql/functions/Tests/ST_NumInteriorRings.stable.out
@@ -26,25 +26,25 @@ Ready.
# 14:51:11 >
#SELECT ST_NumInteriorRings(ST_polygonFromText('POLYGON((1 2, 3 4, 5 6, 1 2),
(3 4, 5 6, 7 8, 3 4))') ) AS "INTERIOR RINGS";
-% .L1 # table_name
-% INTERIOR RINGS # name
+% .L2 # table_name
+% "INTERIOR RINGS" # name
% int # type
% 1 # length
[ 1]
#SELECT ST_NumInteriorRings(ST_MPolyFromText('MULTIPOLYGON(((1 2, 3 4, 5 6, 1
2),(10 20, 30 40, 50 60, 10 20), (100 200, 300 400, 500 600, 100 200)), ((1 2,
3 4, 5 6, 1 2)))') ) AS "INTERIOR RINGS";
-% .L1 # table_name
-% INTERIOR RINGS # name
+% .L2 # table_name
+% "INTERIOR RINGS" # name
% int # type
% 1 # length
[ 2]
#SELECT ST_NumInteriorRings(st_linefromtext('linestring(1 2 3, 4 5 6, 7 8
9)')) AS "INTERIOR RINGS";
-% .L1 # table_name
-% INTERIOR RINGS # name
+% .L2 # table_name
+% "INTERIOR RINGS" # name
% int # type
% 1 # length
[ 0]
#SELECT id, geom AS "GEOMETRY", ST_NumInteriorRings(geom) AS "INTERIOR RINGS"
FROM geometries WHERE 5<=id AND id<=10 OR id=18 OR id=23 OR id=26 OR id=27;
-% sys.geometries, sys.L1, sys.L2 # table_name
+% sys.geometries, sys.L3, sys.L5 # table_name
% id, GEOMETRY, "INTERIOR RINGS" # name
% int, geometry, int # type
% 2, 0, 1 # length
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
@@ -1,7 +1,7 @@
shutdown.Bug-6182
avggroupbysq.Bug-6178
semijoinunion.Bug-6150
-HAVE_LIBZ?heapextend.Bug-6134
+#HAVE_LIBZ?heapextend.Bug-6134
incorrect_error.Bug-6141
empty-interval.Bug-6184
crash_in_null_cast.Bug-6186
@@ -30,3 +30,4 @@ null-quantile.Bug-6218
sqlsmith.Bug-6216
sqlsmith.Bug-6217
real-power.Bug-6228
+sqlsmith.Bug-6219
diff --git a/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.sql
b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.sql
@@ -0,0 +1,30 @@
+select
+ subq_0.c1 as c0,
+ subq_0.c2 as c1
+from
+ (select
+ref_25.name as c0,
+(select sessiontimeout from sys.sessions)
+ as c1,
+63 as c2,
+ref_24.var_id as c3,
+ref_25.name as c4,
+(select sorted from sys.storage)
+ as c5
+ from
+sys.idxs as ref_23
+inner join sys.netcdf_vardim as ref_24
+ left join sys.db_user_info as ref_25
+ on (ref_24.dimpos = ref_25.default_schema )
+on (ref_23.id = ref_24.var_id )
+ right join tmp.objects as ref_26
+ on (ref_25.name = ref_26.name )
+ where EXISTS (
+select distinct
+ref_27.table_id as c0
+ from
+tmp.keys as ref_27
+ right join tmp.keys as ref_28
+ on (ref_27.type = ref_28.id )
+ where ref_27.type is not NULL)) as subq_0
+where subq_0.c5 is NULL;
diff --git a/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.err
b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.err
@@ -0,0 +1,55 @@
+stderr of test 'sqlsmith.Bug-6219` in directory 'sql/test/BugTracker-2017`
itself:
+
+
+# 17:09:30 >
+# 17:09:30 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31733" "--set"
"mapi_usock=/var/tmp/mtest-20365/.s.monetdb.31733" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 17:09:30 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/monetdb/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 5
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 31733
+# cmdline opt
MonetDB: default - Approve output, more stable results
Changeset: 17773b3b279f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=17773b3b279f Modified Files: sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out Branch: default Log Message: Approve output, more stable results diffs (32 lines): diff --git a/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out b/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out --- a/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out +++ b/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out @@ -78,23 +78,23 @@ Ready. % .querylog_catalog, .querylog_catalog, .querylog_catalog, .querylog_catalog # table_name % owner, query, pipe, plan # name % clob,clob, clob, clob # type -% 7, 63, 12, 10 # length +% 7, 58, 12, 10 # length [ "monetdb", "select 1;","default_pipe", "user.s10_1"] -[ "monetdb", "select owner, query, pipe, plan, mal from sys.querylog_catalog;", "default_pipe", "user.s12_1"] +[ "monetdb", "select owner, query, pipe, plan from sys.querylog_catalog;", "default_pipe", "user.s12_1"] #select arguments, tuples from sys.querylog_calls; % .querylog_calls, .querylog_calls # table_name % arguments, tuples # name % clob,bigint # type % 18, 1 # length [ "user.s10_1():void;",1 ] -[ "user.s12_1():void;",5 ] +[ "user.s12_1():void;",4 ] #select owner, query, pipe, plan, arguments, tuples from sys.querylog_history; % .querylog_history, .querylog_history, .querylog_history, .querylog_history, .querylog_history, .querylog_history # table_name % owner, query, pipe, plan, arguments, tuples # name % clob,clob, clob, clob, clob, bigint # type -% 7, 63, 12, 10, 18, 1 # length +% 7, 58, 12, 10, 18, 1 # length [ "monetdb", "select 1;","default_pipe", "user.s10_1", "user.s10_1():void;", 1 ] -[ "monetdb", "select owner, query, pipe, plan, mal from sys.querylog_catalog;", "default_pipe", "user.s12_1", "user.s12_1():void;", 5 ] +[ "monetdb", "select owner, query, pipe, plan from sys.querylog_catalog;", "default_pipe", "user.s12_1", "user.s12_1():void;", 4 ] [ "monetdb", "select arguments, tuples from sys.querylog_calls;", "default_pipe", "user.s14_1", "user.s14_1():void;", 2 ] #select * from sys.querylog_history; % .querylog_history, .querylog_history, .querylog_history, .querylog_history, .querylog_history, .querylog_history, .querylog_history, .querylog_history, .querylog_history, .querylog_history, .querylog_history, .querylog_history, .querylog_history, .querylog_history, .querylog_history, .querylog_history # table_name ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - approve output
Changeset: 0c7dd33365ba for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c7dd33365ba Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: approve output 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 @@ -268,7 +268,7 @@ gdk_return GDKreleasemmap(void *ptr, siz gdk_return GDKreleasesem(int sem_id, str *msg); void GDKreset(int status, int exit); void GDKsetenv(str name, str value); -void GDKsetmemorylimit(lng nbytes); +void GDKsetmallocsuccesscount(lng count); ssize_t GDKstrFromStr(unsigned char *dst, const unsigned char *src, ssize_t len); str GDKstrdup(const char *s) __attribute__((__warn_unused_result__)); str GDKstrndup(const char *s, size_t n) __attribute__((__warn_unused_result__)); @@ -1206,7 +1206,7 @@ str IOimport(void *ret, bat *bid, str *f str IOprint_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str IOprintf(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str IOprintfStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str IOsetmemorylimit(void *res, lng *nbytes); +str IOsetmallocsuccesscount(void *res, lng *nbytes); str IOtable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str ITRbunIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str ITRbunNext(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: d4af41565570 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4af41565570 Modified Files: monetdb5/optimizer/Tests/tst4000.stable.out Branch: default Log Message: Approve output diffs (12 lines): diff --git a/monetdb5/optimizer/Tests/tst4000.stable.out b/monetdb5/optimizer/Tests/tst4000.stable.out --- a/monetdb5/optimizer/Tests/tst4000.stable.out +++ b/monetdb5/optimizer/Tests/tst4000.stable.out @@ -29,7 +29,7 @@ function user.foo():void; b:bat[:int] := bat.new(:int); #[1] (0) CMDBATnew 1 <- 2 c:bat[:int] := bat.new(:int); #[2] (0) CMDBATnew 3 <- 2 # identical until insert takes place -d:bat[:oid] := algebra.subselect(b:bat[:int],0:int,100:int,true:bit,true:bit,false:bit); #[4] (0) ALGsubselect1 5 <- 1 6 7 8 9 10 +d:bat[:oid] := algebra.select(b:bat[:int],0:int,100:int,true:bit,true:bit,false:bit); #[4] (0) ALGselect1 5 <- 1 6 7 8 9 10 # mapped onto one instruction l:int := calc.+(24:int,27:int);#[6] (0) CMDvarADDsignal 17 <- 14 16 # mapped to l ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 5f5b0b43a641 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f5b0b43a641
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/optimizer/Tests/GCexample01.stable.out
sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/setoptimizer.stable.out.Windows
sql/test/mapi/Tests/sql_int128.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
Branch: default
Log Message:
Approve output
diffs (truncated from 1471 to 300 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
@@ -55,8 +55,8 @@ Ready.
% .L1 # table_name
% def # name
% clob # type
-% 579 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.jit();optimizer.garbageCollector();"
]
+% 544 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();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.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
@@ -65,13 +65,12 @@ Ready.
function user.s8_1():void;
X_0:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",21:int);
X_3 := sql.mvc();
-(X_13:bat[:int],X_14:bat[:int],X_15:bat[:int]) :=
sql.copy_from(nil:ptr,"|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0:int,0:int,nil:str);
-# querylog.define("explain copy into ttt from \\'/tmp/xyz\\';","default_pipe")
-X_16 := sql.append(X_3,"sys","ttt","a",X_13);
-X_20 := sql.append(X_16,"sys","ttt","b",X_14);
-X_22 := sql.append(X_20,"sys","ttt","c",X_15);
-X_24 := aggr.count(X_15);
-sql.affectedRows(X_22,X_24);
+(X_24:bat[:int],X_25:bat[:int],X_26:bat[:int]) :=
sql.copy_from(nil:ptr,"|","\\n",nil:str,"null","/tmp/xyz",-1:lng,0:lng,0:int,0:int,nil:str);
+X_28 := sql.append(X_3,"sys","ttt","a",X_24);
+X_33 := sql.append(X_28,"sys","ttt","b",X_25);
+X_36 := sql.append(X_33,"sys","ttt","c",X_26);
+X_38 := aggr.count(X_26);
+sql.affectedRows(X_36,X_38);
end user.s8_1;
#inline actions= 0 time=1 usec
#candidates actions= 1 time=14 usec
@@ -115,8 +114,8 @@ end user.s8_1;
% .L1 # table_name
% def # name
% clob # type
-% 602 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.jit();optimizer.sql_append();optimizer.garbageCollector();"
]
+% 567 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode()
MonetDB: default - Approve output
Changeset: f0d5d67e6f20 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0d5d67e6f20 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out sql/backends/monet5/sql_gencode.c Branch: default Log Message: Approve output diffs (172 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 @@ -7921,7 +7921,6 @@ Ready. [ "mdb", "getStackFrame","pattern mdb.getStackFrame() (X_0:bat[:str],X_1:bat[:str]) ", "MDBgetStackFrame;","Collect variable binding of current (n-th) stack frame." ] [ "mdb", "getStackFrame","pattern mdb.getStackFrame(i:int) (X_0:bat[:str],X_1:bat[:str]) ", "MDBgetStackFrameN;", "" ] [ "mdb", "getStackTrace","pattern mdb.getStackTrace() (X_0:bat[:int],X_1:bat[:str]) ", "MDBStkTrace;", "" ] -[ "mdb", "grab", "pattern mdb.grab():void ", "mdbGrab;", "Call debugger for a suspended process."] [ "mdb", "inspect", "pattern mdb.inspect(mod:str,fcn:str):void ", "MDBinspect;", "Run the debugger on a specific function" ] [ "mdb", "list", "pattern mdb.list(M:str,F:str):void ", "MDBlist3;", "Dump the routine M.F on standard out." ] [ "mdb", "list", "pattern mdb.list():void ", "MDBlist;", "Dump the current routine on standard out." ] @@ -7932,14 +7931,11 @@ Ready. [ "mdb", "setDebug", "command mdb.setDebug(flg:str):int ", "MDBsetDebugStr;", "Set the kernel debugging bit-set and return its previous value.\nThe recognized options are: threads, memory, properties,\nio, transactions, modules, algorithms, estimates." ] [ "mdb", "setTrace", "pattern mdb.setTrace(b:bit):void ", "MDBsetTrace;", "Turn on/off tracing of current routine"] [ "mdb", "setTrace", "pattern mdb.setTrace(b:str):void ", "MDBsetVarTrace;", "Turn on/off tracing of a variable "] -[ "mdb", "setTrap", "pattern mdb.setTrap(mod:str,fcn:str,b:bit):void ", "MDBtrapFunction;", "Suspend upon a call to the MAL function." ] -[ "mdb", "setTrap", "pattern mdb.setTrap(idx:int):void ", "mdbTrapClient;", "Call debugger for a specific process." ] [ "mdb", "start","pattern mdb.start():void ","MDBstart;", "Start interactive debugger"] [ "mdb", "start","pattern mdb.start(clientid:int):void ", "MDBstart;","Start interactive debugger on a client"] [ "mdb", "start","pattern mdb.start(mod:str,fcn:str):void ", "MDBstartFactory;", "Start interactive debugger on a running factory" ] [ "mdb", "stop", "pattern mdb.stop():void ", "MDBstop;", "Stop the interactive debugger" ] [ "mdb", "traceOptimizer", "command mdb.traceOptimizer(flg:str):void ","OPTsetDebugStr;", "Otherwise it is considered a request to trace the optimizers,\nwhich requires a comma separated list or pipeline name."] -[ "mdb", "trap", "pattern mdb.trap():void ", "mdbTrap;", "A suspended process for debugging."] [ "mdb", "var", "pattern mdb.var(M:str,F:str):void ", "MDBvar3;", "Dump the symboltable of routine M.F on standard out." ] [ "mdb", "var", "pattern mdb.var():void ", "MDBvar;", "Dump the symboltable of current routine on standard out." ] [ "mkey", "bulk_rotate_xor_hash", "command mkey.bulk_rotate_xor_hash(h:bat[:lng],nbits:int,b:bat[:any_1]):bat[:lng] ", "MKEYbulk_rotate_xor_hash;","pre: h and b should be synced on head\n post: [:xor=]([:rotate=](h, nbits), [hash](b))" ] @@ -8191,9 +8187,6 @@ Ready. [ "optimizer", "reorder", "pattern optimizer.reorder(mod:str,fcn:str):str ", "OPTwrapper;", "Reorder by dataflow dependencies" ] [ "optimizer", "selcrack", "pattern optimizer.selcrack():str ", "OPTwrapper;", "" ] [ "optimizer", "selcrack", "pattern optimizer.selcrack(mod:str,fcn:str):str ", "OPTwrapper;", "Selection cracking"] -[ "optimizer", "showFlowGraph","pattern optimizer.showFlowGraph(M:str,F:str,s:str):void ", "QOTshowFlowGraph;", "Dump the data flow of the function \n\tM.F in a format recognizable by the \n\tcommand 'dot' on the file s"] -[ "optimizer", "showPlan", "pattern optimizer.showPlan():void ", "QOTshowPlan;", "Illustrate the plan derived so far"] -[ "optimizer", "showPlan", "pattern optimizer.showPlan(M:str,F:str,s:str):void ", "QOTshowPlan;", "" ] [ "optimizer", "sql_append", "pattern optimizer.sql_append():str ", "OPTsql_append;", "Avoid extra BAT copy with sql.append() whenever possible." ] [ "optimizer", "sql_appe
MonetDB: default - approve output
Changeset: 7418439d33d6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7418439d33d6
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/optimizer/Tests/dataflow3.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:
approve output
diffs (253 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
@@ -64,10 +64,10 @@ Ready.
% 126 # length
function user.s8_1():void;
X_38:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",12);
-barrier X_56 := language.dataflow();
+barrier X_58 := language.dataflow();
X_0 := sql.mvc();
(X_21:bat[:int],X_22:bat[:int],X_23:bat[:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0,nil:str);
-exit X_56;
+exit X_58;
X_25 := sql.append(X_0,"sys","ttt","a",X_21);
X_30 := sql.append(X_25,"sys","ttt","b",X_22);
X_33 := sql.append(X_30,"sys","ttt","c",X_23);
@@ -125,10 +125,10 @@ end user.s8_1;
% 126 # length
function user.s24_1():void;
X_38:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",12);
-barrier X_56 := language.dataflow();
+barrier X_58 := language.dataflow();
X_0 := sql.mvc();
(X_21:bat[:int],X_22:bat[:int],X_23:bat[:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0,nil:str);
-exit X_56;
+exit X_58;
X_25 := sql.append(X_0,"sys","ttt","a",X_21);
X_30 := sql.append(X_25,"sys","ttt","b",X_22);
X_35 := aggr.count(X_23);
diff --git a/monetdb5/optimizer/Tests/dataflow3.stable.out
b/monetdb5/optimizer/Tests/dataflow3.stable.out
--- a/monetdb5/optimizer/Tests/dataflow3.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow3.stable.out
@@ -26,13 +26,13 @@ Ready.
#mdb.list("user","s1_0");
function user.s1_0():void;
-barrier X_30 := language.dataflow();
+barrier X_31 := language.dataflow();
X17 := bat.new(:lng);
X54 := bat.new(:lng);
X55 := bat.new(:lng);
X56 := bat.new(:lng);
X57 := bat.new(:lng);
-exit X_30;
+exit X_31;
X59 :=
remote.connect("mapi:monetdb://volund.ins.cwi.nl:5/sn4","monetdb","monetdb","msql");
remote.register(X59,"user","s1_0map");
X66 := remote.put(X59,X54);
diff --git a/sql/test/remote/Tests/partition_elim.stable.out
b/sql/test/remote/Tests/partition_elim.stable.out
--- a/sql/test/remote/Tests/partition_elim.stable.out
+++ b/sql/test/remote/Tests/partition_elim.stable.out
@@ -135,7 +135,7 @@ Ready.
% mal # name
% clob # type
% 68 # length
-function user.SQLanalyze():void;
+function user.main():void;
barrier X_1253 := language.dataflow();
X_1181 := bat.new(nil:str);
X_1188 := bat.append(X_1181,".test");
@@ -189,13 +189,37 @@ barrier X_1253 := language.dataflow();
language.pass(C_1167);
exit X_1253;
sql.resultSet(X_1198,X_1199,X_1200,X_1201,X_1202,X_1169,X_1179);
-end user.SQLanalyze;
+end user.main;
+#inline actions= 0 time=3 usec
+#remapactions= 0 time=8 usec
+#costmodelactions= 1 time=4 usec
+#coercion actions= 0 time=5 usec
+#evaluate actions= 6 time=48 usec
+#emptybindactions= 0 time=24 usec
+#aliases actions=10 time=24 usec
+#mitosis actions= 1 time=72 usec
+#mergetable actions= 3 time=157 usec
+#deadcode actions= 4 time=21 usec
+#aliases actions= 0 time=16 usec
+#constantsactions= 7 time=17 usec
+#commonTerms actions= 0 time=18 usec
+#projectionpath actions= 0 time=12 usec
+#deadcode actions= 0 time=16 usec
+#reorder actions= 1 time=79 usec
+#reduce actions=43 time=23 usec
+#matpack actions= 2 time=17 usec
+#dataflow actions=27 time=63 usec
+#multiplexactions= 0 time=5 usec
+#profiler actions= 1 time=9 usec
+#candidates actions= 1 time=4 usec
+#garbagecollector actions= 1 time=44 usec
+#totalactions= 1 time=984 usec
#explain select x,y from test where x between (7-3) and (7-1);
% .explain # table_name
% mal # name
% clob # type
% 75 # length
-function user.SQLanalyze():void;
+function user.main():void;
barrier X_1397 := language.dataflow();
X_1320 := bat.new(nil:str);
X_1327 := bat.append(X_1320,".test");
@@ -249,13 +273,37 @@ barrier X_1397 := language.dataflow();
language.pass(C_1305);
exit X_1397;
sql.resultSet(X_1337,X_1338,X_1339,X_1340,X_1341,X_1307,X_1318);
-end user.SQLanalyze;
+end user.main;
+#inline actions= 0 time=3 usec
+#remapactions= 0 time=9 usec
+#costmodel
MonetDB: default - approve output after merge
Changeset: 1840c873b61a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1840c873b61a Modified Files: sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out sql/test/BugTracker-2016/Tests/prepare_without_querycache.Bug-4047.stable.out Branch: default Log Message: approve output after merge diffs (63 lines): diff --git a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out --- a/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out +++ b/sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out @@ -49,6 +49,7 @@ end user.s8_1; #evaluate actions= 0 time=3 usec #emptybindactions= 5 time=23 usec #aliases actions= 1 time=6 usec +#mergetable actions= 0 time=34 usec #deadcode actions= 5 time=8 usec #aliases actions= 0 time=3 usec #constantsactions= 3 time=4 usec @@ -57,6 +58,7 @@ end user.s8_1; #reorder actions= 1 time=16 usec #deadcode actions= 0 time=4 usec #reduce actions=38 time=20 usec +#matpack actions= 0 time=3 usec #multiplexactions= 0 time=2 usec #profiler actions= 1 time=0 usec #candidates actions= 1 time=0 usec @@ -84,6 +86,7 @@ end user.s10_1; #evaluate actions= 0 time=3 usec #emptybindactions= 5 time=14 usec #aliases actions= 1 time=6 usec +#mergetable actions= 0 time=24 usec #deadcode actions= 5 time=9 usec #aliases actions= 0 time=4 usec #constantsactions= 3 time=4 usec @@ -92,6 +95,7 @@ end user.s10_1; #reorder actions= 1 time=15 usec #deadcode actions= 0 time=4 usec #reduce actions=38 time=20 usec +#matpack actions= 0 time=2 usec #multiplexactions= 0 time=2 usec #profiler actions= 1 time=1 usec #candidates actions= 1 time=1 usec @@ -121,6 +125,7 @@ end user.s18_1; #evaluate actions= 0 time=3 usec #emptybindactions= 5 time=13 usec #aliases actions= 1 time=5 usec +#mergetable actions= 0 time=25 usec #deadcode actions= 5 time=8 usec #aliases actions= 0 time=4 usec #constantsactions= 3 time=4 usec @@ -129,6 +134,7 @@ end user.s18_1; #reorder actions= 1 time=15 usec #deadcode actions= 0 time=4 usec #reduce actions=38 time=20 usec +#matpack actions= 0 time=2 usec #multiplexactions= 0 time=2 usec #profiler actions= 1 time=1 usec #candidates actions= 1 time=0 usec diff --git a/sql/test/BugTracker-2016/Tests/prepare_without_querycache.Bug-4047.stable.out b/sql/test/BugTracker-2016/Tests/prepare_without_querycache.Bug-4047.stable.out --- a/sql/test/BugTracker-2016/Tests/prepare_without_querycache.Bug-4047.stable.out +++ b/sql/test/BugTracker-2016/Tests/prepare_without_querycache.Bug-4047.stable.out @@ -32,7 +32,7 @@ Ready. % type,digits, scale, schema, table, column # name % varchar, int,int,str,str,str # type % 7, 1, 1, 0, 1, 0 # length -[ "tinyint", 8, 0, "", "L","" ] +[ "tinyint", 1, 0, "", "L","" ] # 12:52:08 > # 12:52:08 > "Done." ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 5144526f745d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5144526f745d
Modified Files:
monetdb5/optimizer/Tests/inlineFunction.stable.out
monetdb5/optimizer/Tests/inlineFunction1.stable.out
monetdb5/optimizer/Tests/inlineFunction3.stable.out
monetdb5/optimizer/Tests/inlineFunction4.stable.out
Branch: default
Log Message:
Approve output
diffs (61 lines):
diff --git a/monetdb5/optimizer/Tests/inlineFunction.stable.out
b/monetdb5/optimizer/Tests/inlineFunction.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction.stable.out
@@ -29,7 +29,7 @@ Ready.
#result of inline
function user.tst():void;
-X_3 := true:bit;
+true:bit;
X_4:int := 0;
X_4:int := 100;
z := X_4;
diff --git a/monetdb5/optimizer/Tests/inlineFunction1.stable.out
b/monetdb5/optimizer/Tests/inlineFunction1.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction1.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction1.stable.out
@@ -30,12 +30,12 @@ Ready.
#result of inline
#mdb.list("user","tst");
function user.tst():void;
-X_3 := true:bit;
+true:bit;
z := 0:int;
end user.tst;
#mdb.list("user","tst");
function user.tst():void;
-X_3 := true:bit;
+true:bit;
z := 0:int;
end user.tst;
diff --git a/monetdb5/optimizer/Tests/inlineFunction3.stable.out
b/monetdb5/optimizer/Tests/inlineFunction3.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction3.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction3.stable.out
@@ -29,8 +29,8 @@ Ready.
#io.printf("#result of inline\n");
#result of inline
function user.tst():void;
-X_3 := false:bit;
-X_9 := false:bit;
+false:bit;
+false:bit;
z := 1:int;
end user.tst;
diff --git a/monetdb5/optimizer/Tests/inlineFunction4.stable.out
b/monetdb5/optimizer/Tests/inlineFunction4.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction4.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction4.stable.out
@@ -29,10 +29,10 @@ Ready.
#io.printf("#result of inline\n");
#result of inline
function user.tst():void;
-X_3 := false:bit;
+false:bit;
X_5:int := 0;
-X_10 := false:bit;
-X_16 := -1:int;
+false:bit;
+-1:int;
X_5:int := -1:int;
z := X_5;
end user.tst;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 8a0828829707 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a0828829707 Modified Files: sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/11-explain.stable.out sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/13-explain.stable.out sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/04-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/06-explain.stable.out.int128 sql/benchmarks/tpch/Tests/07-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 sql/benchmarks/tpch/Tests/12-explain.stable.out.int128 sql/benchmarks/tpch/Tests/13-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/15-explain.stable.out.int128 sql/benchmarks/tpch/Tests/16-explain.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/18-explain.stable.out.int128 sql/benchmarks/tpch/Tests/19-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 sql/benchmarks/tpch/Tests/21-explain.stable.out sql/benchmarks/tpch/Tests/22-explain.stable.out.int128 sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128 sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128 sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out sql/test/BugTracker-2016/Tests/querylog.stable.err sql/test/BugTracker-2016/Tests/querylog.stable.out sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/mergetables/Tests/mergequery.stable.out sql/test/remote/Tests/partition_elim.stable.out Branch: default Log Message: Approve output diffs (truncated from 6654 to 300 lines): diff --git a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out --- a/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out +++ b/sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out @@ -107,17 +107,17 @@ function user.s8_1():void; X_31 := bat.new(nil:int); X_40 := bat.append(X_31,0); X_0 := sql.mvc(); -X_1:bat[:oid] := sql.tid(X_0,"sys","udf_fuse"); +C_1:bat[:oid] := sql.tid(X_0,"sys","udf_fuse"); X_4:bat[:bte] := sql.bind(X_0,"sys","udf_fuse","a",0); -(X_7,r1_8) := sql.bind(X_0,"sys","udf_fuse","a",2); +(C_7,r1_8) := sql.bind(X_0,"sys","udf_fuse","a",2); X_10:bat[:bte] := sql.bind(X_0,"sys","udf_fuse","a",1); -X_12 := sql.delta(X_4,X_7,r1_8,X_10); -X_13 := algebra.projection(X_1,X_12); +X_12 := sql.delta(X_4,C_7,r1_8,X_
MonetDB: default - Approve output
Changeset: fdd3562dc126 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fdd3562dc126
Modified Files:
clients/Tests/exports.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
Branch: default
Log Message:
Approve output
diffs (57 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
@@ -260,6 +260,8 @@ gdk_return GDKreleasemmap(void *ptr, siz
gdk_return GDKreleasesem(int sem_id, str *msg);
void GDKreset(int status);
void GDKsetenv(str name, str value);
+void GDKsetmemorylimit(size_t nbytes);
+void GDKsetmemorylimit(size_t nbytes){ GDK_mallocedbytes_limit = nbytes;
ssize_t GDKstrFromStr(unsigned char *dst, const unsigned char *src, ssize_t
len);
str GDKstrdup(const char *s) __attribute__((__warn_unused_result__));
str GDKstrndup(const char *s, size_t n)
__attribute__((__warn_unused_result__));
@@ -1201,6 +1203,7 @@ str IOimport(void *ret, bat *bid, str *f
str IOprint_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str IOprintf(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str IOprintfStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str IOsetmemorylimit(void *res, lng *nbytes);
str IOtable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ITRbunIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ITRbunNext(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
@@ -74,7 +74,7 @@ Ready.
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0, true]
[ "sys", "_tables", "name", "varchar", "writable", 8,
0, false, 0, false ]
[ "sys", "_tables", "schema_id","int", "writable", 4,
0, false, 0, false ]
-[ "sys", "_tables", "query","varchar", "writable",
45, 0, false, 0, false ]
+[ "sys", "_tables", "query","varchar", "writable",
34, 0, false, 0, false ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0, false ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0, false ]
[ "sys", "_tables", "commit_action","smallint",
"writable", 2, 0, false, 0, false ]
@@ -96,10 +96,10 @@ Ready.
% schema, table, column, type, mode, typewidth, hashes, phash,
imprints, sorted # name
% clob,clob, clob, clob, clob, int,bigint, boolean,
bigint, boolean # type
% 3, 7, 13, 8, 8, 2, 4, 5, 1, 5 #
length
-[ "sys", "_tables", "id", "int", "writable", 4, 2600,
false, 0, false ]
+[ "sys", "_tables", "id", "int", "writable", 4, 1064,
false, 0, false ]
[ "sys", "_tables", "name", "varchar", "writable", 8,
0, false, 0, false ]
[ "sys", "_tables", "schema_id","int", "writable", 4,
0, false, 0, false ]
-[ "sys", "_tables", "query","varchar", "writable",
45, 0, false, 0, false ]
+[ "sys", "_tables", "query","varchar", "writable",
33, 0, false, 0, false ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0, false ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0, false ]
[ "sys", "_tables", "commit_action","smallint",
"writable", 2, 0, false, 0, false ]
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
@@ -74,7 +74,7 @@ Ready.
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0, true]
[ "sys", "_tables", "name", "varchar", "writable", 8,
0, false, 0, false ]
[ "sys", "_tables", "schema_id","int", "writable", 4,
0, false, 0, false ]
-[ "sys", "_tables", "query","varchar", "writable",
45, 0, false, 0, false ]
+[ "sys", "_tables",
MonetDB: default - Approve output
Changeset: be5f51e44622 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be5f51e44622
Modified Files:
monetdb5/modules/mal/Tests/remote03.stable.err
monetdb5/modules/mal/Tests/remote03.stable.out
monetdb5/optimizer/Tests/dataflow3.stable.out
monetdb5/optimizer/Tests/dataflow4.stable.out
Branch: default
Log Message:
Approve output
diffs (191 lines):
diff --git a/monetdb5/modules/mal/Tests/remote03.stable.err
b/monetdb5/modules/mal/Tests/remote03.stable.err
--- a/monetdb5/modules/mal/Tests/remote03.stable.err
+++ b/monetdb5/modules/mal/Tests/remote03.stable.err
@@ -1,11 +1,11 @@
stderr of test 'remote03` in directory 'monetdb5/modules/mal` itself:
-# 13:32:04 >
-# 13:32:04 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38272" "--set"
"mapi_usock=/var/tmp/mtest-30987/.s.monetdb.38272" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/Monet-devel/var/MonetDB/mTests_monetdb5_modules_mal"
"--set" "embedded_r=yes"
-# 13:32:04 >
+# 04:04:13 >
+# 04:04:13 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32121" "--set"
"mapi_usock=/var/tmp/mtest-3168/.s.monetdb.32121" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
+# 04:04:13 >
-# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-devel/var/monetdb5/dbfarm/demo
+# builtin opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo
# builtin opt gdk_debug = 0
# builtin opt gdk_vmtrim = no
# builtin opt monet_prompt = >
@@ -17,18 +17,17 @@ stderr of test 'remote03` in directory '
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 38272
-# cmdline opt mapi_usock = /var/tmp/mtest-30987/.s.monetdb.38272
+# cmdline opt mapi_port = 32121
+# cmdline opt mapi_usock = /var/tmp/mtest-3168/.s.monetdb.32121
# cmdline opt monet_prompt =
-# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-devel/var/MonetDB/mTests_monetdb5_modules_mal
-# cmdline opt embedded_r = yes
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal
# cmdline opt gdk_debug = 536870922
-# 13:32:05 >
-# 13:32:05 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-30987" "--port=38272"
-# 13:32:05 >
+# 04:04:13 >
+# 04:04:13 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-3168" "--port=32121"
+# 04:04:13 >
-MAPI = (monetdb) /var/tmp/mtest-30987/.s.monetdb.38272
+MAPI = (monetdb) /var/tmp/mtest-3168/.s.monetdb.32121
QUERY = # let connect figure out itself how to connect to the running db
uri := sabaoth.getLocalConnectionURI();
conn:str := remote.connect(uri, "monetdb", "monetdb");
@@ -94,10 +93,9 @@ QUERY = # let connect figure out itself
io.print("Received an error from the remote site");
exit MALException;
+ERROR =
!SyntaxException:remote.exec:(mapi:monetdb://mone...@vienna.da.cwi.nl/mTests_monetdb5_modules_mal)
rmt0_X_0_void := io.print.bla();
+# 04:04:13 >
+# 04:04:13 > "Done."
+# 04:04:13 >
-
-# 23:12:09 >
-# 23:12:09 > "Done."
-# 23:12:09 >
-
diff --git a/monetdb5/modules/mal/Tests/remote03.stable.out
b/monetdb5/modules/mal/Tests/remote03.stable.out
--- a/monetdb5/modules/mal/Tests/remote03.stable.out
+++ b/monetdb5/modules/mal/Tests/remote03.stable.out
@@ -1,34 +1,32 @@
stdout of test 'remote03` in directory 'monetdb5/modules/mal` itself:
-# 22:17:31 >
-# 22:17:31 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30468" "--set"
"mapi_usock=/var/tmp/mtest-3813/.s.monetdb.30468" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"remote03.mal"
-# 22:17:31 >
+# 04:04:13 >
+# 04:04:13 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32121" "--set"
"mapi_usock=/var/tmp/mtest-3168/.s.monetdb.32121" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
+# 04:04:13 >
-# MonetDB 5 server v11.18.0
+# MonetDB 5 server v11.24.0
# This is an unreleased version
# Serving database 'mTests_monetdb5_modules_mal', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 15.591 GiB available main-memory.
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.589 GiB available main-memory.
# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
# Visit http://www.monetdb.org/ for further informatio
MonetDB: default - Approve output
Changeset: d5ddbee32495 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d5ddbee32495 Modified Files: monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out sql/test/Tests/setoptimizer.stable.out sql/test/Tests/setoptimizer.stable.out.Windows sql/test/remote/Tests/partition_elim.stable.out Branch: default Log Message: Approve output diffs (truncated from 916 to 300 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 @@ -56,7 +56,7 @@ Ready. % def # name % clob # type % 541 # length -[ "optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();" ] +[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector();" ] #explain copy into ttt from '/tmp/xyz'; % .explain # table_name % mal # name @@ -90,7 +90,7 @@ end user.s4_1; % def # name % clob # type % 564 # length -[ "optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.sql_append();optimizer.garbageCollector();" ] +[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.sql_append();optimizer.garbageCollector();" ] #explain copy into ttt from '/tmp/xyz'; % .explain # table_name % mal # name diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single --- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single +++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single @@ -56,7 +56,7 @@ Ready. % def # name % clob # type % 541 # length -[ "optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();" ] +[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optim
MonetDB: default - Approve output
Changeset: 9f53cfea95d0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f53cfea95d0 Modified Files: monetdb5/optimizer/Tests/inline12.stable.out Branch: default Log Message: Approve output diffs (14 lines): diff --git a/monetdb5/optimizer/Tests/inline12.stable.out b/monetdb5/optimizer/Tests/inline12.stable.out --- a/monetdb5/optimizer/Tests/inline12.stable.out +++ b/monetdb5/optimizer/Tests/inline12.stable.out @@ -33,8 +33,8 @@ function user.qry():void; X_17:int := calc.+(1:int,2:int); #[3] (0) CMDvarADDsignal 17 <- 5 7 zz:int := X_17:int;#[4] (0) 6 <- 17 # base line test for inlining -X_21:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]); #[6] (0) CMDbatADDsignal 21 <- 1 1 -z:bat[:int] := X_21:bat[:int]; #[7] (0) 9 <- 21 +X_22:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]); #[6] (0) CMDbatADDsignal 22 <- 1 1 +z:bat[:int] := X_22:bat[:int]; #[7] (0) 9 <- 22 z:bat[:int] := batcalc.+(b:bat[:int],2:int); #[8] (0) CMDbatADDsignal 9 <- 1 7 end user.qry; #[9] (0) ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 992cf3c3a818 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=992cf3c3a818
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/modules/mal/Tests/inspect00.stable.out
monetdb5/optimizer/Tests/inline02.stable.out
monetdb5/optimizer/Tests/inline03.stable.out
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inline06.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/inline09.stable.out
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/inlineCst.stable.out
monetdb5/optimizer/Tests/inlineFunction2.stable.out
monetdb5/optimizer/Tests/manifold2.stable.out
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:
Approve output
diffs (truncated from 1629 to 300 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
@@ -64,10 +64,10 @@ Ready.
% 118 # length
function user.s4_1():void;
X_24:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",12);
-barrier X_34 := language.dataflow();
+barrier X_53 := language.dataflow();
X_1 := sql.mvc();
(X_11:bat[:int],X_12:bat[:int],X_13:bat[:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
-exit X_34;
+exit X_53;
X_14 := sql.append(X_1,"sys","ttt","a",X_11);
X_18 := sql.append(X_14,"sys","ttt","b",X_12);
X_20 := sql.append(X_18,"sys","ttt","c",X_13);
@@ -98,10 +98,10 @@ end user.s4_1;
% 118 # length
function user.s12_1():void;
X_24:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",12);
-barrier X_35 := language.dataflow();
+barrier X_54 := language.dataflow();
X_1 := sql.mvc();
(X_11:bat[:int],X_12:bat[:int],X_13:bat[:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
-exit X_35;
+exit X_54;
X_14 := sql.append(X_1,"sys","ttt","a",X_11);
X_18 := sql.append(X_14,"sys","ttt","b",X_12);
X_22 := aggr.count(X_13);
diff --git a/monetdb5/modules/mal/Tests/inspect00.stable.out
b/monetdb5/modules/mal/Tests/inspect00.stable.out
--- a/monetdb5/modules/mal/Tests/inspect00.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect00.stable.out
@@ -64,6 +64,7 @@ stack depth 2
[ 0@0, "tst", "0@0" ]
[ 1@0, "i","nil" ]
[ 2@0, "X_2", "0@0" ]
+[ 3@0, "X_3", "nil" ]
# 09:13:25 >
# 09:13:25 > Done.
diff --git a/monetdb5/optimizer/Tests/inline02.stable.out
b/monetdb5/optimizer/Tests/inline02.stable.out
--- a/monetdb5/optimizer/Tests/inline02.stable.out
+++ b/monetdb5/optimizer/Tests/inline02.stable.out
@@ -35,10 +35,10 @@ function user.qry():void;
X_16:int := calc.+(1:int,2:int); #[3] (0) CMDvarADDsignal 16 <-
5 7
zz:int := X_16:int;#[4] (0) 6 <- 16
# base line test for inlining
-X_20:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]); #[6] (0)
CMDbatADDsignal 20 <- 1 1
-z:bat[:int] := X_20:bat[:int]; #[7] (0) 9 <- 20
-X_24:bat[:int] := batcalc.+(b:bat[:int],2:int);#[8] (0)
CMDbatADDsignal 24 <- 1 7
-z:bat[:int] := X_24:bat[:int]; #[9] (0) 9 <- 24
+X_21:bat[:int] := batcalc.+(b:bat[:int],b:bat[:int]); #[6] (0)
CMDbatADDsignal 21 <- 1 1
+z:bat[:int] := X_21:bat[:int]; #[7] (0) 9 <- 21
+X_25:bat[:int] := batcalc.+(b:bat[:int],2:int);#[8] (0)
CMDbatADDsignal 25 <- 1 7
+z:bat[:int] := X_25:bat[:int]; #[9] (0) 9 <- 25
end user.qry; #[10] (0)
# 18:00:43 >
diff --git a/monetdb5/optimizer/Tests/inline03.stable.out
b/monetdb5/optimizer/Tests/inline03.stable.out
--- a/monetdb5/optimizer/Tests/inline03.stable.out
+++ b/monetdb5/optimizer/Tests/inline03.stable.out
@@ -32,14 +32,14 @@ Ready.
function user.qry():void; #[0] (0) 0
b:bat[:int] := bat.new(:oid,:i
MonetDB: default - Approve output
Changeset: e54b1faa2fa0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e54b1faa2fa0 Modified Files: sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-explain.stable.out sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/06-explain.stable.out sql/benchmarks/tpch/Tests/06-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/12-explain.stable.out sql/benchmarks/tpch/Tests/12-explain.stable.out.int128 sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 Branch: default Log Message: Approve output diffs (truncated from 1842 to 300 lines): diff --git a/sql/benchmarks/ssbm/Tests/01-explain.stable.out b/sql/benchmarks/ssbm/Tests/01-explain.stable.out --- a/sql/benchmarks/ssbm/Tests/01-explain.stable.out +++ b/sql/benchmarks/ssbm/Tests/01-explain.stable.out @@ -43,30 +43,30 @@ function user.s2_1(A0:int,A1:int,A2:int, X_9:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_quantity",0); X_17:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_discount",0); C_6:bat[:oid] := sql.tid(X_5,"sys","lineorder"); -C_72 := algebra.subselect(X_17,C_6,A1,A2,true,true,false); +C_79 := algebra.subselect(X_17,C_6,A1,A2,true,true,false); (C_19,r1_22) := sql.bind(X_5,"sys","lineorder","lo_discount",2); -C_73 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,false); +C_80 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,false); X_21:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_discount",1); -C_75 := algebra.subselect(X_21,C_6,A1,A2,true,true,false); -C_22 := sql.subdelta(C_72,C_6,C_19,C_73,C_75); -C_76 := algebra.thetasubselect(X_9,C_22,A3,"<"); +C_82 := algebra.subselect(X_21,C_6,A1,A2,true,true,false); +C_22 := sql.subdelta(C_79,C_6,C_19,C_80,C_82); +C_83 := algebra.thetasubselect(X_9,C_22,A3,"<"); (C_12,r1_12) := sql.bind(X_5,"sys","lineorder","lo_quantity",2); -C_77 := algebra.thetasubselect(r1_12,nil:bat[:oid],A3,"<"); +C_84 := algebra.thetasubselect(r1_12,nil:bat[:oid],A3,"<"); X_15:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_quantity",1); -C_78 := algebra.thetasubselect(X_15,C_22,A3,"<"); -C_25 := sql.subdelta(C_76,C_22,C_12,C_77,C_78); +C_85 := algebra.thetasubselect(X_15,C_22,A3,"<"); +C_25 := sql.subdelta(C_83,C_22,C_12,C_84,C_85); X_27:bat[:oid] := sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",0); (X_29,r1_37) := sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",2); X_31:bat[:oid] := sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",1); X_32 := sql.projectdelta(C_25,X_27,X_29,r1_37,X_31); X_35:bat[:int] := sql.bind(X_5,"sys","dwdate","d_year",0); C_33:bat[:oid] := sql.tid(X_5,"sys","dwdate"); -C_79 := algebra.subselect(X_35,C_33,A0,A0,true,false,false); +C_86 := algebra.subselect(X_35,C_33,A0,A0,true,false,false); (C_37,r1_47) :=
MonetDB: default - Approve output
Changeset: 1c4b9c1ac63c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1c4b9c1ac63c Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: Approve output diffs (36 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 @@ -1566,6 +1566,7 @@ int OPTmultiplexImplementation(Client cn str OPTmultiplexSimple(Client cntxt, MalBlkPtr mb); str OPTorcam(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); int OPTorcamImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); +int OPTpostfixImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); int OPTprofilerImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); int OPTprojectionpathImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); int OPTpushselectImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1939,7 +1940,7 @@ str ZORDslice_int(bat *r, int *xb, int * str abortRef; str addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name); str addPipeDefinition(Client cntxt, str name, str pipe); -void addtoMalBlkHistory(MalBlkPtr mb, str marker); +void addtoMalBlkHistory(MalBlkPtr mb); str affectedRowsRef; str aggrRef; str alarmRef; @@ -2116,7 +2117,6 @@ int getHgeConstant(MalBlkPtr mb, hge val int getIntConstant(MalBlkPtr mb, int val); int getLngConstant(MalBlkPtr mb, lng val); MalBlkPtr getMalBlkHistory(MalBlkPtr mb, int idx); -MalBlkPtr getMalBlkMarker(MalBlkPtr mb, str marker); lng getMemoryClaim(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int i, int flag); str getName(const char *nme); str getNameLen(const char *nme, size_t len); @@ -2138,7 +2138,6 @@ lng getUserTime(void); str getVarName(MalBlkPtr mb, int i); lng getVolume(MalStkPtr stk, InstrPtr pci, int rd); int getWrdConstant(MalBlkPtr mb, wrd val); -MalBlkPtr gotoMalBlkMarker(MalBlkPtr mb, str marker); str grabRef; str groupRef; str groupbyRef; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: ed14cf65817b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed14cf65817b Modified Files: sql/test/BugTracker/Tests/caching.SF-1651599.stable.out sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out Branch: default Log Message: Approve output diffs (36 lines): diff --git a/sql/test/BugTracker/Tests/caching.SF-1651599.stable.out b/sql/test/BugTracker/Tests/caching.SF-1651599.stable.out --- a/sql/test/BugTracker/Tests/caching.SF-1651599.stable.out +++ b/sql/test/BugTracker/Tests/caching.SF-1651599.stable.out @@ -2353,9 +2353,9 @@ Ready. % .cache, .cache # table_name % query, count # name % clob,int # type -% 130, 1 # length +% 118, 4 # length [ "select * from querycache() cache;", 1 ] -[ "insert into foo (foo1,foo2,foo3,foo4,foo5,foo6,foo7) select 2543.5363,9249.8762,9081.9249,5363.9249,8762.9081,8516.5131,5131.8516;", 1 ] +[ "insert into foo (foo1,foo2,foo3,foo4,foo5,foo6,foo7) select 3869.3905,null,9208.3881,null,9725.9208,435.9519,9519.435;",2000] #drop table foo; #commit; diff --git a/sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out b/sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out --- a/sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out +++ b/sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out @@ -109,7 +109,7 @@ Ready. % .L # table_name % single_value # name % char # type -% 15 # length +% 31 # length [ "dropping kwTemp"] #DROP TABLE kwTemp; #COMMIT; @@ -131,7 +131,7 @@ Ready. % .L # table_name % single_value # name % char # type -% 16 # length +% 27 # length [ "dropping kwmTemp" ] #DROP TABLE kwmTemp; #COMMIT; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output result from IMPRINTS as keyword
Changeset: 06eb4c2e36a0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=06eb4c2e36a0
Modified Files:
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.sql
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.sql
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker-2013/Tests/qualified_aggrname.Bug-3332.sql
sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.sql
sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.stable.out
sql/test/BugTracker-2014/Tests/select-having.Bug-3458.sql
sql/test/BugTracker-2015/Tests/cardinality.Bug-3761.sql
sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.sql
sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql
sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out
sql/test/bugs/Tests/crash_order_by.sql
sql/test/bugs/Tests/simple_view.sql
sql/test/bugs/insert_delete-bug-sf-904025.sql
sql/test/orderidx/Tests/simpletable.sql
sql/test/orderidx/Tests/smalltable.sql
sql/test/pg_regress/Tests/vacuum.sql
sql/test/pg_regress/Tests/without_oid.sql
Branch: default
Log Message:
Approve output result from IMPRINTS as keyword
diffs (truncated from 433 to 300 lines):
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -846,7 +846,7 @@ create view sys.sessions as select * fro
create view sys."storage" as select * from sys."storage"();
create view sys.storagemodel as select * from sys.storagemodel();
SELECT "id", "name", "schema_id", "query", CAST(CASE WHEN "system" THEN "type"
+ 10 ELSE (CASE WHEN "commit_action" = 0 THEN "type" ELSE "type" + 20 END) END
AS SMALLINT) AS "type", "system", "commit_action", "access", CASE WHEN (NOT
"system" AND "commit_action" > 0) THEN 1 ELSE 0 END AS "temporary" FROM
"sys"."_tables" WHERE "type" <> 2 UNION ALL SELECT "id", "name", "schema_id",
"query", CAST("type" + 30 AS SMALLINT) AS "type", "system", "commit_action",
"access", 1 AS "temporary" FROM "tmp"."_tables";
-create view sys.tablestoragemodel as select "schema","table",max(count) as
"count", sum(columnsize) as columnsize, sum(heapsize) as heapsize, sum(hashes)
as hashes, sum(imprints) as imprints, sum(case when sorted = false then 8 *
count else 0 end) as auxiliary from sys.storagemodel() group by
"schema","table";
+create view sys.tablestoragemodel as select "schema","table",max(count) as
"count", sum(columnsize) as columnsize, sum(heapsize) as heapsize, sum(hashes)
as hashes, sum("imprints") as "imprints", sum(case when sorted = false then 8 *
count else 0 end) as auxiliary from sys.storagemodel() group by
"schema","table";
create view sys.tracelog as select * from sys.tracelog();
SELECT u."name" AS "name", ui."fullname", ui."default_schema" FROM db_users()
AS u LEFT JOIN "sys"."db_user_info" AS ui ON u."name" = ui."name" ;
create function "abbrev" (p inet) returns clob external name inet."abbrev";
@@ -1160,11 +1160,11 @@ create aggregate stddev_samp(val time) r
create aggregate stddev_samp(val timestamp) returns double external name
"aggr"."stdev";
create procedure sys.stop(tag int) external name sql.sysmon_stop;
create procedure sys.stop(tag bigint) external name sql.sysmon_stop;
-create function sys."storage"() returns table ("schema" string, "table"
string, "column" string, "type" string, "mode" string, location string, "count"
bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash
boolean, imprints bigint, sorted boolean, orderidx bigint) external name
sql."storage";
-create function sys."storage"(sname string) returns table ("schema" string,
"table" string, "column" string, "type" string, "mode" string, location string,
"count" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes
bigint, phash boolean, imprints bigint, sorted boolean, orderidx bigint)
external name sql."storage";
-create function sys."storage"(sname string, tname string) returns table
("schema" string, "table" string, "column" string, "type" string, "mode"
string, location string, "count" bigint, typewidth int, columnsize bigint,
heapsize bigint, hashes bigint, phash boolean, imprints bigint, sorted boolean,
orderidx bigint) external name sql."storage";
-create function sys."storage"(sname string, tname string, cname string)
returns table ("schema" string, "table" string, "column" string, "type" string,
"mode" string, location string, "count" bigint, type
MonetDB: default - approve output after orderidx merge
Changeset: 11a51a9287ed for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=11a51a9287ed Modified Files: monetdb5/modules/mal/Tests/inspect05.stable.out.int128 sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check0.stable.out.int128 sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 sql/test/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/drop3.stable.out.int128 sql/test/leaks/Tests/select1.stable.out.int128 sql/test/leaks/Tests/select2.stable.out.int128 sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp1.stable.out.int128 sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp2.stable.out.int128 sql/test/leaks/Tests/temp3.stable.out sql/test/leaks/Tests/temp3.stable.out.int128 Branch: default Log Message: approve output after orderidx merge diffs (truncated from 1079 to 300 lines): diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128 b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128 --- a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128 +++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128 @@ -38,67 +38,72 @@ Ready. [ 6@0, "delete", "command", "bat", "(b:bat[:any_1]):bat[:any_1] ", "BKCdelete_all;"] [ 7@0, "delete", "command", "bat", "(b:bat[:any_1],d:bat[:oid]):bat[:any_1] ", "BKCdelete_multi;" ] [ 8@0, "densebat", "command", "bat", "(b:bat[:any_1],h:oid):bat[:any_1] ", "BKCdelete;"] -[ 9@0, "getAccess","command", "bat", "(b:bat[:any_1]):str ", "BKCgetBBPname;"] -[ 10@0,"getCapacity", "command", "bat", "(b:bat[:any_1]):oid ", "BKCgetSequenceBase;" ] -[ 11@0,"getColumnType","command", "bat", "(b:bat[:any_1]):str ", "BKCgetAccess;" ] -[ 12@0,"getName", "command", "bat", "(bid:bat[:any_1]):str ", "BKCgetRole;" ] -[ 13@0,"getRole", "command", "bat", "(b:bat[:any_1]):str ", "BKCgetColumnType;" ] -[ 14@0,"getSequenceBase", "command", "bat", "(b:bat[:any_1]):lng ", "BKCgetCapacity;" ] -[ 15@0,"getSize", "command", "bat", "(b:bat[:any_1]):lng ", "BKCgetSize;" ] -[ 16@0,"imprints", "command", "bat", "(b:bat[:hge]):lng ", "CMDBATimprintsize;"] -[ 17@0,"imprints", "command", "bat", "(b:bat[:hge]):void ", "CMDBATimprints;" ] -[ 18@0,"imprints", "command", "bat", "(b:bat[:dbl]):lng ", "CMDBATimprintsize;"] -[ 19@0,"imprints", "command", "bat", "(b:bat[:flt]):lng ", "CMDBATimprintsize;"] -[ 20@0,"imprints", "command", "bat", "(b:bat[:lng]):lng ", "CMDBATimprintsize;"] -[ 21@0,"imprints", "command", "bat", "(b:bat[:int]):lng ", "CMDBATimprintsize;"] -[ 22@0,"imprints", "command", "bat", "(b:bat[:sht]):lng ", "CMDBATimprintsize;"] -[ 23@0,"imprintsize", "command", "bat", "(b:bat[:bte]):lng ", "CMDBATimprintsize;"] -[ 24@0,"imprintsize", "command", "bat", "(b:bat[:dbl]):void ", "CMDBATimprints;" ] -[ 25@0,"imprintsize", "command", "bat", "(b:bat[:flt]):void ", "CMDBATimprints;" ] -[ 26@0,"imprintsize", "command", "bat", "(b:bat[:lng]):void ", "CMDBATimprints;" ] -[ 27@0,"imprintsize", "command", "bat", "(b:bat[:int]):void ", "CMDBATimprints;" ] -[ 28@0,"imprintsize", "command", "bat", "(b:bat[:sht]):void ", "CMDBATimprints;" ] -[ 29@0,"imprintsize", "command", "bat", "(b:bat[:bte]):void ", "CMDBATimprints;" ] -[ 30@0,"info", "command", "bat", "(a:bat[:oid],b:bat[:oid]):bat[:oid] ", "BKCintersectcand;" ] -[ 31@0,"intersectcand","command", "bat", "(b1:bat[:any_1],b2:bat[:any_2]):bit ", "BKCisSynced;" ] -[ 32@0,"isPersistent", "command", "bat", "(b:bat[:any_1]):bit ", "BKCisPersistent;" ] -[ 33@0,"isSorted", "command", "bat", "(b:bat[:any_1]):bit ", "BKCisTransient;" ] -[ 34@0,"isSorted
MonetDB: default - Approve output
Changeset: c9ab8de25201 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c9ab8de25201
Modified Files:
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
Branch: default
Log Message:
Approve output
diffs (226 lines):
diff --git a/sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
b/sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
@@ -64,7 +64,7 @@ Ready.
% clob # type
% 515 # length
function user.s2_1(A0:sht):void;
-X_177:void := querylog.define("explain select\n c_name,\n c_custkey,\n
o_orderkey,\n o_orderdate,\n o_totalprice,\n sum(l_quantity)\nfrom\n
customer,\n orders,\n lineitem\nwhere\n o_orderkey in (\n select\n l_orderkey\n
from\n lineitem\n group by\n l_orderkey having\n sum(l_quantity) > 300\n )\n
and c_custkey = o_custkey\n and o_orderkey = l_orderkey\ngroup by\n c_name,\n
c_custkey,\n o_orderkey,\n o_orderdate,\n o_totalprice\norder by\n o_totalprice
desc,\n o_orderdate\nlimit 100;","sequential_pipe",121);
+X_177:void := querylog.define("explain select\n c_name,\n c_custkey,\n
o_orderkey,\n o_orderdate,\n o_totalprice,\n sum(l_quantity)\nfrom\n
customer,\n orders,\n lineitem\nwhere\n o_orderkey in (\n select\n l_orderkey\n
from\n lineitem\n group by\n l_orderkey having\n sum(l_quantity) > 300\n )\n
and c_custkey = o_custkey\n and o_orderkey = l_orderkey\ngroup by\n c_name,\n
c_custkey,\n o_orderkey,\n o_orderdate,\n o_totalprice\norder by\n o_totalprice
desc,\n o_orderdate\nlimit 100;","sequential_pipe",117);
X_128 := bat.new(nil:oid,nil:str);
X_136 := bat.append(X_128,"sys.customer");
X_144 := bat.append(X_136,"sys.customer");
@@ -150,17 +150,16 @@ function user.s2_1(A0:sht):void;
X_124:bat[:lng] := algebra.projectionpath(X_61,r1_62,X_25);
X_125:bat[:hge] := aggr.subsum(X_124,X_75,r1_90,true,true);
(X_82,r1_117) := algebra.subjoin(X_81,X_15,nil:BAT,nil:BAT,false,nil:lng);
-X_189:bat[:oid] := algebra.projection(r1_117,C_3);
X_84:bat[:date] := sql.bind(X_2,"sys","orders","o_orderdate",0);
(C_86,r1_121) := sql.bind(X_2,"sys","orders","o_orderdate",2);
X_88:bat[:date] := sql.bind(X_2,"sys","orders","o_orderdate",1);
X_89 := sql.delta(X_84,C_86,r1_121,X_88);
-X_90:bat[:date] := algebra.projection(X_189,X_89);
+X_90:bat[:date] := algebra.projectionpath(r1_117,C_3,X_89);
X_91:bat[:lng] := sql.bind(X_2,"sys","orders","o_totalprice",0);
(C_93,r1_129) := sql.bind(X_2,"sys","orders","o_totalprice",2);
X_95:bat[:lng] := sql.bind(X_2,"sys","orders","o_totalprice",1);
X_96 := sql.delta(X_91,C_93,r1_129,X_95);
-X_97:bat[:lng] := algebra.projection(X_189,X_96);
+X_97:bat[:lng] := algebra.projectionpath(r1_117,C_3,X_96);
(C_100,r1_140) := algebra.firstn(X_97,100,false,false);
C_102 := algebra.firstn(X_90,C_100,r1_140,100,true,false);
X_103 := algebra.projection(C_102,X_90);
@@ -174,14 +173,11 @@ function user.s2_1(A0:sht):void;
X_117:bat[:str] :=
algebra.projectionpath(r1_153,C_102,X_82,r1_101,C_59,X_116);
X_118 := algebra.subslice(X_117,0,99:wrd);
X_119 := algebra.projection(X_118,X_117);
-X_190:bat[:oid] := algebra.projection(X_118,r1_153);
-X_188:bat[:oid] := algebra.projectionpath(X_190,C_102,X_82);
-X_187:bat[:oid] := algebra.projection(X_188,X_79);
-X_120:bat[:int] := algebra.projection(X_187,X_78);
-X_121:bat[:int] := algebra.projection(X_188,X_81);
-X_122:bat[:date] := algebra.projection(X_190,X_103);
-X_123:bat[:lng] := algebra.projection(X_190,X_104);
-X_126:bat[:hge] := algebra.projection(X_187,X_125);
+X_120:bat[:int] :=
algebra.projectionpath(X_118,r1_153,C_102,X_82,X_79,X_78);
+X_121:bat[:int] := algebra.projectionpath(X_118,r1_153,C_102,X_82,X_81);
+X_122:bat[:date] := algebra.projectionpath(X_118,r1_153,X_103);
+X_123:bat[:lng] := algebra.projectionpath(X_118,r1_153,X_104);
+X_126:bat[:hge] :=
algebra.projectionpath(X_118,r1_153,C_102,X_82,X_79,X_125);
sql.resultSet(X_170,X_172,X_174,X_175,X_176,X_119,X_120,X_121,X_122,X_123,X_126);
end user.s2_1;
diff --git a/sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
b/sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
@@ -52,7 +52,7 @@ Ready.
% clob # type
% 1117 # length
function
user.s2_1(A0:bte,A1:str,A2:str,A3:str,A4:str,A5:str,A6:bte,A7:sht,A8:sht,A9:int,A10:int,A11:str,A12:str,A13:str,A14:str,A15:str,A16:str,A17:str,A18:str,A19:bte,A20:sht,A21:sht,A22:int,A23:int,A24:str,A25:str,A26:str,A27:str,A28:str,
MonetDB: default - Approve output
Changeset: d05b8549226a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d05b8549226a
Modified Files:
monetdb5/optimizer/Tests/JPexample.stable.out
monetdb5/optimizer/Tests/projectionchain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out.int128
Branch: default
Log Message:
Approve output
diffs (truncated from 1962 to 300 lines):
diff --git a/monetdb5/optimizer/Tests/JPexample.stable.out
b/monetdb5/optimizer/Tests/JPexample.stable.out
--- a/monetdb5/optimizer/Tests/JPexample.stable.out
+++ b/monetdb5/optimizer/Tests/JPexample.stable.out
@@ -31,7 +31,16 @@ Ready.
#mdb.List("user","foo");
function user.foo():void; #[0] 0
-end user.foo; #[1]
+a:bat[:oid] := bat.new(:oid,:oid); #[1] CMDBATnew 1 <- 2 2
+b:bat[:oid] := bat.new(:oid,:oid); #[2] CMDBATnew 3 <- 2 2
+c:bat[:oid] := bat.new(:oid,:oid); #[3] CMDBATnew 4 <- 2 2
+d:bat[:oid] := bat.new(:oid,:oid); #[4] CMDBATnew 5 <- 2 2
+j1:bat[:oid] := algebra.projection(a:bat[:oid],b:bat[:oid]); #[5]
ALGprojection 6 <- 1 3
+j2:bat[:oid] :=
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid]); #[6]
ALGprojectionpath 7 <- 1 3 4
+j3:bat[:any] :=
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid],d:bat[:oid]); #[7]
ALGprojectionpath 8 <- 1 3 4 5
+j4:bat[:any] :=
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid]); #[8]
ALGprojectionpath 9 <- 1 3 4
+j5:bat[:oid] :=
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid],b:bat[:oid]); #[9]
ALGprojectionpath 10 <- 1 3 4 3
+end user.foo; #[10]
# 06:41:06 >
# 06:41:06 > "Done."
diff --git a/monetdb5/optimizer/Tests/projectionchain.stable.out
b/monetdb5/optimizer/Tests/projectionchain.stable.out
--- a/monetdb5/optimizer/Tests/projectionchain.stable.out
+++ b/monetdb5/optimizer/Tests/projectionchain.stable.out
@@ -63,17 +63,26 @@ function user.qry():void;
bat.append(k,7);
bat.append(k,8);
bat.append(k,9);
-X_89:bat[:oid] := algebra.projectionpath(a,b,c);
-f:bat[:oid] := X_89;
+e := algebra.projection(a,b);
+f:bat[:oid] := algebra.projectionpath(a,b,c);
g := alg
MonetDB: default - Approve output
Changeset: bef1d50c4c34 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bef1d50c4c34 Modified Files: monetdb5/mal/Tests/dynamicload.stable.err Branch: default Log Message: Approve output diffs (12 lines): diff --git a/monetdb5/mal/Tests/dynamicload.stable.err b/monetdb5/mal/Tests/dynamicload.stable.err --- a/monetdb5/mal/Tests/dynamicload.stable.err +++ b/monetdb5/mal/Tests/dynamicload.stable.err @@ -80,7 +80,7 @@ stderr of test 'dynamicload` in director # 13:21:38 > "mclient" "-lmal" "-ftest" "-Eutf-8" "--host=/var/tmp/mtest-18020" "--port=37961" # 13:21:38 > -MAPI = (monetdb) /var/tmp/mtest-7978/.s.monetdb.32278 +MAPI = (monetdb) /var/tmp/mtest-6360/.s.monetdb.38700 QUERY = # examples of non-bindable instructions #load unknown library ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: ec55a3bda374 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec55a3bda374 Modified Files: monetdb5/optimizer/Tests/JPexample.stable.out monetdb5/optimizer/Tests/projectionchain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/11-explain.stable.out sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/13-explain.stable.out sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128 sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/07-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/15-explain.stable.out sql/benchmarks/tpch/Tests/15-explain.stable.out.int128 sql/benchmarks/tpch/Tests/16-explain.stable.out sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/18-explain.stable.out sql/benchmarks/tpch/Tests/18-explain.stable.out.int128 sql/benchmarks/tpch/Tests/19-explain.stable.out sql/benchmarks/tpch/Tests/19-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 sql/benchmarks/tpch/Tests/21-explain.stable.out sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.int128 Branch: default Log Message: Approve output diffs (truncated from 1651 to 300 lines): diff --git a/monetdb5/optimizer/Tests/JPexample.stable.out b/monetdb5/optimizer/Tests/JPexample.stable.out --- a/monetdb5/optimizer/Tests/JPexample.stable.out +++ b/monetdb5/optimizer/Tests/JPexample.stable.out @@ -36,11 +36,12 @@ function user.foo():void; c:bat[:oid] := bat.new(:oid,:oid); #[3] CMDBATnew 4 <- 2 2 d:bat[:oid] := bat.new(:oid,:oid); #[4] CMDBATnew 5 <- 2 2 j1:bat[:oid] := algebra.projection(a:bat[:oid],b:bat[:oid]); #[5] ALGprojection 6 <- 1 3 -j2:bat[:oid] := algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid]); #[6] ALGprojectionpath 7 <- 1 3 4 -j3:bat[:any] := algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid],d:bat[:oid]); #[7] ALGprojectionpath 8 <- 1 3 4 5 -j4:bat[:any] := algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid]); #[8] ALGprojectionpath 9 <- 1 3 4 -j5:bat[:oid] := algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid],b:bat[:oid]); #[9] ALGprojectionpath 10 <- 1 3 4 3 -end user.foo; #[10] +X_11:bat[:oid] := algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid]); #[6] ALGprojectionpath 11 <- 1 3 4 +j2:bat[:oid] := X_11:bat[:oid];#[7] 7 <- 11 +j3:bat[:any] := algebra.projectionpath(X_11:bat[:oid],d:bat[:oid]); #[8] ALGprojectionpath 8 <- 11 5 +j4:bat[:any] := X_11:bat[:oid];#[9] 9 <- 11 +j5:bat[:oid] := algebra.projectionpath(X_11:bat[:oid],b:bat[:oid]); #[10] ALGprojectionpath 10 <- 11 3 +end user.foo; #[11] # 06:41:06 > # 06:41:06 > "Done." diff --git a/monetdb5/optimizer/Tests/projectionchain.stable.out b/monetdb5/optimizer/Tests/projectionchain.stable.out --- a/monetdb5/optimizer/Tests/projectionchain.stable.out +++ b/monetdb5/optimizer/Tests/projectionchain.stable.out @@ -64,25 +64,28 @@ function user.qry():void; bat.append(k,8); b
MonetDB: default - Approve output. catalog is now null.
Changeset: a5d070b5f614 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a5d070b5f614 Modified Files: sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/jdbc/tests/Tests/Test_PSmetadata.stable.out sql/jdbc/tests/Tests/Test_Rmetadata.stable.out sql/jdbc/tests/Tests/Test_Rsqldata.stable.out Branch: default Log Message: Approve output. catalog is now null. diffs (134 lines): diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out --- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out +++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out @@ -30,7 +30,6 @@ Ready. Resultset with 1 columns TABLE_CAT - Resultset with 3 columns TABLE_SCHEMTABLE_CATALOG TABLE_CAT bamnullnull diff --git a/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out --- a/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out +++ b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out @@ -52,7 +52,7 @@ Ready. 0. false false 0. 6 columns: 6 -1. +1. null classname java.lang.Short displaysize 8 label intnull @@ -72,7 +72,7 @@ 1. searchabletrue signedtrue writable false -2. +2. null classname java.lang.Integer displaysize 32 label myint @@ -92,7 +92,7 @@ 2. searchabletrue signedtrue writable false -3. +3. null classname java.lang.Double displaysize 53 label mydouble @@ -112,7 +112,7 @@ 3. searchabletrue signedtrue writable false -4. +4. null classname java.lang.Boolean displaysize 1 label mybool @@ -132,7 +132,7 @@ 4. searchabletrue signedfalse writable false -5. +5. null classname java.lang.String displaysize 15 label myvarchar @@ -152,7 +152,7 @@ 5. searchabletrue signedfalse writable false -6. +6. null classname java.sql.Clob displaysize 0 label myclob diff --git a/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out b/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out --- a/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out +++ b/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out @@ -25,7 +25,7 @@ Ready. 0. false false 0. 4 columns: 5 -1. +1. null classname java.lang.Integer displaysize 1 label myint @@ -45,7 +45,7 @@ 1. searchabletrue signedtrue writable false -2. +2. null classname java.lang.Double displaysize 24 label mydouble @@ -65,7 +65,7 @@ 2. searchabletrue signedtrue writable false -3. +3. null classname java.lang.Boolean displaysize 5 label mybool @@ -85,7 +85,7 @@ 3. searchabletrue signedfalse writable false -4. +4. null classname java.lang.String displaysize 8 label myvarchar @@ -105,7 +105,7 @@ 4. searchabletrue signedfalse writable false -5. +5. null classname java.sql.Clob displaysize 11 label myclob diff --git a/sql/jdbc/tests/Tests/Test_Rsqldata.stable.out b/sql/jdbc/tests/Tests/Test_Rsqldata.stable.out --- a/sql/jdbc/tests/Tests/Test_Rsqldata.stable.out +++ b/sql/jdbc/tests/Tests/Test_Rsqldata.stable.out @@ -52,12 +52,12 @@ Ready. 0. false false 0. 4 columns: 2 -1. +1. null classname nl.cwi.monetdb.jdbc.types.INET schemanamesys tablename table_test_rsqldata name myinet -2. +2. null classname nl.cwi.monetdb.jdbc.types.URL schemanamesys tablename table_test_rsqldata ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 68efe36f2e71 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68efe36f2e71 Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: Approve output 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 @@ -1251,7 +1251,7 @@ str MALpass(Client cntxt, MalBlkPtr mb, str MALpipeline(Client c); str MALreader(Client c); void MALresourceFairness(lng usec); -int MALrunningThreads(void); +size_t MALrunningThreads(void); str MALstartDataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MANIFOLDevaluate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MANIFOLDremapMultiplex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: a919332d1aa7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a919332d1aa7 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out sql/test/Tests/setoptimizer.stable.err sql/test/Tests/setoptimizer.stable.out sql/test/Tests/setoptimizer.stable.out.Windows Branch: default Log Message: Approve output diffs (144 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 @@ -38338,6 +38338,10 @@ command language.assert(v:sht,term:str): address MALassertSht; command language.assert(v:bit,term:str):void address MALassertBit; +pattern language.block(v:int,w:any...):int +address deblockdataflow; +comment Block on availability of all variables w, and then pass on v + pattern language.call(s:bat[:str]):void address CMDcallBAT; comment Evaluate a program stored in a BAT. @@ -39674,6 +39678,12 @@ comment Collect trace of a specific oper pattern optimizer.trace():str address OPTwrapper; +pattern optimizer.volcano(mod:str,fcn:str):str +address OPTwrapper; +comment Simulate volcano style execution + +pattern optimizer.volcano():str +address OPTwrapper; command pcre.imatch(s:str,pat:str):bit address PCREimatch; comment Caseless Perl Compatible Regular Expression pattern matching against a string 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 @@ -49189,6 +49189,10 @@ command language.assert(v:sht,term:str): address MALassertSht; command language.assert(v:bit,term:str):void address MALassertBit; +pattern language.block(v:int,w:any...):int +address deblockdataflow; +comment Block on availability of all variables w, and then pass on v + pattern language.call(s:bat[:str]):void address CMDcallBAT; comment Evaluate a program stored in a BAT. @@ -50533,6 +50537,12 @@ comment Collect trace of a specific oper pattern optimizer.trace():str address OPTwrapper; +pattern optimizer.volcano(mod:str,fcn:str):str +address OPTwrapper; +comment Simulate volcano style execution + +pattern optimizer.volcano():str +address OPTwrapper; command pcre.imatch(s:str,pat:str):bit address PCREimatch; comment Caseless Perl Compatible Regular Expression pattern matching against a string 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 @@ -1251,6 +1251,7 @@ str MALpass(Client cntxt, MalBlkPtr mb, str MALpipeline(Client c); str MALreader(Client c); void MALresourceFairness(lng usec); +int MALrunningThreads(void); str MALstartDataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MANIFOLDevaluate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MANIFOLDremapMultiplex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); @@ -1540,6 +1541,7 @@ int OPTremapImplementation(Client cntxt, int OPTremoteQueriesImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int OPTreorderImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str OPTsetDebugStr(void *ret, str *nme); +int OPTvolcanoImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str OPTwrapper(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str PCREilike2(bit *ret, const str *s, const str *pat); str PCREilike3(bit *ret, const str *s, const str *pat, const str *esc); @@ -1933,6 +1935,7 @@ str bindRef; str binddbatRef; str bindidxRef; var_t blobsize(size_t nitems); +str blockRef; str bpmRef; str bstreamRef; int bstream_create_wrap(Bstream *BS, Stream *S, int *bufsize); @@ -1993,6 +1996,7 @@ int daytime_fromstr(const char *buf, int int daytime_tostr(str *buf, int *len, const daytime *val); int daytime_tz_fromstr(const char *buf, int *len, daytime **ret); str dblRef; +str deblockdataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); void debugFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg, int first, int size); void debugLifespan(Client cntxt, MalBlkPtr mb, Lifespan span); str debugOptimizers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -2057,6 +2061,7 @@ str generatorRef; MALfcn getAddress(stream *out, str filename, str modnme, str fcnname, int silent); str getArgDefault(MalBlkPtr mb, InstrPtr p, int idx); ptr getArgReference(MalStkPtr stk, InstrPtr pci, int k); +lng getBatSpace(BAT *b); int getBitConstant(MalBlkPtr mb, bit val); int getBlockBegin(MalBlkPtr mb, int pc); int getBlockExit(MalBlkPtr mb, int pc); diff --git a/sql/test/Tests/setoptimizer.stable.err b/sql/test/Tests/setoptimizer.stable.err --- a/sql/test/Tests/setoptimizer.
MonetDB: default - Approve output
Changeset: 4e9b1355f5d7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4e9b1355f5d7 Modified Files: clients/Tests/exports.stable.out monetdb5/mal/Tests/tst611.stable.err Branch: default Log Message: Approve output diffs (36 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 @@ -2368,7 +2368,6 @@ str recycleRef; str reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk); str refineRef; str registerRef; -void releaseBAT(MalBlkPtr mb, MalStkPtr stk, int bid); str remapRef; str remoteRef; void removeDataflow(MalBlkPtr mb); @@ -2400,7 +2399,6 @@ void runtimeProfileBegin(Client cntxt, M void runtimeProfileExit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, RuntimeProfile prof); void runtimeProfileFinish(Client cntxt, MalBlkPtr mb); void runtimeProfileInit(Client cntxt, MalBlkPtr mb, MalStkPtr stk); -str safeguardStack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int safetyBarrier(InstrPtr p, InstrPtr q); str schedulerRef; str selectNotNilRef; diff --git a/monetdb5/mal/Tests/tst611.stable.err b/monetdb5/mal/Tests/tst611.stable.err --- a/monetdb5/mal/Tests/tst611.stable.err +++ b/monetdb5/mal/Tests/tst611.stable.err @@ -30,11 +30,11 @@ stderr of test 'tst611` in directory 'mo # 09:29:46 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25470" "--port=39422" # 09:29:46 > -MAPI = (monetdb) /var/tmp/mtest-3713/.s.monetdb.31932 +MAPI = (monetdb) /var/tmp/mtest-7956/.s.monetdb.39940 QUERY = # initialization of BATs on the stack # caused a problem when executed in interactve mode function foo(); -RKA:= bat.new(:int,1048576); +RKA:bat[:int]:= bat.new(:int,1048576); bat.append(RKA,360:int); io.print(RKA); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 5817dd6b6654 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5817dd6b6654 Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: Approve output diffs (59 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 @@ -2005,7 +2005,6 @@ void deriveModule(Module scope, str nme) malType destinationType(MalBlkPtr mb, InstrPtr p); str diffRef; str disconnectRef; -void displayVolume(Client cntxt, lng vol); str divRef; void dumpExceptionsToStream(stream *out, str msg); void dumpHelpTable(stream *f, Module s, str text, int flag); @@ -2135,7 +2134,6 @@ str io_stderr(Client cntxt, MalBlkPtr mb str io_stdin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str io_stdout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int isAllScalar(MalBlkPtr mb, InstrPtr p); -int isAmbiguousType(int type); int isBlocking(InstrPtr p); int isDelta(InstrPtr q); int isDependent(InstrPtr p, InstrPtr q); @@ -2164,7 +2162,6 @@ int isSubJoin(InstrPtr q); int isSubSelect(InstrPtr q); int isTmpName(const char *n); int isTopn(InstrPtr q); -int isTypeName(str n); int isUnsafeFunction(InstrPtr q); int isUnsafeInstruction(InstrPtr q); int isUpdateInstruction(InstrPtr p); @@ -2282,7 +2279,6 @@ InstrPtr newStmt(MalBlkPtr mb, char *mod InstrPtr newStmt1(MalBlkPtr mb, str module, char *name); InstrPtr newStmt2(MalBlkPtr mb, str module, char *name); Symbol newSymbol(str nme, int kind); -str newTmpName(char tag, int i); int newTmpSink(MalBlkPtr mb, malType type); int newTmpVariable(MalBlkPtr mb, malType type); int newTypeVariable(MalBlkPtr mb, malType type); @@ -2365,7 +2361,6 @@ str rankRef; str rapiRef; int readConsole(Client cntxt); MalStkPtr reallocGlobalStack(MalStkPtr s, int cnt); -MalStkPtr reallocStack(MalStkPtr s, int cnt); str reconnectRef; MalBlkPtr recycleBlk; int recycleCacheLimit; @@ -2432,7 +2427,6 @@ void showException(stream *out, enum mal void showFlowGraph(MalBlkPtr mb, MalStkPtr stk, str fname); void showHelp(Module m, str txt, stream *fs); void showMalBlkHistory(stream *out, MalBlkPtr mb); -void showModuleStatistics(stream *f, Module s); void showOptimizerHistory(void); void showOptimizerStep(str fnme, int i, int flg); void showScenario(stream *f, Scenario s); @@ -2508,7 +2502,6 @@ void unloadLibraries(void); str unlockRef; str unpackRef; str unpinRef; -void updateFootPrint(MalBlkPtr mb, MalStkPtr stk, int varid); str updateRef; void updateScenario(str scen, str nme, MALfcn fcn); str userRef; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: bc99ac396d18 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bc99ac396d18
Modified Files:
monetdb5/modules/mal/Tests/remote03.stable.err
monetdb5/modules/mal/Tests/remote03.stable.out.int128
monetdb5/optimizer/Tests/dataflow4.stable.out
Branch: default
Log Message:
Approve output
diffs (247 lines):
diff --git a/monetdb5/modules/mal/Tests/remote03.stable.err
b/monetdb5/modules/mal/Tests/remote03.stable.err
--- a/monetdb5/modules/mal/Tests/remote03.stable.err
+++ b/monetdb5/modules/mal/Tests/remote03.stable.err
@@ -1,14 +1,96 @@
stderr of test 'remote03` in directory 'monetdb5/modules/mal` itself:
-# 15:28:56 >
-# 15:28:56 > Mtimeout -timeout 60 mserver5
"--config=/ufs/fabian/scratch/monetdb/current/program-x86_64/etc/monetdb5.conf"
--debug=10 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/lib:/ufs/fabian/scratch/monetdb/current/program-x86_64/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/five/dbfarm"
--set
"sql_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/five/sqllog"
--set
"xquery_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-current-pegasus.ins.cwi.nl/five/xquerylog"
--set mapi_open=true --set mapi_port=34439 --set xrpc_port=43409 --set
monet_prompt= --trace --dbname=mTests_src_modules_mal remote03.mal
-# 15:28:56 >
+# 23:12:08 >
+# 23:12:08 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30565" "--set"
"mapi_usock=/var/tmp/mtest-23626/.s.monetdb.30565" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal"
"--set" "mal_listing=2" "--set" "embedded_r=yes"
+# 23:12:08 >
-#warning: please don't forget to set your vault key!
-#(see /ufs/fabian/scratch/monetdb/current/program-x86_64/etc/monetdb5.conf)
+# builtin opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 5
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 30565
+# cmdline opt mapi_usock = /var/tmp/mtest-23626/.s.monetdb.30565
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_modules_mal
+# cmdline opt mal_listing = 2
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
-# 15:28:56 >
-# 15:28:56 > Done.
-# 15:28:56 >
+# 23:12:08 >
+# 23:12:08 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-23626" "--port=30565"
+# 23:12:08 >
+MAPI = (monetdb) /var/tmp/mtest-23626/.s.monetdb.30565
+QUERY = # let connect figure out itself how to connect to the running db
+uri := sabaoth.getLocalConnectionURI();
+conn:str := remote.connect(uri, "monetdb", "monetdb");
+
+# this is invalid, as io.print is an invalid module, and bla will be
+# taken as function
+res:str := remote.put(conn,:void);
+res := remote.exec(conn, "io.print", "bla");
+catch SyntaxException:str;
+ io.print("Received first error from the remote site");
+ io.printf("!%s\n", SyntaxException);
+exit SyntaxException;
+
+# now do it with a function that returns something (a BAT in this case)
+bn:= bat.new(:oid,:str);
+b := remote.put(conn,bn);
+catch MALException:str;
+ io.print("Received second init error from the remote site");
+ io.printf("!%s\n", MALException);
+exit MALException;
+io.print(b);
+b := remote.exec(conn, "inspect", "getAtomNames");
+catch MALException:str;
+ io.print("Received second error from the remote site");
+ io.printf("!%s\n", MALException);
+exit MALException;
+io.print(b);
+
+c:bat[:oid,:str] := remote.get(conn, b);
+io.print(c);
+catch MALException:str;
+ io.print("Received third error from the remote site");
+ io.printf("!%s\n", MALException);
+exit MALException;
+
+# io.print only outputs things, but returns nothing
+ah:str := remote.put(conn,:void);
+io.print(ah);
+ah:str := remote.exec(conn, "io", "print", b);
+catch MALException:str;
+ io.print("Received fourth error from the remote site");
+
MonetDB: default - Approve output
Changeset: 614c5863fc83 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=614c5863fc83
Added Files:
sql/backends/monet5/Tests/simpleSQL.malC
sql/backends/monet5/vaults/Tests/vault00.malC
Removed Files:
sql/backends/monet5/Tests/simpleSQL.mal
sql/backends/monet5/vaults/Tests/vault00.mal
sql/test/BugTracker-2009/Tests/union_leak.SF-2540169.2.mal
Modified Files:
sql/backends/monet5/Tests/prepare.mal
sql/backends/monet5/Tests/simpleSQL.stable.err
sql/backends/monet5/Tests/simpleSQL.stable.out
sql/test/BugTracker-2009/Tests/All
Branch: default
Log Message:
Approve output
diffs (160 lines):
diff --git a/sql/backends/monet5/Tests/prepare.mal
b/sql/backends/monet5/Tests/prepare.mal
--- a/sql/backends/monet5/Tests/prepare.mal
+++ b/sql/backends/monet5/Tests/prepare.mal
@@ -1,4 +1,5 @@
#execute simple SQL queries from MAL
+function foo();
sql.init();
sql.prepare("myqry","select 2;");
@@ -13,3 +14,6 @@ select * from sys.prepared();
sql.deallocate("myqry");
sql.deallocate("myqry2");
+end foo;
+mdb.list("user","foo");
+user.foo();
diff --git a/sql/backends/monet5/Tests/simpleSQL.mal
b/sql/backends/monet5/Tests/simpleSQL.malC
rename from sql/backends/monet5/Tests/simpleSQL.mal
rename to sql/backends/monet5/Tests/simpleSQL.malC
--- a/sql/backends/monet5/Tests/simpleSQL.mal
+++ b/sql/backends/monet5/Tests/simpleSQL.malC
@@ -1,4 +1,5 @@
#execute simple SQL queries from MAL
+function foo();
sql.init();
sql.eval("select 1;",true);
@@ -11,3 +12,6 @@ sql.eval("drop table simpleT;");
#cause an error
sql.eval("select 1;",false);
+end foo;
+mdb.list("user","foo");
+user.foo();
diff --git a/sql/backends/monet5/Tests/simpleSQL.stable.err
b/sql/backends/monet5/Tests/simpleSQL.stable.err
--- a/sql/backends/monet5/Tests/simpleSQL.stable.err
+++ b/sql/backends/monet5/Tests/simpleSQL.stable.err
@@ -24,7 +24,31 @@ stderr of test 'simpleSQL` in directory
# cmdline opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_sql_backends_monet5
# cmdline opt gdk_debug = 536870922
-# 23:37:35 >
-# 23:37:35 > "Done."
-# 23:37:35 >
+# 13:03:24 >
+# 13:03:24 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-21282" "--port=38130"
+# 13:03:24 >
+MAPI = (monetdb) /var/tmp/mtest-21282/.s.monetdb.38130
+QUERY = #execute simple SQL queries from MAL
+function foo();
+sql.init();
+sql.eval("select 1;",true);
+
+sql.eval("create table simpleT(i integer);");
+sql.eval("insert into simpleT values(123);");
+
+sql.eval("select * from simpleT;");
+sql.eval("select * from simpleT;",false);
+sql.eval("drop table simpleT;");
+
+#cause an error
+sql.eval("select 1;",false);
+end foo;
+mdb.list("user","foo");
+user.foo();
+ERROR = !SQLException:sql.exportValue:failed
+
+# 13:03:24 >
+# 13:03:24 > "Done."
+# 13:03:24 >
+
diff --git a/sql/backends/monet5/Tests/simpleSQL.stable.out
b/sql/backends/monet5/Tests/simpleSQL.stable.out
--- a/sql/backends/monet5/Tests/simpleSQL.stable.out
+++ b/sql/backends/monet5/Tests/simpleSQL.stable.out
@@ -17,8 +17,15 @@ stdout of test 'simpleSQL` in directory
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-28801/.s.monetdb.30175
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
-function user.main():void;
-#execute simple SQL queries from MAL
+# MonetDB/R module loaded
+
+Ready.
+
+# 13:03:24 >
+# 13:03:24 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-21282" "--port=38130"
+# 13:03:24 >
+
+function user.foo():void;
sql.init();
sql.eval("select 1;",true);
sql.eval("create table simpleT(i integer);");
@@ -28,28 +35,23 @@ function user.main():void;
sql.eval("drop table simpleT;");
#cause an error
sql.eval("select 1;",false);
-end user.main;
-&1 0 1 1 1
+end user.foo;
% .L # table_name
% single_value # name
% tinyint # type
% 1 # length
[ 1]
-&2 1 -1
-&1 0 1 1 1
+[ 1]
% sys.simplet # table_name
% i # name
% int # type
% 3 # length
[ 123 ]
-&1 0 1 1 1
% sys.simplet # table_name
% i # name
% int # type
% 3 # length
[ 123 ]
-!SQLException:sql.exportValue:failed
-
# 23:37:35 >
# 23:37:35 > "Done."
diff --git a/sql/backends/monet5/vaults/Tests/vault00.mal
b/sql/backends/monet5/vaults/Tests/vault00.malC
rename from sql/backends/monet5/vaults/Tests/vault00.mal
rename to sql/backends/monet5/vaults/Tests/vault00.malC
--- a/sql/backends/monet5/vaults/Tests/vault00.mal
+++ b/sql/backends/monet5/vaults/Tests/vault00.malC
@@ -1,3 +1,5 @@
-
+function foo();
s:= vault.getdirectory();
io.print(s);
+end foo;
+user.foo();
diff --git a/sql/test/BugTracker-2009/Tests/All
b/sql/test/BugTracker-2009/Tests/All
--- a/sql/test/BugTracker-2009/Tests/All
+++ b/sql/test/BugTracker-2009/Tests/All
@@ -9,7 +9,6 @@ incomplete.SF.2536893
subquer
MonetDB: default - Approve output
Changeset: 8648c37526ef for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8648c37526ef
Added Files:
monetdb5/mal/Tests/tst005.malC
monetdb5/mal/Tests/tst005.stable.err
monetdb5/mal/Tests/tst022.stable.err
monetdb5/mal/Tests/tst022.stable.out
monetdb5/mal/Tests/tst116.malC
monetdb5/mal/Tests/tst116.stable.err
monetdb5/mal/Tests/tst116.stable.out
monetdb5/mal/Tests/tst237.malC
monetdb5/mal/Tests/tst237.stable.err
monetdb5/mal/Tests/tst237.stable.out
Removed Files:
monetdb5/mal/Tests/tst040.mal
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst005.stable.out
Branch: default
Log Message:
Approve output
diffs (truncated from 579 to 300 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -3,6 +3,7 @@ tst001
tst002
tst003
tst004
+tst005
tst006
tst007
tst008
@@ -35,7 +36,6 @@ tst036
tst037
tst038
tst039
-tst040
tst041
tst042
tst043
@@ -80,6 +80,7 @@ tst108
tst109
tst110
tst115
+tst116
tst1150
#tst120files are not located in module and paths are runtime dependent
tst1200
@@ -114,6 +115,7 @@ tst232
tst233
tst234
tst235
+tst237
tst250
tst2500
tst2501
diff --git a/monetdb5/mal/Tests/tst005.malC b/monetdb5/mal/Tests/tst005.malC
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst005.malC
@@ -0,0 +1,23 @@
+# test proper exists
+function foo();
+ i:= 1;
+ j:= 2;
+barrier v:=i;
+ io.print("entered");
+ io.print(v);
+ redo v:= iterator.next(-1,0);
+exit v;
+ io.print("doubles");
+ i:= 1;
+barrier (v,w):=(i,j);
+ io.print("entered2");
+ io.print(v);
+ v:= v-1;
+ barrier b:= v == 0;
+ leave (v,w);
+ exit b;
+ redo (v,w):= (v,w);
+exit (v,w);
+ io.print("finished");
+end foo;
+user.foo();
diff --git a/monetdb5/mal/Tests/tst005.stable.err
b/monetdb5/mal/Tests/tst005.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst005.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'tst005` in directory 'monetdb5/mal` itself:
+
+
+# 08:15:16 >
+# 08:15:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32746" "--set"
"mapi_usock=/var/tmp/mtest-26338/.s.monetdb.32746" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal"
"--set" "mal_listing=2" "--set" "embedded_r=yes"
+# 08:15:16 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 5
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 32746
+# cmdline opt mapi_usock = /var/tmp/mtest-26338/.s.monetdb.32746
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal
+# cmdline opt mal_listing = 2
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 08:15:16 >
+# 08:15:16 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-26338" "--port=32746"
+# 08:15:16 >
+
+
+# 08:15:16 >
+# 08:15:16 > "Done."
+# 08:15:16 >
+
diff --git a/monetdb5/mal/Tests/tst005.stable.out
b/monetdb5/mal/Tests/tst005.stable.out
--- a/monetdb5/mal/Tests/tst005.stable.out
+++ b/monetdb5/mal/Tests/tst005.stable.out
@@ -1,52 +1,37 @@
-# Monet Database Server V4.5.0
-# Copyright (c) 1993-2004, CWI. All rights reserved.
-# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked.
-# config:/ufs/mk/monet5/src/mal/Tests/All.conf
-# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm
-# dbname:demo
-# Visit http://monetdb.cwi.nl for further information.
-## test proper exists
-# i:= 1;
-# j:= 2;
-#barrier v:=i;
-# print("entered");
-# print(v);
-# redo v:= v -1;
-#exit v;
-# print("doubles");
-#barrier (v,w):=(i,j);
-# print("entered");
-# print(v);
-# v:= v-1;
-# redo (v,w):= (v,w);
-#exit (v,w);
-#
-# print("finished");
-#
-function Admin.main():int; # 0 (main:int)
-i := 1;# 1 (i:int)<-($2:int)
-j := 2;# 2 (j:int)<-($4:int)
-barrier v := i;# 3 (v:int)<-(i:int) jump 7
-io.print("entered"); # 4 IOprint_val ($6:int)<-($7:str)
-io.print(v); # 5 IOprint_val ($8:int)<-(v:int)
-redo v := calc.-(v,1); # 6 CALCbinarySUBintint
(v:int)<-(v:int)($2:int) jump 4
-exit v;# 7 (v:int)
-io.print("doubles"); # 8 IOprint_val ($9:int)<-($10:str)
-barrier (v,w):= (i,j
MonetDB: default - Approve output
Changeset: a387d75a4436 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a387d75a4436 Modified Files: monetdb5/extras/rapi/Tests/rapi01.stable.err monetdb5/extras/rapi/Tests/rapi01.stable.out monetdb5/mal/Tests/recycle01.stable.err monetdb5/mal/Tests/recycle01.stable.out monetdb5/mal/Tests/recycle02.stable.err monetdb5/mal/Tests/recycle02.stable.out monetdb5/mal/Tests/tst1002.malC monetdb5/mal/Tests/tst1002.stable.err monetdb5/mal/Tests/tst1002.stable.out monetdb5/mal/Tests/tst102.stable.err monetdb5/mal/Tests/tst102.stable.out monetdb5/mal/Tests/tst108.stable.err monetdb5/mal/Tests/tst108.stable.out monetdb5/mal/Tests/tst109.stable.err monetdb5/mal/Tests/tst109.stable.out monetdb5/mal/Tests/tst1200.stable.out monetdb5/mal/Tests/tst1203.stable.out monetdb5/mal/Tests/tst1500.stable.out monetdb5/mal/Tests/tst670.malC monetdb5/mal/Tests/tst670.stable.err monetdb5/mal/Tests/tst670.stable.out monetdb5/optimizer/Tests/inline02.stable.out monetdb5/optimizer/Tests/inline03.stable.out monetdb5/optimizer/Tests/inline08.malC monetdb5/optimizer/Tests/inline09.malC monetdb5/optimizer/Tests/inlineIfthen.stable.out monetdb5/optimizer/opt_inline.c Branch: default Log Message: Approve output diffs (truncated from 1444 to 300 lines): diff --git a/monetdb5/extras/rapi/Tests/rapi01.stable.err b/monetdb5/extras/rapi/Tests/rapi01.stable.err --- a/monetdb5/extras/rapi/Tests/rapi01.stable.err +++ b/monetdb5/extras/rapi/Tests/rapi01.stable.err @@ -30,26 +30,37 @@ stderr of test 'rapi01` in directory 'mo # 11:17:47 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-13991" "--port=31221" # 11:17:47 > -MAPI = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221 -QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- Re(fft(somevalue));",b); +MAPI = (monetdb) /var/tmp/mtest-23471/.s.monetdb.34866 +QUERY = # Error handling tests +b:= bat.new(:oid,:int); +bat.append(b,1804289383); +bat.append(b,846930886); +bat.append(b,1681692777); +bat.append(b,1714636915); +bat.append(b,1957747793); +bat.append(b,424238335); +bat.append(b,719885386); +bat.append(b,1649760492); +bat.append(b,596516649); +bat.append(b,1189641421); + +io.print(b); + +# illegal variables being used + +r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- Re(fft(somevalue));",b); +r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- Re(fft(arg2));",b); +r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(somevalue));",b); +r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret1 <- Re(fft(arg2));",b); +r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg5));",b); + +# illegal R expressions +r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg2) ) );",b); + +io.print(r); ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(somevalue) : object 'somevalue' not found Calls: as.data.frame -> -> fft -MAPI = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221 -QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"someresult <- Re(fft(arg2));",b); -ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(arg2) : object 'arg2' not found Calls: as.data.frame -> -> fft -MAPI = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221 -QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(somevalue));",b); -ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(somevalue) : object 'somevalue' not found Calls: as.data.frame -> -> fft -MAPI = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221 -QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret1 <- Re(fft(arg2));",b); -ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(arg2) : object 'arg2' not found Calls: as.data.frame -> -> fft -MAPI = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221 -QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg5));",b); -ERROR = !MALException:rapi.eval:Error running R expression: Error in fft(arg5) : object 'arg5' not found Calls: as.data.frame -> -> fft -MAPI = (monetdb) /var/tmp/mtest-13991/.s.monetdb.31221 -QUERY = r:bat[:oid,:dbl] := rapi.eval(nil:ptr,"ret0 <- Re(fft(arg2) ) );",b); -ERROR = !MALException:rapi.eval:Error parsing R expression 'ret0 <- Re(fft(arg2) ) );'. -# 11:17:47 > -# 11:17:47 > "Done." -# 11:17:47 > +# 20:42:39 > +# 20:42:39 > "Done." +# 20:42:39 > diff --git a/monetdb5/extras/rapi/Tests/rapi01.stable.out b/monetdb5/extras/rapi/Tests/rapi01.stable.out --- a/monetdb5/extras/rapi/Tests/rapi01.stable.out +++ b/monetdb5/extras/rapi/Tests/rapi01.stable.out @@ -39,8 +39,6 @@ Ready. [ 7@0, 1649760492
MonetDB: default - Approve output
Changeset: db0e8e6b550b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db0e8e6b550b Modified Files: monetdb5/extras/rapi/Tests/rapi07.stable.err monetdb5/extras/rapi/Tests/rapi07.stable.out monetdb5/mal/Tests/All monetdb5/mal/Tests/dynamicload.stable.err monetdb5/mal/Tests/flowchk.stable.err monetdb5/mal/Tests/parseErrors.stable.err monetdb5/mal/Tests/parseErrors.stable.out monetdb5/mal/Tests/pithole.stable.err monetdb5/mal/Tests/recycle01.stable.out monetdb5/mal/Tests/recycle02.stable.out monetdb5/mal/Tests/tst002.stable.err monetdb5/mal/Tests/tst003.stable.err monetdb5/mal/Tests/tst007.stable.err monetdb5/mal/Tests/tst007.stable.out monetdb5/mal/Tests/tst008.stable.err monetdb5/mal/Tests/tst010.stable.err monetdb5/mal/Tests/tst013.stable.err monetdb5/mal/Tests/tst019.stable.err monetdb5/mal/Tests/tst019.stable.out monetdb5/mal/Tests/tst027.stable.err monetdb5/mal/Tests/tst027.stable.out monetdb5/mal/Tests/tst036.stable.err monetdb5/mal/Tests/tst036.stable.out monetdb5/mal/Tests/tst038.stable.err monetdb5/mal/Tests/tst050.malC monetdb5/mal/Tests/tst050.stable.err monetdb5/mal/Tests/tst054.stable.err monetdb5/mal/Tests/tst058.stable.err monetdb5/mal/Tests/tst070.stable.err monetdb5/mal/Tests/tst071.stable.err monetdb5/mal/Tests/tst071.stable.out monetdb5/mal/Tests/tst102.stable.err monetdb5/mal/Tests/tst104.stable.err monetdb5/mal/Tests/tst105.stable.err monetdb5/mal/Tests/tst105a.stable.err monetdb5/mal/Tests/tst106.stable.err monetdb5/mal/Tests/tst108.stable.err monetdb5/mal/Tests/tst109.stable.err monetdb5/mal/Tests/tst115.stable.err monetdb5/mal/Tests/tst150.stable.err monetdb5/mal/Tests/tst1500.stable.err monetdb5/mal/Tests/tst1500.stable.out monetdb5/mal/Tests/tst161.stable.err monetdb5/mal/Tests/tst163.stable.err monetdb5/mal/Tests/tst163.stable.out monetdb5/mal/Tests/tst200.stable.err monetdb5/mal/Tests/tst200.stable.out monetdb5/mal/Tests/tst201.malC monetdb5/mal/Tests/tst201.stable.out monetdb5/mal/Tests/tst272.stable.err monetdb5/mal/Tests/tst272.stable.out monetdb5/mal/Tests/tst275.stable.err monetdb5/mal/Tests/tst275.stable.out monetdb5/mal/Tests/tst302.stable.err monetdb5/mal/Tests/tst303.stable.err monetdb5/mal/Tests/tst305.stable.err monetdb5/mal/Tests/tst611.stable.err monetdb5/mal/Tests/tst660.stable.err monetdb5/mal/Tests/tst755.stable.err monetdb5/mal/Tests/tst760.stable.err monetdb5/mal/Tests/tst804.stable.err monetdb5/mal/Tests/tst840.stable.err monetdb5/mal/Tests/tst840.stable.out monetdb5/mal/Tests/tst850.malC monetdb5/mal/Tests/tst900.stable.err monetdb5/mal/Tests/tst903.stable.out monetdb5/mal/Tests/tst904.malC monetdb5/mal/Tests/tst905.malC monetdb5/mal/Tests/tst907.malC monetdb5/optimizer/Tests/ARexample.stable.out monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/CXexample.stable.out monetdb5/optimizer/Tests/DCexample.stable.out monetdb5/optimizer/Tests/JPexample.stable.out monetdb5/optimizer/Tests/ifthencst.stable.out monetdb5/optimizer/Tests/inline04.malC monetdb5/optimizer/Tests/inline05.malC monetdb5/optimizer/Tests/inline06.malC monetdb5/optimizer/Tests/inline07.malC monetdb5/optimizer/Tests/inline08.malC monetdb5/optimizer/Tests/inline09.malC monetdb5/optimizer/Tests/inline10.malC monetdb5/optimizer/Tests/inlineCst.malC monetdb5/optimizer/Tests/inlineFunction1.stable.out monetdb5/optimizer/Tests/joinchain.stable.out monetdb5/optimizer/Tests/manifold2.stable.out monetdb5/optimizer/Tests/reorder00.stable.out monetdb5/optimizer/Tests/tst4001.stable.out monetdb5/optimizer/Tests/tst4004.stable.out Branch: default Log Message: Approve output diffs (truncated from 3366 to 300 lines): diff --git a/monetdb5/extras/rapi/Tests/rapi07.stable.err b/monetdb5/extras/rapi/Tests/rapi07.stable.err --- a/monetdb5/extras/rapi/Tests/rapi07.stable.err +++ b/monetdb5/extras/rapi/Tests/rapi07.stable.err @@ -1,11 +1,11 @@ stderr of test 'rapi07` in directory 'monetdb5/extras/rapi` itself: -# 20:20:45 > -# 20:20:45 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38117" "--set" "mapi_usock=/var/tmp/mtest-2827/.s.monetdb.38117" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/manegold/_/Monet/HG/Oct2014/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_mone
MonetDB: default - Approve output
Changeset: 7337849bc476 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7337849bc476
Modified Files:
monetdb5/optimizer/Tests/FTexample.stable.out
Branch: default
Log Message:
Approve output
diffs (60 lines):
diff --git a/monetdb5/optimizer/Tests/FTexample.stable.out
b/monetdb5/optimizer/Tests/FTexample.stable.out
--- a/monetdb5/optimizer/Tests/FTexample.stable.out
+++ b/monetdb5/optimizer/Tests/FTexample.stable.out
@@ -5,23 +5,39 @@ stdout of test 'FTexample` in directory
# 23:53:03 > Mtimeout -timeout 60 Mserver
"--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/log" --set
mapi_port=39352 --set sql_port=45171 --set xquery_port=52900 --set
monet_prompt= --trace --dbname=mTests_src_optimizer FTexample.mal
-# MonetDB server v5.7.0, based on kernel v1.25.0
-# Serving database 'mTests_src_optimizer', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-2008 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32348/
-function user.test(s:str):wrd;
-b := bat.new(:oid,:str);
-bat.append(b,"hello");
-z := algebra.subselect(b,s,s,true,true,false);
-i := aggr.count(z);
-return test := i;
-end user.test;
-function user.main():void;
-#Code factorization
-mdb.List("user","test");
-end user.main;
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_optimizer', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.589 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:33204/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-32050/.s.monetdb.33204
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 23:59:48 >
+# 23:59:48 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-32050" "--port=33204"
+# 23:59:48 >
+
+#mdb.List("user","test");
+function user.test(s:str):wrd; #[0] 0 <- 1
+b:bat[:oid,:str] := bat.new(:oid,:str);#[1] CMDBATnew 2 <- 3 4
+bat.append(b:bat[:oid,:str],"hello":str); #[2] BKCappend_val_wrap 5 <- 2
6
+z:bat[:oid,:oid] :=
algebra.subselect(b:bat[:oid,:str],s:str,s:str,true:bit,true:bit,false:bit);
#[3] ALGsubselect1 7 <- 2 1 1 8 9 10
+i:wrd := aggr.count(z:bat[:oid,:oid]); #[4] ALGcount_bat 11 <- 7
+return test:wrd := i:wrd; #[5] 0 <- 11
+end user.test; #[6]
+#mdb.List("user","test");
factory user.test(s:str):wrd; #[0] 0 <- 1
b:bat[:oid,:str] := bat.new(:oid,:str);#[1] CMDBATnew 2 <- 3 4
bat.append(b:bat[:oid,:str],"hello":str); #[2] BKCappend_val_wrap 5 <- 2
6
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - approve output
Changeset: 35e28172407d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=35e28172407d Added Files: sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.err sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.out sql/test/BugTracker-2015/Tests/missed-error.Bug-3842.stable.err sql/test/BugTracker-2015/Tests/missed-error.Bug-3842.stable.out Branch: default Log Message: approve output diffs (287 lines): diff --git a/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.err b/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.err @@ -0,0 +1,37 @@ +stderr of test 'constant-random.Bug-3836` in directory 'sql/test/BugTracker-2015` itself: + + +# 17:48:01 > +# 17:48:01 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31631" "--set" "mapi_usock=/var/tmp/mtest-18246/.s.monetdb.31631" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 17:48:01 > + +# builtin opt gdk_dbpath = /home/niels/scratch/monetdb/Linux-x86_64/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 5 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 31631 +# cmdline opt mapi_usock = /var/tmp/mtest-18246/.s.monetdb.31631 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015 +# cmdline opt mal_listing = 0 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 17:48:01 > +# 17:48:01 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-18246" "--port=31631" +# 17:48:01 > + + +# 17:48:01 > +# 17:48:01 > "Done." +# 17:48:01 > + diff --git a/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.out b/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2015/Tests/constant-random.Bug-3836.stable.out @@ -0,0 +1,85 @@ +stdout of test 'constant-random.Bug-3836` in directory 'sql/test/BugTracker-2015` itself: + + +# 17:48:01 > +# 17:48:01 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31631" "--set" "mapi_usock=/var/tmp/mtest-18246/.s.monetdb.31631" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 17:48:01 > + +# MonetDB 5 server v11.22.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2015', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 7.333 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://localhost.nes.nl:31631/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-18246/.s.monetdb.31631 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Start reading the write-ahead log 'sql_logs/sql/log.55' +# Finished reading the write-ahead log 'sql_logs/sql/log.55' +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. + +# 17:48:01 > +# 17:48:01 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-18246" "--port=31631" +# 17:48:01 > + +#create table tr(a int); +#insert into tr values (1), (1); +[ 2] +#select a + rand() from tr; +% sys.L # table_name +% sql_add_a # name +% bigint # type +% 10 # length +[ 2024039433 ] +[ 61050385 ] +#create table trand (a int, b int default rand()); +#insert into trand(a) values (1); +[ 1] +#insert into trand(a) values (2); +[ 1] +#insert into trand(a) values (3); +[ 1] +#alter table trand add column c int default rand(); +#alter table trand add column d int default null; +#select * from trand; +% sys.trand, sys.trand, sys.trand, sys.trand # table_name +% a, b, c, d # name +% int, int,int,int # type +% 1, 10, 10, 1 # length +[ 1, 1608666431, 2022107617, NULL] +[ 2, 1889558987, 237295360, NULL
MonetDB: default - Approve output.
Changeset: 477932282ab6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=477932282ab6 Modified Files: sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128 Branch: default Log Message: Approve output. diffs (truncated from 763 to 300 lines): diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128 b/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128 --- a/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128 +++ b/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128 @@ -61109,7 +61109,6 @@ Ready. [ 685, 229 ] [ 698, 234 ] [ 711, 239 ] -[ 723, 243 ] [ 743, 245 ] #SELECT a+b*2, # abs(a) @@ -61137,7 +61136,6 @@ Ready. [ 685, 229 ] [ 698, 234 ] [ 711, 239 ] -[ 723, 243 ] [ 743, 245 ] #SELECT (SELECT count(*) FROM t1 AS x WHERE x.b(SELECT avg(c) FROM t1) THEN a*2 ELSE b*10 END, # CASE WHEN ab-2 AND ahttps://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 9aab37a15bc6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9aab37a15bc6 Modified Files: monetdb5/mal/Tests/flowchk.stable.err monetdb5/mal/Tests/flowchk.stable.out Branch: default Log Message: Approve output diffs (66 lines): diff --git a/monetdb5/mal/Tests/flowchk.stable.err b/monetdb5/mal/Tests/flowchk.stable.err --- a/monetdb5/mal/Tests/flowchk.stable.err +++ b/monetdb5/mal/Tests/flowchk.stable.err @@ -65,7 +65,15 @@ stderr of test 'flowchk` in directory 'm #warning: please don't forget to set your vault key! #(see /ufs/mk/monet5//Linux/etc/monetdb5.conf) -# 20:45:09 > -# 20:45:09 > Done. -# 20:45:09 > +# 07:33:12 > +# 07:33:12 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-15547" "--port=37088" +# 07:33:12 > +MAPI = (monetdb) /var/tmp/mtest-15547/.s.monetdb.37088 +QUERY = end tst; + + +# 07:33:12 > +# 07:33:12 > "Done." +# 07:33:12 > + diff --git a/monetdb5/mal/Tests/flowchk.stable.out b/monetdb5/mal/Tests/flowchk.stable.out --- a/monetdb5/mal/Tests/flowchk.stable.out +++ b/monetdb5/mal/Tests/flowchk.stable.out @@ -9,19 +9,26 @@ stdout of test 'flowchk` in directory 'm # Serving database 'mTests_src_mal', using 4 threads # Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked # Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32709/ -!TypeException:user.tst[5]:'a' may not be used before being initialized -function user.tst():void; -barrier go := true; -a := bat.new(:oid,:int); -io.print(a); -exit go; -c := a; -end user.tst; +# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:37088/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-15547/.s.monetdb.37088 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Start reading the write-ahead log 'sql_logs/sql/log.4' +# Finished reading the write-ahead log 'sql_logs/sql/log.4' +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded -# 20:45:09 > -# 20:45:09 > Done. -# 20:45:09 > +Ready. +# 07:33:12 > +# 07:33:12 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-15547" "--port=37088" +# 07:33:12 > + + +# 07:33:12 > +# 07:33:12 > "Done." +# 07:33:12 > + ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: c7a1259b8ae5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c7a1259b8ae5
Removed Files:
monetdb5/optimizer/Tests/tst4602.malC
monetdb5/optimizer/Tests/tst4602.stable.err
monetdb5/optimizer/Tests/tst4602.stable.out
Modified Files:
monetdb5/optimizer/Tests/All
monetdb5/optimizer/Tests/DCexample2.stable.out
monetdb5/optimizer/Tests/FTexample.malC
monetdb5/optimizer/Tests/GCexample01.stable.out
monetdb5/optimizer/Tests/JPexample.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/inline09.stable.out
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/inlineFunction.malC
monetdb5/optimizer/Tests/inlineFunction1.stable.out
monetdb5/optimizer/Tests/joinchain.stable.out
monetdb5/optimizer/Tests/remap.malC
monetdb5/optimizer/Tests/tst4000.malC
monetdb5/optimizer/Tests/tst4000.stable.out
monetdb5/optimizer/Tests/tst4003.malC
monetdb5/optimizer/Tests/tst4003.stable.out
monetdb5/optimizer/Tests/tst4004.stable.out
monetdb5/optimizer/Tests/tst4010.malC
monetdb5/optimizer/Tests/tst4010.stable.out
monetdb5/optimizer/Tests/tst4030.malC
monetdb5/optimizer/Tests/tst4030.stable.out
monetdb5/optimizer/Tests/tst4601.stable.out
Branch: default
Log Message:
Approve output
diffs (truncated from 974 to 300 lines):
diff --git a/monetdb5/optimizer/Tests/All b/monetdb5/optimizer/Tests/All
--- a/monetdb5/optimizer/Tests/All
+++ b/monetdb5/optimizer/Tests/All
@@ -7,7 +7,6 @@ tst4005
tst4010
tst4030
tst4601
-tst4602
tst4630
#tst4700 no compiler
#tst4701
diff --git a/monetdb5/optimizer/Tests/DCexample2.stable.out
b/monetdb5/optimizer/Tests/DCexample2.stable.out
--- a/monetdb5/optimizer/Tests/DCexample2.stable.out
+++ b/monetdb5/optimizer/Tests/DCexample2.stable.out
@@ -5,30 +5,48 @@ stdout of test 'DCexample2` in directory
# 22:31:27 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set
mapi_port=34030 --set xrpc_port=44388 --set monet_prompt= --trace
--dbname=mTests_src_optimizer DCexample2.mal < /dev/null
# 22:31:27 >
-# MonetDB Server v5.0.0_beta2_1
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# dbname:mTests_src_optimizer
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32348/
-function user.main():void;
-b := bat.new(:oid,:int);
-bat.append(b,2);
-bat.append(b,5);
-bat.append(b,3);
-b := algebra.subsort(b,false,false);
-mdb.List();
-end user.main;
-function user.main():void; #[0] 0
-b:bat[:oid,:int] := bat.new(:oid,:int);#[1] CMDBATnew 2 <- 3 4
-bat.append(b:bat[:oid,:int],2:int);#[2] BKCappend_val_wrap 5 <- 2
6
-bat.append(b:bat[:oid,:int],5:int);#[3] BKCappend_val_wrap 7 <- 2
8
-bat.append(b:bat[:oid,:int],3:int);#[4] BKCappend_val_wrap 9 <- 2
10
-b:bat[:oid,:int] := algebra.subsort(b:bat[:oid,:int],false:bit,false:bit);
#[5] ALGsubsort11 2 <- 2 11 12
-mdb.List();#[6] MDBlistDetail 15
-end user.main; #[7]
+# MonetDB 5 server v11.22.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_optimizer', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.589 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:33343/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-8837/.s.monetdb.33343
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished reading the write-ahead log 'sql_logs/sql/log.4'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
-# 22:31:27 >
-# 22:31:27 > Done.
-# 22:31:27 >
+Ready.
+# 06:41:04 >
+# 06:41:04 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-8837" "--port=33343"
+# 06:41:04 >
+
+#mdb.List("user","foo");
+function user.foo():void; #[0] 0
+b:bat[:oid,:int] := bat.new(:oid,:int
MonetDB: default - Approve output
Changeset: 66325b2a7b74 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66325b2a7b74 Modified Files: monetdb5/mal/Tests/tst105a.malC monetdb5/mal/Tests/tst105a.stable.err monetdb5/mal/Tests/tst105a.stable.out monetdb5/mal/Tests/tst1150.stable.out monetdb5/mal/Tests/tst120a.stable.out monetdb5/mal/Tests/tst120b.stable.out monetdb5/mal/Tests/tst1225.stable.out monetdb5/mal/Tests/tst1500.stable.out monetdb5/mal/Tests/tst1502.stable.out monetdb5/mal/Tests/tst1503.stable.out monetdb5/mal/Tests/tst1504.stable.out monetdb5/mal/Tests/tst1505.stable.out monetdb5/mal/Tests/tst1506.stable.out monetdb5/mal/Tests/tst1602.stable.out monetdb5/mal/Tests/tst1604.stable.out Branch: default Log Message: Approve output diffs (truncated from 1115 to 300 lines): diff --git a/monetdb5/mal/Tests/tst105a.malC b/monetdb5/mal/Tests/tst105a.malC --- a/monetdb5/mal/Tests/tst105a.malC +++ b/monetdb5/mal/Tests/tst105a.malC @@ -1,7 +1,6 @@ # check classification of functions in the proper module module bbp; -command new(t:any_2):bat[:oid,:any_2] -address GDKbatnew; +command new(t:any_2):bat[:oid,:any_2] address GDKbatnew; b:= bbp.new(:int); diff --git a/monetdb5/mal/Tests/tst105a.stable.err b/monetdb5/mal/Tests/tst105a.stable.err --- a/monetdb5/mal/Tests/tst105a.stable.err +++ b/monetdb5/mal/Tests/tst105a.stable.err @@ -1,1 +1,41 @@ stderr of test 'tst105a` in directory 'monetdb5/mal` itself: + + +# 15:56:09 > +# 15:56:09 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34844" "--set" "mapi_usock=/var/tmp/mtest-21504/.s.monetdb.34844" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal" "--set" "mal_listing=2" "--set" "embedded_r=yes" +# 15:56:09 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 5 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 34844 +# cmdline opt mapi_usock = /var/tmp/mtest-21504/.s.monetdb.34844 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal +# cmdline opt mal_listing = 2 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 15:56:09 > +# 15:56:09 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21504" "--port=34844" +# 15:56:09 > + +MAPI = (monetdb) /var/tmp/mtest-21504/.s.monetdb.34844 +QUERY = b:= bbp.new(:int); +ERROR = !TypeException:user.main[1]:object code for command bbp.new missing +!TypeException:user.main[1]:'bbp.new' undefined in: b:bat[:oid,:int] := bbp.new(:int); + +# 15:56:09 > +# 15:56:09 > "Done." +# 15:56:09 > + diff --git a/monetdb5/mal/Tests/tst105a.stable.out b/monetdb5/mal/Tests/tst105a.stable.out --- a/monetdb5/mal/Tests/tst105a.stable.out +++ b/monetdb5/mal/Tests/tst105a.stable.out @@ -19,15 +19,16 @@ stdout of test 'tst105a` in directory 'm # Finished reading the write-ahead log 'sql_logs/sql/log.4' # Finished processing logs sql/sql_logs # MonetDB/SQL module loaded -command bbp.new(t:any_2):bat[:oid,:any_2] address GDKbatnew; -!TypeException:user.main[2]:object code for command bbp.new missing -!TypeException:user.main[2]:'bbp.new' undefined in: b:bat[:oid,:int] := bbp.new(:int); -function user.main():void; -# check classification of functions in the proper module -b := bbp.new(:int); -end user.main; +# MonetDB/R module loaded -# 07:58:57 > -# 07:58:57 > Done. -# 07:58:57 > +Ready. +# 15:56:09 > +# 15:56:09 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21504" "--port=34844" +# 15:56:09 > + + +# 15:56:09 > +# 15:56:09 > "Done." +# 15:56:09 > + diff --git a/monetdb5/mal/Tests/tst1150.stable.out b/monetdb5/mal/Tests/tst1150.stable.out --- a/monetdb5/mal/Tests/tst1150.stable.out +++ b/monetdb5/mal/Tests/tst1150.stable.out @@ -5,48 +5,31 @@ stdout of test 'tst1150` in directory 'm # 07:59:00 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB" --set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/log" --set mapi_port=42158 --set sql_port=55708 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst1150.mal -
MonetDB: default - Approve output
Changeset: 21e8b6e351db for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=21e8b6e351db 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 @@ -2448,7 +2448,6 @@ str recycleRef; str reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk); str refineRef; str registerRef; -void register_http_handler(http_request_handler handler); void releaseBAT(MalBlkPtr mb, MalStkPtr stk, int bid); str remapRef; str remoteRef; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 2143121d13ab for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2143121d13ab Modified Files: monetdb5/mal/Tests/tst275.stable.out Branch: default Log Message: Approve output diffs (122 lines): diff --git a/monetdb5/mal/Tests/tst275.stable.out b/monetdb5/mal/Tests/tst275.stable.out --- a/monetdb5/mal/Tests/tst275.stable.out +++ b/monetdb5/mal/Tests/tst275.stable.out @@ -54,8 +54,8 @@ end user.main; # tt t # name # void str str # type #--# -[ 0@0, "batId","tmp_525" ] -[ 1@0, "batCacheid", "341" ] +[ 0@0, "batId","tmp_461" ] +[ 1@0, "batCacheid", "305" ] [ 2@0, "hparentid","0" ] [ 3@0, "tparentid","0" ] [ 4@0, "batSharecnt", "0" ] @@ -71,57 +71,56 @@ end user.main; [ 14@0,"hsorted", "1" ] [ 15@0,"hrevsorted", "1" ] [ 16@0,"hident", "h" ] -[ 17@0,"hdense", "1" ] -[ 18@0,"hseqbase", "0@0" ] -[ 19@0,"hkey", "1" ] -[ 20@0,"hvarsized","1" ] -[ 21@0,"halign", "0" ] -[ 22@0,"hnosorted","0" ] -[ 23@0,"hnorevsorted", "0" ] -[ 24@0,"hnodense", "0" ] -[ 25@0,"hnokey[0]","0" ] -[ 26@0,"hnokey[1]","0" ] -[ 27@0,"hnonil", "1" ] -[ 28@0,"hnil", "0" ] -[ 29@0,"tident", "t" ] -[ 30@0,"tdense", "0" ] -[ 31@0,"tseqbase", "0@0" ] -[ 32@0,"tsorted", "1" ] -[ 33@0,"trevsorted", "1" ] -[ 34@0,"tkey", "1" ] -[ 35@0,"tvarsized","0" ] -[ 36@0,"talign", "2001" ] -[ 37@0,"tnosorted","0" ] -[ 38@0,"tnorevsorted", "0" ] -[ 39@0,"tnodense", "0" ] -[ 40@0,"tnokey[0]","0" ] -[ 41@0,"tnokey[1]","0" ] -[ 42@0,"tnonil", "1" ] -[ 43@0,"tnil", "0" ] -[ 44@0,"batInserted", "0" ] -[ 45@0,"batDeleted", "0" ] -[ 46@0,"batFirst", "0" ] -[ 47@0,"htop", "0" ] -[ 48@0,"ttop", "0" ] -[ 49@0,"batStamp", "152" ] -[ 50@0,"lastUsed", "1117" ] -[ 51@0,"curStamp", "154" ] -[ 52@0,"batCopiedtodisk", "0" ] -[ 53@0,"batDirtydesc", "dirty" ] -[ 54@0,"H->heap.dirty","clean" ] -[ 55@0,"T->heap.dirty","clean" ] -[ 56@0,"head.free","0" ] -[ 57@0,"head.size","0" ] -[ 58@0,"head.storage", "absent" ] -[ 59@0,"head.newstorage", "malloced" ] -[ 60@0,"head.filename","no file" ] -[ 61@0,"tail.free","0" ] -[ 62@0,"tail.size","1024" ] -[ 63@0,"tail.storage", "malloced" ] -[ 64@0,"tail.newstorage", "malloced" ] -[ 65@0,"tail.filename","05/525.tail" ] -[ 66@0,"H->vheap->dirty", "clean" ] -[ 67@0,"T->vheap->dirty", "clean" ] +[ 17@0,"hseqbase", "0@0" ] +[ 18@0,"hkey", "1" ] +[ 19@0,"hvarsized","1" ] +[ 20@0,"halign", "0" ] +[ 21@0,"hnosorted","0" ] +[ 22@0,"hnorevsorted", "0" ] +[ 23@0,"hnodense", "0" ] +[ 24@0,"hnokey[0]","0" ] +[ 25@0,"hnokey[1]","0" ] +[ 26@0,"hnonil", "1" ] +[ 27@0,"hnil", "0" ] +[ 28@0,"tident", "t" ] +[ 29@0,"tdense", "0" ] +[ 30@0,"tseqbase", "0@0" ] +[ 31@0,"tsorted", "1" ] +[ 32@0,"trevsorted", "1" ] +[ 33@0,"tkey", "1" ] +[ 34@0,"tvarsized","0" ] +[ 35@0,"talign", "2001" ] +[ 36@0,"tnosorted","0" ] +[ 37@0,"tnorevsorted", "0" ] +[ 38@0,"tnodense", "0" ] +[ 39@0,"tnokey[0]","0" ] +[ 40@0,"tnokey[1]","0" ] +[ 41@0,"tnonil", "1" ] +[ 42@0,"tnil", "0" ] +[ 43@0,"batInserted", "0" ] +[ 44@0,"batDeleted", "0" ] +[ 45@0,"batFirst", "0" ] +[ 46@0,"htop", "0" ] +[ 47@0,"ttop", "0" ] +[ 48@0,"batStamp", "535" ] +[ 49@0,"lastUsed", "45504" ] +[ 50@0,"curStamp", "537" ] +[ 51@0,"batCopiedtodisk", "0" ] +[ 52@0,"batDirtydesc", "dirty" ] +[ 53@0,"H->heap.dirty","clean" ] +[ 54@0,"T->heap.dirty","clean" ] +[ 55@0,"head.free","0" ] +[ 56@0,"head.size","0" ] +[ 57@0,"head.storage", "absent" ] +[ 58@0,"head.newstorage", "malloced" ] +[ 59@0,"head.filename","no file" ] +[ 60@0,"tail.free","0" ] +[ 61@0,"tail.size","1024" ] +[ 62@0,"tail.storage", "malloced" ] +[ 63@0,"tail.newstorage", "malloced" ] +[ 64@0,"tail.filena
MonetDB: default - Approve output
Changeset: b3a59e2c533d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3a59e2c533d
Modified Files:
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out.single
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:
Approve output
diffs (truncated from 1178 to 300 lines):
diff --git a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
--- a/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
+++ b/sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
@@ -44,7 +44,7 @@ Ready.
% mal # name
% clob # type
% 206 # length
-function user.s5_1{autoCommit=true}(A0:timestamp,A1:timestamp,A2:void):void;
+function user.s5_1(A0:timestamp,A1:timestamp,A2:void):void;
X_55:void := querylog.define("explain select (t-(select timestamp
\\'1970-1-1\\')),v from foo_nil_2dec union all select (t-(select timestamp
\\'1970-1-1\\')),null from foo_nil_2dec;","default_pipe",74);
barrier X_111 := language.dataflow();
X_33 := bat.new(nil:oid,nil:str);
@@ -62,27 +62,27 @@ barrier X_111 := language.dataflow();
X_39 := bat.new(nil:oid,nil:int);
X_48 := bat.append(X_39,0);
X_54 := bat.append(X_48,9);
-X_6:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
-X_5 := sql.mvc();
-X_64:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",0,2);
-X_66:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,0,2);
-(X_68:bat[:oid,:oid],X_69:bat[:oid,:timestamp]) :=
sql.bind(X_5,"sys","foo_nil_2dec","t",2,0,2);
+X_5:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
+X_4 := sql.mvc();
+X_64:bat[:oid,:oid] := sql.tid(X_4,"sys","foo_nil_2dec",0,2);
+X_66:bat[:oid,:timestamp] := sql.bind(X_4,"sys","foo_nil_2dec","t",0,0,2);
+(X_68:bat[:oid,:oid],X_69:bat[:oid,:timestamp]) :=
sql.bind(X_4,"sys","foo_nil_2dec","t",2,0,2);
X_78 := sql.delta(X_66,X_68,X_69);
X_80 := algebra.leftfetchjoin(X_64,X_78);
-X_16 := calc.timestamp(A0,7);
-X_82 := algebra.project(X_80,X_16);
+X_15 := calc.timestamp(A0,7);
+X_82 := algebra.project(X_80,X_15);
X_84 := batmtime.diff(X_80,X_82);
-X_65:bat[:oid,:oid] := sql.tid(X_5,"sys","foo_nil_2dec",1,2);
-X_67:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",0,1,2);
-(X_70:bat[:oid,:oid],X_71:bat[:oid,:timestamp]) :=
sql.bind(X_5,"sys","foo_nil_2dec","t",2,1,2);
-X_14:bat[:oid,:timestamp] := sql.bind(X_5,"sys","foo_nil_2dec","t",1);
-X_79 := sql.delta(X_67,X_70,X_71,X_14);
+X_65:bat[:oid,:oid] := sql.tid(X_4,"sys","foo_nil_2dec",1,2);
+X_67:bat[:oid,:timestamp] := sql.bind(X_4,"sys","foo_nil_2dec","t",0,1,2);
+(X_70:bat[:oid,:oid],X_71:bat[:oid,:timestamp]) :=
sql.bind(X_4,"sys","foo_nil_2dec","t",2,1,2);
+X_13:bat[:oid,:timestamp] := sql.bind(X_4,"sys","foo_nil_2dec","t",1);
+X_79 := sql.delta(X_67,X_70,X_71,X_13);
X_81 := algebra.leftfetchjoin(X_65,X_79);
-X_83 := algebra.project(X_81,X_16);
+X_83 := algebra.project(X_81,X_15);
X_85 := batmtime.diff(X_81,X_83);
X_96 := mat.packIncrement(X_84,2);
-X_18:bat[:oid,:lng] := mat.packIncrement(X_96,X_85);
-X_19 := bat.append(X_6,X_18,true);
+X_17:bat[:oid,:lng] := mat.packIncrement(X_96,X_85);
+X_18 := bat.append(X_5,X_17,true);
X_20 := calc.timestamp(A1,7);
X_86 := algebra.project(X_80,X_20);
X_88 := batmtime.diff(X_80,X_86);
@@ -90,15 +90,15 @@ barrier X_111 := language.dataflow();
X_89 := batmtime.diff(X_81,X_87);
X_99 := mat.packIncrement(X_88,2);
X_21:bat[:oid,:lng] := mat.packIncrement(X_99,X_89);
-X_22 := bat.append(X_19,X_21,true);
+X_22 := bat.append(X_18,X_21,true);
X_23:bat[:oid,:lng] := bat.new(nil:oid,nil:lng);
-X_72:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,0,2);
-(X_74:bat[:oid,:oid],X_75:bat[:oid,:lng]) :=
sql.bind(X_5,"sys","foo_nil_2dec","v",2,0,2);
+X_72:bat[:oid,:lng] := sql.bind(X_4,"sys","foo_nil_2dec","v",0,0,2);
+(X_74:bat[:oid,:oid],X_75:bat[:oid,:lng]) :=
sql.bind(X_4,"sys","foo_nil_2dec","v",2,0,2);
X_90 := sql.delta(X_72,X_74,X_75);
X_92 := algebra.leftfetchjoin(X_64,X_90);
-X_73:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",0,1,2);
-(X_76:bat[:oid,:oid],X_77:bat[:oid,:lng]) :=
sql.bind(X_5,"sys","foo_nil_2dec","v",2,1,2);
-X_25:bat[:oid,:lng] := sql.bind(X_5,"sys","foo_nil_2dec","v",1);
+X_73:bat[:oid,:lng] := sql.bind(X_4,"sys","foo_nil_2dec","v",0,1,2);
+(X_76:bat[:oid,:oid],X_77:bat[:oid,:lng]) :=
sql.bind(X_4,"sys","foo_nil_2dec","v",2,1,2);
+X_25:bat[:oid,:lng] := sql.bind(X_4,"sys","foo_nil_2dec","v",1);
X_91 := sql.delta(X_73,X_76,X_77,X_25);
X_93 := algebra.left
MonetDB: default - Approve output
Changeset: 222e2534a70c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=222e2534a70c Modified Files: clients/Tests/exports.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-explain.stable.out sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/06-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/12-explain.stable.out sql/benchmarks/tpch/Tests/12-explain.stable.out.int128 sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out Branch: default Log Message: Approve output diffs (truncated from 1977 to 300 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -1983,6 +1983,7 @@ str batcalcRef; str batmalRef; str batmmathRef; str batmtimeRef; +str batsqlRef; str batstrRef; str batxmlRef; str bbpRef; @@ -1990,7 +1991,6 @@ str bindRef; str binddbatRef; str bindidxRef; var_t blobsize(size_t nitems); -str boxRef; str bpmRef; str bstreamRef; int bstream_create_wrap(Bstream *BS, Stream *S, int *bufsize); @@ -2064,9 +2064,11 @@ void delVariable(MalBlkPtr mb, int varid str deleteRef; void deleteSymbol(Module scope, Symbol prg); str deltaRef; +str dense_rankRef; str depositRef; void deriveModule(Module scope, str nme); malType destinationType(MalBlkPtr mb, InstrPtr p); +str diffRef; str disconnectRef; void displayVolume(Client cntxt, lng vol); str divRef; @@ -2085,7 +2087,6 @@ str exportOperationRef; str export_tableRef; int fcnBinder(stream *out, Module scope, MalBlkPtr mb, InstrPtr p); str fcnDefinition(MalBlkPtr mb, InstrPtr p, str s, int flg, str base, size_t len); -int fileProp; int findGDKtype(int type); int findInstruction(Module scope, MalBlkPtr mb, InstrPtr pci); Module findModule(Module scope, str name); @@ -2240,7 +2241,6 @@ str iteratorRef; str joinPathRef; str joinRef; str jsonRef; -str kdifferenceRef; str languageRef; str leftfetchjoinPathRef; str leftfetchjoinRef; @@ -2448,6 +2448,7 @@ str putName(const char *nme, size_t len) str putRef; str queryRef; str querylogRef; +str rankRef; str rapiRef; int readConsole(Client cntxt); MalStkPtr reallocGlobalStack(MalStkPtr s, int cnt); @@ -2478,6 +2479,7 @@ int resolveType(int dsttype, int srctype str resultSetRef; str reuseRef; malType reverseBatType(malType v); +str row_numberRef; int rowsProp; str rpcRef; str rsColumnRef; @@ -2488,7 +2490,6 @@ str runMALDebugger(Client cntxt, Symbol str runMALdataflow(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk); str runMALsequence(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk, MalStkPtr env, InstrPtr pcicaller); str runScenario(Client c); -int runonceProp; void runtimeProfileBegin(Client cntxt, MalBlkPtr mb, MalStkPtr
MonetDB: default - Approve output.
Changeset: f620a88e6838 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f620a88e6838 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 Branch: default Log Message: Approve output. diffs (24 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 @@ -31415,7 +31415,7 @@ command bbp.getName(b:bat[:oid,:any_1]): address CMDbbpName; comment Map a BAT into its internal name -command bbp.get() (id:bat[:oid,:int],ns:bat[:oid,:str],ht:bat[:oid,:str],tt:bat[:oid,:str],cnt:bat[:oid,:lng],refcnt:bat[:oid,:int],lrefcnt:bat[:oid,:int],location:bat[:oid,:str],heat:bat[:oid,:int],dirty:bat[:oid,:str],status:bat[:oid,:str],kind:bat[:oid,:str]) +command bbp.get() (id:bat[:oid,:int],ns:bat[:oid,:str],tt:bat[:oid,:str],cnt:bat[:oid,:lng],refcnt:bat[:oid,:int],lrefcnt:bat[:oid,:int],location:bat[:oid,:str],heat:bat[:oid,:int],dirty:bat[:oid,:str],status:bat[:oid,:str],kind:bat[:oid,:str]) address CMDbbp; comment bpp 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 @@ -40460,7 +40460,7 @@ command bbp.getName(b:bat[:oid,:any_1]): address CMDbbpName; comment Map a BAT into its internal name -command bbp.get() (id:bat[:oid,:int],ns:bat[:oid,:str],ht:bat[:oid,:str],tt:bat[:oid,:str],cnt:bat[:oid,:lng],refcnt:bat[:oid,:int],lrefcnt:bat[:oid,:int],location:bat[:oid,:str],heat:bat[:oid,:int],dirty:bat[:oid,:str],status:bat[:oid,:str],kind:bat[:oid,:str]) +command bbp.get() (id:bat[:oid,:int],ns:bat[:oid,:str],tt:bat[:oid,:str],cnt:bat[:oid,:lng],refcnt:bat[:oid,:int],lrefcnt:bat[:oid,:int],location:bat[:oid,:str],heat:bat[:oid,:int],dirty:bat[:oid,:str],status:bat[:oid,:str],kind:bat[:oid,:str]) address CMDbbp; comment bpp ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 10a7f31ca5fa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=10a7f31ca5fa
Modified Files:
monetdb5/modules/mal/Tests/mapi07.stable.out
monetdb5/modules/mal/Tests/remote12.stable.out
monetdb5/modules/mal/mal_mapi.c
Branch: default
Log Message:
Approve output
diffs (57 lines):
diff --git a/monetdb5/modules/mal/Tests/mapi07.stable.out
b/monetdb5/modules/mal/Tests/mapi07.stable.out
--- a/monetdb5/modules/mal/Tests/mapi07.stable.out
+++ b/monetdb5/modules/mal/Tests/mapi07.stable.out
@@ -39,7 +39,7 @@ end user.main;
# tt # name
# void int # type
#--#
-[ 2@0, nil ]
+[ 0@0, nil ]
# 09:12:08 >
# 09:12:08 > Done.
diff --git a/monetdb5/modules/mal/Tests/remote12.stable.out
b/monetdb5/modules/mal/Tests/remote12.stable.out
--- a/monetdb5/modules/mal/Tests/remote12.stable.out
+++ b/monetdb5/modules/mal/Tests/remote12.stable.out
@@ -16,25 +16,20 @@ stdout of test 'remote12` in directory '
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:33456/
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
-!SyntaxException:parseError:e := nil:BAT;
-!SyntaxException:parseError: ^ expected
-!SyntaxException:parseError:m:str := remote.put(conn, e);
-!SyntaxException:parseError:^operator expected
-!SyntaxException:parseError:v:BAT := remote.get(conn,m);
-!SyntaxException:parseError: ^ expected
-!SyntaxException:parseError:io.print(v);
-!SyntaxException:parseError:^';' expected
function user.main():void;
#causing a sigfault
uri := sabaoth.getLocalConnectionURI();
conn:str := remote.connect(uri,"monetdb","monetdb");
e := nil:BAT;
+m:str := remote.put(conn,e);
io.print(m);
-v:BAT;
+v:BAT := remote.get(conn,m);
+io.print(v);
mdb.var();
end user.main;
+
# 20:06:20 >
# 20:06:20 > Done.
# 20:06:20 >
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -1603,7 +1603,7 @@ SERVERmapi_rpc_bat(Client cntxt, MalBlkP
throw(MAL,"mapi.rpc",MAL_MALLOC_FAIL);
BATseqbase(b,0);
while( mapi_fetch_row(hdl)){
- fld2= mapi_fetch_field(hdl,0);
+ fld2= mapi_fetch_field(hdl,1);
SERVERfieldAnalysis(fld2, tt, &tval);
BUNappend(b,VALptr(&tval), FALSE);
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 37ffa144978f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=37ffa144978f Modified Files: monetdb5/modules/mal/Tests/remote12.stable.out Branch: default Log Message: Approve output diffs (29 lines): diff --git a/monetdb5/modules/mal/Tests/remote12.stable.out b/monetdb5/modules/mal/Tests/remote12.stable.out --- a/monetdb5/modules/mal/Tests/remote12.stable.out +++ b/monetdb5/modules/mal/Tests/remote12.stable.out @@ -16,16 +16,21 @@ stdout of test 'remote12` in directory ' # Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:33456/ # MonetDB/GIS module loaded # MonetDB/SQL module loaded -# SQLException:mvc:SQL module not initialized +!SyntaxException:parseError:e := nil:BAT; +!SyntaxException:parseError: ^ expected +!SyntaxException:parseError:m:str := remote.put(conn, e); +!SyntaxException:parseError:^operator expected +!SyntaxException:parseError:v:BAT := remote.get(conn,m); +!SyntaxException:parseError: ^ expected +!SyntaxException:parseError:io.print(v); +!SyntaxException:parseError:^';' expected function user.main():void; #causing a sigfault uri := sabaoth.getLocalConnectionURI(); conn:str := remote.connect(uri,"monetdb","monetdb"); e := nil:BAT; -m:str := remote.put(conn,e); io.print(m); -v:BAT := remote.get(conn,m); -io.print(v); +v:BAT; mdb.var(); end user.main; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 7dd5531d5258 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7dd5531d5258 Modified Files: monetdb5/mal/Tests/tst025.stable.out monetdb5/mal/Tests/tst032.stable.out monetdb5/mal/Tests/tst201.stable.out monetdb5/mal/Tests/tst810.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/Tests/setoptimizer.stable.err sql/test/Tests/setoptimizer.stable.out sql/test/Tests/setoptimizer.stable.out.Windows Branch: default Log Message: Approve output diffs (197 lines): diff --git a/monetdb5/mal/Tests/tst025.stable.out b/monetdb5/mal/Tests/tst025.stable.out --- a/monetdb5/mal/Tests/tst025.stable.out +++ b/monetdb5/mal/Tests/tst025.stable.out @@ -50,7 +50,7 @@ end user.main; # void int # type #--# [ 0@0, 5140046 ] -[ 2@0, 5645862 ] +[ 1@0, 5645862 ] #--# # tt # name # void int # type diff --git a/monetdb5/mal/Tests/tst032.stable.out b/monetdb5/mal/Tests/tst032.stable.out --- a/monetdb5/mal/Tests/tst032.stable.out +++ b/monetdb5/mal/Tests/tst032.stable.out @@ -57,7 +57,7 @@ end user.main; # oid int # type #--# [ 0@0, 0 ] -[ 2@0, 2 ] +[ 1@0, 2 ] # 22:30:08 > # 22:30:08 > Done. diff --git a/monetdb5/mal/Tests/tst201.stable.out b/monetdb5/mal/Tests/tst201.stable.out --- a/monetdb5/mal/Tests/tst201.stable.out +++ b/monetdb5/mal/Tests/tst201.stable.out @@ -87,10 +87,10 @@ end user.main; # ht # name # oid str # type #--# -[ 10@0,"" ] +[ 0@0, "" ] [ 1@0, "quick" ] [ 2@0, "brown" ] -[ 11@0,nil ] +[ 3@0, nil ] [ 4@0, "jumps" ] [ 5@0, "over" ] [ 6@0, "lazy" ] @@ -101,49 +101,49 @@ end user.main; # th # name # void str # type #--# -[ 2@0, "brown" ] +[ 0@0, "brown" ] #--# # th # name # void str # type #--# -[ 10@0,"" ] -[ 11@0,nil ] -[ 7@0, "dog" ] -[ 8@0, nil ] -[ 12@0,"fox" ] -[ 13@0,"the" ] -[ 14@0,"." ] +[ 0@0, "" ] +[ 1@0, nil ] +[ 2@0, "dog" ] +[ 3@0, nil ] +[ 4@0, "fox" ] +[ 5@0, "the" ] +[ 6@0, "." ] #--# # tt # name # void str # type #--# -[ 10@0,"" ] +[ 0@0, "" ] [ 1@0, "quick" ] [ 2@0, "brown" ] -[ 11@0,nil ] +[ 3@0, nil ] [ 4@0, "jumps" ] [ 5@0, "over" ] [ 6@0, "lazy" ] [ 7@0, "dog" ] [ 8@0, nil ] -[ 12@0,"fox" ] -[ 13@0,"the" ] -[ 14@0,"." ] +[ 9@0, "fox" ] +[ 10@0,"the" ] +[ 11@0,"." ] #--# # tt # name # void str # type #--# -[ 12@0,"fox" ] +[ 0@0, "fox" ] #--# # ht # name # oid str # type #--# -[ 12@0,"fox" ] +[ 0@0, "fox" ] #--# # ht # name # oid str # type #--# -[ 12@0,"fox" ] +[ 0@0, "fox" ] #--# # ht # name # oid str # type diff --git a/monetdb5/mal/Tests/tst810.stable.out b/monetdb5/mal/Tests/tst810.stable.out --- a/monetdb5/mal/Tests/tst810.stable.out +++ b/monetdb5/mal/Tests/tst810.stable.out @@ -59,11 +59,11 @@ end user.main; # th # name # void int # type #--# -[ 4@0, 5 ] -[ 5@0, 6 ] -[ 6@0, 7 ] -[ 7@0, 8 ] -[ 8@0, 9 ] +[ 0@0, 5 ] +[ 1@0, 6 ] +[ 2@0, 7 ] +[ 3@0, 8 ] +[ 4@0, 9 ] # 16:18:09 > # 16:18:09 > "Done." diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out --- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out +++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out @@ -54,12 +54,12 @@ Operation successful | X_2 := sql.mvc(); | | X_9:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); | | X_6:bat[:oid,:oid] := sql.tid(X_2,"sys","_tables");| -| X_55 := algebra.subselect(X_9,X_6,2,2,true,true,true); | +| X_57 := algebra.subselect(X_9,X_6,2,2,true,true,true); | | (X_12,r1_12) := sql.bind(X_2,"sys","_tables","type",2); | -| X_56 := algebra.subselect(r1_12,nil:bat[:oid,:oid],2,2,true,true,true); | +| X_58 := algebra.subselect(r1_12,nil:bat[:oid,:oid],2,2,true,true,true); | | X_15:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1); | -| X_58 := algebra.subselect(X_15,X_6,2,2,true,true,true); | -| X_18 := sql.subdelta(X_55,X_6,
MonetDB: default - Approve output
Changeset: f59d31a05ed9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f59d31a05ed9 Modified Files: monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out Branch: default Log Message: Approve output diffs (11 lines): diff --git a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out --- a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out +++ b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out @@ -32,6 +32,7 @@ end user.main; #-# [ 0@0, 2, 4 ] [ 1@0, 3, 9 ] +!GDKerror:!ERROR: Columns must be the same size ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - approve output
Changeset: 8bd66f3f610a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8bd66f3f610a
Modified Files:
sql/test/Users/Tests/grantRole.Bug-3772.SQL.py
sql/test/Users/Tests/grantRole.Bug-3772.stable.err
sql/test/Users/Tests/grantRole.Bug-3772.stable.out
Branch: default
Log Message:
approve output
diffs (72 lines):
diff --git a/sql/test/Users/Tests/grantRole.Bug-3772.SQL.py
b/sql/test/Users/Tests/grantRole.Bug-3772.SQL.py
--- a/sql/test/Users/Tests/grantRole.Bug-3772.SQL.py
+++ b/sql/test/Users/Tests/grantRole.Bug-3772.SQL.py
@@ -4,9 +4,7 @@
from util import sql_test_client
-sql_client = os.getenv('SQL_CLIENT')
-
-client('monetdb', 'monetdb', input = """\
+sql_test_client('monetdb', 'monetdb', input = """\
CREATE SCHEMA s1;
CREATE USER bruce WITH PASSWORD 'bruce' name 'willis' schema s1;
CREATE TABLE s1.test(d int);
@@ -15,7 +13,7 @@ GRANT ALL ON s1.test to role1;
""")
-client('bruce', 'bruce', input = """\
+sql_test_client('bruce', 'bruce', input = """\
GRANT role1 to bruce;
SET role role1;
select * from test;
diff --git a/sql/test/Users/Tests/grantRole.Bug-3772.stable.err
b/sql/test/Users/Tests/grantRole.Bug-3772.stable.err
--- a/sql/test/Users/Tests/grantRole.Bug-3772.stable.err
+++ b/sql/test/Users/Tests/grantRole.Bug-3772.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'grantRole` in directory 'sql/test/Users` itself:
+stderr of test 'grantRole.Bug-3772` in directory 'sql/test/Users` itself:
# 22:31:48 >
@@ -26,15 +26,21 @@ stderr of test 'grantRole` in directory
# cmdline opt embedded_r = yes
# cmdline opt gdk_debug = 536870922
-# 22:31:49 >
-# 22:31:49 > "/usr/bin/python2" "grantRole.SQL.py" "grantRole"
-# 22:31:49 >
+# 22:00:19 >
+# 22:00:19 > "/usr/bin/python2" "grantRole.Bug-3772.SQL.py"
"grantRole.Bug-3772"
+# 22:00:19 >
-#GRANT role1 to bruce;
-# I imaine the error message should be something like this...
-GRANT: cannot grant ROLE 'role1' to ROLE/USER 'bruce'
+MAPI = (bruce) /var/tmp/mtest-16480/.s.monetdb.37363
+QUERY = GRANT role1 to bruce;
+ERROR = !GRANT: insufficient privileges to grant ROLE 'role1'
+MAPI = (bruce) /var/tmp/mtest-16480/.s.monetdb.37363
+QUERY = SET role role1;
+ERROR = !Role (role1) missing
+MAPI = (bruce) /var/tmp/mtest-16480/.s.monetdb.37363
+QUERY = select * from test;
+ERROR = !SELECT: access denied for bruce to table 's1.test'
-# 22:31:49 >
-# 22:31:49 > "Done."
-# 22:31:49 >
+# 22:00:20 >
+# 22:00:20 > "Done."
+# 22:00:20 >
diff --git a/sql/test/Users/Tests/grantRole.Bug-3772.stable.out
b/sql/test/Users/Tests/grantRole.Bug-3772.stable.out
--- a/sql/test/Users/Tests/grantRole.Bug-3772.stable.out
+++ b/sql/test/Users/Tests/grantRole.Bug-3772.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'grantRole` in directory 'sql/test/Users` itself:
+stdout of test 'grantRole.Bug-3772` in directory 'sql/test/Users` itself:
# 22:31:48 >
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 1edfd3c36057 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1edfd3c36057
Modified Files:
clients/mapiclient/Tests/mclient--help.stable.err
clients/mapiclient/Tests/mclient--help.stable.err.Windows
Branch: default
Log Message:
Approve output
diffs (24 lines):
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err
b/clients/mapiclient/Tests/mclient--help.stable.err
--- a/clients/mapiclient/Tests/mclient--help.stable.err
+++ b/clients/mapiclient/Tests/mclient--help.stable.err
@@ -21,7 +21,7 @@ Options are:
-E charset | --encoding=charset specify encoding (character set) of the
terminal
-f kind | --format=kind specify output format {csv,tab,raw,sql,xml}
-H | --history load/save cmdline history (default off)
- -i | --interactive[=tm] interpret \ commands on stdin, use time
formatting {ms,s,m}
+ -i | --interactive[=tm] interpret `\' commands on stdin, use time
formatting {ms,s,m}
-l language | --language=lang{sql,mal}
-L logfile | --log=logfile save client/server interaction
-s stmt | --statement=stmt run single statement
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
--- a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
+++ b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
@@ -21,7 +21,7 @@ Options are:
-E charset | --encoding=charset specify encoding (character set) of the
terminal
-f kind | --format=kind specify output format {csv,tab,raw,sql,xml}
-H | --history load/save cmdline history (default off)
- -i | --interactive[=tm] interpret \ commands on stdin, use time
formatting {ms,s,m}
+ -i | --interactive[=tm] interpret `\' commands on stdin, use time
formatting {ms,s,m}
-l language | --language=lang{sql,mal}
-L logfile | --log=logfile save client/server interaction
-s stmt | --statement=stmt run single statement
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: 6b7b984e43bf for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b7b984e43bf Modified Files: clients/mapiclient/Tests/tomograph--help.stable.err Branch: default Log Message: Approve output diffs (14 lines): diff --git a/clients/mapiclient/Tests/tomograph--help.stable.err b/clients/mapiclient/Tests/tomograph--help.stable.err --- a/clients/mapiclient/Tests/tomograph--help.stable.err +++ b/clients/mapiclient/Tests/tomograph--help.stable.err @@ -19,9 +19,7 @@ tomograph [options] -T | --title= -r | --range=-[ms,s] -i | --input= - -o | --output= (default 'tomograph' - -c | --cache= - -s | --system=# (on= 1(default) off=0 + -o | --output= (default 'cache/' -b | --beat= in milliseconds (default 5000) -A | --atlas= maximum number of queries (default 1) -D | --debug ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: a5c5fcac667d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a5c5fcac667d Modified Files: sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 Branch: default Log Message: Approve output diffs (48 lines): diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -684,7 +684,7 @@ Ready. [ "sys", "stddev_samp", 1, "timestamp","" ] [ "sys", "stop", 0, "int", "create procedure sys.stop(tag int)\nexternal name sql.sysmon_stop;"] [ "sys", "stop", 0, "bigint", "create procedure sys.stop(tag bigint)\nexternal name sql.sysmon_stop;" ] -[ "sys", "storage", 0, "clob", "-- This Source Code Form is subject to the terms of the Mozilla Public\n-- License, v. 2.0. If a copy of the MPL was not distributed with this\n-- file, You can obtain one at http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 2008-2015 MonetDB B.V.\n\n-- Author M.Kersten\n-- This script gives the database administrator insight in the actual\n-- footprint of the persistent tables and the maximum playground used\n-- when indices are introduced upon them.\n-- By chancing the storagemodelinput table directly, the footprint for\n-- yet to be loaded databases can be assessed.\n\n-- The actual storage footprint of an existing database can be\n-- obtained by the table procuding function storage()\n-- It represents the actual state of affairs, i.e. storage on disk\n-- of columns and foreign key indices, and possible temporary hash indices.\n-- For strings we take a sample to determine their average length.\n\ncreate function sys.\"storage\"()\nreturns table (\"sc hema\" string, \"table\" string, \"column\" string, \"type\" string, \"mode\" string, location string, \"count\" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, imprints bigint, sorted boolean)\nexternal name sql.\"storage\";" ] +[ "sys", "storage", 0, "clob", "-- This Source Code Form is subject to the terms of the Mozilla Public\n-- License, v. 2.0. If a copy of the MPL was not distributed with this\n-- file, You can obtain one at http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 2008-2015 MonetDB B.V.\n\n-- Author M.Kersten\n-- This script gives the database administrator insight in the actual\n-- footprint of the persistent tables and the maximum playground used\n-- when indices are introduced upon them.\n-- By chancing the storagemodelinput table directly, the footprint for\n-- yet to be loaded databases can be assessed.\n\n-- The actual storage footprint of an existing database can be\n-- obtained by the table procuding function storage()\n-- It represents the actual state of affairs, i.e. storage on disk\n-- of columns and foreign key indices, and possible temporary hash indices.\n-- For strings we take a sample to determine their average length.\n\ncreate function sys.\"storage\"()\nreturns table (\"sc hema\" string, \"table\" string, \"column\" string, \"type\" string, \"mode\" string, location string, \"count\" bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, imprints bigint, sorted boolean)\nexternal name sql.\"storage\";"] [ "sys", "storage", 1, "clob", "" ] [ "sys", "storage", 2, "clob", "" ] [ "sys", "storage", 3, "clob", "" ] @@ -695,8 +695,9 @@ Ready. [ "sys", "storage", 8, "bigint", "" ] [ "sys", "storage", 9, "bigint", "" ] [ "sys", "storage", 10, "bigint", "" ] -[ "sys", "storage", 11, "bigint", "" ] -[ "sys", "storage", 12, "boolean", "" ] +[ "sys", "storage", 11, "boolean", "" ] +[ "sys", "storage", 12, "bigint", "" ] +[ "sys", "storage", 13, "boolean", "" ] [ "sys", "storagemodel", 0, "clob", "create function sys.storagemodel()\nreturns table (\n\t\"schema\" string,\n\t\"table\" string,\n\t\"column\" string,\n\t\"type\" string,\n\t\"count\"\tbigint,\n\tcolumnsize bigint,\n\theapsize bigint,\n\thashes bigint,\n\timprints bigint,\n\tsorted boolean)\nbegin\n\treturn select i.\"schema\", i.\"table\", i.\"column\", i.\"type\", i.\"count\",\n\tcolumnsize(i.\"type\", i.count, i.\"distinct\"),\n\theapsize(i.\"type\", i.\"distinct\", i.\"atomwidth\"),\n\thashsize(i.\"reference\", i.\"count\"),\n\timprintsize(i.\"count\",i.\"type\"),\n\ti.sorted\n\tfrom sys.storagemodelinput i;\nend;" ] [ "sys", "storagemodel", 1, "clob", "" ] [ "sys", "storagemodel", 2, "clob", "" ] diff --git a/sql/test/Tests/systemfunctions.stable.out.int128 b/sql/test/Tes
MonetDB: default - Approve output
Changeset: a20cc0b7d0bf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a20cc0b7d0bf
Modified Files:
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/SQL-dump.stable.out.oid32
clients/Tests/SQL-dump.stable.out.oid32.int128
Branch: default
Log Message:
Approve output
diffs (truncated from 1959 to 300 lines):
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -1166,7 +1166,7 @@ external name sql.sysmon_stop;
-- For strings we take a sample to determine their average length.
create function sys."storage"()
-returns table ("schema" string, "table" string, "column" string, "type"
string, "mode" string, location string, "count" bigint, typewidth int,
columnsize bigint, heapsize bigint, hashes bigint, imprints bigint, sorted
boolean)
+returns table ("schema" string, "table" string, "column" string, "type"
string, "mode" string, location string, "count" bigint, typewidth int,
columnsize bigint, heapsize bigint, hashes bigint, phash boolean, imprints
bigint, sorted boolean)
external name sql."storage";
create function sys.storagemodel()
returns table (
@@ -1337,7 +1337,7 @@ CREATE TABLE "sys"."_columns" (
"number" INTEGER,
"storage" VARCHAR(2048)
);
-COPY 351 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 352 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
2002 "id""int" 32 0 2001NULLtrue0 NULL
2003 "name" "varchar" 10240 2001NULLtrue1
NULL
2004 "authorization" "int" 32 0 2001NULLtrue2
NULL
diff --git a/clients/Tests/SQL-dump.stable.out.int128
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -1203,7 +1203,7 @@ external name sql.sysmon_stop;
-- For strings we take a sample to determine their average length.
create function sys."storage"()
-returns table ("schema" string, "table" string, "column" string, "type"
string, "mode" string, location string, "count" bigint, typewidth int,
columnsize bigint, heapsize bigint, hashes bigint, imprints bigint, sorted
boolean)
+returns table ("schema" string, "table" string, "column" string, "type"
string, "mode" string, location string, "count" bigint, typewidth int,
columnsize bigint, heapsize bigint, hashes bigint, phash boolean, imprints
bigint, sorted boolean)
external name sql."storage";
create function sys.storagemodel()
returns table (
@@ -1378,7 +1378,7 @@ CREATE TABLE "sys"."_columns" (
"number" INTEGER,
"storage" VARCHAR(2048)
);
-COPY 351 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 352 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
2002 "id""int" 32 0 2001NULLtrue0 NULL
2003 "name" "varchar" 10240 2001NULLtrue1
NULL
2004 "authorization" "int" 32 0 2001NULLtrue2
NULL
@@ -1634,102 +1634,103 @@ 6938 "att_type" "varchar" 64 0
6942NULL
6939 "value" "clob" 0 0 6942NULLtrue3 NULL
6940 "file_id" "int" 32 0 6942NULLtrue4
NULL
6941 "gr_name" "varchar" 256 0 6942NULLtrue
5 NULL
-6966 "schema""clob" 0 0 6979NULLtrue0
NULL
-6967 "table" "clob" 0 0 6979NULLtrue1 NULL
-6968 "column""clob" 0 0 6979NULLtrue2
NULL
-6969 "type" "clob" 0 0 6979NULLtrue3 NULL
-6970 "mode" "clob" 0 0 6979NULLtrue4 NULL
-6971 "location" "clob" 0 0 6979NULLtrue5
NULL
-6972 "count" "bigint"64 0 6979NULLtrue6
NULL
-6973 "typewidth" "int" 32 0 6979NULLtrue7
NULL
-6974 "columnsize""bigint"64 0 6979NULLtrue
8 NULL
-6975 "heapsize" "bigint"64 0 6979NULLtrue
9 NULL
-6976 "hashes""bigint"64 0 6979NULLtrue
10 NULL
-6977 "imprints" "bigint"64 0 6979NULLtrue
11 NULL
-6978 "sorted""boolean" 1 0 6979NULLtrue
12 NULL
-6981 "schema""clob" 0 0 6991NULLtrue0
NULL
-6982 "table" "clob" 0 0 6991NULLtrue1 NULL
-6983 "column""clob" 0 0 6991NULLtrue2
MonetDB: default - Approve output
Changeset: 4db79327c25c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4db79327c25c Modified Files: sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out.int128 Branch: default Log Message: Approve output diffs (truncated from 355 to 300 lines): diff --git a/sql/test/leaks/Tests/check1.stable.out.int128 b/sql/test/leaks/Tests/check1.stable.out.int128 --- a/sql/test/leaks/Tests/check1.stable.out.int128 +++ b/sql/test/leaks/Tests/check1.stable.out.int128 @@ -39,11 +39,11 @@ Ready. [ "oid", "bit", 0 ] [ "oid", "bit", 4 ] [ "oid", "bit", 50 ] -[ "oid", "bit", 351 ] +[ "oid", "bit", 352 ] [ "oid", "bit", 1520] [ "oid", "bit", 1520] [ "oid", "bit", 1520] -[ "oid", "bte", 4258] +[ "oid", "bte", 4259] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -111,21 +111,21 @@ Ready. [ "oid", "int", 229 ] [ "oid", "int", 229 ] [ "oid", "int", 232 ] -[ "oid", "int", 351 ] -[ "oid", "int", 351 ] -[ "oid", "int", 351 ] -[ "oid", "int", 351 ] -[ "oid", "int", 351 ] +[ "oid", "int", 352 ] +[ "oid", "int", 352 ] +[ "oid", "int", 352 ] +[ "oid", "int", 352 ] +[ "oid", "int", 352 ] [ "oid", "int", 1520] [ "oid", "int", 1520] [ "oid", "int", 1520] [ "oid", "int", 1520] [ "oid", "int", 1520] -[ "oid", "int", 4258] -[ "oid", "int", 4258] -[ "oid", "int", 4258] -[ "oid", "int", 4258] -[ "oid", "int", 4258] +[ "oid", "int", 4259] +[ "oid", "int", 4259] +[ "oid", "int", 4259] +[ "oid", "int", 4259] +[ "oid", "int", 4259] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -259,15 +259,15 @@ Ready. [ "oid", "str", 50 ] [ "oid", "str", 50 ] [ "oid", "str", 232 ] -[ "oid", "str", 351 ] -[ "oid", "str", 351 ] -[ "oid", "str", 351 ] -[ "oid", "str", 351 ] +[ "oid", "str", 352 ] +[ "oid", "str", 352 ] +[ "oid", "str", 352 ] +[ "oid", "str", 352 ] [ "oid", "str", 1520] [ "oid", "str", 1520] [ "oid", "str", 1520] -[ "oid", "str", 4258] -[ "oid", "str", 4258] +[ "oid", "str", 4259] +[ "oid", "str", 4259] [ "oid", "timestamp",0 ] [ "oid", "timestamp",0 ] [ "oid", "wrd", 0 ] diff --git a/sql/test/leaks/Tests/check2.stable.out.int128 b/sql/test/leaks/Tests/check2.stable.out.int128 --- a/sql/test/leaks/Tests/check2.stable.out.int128 +++ b/sql/test/leaks/Tests/check2.stable.out.int128 @@ -39,11 +39,11 @@ Ready. [ "oid", "bit", 0 ] [ "oid", "bit", 4 ] [ "oid", "bit", 50 ] -[ "oid", "bit", 351 ] +[ "oid", "bit", 352 ] [ "oid", "bit", 1520] [ "oid", "bit", 1520] [ "oid", "bit", 1520] -[ "oid", "bte", 4258] +[ "oid", "bte", 4259] [ "oid", "int", 0 ] [ "oid", "int", 0 ] [ "oid", "int", 0 ] @@ -111,21 +111,21 @@ Ready. [ "oid", "int", 229 ] [ "oid", "int", 229 ] [ "oid", "int", 232 ] -[ "oid", "int", 351 ] -[ "oid", "int", 351 ] -[ "oid", "int", 351 ] -[ "oid", "int", 351 ] -[ "oid", "int", 351 ] +[ "oid", "int", 352 ] +[ "oid", "int", 352 ] +[ "oid", "int", 352 ] +[ "oid", "int", 352 ] +[ "oid", "int", 352 ] [ "oid", "int", 1520] [ "oid", "int", 1520] [ "oid", "int", 1520] [ "oid", "int", 1520] [ "oid", "int", 1520] -[ "oid", "int", 4258] -[ "oid", "int", 4258] -[ "oid", "int", 4258] -[ "oid", "int", 4258] -[ "oid", "int", 4258] +[ "oid", "int", 4259] +[ "oid", "int", 4259] +[ "oid", "int", 4259] +[ "oid", "int", 4259] +[ "oid", "int", 4259] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] [ "oid", "lng", 0 ] @@ -259,15 +259,15 @@ Ready. [ "oid", "str", 50 ] [ "oid", "str", 50 ] [ "oid", "str", 232 ] -[ "oid", "str", 351 ] -[ "oid", "str", 351 ] -[ "oid", "str", 351
MonetDB: default - approve output
Changeset: 181f419a2a06 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=181f419a2a06
Modified Files:
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
Branch: default
Log Message:
approve output
diffs (30 lines):
diff --git a/sql/benchmarks/tpch/Tests/11-explain.stable.out
b/sql/benchmarks/tpch/Tests/11-explain.stable.out
--- a/sql/benchmarks/tpch/Tests/11-explain.stable.out
+++ b/sql/benchmarks/tpch/Tests/11-explain.stable.out
@@ -56,9 +56,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 633 # length
+% 812 # length
function user.s2_1{autoCommit=true}(A0:str,A1:sht,A2:str):void;
-X_132:void := querylog.define("explain
select\n\tps_partkey,\n\tsum(ps_supplycost * ps_availqty) as
value\nfrom\n\tpartsupp,\n\tsupplier,\n\tnation\nwhere\n\tps_suppkey =
s_suppkey\n\tand s_nationkey = n_nationkey\n\tand n_name = \\'GERMANY\\'\ngroup
by\n\tps_partkey having\n\t\tsum(ps_supplycost * ps_availqty) >
(\n\t\t\tselect\n\t\t\t\tsum(ps_supplycost * ps_availqty) *
0.01\n\t\t\tfrom\n\t\t\t\tpartsupp,\n\t\t\t\tsupplier,\n\t\t\t\tnation\n\t\t\twhere\n\t\t\t\tps_suppkey
= s_suppkey\n\t\t\t\tand s_nationkey = n_nationkey\n\t\t\t\tand n_name =
\\'GERMANY\\'\n\t\t)\norder by\n\tvalue desc;","sequential_pipe",72);
+X_132:void := querylog.define("explain
select\n\tps_partkey,\n\tsum(ps_supplycost * ps_availqty) as
value\nfrom\n\tpartsupp,\n\tsupplier,\n\tnation\nwhere\n\tps_suppkey =
s_suppkey\n\tand s_nationkey = n_nationkey\n\tand n_name = \\'GERMANY\\'\ngroup
by\n\tps_partkey having\n\t\tsum(ps_supplycost * ps_availqty) >
(\n\t\t\tselect\n\t\t\t\tsum(ps_supplycost * ps_availqty) *
0.01\n\t\t\t--\t
\n\t\t\t-- The above constant needs to be adjusted
according\n\t\t\t-- to the scale factor (SF): constant = 0.0001 /
SF.\n\t\t\tfrom\n\t\t\t\tpartsupp,\n\t\t\t\tsupplier,\n\t\t\t\tnation\n\t\t\twhere\n\t\t\t\tps_suppkey
= s_suppkey\n\t\t\t\tand s_nationkey = n_nationkey\n\t\t\t\tand n_name =
\\'GERMANY\\'\n\t\t)\norder by\n\tvalue desc;","sequential_pipe",72);
X_5 := sql.mvc();
X_6:bat[:oid,:oid] := sql.tid(X_5,"sys","supplier");
X_9:bat[:oid,:oid] :=
sql.bind_idxbat(X_5,"sys","supplier","supplier_s_nationkey_fkey",0);
diff --git a/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
b/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
--- a/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
+++ b/sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
@@ -56,9 +56,9 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 633 # length
+% 812 # length
function user.s2_1{autoCommit=true}(A0:str,A1:sht,A2:str):void;
-X_132:void := querylog.define("explain
select\n\tps_partkey,\n\tsum(ps_supplycost * ps_availqty) as
value\nfrom\n\tpartsupp,\n\tsupplier,\n\tnation\nwhere\n\tps_suppkey =
s_suppkey\n\tand s_nationkey = n_nationkey\n\tand n_name = \\'GERMANY\\'\ngroup
by\n\tps_partkey having\n\t\tsum(ps_supplycost * ps_availqty) >
(\n\t\t\tselect\n\t\t\t\tsum(ps_supplycost * ps_availqty) *
0.01\n\t\t\tfrom\n\t\t\t\tpartsupp,\n\t\t\t\tsupplier,\n\t\t\t\tnation\n\t\t\twhere\n\t\t\t\tps_suppkey
= s_suppkey\n\t\t\t\tand s_nationkey = n_nationkey\n\t\t\t\tand n_name =
\\'GERMANY\\'\n\t\t)\norder by\n\tvalue desc;","sequential_pipe",72);
+X_132:void := querylog.define("explain
select\n\tps_partkey,\n\tsum(ps_supplycost * ps_availqty) as
value\nfrom\n\tpartsupp,\n\tsupplier,\n\tnation\nwhere\n\tps_suppkey =
s_suppkey\n\tand s_nationkey = n_nationkey\n\tand n_name = \\'GERMANY\\'\ngroup
by\n\tps_partkey having\n\t\tsum(ps_supplycost * ps_availqty) >
(\n\t\t\tselect\n\t\t\t\tsum(ps_supplycost * ps_availqty) *
0.01\n\t\t\t--\t
\n\t\t\t-- The above constant needs to be adjusted
according\n\t\t\t-- to the scale factor (SF): constant = 0.0001 /
SF.\n\t\t\tfrom\n\t\t\t\tpartsupp,\n\t\t\t\tsupplier,\n\t\t\t\tnation\n\t\t\twhere\n\t\t\t\tps_suppkey
= s_suppkey\n\t\t\t\tand s_nationkey = n_nationkey\n\t\t\t\tand n_name =
\\'GERMANY\\'\n\t\t)\norder by\n\tvalue desc;","sequential_pipe",72);
X_5 := sql.mvc();
X_6:bat[:oid,:oid] := sql.tid(X_5,"sys","supplier");
X_9:bat[:oid,:oid] :=
sql.bind_idxbat(X_5,"sys","supplier","supplier_s_nationkey_fkey",0);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approve output
Changeset: d8bd9ed4fab1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d8bd9ed4fab1 Removed Files: monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.mal monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.err monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.out Modified Files: monetdb5/optimizer/Tests/tst4300.mal monetdb5/optimizer/Tests/tst4300.stable.out monetdb5/tests/BugTracker/Tests/All sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/16-explain.stable.out sql/test/leaks/Tests/check0_bam.stable.out.int128 Branch: default Log Message: Approve output diffs (truncated from 341 to 300 lines): diff --git a/monetdb5/optimizer/Tests/tst4300.mal b/monetdb5/optimizer/Tests/tst4300.mal --- a/monetdb5/optimizer/Tests/tst4300.mal +++ b/monetdb5/optimizer/Tests/tst4300.mal @@ -20,6 +20,6 @@ io.print(i); bo := batcalc.oid(b); co := batcalc.oid(c); cor:= bat.reverse(co); -zz:= algebra.joinPath(bo,cor,d); +zz:= algebra.leftjoinPath(bo,cor,d); i:= aggr.count(zz); io.print(i); diff --git a/monetdb5/optimizer/Tests/tst4300.stable.out b/monetdb5/optimizer/Tests/tst4300.stable.out --- a/monetdb5/optimizer/Tests/tst4300.stable.out +++ b/monetdb5/optimizer/Tests/tst4300.stable.out @@ -31,7 +31,7 @@ exit v; bo := batcalc.oid(b); co := batcalc.oid(c); cor := bat.reverse(co); -zz := algebra.joinPath(bo,cor,d); +zz := algebra.leftjoinPath(bo,cor,d); i := aggr.count(zz); io.print(i); end user.main; diff --git a/monetdb5/tests/BugTracker/Tests/All b/monetdb5/tests/BugTracker/Tests/All --- a/monetdb5/tests/BugTracker/Tests/All +++ b/monetdb5/tests/BugTracker/Tests/All @@ -5,6 +5,5 @@ batcast.SF-1730987 empty_line_crash.SF-1806638 parser.SF-2051309 mal_var_persistent_over_sessions.SF-2581675 -joinpath-loop.Bug-2965 algebra_project.Bug-3045 stdev.Bug-3178 diff --git a/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.mal b/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.mal deleted file mode 100644 --- a/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.mal +++ /dev/null @@ -1,13 +0,0 @@ -a:bat[:oid, :int] := bat.new(:oid, :int); -b:bat[:oid, :int] := bat.new(:oid, :int); -c:bat[:oid, :int] := bat.new(:oid, :int); -bat.append(a, 1); -bat.append(a, 2); -bat.append(a, 3); -bat.append(b, 1); -bat.append(b, 2); -bat.append(b, 0); -bat.append(c, 0); -bat.append(c, 3); -bat.append(c, 1); -algebra.joinPath(a, b, c); diff --git a/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.err b/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.err deleted file mode 100644 --- a/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.err +++ /dev/null @@ -1,31 +0,0 @@ -stderr of test 'joinpath-loop.Bug-2965` in directory 'monetdb5/tests/BugTracker` itself: - - -# 16:23:27 > -# 16:23:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/ufs/sjoerd/Monet-candidate/var/MonetDB" "--set" "mapi_open=true" "--set" "mapi_port=39263" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_tests_BugTracker" "joinpath-loop.Bug-2965.mal" -# 16:23:27 > - -# builtin opt gdk_dbname = demo -# builtin opt gdk_dbfarm = /ufs/sjoerd/Monet-candidate/var/monetdb5/dbfarm -# builtin opt gdk_debug = 0 -# builtin opt gdk_alloc_map = no -# builtin opt gdk_vmtrim = yes -# builtin opt monet_prompt = > -# builtin opt monet_daemon = no -# builtin opt mapi_port = 5 -# builtin opt mapi_open = false -# builtin opt mapi_autosense = false -# builtin opt sql_optimizer = default_pipe -# builtin opt sql_debug = 0 -# cmdline opt gdk_nr_threads = 0 -# cmdline opt gdk_dbfarm = /ufs/sjoerd/Monet-candidate/var/MonetDB -# cmdline opt mapi_open = true -# cmdline opt mapi_port = 39263 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbname = mTests_tests_BugTracker - -# 16:23:27 > -# 16:23:27 > "Done." -# 16:23:27 > - diff --git a/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.out b/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.out deleted file mode 100644 --- a/monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.out +++ /dev/null @@ -1,39 +0,0 @@ -stdout of test 'joinpath-loop.Bug-2965` in directory 'monetdb5/tests/BugTracker` itself: - - -# 16:23:27 > -# 16:23:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/ufs/sjoerd/Monet-candidate/var/MonetDB" "--set" "mapi_open=true" "--set" "mapi_port=39263" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_tests_BugTracker" "joinpath-loop.Bug-2965.mal" -# 16:23:27 > - -# MonetDB 5 server v11.7.0 -# This is an unreleased version -# Serving database 'mTests
MonetDB: default - Approve output of new joinpathcode
Changeset: 85f77dc9e6c0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=85f77dc9e6c0
Modified Files:
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
Branch: default
Log Message:
Approve output of new joinpathcode
diffs (truncated from 1259 to 300 lines):
diff --git a/sql/benchmarks/ssbm/Tests/04-explain.stable.out
b/sql/benchmarks/ssbm/Tests/04-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/04-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/04-explain.stable.out
@@ -41,7 +41,7 @@ Ready.
% clob # type
% 412 # length
function user.s2_1{autoCommit=true}(A0:str,A1:str):void;
-X_138:void := querylog.define("explain\nselect sum(lo_revenue), d_year,
p_brand1\n\tfrom lineorder, dwdate, part, supplier\n\twhere lo_orderdate =
d_datekey\n\t\tand lo_partkey = p_partkey\n\t\tand lo_suppkey =
s_suppkey\n\t\tand p_category = \\'MFGR#12\\' -- OK to add p_mfgr =
’MFGR#1’\n\t\tand s_region = \\'AMERICA\\'\n\tgroup by d_year,
p_brand1\n\torder by d_year, p_brand1;","sequential_pipe",74);
+X_138:void := querylog.define("explain\nselect sum(lo_revenue), d_year,
p_brand1\n\tfrom lineorder, dwdate, part, supplier\n\twhere lo_orderdate =
d_datekey\n\t\tand lo_partkey = p_partkey\n\t\tand lo_suppkey =
s_suppkey\n\t\tand p_category = \\'MFGR#12\\' -- OK to add p_mfgr =
’MFGR#1’\n\t\tand s_region = \\'AMERICA\\'\n\tgroup by d_year,
p_brand1\n\torder by d_year, p_brand1;","sequential_pipe",72);
X_4 := sql.mvc();
X_5:bat[:oid,:oid] := sql.tid(X_4,"sys","lineorder");
X_8:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_partkey_fkey",0);
@@ -73,20 +73,18 @@ function user.s2_1{autoCommit=true}(A0:s
X_50 := sql.subdelta(X_171,X_40,X_45,X_172,X_174);
X_52 := X_50;
(X_53,r1_61) := algebra.subjoin(X_39,X_52,nil:BAT,nil:BAT,false,nil:lng);
-X_175 := algebra.leftfetchjoin(X_53,X_27);
X_56:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_58,r1_66) :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
X_60:bat[:oid,:oid] :=
sql.bind_idxbat(X_4,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_61 := sql.projectdelta(X_5,X_56,X_58,r1_66,X_60);
-X_62:bat[:oid,:oid] := algebra.leftfetchjoin(X_175,X_61);
+X_62:bat[:oid,:oid] := algebra.leftfetchjoinPath(X_53,X_27,X_61);
X_63:bat[:oid,:oid] := sql.tid(X_4,"sys","dwdate");
(X_66,r1_76) := algebra.subjoin(X_62,X_63,nil:BAT,nil:BAT,false,nil:lng);
-X_176 := algebra.leftfetchjoin(X_66,X_53);
X_70:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_brand1",0);
(X_74,r1_84) := sql.bind(X_4,"sys","part","p_brand1",2);
X_77:bat[:oid,:str] := sql.bind(X_4,"sys","part","p_brand1",1);
X_79 := sql.projectdelta(X_24,X_70,X_74,r1_84,X_77);
-X_80:bat[:oid,:str] := algebra.leftfetchjoinPath(X_176,r1_31,X_79);
+X_80:bat[:oid,:str] := algebra.leftfetchjoinPath(X_66,X_53,r1_31,X_79);
X_81:bat[:oid,:int] := sql.bind(X_4,"sys","dwdate","d_year",0);
(X_83,r1_97) := sql.bind(X_4,"sys","dwdate","d_year",2);
X_85:bat[:oid,:int] := sql.bind(X_4,"sys","dwdate","d_year",1);
diff --git a/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
@@ -41,7 +41,7 @@ Ready.
% clob # type
% 412 # length
function user.s2_1{autoCommit=true}(A0:str,A1:str):void;
-X_138:void := querylog.define("explain\nselect sum(lo_revenue), d_year,
p_brand1\n\tfrom lineorder, dwdate, part, supplier\n\twhere lo_orderdate =
d_datekey\n\t\tand lo_partkey = p_partkey\n\t\tand lo_suppkey =
s_suppkey\n\t\tand p_category = \\'MFGR#12\\' -- OK to add p_mfgr =
’MFGR#1’\n\t\tand s_region = \\
