date:20201223

MonetDB: Oct2020 - Fix Coverity model: no loop variable declarat...

2020-12-23 Thread Sjoerd Mullender

Changeset: e7c8b5b16534 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e7c8b5b16534
Modified Files:
buildtools/coverity_model.c
Branch: Oct2020
Log Message:

Fix Coverity model: no loop variable declaration in "for" expression.


diffs (13 lines):

diff --git a/buildtools/coverity_model.c b/buildtools/coverity_model.c
--- a/buildtools/coverity_model.c
+++ b/buildtools/coverity_model.c
@@ -51,7 +51,8 @@ GDKzalloc(size_t size)
 {
void *p = GDKmalloc(size);
if (p) {
-   for (size_t i = 0; i < size; i++)
+   size_t i;
+   for (i = 0; i < size; i++)
((char *) p)[i] = 0;
}
return p;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Oct2020 - Modernize.

2020-12-23 Thread Sjoerd Mullender

Changeset: f0f1bc3e5854 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0f1bc3e5854
Modified Files:
MonetDB.spec
Branch: Oct2020
Log Message:

Modernize.


diffs (23 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -187,6 +187,8 @@ need this package, but you will also nee
 package, and most likely also %{name}-SQL-server5, as well as one or
 more client packages.
 
+%ldconfig_scriptlets
+
 %files
 %license COPYING
 %defattr(-,root,root)
@@ -888,10 +890,6 @@ sed -i 's|/var/run|/run|' \
 %{buildroot}%{_unitdir}/monetdbd.service
 %endif
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 %changelog
 * Wed Nov 18 2020 Sjoerd Mullender  - 11.39.7-20201118
 - Rebuilt.
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Oct2020 - Package (relatively) new files.

2020-12-23 Thread Sjoerd Mullender

Changeset: d360711c6460 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d360711c6460
Added Files:
debian/monetdb5-sql-dev.install
Modified Files:
MonetDB.spec
NT/mksqlwxs.py
debian/control
debian/monetdb5-server-dev.install
Branch: Oct2020
Log Message:

Package (relatively) new files.


diffs (88 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -572,6 +572,7 @@ used from the MAL level.
 %files -n MonetDB5-server-devel
 %defattr(-,root,root)
 %{_includedir}/monetdb/mal*.h
+%{_includedir}/monetdb/mel.h
 %{_libdir}/libmonetdb5.so
 %{_libdir}/pkgconfig/monetdb5.pc
 
@@ -635,6 +636,24 @@ configuration.
 %docdir %{_datadir}/doc/MonetDB-SQL
 %{_datadir}/doc/MonetDB-SQL/*
 
+%package SQL-server5-devel
+Summary: MonetDB5 SQL server modules
+Group: Applications/Databases
+Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+Requires: MonetDB5-server-devel%{?_isa} = %{version}-%{release}
+
+%description SQL-server5-devel
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators.  It also has an SQL front end.
+
+This package contains files needed to develop SQL extensions.
+
+%files SQL-server5-devel
+%defattr(-,root,root)
+%{_includedir}/monetdb/sql*.h
+
 %package embedded
 Summary: MonetDB as an embedded library
 Group: Applications/Databases
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -173,9 +173,10 @@ def main():
 print(r'')
 print(r'  ')
 id = comp(extend, id, 16,
-  sorted([r'include\monetdb\{}'.format(x) for x in filter(lambda 
x: (x.startswith('gdk') or x.startswith('monet') or x.startswith('mal')) and 
x.endswith('.h'), os.listdir(os.path.join(sys.argv[3], 'include', 'monetdb')))] 
+
+  sorted([r'include\monetdb\{}'.format(x) for x in filter(lambda 
x: (x.startswith('gdk') or x.startswith('monet') or x.startswith('mal') or 
x.startswith('sql')) and x.endswith('.h'), os.listdir(os.path.join(sys.argv[3], 
'include', 'monetdb')))] +
  [r'include\monetdb\mapi.h',
   r'include\monetdb\matomic.h',
+  r'include\monetdb\mel.h',
   r'include\monetdb\mstring.h',
   r'include\monetdb\stream.h',
   r'include\monetdb\stream_socket.h']),
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -215,6 +215,19 @@ Description: MonetDB SQL support for mon
  This package contains the monetdb and monetdbd programs and the systemd
  configuration.
 
+Package: monetdb5-sql-dev
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-server-dev (= ${source:Version}),
+ monetdb5-sql (= ${source:Version})
+Description: MonetDB SQL support for monetdb5
+ MonetDB is a database management system that is developed from a
+ main-memory perspective with use of a fully decomposed storage model,
+ automatic index management, extensibility of data types and search
+ accelerators.  It also has an SQL front end.
+ .
+ This package contains files needed to develop SQL extensions.
+
 Package: monetdb-python3
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
diff --git a/debian/monetdb5-server-dev.install 
b/debian/monetdb5-server-dev.install
--- a/debian/monetdb5-server-dev.install
+++ b/debian/monetdb5-server-dev.install
@@ -1,3 +1,4 @@
 debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdb5.so usr/lib/x86_64-linux-gnu
 debian/tmp/usr/include/monetdb/mal*.h usr/include/monetdb
+debian/tmp/usr/include/monetdb/mel.h usr/include/monetdb
 debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/monetdb5.pc 
usr/lib/x86_64-linux-gnu/pkgconfig
diff --git a/debian/monetdb5-sql-dev.install b/debian/monetdb5-sql-dev.install
new file mode 100644
--- /dev/null
+++ b/debian/monetdb5-sql-dev.install
@@ -0,0 +1,1 @@
+debian/tmp/usr/include/monetdb/sql*.h usr/include/monetdb
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge with Oct2020 branch.

2020-12-23 Thread Sjoerd Mullender

Changeset: ce5b03e76dac for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce5b03e76dac
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_logger.c
gdk/gdk_logger.h
Branch: default
Log Message:

Merge with Oct2020 branch.

___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Oct2020 - Do not remove functions from the ABI.

2020-12-23 Thread Sjoerd Mullender

Changeset: e5d1bd926b2b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e5d1bd926b2b
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_logger.c
gdk/gdk_logger.h
Branch: Oct2020
Log Message:

Do not remove functions from the ABI.


diffs (64 lines):

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
@@ -524,8 +524,10 @@ gdk_return logger_cleanup(logger *lg);
 logger *logger_create(int debug, const char *fn, const char *logdir, int 
version, preversionfix_fptr prefuncp, postversionfix_fptr postfuncp);
 gdk_return logger_del_bat(logger *lg, log_bid bid) 
__attribute__((__warn_unused_result__));
 void logger_destroy(logger *lg);
+gdk_return logger_exit(logger *lg);
 log_bid logger_find_bat(logger *lg, const char *name, char tpe, oid id);
 gdk_return logger_flush(logger *lg, lng save_id);
+gdk_return logger_restart(logger *lg);
 int logger_sequence(logger *lg, int seq, lng *id);
 gdk_return logger_upgrade_bat(logger *lg, const char *name, char tpe, oid id) 
__attribute__((__warn_unused_result__));
 void logger_with_ids(logger *lg);
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2403,7 +2403,7 @@ logger_new(int debug, const char *fn, co
return NULL;
 }
 
-static gdk_return
+gdk_return
 logger_restart(logger *lg)
 {
return logger_flush(lg, lg->tid);
@@ -2482,7 +2482,7 @@ logger_destroy(logger *lg)
 }
 
 static gdk_return
-logger_exit(logger *lg, lng save_id)
+logger_end(logger *lg, lng save_id)
 {
FILE *fp;
char filename[FILENAME_MAX];
@@ -2575,9 +2575,15 @@ logger_exit(logger *lg, lng save_id)
 }
 
 gdk_return
+logger_exit(logger *lg)
+{
+   return logger_end(lg, lg->tid);
+}
+
+gdk_return
 logger_flush(logger *lg, lng save_id)
 {
-   if (logger_exit(lg, save_id) == GDK_SUCCEED &&
+   if (logger_end(lg, save_id) == GDK_SUCCEED &&
logger_open(lg) == GDK_SUCCEED)
return GDK_SUCCEED;
return GDK_FAIL;
diff --git a/gdk/gdk_logger.h b/gdk/gdk_logger.h
--- a/gdk/gdk_logger.h
+++ b/gdk/gdk_logger.h
@@ -40,6 +40,8 @@ typedef int log_bid;
 
 gdk_export logger *logger_create(int debug, const char *fn, const char 
*logdir, int version, preversionfix_fptr prefuncp, postversionfix_fptr 
postfuncp);
 gdk_export void logger_destroy(logger *lg);
+gdk_export gdk_return logger_exit(logger *lg);
+gdk_export gdk_return logger_restart(logger *lg);
 gdk_export gdk_return logger_flush(logger *lg, lng save_id);
 gdk_export gdk_return logger_cleanup(logger *lg);
 gdk_export void logger_with_ids(logger *lg);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge with Oct2020 branch.

2020-12-23 Thread Sjoerd Mullender

Changeset: c71d1ae893e6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c71d1ae893e6
Modified Files:
clients/mapiclient/mhelp.c
sql/storage/bat/bat_storage.c
sql/storage/store.c
Branch: default
Log Message:

Merge with Oct2020 branch.


diffs (truncated from 377 to 300 lines):

diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -49,18 +49,18 @@ SQLhelp sqlhelp1[] = {
 "ALTER TABLE [ IF EXISTS ] qname DROP TABLE qname [ RESTRICT | CASCADE 
]\n"
 "ALTER TABLE [ IF EXISTS ] qname SET TABLE qname AS PARTITION 
partition_spec",
 "qname,partition_spec",
-"See also 
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/DataPartitioning"},
+"See also 
https://www.monetdb.org/Documentation/ServerAdministration/DistributedQueryProcessing/DataPartitioning"},
{"ALTER SCHEMA",
 "",
 "ALTER SCHEMA [ IF EXISTS ] ident RENAME TO ident",
 "ident",
-"See also https://www.monetdb.org/Documentation/SQLreference/Alter"},
+"See also 
https://www.monetdb.org/Documentation/SQLreference/TableDefinitions/AlterStatement"},
{"ALTER SEQUENCE",
 "",
 "ALTER SEQUENCE qname [ AS seq_int_datatype] [ RESTART [WITH intval]] 
[INCREMENT BY intval]\n"
 "[MINVALUE intval | NO MINVALUE] [MAXVALUE intval | NO MAXVALUE] 
[CACHE intval] [[NO] CYCLE]",
 "seq_int_datatype,intval",
-"See also 
https://www.monetdb.org/Documentation/Manuals/SQLreference/SerialTypes"},
+"See also 
https://www.monetdb.org/Documentation/SQLReference/DataTypes/SerialDatatypes"},
{"ALTER TABLE",
 "",
 "ALTER TABLE [ IF EXISTS ] qname ADD [ COLUMN ] column_def\n"
@@ -76,7 +76,7 @@ SQLhelp sqlhelp1[] = {
 "ALTER TABLE [ IF EXISTS ] qname SET { INSERT ONLY | READ ONLY | READ 
WRITE }\n"
 "ALTER TABLE [ IF EXISTS ] qname SET SCHEMA ident",
 "qname,column_def,table_constraint,ident",
-"See also https://www.monetdb.org/Documentation/SQLreference/Alter"},
+"See also 
https://www.monetdb.org/Documentation/SQLreference/TableDefinitions/AlterStatement"},
{"ALTER USER",
 "Change a user's login name or password or default schema",
 "ALTER USER ident RENAME TO ident\n"
@@ -85,12 +85,12 @@ SQLhelp sqlhelp1[] = {
 "ALTER USER ident [WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string] SET 
SCHEMA ident\n"
 "ALTER USER ident [WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string] 
SCHEMA PATH string",
 "ident",
-"See also https://www.monetdb.org/Documentation/SQLreference/Users"},
+"See also 
https://www.monetdb.org/Documentation/SQLReference/DataDefinition/Privileges/Users"},
{"ANALYZE",
 "Collect column/table/schema data statistics for analysis and 
optimizer usage",
 "ANALYZE ident [ . ident [ column_list ] ] [SAMPLE size] [MINMAX]",
 "ident,column_list",
-"See also 
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/statistics"},
+"See also 
https://www.monetdb.org/Documentation/ServerAdministration/TableStatistics"},
{"CALL",
 "Call a stored procedure",
 "CALL qname '(' [ scalar_expression [',' ...] ] ')' | CALL ident '.' 
ident",
@@ -106,12 +106,12 @@ SQLhelp sqlhelp1[] = {
 "Commit the current transaction",
 "COMMIT [ WORK ] [ AND CHAIN | AND NO CHAIN ]",
 NULL,
-NULL},
+"See also 
https://www.monetdb.org/Documentation/SQLreference/Transactions"},
{"COPY BINARY",
 "Append binary representations into a table",
 "COPY [nrofrecords] BINARY INTO qname [column_list] FROM string [',' 
...] [ON { CLIENT | SERVER }] [NO CONSTRAINT]",
 "nrofrecords,qname,column_list",
-"See also 
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/BinaryBulkLoad"},
+"See also 
https://www.monetdb.org/Documentation/ServerAdministration/LoadingBulkData/BinaryBulkLoad"},
{"COPY INTO",
 "Parse a csv file into a table or write a query result to a csv file",
 "COPY [nrofrecords] INTO qname [column_list] FROM string [',' ...] 
[headerlist] [ON { CLIENT | SERVER }] [ separators]\n"
@@ -120,7 +120,7 @@ SQLhelp sqlhelp1[] = {
 " [NULL [AS] string] [LOCKED] [BEST EFFORT] [NO CONSTRAINT]\n"
 "COPY query_expression INTO [STDOUT | string [ON { CLIENT | SERVER }]] 
[separators] [NULL [AS] string]",
 "nrofrecords,qname,column_list,headerlist,separators",
-"See also 
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/LoadingBulkData"},
+"See also 
https://www.monetdb.org/Documentation/ServerAdministration/LoadingBulkData"},
{"COPY LOADER",
 "Copy into using a user supplied parsing function",
 "COPY LOADER INTO qname FROM qname '(' [ scalar_expression ... ] ')'",
@@

MonetDB: Oct2020 - Updated links in mclient help.

2020-12-23 Thread Sjoerd Mullender

Changeset: 0b2b5dc84800 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0b2b5dc84800
Modified Files:
clients/mapiclient/mhelp.c
Branch: Oct2020
Log Message:

Updated links in mclient help.


diffs (truncated from 341 to 300 lines):

diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -49,18 +49,18 @@ SQLhelp sqlhelp1[] = {
 "ALTER TABLE [ IF EXISTS ] qname DROP TABLE qname [ RESTRICT | CASCADE 
]\n"
 "ALTER TABLE [ IF EXISTS ] qname SET TABLE qname AS PARTITION 
partition_spec",
 "qname,partition_spec",
-"See also 
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/DataPartitioning"},
+"See also 
https://www.monetdb.org/Documentation/ServerAdministration/DistributedQueryProcessing/DataPartitioning"},
{"ALTER SCHEMA",
 "",
 "ALTER SCHEMA [ IF EXISTS ] ident RENAME TO ident",
 "ident",
-"See also https://www.monetdb.org/Documentation/SQLreference/Alter"},
+"See also 
https://www.monetdb.org/Documentation/SQLreference/TableDefinitions/AlterStatement"},
{"ALTER SEQUENCE",
 "",
 "ALTER SEQUENCE qname [ AS seq_int_datatype] [ RESTART [WITH intval]] 
[INCREMENT BY intval]\n"
 "[MINVALUE intval | NO MINVALUE] [MAXVALUE intval | NO MAXVALUE] 
[CACHE intval] [[NO] CYCLE]",
 "seq_int_datatype,intval",
-"See also 
https://www.monetdb.org/Documentation/Manuals/SQLreference/SerialTypes"},
+"See also 
https://www.monetdb.org/Documentation/SQLReference/DataTypes/SerialDatatypes"},
{"ALTER TABLE",
 "",
 "ALTER TABLE [ IF EXISTS ] qname ADD [ COLUMN ] column_def\n"
@@ -76,7 +76,7 @@ SQLhelp sqlhelp1[] = {
 "ALTER TABLE [ IF EXISTS ] qname SET { INSERT ONLY | READ ONLY | READ 
WRITE }\n"
 "ALTER TABLE [ IF EXISTS ] qname SET SCHEMA ident",
 "qname,column_def,table_constraint,ident",
-"See also https://www.monetdb.org/Documentation/SQLreference/Alter"},
+"See also 
https://www.monetdb.org/Documentation/SQLreference/TableDefinitions/AlterStatement"},
{"ALTER USER",
 "Change a user's login name or password or default schema",
 "ALTER USER ident RENAME TO ident\n"
@@ -84,12 +84,12 @@ SQLhelp sqlhelp1[] = {
 "ALTER USER ident WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string\n"
 "ALTER USER ident [ WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string ] 
SET SCHEMA ident",
 "ident",
-"See also https://www.monetdb.org/Documentation/SQLreference/Users"},
+"See also 
https://www.monetdb.org/Documentation/SQLReference/DataDefinition/Privileges/Users"},
{"ANALYZE",
 "Collect column/table/schema data statistics for analysis and 
optimizer usage",
 "ANALYZE ident [ . ident [ column_list ] ] [SAMPLE size] [MINMAX]",
 "ident,column_list",
-"See also 
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/statistics"},
+"See also 
https://www.monetdb.org/Documentation/ServerAdministration/TableStatistics"},
{"CALL",
 "Call a stored procedure",
 "CALL qname '(' [ scalar_expression [',' ...] ] ')' | CALL ident '.' 
ident",
@@ -105,12 +105,12 @@ SQLhelp sqlhelp1[] = {
 "Commit the current transaction",
 "COMMIT [ WORK ] [ AND CHAIN | AND NO CHAIN ]",
 NULL,
-NULL},
+"See also 
https://www.monetdb.org/Documentation/SQLreference/Transactions"},
{"COPY BINARY",
 "Append binary representations into a table",
 "COPY [nrofrecords] BINARY INTO qname [column_list] FROM string [',' 
...] [ON { CLIENT | SERVER }] [NO CONSTRAINT]",
 "nrofrecords,qname,column_list",
-"See also 
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/BinaryBulkLoad"},
+"See also 
https://www.monetdb.org/Documentation/ServerAdministration/LoadingBulkData/BinaryBulkLoad"},
{"COPY INTO",
 "Parse a csv file into a table or write a query result to a csv file",
 "COPY [nrofrecords] INTO qname [column_list] FROM string [',' ...] 
[headerlist] [ON { CLIENT | SERVER }] [ separators]\n"
@@ -119,7 +119,7 @@ SQLhelp sqlhelp1[] = {
 " [NULL [AS] string] [LOCKED] [BEST EFFORT] [NO CONSTRAINT]\n"
 "COPY query_expression INTO [STDOUT | string [ON { CLIENT | SERVER }]] 
[separators] [NULL [AS] string]",
 "nrofrecords,qname,column_list,headerlist,separators",
-"See also 
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/LoadingBulkData"},
+"See also 
https://www.monetdb.org/Documentation/ServerAdministration/LoadingBulkData"},
{"COPY LOADER",
 "Copy into using a user supplied parsing function",
 "COPY LOADER INTO qname FROM qname '(' [ scalar_expression ... ] ')'",
@@ -135,14 +135,14 @@ SQLhelp sqlhelp1[] = {
 "RETURNS

MonetDB: default - The option to keep transients away from the d...

2020-12-23 Thread Sjoerd Mullender

Changeset: 65c4c37316f2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65c4c37316f2
Modified Files:
monetdb5/ChangeLog
testing/Mconvert.py.in
testing/Mz.py.in
Branch: default
Log Message:

The option to keep transients away from the disk is --dbextra=:memory:.


diffs (80 lines):

diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -2,6 +2,6 @@
 # This file is updated with Maddlog
 
 * Wed Sep  9 2020 Sjoerd Mullender 
-- By using the option "--dbextra=:inmemory", mserver5 can be instructed
+- By using the option "--dbextra=:memory:", mserver5 can be instructed
   to keep transient BATs completely in memory.
 
diff --git a/testing/Mconvert.py.in b/testing/Mconvert.py.in
--- a/testing/Mconvert.py.in
+++ b/testing/Mconvert.py.in
@@ -881,7 +881,7 @@ def GetBitsAndModsAndThreads(env) :
   ignore_errors = True)
 os.makedirs(os.path.join(env['GDK_DBFARM'], TSTPREF + '_transient'))
 elif env.get('TRANS_INMEM'):
-cmd.append('--dbextra=:inmemory')
+cmd.append('--dbextra=:memory:')
 if procdebug:
 print('GetBitsAndModsAndThreads: starting process "%s" (inpipe, 
outpipe, errpipe)\n' % '" "'.join(cmd))
 setpgrp = True
@@ -1798,7 +1798,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
   ignore_errors = True)
 os.makedirs(os.path.join(env['GDK_DBFARM'], TSTDB + 
'_transient'))
 elif env.get('TRANS_INMEM'):
-Srvr.append('--dbextra=:inmemory')
+Srvr.append('--dbextra=:memory:')
 if os.path.isfile(TST + '.options5'):
 Srvr.extend(openutf8(TST + '.options5').read().split())
 lang=""
@@ -1848,7 +1848,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
   ignore_errors = True)
 os.makedirs(os.path.join(env['GDK_DBFARM'], TSTPREF + 
'_transient'))
 elif env.get('TRANS_INMEM'):
-Srvr.append('--dbextra=:inmemory')
+Srvr.append('--dbextra=:memory:')
 pSrvr = ServerClass(Srvr, SrvrOut, SrvrErr, TIMEOUT, 
os.path.join(dbpath, '.started'), int(env['MAPIPORT']))
 pSrvr.LaunchIt()
 if savepath is not None:
diff --git a/testing/Mz.py.in b/testing/Mz.py.in
--- a/testing/Mz.py.in
+++ b/testing/Mz.py.in
@@ -843,7 +843,7 @@ def GetBitsAndModsAndThreads(env) :
   ignore_errors = True)
 os.makedirs(os.path.join(env['GDK_DBFARM'], TSTPREF + '_transient'))
 elif env.get('TRANS_INMEM'):
-cmd.append('--dbextra=:inmemory')
+cmd.append('--dbextra=:memory:')
 if procdebug:
 print('GetBitsAndModsAndThreads: starting process "%s" (inpipe, 
outpipe, errpipe)\n' % '" "'.join(cmd))
 setpgrp = True
@@ -1607,7 +1607,7 @@ def create_mserver5(dbpath, timeout=0, e
   ignore_errors = True)
 os.makedirs(os.path.join(env['GDK_DBFARM'], TSTPREF + '_transient'))
 elif env.get('TRANS_INMEM'):
-cmd.append('--dbextra=:inmemory')
+cmd.append('--dbextra=:memory:')
 return ServerClass(cmd,
 outfile,
 errfile,
@@ -1720,7 +1720,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
   ignore_errors = True)
 os.makedirs(os.path.join(env['GDK_DBFARM'], TSTDB + 
'_transient'))
 elif env.get('TRANS_INMEM'):
-Srvr.append('--dbextra=:inmemory')
+Srvr.append('--dbextra=:memory:')
 if os.path.isfile(TST + '.options5'):
 Srvr.extend(openutf8(TST + '.options5').read().split())
 lang=""
@@ -1770,7 +1770,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
   ignore_errors = True)
 os.makedirs(os.path.join(env['GDK_DBFARM'], TSTPREF + 
'_transient'))
 elif env.get('TRANS_INMEM'):
-Srvr.append('--dbextra=:inmemory')
+Srvr.append('--dbextra=:memory:')
 pSrvr = ServerClass(Srvr, SrvrOut, SrvrErr, TIMEOUT, 
os.path.join(dbpath, '.started'), int(env['MAPIPORT']))
 pSrvr.LaunchIt()
 if savepath is not None:
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: copybinary - Merge branch 'default' into 'copybinary'

2020-12-23 Thread Joeri van Ruth

Changeset: 975f73debe76 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=975f73debe76
Modified Files:
testing/sqltest.py
Branch: copybinary
Log Message:

Merge branch 'default' into 'copybinary'


diffs (177 lines):

diff --git a/documentation/source/developers_handbook.rst 
b/documentation/source/developers_handbook.rst
--- a/documentation/source/developers_handbook.rst
+++ b/documentation/source/developers_handbook.rst
@@ -70,7 +70,7 @@ directory where they reside::
 
 
 Adding sqllogic test
--
+
 
 See ``_ for detail 
information 
 on how to structure sqllogic test if you desire to make one by hand. We have 
extended the 
diff --git a/documentation/source/windowsbuild.rst 
b/documentation/source/windowsbuild.rst
deleted file mode 100644
--- a/documentation/source/windowsbuild.rst
+++ /dev/null
@@ -1,121 +0,0 @@
-.. This Source Code Form is subject to the terms of the Mozilla Public
-.. License, v. 2.0.  If a copy of the MPL was not distributed with this
-.. file, You can obtain one at http://mozilla.org/MPL/2.0/.
-..
-.. Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-
-.. This document is written in reStructuredText (see
-   http://docutils.sourceforge.net/ for more information).
-   Use ``rst2html.py`` to convert this file to HTML.
-
-Building MonetDB On Windows
-+++
-
-In this document we describe how to build the MonetDB suite of
-programs on Windows using the sources from `our source repository`__.
-This document is mainly targeted at building on Windows on a 32-bit
-architecture, but there are notes throughout about building on Windows
-on a 64-bit architecture which is indicated with Windows64.  We have
-successfully built on Windows XP, Windows Server, and Windows 7.
-
-.. _MonetDB: https://dev.monetdb.org/hg/MonetDB/
-
-__ MonetDB_
-
-Introduction
-
-
-The MonetDB suite of programs consists of a number of components which
-we will describe briefly here.  The section names are the names of the
-top-level folders in the Mercurial clone.
-
-Note that in branches up to and including Oct2010 the build process
-was different.  This document describes the build process for the
-branch this document is part of.  Use the command ``hg branch`` to
-find out the name of the branch.
-
-buildtools
---
-
-The buildtools component contains tools that are used to build the
-other components.  This component is required, but not all parts of
-this component are required for all configurations.
-
-common
---
-
-Also known as the MonetDB Common component contains some generally
-useful libraries.  This component is required.
-
-gdk

-
-Also known as the Goblin Database Kernel contains the database kernel,
-i.e. the heart of MonetDB.  This component is required.
-
-clients

-
-Also known as the MonetDB Client component contains a library which
-forms the basis for communicating with the MonetDB server components,
-and some interface programs that use this library to communicate with
-the server.  This component is required.
-
-monetdb5
-
-
-The MonetDB5 Server component is the database server.  It uses MAL
-(the MonetDB Algebra Language) as programming interface.  This
-component is required.
-
-sql

-
-Also known as MonetDB SQL, this component provides an SQL frontend to
-MonetDB5.  This component is required if you need SQL support.
-
-tools
--
-
-The tools component contains two parts.  The mserver part is the
-actual database server binary and is required.  The merovingian part
-is not used on Windows.
-
-geom
-
-
-The geom component provides a module for the MonetDB SQL frontend.
-This component is optional.
-
-testing

-
-The testing component contains some files and programs we use for
-testing the MonetDB suite.  This component is optional.
-
-Prerequisites
-=
-
-In order to compile the MonetDB suite of programs, several other
-programs and libraries need to be installed.  Some further programs
-and libraries can be optionally installed to enable optional features.
-The required programs and libraries are listed in this section, the
-following section lists the optional programs and libraries.
-
-Chocolatey
---
-
-Although Chocolatey_ is not a prerequisite per se, it makes
-installing and maintaining some of the other prerequisites a lot
-easier.  Therefore we recommend installing chocolatey.  Instructions
-are on their website__.
-
-We have installed the following programs using Chocolatey_::
-
-  choco install ActivePerl ant cmake ruby
-  choco install python3 python3-x86_32
-
-.. _Chocolatey: https://chocolatey.org/
-
-__ Chocolatey_
-
diff --git a/testing/sqltest.py b/testing/sqltest.py
--- a/testing/sqltest.py
+++ b/testing/sqltest.py
@@ -33,6 +33,17 @@ def sequence_match(left=[], right=[], in
 return False
 return True
 
+def

MonetDB: copybinary - Use SQLTestCase in bincopy tests

2020-12-23 Thread Joeri van Ruth

Changeset: 2866beda5571 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2866beda5571
Modified Files:
sql/test/bincopy/Tests/bincopy_support.py
Branch: copybinary
Log Message:

Use SQLTestCase in bincopy tests


diffs (truncated from 330 to 300 lines):

diff --git a/sql/test/bincopy/Tests/bincopy_support.py 
b/sql/test/bincopy/Tests/bincopy_support.py
--- a/sql/test/bincopy/Tests/bincopy_support.py
+++ b/sql/test/bincopy/Tests/bincopy_support.py
@@ -1,32 +1,30 @@
 
-import array
-import codecs
 import os
 import re
 import subprocess
 import sys
 
-try:
-from MonetDBtesting import process
-except ImportError:
-import process
+from MonetDBtesting.sqltest import SQLTestCase
+NRECS = 1_000_000
 
-NRECS = 1_000_000
 
 # location generated test data files.
 BINCOPY_FILES = os.environ.get('BINCOPY_FILES', None) or 
os.environ['TSTTRGDIR']
 
 class DataMaker:
-def __init__(self, side):
-self.side_clause = 'ON ' + side.upper()
+def __init__(self):
+self.fixed_substitutions = dict()
 self.work_list = set()
 
+def additionally(self, key, value):
+self.fixed_substitutions[key] = value
+
 def substitute_match(self, match):
 flags = []
 ext = ''
 var = match.group(1)
-if var == 'ON':
-return self.side_clause
+if var in self.fixed_substitutions:
+return self.fixed_substitutions[var]
 elif var.startswith('le_'):
 var = var[3:]
 ext = '.le'
@@ -63,83 +61,92 @@ class DataMaker:
 
 
 
-def run_test(side, code):
+def run_test(side, testcase):
+code, expected_result = testcase
 # generate the query
-data_maker = DataMaker(side)
-code = re.sub(r'@(\w+)@', data_maker.substitute_match, code)
+data_maker = DataMaker()
+data_maker.additionally('ON', 'ON ' + side.upper())
+data_maker.additionally('NRECS', NRECS)
+data_maker.additionally('NRECS_DIV_4', NRECS / 4)
+massage = lambda s: re.sub(r'@(\w+)@', data_maker.substitute_match, s)
+code = massage(code)
 code = f"START TRANSACTION;\n{code}\nROLLBACK;"
 open(os.path.join(BINCOPY_FILES, 'test.sql'), "w").write(code)
 
 # generate the required data files
 data_maker.generate_files()
 
-with process.client('sql',
-stdin=process.PIPE, input=code,
-stdout=process.PIPE, stderr=process.PIPE,
-log=True) as p:
-out, err = p.communicate()
-sys.stdout.write(out.replace(os.environ['TSTTRGBASE'].replace('\\', 
''),'${TSTTRGBASE}').replace('','/'))
-sys.stderr.write(err.replace(os.environ['TSTTRGBASE'].replace('\\', 
''),'${TSTTRGBASE}').replace('','/'))
+with SQLTestCase() as tc:
+tr = tc.execute(code, '-fcsv', client='mclient')
+print(repr(tr.data), file=sys.stderr)
+if isinstance(expected_result, list):
+tr.assertSucceeded()
+tr.assertDataResultMatch(expected_result)
+else:
+assert isinstance(expected_result, tuple)
+err_code = expected_result[0]
+err_msg = expected_result[1]
+if err_msg:
+err_msg = massage(err_msg)
+tr.assertFailed(err_code, err_msg)
 
 
-
-INTS = """
+INTS = ("""
 CREATE TABLE foo(id INT NOT NULL);
 COPY BINARY INTO foo(id) FROM @ints@ @ON@;
 SELECT COUNT(DISTINCT id) FROM foo;
-"""
+""", [f"{NRECS} affected rows", f"{NRECS}"])
 
-MORE_INTS = """
+MORE_INTS = ("""
 CREATE TABLE foo(id INT NOT NULL, i INT);
 COPY BINARY INTO foo(id, i) FROM @ints@, @more_ints@ @ON@;
 SELECT COUNT(id) FROM foo WHERE i = id + 1;
-"""
+""", [f"{NRECS} affected rows", f"{NRECS}"])
 
-STRINGS = """
+STRINGS = ("""
 CREATE TABLE foo(id INT NOT NULL, s VARCHAR(20));
 COPY BINARY INTO foo(id, s) FROM @ints@, @strings@ @ON@;
 SELECT COUNT(id) FROM foo WHERE s = ('int' || id);
-"""
+""", [f"{NRECS} affected rows", f"{NRECS}"])
 
-NULL_INTS = """
+NULL_INTS = ("""
 CREATE TABLE foo(id INT NOT NULL, i INT);
 COPY BINARY INTO foo(id, i) FROM @ints@, @null_ints@ @ON@;
 SELECT COUNT(id) FROM foo
 WHERE (id % 2 = 0 AND i IS NULL)
 OR(id % 2 = 1 AND i = id);
-"""
+""", [f"{NRECS} affected rows", f"{NRECS}"])
 
-LARGE_STRINGS = """
+LARGE_STRINGS = ("""
 CREATE TABLE foo(id INT NOT NULL, s TEXT);
 COPY BINARY INTO foo(id, s) FROM @ints@, @large_strings@ @ON@;
 SELECT COUNT(id) FROM foo
 WHERE (id % 1 <> 0 AND LENGTH(s) = 9)
 OR(id % 1 = 0 AND LENGTH(s) = 28 + 9);
-"""
+""", [f"{NRECS} affected rows", f"{NRECS}"])
 
-BROKEN_STRINGS = """
+BROKEN_STRINGS = ("""
 CREATE TABLE foo(id INT NOT NULL, s TEXT);
 COPY BINARY INTO foo(id, s) FROM @ints@, @broken_strings@ @ON@;
--- should fail!
-"""
+""", (None, "!GDK reported error: strPut: incorrectly encoded UTF-8"))
 
 # note that the \r\n has been normalized to \n but the lone \r has been
 # left alone.
-NEWLINE_STRINGS = r"""
+NEWLINE_STRINGS = (r"""
 CREATE TABLE foo(id INT NOT

MonetDB: copybinary - SQLTestCase: attempt to implement MclientT...

2020-12-23 Thread Joeri van Ruth

Changeset: 4d756b6f06e1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4d756b6f06e1
Modified Files:
testing/sqltest.py
Branch: copybinary
Log Message:

SQLTestCase: attempt to implement MclientTestResult.assertValue


diffs (28 lines):

diff --git a/testing/sqltest.py b/testing/sqltest.py
--- a/testing/sqltest.py
+++ b/testing/sqltest.py
@@ -403,8 +403,22 @@ class MclientTestResult(TestCaseResult, 
 self.fail(msg)
 return self
 
-def assertDataResultMatch(self, data=[], index=None):
-raise NotImplementedError
+def assertDataResultMatch(self, expected):
+data = list(filter(filter_junk, self.data.split('\n')))
+data = list(filter(filter_headers, data))
+a, b = filter_matching_blocks(expected, data)
+diff = list(difflib.unified_diff(a, b, fromfile='expected', 
tofile='test'))
+if len(diff) > 0:
+err_file = self.test_case.err_file
+exp = '\n'.join(expected)
+got = '\n'.join(data)
+msg = "Output didn't match.\n"
+msg += f"Expected:\n{exp}\n"
+msg += f"Got:\n{got}\n"
+msg += "Diff:\n" + '\n'.join(s.rstrip() for s in diff)
+self.assertion_errors.append(AssertionError(msg))
+self.fail(msg)
+return self
 
 def assertValue(self, row, col, val):
 raise NotImplementedError
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: copybinary - SQLTestCase: add more quotes in .assertFa...

2020-12-23 Thread Joeri van Ruth

Changeset: dd15f1e82f81 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dd15f1e82f81
Modified Files:
testing/sqltest.py
Branch: copybinary
Log Message:

SQLTestCase:  add more quotes in .assertFailed


diffs (15 lines):

diff --git a/testing/sqltest.py b/testing/sqltest.py
--- a/testing/sqltest.py
+++ b/testing/sqltest.py
@@ -235,9 +235,9 @@ class TestCaseResult(object):
 if err_message:
 if self.err_message:
 if err_message.lower() != self.err_message.lower():
-msgs.append("expected to fail with error message {} 
but failed with error message {}".format(err_message, self.err_message))
+msgs.append("expected to fail with error message '{}' 
but failed with error message '{}'".format(err_message, self.err_message))
 else:
-msgs.append("expected to fail with error message {} but 
got {}".format(err_message, self.err_message))
+msgs.append("expected to fail with error message '{}' but 
got '{}'".format(err_message, self.err_message))
 if len(msgs) > 0:
 self.fail('\n'.join(msgs))
 return self
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approve dump output.

2020-12-23 Thread Sjoerd Mullender

Changeset: 83184459660e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83184459660e
Modified Files:
sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
sql/test/testdb-upgrade-chain/Tests/dump.stable.out
sql/test/testdb-upgrade-hge/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb/Tests/dump-nogeom.stable.out
Branch: default
Log Message:

Approve dump output.


diffs (50 lines):

diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out 
b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
@@ -1,5 +1,5 @@
 START TRANSACTION;
-CREATE USER "testuser" WITH ENCRYPTED PASSWORD 
'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00'
 NAME 'Test User' SCHEMA "sys";
+CREATE USER "testuser" WITH ENCRYPTED PASSWORD 
'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00'
 NAME 'Test User' SCHEMA "sys" SCHEMA PATH '"sys"';
 CREATE SCHEMA "testschema" AUTHORIZATION "testuser";
 ALTER USER "testuser" SET SCHEMA "testschema";
 CREATE SEQUENCE "testschema"."selfref_seq" AS INTEGER;
diff --git a/sql/test/testdb-upgrade-chain/Tests/dump.stable.out 
b/sql/test/testdb-upgrade-chain/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/dump.stable.out
@@ -1,5 +1,5 @@
 START TRANSACTION;
-CREATE USER "testuser" WITH ENCRYPTED PASSWORD 
'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00'
 NAME 'Test User' SCHEMA "sys";
+CREATE USER "testuser" WITH ENCRYPTED PASSWORD 
'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00'
 NAME 'Test User' SCHEMA "sys" SCHEMA PATH '"sys"';
 CREATE SCHEMA "testschema" AUTHORIZATION "testuser";
 ALTER USER "testuser" SET SCHEMA "testschema";
 CREATE SEQUENCE "testschema"."selfref_seq" AS INTEGER;
diff --git a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out 
b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade-hge/Tests/dump.stable.out
@@ -1,5 +1,5 @@
 START TRANSACTION;
-CREATE USER "testuser" WITH ENCRYPTED PASSWORD 
'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00'
 NAME 'Test User' SCHEMA "sys";
+CREATE USER "testuser" WITH ENCRYPTED PASSWORD 
'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00'
 NAME 'Test User' SCHEMA "sys" SCHEMA PATH '"sys"';
 CREATE SCHEMA "testschema" AUTHORIZATION "testuser";
 COMMENT ON SCHEMA "testschema" IS 'a schema used for testing';
 ALTER USER "testuser" SET SCHEMA "testschema";
diff --git a/sql/test/testdb-upgrade/Tests/dump.stable.out 
b/sql/test/testdb-upgrade/Tests/dump.stable.out
--- a/sql/test/testdb-upgrade/Tests/dump.stable.out
+++ b/sql/test/testdb-upgrade/Tests/dump.stable.out
@@ -1,5 +1,5 @@
 START TRANSACTION;
-CREATE USER "testuser" WITH ENCRYPTED PASSWORD 
'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00'
 NAME 'Test User' SCHEMA "sys";
+CREATE USER "testuser" WITH ENCRYPTED PASSWORD 
'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00'
 NAME 'Test User' SCHEMA "sys" SCHEMA PATH '"sys"';
 CREATE SCHEMA "testschema" AUTHORIZATION "testuser";
 COMMENT ON SCHEMA "testschema" IS 'a schema used for testing';
 ALTER USER "testuser" SET SCHEMA "testschema";
diff --git a/sql/test/testdb/Tests/dump-nogeom.stable.out 
b/sql/test/testdb/Tests/dump-nogeom.stable.out
--- a/sql/test/testdb/Tests/dump-nogeom.stable.out
+++ b/sql/test/testdb/Tests/dump-nogeom.stable.out
@@ -1,5 +1,5 @@
 START TRANSACTION;
-CREATE USER "testuser" WITH ENCRYPTED PASSWORD 
'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00'
 NAME 'Test User' SCHEMA "sys";
+CREATE USER "testuser" WITH ENCRYPTED PASSWORD 
'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00'
 NAME 'Test User' SCHEMA "sys" SCHEMA PATH '"sys"';
 CREATE SCHEMA "testschema" AUTHORIZATION "testuser";
 COMMENT ON SCHEMA "testschema" IS 'a schema used for testing';
 ALTER USER "testuser" SET SCHEMA "testschema";
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: unlock - fix compilation

2020-12-23 Thread Niels Nes

Changeset: 90644f3cee46 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=90644f3cee46
Modified Files:
sql/storage/bat/bat_storage.c
Branch: unlock
Log Message:

fix compilation


diffs (19 lines):

diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -1836,6 +1836,7 @@ tr_update_cs( sql_trans *tr, column_stor
BAT *cur = NULL;
 
(void)tr;
+   (void)end;
assert(ATOMIC_GET(_nr_active)==1);
assert (ocs->bid != 0 || tr != gtrans);
 
@@ -1925,6 +1926,7 @@ tr_merge_cs( sql_trans *tr, column_stora
BAT *cur = NULL;
 
(void)tr;
+   (void)end;
assert(ATOMIC_GET(_nr_active)==1);
assert (cs->bid != 0 || tr != gtrans);
 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Oct2020 - Fix Coverity model: no loop variable declarat...

MonetDB: Oct2020 - Modernize.

MonetDB: Oct2020 - Package (relatively) new files.

MonetDB: default - Merge with Oct2020 branch.

MonetDB: Oct2020 - Do not remove functions from the ABI.

MonetDB: default - Merge with Oct2020 branch.

MonetDB: Oct2020 - Updated links in mclient help.

MonetDB: default - The option to keep transients away from the d...

MonetDB: copybinary - Merge branch 'default' into 'copybinary'

MonetDB: copybinary - Use SQLTestCase in bincopy tests

MonetDB: copybinary - SQLTestCase: attempt to implement MclientT...

MonetDB: copybinary - SQLTestCase: add more quotes in .assertFa...

MonetDB: default - Approve dump output.

MonetDB: unlock - fix compilation

14 matches

Site Navigation

Mail list logo

Footer information