Changeset: 62f0746db236 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=62f0746db236
Added Files:
        monetdb5/optimizer/opt_profiler.c
        monetdb5/optimizer/opt_profiler.h
        sql/scripts/46_profiler.sql
        sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.sql
        sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.stable.err
        sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.stable.out
Modified Files:
        clients/Tests/MAL-signatures.stable.out
        clients/Tests/MAL-signatures.stable.out.int128
        clients/Tests/SQL-dump.stable.out
        clients/Tests/SQL-dump.stable.out.int128
        clients/Tests/exports.stable.out
        clients/Tests/malcheck.stable.err
        clients/mapiclient/Tests/mclient--help.stable.err
        clients/mapiclient/Tests/mclient--help.stable.err.Windows
        clients/mapiclient/Tests/stethoscope--help.stable.err
        clients/mapiclient/Tests/tachograph--help.stable.err
        clients/mapiclient/eventparser.c
        clients/mapiclient/eventparser.h
        clients/mapiclient/mclient.c
        clients/mapiclient/stethoscope.c
        clients/mapiclient/tachograph.c
        clients/mapiclient/tomograph.c
        clients/mapilib/mapi.c
        clients/mapilib/mapi.h
        gdk/ChangeLog
        gdk/gdk.h
        gdk/gdk_aggr.c
        gdk/gdk_bat.c
        gdk/gdk_batop.c
        gdk/gdk_bbp.c
        gdk/gdk_cross.c
        gdk/gdk_imprints.c
        gdk/gdk_join.c
        gdk/gdk_logger.c
        gdk/gdk_private.h
        gdk/gdk_search.c
        gdk/gdk_select.c
        gdk/gdk_storage.c
        gdk/gdk_unique.c
        monetdb5/ChangeLog
        monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
        monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
        
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
        monetdb5/mal/Tests/tst025.stable.out
        monetdb5/mal/Tests/tst032.stable.out
        monetdb5/mal/Tests/tst1602.mal
        monetdb5/mal/Tests/tst1602.stable.out
        monetdb5/mal/Tests/tst201.stable.out
        monetdb5/mal/Tests/tst272.mal
        monetdb5/mal/Tests/tst272.stable.out
        monetdb5/mal/Tests/tst275.mal
        monetdb5/mal/Tests/tst275.stable.out
        monetdb5/mal/Tests/tst810.stable.out
        monetdb5/mal/mal.c
        monetdb5/mal/mal.h
        monetdb5/mal/mal_authorize.c
        monetdb5/mal/mal_client.c
        monetdb5/mal/mal_client.h
        monetdb5/mal/mal_function.c
        monetdb5/mal/mal_instruction.c
        monetdb5/mal/mal_instruction.h
        monetdb5/mal/mal_listing.c
        monetdb5/mal/mal_listing.h
        monetdb5/mal/mal_profiler.c
        monetdb5/mal/mal_profiler.h
        monetdb5/mal/mal_runtime.c
        monetdb5/mal/mal_scenario.c
        monetdb5/mal/mal_session.c
        monetdb5/modules/kernel/algebra.c
        monetdb5/modules/kernel/algebra.h
        monetdb5/modules/kernel/algebra.mal
        monetdb5/modules/mal/Tests/inspect05.stable.out.int128
        monetdb5/modules/mal/Tests/tokenizer00.stable.out
        monetdb5/modules/mal/groupby.c
        monetdb5/modules/mal/pcre.c
        monetdb5/modules/mal/profiler.c
        monetdb5/modules/mal/profiler.h
        monetdb5/modules/mal/profiler.mal
        monetdb5/modules/mal/tablet.c
        monetdb5/modules/mal/tokenizer.c
        monetdb5/optimizer/Makefile.ag
        monetdb5/optimizer/Tests/mat00.mal
        monetdb5/optimizer/Tests/qep00.mal
        monetdb5/optimizer/Tests/qep01.mal
        monetdb5/optimizer/Tests/qep02.mal
        monetdb5/optimizer/opt_costModel.c
        monetdb5/optimizer/opt_generator.c
        monetdb5/optimizer/opt_pipes.c
        monetdb5/optimizer/opt_prelude.c
        monetdb5/optimizer/opt_prelude.h
        monetdb5/optimizer/opt_pushselect.c
        monetdb5/optimizer/opt_support.c
        monetdb5/optimizer/opt_support.h
        monetdb5/optimizer/opt_wrapper.c
        monetdb5/optimizer/optimizer.mal
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql_scenario.c
        sql/backends/monet5/sql_statistics.c
        sql/backends/monet5/sql_upgrades.c
        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.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.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
        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
        sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/15-explain.stable.out
        sql/benchmarks/tpch/Tests/17-explain.stable.out
        sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/19-explain.stable.out
        sql/benchmarks/tpch/Tests/20-explain.stable.out
        sql/jdbc/tests/Tests/Test_Dobjects.stable.out
        sql/scripts/16_tracelog.sql
        sql/scripts/Makefile.ag
        sql/server/rel_optimizer.c
        sql/server/sql_atom.c
        sql/server/sql_parser.y
        sql/storage/bat/bat_storage.c
        sql/storage/bat/bat_table.c
        sql/storage/sql_storage.h
        sql/storage/store.c
        sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
        sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
        
