Changeset: 24e650d729be for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24e650d729be
Modified Files:
clients/ChangeLog.Jun2020
clients/Tests/exports.stable.out
clients/mapiclient/mclient.1
clients/mapiclient/msqldump.1
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/ChangeLog.Jun2020
gdk/gdk.h
gdk/gdk_system.h
monetdb5/ChangeLog.Jun2020
monetdb5/mal/mal.h
monetdb5/tools/Tests/mserver5--help.stable.err
monetdb5/tools/Tests/mserver5--help.stable.err.Windows
sql/ChangeLog.Jun2020
sql/backends/monet5/sql_scenario.c
sql/storage/store.c
tools/merovingian/daemon/monetdbd.1.in
tools/mserver/mserver5.1.in
tools/mserver/mserver5.c
Branch: default
Log Message:
Merge with Jun2020 branch.
diffs (truncated from 951 to 300 lines):
diff --git a/clients/ChangeLog.Jun2020 b/clients/ChangeLog.Jun2020
--- a/clients/ChangeLog.Jun2020
+++ b/clients/ChangeLog.Jun2020
@@ -3,7 +3,7 @@
* Mon Apr 20 2020 Sjoerd Mullender <sjo...@acm.org>
- The monetdb-client-tools (Debian/Ubuntu) and MonetDB-client-tools
- (Fedora/RHcontaining the stethoscope, tachograph, and tomograph has
+ (Fedora/RH) containing the stethoscope, tachograph, and tomograph has
been removed. A completely new version of stethoscope will be released
to replace the old version.
@@ -20,6 +20,6 @@
gets tagged with the current session identifier
* Thu Oct 24 2019 Martin Kersten <m...@cwi.nl>
-- Allow monetdb user to control session and query time out and selective
+- Allow monetdb user to control session and query time out and selectively
stopping a client sessions with a soft termination request.
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
@@ -297,7 +297,6 @@ void GDKreset(int status);
void GDKsetdebug(int debug);
gdk_return GDKsetenv(const char *name, const char *value);
void GDKsetmallocsuccesscount(lng count);
-void GDKsetverbose(int verbosity);
ssize_t GDKstrFromStr(unsigned char *restrict dst, const unsigned char
*restrict src, ssize_t len);
str GDKstrdup(const char *s) __attribute__((__malloc__))
__attribute__((__warn_unused_result__));
str GDKstrndup(const char *s, size_t n) __attribute__((__malloc__))
__attribute__((__warn_unused_result__));
@@ -318,7 +317,6 @@ 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);
-int GDKverbose;
const char *GDKversion(void) __attribute__((__const__));
size_t GDKvm_cursize(void);
void *GDKzalloc(size_t size) __attribute__((__malloc__))
__attribute__((__alloc_size__(1))) __attribute__((__warn_unused_result__));
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -75,6 +75,8 @@ This file can contain defaults for the f
.BR database ,
.BR save_history ,
.BR format ,
+.BR host ,
+.BR port ,
and
.BR width .
For example, an entry in a
@@ -182,7 +184,11 @@ measured and reported per query.
\fB\-\-user\fP\fB=\fP\fIuser\fP (\fB\-u\fP \fIuser\fP)
Specify the user to connect as.
If this flag is absent, the client will ask for a user name, unless a
-default was found in .monetdb file.
+default was found in the
+.I .monetdb
+or
+.B $DOTMONETDBFILE
+file.
.TP
\fB\-\-format=\fP\fIformat\fP (\fB\-f\fP \fIformat\fP)
Specify the output format.
@@ -194,29 +200,34 @@ The possible values are
.BR tab ,
.BR raw ,
.BR xml ,
+.BR trash ,
and
-.BR trash .
+.BR rowcount .
.B csv
-is comma-separated values,
+is comma-separated values;
.B tab
-is tab-separated values,
+is tab-separated values;
.B raw
is no special formatting (data is dumped the way the server sends it
-to the client),
+to the client);
.B sql
is a pretty format which is meant for human consumption where columns
-are clearly shown,
+are clearly shown;
.B expanded
and
.B x
are synonyms and are another pretty format meant for human consumption
-where column values are printed in full and below each other,
+where column values are printed in full and below each other;
.B xml
-is a valid (in the XML sense) document,
-and
+is a valid (in the XML sense) document;
.B trash
does not render any output, enabling performance measurements free of any
-output rendering/serialization costs.
+output rendering/serialization costs;
+and
+.B rowcount
+is a variation on
+.B trash
+where only the number of affected rows is printed.
In addition to plain \fBcsv\fP, two other forms are possible.
\fBcsv=\fP\fIc\fP uses \fIc\fP as column separator; \fBcsv+\fP\fIc\fP
uses \fIc\fP as column separator and produces a single header line in
@@ -227,7 +238,10 @@ Echo the query.
Note that using this option slows down processing.
.TP
\fB\-\-history\fP (\fB\-H\fP)
-Load and save the command line history (default off).
+If compiled with the
+.IR readline (3)
+library,
+load and save the command line history (default off).
.TP
\fB\-\-log=\fP\fIlogfile\fP (\fB\-L\fP \fIlogfile\fP)
Save client/server interaction in the specified file.
diff --git a/clients/mapiclient/msqldump.1 b/clients/mapiclient/msqldump.1
--- a/clients/mapiclient/msqldump.1
+++ b/clients/mapiclient/msqldump.1
@@ -33,9 +33,11 @@ searches for a
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
-.BR user
+.BR user ,
+.BR password ,
+.BR host ,
and
-.BR password .
+.BR port .
To disable reading the
.I .monetdb
file, set the variable
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
@@ -36,16 +36,17 @@ 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**, **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.
+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.
OPTIONS
=======
@@ -110,40 +111,42 @@ General Options
("**run**"). All timings are reported on stderr.
| **Note** that the client-measured wall-clock time is reported per
query **only** when options **--interactive** or **--echo** are
- used, because only then does mclient send individual lines
+ used, because only then does *mclient* send individual lines
(statements) of the SQL script to the server. Otherwise, when
- mclient sends the SQL script in large(r) batch(es), only the total
- wall-clock time per batch is measured and reported. The
+ *mclient* sends the SQL script in large(r) batch(es), only the
+ total wall-clock time per batch is measured and reported. The
server-measured detailed performance timings are always measured
and reported per query.
**--user=**\ *user* (**-u** *user*)
Specify the user to connect as. If this flag is absent, the client
- will ask for a user name, unless a default was found in .monetdb
- file.
+ will ask for a user name, unless a default was found in the
+ *.monetdb* or **$DOTMONETDBFILE** file.
**--format=**\ *format* (**-f** *format*)
Specify the output format. The possible values are **sql**,
- **expanded**, **x**, **csv**, **tab**, **raw**, **xml**, and
- **trash**. **csv** is comma-separated values, **tab** is
- tab-separated values, **raw** is no special formatting (data is
- dumped the way the server sends it to the client), **sql** is a
+ **expanded**, **x**, **csv**, **tab**, **raw**, **xml**, **trash**,
+ and **rowcount**. **csv** is comma-separated values; **tab** is
+ tab-separated values; **raw** is no special formatting (data is
+ dumped the way the server sends it to the client); **sql** is a
pretty format which is meant for human consumption where columns are
- clearly shown, **expanded** and **x** are synonyms and are another
+ clearly shown; **expanded** and **x** are synonyms and are another
pretty format meant for human consumption where column values are
- printed in full and below each other, **xml** is a valid (in the XML
- sense) document, and **trash** does not render any output, enabling
+ printed in full and below each other; **xml** is a valid (in the XML
+ sense) document; **trash** does not render any output, enabling
performance measurements free of any output rendering/serialization
- costs. In addition to plain **csv**, two other forms are possible.
- **csv=**\ *c* uses *c* as column separator; **csv+**\ *c* uses *c* as
- column separator and produces a single header line in addition to the
- data.
+ costs; and **rowcount** is a variation on **trash** where only the
+ number of affected rows is printed. In addition to plain **csv**, two
+ other forms are possible. **csv=**\ *c* uses *c* as column separator;
+ **csv+**\ *c* uses *c* as column separator and produces a single
+ header line in addition to the data.
**--echo** (**-e**)
Echo the query. Note that using this option slows down processing.
**--history** (**-H**)
- Load and save the command line history (default off).
+ If compiled with the *readline*\ (3) library, load and save the
+ command line history (default off).
**--log=**\ *logfile* (**-L** *logfile*)
Save client/server interaction in the specified file.
@@ -303,9 +306,9 @@ name of the database.
mclient -d $db -s "COPY INTO $table FROM '$file' USING DELIMITERS
',',E'\\n','\"'"
Efficiently import data from a CSV file into a table when the file is to
-be read by mclient (e.g. the server has no access to the file). *$file*
-is the (absolute or relative) path name of the file, *$table* is the
-name of the table, *$db* is the name of the database.
+be read by *mclient* (e.g. the server has no access to the file).
+*$file* is the (absolute or relative) path name of the file, *$table* is
+the name of the table, *$db* is the name of the database.
::
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
@@ -261,8 +261,9 @@ value.
be filtered out using an expression (e.g. "mapi:monetdb:*") if
desired. The control entries come in handy when one wants to get an
overview of available monetdbds in e.g. a local cluster. Note that
- for monetdbd to announce its control port, the *mero_controlport*
- setting for that monetdbd must be enabled in the configuration file.
+ for *monetdbd* to announce its control port, the *mero_controlport*
+ setting for that *monetdbd* must be enabled in the configuration
+ file.
**-h**
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
@@ -119,7 +119,7 @@ using the **set** command. The following
for connection requests. Defaults to 50000.
**ipv6**
- This property forces monetdbd to bind connections on IPv6 addresses
+ This property forces *monetdbd* to bind connections on IPv6 addresses
only. Defaults to false.
**listenaddr**
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
@@ -55,13 +55,24 @@ MSERVER5 OPTIONS
**@localstatedir@/monetdb5/dbfarm/demo**.
**--dbextra=**\ *path*
- Path where mserver5 should store transient data. Default value is the
- value of the **--dbpath** option.
+ Path where *mserver5* should store transient data. Default value is
+ the value of the **--dbpath** option.
+
+**--dbtrace=**\ *path*
+ File name for the trace log file for *mserver5*. Default value is the
+ file **mdbtrace.log** inside the directory specified with the
+ **--dbpath** option.
**--config=**\ *file*
Config file to read options from. This file can contain all options
as can be set with the --set flag. See *CONFIG FILE FORMAT*.
+**--single-user**
+ Allow only a single user at a time.
+
+**--readonly**
+ The database is opened in read-only mode.
+
**--set** *option*\ **=**\ *value*
Set individual configuration option. For possible options, see
*PARAMETERS* sections.
@@ -73,17 +84,7 @@ MSERVER5 OPTIONS
Print version and compile configuration.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
