Changeset: 569ba70c8d18 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=569ba70c8d18
Added Files:
        documentation/Makefile
        documentation/make.bat
        documentation/source/conf.py
        documentation/source/index.rst
        documentation/source/input.rst
        gdk/gdk_tracer.c
        gdk/gdk_tracer.h
        monetdb5/mal/Tests/tracer00.malC
        monetdb5/mal/Tests/tracer00.stable.err
        monetdb5/mal/Tests/tracer00.stable.out
        monetdb5/mal/Tests/tst111.malC
        monetdb5/mal/Tests/tst111.stable.err
        monetdb5/mal/Tests/tst111.stable.out
        monetdb5/mal/Tests/tst112.malC
        monetdb5/mal/Tests/tst112.stable.err
        monetdb5/mal/Tests/tst112.stable.out
        monetdb5/mal/Tests/tst113.malC
        monetdb5/mal/Tests/tst113.stable.err
        monetdb5/mal/Tests/tst113.stable.out
        monetdb5/mal/Tests/tst114.malC
        monetdb5/mal/Tests/tst114.stable.err
        monetdb5/mal/Tests/tst114.stable.out
        monetdb5/mal/Tests/tst117.malC
        monetdb5/mal/Tests/tst117.stable.err
        monetdb5/mal/Tests/tst117.stable.out
        monetdb5/mal/Tests/tst190.malC
        monetdb5/mal/Tests/tst190.stable.err
        monetdb5/mal/Tests/tst190.stable.out
        monetdb5/mal/Tests/tst191.malC
        monetdb5/mal/Tests/tst191.stable.err
        monetdb5/mal/Tests/tst191.stable.out
        monetdb5/mal/Tests/tst192.malC
        monetdb5/mal/Tests/tst192.stable.err
        monetdb5/mal/Tests/tst192.stable.out
        monetdb5/mal/Tests/tst193.malC
        monetdb5/mal/Tests/tst193.stable.err
        monetdb5/mal/Tests/tst193.stable.out
        monetdb5/mal/Tests/tst194.malC
        monetdb5/mal/Tests/tst194.stable.err
        monetdb5/mal/Tests/tst194.stable.out
        monetdb5/mal/Tests/tst195.malC
        monetdb5/mal/Tests/tst195.stable.err
        monetdb5/mal/Tests/tst195.stable.out
        monetdb5/mal/Tests/tst196.malC
        monetdb5/mal/Tests/tst196.stable.err
        monetdb5/mal/Tests/tst196.stable.out
        monetdb5/modules/mal/tracer.c
        monetdb5/modules/mal/tracer.h
        monetdb5/modules/mal/tracer.mal
        sql/scripts/81_tracer.sql
        sql/test/wlcr/Tests/wlr110.py
        sql/test/wlcr/Tests/wlr110.stable.err
        sql/test/wlcr/Tests/wlr110.stable.out
        sql/test/wlcr/Tests/wlr35.py
        sql/test/wlcr/Tests/wlr35.stable.err
        sql/test/wlcr/Tests/wlr35.stable.out
Removed Files:
        
sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.options5
        sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.sql
        
sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.err
        