sql/test/BugTracker-2010/Tests/crash_on_complex_join_exp.Bug-2353.stable.out
        
sql/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.out.int128
        sql/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.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-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
        
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
        sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
        sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
        sql/test/BugTracker-2013/Tests/sort_void_crash.Bug-3341.stable.out
        sql/test/BugTracker-2014/Tests/All
        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/Tests/explain.SF-1739353.stable.out
        sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
        sql/test/BugTracker/Tests/with_row_number.SF-1898089.stable.out
        sql/test/Dependencies/Tests/Dependencies.stable.err
        sql/test/Dependencies/Tests/Dependencies.stable.out
        sql/test/Dependencies/Tests/Dependencies.stable.out.int128
        sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout
        sql/test/SQLite_regress/sqllogictest/Tests/select4.test.timeout
        sql/test/SQLite_regress/sqllogictest/Tests/select5.test.timeout
        sql/test/Tests/setoptimizer.stable.err
        sql/test/Tests/setoptimizer.stable.out
        sql/test/Tests/setoptimizer.stable.out.Windows
        sql/test/Tests/systemfunctions.stable.out
        sql/test/Tests/systemfunctions.stable.out.int128
        sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
        sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.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
        sql/test/leaks/Tests/select1.stable.out.int128
        sql/test/leaks/Tests/select2.stable.out
        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
        sql/test/mergetables/Tests/mergequery.stable.out
        sql/test/remote/Tests/partition_elim.stable.out
        testing/Mtest.py.in
        tools/mserver/mserver5.c
Branch: leftmart
Log Message:

Merge with default branch.


diffs (truncated from 22266 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
@@ -2254,10 +2254,6 @@ command aggr.variance(b:bat[:oid,:any_2]
 address ALGvariance;
 comment Gives the variance of all tail values
 
-command algebra.antijoin(left:bat[:oid,:any_1],right:bat[:oid,:any_1]) 
(l:bat[:oid,:oid],r:bat[:oid,:oid]) 
-address ALGantijoin2;
-comment Returns 2 columns with all BUNs, consisting of the head-oids     from 
'left' and 'right' for which there are BUNs in 'left'      and 'right' with 
equal tails
-
 command algebra.crossproduct(left:bat[:oid,:any_1],right:bat[:oid,:any_2]) 
(l:bat[:oid,:oid],r:bat[:oid,:oid]) 
 address ALGcrossproduct2;
 comment Returns 2 columns with all BUNs, consisting of the head-oids     from 
'left' and 'right' for which there are BUNs in 'left'      and 'right' with 
equal tails
@@ -2320,14 +2316,6 @@ command algebra.ilike(s:str,pat:str):bit
 address PCREilike2;
 command algebra.ilike(s:str,pat:str,esc:str):bit 
 address PCREilike3;
-command 
algebra.join(left:bat[:oid,:any_2],rl:bat[:oid,:any_2],rh:bat[:oid,:any_2],li:bit,hi:bit)
 (l:bat[:oid,:oid],r:bat[:oid,:oid]) 
-address ALGrangejoin2;
-comment Deprecated, see algebra.subrangejoin. Range join
-
-command algebra.join(left:bat[:oid,:any_1],right:bat[:oid,:any_1]) 
(l:bat[:oid,:oid],r:bat[:oid,:oid]) 
-address ALGjoin2;
-comment Returns 2 columns with all BUNs, consisting of the head-oids     from 
'left' and 'right' for which there are BUNs in 'left'      and 'right' with 
equal tails
-
 command 
algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng)
 (X_7:bat[:oid,:oid],X_8:bat[:oid,:oid]) 
 address LIKEsubjoin1;
 command 
algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],esc:str,sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng)
 (X_8:bat[:oid,:oid],X_9:bat[:oid,:oid]) 
