Changeset: 00fa4016d75a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=00fa4016d75a Added Files: sql/test/VOC/VOCcreate_user.sql sql/test/VOC/VOCdrop.sql sql/test/VOC/VOCdrop_user.sql sql/test/VOC/VOCinsert.sql sql/test/VOC/VOCmanual_examples.sql sql/test/VOC/VOCquery.sql Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out documentation/source/manual_pages/mclient.rst documentation/source/manual_pages/monetdb.rst documentation/source/manual_pages/monetdbd.rst.in documentation/source/manual_pages/mserver5.rst.in documentation/source/manual_pages/msqldump.rst gdk/gdk.h gdk/gdk_bat.c gdk/gdk_bbp.c gdk/gdk_hash.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_posix.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_tm.c gdk/gdk_tracer.c gdk/gdk_tracer.h gdk/gdk_utils.c monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_client.c monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_exception.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_namespace.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resolve.c monetdb5/modules/atoms/inet.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/oltp.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tracer.c monetdb5/modules/mal/tracer.h monetdb5/modules/mal/tracer.mal sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_upgrades.c sql/benchmarks/nobench/Tests/nobench.sql sql/benchmarks/nobench/Tests/nobench.stable.out sql/scripts/81_tracer.sql sql/server/rel_dump.c sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_sequence.c sql/server/rel_updates.c sql/server/sql_privileges.c sql/server/sql_semantic.c sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows 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/VOC/Tests/VOC.SQL.py sql/test/VOC/Tests/VOC.stable.out sql/test/VOC/Tests/double_is_null.Bug-3116.sql sql/test/VOC/Tests/double_is_null.Bug-3116.stable.out sql/test/VOC/Tests/median.Bug-3096.sql sql/test/VOC/Tests/median.Bug-3096.stable.out sql/test/VOC/VOCschema.sql 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/merge-partitions/Tests/mergepart28.stable.err sql/test/miscellaneous/Tests/simple_selects.sql sql/test/miscellaneous/Tests/simple_selects.stable.err 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 tools/mserver/mserver5.1.in Branch: scoping Log Message:
Merged with default diffs (truncated from 65112 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 @@ -10918,13 +10918,13 @@ stdout of test 'MAL-signatures` in direc [ "logging", "compinfo", "pattern logging.compinfo() (id:bat[:int], component:bat[:str], log_level:bat[:str]) ", "TRACERcomp_info;", "Returns in the form of a SQL result-set all the components along with their ID\nand the their current logging level being set" ] [ "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", "resetcomplevel", "command logging.resetcomplevel(comp:str):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", "resetlayerlevel", "command logging.resetlayerlevel(layer:str):void ", "TRACERreset_layer_level;", "Resets the log level for a specific layer back to the default" ] +[ "logging", "setadapter", "command logging.setadapter(adapter:str):void ", "TRACERset_adapter;", "Sets the adapter" ] +[ "logging", "setcomplevel", "command logging.setcomplevel(comp:str, lvl:str):void ", "TRACERset_component_level;", "Sets the log level for a specific component" ] +[ "logging", "setflushlevel", "command logging.setflushlevel(lvl:str):void ", "TRACERset_flush_level;", "Sets the flush level" ] +[ "logging", "setlayerlevel", "command logging.setlayerlevel(layer:str, lvl:str):void ", "TRACERset_layer_level;", "Sets the log level for a specific layer" ] [ "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 @@ -15338,13 +15338,13 @@ stdout of test 'MAL-signatures` in direc [ "logging", "compinfo", "pattern logging.compinfo() (id:bat[:int], component:bat[:str], log_level:bat[:str]) ", "TRACERcomp_info;", "Returns in the form of a SQL result-set all the components along with their ID\nand the their current logging level being set" ] [ "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", "resetcomplevel", "command logging.resetcomplevel(comp:str):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", "resetlayerlevel", "command logging.resetlayerlevel(layer:str):void ", "TRACERreset_layer_level;", "Resets the log level for a specific layer back to the default" ] +[ "logging", "setadapter", "command logging.setadapter(adapter:str):void ", "TRACERset_adapter;", "Sets the adapter" ] +[ "logging", "setcomplevel", "command logging.setcomplevel(comp:str, lvl:str):void ", "TRACERset_component_level;", "Sets the log level for a specific component" ] +[ "logging", "setflushlevel", "command logging.setflushlevel(lvl:str):void ", "TRACERset_flush_level;", "Sets the flush level" ] +[ "logging", "setlayerlevel", "command logging.setlayerlevel(layer:str, lvl:str):void ", "TRACERset_layer_level;", "Sets the log level for a specific layer" ] [ "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 @@ -217,6 +217,7 @@ BUN BUNfnd(BAT *b, const void *right); gdk_return BUNinplace(BAT *b, BUN p, const void *right, bool force) __attribute__((__warn_unused_result__)); BAT *COLcopy(BAT *b, int tt, bool writable, role_t role); BAT *COLnew(oid hseq, int tltype, BUN capacity, role_t role) __attribute__((__warn_unused_result__)); +const char *COMPONENT_STR[]; size_t GDK_mem_maxsize; size_t GDK_vm_maxsize; gdk_return GDKanalytical_correlation(BAT *r, BAT *b1, BAT *b2, BAT *s, BAT *e, int tpe); @@ -306,13 +307,13 @@ char *GDKtracer_get_timestamp(const char gdk_return GDKtracer_log(LOG_LEVEL level, const char *fmt, ...) __attribute__((format(printf, 2, 3))); void GDKtracer_reinit_basic(int sig); gdk_return GDKtracer_reset_adapter(void); -gdk_return GDKtracer_reset_component_level(int comp); +gdk_return GDKtracer_reset_component_level(const char *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_reset_layer_level(const char *layer); +gdk_return GDKtracer_set_adapter(const char *adapter); +gdk_return GDKtracer_set_component_level(const char *comp, const char *lvl); +gdk_return GDKtracer_set_flush_level(const char *lvl); +gdk_return GDKtracer_set_layer_level(const char *layer, const char *lvl); 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__)); @@ -333,6 +334,7 @@ size_t HEAPmemsize(Heap *h); size_t HEAPvmsize(Heap *h); void IMPSdestroy(BAT *b); lng IMPSimprintsize(BAT *b); +const char *LEVEL_STR[]; 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); @@ -1918,13 +1920,13 @@ str TKNZRtakeOid(Client cntxt, MalBlkPtr str TRACERcomp_info(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_component_level(void *ret, str *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 TRACERreset_layer_level(void *ret, str *layer_id); +str TRACERset_adapter(void *ret, str *adapter_id); +str TRACERset_component_level(void *ret, str *comp_id, str *lvl_id); +str TRACERset_flush_level(void *ret, str *lvl_id); +str TRACERset_layer_level(void *ret, str *layer_id, str *lvl_id); int TRACEtable(Client cntxt, BAT **r); str TRNglobal_abort(bit *ret); str TRNglobal_commit(bit *ret); diff --git a/documentation/source/manual_pages/mclient.rst b/documentation/source/manual_pages/mclient.rst --- a/documentation/source/manual_pages/mclient.rst +++ b/documentation/source/manual_pages/mclient.rst @@ -1,3 +1,7 @@ +======= +MCLIENT +======= + NAME ==== @@ -32,17 +36,16 @@ the **--interactive** (**-i**) option is lines starting with **\\** (backslash) specially. See the section BACKSLASH COMMANDS below. -Before *mclient* starts parsing command line options, it reads a -*.monetdb* file. If the environment variable **DOTMONETDBFILE** is set, -it reads the file pointed to by that variable instead. When unset, -*mclient* searches for a *.monetdb* file in the current working -directory, and if that doesn't exist, in the current user's home -directory. This file can contain defaults for the flags **user**, -**password**, **language**, **database**, **save_history**, **format**, -and **width**. For example, an entry in a *.monetdb* file that sets the -default language for *mclient* to mal looks like this: **language=mal**. -To disable reading the *.monetdb* file, set the variable -**DOTMONETDBFILE** to the empty string in the environment. +Before *mclient* starts parsing command line options, it reads a *.monetdb* +file. If the environment variable **DOTMONETDBFILE** is set, it reads the file +pointed to by that variable instead. When unset, *mclient* searches for a +*.monetdb* file in the current working directory, and if that doesn't exist, in +the current user's home directory. This file can contain defaults for the flags +**user**, **password**, **language**, **database**, **save_history**, +**format**, **host**, **port**, and **width**. For example, an entry in a +*.monetdb* file that sets the default language for *mclient* to mal looks like +this: **language=mal**. To disable reading the *.monetdb* file, set the +variable **DOTMONETDBFILE** to the empty string in the environment. OPTIONS ======= diff --git a/documentation/source/manual_pages/monetdb.rst b/documentation/source/manual_pages/monetdb.rst --- a/documentation/source/manual_pages/monetdb.rst +++ b/documentation/source/manual_pages/monetdb.rst @@ -1,3 +1,7 @@ +======= +MONETDB +======= + NAME ==== diff --git a/documentation/source/manual_pages/monetdbd.rst.in b/documentation/source/manual_pages/monetdbd.rst.in --- a/documentation/source/manual_pages/monetdbd.rst.in +++ b/documentation/source/manual_pages/monetdbd.rst.in @@ -1,3 +1,8 @@ +======== +MONETDBD +======== + + NAME ==== diff --git a/documentation/source/manual_pages/mserver5.rst.in b/documentation/source/manual_pages/mserver5.rst.in --- a/documentation/source/manual_pages/mserver5.rst.in +++ b/documentation/source/manual_pages/mserver5.rst.in @@ -1,3 +1,8 @@ +======== +MSERVER5 +======== + + NAME ==== diff --git a/documentation/source/manual_pages/msqldump.rst b/documentation/source/manual_pages/msqldump.rst --- a/documentation/source/manual_pages/msqldump.rst +++ b/documentation/source/manual_pages/msqldump.rst @@ -1,3 +1,7 @@ +======== +MSQLDUMP +======== + NAME ==== @@ -19,14 +23,14 @@ accelerators, and an SQL front end. *Msqldump* is the program to dump an MonetDB/SQL database. The dump can be used to populate a new MonetDB/SQL database. -Before *msqldump* starts parsing command line options, it reads a -*.monetdb* file. If the environment variable **DOTMONETDBFILE** is set, -it reads the file pointed to by that variable instead. When unset, -*msqldump* searches for a *.monetdb* file in the current working -directory, and if that doesn't exist, in the current user's home -directory. This file can contain defaults for the flags **user** and -**password**. To disable reading the *.monetdb* file, set the variable -**DOTMONETDBFILE** to the empty string in the environment. +Before *msqldump* starts parsing command line options, it reads a *.monetdb* +file. If the environment variable **DOTMONETDBFILE** is set, it reads the file +pointed to by that variable instead. When unset, *msqldump* searches for a +*.monetdb* file in the current working directory, and if that doesn't exist, in +the current user's home directory. This file can contain defaults for the flags +**user**, **password**, **host**, and **port**. To disable reading the +*.monetdb* file, set the variable **DOTMONETDBFILE** to the empty string in the +environment. OPTIONS ======= diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -361,62 +361,21 @@ */ #define THRDMASK (1) -#define THRDDEBUG if (GDKdebug & THRDMASK) #define CHECKMASK (1<<1) #define CHECKDEBUG if (GDKdebug & CHECKMASK) -#define MEMMASK (1<<2) -#define MEMDEBUG if (GDKdebug & MEMMASK) #define PROPMASK (1<<3) #define PROPDEBUG if (GDKdebug & PROPMASK) #define IOMASK (1<<4) -#define IODEBUG if (GDKdebug & IOMASK) #define BATMASK (1<<5) -#define BATDEBUG if (GDKdebug & BATMASK) -/* PARSEMASK not used anymore -#define PARSEMASK (1<<6) -#define PARSEDEBUG if (GDKdebug & PARSEMASK) -*/ #define PARMASK (1<<7) -#define PARDEBUG if (GDKdebug & PARMASK) -/* HEADLESSMASK not used anymore -#define HEADLESSMASK (1<<8) -#define HEADLESSDEBUG if (GDKdebug & HEADLESSMASK) -*/ #define TMMASK (1<<9) -#define TMDEBUG if (GDKdebug & TMMASK) #define TEMMASK (1<<10) -#define TEMDEBUG if (GDKdebug & TEMMASK) -/* DLMASK not used anymore -#define DLMASK (1<<11) -#define DLDEBUG if (GDKdebug & DLMASK) -*/ #define PERFMASK (1<<12) -#define PERFDEBUG if (GDKdebug & PERFMASK) #define DELTAMASK (1<<13) -#define DELTADEBUG if (GDKdebug & DELTAMASK) #define LOADMASK (1<<14) -#define LOADDEBUG if (GDKdebug & LOADMASK) -/* YACCMASK not used anymore -#define YACCMASK (1<<15) -#define YACCDEBUG if (GDKdebug & YACCMASK) -*/ -/* -#define ?tcpip? if (GDKdebug&(1<<16)) -#define ?monet_multiplex? if (GDKdebug&(1<<17)) -#define ?ddbench? if (GDKdebug&(1<<18)) -#define ?ddbench? if (GDKdebug&(1<<19)) -#define ?ddbench? if (GDKdebug&(1<<20)) -*/ #define ACCELMASK (1<<20) -#define ACCELDEBUG if (GDKdebug & (ACCELMASK|ALGOMASK)) #define ALGOMASK (1<<21) -#define ALGODEBUG if (GDKdebug & ALGOMASK) #define ESTIMASK (1<<22) -#define ESTIDEBUG if (GDKdebug & ESTIMASK) -/* XPROPMASK not used anymore -#define XPROPMASK (1<<23) -#define XPROPDEBUG if (GDKdebug & XPROPMASK) -*/ #define NOSYNCMASK (1<<24) @@ -424,16 +383,13 @@ #define DEADBEEFCHK if (!(GDKdebug & DEADBEEFMASK)) #define ALLOCMASK (1<<26) -#define ALLOCDEBUG if (GDKdebug & ALLOCMASK) /* M5, only; cf., * monetdb5/mal/mal.h */ #define OPTMASK (1<<27) -#define OPTDEBUG if (GDKdebug & OPTMASK) #define HEAPMASK (1<<28) -#define HEAPDEBUG if (GDKdebug & HEAPMASK) #define FORCEMITOMASK (1<<29) #define FORCEMITODEBUG if (GDKdebug & FORCEMITOMASK) diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk/gdk_bat.c @@ -447,11 +447,12 @@ BATextend(BAT *b, BUN newcap) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
