Changeset: bb1d2d00f0ff for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb1d2d00f0ff
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/modules/mal/Tests/inspect00.stable.out
monetdb5/tools/Tests/mserver5--help.stable.err
monetdb5/tools/Tests/mserver5--help.stable.err.Windows
sql/backends/monet5/wlr.c
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/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: gdk_tracer
Log Message:
Get updates from branch gdk_tracer
diffs (251 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
@@ -11244,14 +11244,15 @@ stdout of test 'MAL-signatures` in direc
[ "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", "log", "command logging.log():void ", "TRACERlog;", "Create
a log message" ]
-[ "logging", "resetadapter", "command logging.resetadapter():void ",
"TRACERreset_adapter;", "Reset the adapter" ]
-[ "logging", "resetcomplevel", "command
logging.resetcomplevel(comp:int):void ", "TRACERreset_component_level;",
"Reset the log level for a specific component" ]
-[ "logging", "resetflushlevel", "command logging.resetflushlevel():void
", "TRACERreset_flush_level;", "Reset the flush level" ]
-[ "logging", "resetlayerlevel", "command
logging.resetlayerlevel(layer:int):void ", "TRACERreset_layer_level;",
"Reset the log level for a specific layer" ]
-[ "logging", "setadapter", "command logging.setadapter(adapter:int):void
", "TRACERset_adapter;", "Set the adapter" ]
-[ "logging", "setcomplevel", "command logging.setcomplevel(comp:int,
lvl:int):void ", "TRACERset_component_level;", "Set the log level for
a specific component" ]
-[ "logging", "setflushlevel", "command
logging.setflushlevel(lvl:int):void ", "TRACERset_flush_level;", "Set the
flush level" ]
-[ "logging", "setlayerlevel", "command
logging.setlayerlevel(layer:int, lvl:int):void ",
"TRACERset_layer_level;", "Set the log level for a specific layer"
]
+[ "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"
]
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
@@ -15646,14 +15646,15 @@ stdout of test 'MAL-signatures` in direc
[ "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", "log", "command logging.log():void ", "TRACERlog;", "Create
a log message" ]
-[ "logging", "resetadapter", "command logging.resetadapter():void ",
"TRACERreset_adapter;", "Reset the adapter" ]
-[ "logging", "resetcomplevel", "command
logging.resetcomplevel(comp:int):void ", "TRACERreset_component_level;",
"Reset the log level for a specific component" ]
-[ "logging", "resetflushlevel", "command logging.resetflushlevel():void
", "TRACERreset_flush_level;", "Reset the flush level" ]
-[ "logging", "resetlayerlevel", "command
logging.resetlayerlevel(layer:int):void ", "TRACERreset_layer_level;",
"Reset the log level for a specific layer" ]
-[ "logging", "setadapter", "command logging.setadapter(adapter:int):void
", "TRACERset_adapter;", "Set the adapter" ]
-[ "logging", "setcomplevel", "command logging.setcomplevel(comp:int,
lvl:int):void ", "TRACERset_component_level;", "Set the log level for
a specific component" ]
-[ "logging", "setflushlevel", "command
logging.setflushlevel(lvl:int):void ", "TRACERset_flush_level;", "Set the
flush level" ]
-[ "logging", "setlayerlevel", "command
logging.setlayerlevel(layer:int, lvl:int):void ",
"TRACERset_layer_level;", "Set the log level for a specific layer"
]
+[ "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"
]
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,7 +286,6 @@ 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)));
-void GDKtracerinfo(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);
@@ -1876,13 +1875,14 @@ str TKNZRtakeOid(Client cntxt, MalBlkPtr
str TRACERflush_buffer(void);
str TRACERlog(void);
str TRACERreset_adapter(void);
-str TRACERreset_component_level(int *comp);
+str TRACERreset_component_level(void *ret, int *comp_id);
str TRACERreset_flush_level(void);
-str TRACERreset_layer_level(int *layer);
-str TRACERset_adapter(void *ret, int *adapter);
-str TRACERset_component_level(void *ret, int *comp, int *lvl);
-str TRACERset_flush_level(void *ret, int *lvl);
-str TRACERset_layer_level(void *ret, int *layer, int *lvl);
+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);
int TRACEtable(Client cntxt, BAT **r);
str TRNglobal_abort(bit *ret);
str TRNglobal_commit(bit *ret);
diff --git a/monetdb5/modules/mal/Tests/inspect00.stable.out
b/monetdb5/modules/mal/Tests/inspect00.stable.out
--- a/monetdb5/modules/mal/Tests/inspect00.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect00.stable.out
@@ -31,10 +31,10 @@ stack depth 2
# view stk stk # name
# void int str # type
#--------------------------#
-[ 0@0, 0, " (h=nil:bat[:int], t=nil:bat[:str]) := mdb.getStackTrace();
at user.tst[3]" ]
-[ 1@0, 1, " user.tst(); at user.main[2]" ]
-#-------------------------------------------------#
-# view stk stk # name
+[ 0@0, 0, " (h=nil:bat[:int], t=nil:bat[:str]) :=
mdb.getStackTrace();\t#[3] (0) MDBStkTrace 4 5 at user.tst[3]" ]
+[ 1@0, 1, " user.tst();\t#[2] (0) 2 at user.main[2]" ]
+#--------------------------#
+# t stk stk # name
# void str str # type
#-------------------------------------------------#
[ 0@0, "tst", "0@0" ]
diff --git a/monetdb5/tools/Tests/mserver5--help.stable.err
b/monetdb5/tools/Tests/mserver5--help.stable.err
--- a/monetdb5/tools/Tests/mserver5--help.stable.err
+++ b/monetdb5/tools/Tests/mserver5--help.stable.err
@@ -20,7 +20,6 @@ Usage: mserver5 [options]
--set <option>=<value> Set configuration option
--help Print this list of options
--version Print version and compile time info
- --verbose[=value] Set or increase verbosity level
The debug, testing & trace options:
--threads
--memory
@@ -31,7 +30,6 @@ The debug, testing & trace options:
--modules
--algorithms
--performance
- --optimizers
--forcemito
--debug=<bitmask>
diff --git a/monetdb5/tools/Tests/mserver5--help.stable.err.Windows
b/monetdb5/tools/Tests/mserver5--help.stable.err.Windows
--- a/monetdb5/tools/Tests/mserver5--help.stable.err.Windows
+++ b/monetdb5/tools/Tests/mserver5--help.stable.err.Windows
@@ -15,7 +15,6 @@ Usage: mserver5.exe [options]
--set <option>=<value> Set configuration option
--help Print this list of options
--version Print version and compile time info
- --verbose[=value] Set or increase verbosity level
The debug, testing & trace options:
--threads
--memory
@@ -26,7 +25,6 @@ The debug, testing & trace options:
--modules
--algorithms
--performance
- --optimizers
--forcemito
--debug=<bitmask>
diff --git a/sql/backends/monet5/wlr.c b/sql/backends/monet5/wlr.c
--- a/sql/backends/monet5/wlr.c
+++ b/sql/backends/monet5/wlr.c
@@ -354,7 +354,7 @@ WLRprocessBatch(void *arg)
sql->session->ac_on_commit = 1;
sql->session->level = 0;
if(mvc_trans(sql) < 0) {
- TRC_CRITICAL(SQL_WLR,
"Allocation failure while starting the transaction\n");
+ TRC_ERROR(SQL_WLR, "Allocation
failure while starting the transaction\n");
} else {
TRC_DEBUG(SQL_WLR, "Process a
transaction\n");
debugFunction(SQL_WLR, mb, 0,
LIST_MAL_DEBUG | LIST_MAL_MAPI );
@@ -375,7 +375,7 @@ WLRprocessBatch(void *arg)
if( msg != MAL_SUCCEED){
// they should always
succeed
msg
=createException(MAL,"wlr.process", "batch %d:"LLFMT" :%s\n", i, tag, msg);
- debugFunction(SQL_WLR,
mb, 0, LIST_MAL_DEBUG );
+
//debugFunction(SQL_WLR, mb, 0, LIST_MAL_DEBUG );
if((other =
mvc_rollback(sql,0,NULL, false)) != MAL_SUCCEED) //an error was already
established
GDKfree(other);
} else
@@ -388,8 +388,8 @@ WLRprocessBatch(void *arg)
char line[FILENAME_MAX];
snprintf(line,
FILENAME_MAX,"#wlr.process:typechecking failed '%s':\n",path);
snprintf(wlr_error, FILENAME_MAX, "%s",
line);
- TRC_INFO(SQL_WLR, "%s\n", line);
- debugFunction(SQL_WLR, mb, 0,
LIST_MAL_DEBUG );
+ //TRC_INFO(SQL_WLR, "%s\n", line);
+ //debugFunction(SQL_WLR, mb, 0,
LIST_MAL_DEBUG );
}
cleanup();
if ( wlr_tag + 1 == wlc_tag || tag == wlr_limit)
@@ -974,7 +974,6 @@ cleanup:
#define WLRvalue(TPE) \
{ TPE val = *getArgReference_##TPE(stk,pci,5);
\
if (BUNappend(upd, (void*) &val, false) != GDK_SUCCEED)
{ \
- TRC_ERROR(SQL_WLR, "BUNappend failed\n");
\
goto cleanup;
\
}
\
}
diff --git
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
---
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
+++
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
@@ -37,6 +37,7 @@ stdout of test 'table_functions_fail_aft
[ "profiler" ]
[ "wlc" ]
[ "wlr" ]
+[ "logging" ]
[ "bam" ]
[ "ft" ]
diff --git
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
---
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
+++
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
@@ -33,6 +33,7 @@ stdout of test 'table_functions_fail_aft
[ "profiler" ]
[ "wlc" ]
[ "wlr" ]
+[ "logging" ]
[ "bam" ]
[ "ft" ]
#drop function ft.func;
diff --git
a/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
b/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
--- a/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
+++ b/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
@@ -40,6 +40,7 @@ stdout of test 'groupby_having_charlengt
[ "profiler", 8, 10 ]
[ "wlc", 3, 10 ]
[ "wlr", 3, 10 ]
+[ "logging", 7, 10 ]
[ "bam", 3, 10 ]
# 12:48:35 >
diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out
b/sql/test/sys-schema/Tests/systemfunctions.stable.out
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out
@@ -98,6 +98,14 @@ stdout of test 'systemfunctions` in dire
[ "json", "tojsonarray", 1, "double", "" ]
[ "json", "valuearray", 0, "json", "create function
json.valuearray(js json)\nreturns json external name json.valuearray;" ]
[ "json", "valuearray", 1, "json", "" ]
+[ "logging", "resetcomplevel", 0, "int", "create procedure
logging.resetcomplevel(comp_id int)\n external name logging.resetcomplevel;" ]
+[ "logging", "resetlayerlevel", 0, "int", "create procedure
logging.resetlayerlevel(layer_id int)\n external name logging.resetlayerlevel;"
]
+[ "logging", "setadapter", 0, "int", "create procedure
logging.setadapter(adapter_id int)\n external name logging.setadapter;" ]
+[ "logging", "setcomplevel", 0, "int", "create procedure
logging.setcomplevel(comp_id int, lvl_id int)\n external name
logging.setcomplevel;" ]
+[ "logging", "setcomplevel", 1, "int", "" ]
+[ "logging", "setflushlevel", 0, "int", "create procedure
logging.setflushlevel(lvl_id int)\n external name logging.setflushlevel;" ]
+[ "logging", "setlayerlevel", 0, "int", "create procedure
logging.setlayerlevel(layer_id int, lvl_id int)\n external name
logging.setlayerlevel;" ]
+[ "logging", "setlayerlevel", 1, "int", "" ]
[ "profiler", "getlimit", 0, "int", "create function
profiler.getlimit() returns integer external name profiler.getlimit;" ]
[ "profiler", "setheartbeat", 0, "int", "create procedure
profiler.setheartbeat(beat int) external name profiler.setheartbeat;" ]
[ "profiler", "setlimit", 0, "int", "create procedure
profiler.setlimit(lim integer) external name profiler.setlimit;" ]
diff --git a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
--- a/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
+++ b/sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
@@ -101,6 +101,14 @@ stdout of test 'systemfunctions` in dire
[ "json", "tojsonarray", 1, "double", "" ]
[ "json", "valuearray", 0, "json", "create function
json.valuearray(js json)\nreturns json external name json.valuearray;" ]
[ "json", "valuearray", 1, "json", "" ]
+[ "logging", "resetcomplevel", 0, "int", "create procedure
logging.resetcomplevel(comp_id int)\n external name logging.resetcomplevel;" ]
+[ "logging", "resetlayerlevel", 0, "int", "create procedure
logging.resetlayerlevel(layer_id int)\n external name logging.resetlayerlevel;"
]
+[ "logging", "setadapter", 0, "int", "create procedure
logging.setadapter(adapter_id int)\n external name logging.setadapter;" ]
+[ "logging", "setcomplevel", 0, "int", "create procedure
logging.setcomplevel(comp_id int, lvl_id int)\n external name
logging.setcomplevel;" ]
+[ "logging", "setcomplevel", 1, "int", "" ]
+[ "logging", "setflushlevel", 0, "int", "create procedure
logging.setflushlevel(lvl_id int)\n external name logging.setflushlevel;" ]
+[ "logging", "setlayerlevel", 0, "int", "create procedure
logging.setlayerlevel(layer_id int, lvl_id int)\n external name
logging.setlayerlevel;" ]
+[ "logging", "setlayerlevel", 1, "int", "" ]
[ "profiler", "getlimit", 0, "int", "create function
profiler.getlimit() returns integer external name profiler.getlimit;" ]
[ "profiler", "setheartbeat", 0, "int", "create procedure
profiler.setheartbeat(beat int) external name profiler.setheartbeat;" ]
[ "profiler", "setlimit", 0, "int", "create procedure
profiler.setlimit(lim integer) external name profiler.setlimit;" ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