@@ -2361,7 +2349,7 @@ comment Routine to handle join paths.  T
 
 command 
algebra.projection(left:bat[:oid,:oid],right:bat[:oid,:any_3]):bat[:oid,:any_3] 
 address ALGprojection;
-comment Hook directly into the left fetch join implementation.
+comment Project left input onto right input.
 
 pattern algebra.project(b:bat[:oid,:any_1],v:any_3):bat[:oid,:any_3] 
 address ALGprojecttail;
@@ -38012,22 +38000,22 @@ pattern generator.join(b:bat[:oid,:sht],
 address VLTgenerator_join;
 pattern generator.join(b:bat[:oid,:bte],gen:bat[:oid,:bte]) 
(l:bat[:oid,:oid],r:bat[:oid,:oid]) 
 address VLTgenerator_join;
-pattern 
generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:timestamp]):bat[:oid,:timestamp]
 
-address VLTgenerator_leftfetchjoin;
-comment Overloaded leftfetchjoin operation
-
-pattern 
generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:dbl]):bat[:oid,:dbl] 
-address VLTgenerator_leftfetchjoin;
-pattern 
generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:flt]):bat[:oid,:flt] 
-address VLTgenerator_leftfetchjoin;
-pattern 
generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:lng]):bat[:oid,:lng] 
-address VLTgenerator_leftfetchjoin;
-pattern 
generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:int]):bat[:oid,:int] 
-address VLTgenerator_leftfetchjoin;
-pattern 
generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:sht]):bat[:oid,:sht] 
-address VLTgenerator_leftfetchjoin;
-pattern 
generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:bte]):bat[:oid,:bte] 
-address VLTgenerator_leftfetchjoin;
+pattern 
generator.projection(b:bat[:oid,:oid],cand:bat[:oid,:timestamp]):bat[:oid,:timestamp]
 
+address VLTgenerator_projection;
+comment Overloaded projection operation
+
+pattern 
generator.projection(b:bat[:oid,:oid],cand:bat[:oid,:dbl]):bat[:oid,:dbl] 
+address VLTgenerator_projection;
+pattern 
generator.projection(b:bat[:oid,:oid],cand:bat[:oid,:flt]):bat[:oid,:flt] 
+address VLTgenerator_projection;
+pattern 
generator.projection(b:bat[:oid,:oid],cand:bat[:oid,:lng]):bat[:oid,:lng] 
+address VLTgenerator_projection;
+pattern 
generator.projection(b:bat[:oid,:oid],cand:bat[:oid,:int]):bat[:oid,:int] 
+address VLTgenerator_projection;
+pattern 
generator.projection(b:bat[:oid,:oid],cand:bat[:oid,:sht]):bat[:oid,:sht] 
+address VLTgenerator_projection;
+pattern 
generator.projection(b:bat[:oid,:oid],cand:bat[:oid,:bte]):bat[:oid,:bte] 
+address VLTgenerator_projection;
 pattern generator.parameters(first:dbl,last:dbl):bat[:oid,:dbl] 
 address VLTgenerator_noop;
 pattern generator.parameters(first:flt,last:flt):bat[:oid,:flt] 
@@ -40048,6 +40036,12 @@ pattern optimizer.prelude():void
 address optimizer_prelude;
 comment Initialize the optimizer
 
+pattern optimizer.profiler(mod:str,fcn:str):str 
+address OPTwrapper;
+comment Collect properties for the profiler
+
+pattern optimizer.profiler():str 
+address OPTwrapper;
 pattern optimizer.querylog(mod:str,fcn:str):str 
 address OPTwrapper;
 comment Collect SQL query statistics
@@ -40159,16 +40153,12 @@ address CMDcpustats;
 comment Extract cpu statistics from the kernel
 
 command profiler.cleanup():void 
-address CMDcleanup;
+address CMDcleanupTraces;
 comment Remove the temporary tables for profiling
 
