Changeset: 8cf74ff465dd for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8cf74ff465dd Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out geom/monetdb5/geom.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_runtime.c monetdb5/modules/kernel/batmmath.c monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.int128 sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.single sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out.single 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/remote/Tests/partition_elim.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out.int128 sql/test/sysmon/Tests/sys_queue_expand.stable.out Branch: unlock Log Message:
Merge with default branch. diffs (truncated from 93987 to 300 lines): diff --git a/ChangeLog.userstats b/ChangeLog.userstats new file mode 100644 --- /dev/null +++ b/ChangeLog.userstats @@ -0,0 +1,19 @@ +# ChangeLog file for userstats +# This file is updated with Maddlog + +* Mon Aug 10 2020 Ying Zhang <[email protected]> +- Finished a first version of the new monitoring function + user_statistics(), which is only intended for the DBAs. + For each database user who has logged in during the current mserver5 + session, it returns + "username": login name of the database user, + "querycount": the number of queries this user has executed since his/her + first login, + "totalticks": the total execution time (in microsecond) of the queries ran + by this user, + "maxquery": the query with the longest execution time (if two queries have + the same execution time, the newer overwrites the older), + "maxticks": the execution time of the 'maxquery' (in microsecond), + "started": the start timestamp of the 'maxquery', + "finished": the finish timestamp of the 'maxquery'. + 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 @@ -3553,7 +3553,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:sht], X_3:bat[:cnd], X_4:int, X_5:int):bat[:bte] ", "batsht_dec2dec_cand_bte;", "" ] [ "batcalc", "bte", "command batcalc.bte(X_1:bat[:sht], X_2:int, X_3:int):bat[:bte] ", "batsht_num2dec_bte;", "" ] [ "batcalc", "bte", "command batcalc.bte(X_1:bat[:sht], X_2:bat[:cnd], X_3:int, X_4:int):bat[:bte] ", "batsht_num2dec_cand_bte;", "" ] -[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:str], X_2:int, X_3:int):bat[:bte] ", "batstr_2dec_bte;", "" ] +[ "batcalc", "bte", "pattern batcalc.bte(X_1:bat[:str], X_2:bat[:cnd], X_3:int, X_4:int):bat[:bte] ", "batstr_2dec_bte;", "" ] +[ "batcalc", "bte", "pattern batcalc.bte(X_1:bat[:str], X_2:int, X_3:int):bat[:bte] ", "batstr_2dec_bte;", "" ] [ "batcalc", "bte_noerror", "pattern batcalc.bte_noerror(X_1:bat[:bit]):bat[:bte] ", "CMDconvert_bte;", "" ] [ "batcalc", "bte_noerror", "pattern batcalc.bte_noerror(X_1:bat[:bit], X_2:bat[:cnd]):bat[:bte] ", "CMDconvert_bte;", "" ] [ "batcalc", "bte_noerror", "pattern batcalc.bte_noerror(X_1:bat[:bte]):bat[:bte] ", "CMDconvert_bte;", "" ] @@ -3807,15 +3808,22 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "cmp", "pattern batcalc.cmp(X_1:str, X_2:bat[:str]):bat[:bte] ", "CMDbatCMP;", "" ] [ "batcalc", "cmp", "pattern batcalc.cmp(X_1:str, X_2:bat[:str], X_3:bat[:cnd]):bat[:bte] ", "CMDbatCMP;", "" ] [ "batcalc", "date", "command batcalc.date(X_1:bat[:date]):bat[:date] ", "MTIMEdate_date_bulk;", "" ] +[ "batcalc", "date", "command batcalc.date(X_1:bat[:date], X_2:bat[:oid]):bat[:date] ", "MTIMEdate_date_bulk_cand;", "" ] [ "batcalc", "date", "command batcalc.date(X_1:bat[:str]):bat[:date] ", "MTIMEdate_fromstr_bulk;", "" ] +[ "batcalc", "date", "command batcalc.date(X_1:bat[:str], X_2:bat[:oid]):bat[:date] ", "MTIMEdate_fromstr_bulk_cand;", "" ] [ "batcalc", "date", "command batcalc.date(X_1:bat[:timestamp]):bat[:date] ", "MTIMEtimestamp_extract_date_bulk;", "" ] +[ "batcalc", "date", "command batcalc.date(X_1:bat[:timestamp], X_2:bat[:oid]):bat[:date] ", "MTIMEtimestamp_extract_date_bulk_cand;", "" ] [ "batcalc", "date", "command batcalc.date(X_1:bat[:str]):bat[:date] ", "batstr_2_date;", "" ] [ "batcalc", "date", "command batcalc.date(X_1:bat[:str], X_2:bat[:cnd]):bat[:date] ", "batstr_2_date_cand;", "" ] [ "batcalc", "date", "pattern batcalc.date(X_1:bat[:oid]):bat[:date] ", "nil_2_date;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:daytime]):bat[:daytime] ", "MTIMEdaytime_daytime_bulk;", "" ] +[ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:daytime], X_2:bat[:oid]):bat[:daytime] ", "MTIMEdaytime_daytime_bulk_cand;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:lng]):bat[:daytime] ", "MTIMEdaytime_fromseconds_bulk;", "" ] +[ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:lng], X_2:bat[:oid]):bat[:daytime] ", "MTIMEdaytime_fromseconds_bulk_cand;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:str]):bat[:daytime] ", "MTIMEdaytime_fromstr_bulk;", "" ] +[ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:str], X_2:bat[:oid]):bat[:daytime] ", "MTIMEdaytime_fromstr_bulk_cand;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:timestamp]):bat[:daytime] ", "MTIMEtimestamp_extract_daytime_bulk;", "" ] +[ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:timestamp], X_2:bat[:oid]):bat[:daytime] ", "MTIMEtimestamp_extract_daytime_bulk_cand;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:str], X_2:int):bat[:daytime] ", "batstr_2time_daytime;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:str], X_2:bat[:cnd], X_3:int):bat[:daytime] ", "batstr_2time_daytime_cand;", "" ] [ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:daytime], X_2:bat[:cnd], X_3:int):bat[:daytime] ", "daytime_2time_daytime;", "" ] @@ -3823,8 +3831,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:oid], X_2:int):bat[:daytime] ", "nil_2time_daytime;", "" ] [ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:lng], X_2:bat[:cnd], X_3:int):bat[:daytime] ", "second_interval_2_daytime;", "" ] [ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:lng], X_2:int):bat[:daytime] ", "second_interval_2_daytime;", "" ] -[ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:daytime], X_2:bat[:cnd], X_3:int, X_4:int):bat[:daytime] ", "str_2time_daytimetz;", "" ] -[ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:daytime], X_2:int, X_3:int):bat[:daytime] ", "str_2time_daytimetz;", "" ] +[ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:str], X_2:bat[:cnd], X_3:int, X_4:int):bat[:daytime] ", "str_2time_daytimetz;", "" ] +[ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:str], X_2:int, X_3:int):bat[:daytime] ", "str_2time_daytimetz;", "" ] [ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:timestamp], X_2:bat[:cnd], X_3:int):bat[:daytime] ", "timestamp_2_daytime;", "" ] [ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:timestamp], X_2:int):bat[:daytime] ", "timestamp_2_daytime;", "" ] [ "batcalc", "dbl", "pattern batcalc.dbl(X_1:bat[:bit]):bat[:dbl] ", "CMDconvertsignal_dbl;", "" ] @@ -4393,7 +4401,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:sht], X_3:int, X_4:int):bat[:int] ", "batsht_dec2dec_int;", "" ] [ "batcalc", "int", "command batcalc.int(X_1:bat[:sht], X_2:bat[:cnd], X_3:int, X_4:int):bat[:int] ", "batsht_num2dec_cand_int;", "" ] [ "batcalc", "int", "command batcalc.int(X_1:bat[:sht], X_2:int, X_3:int):bat[:int] ", "batsht_num2dec_int;", "" ] -[ "batcalc", "int", "command batcalc.int(X_1:bat[:str], X_2:int, X_3:int):bat[:int] ", "batstr_2dec_int;", "" ] +[ "batcalc", "int", "pattern batcalc.int(X_1:bat[:str], X_2:bat[:cnd], X_3:int, X_4:int):bat[:int] ", "batstr_2dec_int;", "" ] +[ "batcalc", "int", "pattern batcalc.int(X_1:bat[:str], X_2:int, X_3:int):bat[:int] ", "batstr_2dec_int;", "" ] [ "batcalc", "int_noerror", "pattern batcalc.int_noerror(X_1:bat[:bit]):bat[:int] ", "CMDconvert_int;", "" ] [ "batcalc", "int_noerror", "pattern batcalc.int_noerror(X_1:bat[:bit], X_2:bat[:cnd]):bat[:int] ", "CMDconvert_int;", "" ] [ "batcalc", "int_noerror", "pattern batcalc.int_noerror(X_1:bat[:bte]):bat[:int] ", "CMDconvert_int;", "" ] @@ -4475,7 +4484,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:sht], X_3:int, X_4:int):bat[:lng] ", "batsht_dec2dec_lng;", "" ] [ "batcalc", "lng", "command batcalc.lng(X_1:bat[:sht], X_2:bat[:cnd], X_3:int, X_4:int):bat[:lng] ", "batsht_num2dec_cand_lng;", "" ] [ "batcalc", "lng", "command batcalc.lng(X_1:bat[:sht], X_2:int, X_3:int):bat[:lng] ", "batsht_num2dec_lng;", "" ] -[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:str], X_2:int, X_3:int):bat[:lng] ", "batstr_2dec_lng;", "" ] +[ "batcalc", "lng", "pattern batcalc.lng(X_1:bat[:str], X_2:bat[:cnd], X_3:int, X_4:int):bat[:lng] ", "batstr_2dec_lng;", "" ] +[ "batcalc", "lng", "pattern batcalc.lng(X_1:bat[:str], X_2:int, X_3:int):bat[:lng] ", "batstr_2dec_lng;", "" ] [ "batcalc", "lng_noerror", "pattern batcalc.lng_noerror(X_1:bat[:bit]):bat[:lng] ", "CMDconvert_lng;", "" ] [ "batcalc", "lng_noerror", "pattern batcalc.lng_noerror(X_1:bat[:bit], X_2:bat[:cnd]):bat[:lng] ", "CMDconvert_lng;", "" ] [ "batcalc", "lng_noerror", "pattern batcalc.lng_noerror(X_1:bat[:bte]):bat[:lng] ", "CMDconvert_lng;", "" ] @@ -5092,7 +5102,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:bat[:daytime], X_2:int, X_3:int):bat[:lng] ", "second_interval_daytime;", "" ] [ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:bat[:str], X_2:bat[:cnd], X_3:int, X_4:int):bat[:lng] ", "second_interval_str;", "" ] [ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:bat[:str], X_2:int, X_3:int):bat[:lng] ", "second_interval_str;", "" ] -[ "batcalc", "second_interval", "command batcalc.second_interval(X_1:int, X_2:bat[:sht], X_3:int, X_4:int):bat[:lng] ", "sht_batdec2second_interval;", "" ] +[ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:int, X_2:bat[:sht], X_3:bat[:cnd], X_4:int, X_5:int):bat[:lng] ", "sht_batdec2second_interval;", "" ] +[ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:int, X_2:bat[:sht], X_3:int, X_4:int):bat[:lng] ", "sht_batdec2second_interval;", "" ] [ "batcalc", "sht", "pattern batcalc.sht(X_1:bat[:bit]):bat[:sht] ", "CMDconvertsignal_sht;", "" ] [ "batcalc", "sht", "pattern batcalc.sht(X_1:bat[:bit], X_2:bat[:cnd]):bat[:sht] ", "CMDconvertsignal_sht;", "" ] [ "batcalc", "sht", "pattern batcalc.sht(X_1:bat[:bte]):bat[:sht] ", "CMDconvertsignal_sht;", "" ] @@ -5140,7 +5151,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:sht], X_3:int, X_4:int):bat[:sht] ", "batsht_dec2dec_sht;", "" ] [ "batcalc", "sht", "command batcalc.sht(X_1:bat[:sht], X_2:bat[:cnd], X_3:int, X_4:int):bat[:sht] ", "batsht_num2dec_cand_sht;", "" ] [ "batcalc", "sht", "command batcalc.sht(X_1:bat[:sht], X_2:int, X_3:int):bat[:sht] ", "batsht_num2dec_sht;", "" ] -[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:str], X_2:int, X_3:int):bat[:sht] ", "batstr_2dec_sht;", "" ] +[ "batcalc", "sht", "pattern batcalc.sht(X_1:bat[:str], X_2:bat[:cnd], X_3:int, X_4:int):bat[:sht] ", "batstr_2dec_sht;", "" ] +[ "batcalc", "sht", "pattern batcalc.sht(X_1:bat[:str], X_2:int, X_3:int):bat[:sht] ", "batstr_2dec_sht;", "" ] [ "batcalc", "sht_noerror", "pattern batcalc.sht_noerror(X_1:bat[:bit]):bat[:sht] ", "CMDconvert_sht;", "" ] [ "batcalc", "sht_noerror", "pattern batcalc.sht_noerror(X_1:bat[:bit], X_2:bat[:cnd]):bat[:sht] ", "CMDconvert_sht;", "" ] [ "batcalc", "sht_noerror", "pattern batcalc.sht_noerror(X_1:bat[:bte]):bat[:sht] ", "CMDconvert_sht;", "" ] @@ -5287,10 +5299,15 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "sub_noerror", "pattern batcalc.sub_noerror(X_1:sht, X_2:bat[:lng], X_3:bat[:cnd]):bat[:lng] ", "CMDbatSUB;", "" ] [ "batcalc", "sub_noerror", "pattern batcalc.sub_noerror(X_1:sht, X_2:bat[:sht], X_3:bat[:cnd]):bat[:sht] ", "CMDbatSUB;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:date]):bat[:timestamp] ", "MTIMEtimestamp_fromdate_bulk;", "" ] +[ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:date], X_2:bat[:oid]):bat[:timestamp] ", "MTIMEtimestamp_fromdate_bulk_cand;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:lng]):bat[:timestamp] ", "MTIMEtimestamp_frommsec_bulk;", "" ] +[ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:lng], X_2:bat[:oid]):bat[:timestamp] ", "MTIMEtimestamp_frommsec_bulk_cand;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:int]):bat[:timestamp] ", "MTIMEtimestamp_fromsecond_bulk;", "" ] +[ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:int], X_2:bat[:oid]):bat[:timestamp] ", "MTIMEtimestamp_fromsecond_bulk_cand;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:str]):bat[:timestamp] ", "MTIMEtimestamp_fromstr_bulk;", "" ] +[ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:str], X_2:bat[:oid]):bat[:timestamp] ", "MTIMEtimestamp_fromstr_bulk_cand;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:timestamp]):bat[:timestamp] ", "MTIMEtimestamp_timestamp_bulk;", "" ] +[ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:timestamp], X_2:bat[:oid]):bat[:timestamp] ", "MTIMEtimestamp_timestamp_bulk_cand;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:str], X_2:int):bat[:timestamp] ", "batstr_2time_timestamp;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:str], X_2:bat[:cnd], X_3:int):bat[:timestamp] ", "batstr_2time_timestamp_cand;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:str], X_2:int, X_3:int):bat[:timestamp] ", "batstr_2time_timestamptz;", "" ] @@ -7451,7 +7468,6 @@ stdout of test 'MAL-signatures` in direc [ "calc", "sign", "pattern calc.sign(X_1:lng):bte ", "CMDvarSIGN;", "" ] [ "calc", "sign", "pattern calc.sign(X_1:sht):bte ", "CMDvarSIGN;", "" ] [ "calc", "str", "pattern calc.str(X_1:any):str ", "CMDvarCONVERT;", "" ] -[ "calc", "str", "command calc.str(X_1:blob):str ", "SQLblob_2_str;", "" ] [ "calc", "str", "pattern calc.str(X_1:int, X_2:int, X_3:int, X_4:int, X_5:any_1, X_6:int):str ", "SQLstr_cast;", "" ] [ "calc", "str", "command calc.str(X_1:uuid):str ", "UUIDuuid2str;", "" ] [ "calc", "strings", "command calc.strings(X_1:str):str ", "STRstrings;", "" ] @@ -8772,6 +8788,7 @@ stdout of test 'MAL-signatures` in direc [ "sysmon", "stop", "pattern sysmon.stop(X_1:int):void ", "SYSMONstop;", "" ] [ "sysmon", "stop", "pattern sysmon.stop(X_1:lng):void ", "SYSMONstop;", "" ] [ "sysmon", "stop", "pattern sysmon.stop(X_1:sht):void ", "SYSMONstop;", "" ] +[ "sysmon", "user_statistics", "pattern sysmon.user_statistics() (X_0:bat[:str], X_1:bat[:lng], X_2:bat[:lng], X_3:bat[:timestamp], X_4:bat[:timestamp], X_5:bat[:lng], X_6:bat[:str]) ", "SYSMONstatistics;", "" ] [ "tokenizer", "append", "command tokenizer.append(X_1:str):oid ", "TKNZRappend;", "" ] [ "tokenizer", "close", "command tokenizer.close():void ", "TKNZRclose;", "" ] [ "tokenizer", "depositFile", "command tokenizer.depositFile(X_1:str):void ", "TKNZRdepositFile;", "" ] 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 @@ -5025,7 +5025,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "bte", "command batcalc.bte(X_1:int, X_2:bat[:sht], X_3:bat[:cnd], X_4:int, X_5:int):bat[:bte] ", "batsht_dec2dec_cand_bte;", "" ] [ "batcalc", "bte", "command batcalc.bte(X_1:bat[:sht], X_2:int, X_3:int):bat[:bte] ", "batsht_num2dec_bte;", "" ] [ "batcalc", "bte", "command batcalc.bte(X_1:bat[:sht], X_2:bat[:cnd], X_3:int, X_4:int):bat[:bte] ", "batsht_num2dec_cand_bte;", "" ] -[ "batcalc", "bte", "command batcalc.bte(X_1:bat[:str], X_2:int, X_3:int):bat[:bte] ", "batstr_2dec_bte;", "" ] +[ "batcalc", "bte", "pattern batcalc.bte(X_1:bat[:str], X_2:bat[:cnd], X_3:int, X_4:int):bat[:bte] ", "batstr_2dec_bte;", "" ] +[ "batcalc", "bte", "pattern batcalc.bte(X_1:bat[:str], X_2:int, X_3:int):bat[:bte] ", "batstr_2dec_bte;", "" ] [ "batcalc", "bte_noerror", "pattern batcalc.bte_noerror(X_1:bat[:bit]):bat[:bte] ", "CMDconvert_bte;", "" ] [ "batcalc", "bte_noerror", "pattern batcalc.bte_noerror(X_1:bat[:bit], X_2:bat[:cnd]):bat[:bte] ", "CMDconvert_bte;", "" ] [ "batcalc", "bte_noerror", "pattern batcalc.bte_noerror(X_1:bat[:bte]):bat[:bte] ", "CMDconvert_bte;", "" ] @@ -5359,15 +5360,22 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "cmp", "pattern batcalc.cmp(X_1:str, X_2:bat[:str]):bat[:bte] ", "CMDbatCMP;", "" ] [ "batcalc", "cmp", "pattern batcalc.cmp(X_1:str, X_2:bat[:str], X_3:bat[:cnd]):bat[:bte] ", "CMDbatCMP;", "" ] [ "batcalc", "date", "command batcalc.date(X_1:bat[:date]):bat[:date] ", "MTIMEdate_date_bulk;", "" ] +[ "batcalc", "date", "command batcalc.date(X_1:bat[:date], X_2:bat[:oid]):bat[:date] ", "MTIMEdate_date_bulk_cand;", "" ] [ "batcalc", "date", "command batcalc.date(X_1:bat[:str]):bat[:date] ", "MTIMEdate_fromstr_bulk;", "" ] +[ "batcalc", "date", "command batcalc.date(X_1:bat[:str], X_2:bat[:oid]):bat[:date] ", "MTIMEdate_fromstr_bulk_cand;", "" ] [ "batcalc", "date", "command batcalc.date(X_1:bat[:timestamp]):bat[:date] ", "MTIMEtimestamp_extract_date_bulk;", "" ] +[ "batcalc", "date", "command batcalc.date(X_1:bat[:timestamp], X_2:bat[:oid]):bat[:date] ", "MTIMEtimestamp_extract_date_bulk_cand;", "" ] [ "batcalc", "date", "command batcalc.date(X_1:bat[:str]):bat[:date] ", "batstr_2_date;", "" ] [ "batcalc", "date", "command batcalc.date(X_1:bat[:str], X_2:bat[:cnd]):bat[:date] ", "batstr_2_date_cand;", "" ] [ "batcalc", "date", "pattern batcalc.date(X_1:bat[:oid]):bat[:date] ", "nil_2_date;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:daytime]):bat[:daytime] ", "MTIMEdaytime_daytime_bulk;", "" ] +[ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:daytime], X_2:bat[:oid]):bat[:daytime] ", "MTIMEdaytime_daytime_bulk_cand;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:lng]):bat[:daytime] ", "MTIMEdaytime_fromseconds_bulk;", "" ] +[ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:lng], X_2:bat[:oid]):bat[:daytime] ", "MTIMEdaytime_fromseconds_bulk_cand;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:str]):bat[:daytime] ", "MTIMEdaytime_fromstr_bulk;", "" ] +[ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:str], X_2:bat[:oid]):bat[:daytime] ", "MTIMEdaytime_fromstr_bulk_cand;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:timestamp]):bat[:daytime] ", "MTIMEtimestamp_extract_daytime_bulk;", "" ] +[ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:timestamp], X_2:bat[:oid]):bat[:daytime] ", "MTIMEtimestamp_extract_daytime_bulk_cand;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:str], X_2:int):bat[:daytime] ", "batstr_2time_daytime;", "" ] [ "batcalc", "daytime", "command batcalc.daytime(X_1:bat[:str], X_2:bat[:cnd], X_3:int):bat[:daytime] ", "batstr_2time_daytime_cand;", "" ] [ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:daytime], X_2:bat[:cnd], X_3:int):bat[:daytime] ", "daytime_2time_daytime;", "" ] @@ -5375,8 +5383,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:oid], X_2:int):bat[:daytime] ", "nil_2time_daytime;", "" ] [ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:lng], X_2:bat[:cnd], X_3:int):bat[:daytime] ", "second_interval_2_daytime;", "" ] [ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:lng], X_2:int):bat[:daytime] ", "second_interval_2_daytime;", "" ] -[ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:daytime], X_2:bat[:cnd], X_3:int, X_4:int):bat[:daytime] ", "str_2time_daytimetz;", "" ] -[ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:daytime], X_2:int, X_3:int):bat[:daytime] ", "str_2time_daytimetz;", "" ] +[ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:str], X_2:bat[:cnd], X_3:int, X_4:int):bat[:daytime] ", "str_2time_daytimetz;", "" ] +[ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:str], X_2:int, X_3:int):bat[:daytime] ", "str_2time_daytimetz;", "" ] [ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:timestamp], X_2:bat[:cnd], X_3:int):bat[:daytime] ", "timestamp_2_daytime;", "" ] [ "batcalc", "daytime", "pattern batcalc.daytime(X_1:bat[:timestamp], X_2:int):bat[:daytime] ", "timestamp_2_daytime;", "" ] [ "batcalc", "dbl", "pattern batcalc.dbl(X_1:bat[:bit]):bat[:dbl] ", "CMDconvertsignal_dbl;", "" ] @@ -6176,7 +6184,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "hge", "command batcalc.hge(X_1:int, X_2:bat[:sht], X_3:int, X_4:int):bat[:hge] ", "batsht_dec2dec_hge;", "" ] [ "batcalc", "hge", "command batcalc.hge(X_1:bat[:sht], X_2:bat[:cnd], X_3:int, X_4:int):bat[:hge] ", "batsht_num2dec_cand_hge;", "" ] [ "batcalc", "hge", "command batcalc.hge(X_1:bat[:sht], X_2:int, X_3:int):bat[:hge] ", "batsht_num2dec_hge;", "" ] -[ "batcalc", "hge", "command batcalc.hge(X_1:bat[:str], X_2:int, X_3:int):bat[:hge] ", "batstr_2dec_hge;", "" ] +[ "batcalc", "hge", "pattern batcalc.hge(X_1:bat[:str], X_2:bat[:cnd], X_3:int, X_4:int):bat[:hge] ", "batstr_2dec_hge;", "" ] +[ "batcalc", "hge", "pattern batcalc.hge(X_1:bat[:str], X_2:int, X_3:int):bat[:hge] ", "batstr_2dec_hge;", "" ] [ "batcalc", "hge_noerror", "pattern batcalc.hge_noerror(X_1:bat[:bit]):bat[:hge] ", "CMDconvert_hge;", "" ] [ "batcalc", "hge_noerror", "pattern batcalc.hge_noerror(X_1:bat[:bit], X_2:bat[:cnd]):bat[:hge] ", "CMDconvert_hge;", "" ] [ "batcalc", "hge_noerror", "pattern batcalc.hge_noerror(X_1:bat[:bte]):bat[:hge] ", "CMDconvert_hge;", "" ] @@ -6266,7 +6275,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "int", "command batcalc.int(X_1:int, X_2:bat[:sht], X_3:int, X_4:int):bat[:int] ", "batsht_dec2dec_int;", "" ] [ "batcalc", "int", "command batcalc.int(X_1:bat[:sht], X_2:bat[:cnd], X_3:int, X_4:int):bat[:int] ", "batsht_num2dec_cand_int;", "" ] [ "batcalc", "int", "command batcalc.int(X_1:bat[:sht], X_2:int, X_3:int):bat[:int] ", "batsht_num2dec_int;", "" ] -[ "batcalc", "int", "command batcalc.int(X_1:bat[:str], X_2:int, X_3:int):bat[:int] ", "batstr_2dec_int;", "" ] +[ "batcalc", "int", "pattern batcalc.int(X_1:bat[:str], X_2:bat[:cnd], X_3:int, X_4:int):bat[:int] ", "batstr_2dec_int;", "" ] +[ "batcalc", "int", "pattern batcalc.int(X_1:bat[:str], X_2:int, X_3:int):bat[:int] ", "batstr_2dec_int;", "" ] [ "batcalc", "int_noerror", "pattern batcalc.int_noerror(X_1:bat[:bit]):bat[:int] ", "CMDconvert_int;", "" ] [ "batcalc", "int_noerror", "pattern batcalc.int_noerror(X_1:bat[:bit], X_2:bat[:cnd]):bat[:int] ", "CMDconvert_int;", "" ] [ "batcalc", "int_noerror", "pattern batcalc.int_noerror(X_1:bat[:bte]):bat[:int] ", "CMDconvert_int;", "" ] @@ -6362,7 +6372,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "lng", "command batcalc.lng(X_1:int, X_2:bat[:sht], X_3:int, X_4:int):bat[:lng] ", "batsht_dec2dec_lng;", "" ] [ "batcalc", "lng", "command batcalc.lng(X_1:bat[:sht], X_2:bat[:cnd], X_3:int, X_4:int):bat[:lng] ", "batsht_num2dec_cand_lng;", "" ] [ "batcalc", "lng", "command batcalc.lng(X_1:bat[:sht], X_2:int, X_3:int):bat[:lng] ", "batsht_num2dec_lng;", "" ] -[ "batcalc", "lng", "command batcalc.lng(X_1:bat[:str], X_2:int, X_3:int):bat[:lng] ", "batstr_2dec_lng;", "" ] +[ "batcalc", "lng", "pattern batcalc.lng(X_1:bat[:str], X_2:bat[:cnd], X_3:int, X_4:int):bat[:lng] ", "batstr_2dec_lng;", "" ] +[ "batcalc", "lng", "pattern batcalc.lng(X_1:bat[:str], X_2:int, X_3:int):bat[:lng] ", "batstr_2dec_lng;", "" ] [ "batcalc", "lng_noerror", "pattern batcalc.lng_noerror(X_1:bat[:bit]):bat[:lng] ", "CMDconvert_lng;", "" ] [ "batcalc", "lng_noerror", "pattern batcalc.lng_noerror(X_1:bat[:bit], X_2:bat[:cnd]):bat[:lng] ", "CMDconvert_lng;", "" ] [ "batcalc", "lng_noerror", "pattern batcalc.lng_noerror(X_1:bat[:bte]):bat[:lng] ", "CMDconvert_lng;", "" ] @@ -7262,11 +7273,14 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "rsh_noerror", "pattern batcalc.rsh_noerror(X_1:sht, X_2:bat[:lng], X_3:bat[:cnd]):bat[:sht] ", "CMDbatRSH;", "" ] [ "batcalc", "rsh_noerror", "pattern batcalc.rsh_noerror(X_1:sht, X_2:bat[:sht]):bat[:sht] ", "CMDbatRSH;", "" ] [ "batcalc", "rsh_noerror", "pattern batcalc.rsh_noerror(X_1:sht, X_2:bat[:sht], X_3:bat[:cnd]):bat[:sht] ", "CMDbatRSH;", "" ] -[ "batcalc", "second_interval", "command batcalc.second_interval(X_1:int, X_2:bat[:bte], X_3:int, X_4:int):bat[:lng] ", "bte_batdec2second_interval;", "" ] -[ "batcalc", "second_interval", "command batcalc.second_interval(X_1:int, X_2:bat[:hge], X_3:bat[:cnd], X_4:int, X_5:int):bat[:lng] ", "hge_batdec2second_interval;", "" ] +[ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:int, X_2:bat[:bte], X_3:bat[:cnd], X_4:int, X_5:int):bat[:lng] ", "bte_batdec2second_interval;", "" ] +[ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:int, X_2:bat[:bte], X_3:int, X_4:int):bat[:lng] ", "bte_batdec2second_interval;", "" ] [ "batcalc", "second_interval", "command batcalc.second_interval(X_1:int, X_2:bat[:hge], X_3:int, X_4:int):bat[:lng] ", "hge_batdec2second_interval;", "" ] -[ "batcalc", "second_interval", "command batcalc.second_interval(X_1:int, X_2:bat[:int], X_3:int, X_4:int):bat[:lng] ", "int_batdec2second_interval;", "" ] -[ "batcalc", "second_interval", "command batcalc.second_interval(X_1:int, X_2:bat[:lng], X_3:int, X_4:int):bat[:lng] ", "lng_batdec2second_interval;", "" ] +[ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:int, X_2:bat[:hge], X_3:bat[:cnd], X_4:int, X_5:int):bat[:lng] ", "hge_batdec2second_interval;", "" ] +[ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:int, X_2:bat[:int], X_3:bat[:cnd], X_4:int, X_5:int):bat[:lng] ", "int_batdec2second_interval;", "" ] +[ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:int, X_2:bat[:int], X_3:int, X_4:int):bat[:lng] ", "int_batdec2second_interval;", "" ] +[ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:int, X_2:bat[:lng], X_3:bat[:cnd], X_4:int, X_5:int):bat[:lng] ", "lng_batdec2second_interval;", "" ] +[ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:int, X_2:bat[:lng], X_3:int, X_4:int):bat[:lng] ", "lng_batdec2second_interval;", "" ] [ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:bat[:bte], X_2:bat[:cnd], X_3:int, X_4:int):bat[:lng] ", "second_interval;", "" ] [ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:bat[:bte], X_2:int, X_3:int):bat[:lng] ", "second_interval;", "" ] [ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:bat[:hge], X_2:bat[:cnd], X_3:int, X_4:int):bat[:lng] ", "second_interval;", "" ] @@ -7281,7 +7295,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:bat[:daytime], X_2:int, X_3:int):bat[:lng] ", "second_interval_daytime;", "" ] [ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:bat[:str], X_2:bat[:cnd], X_3:int, X_4:int):bat[:lng] ", "second_interval_str;", "" ] [ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:bat[:str], X_2:int, X_3:int):bat[:lng] ", "second_interval_str;", "" ] -[ "batcalc", "second_interval", "command batcalc.second_interval(X_1:int, X_2:bat[:sht], X_3:int, X_4:int):bat[:lng] ", "sht_batdec2second_interval;", "" ] +[ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:int, X_2:bat[:sht], X_3:bat[:cnd], X_4:int, X_5:int):bat[:lng] ", "sht_batdec2second_interval;", "" ] +[ "batcalc", "second_interval", "pattern batcalc.second_interval(X_1:int, X_2:bat[:sht], X_3:int, X_4:int):bat[:lng] ", "sht_batdec2second_interval;", "" ] [ "batcalc", "sht", "pattern batcalc.sht(X_1:bat[:bit]):bat[:sht] ", "CMDconvertsignal_sht;", "" ] [ "batcalc", "sht", "pattern batcalc.sht(X_1:bat[:bit], X_2:bat[:cnd]):bat[:sht] ", "CMDconvertsignal_sht;", "" ] [ "batcalc", "sht", "pattern batcalc.sht(X_1:bat[:bte]):bat[:sht] ", "CMDconvertsignal_sht;", "" ] @@ -7339,7 +7354,8 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "sht", "command batcalc.sht(X_1:int, X_2:bat[:sht], X_3:int, X_4:int):bat[:sht] ", "batsht_dec2dec_sht;", "" ] [ "batcalc", "sht", "command batcalc.sht(X_1:bat[:sht], X_2:bat[:cnd], X_3:int, X_4:int):bat[:sht] ", "batsht_num2dec_cand_sht;", "" ] [ "batcalc", "sht", "command batcalc.sht(X_1:bat[:sht], X_2:int, X_3:int):bat[:sht] ", "batsht_num2dec_sht;", "" ] -[ "batcalc", "sht", "command batcalc.sht(X_1:bat[:str], X_2:int, X_3:int):bat[:sht] ", "batstr_2dec_sht;", "" ] +[ "batcalc", "sht", "pattern batcalc.sht(X_1:bat[:str], X_2:bat[:cnd], X_3:int, X_4:int):bat[:sht] ", "batstr_2dec_sht;", "" ] +[ "batcalc", "sht", "pattern batcalc.sht(X_1:bat[:str], X_2:int, X_3:int):bat[:sht] ", "batstr_2dec_sht;", "" ] [ "batcalc", "sht_noerror", "pattern batcalc.sht_noerror(X_1:bat[:bit]):bat[:sht] ", "CMDconvert_sht;", "" ] [ "batcalc", "sht_noerror", "pattern batcalc.sht_noerror(X_1:bat[:bit], X_2:bat[:cnd]):bat[:sht] ", "CMDconvert_sht;", "" ] [ "batcalc", "sht_noerror", "pattern batcalc.sht_noerror(X_1:bat[:bte]):bat[:sht] ", "CMDconvert_sht;", "" ] @@ -7529,10 +7545,15 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "sub_noerror", "pattern batcalc.sub_noerror(X_1:sht, X_2:bat[:lng], X_3:bat[:cnd]):bat[:lng] ", "CMDbatSUB;", "" ] [ "batcalc", "sub_noerror", "pattern batcalc.sub_noerror(X_1:sht, X_2:bat[:sht], X_3:bat[:cnd]):bat[:sht] ", "CMDbatSUB;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:date]):bat[:timestamp] ", "MTIMEtimestamp_fromdate_bulk;", "" ] +[ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:date], X_2:bat[:oid]):bat[:timestamp] ", "MTIMEtimestamp_fromdate_bulk_cand;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:lng]):bat[:timestamp] ", "MTIMEtimestamp_frommsec_bulk;", "" ] +[ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:lng], X_2:bat[:oid]):bat[:timestamp] ", "MTIMEtimestamp_frommsec_bulk_cand;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:int]):bat[:timestamp] ", "MTIMEtimestamp_fromsecond_bulk;", "" ] +[ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:int], X_2:bat[:oid]):bat[:timestamp] ", "MTIMEtimestamp_fromsecond_bulk_cand;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:str]):bat[:timestamp] ", "MTIMEtimestamp_fromstr_bulk;", "" ] +[ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:str], X_2:bat[:oid]):bat[:timestamp] ", "MTIMEtimestamp_fromstr_bulk_cand;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:timestamp]):bat[:timestamp] ", "MTIMEtimestamp_timestamp_bulk;", "" ] +[ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:timestamp], X_2:bat[:oid]):bat[:timestamp] ", "MTIMEtimestamp_timestamp_bulk_cand;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:str], X_2:int):bat[:timestamp] ", "batstr_2time_timestamp;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:str], X_2:bat[:cnd], X_3:int):bat[:timestamp] ", "batstr_2time_timestamp_cand;", "" ] [ "batcalc", "timestamp", "command batcalc.timestamp(X_1:bat[:str], X_2:int, X_3:int):bat[:timestamp] ", "batstr_2time_timestamptz;", "" ] @@ -10364,7 +10385,6 @@ stdout of test 'MAL-signatures` in direc [ "calc", "sign", "pattern calc.sign(X_1:lng):bte ", "CMDvarSIGN;", "" ] [ "calc", "sign", "pattern calc.sign(X_1:sht):bte ", "CMDvarSIGN;", "" ] [ "calc", "str", "pattern calc.str(X_1:any):str ", "CMDvarCONVERT;", "" ] -[ "calc", "str", "command calc.str(X_1:blob):str ", "SQLblob_2_str;", "" ] [ "calc", "str", "pattern calc.str(X_1:int, X_2:int, X_3:int, X_4:int, X_5:any_1, X_6:int):str ", "SQLstr_cast;", "" ] [ "calc", "str", "command calc.str(X_1:uuid):str ", "UUIDuuid2str;", "" ] [ "calc", "strings", "command calc.strings(X_1:str):str ", "STRstrings;", "" ] @@ -11739,6 +11759,7 @@ stdout of test 'MAL-signatures` in direc [ "sysmon", "stop", "pattern sysmon.stop(X_1:int):void ", "SYSMONstop;", "" ] [ "sysmon", "stop", "pattern sysmon.stop(X_1:lng):void ", "SYSMONstop;", "" ] [ "sysmon", "stop", "pattern sysmon.stop(X_1:sht):void ", "SYSMONstop;", "" ] +[ "sysmon", "user_statistics", "pattern sysmon.user_statistics() (X_0:bat[:str], X_1:bat[:lng], X_2:bat[:lng], X_3:bat[:timestamp], X_4:bat[:timestamp], X_5:bat[:lng], X_6:bat[:str]) ", "SYSMONstatistics;", "" ] [ "tokenizer", "append", "command tokenizer.append(X_1:str):oid ", "TKNZRappend;", "" ] [ "tokenizer", "close", "command tokenizer.close():void ", "TKNZRclose;", "" ] [ "tokenizer", "depositFile", "command tokenizer.depositFile(X_1:str):void ", "TKNZRdepositFile;", "" ] 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 @@ -1128,6 +1128,7 @@ str STRtostr(str *res, const str *src); str SYSMONpause(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str SYSMONqueue(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str SYSMONresume(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str SYSMONstatistics(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str SYSMONstop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
