MonetDB: queryid2 - approved test output
Changeset: 72179ed3f8bd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72179ed3f8bd
Modified Files:
sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out
sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out.int128
sql/test/BugTracker-2009/Tests/set_and_arg_null.SF-2812729.stable.out
sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out
sql/test/Tests/identifiers.stable.out
sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py
sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out
sql/test/VOC/Tests/median.Bug-3096.stable.out
sql/test/pg_regress/Tests/date.stable.out
sql/test/pg_regress/Tests/strings.stable.out
sql/test/pg_regress/Tests/strings_concat.stable.out
Branch: queryid2
Log Message:
approved test output
diffs (truncated from 354 to 300 lines):
diff --git
a/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out
b/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out
---
a/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out
+++
b/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out
@@ -36,7 +36,7 @@ Ready.
% .L12 # table_name
% suma # name
% bigint # type
-% 20 # length
+% 1 # length
[ NULL ]
#SELECT SUM(a) AS suma
#FROM (
diff --git
a/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out.int128
b/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out.int128
---
a/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out.int128
+++
b/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out.int128
@@ -36,7 +36,7 @@ Ready.
% .L12 # table_name
% suma # name
% hugeint # type
-% 40 # length
+% 1 # length
[ NULL ]
#SELECT SUM(a) AS suma
#FROM (
diff --git
a/sql/test/BugTracker-2009/Tests/set_and_arg_null.SF-2812729.stable.out
b/sql/test/BugTracker-2009/Tests/set_and_arg_null.SF-2812729.stable.out
--- a/sql/test/BugTracker-2009/Tests/set_and_arg_null.SF-2812729.stable.out
+++ b/sql/test/BugTracker-2009/Tests/set_and_arg_null.SF-2812729.stable.out
@@ -34,7 +34,7 @@ Ready.
% .L2 # table_name
% L2 # name
% int # type
-% 11 # length
+% 1 # length
[ NULL ]
#create function call_function( aa int ) RETURNS int
#begin
@@ -46,7 +46,7 @@ Ready.
% .L2 # table_name
% L2 # name
% int # type
-% 11 # length
+% 1 # length
[ NULL ]
# 22:37:37 >
diff --git a/sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out
b/sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out
--- a/sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out
+++ b/sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out
@@ -37,7 +37,7 @@ Ready.
[ "€", 1 ]
#select 'Liever €uro' as "Liever euro";
% .L2 # table_name
-% Liever euro # name
+% "Liever euro" # name
% char # type
% 11 # length
[ "Liever €uro"]
diff --git a/sql/test/Tests/identifiers.stable.out
b/sql/test/Tests/identifiers.stable.out
--- a/sql/test/Tests/identifiers.stable.out
+++ b/sql/test/Tests/identifiers.stable.out
@@ -58,13 +58,13 @@ Ready.
#CREATE TABLE "B\"la\"" (id int); -- should fail
#SELECT 1 AS "B\"la\""; -- should fail
% .L2 # table_name
-% B\"la\" # name
+% "B\\\"la\\\"" # name
% tinyint # type
% 1 # length
[ 1]
#SELECT 1 AS "\"Bla\""; -- should fail
% .L2 # table_name
-% \"Bla\" # name
+% "\\\"Bla\\\"" # name
% tinyint # type
% 1 # length
[ 1]
diff --git a/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py
b/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py
--- a/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py
+++ b/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py
@@ -19,7 +19,7 @@ def query(conn, sql):
try:
cur.execute(sql)
except pymonetdb.OperationalError, e:
-print e
+print "!", e
return
r = cur.fetchall()
cur.close()
@@ -30,9 +30,10 @@ def run(conn, sql):
try:
r = conn.execute(sql)
except pymonetdb.OperationalError, e:
-print e
+print "!", e
return
-print(r)
+print '# OK'
+
c1 = connect('monetdb', 'monetdb')
# Create a new schema with a new table.
diff --git a/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out
b/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out
--- a/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out
+++ b/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out
@@ -59,57 +59,43 @@ Ready.
# 10:44:34 >
CREATE SCHEMA new_schema_as_well
-&3
-
+# OK
SET SCHEMA new_schema_as_well
-&4 t
-
+# OK
CREATE TABLE test (x int, y int)
-&3
-
+# OK
INSERT INTO test VALUES (-1, -1)
-&2 1 -1
-
+# OK
CREATE USER
MonetDB: queryid2 - merge with default
Changeset: 3de277fe54c3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=3Dchangeset;node=3D3de277fe54c3
Removed Files:
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out=
.32bit
Modified Files:
monetdb5/mal/mal_function.c
monetdb5/mal/mal_profiler.c
monetdb5/tools/Tests/mserver5--help.bat
monetdb5/tools/Tests/mserver5--help.stable.err.Windows
sql/backends/monet5/UDF/pyapi/convert_loops.h
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Darwin
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2017/Tests/sqlsmith02.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith03.stable.out
Branch: queryid2
Log Message:
merge with default
diffs (truncated from 414 to 300 lines):
diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c
--- a/monetdb5/mal/mal_function.c
+++ b/monetdb5/mal/mal_function.c
@@ -924,7 +924,7 @@ showFlowDetails(MalBlkPtr mb, MalStkPtr=20
{
(void) mb; /* fool the compiler */
(void) stk; /* fool the compiler */
- mnstr_printf(f, "n%d [fontsize=3D8, shape=3Dbox, label=3D\"%s\"]\n",
pc, =
getFunctionId(p));
+ mnstr_printf(f, "n%d [fontsize=3D8, shape=3Dbox, label=3D\"%s\"]\n",
pc, =
getFunctionId(p) ? getFunctionId(p) : "");
}
=20
/* Produce a file with the flow graph in dot format.
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -125,7 +125,7 @@ renderProfilerEvent(MalBlkPtr mb, MalStk
if( usrname)
logadd("\"user\":\"%s\",%s",usrname, prettify);
logadd("\"clk\":"LLFMT",%s",usec,prettify);
- logadd("\"ctime\":"LLFMT".%06ld\",%s", clock / 100, (long) (clock %
1=
00), prettify);
+ logadd("\"ctime\":"LLFMT".%06ld,%s", clock / 100, (long) (clock %
100=
), prettify);
logadd("\"thread\":%d,%s", THRgettid(),prettify);
=20
logadd("\"function\":\"%s.%s\",%s", getModuleId(getInstrPtr(mb, 0)),
getF=
unctionId(getInstrPtr(mb, 0)), prettify);
@@ -400,7 +400,7 @@ profilerHeartbeatEvent(char *alter)
lognew();
logadd("{%s",prettify); // fill in later with the event counter
logadd("\"user\":\"heartbeat\",%s", prettify);
- logadd("\"ctime\":"LLFMT".%06ld\",%s", clock / 100, (long) (clock %
1=
00), prettify);
+ logadd("\"ctime\":"LLFMT".%06ld,%s", clock / 100, (long) (clock %
100=
), prettify);
logadd("\"rss\":"SZFMT ",%s", MT_getrss()/1024/1024, prettify);
#ifdef HAVE_SYS_RESOURCE_H
getrusage(RUSAGE_SELF, );
diff --git a/monetdb5/tools/Tests/mserver5--help.bat b/monetdb5/tools/Tests=
/mserver5--help.bat
--- a/monetdb5/tools/Tests/mserver5--help.bat
+++ b/monetdb5/tools/Tests/mserver5--help.bat
@@ -1,4 +1,4 @@
@echo on
@prompt # $t $g =20
=20
- %MTIMEOUT% mserver5 --help
+ %MTIMEOUT% mserver5.exe --help
diff --git a/monetdb5/tools/Tests/mserver5--help.stable.err.Windows b/monet=
db5/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
@@ -5,11 +5,6 @@ stderr of test 'mserver5--help` in direc
# 16:36:12 > Mtimeout -timeout 300 ./mserver5--help mserver5--help=20
# 16:36:12 > =20
=20
-
-# 16:36:12 > =20
-# 16:36:12 > Mtimeout -timeout 60 mserver5 --config=3D --help
-# 16:36:12 > =20
-
Usage: mserver5.exe [options] [scripts]
--dbpath=3D Specify database location
--dbextra=3D Directory for transient BATs
diff --git a/sql/backends/monet5/UDF/pyapi/convert_loops.h b/sql/backends/m=
onet5/UDF/pyapi/convert_loops.h
--- a/sql/backends/monet5/UDF/pyapi/convert_loops.h
+++ b/sql/backends/monet5/UDF/pyapi/convert_loops.h
@@ -24,6 +24,37 @@
=20
// This #define creates a new BAT with the internal data and mask from a N=
umpy array, without copying the data
// 'bat' is a BAT* pointer, which will contain the new BAT. TYPE_'mtpe' is=
the BAT type, and 'batstore' is the heap storage type of the BAT (this sho=
uld be STORE_CMEM or STORE_SHARED)
+#if defined(_MSC_VER) && _MSC_VER <=3D 1600
+#define isnan(x) _isnan(x)
+#endif
+
+#define nancheck_flt(bat)
\
+ do {\
+ for (iu =3D 0; iu < ret->count; iu++) { \
+ if (isnan(((flt*)data)[index_offset * ret->count +
iu])) { \
+ ((flt*)data)[index_offset * ret->count + iu]
=3D flt_nil; \
+ bat->tnil =3D 1;
\
+ } \
+ } \
+
MonetDB: wlcr - Compilation issue and documentation
Changeset: 4028c8c55731 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4028c8c55731 Modified Files: monetdb5/modules/mal/wlcr.c sql/backends/monet5/sql_wlcr.c sql/backends/monet5/sql_wlcr.mal Branch: wlcr Log Message: Compilation issue and documentation diffs (139 lines): diff --git a/monetdb5/modules/mal/wlcr.c b/monetdb5/modules/mal/wlcr.c --- a/monetdb5/modules/mal/wlcr.c +++ b/monetdb5/modules/mal/wlcr.c @@ -20,15 +20,17 @@ * * For REPLICATION, also called a database clone or slave, we take a snapshot and the * log files that reflect the recent changes. The log updates are replayed against - * the snapshot until a specific time point is reached. + * the snapshot until a specific time point or transaction id is reached. * * Some systems also use the logical logs to REPLAY all (expensive) queries - * against the database. + * against the database. We skip this for the time being. * * The goal of this module is to ease BACKUP and REPPLICATION of a master database * with a time-bounded delay. * Such a clone is a database replica that aid in query workload sharing, * database versioning, and (re-)partitioning. + * Tables taken from the master version are not protected against local updates. + * However, any transaction being replay that fails finalizes the cloning process. * * Simplicity and ease of end-user control has been the driving argument here. * @@ -39,9 +41,9 @@ * * A database can be set into 'master' mode only once using the SQL command: * CALL master() - * An alternative path to the log records can be given to reduce the storage cost, + * An alternative path to the log records can be given to reduce the IO latency, * e.g. a nearby SSD. - * By default, it creates a directory .../dbfarm/dbname/master to hold all + * By default, it creates a directory .../dbfarm/dbname/wlcr_logs to hold all * necessary information for the creation of a database clone. * * A master configuration file is added to the database directory to keep the state/ @@ -59,32 +61,32 @@ * Each wlcr log file contains a serial log of committed compound transactions. * The log records are represented as ordinary MAL statement blocks, which * are executed in serial mode. (parallelism can be considered for large updates later) - * Each transaction job is identified by the owner of the query, its starting time and runtime (in ms). + * Each transaction job is identified by a unique id, its starting time, and the user responsible.. * The log-record should end with a commit. * * A transaction log is created by the master. He decides when the log may be globally used. - * The trigger for this is the allowed 'drift'. A new transaction log is created when + * The trigger for this is the allowed 'drift'. A new transaction log file is published when * the system has been collecting logs for some time (drift in seconds). * The drift determines the maximal window of transactions loss that is permitted. * The maximum drift can be set using a SQL command, e.g. - * CALL drift(duration) + * CALL setmasterdrift(duration) * Setting it to zero leads to a log file per transaction and may cause a large log directory. - * A default of 5 minutes should balance polling overhead. + * A default of 5 minutes should balance polling overhead in most practical situations. * * A minor problem here is that we should ensure that the log file is closed even if there * are no transactions running. It is solved with a separate monitor thread, which ensures * that the logs are flushed at least after 'drift' seconds since the first logrecord was created. * After closing, the replicas can see from the master configuration file that a new log batch is available. * - * The final step is to close stop ransaction logging with the command - * CALL stopmaster. + * The final step is to close stop transaction logging with the command + * CALL stopmaster(). * It typically is the end-of-life-time for a snapshot. For example, when planning to do * a large bulk load of the database, stopping logging avoids a double write into the * database. The database can be brought back into wlcr mode using a fresh snapshot. * *[TODO] A more secure way to set a database into master mode is to use the command * monetdb master [ ] - * which locks the database, takes a save copy, initializes the state chance. + * which locks the database, takes a save copy, initializes the state chance to master. * * A fresh replica can be constructed as follows: * monetdb replicate @@ -105,16 +107,16 @@ * The clone process will iterate in the background through the log files, * applying all update transactions. * - * An optional timestamp or transaction id can be added to apply the logs until - * a given moment. This is particularly handy when an unexpected - * desastrous user action (drop persisten table) has to be
MonetDB: default - Approve test
Changeset: 867b53470654 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=867b53470654 Modified Files: sql/test/BugTracker-2017/Tests/sqlsmith02.stable.out sql/test/BugTracker-2017/Tests/sqlsmith03.stable.out Branch: default Log Message: Approve test diffs (109 lines): diff --git a/sql/test/BugTracker-2017/Tests/sqlsmith02.stable.out b/sql/test/BugTracker-2017/Tests/sqlsmith02.stable.out --- a/sql/test/BugTracker-2017/Tests/sqlsmith02.stable.out +++ b/sql/test/BugTracker-2017/Tests/sqlsmith02.stable.out @@ -1,1 +1,49 @@ -Causes a crash +stdout of test 'sqlsmith02` in directory 'sql/test/BugTracker-2017` itself: + + +# 23:02:59 > +# 23:02:59 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30090" "--set" "mapi_usock=/var/tmp/mtest-6840/.s.monetdb.30090" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_sql_test_BugTracker-2017" +# 23:02:59 > + +# MonetDB 5 server v11.26.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2017', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 15.589 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:30090/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-6840/.s.monetdb.30090 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. + +# 23:03:00 > +# 23:03:00 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-6840" "--port=30090" +# 23:03:00 > + +#select +# ref_78.mod as c0, +# ref_79.name as c1 +#from +# sys.columns as ref_38 +#right join sys.args as ref_72 +#right join sys.spatial_ref_sys as ref_75 +#right join sys.geometry_columns as ref_76 +#on (ref_75.proj4text = ref_76.f_table_schema ) +# right join sys.spatial_ref_sys as ref_77 +#inner join sys.functions as ref_78 +#on (ref_77.proj4text = ref_78.name ) +# on (ref_76.srid = ref_78.id ) +#on (ref_72.id = ref_75.srid ) +% .L136, .L140 # table_name +% c0, c1 # name +% varchar, varchar # type +% 0, 0 # length + +# 23:03:00 > +# 23:03:00 > "Done." +# 23:03:00 > + diff --git a/sql/test/BugTracker-2017/Tests/sqlsmith03.stable.out b/sql/test/BugTracker-2017/Tests/sqlsmith03.stable.out --- a/sql/test/BugTracker-2017/Tests/sqlsmith03.stable.out +++ b/sql/test/BugTracker-2017/Tests/sqlsmith03.stable.out @@ -1,1 +1,50 @@ -Causes a crash +stdout of test 'sqlsmith03` in directory 'sql/test/BugTracker-2017` itself: + + +# 23:03:00 > +# 23:03:00 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30090" "--set" "mapi_usock=/var/tmp/mtest-6840/.s.monetdb.30090" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_sql_test_BugTracker-2017" +# 23:03:00 > + +# MonetDB 5 server v11.26.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2017', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 15.589 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:30090/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-6840/.s.monetdb.30090 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. + +# 23:03:00 > +# 23:03:00 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-6840" "--port=30090" +# 23:03:00 > + +#select +# 8 as c0 +#from +# tmp.keys as ref_68 +# left join sys.auths as ref_70 +#inner join sys._columns as ref_86 +#inner join tmp.keys as ref_101 +#inner join sys.querylog_calls as ref_102 +#on (ref_101.type = ref_102.cpu ) +# inner join sys.idxs as ref_103 +# on (ref_102.io = ref_103.id ) +#on (ref_86.table_id = ref_102.cpu ) +# right join sys.privileges as ref_111 +# left join sys.systemfunctions as ref_112 +#left join sys.querylog_calls as ref_113 +% .L152 # table_name +% c0 # name +% tinyint # type +% 1 # length + +# 23:03:00 > +# 23:03:00 > "Done." +# 23:03:00 > + ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: wlcr - Merge with default
Changeset: e408f7a23d3f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e408f7a23d3f Added Files: monetdb5/extras/rapi/Tests/rapi02.stable.out.int128 sql/backends/monet5/Tests/int_notation_1e5.stable.out.int128 sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_huge.stable.out.int128 sql/jdbc/tests/Tests/Test_Int128.stable.out.int128 sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.out.int128 sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out.int128 sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out.int128 sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.sql sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.stable.err sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.stable.out sql/test/BugTracker-2017/Tests/dce_bug-6177.sql sql/test/BugTracker-2017/Tests/dce_bug-6177.stable.err sql/test/BugTracker-2017/Tests/dce_bug-6177.stable.out sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out.int128 sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.sql sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.err sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.out sql/test/BugTracker-2017/Tests/sqlsmith01.sql sql/test/BugTracker-2017/Tests/sqlsmith01.stable.out sql/test/BugTracker-2017/Tests/sqlsmith02.sql sql/test/BugTracker-2017/Tests/sqlsmith02.stable.out sql/test/BugTracker-2017/Tests/sqlsmith03.sql sql/test/BugTracker-2017/Tests/sqlsmith03.stable.out sql/test/BugTracker-2017/Tests/sqlsmith04.sql sql/test/BugTracker-2017/Tests/sqlsmith04.stable.out sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.sql sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.stable.err sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.stable.out sql/test/emptydb/Tests/check.SQL.py sql/test/mapi/Tests/mal_int128.stable.out.int128 sql/test/mapi/Tests/perl_dec38.stable.out.int128 sql/test/mapi/Tests/perl_int128.stable.out.int128 sql/test/mapi/Tests/php_dec38.stable.out.int128 sql/test/mapi/Tests/php_int128.stable.out.int128 sql/test/mapi/Tests/python2_dec38.stable.out.int128 sql/test/mapi/Tests/python2_int128.stable.out.int128 sql/test/mapi/Tests/python3_dec38.stable.out.int128 sql/test/mapi/Tests/python3_int128.stable.out.int128 sql/test/mapi/Tests/sql_dec38.stable.out.int128 sql/test/mapi/Tests/sql_int128.stable.out.int128 sql/test/mergetables/Tests/addtable.sql sql/test/mergetables/Tests/addtable.stable.err sql/test/mergetables/Tests/addtable.stable.out sql/test/pg_regress/Tests/numeric.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/package.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/unpackage.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb/Tests/testdb-package-hge.stable.out.int128 Removed Files: clients/Tests/SQL-dump.SQL.py clients/Tests/SQL-dump.stable.err clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 gdk/bat.feps gdk/bat.png gdk/bat1.feps gdk/bat1.png gdk/bat2.feps gdk/bat2.png monetdb5/extras/rapi/Tests/rapi02.stable.out sql/backends/monet5/Tests/int_notation_1e5.stable.out sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_huge.stable.out sql/jdbc/tests/Tests/Test_Int128.stable.out sql/storage/store_connections.c sql/storage/store_connections.h sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.err.single sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out.single sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.out sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out.single sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/Connections/Tests/All sql/test/Connections/Tests/connections.py
MonetDB: wlcr - A new, simplified replication interface.
Changeset: 6d5dbd832675 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d5dbd832675
Modified Files:
monetdb5/mal/Makefile.ag
monetdb5/mal/mal.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/modules/mal/wlcr.c
monetdb5/modules/mal/wlcr.h
monetdb5/modules/mal/wlcr.mal
monetdb5/optimizer/opt_wlcr.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_wlcr.c
sql/backends/monet5/sql_wlcr.h
sql/backends/monet5/sql_wlcr.mal
sql/scripts/60_wlcr.sql
sql/test/wlcr/Tests/All
sql/test/wlcr/Tests/wlc01.py
sql/test/wlcr/Tests/wlr01.py
sql/test/wlcr/Tests/wlr01.stable.err
sql/test/wlcr/Tests/wlr01.stable.out
sql/test/wlcr/Tests/wlr20.py
sql/test/wlcr/Tests/wlr20.stable.err
sql/test/wlcr/Tests/wlr20.stable.out
sql/test/wlcr/Tests/wlr30.py
sql/test/wlcr/Tests/wlr40.py
Branch: wlcr
Log Message:
A new, simplified replication interface.
- the replication process can be controlled by the transaction id
- masterClock(), replicaClock(), replicaBacklog() to inspect state.
- focus on update queries only.
diffs (truncated from 2251 to 300 lines):
diff --git a/monetdb5/mal/Makefile.ag b/monetdb5/mal/Makefile.ag
--- a/monetdb5/mal/Makefile.ag
+++ b/monetdb5/mal/Makefile.ag
@@ -10,6 +10,7 @@ INCLUDES = ../../common/options \
../../clients/mapilib \
../../gdk \
../optimizer \
+ ../modules/mal \
$(openssl_CFLAGS)
MTSAFE
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -36,6 +36,7 @@ int have_hge;
#include "mal_runtime.h"
#include "mal_resource.h"
#include "opt_statistics.h"
+#include "wlcr.h"
MT_Lock mal_contextLock MT_LOCK_INITIALIZER("mal_contextLock");
MT_Lock mal_namespaceLock MT_LOCK_INITIALIZER("mal_namespaceLock");
@@ -124,6 +125,7 @@ void mserver_reset(int exit)
str err = 0;
GDKprepareExit();
+ WLCreset();
MCstopClients(0);
setHeartbeat(-1);
stopProfiler();
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -243,7 +243,6 @@ MCinitClientRecord(Client c, oid user, b
c->exception_buf_initialized = 0;
c->error_row = c->error_fld = c->error_msg = c->error_input = NULL;
c->wlcr_kind = 0;
- c->wlcr_mode = 0;
c->wlcr = NULL;
#ifndef HAVE_EMBEDDED /* no authentication in embedded mode */
{
@@ -400,7 +399,6 @@ freeClient(Client c)
if( c->wlcr)
freeMalBlk(c->wlcr);
c->wlcr_kind = 0;
- c->wlcr_mode = 0;
c->wlcr = NULL;
}
if (t)
diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -177,7 +177,6 @@ typedef struct CLIENT {
* This allows a single server to act as both a master and a replica.
*/
int wlcr_kind; // used by master to characterise the compound
transaction
- int wlcr_mode; // used by replica to control rerunning the transaction
MalBlkPtr wlcr;
/*
diff --git a/monetdb5/modules/mal/wlcr.c b/monetdb5/modules/mal/wlcr.c
--- a/monetdb5/modules/mal/wlcr.c
+++ b/monetdb5/modules/mal/wlcr.c
@@ -9,118 +9,127 @@
/*
* (c) 2017 Martin Kersten
* This module collects the workload-capture-replay statements during
transaction execution,
- * also known as asynchronous logical replication management.
+ * also known as asynchronous logical replication management. It can be used
for
+ * multiple purposes: BACKUP, REPLICATION, and REPLAY
*
- * The goal is to easily clone a master database.
+ * For a BACKUP we need either a complete update log from the beginning, or
+ * a binary snapshot with a collection of logs recording its changes since.
+ * To ensure transaction ACID properties, the log record should be stored on
+ * disk within the transaction brackets, which may cause a serious IO load.
+ * (Tip, store these logs files on an SSD or NVM)
*
+ * For REPLICATION, also called a database clone or slave, we take a snapshot
and the
+ * log files that reflect the recent changes. The log updates are replayed
against
+ * the snapshot until a specific time point is reached.
+ *
+ * Some systems also use the logical logs to REPLAY all (expensive) queries
+ * against the database.
+ *
+ * The goal of this module is to ease BACKUP and REPPLICATION of a master
database
+ * with a time-bounded delay.
+ * Such a clone is a database replica that aid in query workload sharing,
+ * database versioning, and (re-)partitioning.
+ *
+ * Simplicity and ease of end-user control has been the driving argument here.
*
* IMPLEMENTATION
* The
MonetDB: Dec2016 - Update script.
Changeset: b1c8242ef41e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b1c8242ef41e
Modified Files:
sql/test/emptydb/updatetests
Branch: Dec2016
Log Message:
Update script.
diffs (21 lines):
diff --git a/sql/test/emptydb/updatetests b/sql/test/emptydb/updatetests
--- a/sql/test/emptydb/updatetests
+++ b/sql/test/emptydb/updatetests
@@ -3,7 +3,7 @@
case $# in
1)
-if [ -d "$1" ] && [ -f "$1"/Tests/load.sql ] && [ -f
"$1"/Tests/check.SQL.py.src ]; then
+if [ -d "$1" ] && [ -f "$1"/Tests/load.sql ] && [ -f
"$1"/Tests/check.SQL.py ]; then
cd "$1" || exit 1
else
echo "bad argument"
@@ -14,7 +14,7 @@ 0)
case $0 in
*/*) cd ${0%/*};;
esac
-if [ -f Tests/load.sql ] && [ -f Tests/check.SQL.py.src ]; then
+if [ -f Tests/load.sql ] && [ -f Tests/check.SQL.py ]; then
:
else
echo "bad directory"
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Remove incorrectly left in escaped quote
Changeset: ed926aa83a70 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed926aa83a70
Modified Files:
monetdb5/mal/mal_profiler.c
Branch: default
Log Message:
Remove incorrectly left in escaped quote
diffs (21 lines):
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -125,7 +125,7 @@ renderProfilerEvent(MalBlkPtr mb, MalStk
if( usrname)
logadd("\"user\":\"%s\",%s",usrname, prettify);
logadd("\"clk\":"LLFMT",%s",usec,prettify);
- logadd("\"ctime\":"LLFMT".%06ld\",%s", clock / 100, (long) (clock %
100), prettify);
+ logadd("\"ctime\":"LLFMT".%06ld,%s", clock / 100, (long) (clock %
100), prettify);
logadd("\"thread\":%d,%s", THRgettid(),prettify);
logadd("\"function\":\"%s.%s\",%s", getModuleId(getInstrPtr(mb, 0)),
getFunctionId(getInstrPtr(mb, 0)), prettify);
@@ -400,7 +400,7 @@ profilerHeartbeatEvent(char *alter)
lognew();
logadd("{%s",prettify); // fill in later with the event counter
logadd("\"user\":\"heartbeat\",%s", prettify);
- logadd("\"ctime\":"LLFMT".%06ld\",%s", clock / 100, (long) (clock %
100), prettify);
+ logadd("\"ctime\":"LLFMT".%06ld,%s", clock / 100, (long) (clock %
100), prettify);
logadd("\"rss\":"SZFMT ",%s", MT_getrss()/1024/1024, prettify);
#ifdef HAVE_SYS_RESOURCE_H
getrusage(RUSAGE_SELF, );
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Dec2016 branch.
Changeset: 771b92d1b410 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=771b92d1b410
Modified Files:
monetdb5/mal/mal_function.c
sql/backends/monet5/UDF/pyapi/convert_loops.h
sql/test/BugTracker-2017/Tests/All
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (75 lines):
diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c
--- a/monetdb5/mal/mal_function.c
+++ b/monetdb5/mal/mal_function.c
@@ -924,7 +924,7 @@ showFlowDetails(MalBlkPtr mb, MalStkPtr
{
(void) mb; /* fool the compiler */
(void) stk; /* fool the compiler */
- mnstr_printf(f, "n%d [fontsize=8, shape=box, label=\"%s\"]\n", pc,
getFunctionId(p));
+ mnstr_printf(f, "n%d [fontsize=8, shape=box, label=\"%s\"]\n", pc,
getFunctionId(p) ? getFunctionId(p) : "");
}
/* Produce a file with the flow graph in dot format.
diff --git a/sql/backends/monet5/UDF/pyapi/convert_loops.h
b/sql/backends/monet5/UDF/pyapi/convert_loops.h
--- a/sql/backends/monet5/UDF/pyapi/convert_loops.h
+++ b/sql/backends/monet5/UDF/pyapi/convert_loops.h
@@ -171,6 +171,34 @@
}
\
}
\
} }
+#define NP_COL_BAT_LOOPF(bat, mtpe_to, mtpe_from,index) {
\
+if (mask == NULL)
\
+{
\
+for (iu = 0; iu < ret->count; iu++)
\
+{
\
+if (isnan(((mtpe_from*)data)[index_offset * ret->count + iu])) {
\
+ bat->tnil = 1;
\
+((mtpe_to*) Tloc(bat, 0))[index + iu] = mtpe_to##_nil;
\
+} else {
\
+((mtpe_to*) Tloc(bat, 0))[index + iu] =
(mtpe_to)((mtpe_from*)data)[index_offset * ret->count + iu];
\
+}
\
+}
\
+}
\
+else
\
+{
\
+for (iu = 0; iu < ret->count; iu++)
\
+{
\
+if (mask[index_offset * ret->count + iu] == TRUE ||
isnan(((mtpe_from*)data)[index_offset * ret->count + iu]))
\
+{
\
+bat->tnil = 1;
\
+((mtpe_to*) Tloc(bat, 0))[index + iu] = mtpe_to##_nil;
\
+}
\
+else
\
+{
MonetDB: default - Remove now unnecessary test output.
Changeset: 5afb6c6dc8cb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5afb6c6dc8cb
Removed Files:
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
Branch: default
Log Message:
Remove now unnecessary test output.
diffs (107 lines):
diff --git
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
b/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
deleted file mode 100644
---
a/sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
+++ /dev/null
@@ -1,102 +0,0 @@
-stdout of test 'group-by_ordered_column.Bug-2564` in directory
'sql/test/BugTracker-2010` itself:
-
-
-# 19:36:51 >
-# 19:36:51 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Jun2010/prefix.--enable-strict_--disable-optimize_--enable-debug_--enable-assert/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=30272 --set
xrpc_port=42483 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
-# 19:36:51 >
-
-# MonetDB server v5.20.3, based on kernel v1.38.2
-# Serving database 'mTests_src_test_BugTracker-2010', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 7.751 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://rig.ins.cwi.nl:30272/
-# MonetDB/SQL module v2.38.3 loaded
-# MonetDB/GIS module v0.18.1 loaded
-
-Ready.
-
-
-# 19:36:51 >
-# 19:36:51 > mclient -lsql -ftest -i -e --host=rig --port=30272
-# 19:36:51 >
-
-[ 1]
-[ 1]
-[ 1]
-#select * from t2564;
-% sys.t2564, sys.t2564, sys.t2564 # table_name
-% c1, c2, c3 # name
-% int, int,int # type
-% 1, 1, 1 # length
-[ 3, 1, 2 ]
-[ 1, 2, 1 ]
-[ 2, 3, 3 ]
-#explain select count(*) from t2564 group by c1, c2, c3;
-% .explain # table_name
-% mal # name
-% clob # type
-% 116 # length
-function user.s10_1():void;
-X_0:void := querylog.define("explain select count(*) from t2564 group by
c1, c2, c3;","sequential_pipe",19:int);
-X_43 := bat.new(nil:str);
-X_49 := bat.new(nil:int);
-X_47 := bat.new(nil:int);
-X_46 := bat.new(nil:str);
-X_45 := bat.new(nil:str);
-X_3 := sql.mvc();
-C_4:bat[:oid] := sql.tid(X_3,"sys","t2564");
-X_7:bat[:int] := sql.bind(X_3,"sys","t2564","c3",0:int);
-X_16 := algebra.projection(C_4,X_7);
-X_17:bat[:int] := sql.bind(X_3,"sys","t2564","c1",0:int);
-X_23 := algebra.projection(C_4,X_17);
-X_24:bat[:int] := sql.bind(X_3,"sys","t2564","c2",0:int);
-X_30 := algebra.projection(C_4,X_24);
-(X_31,C1_32,r2_32) := group.subgroup(X_30);
-(X_34,C1_35,r2_35) := group.subgroup(X_23,X_31);
-(X_37,C1_38,r2_38) := group.subgroupdone(X_16,X_34);
-X_40:bat[:lng] := aggr.subcount(X_37,X_37,C1_38,false);
-X_50 := bat.append(X_43,"sys.L3");
-X_52 := bat.append(X_45,"L2");
-X_54 := bat.append(X_46,"bigint");
-X_56 := bat.append(X_47,64:int);
-X_58 := bat.append(X_49,0:int);
-sql.resultSet(X_50,X_52,X_54,X_56,X_58,X_40);
-end user.s10_1;
-#inline actions= 0 time=1 usec
-#remapactions= 0 time=4 usec
-#costmodelactions= 1 time=2 usec
-#coercion actions= 0 time=2 usec
-#evaluate actions= 0 time=4 usec
-#emptybindactions= 9 time=37 usec
-#aliases actions= 3 time=11 usec
-#mergetable actions= 0 time=44 usec
-#deadcode actions= 9 time=11 usec
-#aliases actions= 0 time=7 usec
-#constantsactions= 2 time=8 usec
-#commonTerms actions= 0 time=7 usec
-#projectionpath actions= 0 time=5 usec
-#reorder actions= 1 time=35 usec
-#deadcode actions= 0 time=8 usec
-#reduce actions=37 time=14 usec
-#matpack actions= 0 time=4 usec
-#multiplexactions= 0 time=3 usec
-#profiler actions= 1 time=4 usec
-#candidates actions= 1 time=1 usec
-#garbagecollector actions= 1 time=20
MonetDB: Dec2016 - Protect against missing function name.
Changeset: 65cc98087cfc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65cc98087cfc
Modified Files:
monetdb5/mal/mal_function.c
Branch: Dec2016
Log Message:
Protect against missing function name.
diffs (12 lines):
diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c
--- a/monetdb5/mal/mal_function.c
+++ b/monetdb5/mal/mal_function.c
@@ -924,7 +924,7 @@ showFlowDetails(MalBlkPtr mb, MalStkPtr
{
(void) mb; /* fool the compiler */
(void) stk; /* fool the compiler */
- mnstr_printf(f, "n%d [fontsize=8, shape=box, label=\"%s\"]\n", pc,
getFunctionId(p));
+ mnstr_printf(f, "n%d [fontsize=8, shape=box, label=\"%s\"]\n", pc,
getFunctionId(p) ? getFunctionId(p) : "");
}
/* the stethoscope needs dot files for its graphical interface.
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Dec2016 - Translate NaN to nil.
Changeset: 5a68df90e4da for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a68df90e4da
Modified Files:
sql/backends/monet5/UDF/pyapi/convert_loops.h
Branch: Dec2016
Log Message:
Translate NaN to nil.
diffs (51 lines):
diff --git a/sql/backends/monet5/UDF/pyapi/convert_loops.h
b/sql/backends/monet5/UDF/pyapi/convert_loops.h
--- a/sql/backends/monet5/UDF/pyapi/convert_loops.h
+++ b/sql/backends/monet5/UDF/pyapi/convert_loops.h
@@ -165,6 +165,34 @@
}
\
}
\
} }
+#define NP_COL_BAT_LOOPF(bat, mtpe_to, mtpe_from,index) {
\
+if (mask == NULL)
\
+{
\
+for (iu = 0; iu < ret->count; iu++)
\
+{
\
+if (isnan(((mtpe_from*)data)[index_offset * ret->count + iu])) {
\
+ bat->tnil = 1;
\
+((mtpe_to*) Tloc(bat, 0))[index + iu] = mtpe_to##_nil;
\
+} else {
\
+((mtpe_to*) Tloc(bat, 0))[index + iu] =
(mtpe_to)((mtpe_from*)data)[index_offset * ret->count + iu];
\
+}
\
+}
\
+}
\
+else
\
+{
\
+for (iu = 0; iu < ret->count; iu++)
\
+{
\
+if (mask[index_offset * ret->count + iu] == TRUE ||
isnan(((mtpe_from*)data)[index_offset * ret->count + iu]))
\
+{
\
+bat->tnil = 1;
\
+((mtpe_to*) Tloc(bat, 0))[index + iu] = mtpe_to##_nil;
\
+}
\
+else
\
+{
\
+((mtpe_to*) Tloc(bat, 0))[index + iu] =
(mtpe_to)(*(mtpe_from*)([(index_offset * ret->count + iu) *
ret->memory_size]));\
+}
\
+}
\
+} }
// This #define converts a Numpy Array to a BAT by copying the internal data
to the BAT. It converts the data from the Numpy Array to the BAT using a
function
// This function has to have the
MonetDB: Dec2016 - Tests requires netcdf.
Changeset: 4ac929cbfe2b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ac929cbfe2b Modified Files: sql/test/BugTracker-2017/Tests/All Branch: Dec2016 Log Message: Tests requires netcdf. diffs (12 lines): diff --git a/sql/test/BugTracker-2017/Tests/All b/sql/test/BugTracker-2017/Tests/All --- a/sql/test/BugTracker-2017/Tests/All +++ b/sql/test/BugTracker-2017/Tests/All @@ -15,7 +15,7 @@ complicated_logic.Bug-105 crash_on_count_div_count.Bug-6201 oidx-on-strings.Bug-6202 group-by-on-constant.Bug-6082 -rel2bin_project-assert.Bug-6080 +HAVE_NETCDF?rel2bin_project-assert.Bug-6080 str2decimal.Bug-6202 integer_addition_overflow.Bug-6205 dce_bug-6177 ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Dec2016
Changeset: 0e6c17fca3ca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=3Dchangeset;node=3D0e6c17fca3ca
Modified Files:
monetdb5/tools/Tests/mserver5--help.bat
monetdb5/tools/Tests/mserver5--help.stable.err.Windows
sql/backends/monet5/UDF/pyapi/convert_loops.h
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Darwin
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows
Branch: default
Log Message:
Merge with Dec2016
diffs (105 lines):
diff --git a/monetdb5/tools/Tests/mserver5--help.bat b/monetdb5/tools/Tests=
/mserver5--help.bat
--- a/monetdb5/tools/Tests/mserver5--help.bat
+++ b/monetdb5/tools/Tests/mserver5--help.bat
@@ -1,4 +1,4 @@
@echo on
@prompt # $t $g =20
=20
- %MTIMEOUT% mserver5 --help
+ %MTIMEOUT% mserver5.exe --help
diff --git a/monetdb5/tools/Tests/mserver5--help.stable.err.Windows b/monet=
db5/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
@@ -5,11 +5,6 @@ stderr of test 'mserver5--help` in direc
# 16:36:12 > Mtimeout -timeout 300 ./mserver5--help mserver5--help=20
# 16:36:12 > =20
=20
-
-# 16:36:12 > =20
-# 16:36:12 > Mtimeout -timeout 60 mserver5 --config=3D --help
-# 16:36:12 > =20
-
Usage: mserver5.exe [options] [scripts]
--dbpath=3D Specify database location
--dbextra=3D Directory for transient BATs
diff --git a/sql/backends/monet5/UDF/pyapi/convert_loops.h b/sql/backends/m=
onet5/UDF/pyapi/convert_loops.h
--- a/sql/backends/monet5/UDF/pyapi/convert_loops.h
+++ b/sql/backends/monet5/UDF/pyapi/convert_loops.h
@@ -24,6 +24,37 @@
=20
// This #define creates a new BAT with the internal data and mask from a N=
umpy array, without copying the data
// 'bat' is a BAT* pointer, which will contain the new BAT. TYPE_'mtpe' is=
the BAT type, and 'batstore' is the heap storage type of the BAT (this sho=
uld be STORE_CMEM or STORE_SHARED)
+#if defined(_MSC_VER) && _MSC_VER <=3D 1600
+#define isnan(x) _isnan(x)
+#endif
+
+#define nancheck_flt(bat)
\
+ do {\
+ for (iu =3D 0; iu < ret->count; iu++) { \
+ if (isnan(((flt*)data)[index_offset * ret->count +
iu])) { \
+ ((flt*)data)[index_offset * ret->count + iu]
=3D flt_nil; \
+ bat->tnil =3D 1;
\
+ } \
+ } \
+ bat->tnonil =3D !bat->tnil; \
+ } while (0)
+#define nancheck_dbl(bat)
\
+ do {\
+ for (iu =3D 0; iu < ret->count; iu++) { \
+ if (isnan(((dbl*)data)[index_offset * ret->count +
iu])) { \
+ ((dbl*)data)[index_offset * ret->count + iu]
=3D dbl_nil; \
+ bat->tnil =3D 1;
\
+ } \
+ } \
+ bat->tnonil =3D !bat->tnil; \
+ } while (0)
+#define nancheck_bit(bat) ((void) 0)
+#define nancheck_bte(bat) ((void) 0)
+#define nancheck_sht(bat) ((void) 0)
+#define nancheck_int(bat) ((void) 0)
+#define nancheck_lng(bat) ((void) 0)
+#define nancheck_hge(bat) ((void) 0) /* not used if no HAVE_HGE */
+#define nancheck_oid(bat) ((void) 0)
#if defined (HAVE_FORK) && !defined(HAVE_EMBEDDED)
#define CREATE_BAT_ZEROCOPY(bat, mtpe, batstore) {=
\
bat =3D COLnew(seqbase, TYPE_##mtpe, 0, TRANSIENT); =
\
@@ -43,6 +74,7 @@
bat->tnonil =3D 1 - bat->tnil;=
\
} else { =
\
bat->tnil =3D 0; bat->tnonil =3D 0; =
\
+ nancheck_##mtpe(bat);\
} =
\
=
\
/*When we create a BAT a small part of memory is allocated, free i=
t*/ \
@@ -90,6 +122,7 @@
MonetDB: Dec2016 - Approved after changeset 891a9c0505d5.
Changeset: a0523931a240 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=3Dchangeset;node=3Da0523931a240 Modified Files: sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows Branch: Dec2016 Log Message: Approved after changeset 891a9c0505d5. diffs (12 lines): diff --git a/sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable= .err.Windows b/sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stab= le.err.Windows --- a/sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Wi= ndows +++ b/sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Wi= ndows @@ -73,7 +73,7 @@ stderr of test 'error-truncated.Bug-2615 MAPI =3D (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225 QUERY =3D COPY 2 RECORDS INTO uitspraken FROM STDIN DELIMITERS '\t', '\n' = NULL as ''; 277351 AA7351 1 Rechtbank 's-Gravenhage 2000-08-04 AWB 00/6928, 0= 0/6929, 00/6930 Arrondissementsrechtbank te 's-Gravenhage\nzittinghoudende = te Haarlem\nfungerend president\nenkelvoudige kamer voor Vreemdelingenzaken= \n\nU I T S P R A A K\n\nartikel 8:81 en 8:86 Algemene Wet Bestuursrecht (A= wb)\nartikel 33a, 34a en 34j Vreemdelingenwet (Vw)\n\nreg.nr: AWB 00/6928 V= RWET H (voorlopige voorziening)\nAWB 00/6929 VRWET H (beroepszaak)\nAWB 00/= 6930 VRWET H (vrijheidsontneming)\n\ninzake: A, geboren op [...] 1964, van = Iraakse\nnationaliteit, verblijvende in het Grenshospitium te\nAmsterdam, v= erzoeker,\ngemachtigde: mr. M.R. van der Linde, advocaat te Utrecht,\n\nteg= en: de Staatssecretaris van Justitie, verweerder,\ngemachtigden: mr. M. Ram= saroep en mr. T.H.T.W. Zee, werkzaam bij de onder verweerder ressorterende = Immigratie- en Naturalisatiedienst te 's-Gravenhage.\n\n1. GEGEVENS INZAKE= HET GEDING\n\n1.1. Aan de orde is het verzoek om voorlopige voorziening ha= ngende het beroep van verzoeker tegen de beschikking van verweerder van 21 = juli 2000. Deze beschikking is genomen in het kader van de zogenoemde AC-pr= ocedure en behelst de \nniet-inwilliging van de aanvraag om toelating als = vluchteling en strekt tevens tot het niet verlenen van een vergunning tot v= erblijf wegens klemmende redenen van humanitaire aard. Verzocht wordt om sc= horsing van de beslissing van \nverweerder om uitzetting niet achterwege t= e laten totdat op het beroep tegen voormelde beschikking is beslist.\n\n1.2= Voorts is aan de orde het beroep gericht tegen de vrijheidsontnemende maat= regel van artikel 7a Vw die verweerder verzoeker met ingang van 18 juli 200= 0 heeft opgelegd. Dit beroep strekt tevens tot toekenning van schadevergoed= ing. \n\n1.3 De openbare behandeling van de geschillen heeft plaatsgevonde= n op 2 augustus 2000. Daarbij hebben verzoeker en verweerder bij monde van = hun gemachtigden hun standpunten nader uiteengezet. Voorts is verzoeker ter= zitting gehoord. \n\n2. OVERWEGINGEN\n\n2.1 Ingevolge artikel 8:81 van de= Awb kan, indien tegen een besluit bij de rechtbank beroep is ingesteld, de= president van de rechtbank die bevoegd is in de hoofdzaak op verzoek een v= oorlopige voorziening treffen indien onverwijlde \nspoed, gelet op de betr= okken belangen, zulks vereist.\n\n2.2 Op grond van artikel 8:86 van de Awb = heeft de president na behandeling ter zitting van het verzoek om een voorlo= pige voorziening de bevoegdheid om, indien hij van oordeel is dat nader ond= erzoek redelijkerwijs niet kan bijdragen \naan de beoordeling van de zaak,= onmiddellijk uitspraak te doen in de hoofdzaak. Er bestaat in dit geval aa= nleiding om van deze bevoegdheid gebruik te maken.\n\n2.3 De AC-procedure v= oorziet in een afdoening van asielaanvragen binnen 48 uur. Deze procedure l= eent zich slechts voor die asielaanvragen waaromtrent binnen deze korte ter= mijn procedureel en inhoudelijk naar behoren kan worden \nbeslist.\n\n2.4 = Bij de beoordeling of in het onderhavige geval van een zodanige aanvraag sp= rake is, is het volgende van belang.\n\n2.5 Ingevolge het door verweerder g= evoerde beleid, neergelegd in hoofdstuk B7/3 Vc 1994, bestaat de AC-procedu= re uit twee fasen. Het eerste deel betreft in ieder geval de formele indien= ing van de asielaanvraag en het onderzoek naar \nidentiteit, nationaliteit= en reisroute. Het tweede deel betreft de beoordeling van de asielaanvraag.= Voor het tweede deel zijn maximaal 24 procesuren beschikbaar. Indien de ee= rste fase langer dan 24 uur duurt, gaat dit ten koste van \nde tijd die be= schikbaar is voor de tweede fase.\nIn principe vindt doorverwijzing naar ee= n OC plaats indien de AC-procedure langer duurt dan 48 procesuren.\n\n2.6 T= er beoordeling ligt allereerst voor de vraag of het tweede deel van de AC-p= rocedure is afgerond binnen de voor dat deel maximaal beschikbare termijn v= an 24 procesuren. Hierover overweegt de president als volgt.\n\n2.7 Tussen = partijen is niet in geschil dat (een afschrift van) de beslissing op de asi= elaanvraag van verzoeker aan verzoeker is uitgereikt
MonetDB: Dec2016 - Approved after changeset 891a9c0505d5.
Changeset: df6882392ba9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=3Dchangeset;node=3Ddf6882392ba9 Modified Files: sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Darwin Branch: Dec2016 Log Message: Approved after changeset 891a9c0505d5. diffs (12 lines): diff --git a/sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable= .err.Darwin b/sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stabl= e.err.Darwin --- a/sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Da= rwin +++ b/sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Da= rwin @@ -73,7 +73,7 @@ stderr of test 'error-truncated.Bug-2615 MAPI =3D (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225 QUERY =3D COPY 2 RECORDS INTO uitspraken FROM STDIN DELIMITERS '\t', '\n' = NULL as ''; 277351 AA7351 1 Rechtbank 's-Gravenhage 2000-08-04 AWB 00/6928, 0= 0/6929, 00/6930 Arrondissementsrechtbank te 's-Gravenhage\nzittinghoudende = te Haarlem\nfungerend president\nenkelvoudige kamer voor Vreemdelingenzaken= \n\nU I T S P R A A K\n\nartikel 8:81 en 8:86 Algemene Wet Bestuursrecht (A= wb)\nartikel 33a, 34a en 34j Vreemdelingenwet (Vw)\n\nreg.nr: AWB 00/6928 V= RWET H (voorlopige voorziening)\nAWB 00/6929 VRWET H (beroepszaak)\nAWB 00/= 6930 VRWET H (vrijheidsontneming)\n\ninzake: A, geboren op [...] 1964, van = Iraakse\nnationaliteit, verblijvende in het Grenshospitium te\nAmsterdam, v= erzoeker,\ngemachtigde: mr. M.R. van der Linde, advocaat te Utrecht,\n\nteg= en: de Staatssecretaris van Justitie, verweerder,\ngemachtigden: mr. M. Ram= saroep en mr. T.H.T.W. Zee, werkzaam bij de onder verweerder ressorterende = Immigratie- en Naturalisatiedienst te 's-Gravenhage.\n\n1. GEGEVENS INZAKE= HET GEDING\n\n1.1. Aan de orde is het verzoek om voorlopige voorziening ha= ngende het beroep van verzoeker tegen de beschikking van verweerder van 21 = juli 2000. Deze beschikking is genomen in het kader van de zogenoemde AC-pr= ocedure en behelst de \nniet-inwilliging van de aanvraag om toelating als = vluchteling en strekt tevens tot het niet verlenen van een vergunning tot v= erblijf wegens klemmende redenen van humanitaire aard. Verzocht wordt om sc= horsing van de beslissing van \nverweerder om uitzetting niet achterwege t= e laten totdat op het beroep tegen voormelde beschikking is beslist.\n\n1.2= Voorts is aan de orde het beroep gericht tegen de vrijheidsontnemende maat= regel van artikel 7a Vw die verweerder verzoeker met ingang van 18 juli 200= 0 heeft opgelegd. Dit beroep strekt tevens tot toekenning van schadevergoed= ing. \n\n1.3 De openbare behandeling van de geschillen heeft plaatsgevonde= n op 2 augustus 2000. Daarbij hebben verzoeker en verweerder bij monde van = hun gemachtigden hun standpunten nader uiteengezet. Voorts is verzoeker ter= zitting gehoord. \n\n2. OVERWEGINGEN\n\n2.1 Ingevolge artikel 8:81 van de= Awb kan, indien tegen een besluit bij de rechtbank beroep is ingesteld, de= president van de rechtbank die bevoegd is in de hoofdzaak op verzoek een v= oorlopige voorziening treffen indien onverwijlde \nspoed, gelet op de betr= okken belangen, zulks vereist.\n\n2.2 Op grond van artikel 8:86 van de Awb = heeft de president na behandeling ter zitting van het verzoek om een voorlo= pige voorziening de bevoegdheid om, indien hij van oordeel is dat nader ond= erzoek redelijkerwijs niet kan bijdragen \naan de beoordeling van de zaak,= onmiddellijk uitspraak te doen in de hoofdzaak. Er bestaat in dit geval aa= nleiding om van deze bevoegdheid gebruik te maken.\n\n2.3 De AC-procedure v= oorziet in een afdoening van asielaanvragen binnen 48 uur. Deze procedure l= eent zich slechts voor die asielaanvragen waaromtrent binnen deze korte ter= mijn procedureel en inhoudelijk naar behoren kan worden \nbeslist.\n\n2.4 = Bij de beoordeling of in het onderhavige geval van een zodanige aanvraag sp= rake is, is het volgende van belang.\n\n2.5 Ingevolge het door verweerder g= evoerde beleid, neergelegd in hoofdstuk B7/3 Vc 1994, bestaat de AC-procedu= re uit twee fasen. Het eerste deel betreft in ieder geval de formele indien= ing van de asielaanvraag en het onderzoek naar \nidentiteit, nationaliteit= en reisroute. Het tweede deel betreft de beoordeling van de asielaanvraag.= Voor het tweede deel zijn maximaal 24 procesuren beschikbaar. Indien de ee= rste fase langer dan 24 uur duurt, gaat dit ten koste van \nde tijd die be= schikbaar is voor de tweede fase.\nIn principe vindt doorverwijzing naar ee= n OC plaats indien de AC-procedure langer duurt dan 48 procesuren.\n\n2.6 T= er beoordeling ligt allereerst voor de vraag of het tweede deel van de AC-p= rocedure is afgerond binnen de voor dat deel maximaal beschikbare termijn v= an 24 procesuren. Hierover overweegt de president als volgt.\n\n2.7 Tussen = partijen is niet in geschil dat (een afschrift van) de beslissing op de asi= elaanvraag van verzoeker aan verzoeker is uitgereikt op een
MonetDB: Dec2016 - Call .exe directly.
Changeset: d0e972896c6c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d0e972896c6c Modified Files: monetdb5/tools/Tests/mserver5--help.bat monetdb5/tools/Tests/mserver5--help.stable.err.Windows Branch: Dec2016 Log Message: Call .exe directly. diffs (24 lines): diff --git a/monetdb5/tools/Tests/mserver5--help.bat b/monetdb5/tools/Tests/mserver5--help.bat --- a/monetdb5/tools/Tests/mserver5--help.bat +++ b/monetdb5/tools/Tests/mserver5--help.bat @@ -1,4 +1,4 @@ @echo on @prompt # $t $g - %MTIMEOUT% mserver5 --help + %MTIMEOUT% mserver5.exe --help 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 @@ -5,11 +5,6 @@ stderr of test 'mserver5--help` in direc # 16:36:12 > Mtimeout -timeout 300 ./mserver5--help mserver5--help # 16:36:12 > - -# 16:36:12 > -# 16:36:12 > Mtimeout -timeout 60 mserver5 --config= --help -# 16:36:12 > - Usage: mserver5.exe [options] [scripts] --dbpath= Specify database location --dbextra= Directory for transient BATs ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Dec2016 - Translate NaN to nil.
Changeset: cc48a210ec61 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc48a210ec61
Modified Files:
sql/backends/monet5/UDF/pyapi/convert_loops.h
Branch: Dec2016
Log Message:
Translate NaN to nil.
diffs (57 lines):
diff --git a/sql/backends/monet5/UDF/pyapi/convert_loops.h
b/sql/backends/monet5/UDF/pyapi/convert_loops.h
--- a/sql/backends/monet5/UDF/pyapi/convert_loops.h
+++ b/sql/backends/monet5/UDF/pyapi/convert_loops.h
@@ -18,6 +18,37 @@
// This #define creates a new BAT with the internal data and mask from a Numpy
array, without copying the data
// 'bat' is a BAT* pointer, which will contain the new BAT. TYPE_'mtpe' is the
BAT type, and 'batstore' is the heap storage type of the BAT (this should be
STORE_CMEM or STORE_SHARED)
+#if defined(_MSC_VER) && _MSC_VER <= 1600
+#define isnan(x) _isnan(x)
+#endif
+
+#define nancheck_flt(bat)
\
+ do {\
+ for (iu = 0; iu < ret->count; iu++) { \
+ if (isnan(((flt*)data)[index_offset * ret->count +
iu])) { \
+ ((flt*)data)[index_offset * ret->count + iu] =
flt_nil; \
+ bat->tnil = 1; \
+ } \
+ } \
+ bat->tnonil = !bat->tnil; \
+ } while (0)
+#define nancheck_dbl(bat)
\
+ do {\
+ for (iu = 0; iu < ret->count; iu++) { \
+ if (isnan(((dbl*)data)[index_offset * ret->count +
iu])) { \
+ ((dbl*)data)[index_offset * ret->count + iu] =
dbl_nil; \
+ bat->tnil = 1; \
+ } \
+ } \
+ bat->tnonil = !bat->tnil; \
+ } while (0)
+#define nancheck_bit(bat) ((void) 0)
+#define nancheck_bte(bat) ((void) 0)
+#define nancheck_sht(bat) ((void) 0)
+#define nancheck_int(bat) ((void) 0)
+#define nancheck_lng(bat) ((void) 0)
+#define nancheck_hge(bat) ((void) 0) /* not used if no HAVE_HGE */
+#define nancheck_oid(bat) ((void) 0)
#ifdef HAVE_FORK
#define CREATE_BAT_ZEROCOPY(bat, mtpe, batstore) {
\
bat = COLnew(seqbase, TYPE_##mtpe, 0, TRANSIENT);
\
@@ -37,6 +68,7 @@
bat->tnonil = 1 - bat->tnil;
\
} else {
\
bat->tnil = 0; bat->tnonil = 0;
\
+ nancheck_##mtpe(bat);\
}
\
\
/*When we create a BAT a small part of memory is allocated, free it*/
\
@@ -84,6 +116,7 @@
bat->tnonil = 1 - bat->tnil;
\
} else {
\
bat->tnil = 0; bat->tnonil = 0;
\
+ nancheck_##mtpe(bat);\
}
\
/*When we create a BAT a small part of memory is allocated, free it*/
\
GDKfree(bat->theap.base);
\
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: queryid2 - merge with default
Changeset: 0210c5d6072b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=3Dchangeset;node=3D0210c5d6072b
Modified Files:
MonetDB.spec
geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
monetdb5/modules/mal/mkey.c
sql/backends/monet5/sql.c
sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable=
.err
sql/test/BugTracker-2008/Tests/copy-format.SF-2468513.stable.err
sql/test/BugTracker-2008/Tests/varchar.SF-2471371.stable.err
sql/test/BugTracker-2009/Tests/copy_into_error_off_by_one.SF-2833696.stabl=
e.err
sql/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.e=
rr
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err
sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err
sql/test/BugTracker-2015/Tests/backslash_predecing_separator.Bug-3775.stab=
le.err
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker/Tests/copy_decimal.SF-1582957.stable.err
sql/test/BugTracker/Tests/copy_overflow_null_bug.SF-1842550.stable.err
sql/test/copy/Tests/columns.stable.err
sql/test/copy/Tests/int_parse.stable.err
sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err
sql/test/copy/Tests/null_as_string_errors.stable.err
Branch: queryid2
Log Message:
merge with default
diffs (truncated from 315 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -201,6 +201,7 @@ package, and most likely also %{name}-SQ
more client packages.
=20
%files
+%license COPYING
%defattr(-,root,root)
%{_libdir}/libbat.so.*
=20
@@ -242,6 +243,7 @@ This package contains a shared library (
various other components.
=20
%files stream
+%license COPYING
%defattr(-,root,root)
%{_libdir}/libstream.so.*
=20
@@ -289,6 +291,7 @@ SQL database so that it can be loaded ba
MonetDB, you will very likely need this package.
=20
%files client
+%license COPYING
%defattr(-,root,root)
%{_bindir}/mclient
%{_bindir}/msqldump
@@ -375,6 +378,7 @@ odbcinst -u -d -n MonetDB
fi
=20
%files client-odbc
+%license COPYING
%defattr(-,root,root)
%{_libdir}/libMonetODBC.so
%{_libdir}/libMonetODBCs.so
@@ -853,6 +857,7 @@ MonetDB packages. You probably don't ne
developer. If you do want to test, install %{name}-testing-python.
=20
%files testing
+%license COPYING
%defattr(-,root,root)
%{_bindir}/Mdiff
%{_bindir}/MkillUsers
diff --git a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err b/=
geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
--- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
+++ b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
@@ -13,7 +13,7 @@ stderr of test 'copy_into_crash.SF-19754
MAPI =3D (monetdb) /var/tmp/mtest-27003/.s.monetdb.30235
QUERY =3D COPY 1 RECORDS INTO nodes from STDIN USING DELIMITERS ',', '\n';
45111956, 'POINT(52.0697 4.3723)'
-ERROR =3D !Failed to import table line 1 field p 'geometry(4)' expected in=
' 'POINT(52.0697 4.3723)''
+ERROR =3D !Failed to import table 'nodes', line 1 field p 'geometry(4)' ex=
pected in ' 'POINT(52.0697 4.3723)''
=20
# 13:33:18 > =20
# 13:33:18 > Done.
diff --git a/monetdb5/modules/mal/mkey.c b/monetdb5/modules/mal/mkey.c
--- a/monetdb5/modules/mal/mkey.c
+++ b/monetdb5/modules/mal/mkey.c
@@ -50,6 +50,11 @@ MKEYhash(Client cntxt, MalBlkPtr mb, Mal
res=3D getArgReference_lng(stk,p,0);
val=3D getArgReference(stk,p,1);
switch (ATOMstorage(tpe)) {
+ case TYPE_void:
+ case TYPE_bat:
+ case TYPE_ptr:
+ // illegal types, avoid falling into the default case.
+ assert(0);
case TYPE_bte:
*res =3D MKEYHASH_bte(val);
break;
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -2507,7 +2507,7 @@ mvc_import_table_wrap(Client cntxt, MalB
if (fname && s =3D=3D NULL)
throw(IO, "bstreams.create", "Failed to create block stream");
if (b =3D=3D NULL)
- throw(SQL, "importTable", "Failed to import table %s",
be->mvc->errstr);
+ throw(SQL, "importTable", "Failed to import table '%s', %s",
t->base.nam=
e, be->mvc->errstr);
bat2return(stk, pci, b);
GDKfree(b);
return msg;
diff --git a/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-11=
00504.stable.err b/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into=
.SF-1100504.stable.err
--- a/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.s=
table.err
+++ b/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.s=
table.err
@@ -88,9 +88,7 @@ QUERY =3D COPY 1 RECORDS INTO "news" FROM=20
allemaal nogal lang duurt, maar in principe is het nog
maar een uurtje of 6 werk om het goed te krijgen. Zoals