-command profiler.closeStream():void 
+command profiler.closestream():void 
 address CMDcloseProfilerStream;
-comment Stop sending the event records
-
-command profiler.dumpTrace():void 
-address CMDdumpTrace;
-comment List the events collected
+comment Stop offline proviling
 
 command profiler.getSystemTime():lng 
 address CMDgetSystemTime;
@@ -40194,37 +40184,21 @@ command profiler.noop():void
 address CMDnoopProfiler;
 comment Fetch any pending performance events
 
-pattern profiler.openStream(host:str,port:int):void 
-address CMDsetProfilerStream;
-comment Send the log events to a stream 
-
-pattern profiler.openStream(fnme:str):void 
-address CMDsetProfilerFile;
-comment Send the log events to a file, stdout or console
-
-pattern profiler.openStream():void 
+pattern profiler.openstream(mode:int):void 
 address CMDopenProfilerStream;
-comment Send the events to output stream
-
-command profiler.reset():void 
-address CMDclearTrace;
-comment Clear the profiler traces
-
-command profiler.setHeartbeat(b:int):void 
+comment Start profiling the events, sent to output stream
+
+command profiler.setheartbeat(b:int):void 
 address CMDsetHeartbeat;
 comment Set heart beat performance tracing
 
 pattern profiler.stop():void 
 address CMDstopProfiler;
-comment Stop performance tracing
-
-pattern profiler.stethoscope(b:int):void 
-address CMDstethoscope;
-comment Start stethoscope profiling with heart beat
-
-pattern profiler.tomograph(b:int):void 
-address CMDtomograph;
-comment Start tomograph profiler with heart beat
+comment Stop offline performance profiling
+
+pattern profiler.start():void 
+address CMDstartProfiler;
+comment Start offline performance profiling
 
 pattern 
querylog.call(tick1:timestamp,tick2:timestamp,arg:str,tuples:wrd,xtime:lng,rtime:lng,cpu:int,iowait:int):void
 
 address QLOGcall;
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
@@ -2765,10 +2765,6 @@ command aggr.variance(b:bat[:oid,:any_2]
 address ALGvariance;
 comment Gives the variance of all tail values
 
-command algebra.antijoin(left:bat[:oid,:any_1],right:bat[:oid,:any_1]) 
(l:bat[:oid,:oid],r:bat[:oid,:oid]) 
-address ALGantijoin2;
-comment Returns 2 columns with all BUNs, consisting of the head-oids     from 
'left' and 'right' for which there are BUNs in 'left'      and 'right' with 
equal tails
-
 command algebra.crossproduct(left:bat[:oid,:any_1],right:bat[:oid,:any_2]) 
(l:bat[:oid,:oid],r:bat[:oid,:oid]) 
 address ALGcrossproduct2;
 comment Returns 2 columns with all BUNs, consisting of the head-oids     from 
'left' and 'right' for which there are BUNs in 'left'      and 'right' with 
equal tails
@@ -2831,14 +2827,6 @@ command algebra.ilike(s:str,pat:str):bit
 address PCREilike2;
 command algebra.ilike(s:str,pat:str,esc:str):bit 
 address PCREilike3;
-command 
algebra.join(left:bat[:oid,:any_2],rl:bat[:oid,:any_2],rh:bat[:oid,:any_2],li:bit,hi:bit)
 (l:bat[:oid,:oid],r:bat[:oid,:oid]) 
-address ALGrangejoin2;
-comment Deprecated, see algebra.subrangejoin. Range join
-
-command algebra.join(left:bat[:oid,:any_1],right:bat[:oid,:any_1]) 
(l:bat[:oid,:oid],r:bat[:oid,:oid]) 
-address ALGjoin2;
-comment Returns 2 columns with all BUNs, consisting of the head-oids     from 
'left' and 'right' for which there are BUNs in 'left'      and 'right' with 
equal tails
-
 command 
algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng)
 (X_7:bat[:oid,:oid],X_8:bat[:oid,:oid]) 
 address LIKEsubjoin1;
 command 
algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],esc:str,sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng)
 (X_8:bat[:oid,:oid],X_9:bat[:oid,:oid]) 
@@ -2872,7 +2860,7 @@ comment Routine to handle join paths.  T
 
 command 
