Changeset: 80b3e449ac79 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/80b3e449ac79
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (truncated from 2126 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -817,3 +817,4 @@ e6eb06773c17035954ac5d001cfe1f09ff3425cc
5683fd900f28d65ad7c98d1ed1efd992023a7fa4 Jun2023_15
c5b17681b55e6ca155db28be59913699e561502a Dec2023_root
c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_17
+c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_SP3_release
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -3784,11 +3784,6 @@ command bat.getName(X_0:bat[:any_1]):str
BKCgetBBPname;
Gives back the logical name of a BAT.
bat
-getRole
-command bat.getRole(X_0:bat[:any_1]):str
-BKCgetRole;
-Returns the rolename of the head column of a BAT.
-bat
getSequenceBase
command bat.getSequenceBase(X_0:bat[:any_1]):oid
BKCgetSequenceBase;
@@ -4039,11 +4034,6 @@ command bat.setAccess(X_0:bat[:any_1], X
BKCsetAccess;
Try to change the update access privileges @to this BAT. Mode:@r[ead-only]
- allow only read access.@a[append-only] - allow reads and
update.@w[riteable] - allow all operations.@BATs are updatable by default.
On making a BAT read-only, @all subsequent updates fail with an error
message.@Returns the BAT itself.
bat
-setColumn
-command bat.setColumn(X_0:bat[:any_1], X_1:str):void
-BKCsetColumn;
-Give a logical name to the tail column of a BAT.
-bat
setHash
command bat.setHash(X_0:bat[:any_1]):bit
BKCsetHash;
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -3219,11 +3219,6 @@ command bat.getName(X_0:bat[:any_1]):str
BKCgetBBPname;
Gives back the logical name of a BAT.
bat
-getRole
-command bat.getRole(X_0:bat[:any_1]):str
-BKCgetRole;
-Returns the rolename of the head column of a BAT.
-bat
getSequenceBase
command bat.getSequenceBase(X_0:bat[:any_1]):oid
BKCgetSequenceBase;
@@ -3464,11 +3459,6 @@ command bat.setAccess(X_0:bat[:any_1], X
BKCsetAccess;
Try to change the update access privileges @to this BAT. Mode:@r[ead-only]
- allow only read access.@a[append-only] - allow reads and
update.@w[riteable] - allow all operations.@BATs are updatable by default.
On making a BAT read-only, @all subsequent updates fail with an error
message.@Returns the BAT itself.
bat
-setColumn
-command bat.setColumn(X_0:bat[:any_1], X_1:str):void
-BKCsetColumn;
-Give a logical name to the tail column of a BAT.
-bat
setHash
command bat.setHash(X_0:bat[:any_1]):bit
BKCsetHash;
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
@@ -187,7 +187,6 @@ gdk_return BATreplace(BAT *b, BAT *p, BA
gdk_return BATreplacepos(BAT *b, const oid *positions, BAT *n, bool autoincr,
bool force) __attribute__((__warn_unused_result__));
void BATrmprop(BAT *b, enum prop_t idx);
void BATrmprop_nolock(BAT *b, enum prop_t idx);
-gdk_return BATroles(BAT *b, const char *tnme);
gdk_return BATrtree(BAT *wkb, BAT *mbr);
BAT *BATsample(BAT *b, BUN n);
BAT *BATsample_with_seed(BAT *b, BUN n, uint64_t seed);
@@ -570,7 +569,7 @@ void *mdlopen(const char *library, int m
const char *mercurial_revision(void) __attribute__((__const__));
int mo_add_option(opt **Set, int setlen, opt_kind kind, const char *name,
const char *value);
int mo_builtin_settings(opt **Set);
-char *mo_find_option(opt *set, int setlen, const char *name);
+const char *mo_find_option(opt *set, int setlen, const char *name);
void mo_free_options(opt *set, int setlen);
void mo_print_options(opt *set, int setlen);
int mo_system_config(opt **Set, int setlen);
@@ -720,7 +719,7 @@ const char *mcrypt_getHashAlgorithms(voi
char *mcrypt_hashPassword(const char *algo, const char *password, const char
*challenge);
int mo_add_option(opt **Set, int setlen, opt_kind kind, const char *name,
const char *value);
int mo_builtin_settings(opt **Set);
-char *mo_find_option(opt *set, int setlen, const char *name);
+const char *mo_find_option(opt *set, int setlen, const char *name);
void mo_free_options(opt *set, int setlen);
void mo_print_options(opt *set, int setlen);
int mo_system_config(opt **Set, int setlen);
@@ -810,7 +809,6 @@ int UTF8_strwidth(const char *restrict s
void addMalException(MalBlkPtr mb, str msg);
str addOptimizerPipe(Client cntxt, MalBlkPtr mb, const char *name);
str addPipeDefinition(Client cntxt, const char *name, const char *pipe);
-void addtoMalBlkHistory(MalBlkPtr mb);
const char *affectedRowsRef;
const char *aggrRef;
const char *alarmRef;
@@ -982,8 +980,6 @@ Symbol getFunctionSymbol(Module scope, I
int getHgeConstant(MalBlkPtr mb, hge val);
int getIntConstant(MalBlkPtr mb, int val);
int getLngConstant(MalBlkPtr mb, lng val);
-MalBlkPtr getMalBlkHistory(MalBlkPtr mb, int idx);
-MalBlkPtr getMalBlkOptimized(MalBlkPtr mb, const char *name);
Module getModule(const char *nme);
void getModuleList(Module **out, int *length);
BAT *getModules(void);
@@ -1208,7 +1204,6 @@ const char *remapRef;
const char *remoteRef;
void removeInstruction(MalBlkPtr mb, InstrPtr p);
void removeInstructionBlock(MalBlkPtr mb, int pc, int cnt);
-void removeMalBlkHistory(MalBlkPtr mb);
void renameVariables(MalBlkPtr mb);
const char *rename_columnRef;
const char *rename_schemaRef;
@@ -1246,7 +1241,6 @@ const char *setVariableRef;
void setVariableScope(MalBlkPtr mb);
void setVariableType(MalBlkPtr mb, const int idx, malType type);
const char *set_protocolRef;
-void showMalBlkHistory(stream *out, MalBlkPtr mb);
const char *singleRef;
void slash_2_dir_sep(str fname);
const char *sliceRef;
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -58,7 +58,7 @@ or if the
option is given,
.I mclient
interprets lines starting with
-.B \e
+.B \[rs]
(backslash) specially.
See the section BACKSLASH COMMANDS below.
.PP
@@ -126,7 +126,7 @@ option but not to the contents of files
(except for
.B \-
which refers to standard input) or files specified using the
-.B \e<
+.B \[rs]<
command (those must be encoded using UTF-8).
The default encoding is taken from the locale.
.TP
@@ -149,7 +149,7 @@ The \fB\-d\fP can be omitted if an equal
the current directory.
As such, the first non-option argument will be interpreted as database
to connect to if the argument does not exist as file.
-Valid URIs are as returned by `monetdb discover`, see
+Valid URIs are as returned by ``monetdb discover'', see
.IR monetdb (1),
and look like
\fBmapi:monetdb://\fP\fIhostname\fP\fB:\fP\fIport\fP\fB/\fP\fIdatabase\fP.
@@ -167,7 +167,7 @@ Specify the portnumber of the server (de
.TP
\fB\-\-interactive\fP (\fB\-i\fP)
When reading from standard input, interpret lines starting with
-.B \e
+.B \[rs]
(backslash) specially.
See the section BACKSLASH COMMANDS below.
.TP
@@ -175,13 +175,13 @@ See the section BACKSLASH COMMANDS below
The \fItimer\fP command controls the format of the time reported for queries.
The default mode is \fBnone\fP which turns off timing reporting.
The timer mode \fBclock\fP reports the client-side wall-clock time
-("\fBclk\fP") in a human-friendly format.
+(``\fBclk\fP'') in a human-friendly format.
The timer mode \fBperformance\fP reports client-side wall-clock time
-("\fBclk\fP") as well as detailed server-side timings, all in milliseconds
+(``\fBclk\fP'') as well as detailed server-side timings, all in milliseconds
(ms): the time to parse the SQL query, optimize the logical relational plan
-and create the initial physical (MAL) plan ("\fBsql\fP"); the time to
-optimize the physical (MAL) plan ("\fBopt\fP"); the time to execute the
-physical (MAL) plan ("\fBrun\fP").
+and create the initial physical (MAL) plan (``\fBsql\fP''); the time to
+optimize the physical (MAL) plan (``\fBopt\fP''); the time to execute the
+physical (MAL) plan (``\fBrun\fP'').
All timings are reported on stderr.
.br
\fBNote\fP that the client-measured wall-clock time is reported per query
@@ -296,11 +296,11 @@ SQL Options
\fB\-\-null=\fP\fInullstr\fP (\fB\-n\fP \fInullstr\fP)
Set the string to be used as NULL representation when using the
sql, csv, or tab output formats.
-If not used, NULL values are represented by the string \(dqnull\(dq in
+If not used, NULL values are represented by the string \[dq]null\[dq] in
the sql output format, and as the empty string in the csv and tab
output formats.
Note that an argument is required, so in order to use the empty
-string, use \fB\-n \(dq\(dq\fP (with the space) or \fB\-\-null=\fP.
+string, use \fB\-n \[dq]\[dq]\fP (with the space) or \fB\-\-null=\fP.
.TP
\fB\-\-autocommit\fP (\fB\-a\fP)
Switch autocommit mode off.
@@ -340,25 +340,25 @@ the dump.
.SS
General Commands
.TP
-\fB\e?\fP
+\fB\[rs]?\fP
Show a help message explaining the backslash commands.
.TP
-\fB\eq\fP
+\fB\[rs]q\fP
Exit
.IR mclient .
.TP
-\fB\e<\fP \fIfile\fP
+\fB\[rs]<\fP \fIfile\fP
Read input from the named
.IR file .
.TP
-\fB\e>\fP \fIfile\fP
+\fB\[rs]>\fP \fIfile\fP
Write output to the named
.IR file .
If no
.I file
is specified, write to standard output.
.TP
-\fB\e|\fP \fIcommand\fP
+\fB\[rs]|\fP \fIcommand\fP
Pipe output to the given
.IR command .
Each query is piped to a new invocation of the
@@ -367,28 +367,28 @@ If no
.I command
is given, revert to writing output to standard output.
.TP
-\fB\eh\fP
+\fB\[rs]h\fP
Show the
.IR readline (3)
history.
.TP
-\fB\eL\fP \fIfile\fP
+\fB\[rs]L\fP \fIfile\fP
Log client/server interaction in the given
.IR file .
If no
.I file
is specified, stop logging information.
.TP
-\fB\eX\fP
+\fB\[rs]X\fP
Trace what
.I mclient
is doing.
This is mostly for debugging purposes.
.TP
-\fB\ee\fP
+\fB\[rs]e\fP
Echo the query in SQL formatting mode.
.TP
-\fB\ef\fP \fIformat\fP
+\fB\[rs]f\fP \fIformat\fP
Use the specified
.I format
mode to format the output.
@@ -397,7 +397,7 @@ Possible modes the same as for the
.RB ( \-f )
option.
.TP
-\fB\ew\fP \fIwidth\fP
+\fB\[rs]w\fP \fIwidth\fP
Set the maximum page width for rendering in the
.B sql
formatting mode.
@@ -416,7 +416,7 @@ is greater than
.BR 0 ,
use the given width.
.TP
-\fB\er\fP \fIrows\fP
+\fB\[rs]r\fP \fIrows\fP
Use an internal pager using
.I rows
per page.
@@ -432,19 +432,19 @@ use the height of the terminal.
.SS
SQL Commands
.TP
-\fB\eD\fP
+\fB\[rs]D\fP
Dump the complete database.
This is equivalent to using the program
.IR msqldump (1).
.TP
-\fB\eD\fP \fItable\fP
+\fB\[rs]D\fP \fItable\fP
Dump the given
.IR table .
.TP
-\fB\ed\fP
-Alias for \edvt.
+\fB\[rs]d\fP
+Alias for \[rs]dvt.
.TP
-\fB\ed[Stvsfn]+\fP
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