sql/test/BugTracker-2009/Tests/dumping_tables.SF-2776908--optimizers.stable.out
Modified Files:
        .hgignore
        Makefile.ag
        NT/monetdb_config.h.in
        clients/Tests/MAL-signatures.stable.out
        clients/Tests/MAL-signatures.stable.out.int128
        clients/Tests/exports.stable.out
        clients/mapiclient/mhelp.c
        common/utils/mstring.h
        gdk/Makefile.ag
        gdk/gdk.h
        gdk/gdk_aggr.c
        gdk/gdk_align.c
        gdk/gdk_analytic_bounds.c
        gdk/gdk_analytic_func.c
        gdk/gdk_atoms.h
        gdk/gdk_bat.c
        gdk/gdk_batop.c
        gdk/gdk_calc.c
        gdk/gdk_calc_private.h
        gdk/gdk_cand.c
        gdk/gdk_cross.c
        gdk/gdk_delta.c
        gdk/gdk_delta.h
        gdk/gdk_firstn.c
        gdk/gdk_group.c
        gdk/gdk_hash.c
        gdk/gdk_hash.h
        gdk/gdk_heap.c
        gdk/gdk_imprints.c
        gdk/gdk_join.c
        gdk/gdk_logger.c
        gdk/gdk_orderidx.c
        gdk/gdk_posix.c
        gdk/gdk_private.h
        gdk/gdk_project.c
        gdk/gdk_sample.c
        gdk/gdk_select.c
        gdk/gdk_storage.c
        gdk/gdk_string.c
        gdk/gdk_system.c
        gdk/gdk_system.h
        gdk/gdk_tm.c
        gdk/gdk_unique.c
        gdk/gdk_utils.c
        geom/lib/libgeom.c
        geom/lib/libgeom.h
        geom/monetdb5/geom.c
        monetdb5/mal/Tests/All
        monetdb5/mal/Tests/tst019.stable.err
        monetdb5/mal/Tests/tst110.malC
        monetdb5/mal/Tests/tst110.stable.err
        monetdb5/mal/Tests/tst180.stable.err
        monetdb5/mal/mal.c
        monetdb5/mal/mal.h
        monetdb5/mal/mal_atom.h
        monetdb5/mal/mal_client.c
        monetdb5/mal/mal_client.h
        monetdb5/mal/mal_dataflow.c
        monetdb5/mal/mal_debugger.c
        monetdb5/mal/mal_debugger.h
        monetdb5/mal/mal_errors.h
        monetdb5/mal/mal_exception.c
        monetdb5/mal/mal_exception.h
        monetdb5/mal/mal_factory.c
        monetdb5/mal/mal_factory.h
        monetdb5/mal/mal_function.c
        monetdb5/mal/mal_function.h
        monetdb5/mal/mal_instruction.c
        monetdb5/mal/mal_instruction.h
        monetdb5/mal/mal_interpreter.c
        monetdb5/mal/mal_listing.c
        monetdb5/mal/mal_listing.h
        monetdb5/mal/mal_module.c
        monetdb5/mal/mal_namespace.c
        monetdb5/mal/mal_parser.c
        monetdb5/mal/mal_profiler.c
        monetdb5/mal/mal_resolve.c
        monetdb5/mal/mal_resolve.h
        monetdb5/mal/mal_resource.c
        monetdb5/mal/mal_session.c
        monetdb5/modules/atoms/inet.c
        monetdb5/modules/atoms/str.c
        monetdb5/modules/kernel/alarm.c
        monetdb5/modules/kernel/alarm.mal
        monetdb5/modules/kernel/bat5.c
        monetdb5/modules/mal/Makefile.ag
        monetdb5/modules/mal/Tests/inspect00.stable.out
        monetdb5/modules/mal/groupby.c
        monetdb5/modules/mal/inspect.c
        monetdb5/modules/mal/mal_init.mal
        monetdb5/modules/mal/mal_mapi.c
        monetdb5/modules/mal/mal_mapi.h
        monetdb5/modules/mal/manifold.c
        monetdb5/modules/mal/manifold.h
        monetdb5/modules/mal/mdb.c
        monetdb5/modules/mal/oltp.c
        monetdb5/modules/mal/oltp.h
        monetdb5/modules/mal/orderidx.c
        monetdb5/modules/mal/orderidx.h
        monetdb5/modules/mal/pcre.c
        monetdb5/modules/mal/remote.c
        monetdb5/modules/mal/remote.h
        monetdb5/modules/mal/sysmon.c
        monetdb5/modules/mal/tablet.c
        monetdb5/modules/mal/tablet.h
        monetdb5/modules/mal/wlc.c
        monetdb5/modules/mal/wlc.h
        monetdb5/optimizer/Tests/ARexample.malC
        monetdb5/optimizer/Tests/CRexample.malC
        monetdb5/optimizer/Tests/CXerror1.malC
        monetdb5/optimizer/Tests/CXexample.stable.out
        monetdb5/optimizer/Tests/FTexample.malC
        monetdb5/optimizer/Tests/cst01.stable.out
        monetdb5/optimizer/Tests/dataflow4.malC
        monetdb5/optimizer/Tests/dataflow4.stable.out
        monetdb5/optimizer/Tests/dataflow5.malC
        monetdb5/optimizer/Tests/ifthencst.malC
        monetdb5/optimizer/Tests/inline02.stable.out
        monetdb5/optimizer/Tests/inline03.stable.out
        monetdb5/optimizer/Tests/inline04.stable.out
        monetdb5/optimizer/Tests/inline07.stable.out
        monetdb5/optimizer/Tests/inline09.stable.out
        monetdb5/optimizer/Tests/inline10.stable.out
        monetdb5/optimizer/Tests/inline11.malC
        monetdb5/optimizer/Tests/inline12.stable.out
        monetdb5/optimizer/Tests/inlineCst.stable.out
        monetdb5/optimizer/Tests/inlineFunction.malC
        monetdb5/optimizer/Tests/inlineFunction.stable.out
        monetdb5/optimizer/Tests/inlineFunction1.malC
        monetdb5/optimizer/Tests/inlineFunction2.malC
        monetdb5/optimizer/Tests/inlineFunction2.stable.out
        monetdb5/optimizer/Tests/inlineFunction3.malC
        monetdb5/optimizer/Tests/inlineFunction4.malC
        monetdb5/optimizer/Tests/inlineFunction4.stable.out
        monetdb5/optimizer/Tests/joinpath.malC
        monetdb5/optimizer/Tests/leftjoinpath.malC
        monetdb5/optimizer/Tests/mat00.malC
        monetdb5/optimizer/Tests/mat01.malC
        monetdb5/optimizer/Tests/projectionchain.malC
        monetdb5/optimizer/Tests/qep02.malC
        monetdb5/optimizer/Tests/reorder00.malC
        monetdb5/optimizer/Tests/replicator00.malC
        monetdb5/optimizer/Tests/tst4000.stable.out
        monetdb5/optimizer/Tests/tst4002.malC
        monetdb5/optimizer/Tests/tst4003.stable.out
        monetdb5/optimizer/Tests/tst4004.malC
        monetdb5/optimizer/Tests/tst4005.stable.out
        monetdb5/optimizer/Tests/tst4030.malC
        monetdb5/optimizer/opt_coercion.c
        monetdb5/optimizer/opt_commonTerms.c
        monetdb5/optimizer/opt_constants.c
        monetdb5/optimizer/opt_dataflow.c
        monetdb5/optimizer/opt_garbageCollector.c
        monetdb5/optimizer/opt_generator.c
        monetdb5/optimizer/opt_matpack.c
        monetdb5/optimizer/opt_mergetable.c
        monetdb5/optimizer/opt_multiplex.c
        monetdb5/optimizer/opt_pipes.c
        monetdb5/optimizer/opt_postfix.c
        monetdb5/optimizer/opt_remap.c
        monetdb5/scheduler/Tests/sched00.stable.out
        monetdb5/scheduler/run_isolate.h
        monetdb5/scheduler/run_memo.c
        monetdb5/scheduler/run_pipeline.c
        monetdb5/scheduler/run_pipeline.h
        monetdb5/tools/Tests/mserver5--help.stable.err
        monetdb5/tools/Tests/mserver5--help.stable.err.Windows
        rpm.mk.in
        sql/ChangeLog
        sql/backends/monet5/UDF/pyapi/conversion.c
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql_execute.c
        sql/backends/monet5/sql_optimizer.c
        sql/backends/monet5/sql_orderidx.c
        sql/backends/monet5/sql_orderidx.h
        sql/backends/monet5/sql_result.c
        sql/backends/monet5/sql_scenario.c
        sql/backends/monet5/sql_scenario.h
        sql/backends/monet5/sql_statement.c
        sql/backends/monet5/sql_statistics.c
        sql/backends/monet5/sql_statistics.h
        sql/backends/monet5/sql_upgrades.c
        sql/backends/monet5/sql_user.c
        sql/backends/monet5/vaults/bam/bam_db_interface.h
        sql/backends/monet5/vaults/bam/bam_globals.h
        sql/backends/monet5/vaults/bam/bam_loader.c
        sql/backends/monet5/vaults/bam/bam_wrapper.c
        sql/backends/monet5/vaults/fits/fits.c
        sql/backends/monet5/vaults/lidar/lidar.c
        sql/backends/monet5/vaults/shp/shp.c
        sql/backends/monet5/wlr.c
        sql/backends/monet5/wlr.h
        sql/backends/monet5/wlr.mal
        sql/common/sql_types.c
        sql/common/sql_types.h
        sql/include/sql_mem.h
        sql/scripts/25_debug.sql
        sql/scripts/61_wlcr.sql
        sql/scripts/Makefile.ag
        sql/server/rel_distribute.c
        sql/server/rel_optimizer.c
        sql/server/rel_partition.c
        sql/server/rel_rel.c
        sql/server/rel_rel.h
        sql/server/rel_schema.c
        sql/server/sql_atom.c
        sql/server/sql_mvc.c
        sql/server/sql_parser.y
        sql/server/sql_privileges.c
        sql/server/sql_symbol.c
        sql/storage/bat/bat_table.c
        sql/storage/store.c
        sql/test/BugTracker-2009/Tests/All
        sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.stable.err
        
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-2014/Tests/querylog.Bug-3607.stable.out
        sql/test/BugTracker-2018/Tests/temp-table-performance.Bug-6577.sql
        sql/test/BugTracker-2019/Tests/All
        sql/test/BugTracker-2019/Tests/isaUUID.Bug-6784.stable.err
        sql/test/Dependencies/Tests/Dependencies.stable.out
        sql/test/Dependencies/Tests/Dependencies.stable.out.int128
        sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
        sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
        sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
        sql/test/emptydb/Tests/check.stable.out
        sql/test/emptydb/Tests/check.stable.out.32bit
        sql/test/emptydb/Tests/check.stable.out.int128
        sql/test/miscellaneous/Tests/column_aliases.sql
        sql/test/miscellaneous/Tests/column_aliases.stable.err
        sql/test/miscellaneous/Tests/column_aliases.stable.out
        sql/test/miscellaneous/Tests/simple_selects.sql
        sql/test/miscellaneous/Tests/simple_selects.stable.err
        sql/test/pg_regress/Tests/numeric_big.stable.err
        sql/test/pg_regress/Tests/numeric_big.stable.err.int128
        sql/test/remote/Tests/creds.SQL.py
        sql/test/remote/Tests/different_user.SQL.py
        sql/test/remote/Tests/invalid_creds.SQL.py
        sql/test/remote/Tests/ssbm.SQL.py
        sql/test/sys-schema/Tests/systemfunctions.stable.out
        sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade/Tests/upgrade.stable.out
        sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
        sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
        sql/test/wlcr/Tests/All
        sql/test/wlcr/Tests/wlr10.py
        sql/test/wlcr/Tests/wlr100.py
        sql/test/wlcr/Tests/wlr100.stable.err
        sql/test/wlcr/Tests/wlr100.stable.out
        sql/test/wlcr/Tests/wlr20.py
        sql/test/wlcr/Tests/wlr30.py
        sql/test/wlcr/Tests/wlr40.py
        sql/test/wlcr/Tests/wlr40.stable.err
        sql/test/wlcr/Tests/wlr40.stable.out
        sql/test/wlcr/Tests/wlr50.py
        sql/test/wlcr/Tests/wlr50.stable.err
        sql/test/wlcr/Tests/wlr50.stable.out
        sql/test/wlcr/Tests/wlr70.py
        sql/test/wlcr/Tests/wlr70.stable.err
        sql/test/wlcr/Tests/wlr70.stable.out
        sql/test/wlcr/Tests/wlr80.py
        tools/merovingian/client/monetdb.c
        tools/mserver/mserver5.c