algebra.projection(left:bat[:oid,:oid],right:bat[:oid,:any_3]):bat[:oid,:any_3] 
 address ALGprojection;
-comment Hook directly into the left fetch join implementation.
+comment Project left input onto right input.
 
 pattern algebra.project(b:bat[:oid,:any_1],v:any_3):bat[:oid,:any_3] 
 address ALGprojecttail;
@@ -50979,6 +50967,12 @@ pattern optimizer.prelude():void
 address optimizer_prelude;
 comment Initialize the optimizer
 
+pattern optimizer.profiler(mod:str,fcn:str):str 
+address OPTwrapper;
+comment Collect properties for the profiler
+
+pattern optimizer.profiler():str 
+address OPTwrapper;
 pattern optimizer.querylog(mod:str,fcn:str):str 
 address OPTwrapper;
 comment Collect SQL query statistics
@@ -51090,16 +51084,12 @@ address CMDcpustats;
 comment Extract cpu statistics from the kernel
 
 command profiler.cleanup():void 
-address CMDcleanup;
+address CMDcleanupTraces;
 comment Remove the temporary tables for profiling
 
-command profiler.closeStream():void 
+command profiler.closestream():void 
 address CMDcloseProfilerStream;
-comment Stop sending the event records
-
-command profiler.dumpTrace():void 
-address CMDdumpTrace;
-comment List the events collected
+comment Stop offline proviling
 
 command profiler.getSystemTime():lng 
 address CMDgetSystemTime;
@@ -51125,37 +51115,21 @@ command profiler.noop():void
 address CMDnoopProfiler;
 comment Fetch any pending performance events
 
-pattern profiler.openStream(host:str,port:int):void 
-address CMDsetProfilerStream;
-comment Send the log events to a stream 
-
-pattern profiler.openStream(fnme:str):void 
-address CMDsetProfilerFile;
-comment Send the log events to a file, stdout or console
-
-pattern profiler.openStream():void 
+pattern profiler.openstream(mode:int):void 
 address CMDopenProfilerStream;
-comment Send the events to output stream
-
-command profiler.reset():void 
-address CMDclearTrace;
-comment Clear the profiler traces
-
-command profiler.setHeartbeat(b:int):void 
+comment Start profiling the events, sent to output stream
+
+command profiler.setheartbeat(b:int):void 
 address CMDsetHeartbeat;
 comment Set heart beat performance tracing
 
 pattern profiler.stop():void 
 address CMDstopProfiler;
-comment Stop performance tracing
-
-pattern profiler.stethoscope(b:int):void 
-address CMDstethoscope;
-comment Start stethoscope profiling with heart beat
-
-pattern profiler.tomograph(b:int):void 
-address CMDtomograph;
-comment Start tomograph profiler with heart beat
+comment Stop offline performance profiling
+
+pattern profiler.start():void 
+address CMDstartProfiler;
+comment Start offline performance profiling
 
 pattern 
querylog.call(tick1:timestamp,tick2:timestamp,arg:str,tuples:wrd,xtime:lng,rtime:lng,cpu:int,iowait:int):void
 
 address QLOGcall;
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
@@ -60,6 +60,7 @@ Ready.
 
 SYSTEM SCHEMA  bam
 SYSTEM SCHEMA  json
+SYSTEM SCHEMA  profiler
 SYSTEM SCHEMA  sys
 SYSTEM SCHEMA  tmp
 SYSTEM TABLE  sys._columns
@@ -221,8 +222,6 @@ SYSTEM FUNCTION  sys.point
 SYSTEM FUNCTION  sys.pointfromtext
 SYSTEM FUNCTION  sys.polyfromtext
 SYSTEM FUNCTION  sys.polygonfromtext
-SYSTEM FUNCTION  sys.profiler_openstream
-SYSTEM FUNCTION  sys.profiler_stethoscope
 SYSTEM FUNCTION  sys.quantile
 SYSTEM FUNCTION  sys.querycache
 SYSTEM FUNCTION  sys.querylog
@@ -977,8 +976,6 @@ create function pointfromtext(wkt string
 create function polyfromtext(wkt string, srid smallint) returns polygon 
external name geom."PolyFromText";
 -- alias
 create function polygonfromtext(wkt string, srid smallint) returns polygon 
external name geom."PolyFromText";
-create procedure profiler_openstream(host string, port int) external name 
profiler."openStream";
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to