Branch: compactprofiler
Log Message:

Merge with default


diffs (truncated from 30124 to 300 lines):

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -91,3 +91,6 @@ NT/unistd.h
 # package building on Mac OS X
 MacOSX/build
 MacOSX/usr
+
+# Don't keep the result of the documentation compilation
+documentation/build
diff --git a/Makefile.ag b/Makefile.ag
--- a/Makefile.ag
+++ b/Makefile.ag
@@ -16,7 +16,7 @@ EXTRA_DIST = bootstrap configure configu
        MonetDB.spec rpm.mk.in COPYING README.rst license.txt HowToStart.rst \
        README-Fedora README-Debian
 
-EXTRA_DIST_DIR = NT debian MacOSX
+EXTRA_DIST_DIR = NT debian MacOSX documentation
 
 headers_config = {
        DIR = includedir/monetdb
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -282,6 +282,7 @@
 #define HAVE_LOCALTIME_R 1
 /* there is something very similar to localtime_r on Windows: */
 #define localtime_r(tp,tm)     localtime_s(tm,tp)
+#define gmtime_r(tp,tm)                gmtime_s(tm,tp)
 
 /* Define to 1 if you have the `lockf' function. */
 /* #undef HAVE_LOCKF */
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
@@ -532,7 +532,9 @@ stdout of test 'MAL-signatures` in direc
 [ "aggr",      "variancep",    "command aggr.variancep(b:bat[:any_2]):dbl ",   
"ALGvariancep;",        "Gives the variance of all tail values" ]
 [ "alarm",     "ctime",        "unsafe command alarm.ctime():str ",    
"ALARMctime;",  "Return the current time as a C-time string."   ]
 [ "alarm",     "epoch",        "unsafe command alarm.epoch():int ",    
"ALARMepoch;",  "Return time since Jan 1, 1970 in seconds."     ]
-[ "alarm",     "sleep",        "unsafe command alarm.sleep(secs:int):void ",   
"ALARMsleep;",  "Sleep a few seconds"   ]
+[ "alarm",     "sleep",        "unsafe pattern 
alarm.sleep(msecs:bat[:int]):bat[:int] ",       "ALARMsleep;",  "Sleep a few 
milliseconds and return the slept value"   ]
+[ "alarm",     "sleep",        "unsafe pattern alarm.sleep(msecs:int):int ",   
"ALARMsleep;",  "Sleep a few milliseconds and return the slept value"   ]
+[ "alarm",     "sleep",        "unsafe pattern alarm.sleep(msecs:int):void ",  
"ALARMsleep;",  "Sleep a few milliseconds"      ]
 [ "alarm",     "time", "unsafe command alarm.time():int ",     "ALARMtime;",   
"Return time since program start in milliseconds."      ]
 [ "alarm",     "usec", "unsafe command alarm.usec():lng ",     "ALARMusec;",   
"Return time since Jan 1, 1970 in microseconds."        ]
 [ "algebra",   "antijoin",     "function algebra.antijoin(l:bat[:any_1], 
r:bat[:any_1], sl:bat[:oid], sr:bat[:oid], nil_matches:bit, estimate:lng) 
(X_0:bat[:oid], X_1:bat[:oid]);",   "",     ""      ]
@@ -11244,6 +11246,16 @@ stdout of test 'MAL-signatures` in direc
 [ "lidar",     "attach",       "pattern lidar.attach(fname:str):void ",        
"LIDARattach;", "Open a LIDAR file and return catalog of the table HDUs"        
]
 [ "lidar",     "export",       "pattern lidar.export(tablename:str, fname:str, 
type:str):void ",       "LIDARexportTable;",    "Exporta LIDAR table to a 
LAS/LAZ file" ]
 [ "lidar",     "load", "pattern lidar.load(tablename:str):void ",      
"LIDARloadTable;",      "Load a LIDAR table from an attached file"      ]
+[ "logging",   "flush",        "command logging.flush():void ",        
"TRACERflush_buffer;",  "Flush the buffer"      ]
+[ "logging",   "resetadapter", "command logging.resetadapter():void ", 
"TRACERreset_adapter;", "Resets the adapter back to the default"        ]
+[ "logging",   "resetcomplevel",       "command 
logging.resetcomplevel(comp:int):void ",       "TRACERreset_component_level;", 
"Resets the log level for a specific component back to the default"     ]
+[ "logging",   "resetflushlevel",      "command logging.resetflushlevel():void 
",      "TRACERreset_flush_level;",     "Resets the flush level back to the 
default"    ]
+[ "logging",   "resetlayerlevel",      "command 
logging.resetlayerlevel(layer:int):void ",     "TRACERreset_layer_level;",     
"Resets the log level for a specific layer back to the default" ]
+[ "logging",   "setadapter",   "command logging.setadapter(adapter:int):void 
",        "TRACERset_adapter;",   "Sets the adapter"      ]
+[ "logging",   "setcomplevel", "command logging.setcomplevel(comp:int, 
lvl:int):void ",        "TRACERset_component_level;",   "Sets the log level for 
a specific component"   ]
+[ "logging",   "setflushlevel",        "command 
logging.setflushlevel(lvl:int):void ", "TRACERset_flush_level;",       "Sets 
the flush level"  ]
+[ "logging",   "setlayerlevel",        "command 
logging.setlayerlevel(layer:int, lvl:int):void ",      
"TRACERset_layer_level;",       "Sets the log level for a specific layer"       
]
+[ "logging",   "showinfo",     "command logging.showinfo():void ",     
"TRACERshow_info;",     "Dumps to the console all the available logging levels, 
layers and the components\nalong with their current logging level being set"    
]
 [ "mal",       "manifold",     "pattern mal.manifold(mod:str, fcn:str, 
a:any...):bat[:any] ",  "MANIFOLDevaluate;",    ""      ]
 [ "mal",       "multiplex",    "pattern mal.multiplex(mod:str, fcn:str, 
a:any...):any... ",    "MANIFOLDremapMultiplex;",      ""      ]
 [ "manual",    "functions",    "pattern manual.functions() (mod:bat[:str], 
fcn:bat[:str], sig:bat[:str], adr:bat[:str], com:bat[:str]) ",      
"MANUALcreateOverview;",        "Produces a table with all MAL functions known" 
]
@@ -12186,6 +12198,7 @@ stdout of test 'MAL-signatures` in direc
 [ "wlr",       "drop_user",    "pattern wlr.drop_user(sname:str, 
action:int):void ",   "WLRgeneric;",  "Catalog operation drop_user"   ]
 [ "wlr",       "drop_user",    "pattern wlr.drop_user(sname:str, auth:str, 
action:int):void ", "WLRgeneric;",  "Catalog operation drop_user"   ]
 [ "wlr",       "drop_view",    "pattern wlr.drop_view(sname:str, name:str, 
action:int, ifexists:int):void ",   "WLRgeneric;",  "Catalog operation 
drop_view"   ]
+[ "wlr",       "getMaster",    "pattern wlr.getMaster():str ", 
"WLRgetmaster;",        "What is the current master database"   ]
 [ "wlr",       "getclock",     "pattern wlr.getclock():str ",  "WLRgetclock;", 
"Timestamp of last replicated transaction."     ]
 [ "wlr",       "gettick",      "pattern wlr.gettick():lng ",   "WLRgettick;",  
"Transaction identifier of the last replicated transaction."    ]
 [ "wlr",       "grant",        "pattern wlr.grant(sname:str, tbl:str, 
grantee:str, privs:int, cname:str, gr:int, grantor:int):void ",  "WLRgeneric;", 
 "Catalog operation grant"       ]
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
@@ -636,7 +636,9 @@ stdout of test 'MAL-signatures` in direc
 [ "aggr",      "variancep",    "command aggr.variancep(b:bat[:any_2]):dbl ",   
"ALGvariancep;",        "Gives the variance of all tail values" ]
 [ "alarm",     "ctime",        "unsafe command alarm.ctime():str ",    
"ALARMctime;",  "Return the current time as a C-time string."   ]
 [ "alarm",     "epoch",        "unsafe command alarm.epoch():int ",    
"ALARMepoch;",  "Return time since Jan 1, 1970 in seconds."     ]
-[ "alarm",     "sleep",        "unsafe command alarm.sleep(secs:int):void ",   
"ALARMsleep;",  "Sleep a few seconds"   ]
+[ "alarm",     "sleep",        "unsafe pattern 
alarm.sleep(msecs:bat[:int]):bat[:int] ",       "ALARMsleep;",  "Sleep a few 
milliseconds and return the slept value"   ]
+[ "alarm",     "sleep",        "unsafe pattern alarm.sleep(msecs:int):int ",   
"ALARMsleep;",  "Sleep a few milliseconds and return the slept value"   ]
+[ "alarm",     "sleep",        "unsafe pattern alarm.sleep(msecs:int):void ",  
"ALARMsleep;",  "Sleep a few milliseconds"      ]
 [ "alarm",     "time", "unsafe command alarm.time():int ",     "ALARMtime;",   
"Return time since program start in milliseconds."      ]
 [ "alarm",     "usec", "unsafe command alarm.usec():lng ",     "ALARMusec;",   
"Return time since Jan 1, 1970 in microseconds."        ]
 [ "algebra",   "antijoin",     "function algebra.antijoin(l:bat[:any_1], 
r:bat[:any_1], sl:bat[:oid], sr:bat[:oid], nil_matches:bit, estimate:lng) 
(X_0:bat[:oid], X_1:bat[:oid]);",   "",     ""      ]
@@ -15646,6 +15648,16 @@ stdout of test 'MAL-signatures` in direc
 [ "lidar",     "attach",       "pattern lidar.attach(fname:str):void ",        
"LIDARattach;", "Open a LIDAR file and return catalog of the table HDUs"        
]
 [ "lidar",     "export",       "pattern lidar.export(tablename:str, fname:str, 
type:str):void ",       "LIDARexportTable;",    "Exporta LIDAR table to a 
LAS/LAZ file" ]
 [ "lidar",     "load", "pattern lidar.load(tablename:str):void ",      
"LIDARloadTable;",      "Load a LIDAR table from an attached file"      ]
+[ "logging",   "flush",        "command logging.flush():void ",        
"TRACERflush_buffer;",  "Flush the buffer"      ]
+[ "logging",   "resetadapter", "command logging.resetadapter():void ", 
"TRACERreset_adapter;", "Resets the adapter back to the default"        ]
+[ "logging",   "resetcomplevel",       "command 
logging.resetcomplevel(comp:int):void ",       "TRACERreset_component_level;", 
"Resets the log level for a specific component back to the default"     ]
+[ "logging",   "resetflushlevel",      "command logging.resetflushlevel():void 
",      "TRACERreset_flush_level;",     "Resets the flush level back to the 
default"    ]
+[ "logging",   "resetlayerlevel",      "command 
logging.resetlayerlevel(layer:int):void ",     "TRACERreset_layer_level;",     
"Resets the log level for a specific layer back to the default" ]
+[ "logging",   "setadapter",   "command logging.setadapter(adapter:int):void 
",        "TRACERset_adapter;",   "Sets the adapter"      ]
+[ "logging",   "setcomplevel", "command logging.setcomplevel(comp:int, 
lvl:int):void ",        "TRACERset_component_level;",   "Sets the log level for 
a specific component"   ]
+[ "logging",   "setflushlevel",        "command 
logging.setflushlevel(lvl:int):void ", "TRACERset_flush_level;",       "Sets 
the flush level"  ]
+[ "logging",   "setlayerlevel",        "command 
logging.setlayerlevel(layer:int, lvl:int):void ",      
"TRACERset_layer_level;",       "Sets the log level for a specific layer"       
]
+[ "logging",   "showinfo",     "command logging.showinfo():void ",     
"TRACERshow_info;",     "Dumps to the console all the available logging levels, 
layers and the components\nalong with their current logging level being set"    
]
 [ "mal",       "manifold",     "pattern mal.manifold(mod:str, fcn:str, 
a:any...):bat[:any] ",  "MANIFOLDevaluate;",    ""      ]
 [ "mal",       "multiplex",    "pattern mal.multiplex(mod:str, fcn:str, 
a:any...):any... ",    "MANIFOLDremapMultiplex;",      ""      ]
 [ "manual",    "functions",    "pattern manual.functions() (mod:bat[:str], 
fcn:bat[:str], sig:bat[:str], adr:bat[:str], com:bat[:str]) ",      
"MANUALcreateOverview;",        "Produces a table with all MAL functions known" 
]
@@ -16606,6 +16618,7 @@ stdout of test 'MAL-signatures` in direc
 [ "wlr",       "drop_user",    "pattern wlr.drop_user(sname:str, 
action:int):void ",   "WLRgeneric;",  "Catalog operation drop_user"   ]
 [ "wlr",       "drop_user",    "pattern wlr.drop_user(sname:str, auth:str, 
action:int):void ", "WLRgeneric;",  "Catalog operation drop_user"   ]
 [ "wlr",       "drop_view",    "pattern wlr.drop_view(sname:str, name:str, 
action:int, ifexists:int):void ",   "WLRgeneric;",  "Catalog operation 
drop_view"   ]
+[ "wlr",       "getMaster",    "pattern wlr.getMaster():str ", 
"WLRgetmaster;",        "What is the current master database"   ]
 [ "wlr",       "getclock",     "pattern wlr.getclock():str ",  "WLRgetclock;", 
"Timestamp of last replicated transaction."     ]
 [ "wlr",       "gettick",      "pattern wlr.gettick():lng ",   "WLRgettick;",  
"Transaction identifier of the last replicated transaction."    ]
 [ "wlr",       "grant",        "pattern wlr.grant(sname:str, tbl:str, 
grantee:str, privs:int, cname:str, gr:int, grantor:int):void ",  "WLRgeneric;", 
 "Catalog operation grant"       ]
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
@@ -286,6 +286,20 @@ ssize_t GDKstrFromStr(unsigned char *res
 str GDKstrdup(const char *s) __attribute__((__warn_unused_result__));
 str GDKstrndup(const char *s, size_t n) 
__attribute__((__warn_unused_result__));
 void GDKsyserror(_In_z_ _Printf_format_string_ const char *format, ...) 
__attribute__((__format__(__printf__, 1, 2)));
+gdk_return GDKtracer_flush_buffer(void);
+char *GDKtracer_get_timestamp(char *fmt);
+gdk_return GDKtracer_init(void);
+gdk_return GDKtracer_log(LOG_LEVEL level, char *fmt, ...) 
__attribute__((format(printf, 2, 3)));
+gdk_return GDKtracer_reset_adapter(void);
+gdk_return GDKtracer_reset_component_level(int *comp);
+gdk_return GDKtracer_reset_flush_level(void);
+gdk_return GDKtracer_reset_layer_level(int *layer);
+gdk_return GDKtracer_set_adapter(int *adapter);
+gdk_return GDKtracer_set_component_level(int *comp, int *lvl);
+gdk_return GDKtracer_set_flush_level(int *lvl);
+gdk_return GDKtracer_set_layer_level(int *layer, int *lvl);
+gdk_return GDKtracer_show_info(void);
+gdk_return GDKtracer_stop(void);
 size_t GDKuniqueid(size_t offset);
 gdk_return GDKupgradevarheap(BAT *b, var_t v, bool copyall, bool mayshare) 
__attribute__((__warn_unused_result__));
 lng GDKusec(void);
@@ -305,6 +319,7 @@ size_t HEAPmemsize(Heap *h);
 size_t HEAPvmsize(Heap *h);
 void IMPSdestroy(BAT *b);
 lng IMPSimprintsize(BAT *b);
+LOG_LEVEL LVL_PER_COMPONENT[];
 int MT_check_nr_cores(void);
 int MT_create_thread(MT_Id *t, void (*function)(void *), void *arg, enum 
MT_thr_detach d, const char *threadname);
 void MT_exiting_thread(void);
@@ -707,7 +722,7 @@ str AGGRvariance3_dbl(bat *retval, const
 str AGGRvariancep3_dbl(bat *retval, const bat *bid, const bat *gid, const bat 
*eid);
 str ALARMctime(str *res);
 str ALARMepoch(int *res);
-str ALARMsleep(void *res, int *secs);
+str ALARMsleep(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str ALARMtime(int *res);
 str ALARMusec(lng *ret);
 str ALGbandjoin(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat 
*slid, const bat *srid, const void *low, const void *high, const bit *li, const 
bit *hi, const lng *estimate);
@@ -1617,7 +1632,6 @@ str OPTconstantsImplementation(Client cn
 str OPTcostModelImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 str OPTdataflowImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
 str OPTdeadcodeImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
-lng OPTdebug;
 str OPTemptybindImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr p);
 str OPTevaluateImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 str OPTgarbageCollectorImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
@@ -1874,6 +1888,16 @@ str TKNZRgetLevel(bat *r, int *level);
 str TKNZRlocate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str TKNZRopen(void *r, str *name);
 str TKNZRtakeOid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str TRACERflush_buffer(void *ret);
+str TRACERreset_adapter(void *ret);
+str TRACERreset_component_level(void *ret, int *comp_id);
+str TRACERreset_flush_level(void *ret);
+str TRACERreset_layer_level(void *ret, int *layer_id);
+str TRACERset_adapter(void *ret, int *adapter_id);
+str TRACERset_component_level(void *ret, int *comp_id, int *lvl_id);
+str TRACERset_flush_level(void *ret, int *lvl_id);
+str TRACERset_layer_level(void *ret, int *layer_id, int *lvl_id);
+str TRACERshow_info(void *ret);
 int TRACEtable(Client cntxt, BAT **r);
 str TRNglobal_abort(bit *ret);
 str TRNglobal_commit(bit *ret);
@@ -2178,8 +2202,6 @@ str first_valueRef;
 str firstnRef;
 Module fixModule(str nme);
 int fndConstant(MalBlkPtr mb, const ValRecord *cst, int depth);
-void fprintFunction(FILE *fd, MalBlkPtr mb, MalStkPtr stk, int flg);
-void fprintInstruction(FILE *fd, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, int 
flg);
 void freeException(str);
 void freeInstruction(InstrPtr p);
 void freeMalBlk(MalBlkPtr mb);
@@ -2584,6 +2606,7 @@ void setReturnArgument(InstrPtr p, int v
 str setScenario(Client c, str nme);
 str setVariableRef;
 void setVariableScope(MalBlkPtr mb);
+void setVariableType(MalBlkPtr mb, const int idx, malType type);
 str setWriteModeRef;
 void setprofilerlimit(int limit);
 void showAllScenarios(stream *f);
@@ -2655,6 +2678,8 @@ timestamp timestamp_fromusec(lng usec);
 ssize_t timestamp_precision_tostr(str *buf, size_t *len, timestamp val, int 
precision, bool external);
 ssize_t timestamp_tostr(str *buf, size_t *len, const timestamp *val, bool 
external);
 ssize_t timestamp_tz_fromstr(const char *buf, size_t *len, timestamp **ret, 
bool external);
+void traceFunction(COMPONENT comp, MalBlkPtr mb, MalStkPtr stk, int flg);
+void traceInstruction(COMPONENT comp, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, 
int flg);
 str transactionRef;
 str transaction_abortRef;
 str transaction_beginRef;
@@ -2663,7 +2688,7 @@ str transaction_releaseRef;
 str transaction_rollbackRef;
 void trimMalVariables(MalBlkPtr mb, MalStkPtr stk);
 void trimMalVariables_(MalBlkPtr mb, MalStkPtr glb);
-void typeChecker(Module scope, MalBlkPtr mb, InstrPtr p, int silent);
+void typeChecker(Module scope, MalBlkPtr mb, InstrPtr p, int p_idx, int 
silent);
 str unescape_str(str *retval, str s);
 str uniqueRef;
 str unlockRef;
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -495,7 +495,7 @@ SQLhelp sqlhelp1[] = {
         NULL},
        {"START TRANSACTION",
         "Change transaction mode from auto-commit to user controlled 
commit/rollback",
-        "START TRANSACTION transactionmode",
+        "{ START | BEGIN } TRANSACTION transactionmode",
         "transactionmode,isolevel",
         "See also 
https://www.monetdb.org/Documentation/Manuals/SQLreference/Transactions"},
        {"TABLE JOINS",
diff --git a/common/utils/mstring.h b/common/utils/mstring.h
--- a/common/utils/mstring.h
+++ b/common/utils/mstring.h
@@ -6,6 +6,9 @@
  * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
  */
 
+#ifndef _MSTRING_H_
+#define _MSTRING_H_
+
 #include <stdarg.h>            /* va_list etc. */
 #include <string.h>            /* strlen */
 
@@ -46,3 +49,5 @@ strconcat_len(char *restrict dst, size_t
        va_end(ap);
        return i;
 }
+
+#endif
diff --git a/documentation/Makefile b/documentation/Makefile
new file mode 100644
--- /dev/null
+++ b/documentation/Makefile
@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = source
+BUILDDIR      = build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+       @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+       @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/documentation/make.bat b/documentation/make.bat
new file mode 100644
--- /dev/null
+++ b/documentation/make.bat
@@ -0,0 +1,35 @@
+@ECHO OFF
+
+pushd %~dp0
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+       set SPHINXBUILD=sphinx-build
+)
+set SOURCEDIR=source
+set BUILDDIR=build
+
+if "%1" == "" goto help
+
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
+       echo.
+       echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+       echo.installed, then set the SPHINXBUILD environment variable to point
+       echo.to the full path of the 'sphinx-build' executable. Alternatively 
you
+       echo.may add the Sphinx directory to PATH.
+       echo.
+       echo.If you don't have Sphinx installed, grab it from
+       echo.http://sphinx-doc.org/
+       exit /b 1
+)
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to