date:20230622

MonetDB: Jul2021 - Approve after pymonetdb upgrade.

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: ba1035d74829 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ba1035d74829
Modified Files:
sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
sql/test/analytics/Tests/analytics19.test
sql/test/pg_regress/Tests/interval.test
sql/test/sys-schema/Tests/webExamplesCastFunctionsOperators.test
Branch: Jul2021
Log Message:

Approve after pymonetdb upgrade.


diffs (truncated from 562 to 300 lines):

diff --git a/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test 
b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
--- a/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
+++ b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
@@ -27,7 +27,7 @@ 0:00:00
 query T rowsort
 select time(5) '20:04:04.947' - time(5) '20:04:04.847'
 
-0:00:00
+0:00:00.10
 
 statement ok
 drop table t
diff --git a/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test 
b/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
--- a/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
+++ b/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
@@ -9,7 +9,7 @@ SELECT count(f1), sum(f1), avg(f1), medi
 
 4
 0:00:10
-0:00:02
+0:00:02.50
 0:00:02
 0:00:04
 0:00:01
diff --git a/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test 
b/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
--- a/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
+++ b/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
@@ -10,8 +10,8 @@ insert into t values ('2015-03-01 00:04:
 query T rowsort
 SELECT count(*) * ((max("end")-min("start")) / 60) FROM t GROUP BY s HAVING 
max("end")-min("start")<> interval '0' second
 
--1 day, 23:59:42
--1 day, 23:59:42
+-1 day, 23:59:41.998000
+-1 day, 23:59:41.998000
 
 statement ok
 drop table t
diff --git a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test 
b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
--- a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
+++ b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
@@ -52,7 +52,7 @@ 1
 query T rowsort
 SELECT INTERVAL '1' SECOND * 1.2
 
-0:00:01
+0:00:01.20
 
 query T rowsort
 SELECT INTERVAL '2' MONTH / -1.4
@@ -68,7 +68,7 @@ SELECT INTERVAL '3' MONTH * INTERVAL '3'
 query T rowsort
 select mya + interval '2' second from (select interval '3' second * 1.2) as 
mya(mya)
 
-0:00:05
+0:00:05.60
 
 statement error
 SELECT 1 / INTERVAL '2' MONTH
@@ -91,12 +91,12 @@ 1
 query T rowsort
 SELECT INTERVAL '1' SECOND * cast(2.44 as double)
 
-0:00:02
+0:00:02.44
 
 query T rowsort
 SELECT INTERVAL '5' SECOND * cast(2.29 as real)
 
-0:00:11
+0:00:11.45
 
 query T rowsort
 SELECT INTERVAL '5' SECOND * cast(1.0 as double)
@@ -111,7 +111,7 @@ 13
 query T rowsort
 SELECT cast(3.1 as real) * INTERVAL '3' SECOND
 
-0:00:09
+0:00:09.30
 
 query T rowsort
 SELECT INTERVAL '1' MONTH / cast(2.0 as double)
@@ -146,12 +146,12 @@ 108
 query T rowsort
 SELECT INTERVAL '1' SECOND / cast(2.0 as double)
 
-0:00:00
+0:00:00.50
 
 query T rowsort
 SELECT INTERVAL '5' SECOND / cast(1.5 as double)
 
-0:00:03
+0:00:03.333000
 
 query T rowsort
 SELECT INTERVAL '5' SECOND / cast(1.0 as double)
@@ -166,22 +166,22 @@ SELECT INTERVAL '-100' DAY / cast(23.34 
 query T rowsort
 SELECT INTERVAL '32' MINUTE / cast(45.5677 as real)
 
-0:00:42
+0:00:42.135000
 
 query T rowsort
 SELECT INTERVAL '67' MINUTE / cast(1.57 as real)
 
-0:42:40
+0:42:40.51
 
 query T rowsort
 SELECT INTERVAL '-10.34' SECOND / cast(-1.8 as real)
 
-0:00:05
+0:00:05.744000
 
 query T rowsort
 SELECT INTERVAL '-10.34' SECOND / -1.8
 
-0:00:05
+0:00:05.74
 
 statement error
 SELECT INTERVAL '42' DAY / cast(0 as real)
@@ -228,10 +228,10 @@ SELECT x, y, x / y from (values(interval
 8 days, 0:00:00
 -56 days, 0:00:00
 1.100
--51 days, 2:10:55
+-51 days, 2:10:54.55
 -56 days, 0:00:00
 3.400
--17 days, 12:42:22
+-17 days, 12:42:21.18
 0:00:00
 -7.000
 0:00:00
@@ -243,13 +243,13 @@ 3.400
 0:00:00
 1:07:00
 -7.000
--1 day, 23:50:26
+-1 day, 23:50:25.72
 1:07:00
 1.100
-1:00:54
+1:00:54.54
 1:07:00
 3.400
-0:19:42
+0:19:42.35
 
 query TRT rowsort
 SELECT x, y, x * y from (values(interval '0' month),(interval '-3' 
month),(interval '6' month)) as x(x), (values(cast(1.1 as double)),(cast(3.4 as 
real)),(cast(-7 as double))) as y(y)
@@ -290,10 +290,10 @@ SELECT x, y, x / y from (values(interval
 8 days, 0:00:00
 -56 days, 0:00:00
 1.100
--51 days, 2:10:55
+-51 days, 2:10:54.545000
 -56 days, 0:00:00
 3.400
--17 days, 12:42:22
+-17 days, 12:42:21.216000
 0:00:00
 -7.000
 0:00:00
@@ -305,13 +305,13 @@ 3.400
 0:00:00
 1:07:00
 -7.000
--1 day, 23:50:26
+-1 day, 23:50:2

MonetDB: Jan2022 - Merge with Jul2021 branch.

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: 00bb49e05a5a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/00bb49e05a5a
Modified Files:
monetdb5/ChangeLog.Jan2022
monetdb5/modules/mal/tablet.c
sql/test/analytics/Tests/analytics19.test
tools/merovingian/client/CMakeLists.txt
tools/merovingian/client/monetdb.1
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/utils/properties.c
Branch: Jan2022
Log Message:

Merge with Jul2021 branch.


diffs (truncated from 679 to 300 lines):

diff --git a/monetdb5/ChangeLog.Jan2022 b/monetdb5/ChangeLog.Jan2022
--- a/monetdb5/ChangeLog.Jan2022
+++ b/monetdb5/ChangeLog.Jan2022
@@ -1,3 +1,9 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
+* Tue May 23 2023 Sjoerd Mullender 
+- There is now a new option --set tablet_threads=N to limit the number
+  of threads used for a COPY INTO from CSV file query.  This option can
+  also be set for a specific database using the monetdb command using
+  the ncopyintothreads property.
+
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -1549,10 +1549,18 @@ SQLload_file(Client cntxt, Tablet *as, b
BUN i, attr;
READERtask task;
READERtask ptask[MAXWORKERS];
-   int threads = (maxrow< 0 || maxrow > (1 << 16)) && GDKnr_threads > 1 ? 
(GDKnr_threads < MAXWORKERS ? GDKnr_threads - 1 : MAXWORKERS - 1) : 1;
+   int threads = 1;
lng tio, t1 = 0;
char name[MT_NAME_LEN];
 
+   if (maxrow < 0 || maxrow > (LL_CONSTANT(1) << 16)) {
+   threads = GDKgetenv_int("tablet_threads", GDKnr_threads);
+   if (threads > 1)
+   threads = threads < MAXWORKERS ? threads - 1 : 
MAXWORKERS - 1;
+   else
+   threads = 1;
+   }
+
 /* TRC_DEBUG(MAL_SERVER, "Prepare copy work for '%d' threads col '%s' rec 
'%s' quot '%c'\n", threads, csep, rsep, quote);*/
 
memset(ptask, 0, sizeof(ptask));
diff --git a/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test 
b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
--- a/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
+++ b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
@@ -27,7 +27,7 @@ 0:00:00
 query T rowsort
 select time(5) '20:04:04.947' - time(5) '20:04:04.847'
 
-0:00:00
+0:00:00.10
 
 statement ok
 drop table t
diff --git a/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test 
b/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
--- a/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
+++ b/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
@@ -9,7 +9,7 @@ SELECT count(f1), sum(f1), avg(f1), medi
 
 4
 0:00:10
-0:00:02
+0:00:02.50
 0:00:02
 0:00:04
 0:00:01
diff --git a/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test 
b/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
--- a/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
+++ b/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
@@ -10,8 +10,8 @@ insert into t values ('2015-03-01 00:04:
 query T rowsort
 SELECT count(*) * ((max("end")-min("start")) / 60) FROM t GROUP BY s HAVING 
max("end")-min("start")<> interval '0' second
 
--1 day, 23:59:42
--1 day, 23:59:42
+-1 day, 23:59:41.998000
+-1 day, 23:59:41.998000
 
 statement ok
 drop table t
diff --git a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test 
b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
--- a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
+++ b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
@@ -52,7 +52,7 @@ 1
 query T rowsort
 SELECT INTERVAL '1' SECOND * 1.2
 
-0:00:01
+0:00:01.20
 
 query T rowsort
 SELECT INTERVAL '2' MONTH / -1.4
@@ -68,7 +68,7 @@ SELECT INTERVAL '3' MONTH * INTERVAL '3'
 query T rowsort
 select mya + interval '2' second from (select interval '3' second * 1.2) as 
mya(mya)
 
-0:00:05
+0:00:05.60
 
 statement error
 SELECT 1 / INTERVAL '2' MONTH
@@ -91,12 +91,12 @@ 1
 query T rowsort
 SELECT INTERVAL '1' SECOND * cast(2.44 as double)
 
-0:00:02
+0:00:02.44
 
 query T rowsort
 SELECT INTERVAL '5' SECOND * cast(2.29 as real)
 
-0:00:11
+0:00:11.45
 
 query T rowsort
 SELECT INTERVAL '5' SECOND * cast(1.0 as double)
@@ -111,7 +111,7 @@ 13
 query T rowsort
 SELECT cast(3.1 as real) * INTERVAL '3' SECOND
 
-0:00:09
+0:00:09.30
 
 query T rowsort
 SELECT INTERVAL '1' MONTH / cast(2.0 as double)
@@ -146,12 +146,12 @@ 108
 query T rowsort
 SELECT INTERVAL '1' SECOND / cast(2.0 as double)
 
-0:00:00
+0:00:00.50
 
 query T rowsort
 SELECT INTERVAL '5' SECOND / cast(1.5 as double)
 
-0:00:03
+0:00:03.333000
 
 query T rowsort
 SELECT INTERVAL '5' SECOND / cast(1.0 as double)
@@ -166,

MonetDB: Sep2022 - Merge with Jan2022 branch.

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: 0bb667a66602 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0bb667a66602
Modified Files:
monetdb5/ChangeLog.Sep2022
monetdb5/modules/mal/tablet.c
sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
tools/merovingian/client/CMakeLists.txt
tools/merovingian/client/monetdb.1
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/utils/properties.c
Branch: Sep2022
Log Message:

Merge with Jan2022 branch.


diffs (truncated from 668 to 300 lines):

diff --git a/monetdb5/ChangeLog.Sep2022 b/monetdb5/ChangeLog.Sep2022
--- a/monetdb5/ChangeLog.Sep2022
+++ b/monetdb5/ChangeLog.Sep2022
@@ -1,3 +1,9 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
+* Tue May 23 2023 Sjoerd Mullender 
+- There is now a new option --set tablet_threads=N to limit the number
+  of threads used for a COPY INTO from CSV file query.  This option can
+  also be set for a specific database using the monetdb command using
+  the ncopyintothreads property.
+
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -1514,10 +1514,18 @@ SQLload_file(Client cntxt, Tablet *as, b
BUN i, attr;
READERtask task;
READERtask ptask[MAXWORKERS];
-   int threads = (maxrow< 0 || maxrow > (1 << 16)) && GDKnr_threads > 1 ? 
(GDKnr_threads < MAXWORKERS ? GDKnr_threads - 1 : MAXWORKERS - 1) : 1;
+   int threads = 1;
lng tio, t1 = 0;
char name[MT_NAME_LEN];
 
+   if (maxrow < 0 || maxrow > (LL_CONSTANT(1) << 16)) {
+   threads = GDKgetenv_int("tablet_threads", GDKnr_threads);
+   if (threads > 1)
+   threads = threads < MAXWORKERS ? threads - 1 : 
MAXWORKERS - 1;
+   else
+   threads = 1;
+   }
+
 /* TRC_DEBUG(MAL_SERVER, "Prepare copy work for '%d' threads col '%s' rec 
'%s' quot '%c'\n", threads, csep, rsep, quote);*/
 
memset(ptask, 0, sizeof(ptask));
diff --git a/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test 
b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
--- a/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
+++ b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
@@ -27,7 +27,7 @@ 0:00:00
 query T rowsort
 select time(5) '20:04:04.947' - time(5) '20:04:04.847'
 
-0:00:00
+0:00:00.10
 
 statement ok
 drop table t
diff --git a/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test 
b/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
--- a/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
+++ b/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
@@ -9,7 +9,7 @@ SELECT count(f1), sum(f1), avg(f1), medi
 
 4
 0:00:10
-0:00:02
+0:00:02.50
 0:00:02
 0:00:04
 0:00:01
diff --git a/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test 
b/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
--- a/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
+++ b/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
@@ -10,8 +10,8 @@ insert into t values ('2015-03-01 00:04:
 query T rowsort
 SELECT count(*) * ((max("end")-min("start")) / 60) FROM t GROUP BY s HAVING 
max("end")-min("start")<> interval '0' second
 
--1 day, 23:59:42
--1 day, 23:59:42
+-1 day, 23:59:41.998000
+-1 day, 23:59:41.998000
 
 statement ok
 drop table t
diff --git a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test 
b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
--- a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
+++ b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
@@ -52,7 +52,7 @@ 1
 query T rowsort
 SELECT INTERVAL '1' SECOND * 1.2
 
-0:00:01
+0:00:01.20
 
 query T rowsort
 SELECT INTERVAL '2' MONTH / -1.4
@@ -68,7 +68,7 @@ SELECT INTERVAL '3' MONTH * INTERVAL '3'
 query T rowsort
 select mya + interval '2' second from (select interval '3' second * 1.2) as 
mya(mya)
 
-0:00:05
+0:00:05.60
 
 statement error
 SELECT 1 / INTERVAL '2' MONTH
@@ -91,12 +91,12 @@ 1
 query T rowsort
 SELECT INTERVAL '1' SECOND * cast(2.44 as double)
 
-0:00:02
+0:00:02.44
 
 query T rowsort
 SELECT INTERVAL '5' SECOND * cast(2.29 as real)
 
-0:00:11
+0:00:11.45
 
 query T rowsort
 SELECT INTERVAL '5' SECOND * cast(1.0 as double)
@@ -111,7 +111,7 @@ 13
 query T rowsort
 SELECT cast(3.1 as real) * INTERVAL '3' SECOND
 
-0:00:09
+0:00:09.30
 
 query T rowsort
 SELECT INTERVAL '1' MONTH / cast(2.0 as double)
@@ -146,12 +146,12 @@ 108
 query T rowsort
 SELECT INTERVAL '1' SECOND / cast(2.0 as double)
 
-0:00:00
+0:00:00.50
 
 query T rowsort
 SELECT INTERVAL '5' SECOND / cast(1.5 as double)
 
-0:00:03
+0:00:03.333000
 
 query T rowsort
 SELECT INTERVAL '5' SECOND / cast(1.0 as

MonetDB: Jan2022 - Approve.

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: b931f39052b5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b931f39052b5
Modified Files:
sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
Branch: Jan2022
Log Message:

Approve.


diffs (12 lines):

diff --git a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test 
b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
--- a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
+++ b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
@@ -171,7 +171,7 @@ 0:00:42.135000
 query T rowsort
 SELECT INTERVAL '67' MINUTE / cast(1.57 as real)
 
-0:42:40.51
+0:42:40.509000
 
 query T rowsort
 SELECT INTERVAL '-10.34' SECOND / cast(-1.8 as real)
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: Jun2023 - Merge with Sep2022 branch.

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: d8a09b4936ea for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d8a09b4936ea
Modified Files:
gdk/gdk_join.c
monetdb5/modules/mal/tablet.c
sql/test/sys-schema/Tests/webExamplesCastFunctionsOperators.test
tools/merovingian/client/monetdb.1
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/merovingian.c
Branch: Jun2023
Log Message:

Merge with Sep2022 branch.


diffs (truncated from 668 to 300 lines):

diff --git a/monetdb5/ChangeLog.Sep2022 b/monetdb5/ChangeLog.Sep2022
--- a/monetdb5/ChangeLog.Sep2022
+++ b/monetdb5/ChangeLog.Sep2022
@@ -1,3 +1,9 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
+* Tue May 23 2023 Sjoerd Mullender 
+- There is now a new option --set tablet_threads=N to limit the number
+  of threads used for a COPY INTO from CSV file query.  This option can
+  also be set for a specific database using the monetdb command using
+  the ncopyintothreads property.
+
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -1520,10 +1520,18 @@ SQLload_file(Client cntxt, Tablet *as, b
BUN i, attr;
READERtask task;
READERtask ptask[MAXWORKERS];
-   int threads = (maxrow< 0 || maxrow > (1 << 16)) && GDKnr_threads > 1 ? 
(GDKnr_threads < MAXWORKERS ? GDKnr_threads - 1 : MAXWORKERS - 1) : 1;
+   int threads = 1;
lng tio, t1 = 0;
char name[MT_NAME_LEN];
 
+   if (maxrow < 0 || maxrow > (LL_CONSTANT(1) << 16)) {
+   threads = GDKgetenv_int("tablet_threads", GDKnr_threads);
+   if (threads > 1)
+   threads = threads < MAXWORKERS ? threads - 1 : 
MAXWORKERS - 1;
+   else
+   threads = 1;
+   }
+
 /* TRC_DEBUG(MAL_SERVER, "Prepare copy work for '%d' threads col '%s' rec 
'%s' quot '%c'\n", threads, csep, rsep, quote);*/
 
memset(ptask, 0, sizeof(ptask));
diff --git a/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test 
b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
--- a/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
+++ b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
@@ -27,7 +27,7 @@ 0:00:00
 query T rowsort
 select time(5) '20:04:04.947' - time(5) '20:04:04.847'
 
-0:00:00
+0:00:00.10
 
 statement ok
 drop table t
diff --git a/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test 
b/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
--- a/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
+++ b/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
@@ -9,7 +9,7 @@ SELECT count(f1), sum(f1), avg(f1), medi
 
 4
 0:00:10
-0:00:02
+0:00:02.50
 0:00:02
 0:00:04
 0:00:01
diff --git a/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test 
b/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
--- a/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
+++ b/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
@@ -10,8 +10,8 @@ insert into t values ('2015-03-01 00:04:
 query T rowsort
 SELECT count(*) * ((max("end")-min("start")) / 60) FROM t GROUP BY s HAVING 
max("end")-min("start")<> interval '0' second
 
--1 day, 23:59:42
--1 day, 23:59:42
+-1 day, 23:59:41.998000
+-1 day, 23:59:41.998000
 
 statement ok
 drop table t
diff --git a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test 
b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
--- a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
+++ b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
@@ -52,7 +52,7 @@ 1
 query T rowsort
 SELECT INTERVAL '1' SECOND * 1.2
 
-0:00:01
+0:00:01.20
 
 query T rowsort
 SELECT INTERVAL '2' MONTH / -1.4
@@ -68,7 +68,7 @@ SELECT INTERVAL '3' MONTH * INTERVAL '3'
 query T rowsort
 select mya + interval '2' second from (select interval '3' second * 1.2) as 
mya(mya)
 
-0:00:05
+0:00:05.60
 
 statement error
 SELECT 1 / INTERVAL '2' MONTH
@@ -91,12 +91,12 @@ 1
 query T rowsort
 SELECT INTERVAL '1' SECOND * cast(2.44 as double)
 
-0:00:02
+0:00:02.44
 
 query T rowsort
 SELECT INTERVAL '5' SECOND * cast(2.29 as real)
 
-0:00:11
+0:00:11.45
 
 query T rowsort
 SELECT INTERVAL '5' SECOND * cast(1.0 as double)
@@ -111,7 +111,7 @@ 13
 query T rowsort
 SELECT cast(3.1 as real) * INTERVAL '3' SECOND
 
-0:00:09
+0:00:09.30
 
 query T rowsort
 SELECT INTERVAL '1' MONTH / cast(2.0 as double)
@@ -146,12 +146,12 @@ 108
 query T rowsort
 SELECT INTERVAL '1' SECOND / cast(2.0 as double)
 
-0:00:00
+0:00:00.50
 
 query T rowsort
 SELECT INTERVAL '5' SECOND / cast(1.5 as double)
 
-0:00:03
+0:00:03.333000
 
 query T rowsort
 SELECT INTERVAL '5' SECOND / cast(1.0 as double)
@@ -166,22 +166,22 @@ SELECT INTERVAL '-100' DAY / cast(23.34 
 query T rowsort
 SELECT INTERVAL '32' MINUTE / cast(45.5677 as real)
 ---

MonetDB: Jun2023 - Approve after pymonetdb upgrade.

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: fcdd45954b56 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fcdd45954b56
Modified Files:
sql/test/SQLancer/Tests/sqlancer18.test
sql/test/odbc-escape-sequences/Tests/literals.test
sql/test/sys-schema/Tests/webExamplesCastFunctionsOperators.test
sql/test/sys-schema/Tests/webExamplesDateTimeFunctionsOperators.test
Branch: Jun2023
Log Message:

Approve after pymonetdb upgrade.


diffs (truncated from 788 to 300 lines):

diff --git a/sql/test/SQLancer/Tests/sqlancer18.test 
b/sql/test/SQLancer/Tests/sqlancer18.test
--- a/sql/test/SQLancer/Tests/sqlancer18.test
+++ b/sql/test/SQLancer/Tests/sqlancer18.test
@@ -1,3 +1,5 @@
+hash-threshold 1000
+
 statement ok
 START TRANSACTION
 
@@ -256,7 +258,141 @@ 135
 query R rowsort
 SELECT sub0.c2 FROM t2 JOIN (SELECT DISTINCT t2.c2, 3 FROM t2) AS sub0(c2,c3) 
on t2.c2 = sub0.c2
 
-135 values hashing to 39898748a4604c294a5bcb3435b482a0
+-0.000
+-1.000
+-1.000
+-1087290368.000
+-1268147100.000
+-1462578700.000
+-1701868600.000
+-2044814500.000
+-444399328.000
+-5.000
+-5.370
+-6.000
+-707779136.000
+-8.000
+-809476200.000
+-870545200.000
+-870545200.000
+-870545200.000
+-870545200.000
+-870545200.000
+-870545200.000
+-870545200.000
+-870545200.000
+-870545200.000
+-870545200.000
+-870545200.000
+-870545200.000
+-870545200.000
+-870545200.000
+-870545200.000
+-870545200.000
+-870545200.000
+-870545216.000
+-870545216.000
+-870545216.000
+-946846140.000
+0.000
+0.000
+0.000
+0.000
+0.000
+0.002
+0.029
+0.071
+0.104
+0.121
+0.124
+0.126
+0.172
+0.181
+0.185
+0.188
+0.212
+0.235
+0.244
+0.254
+0.256
+0.283
+0.292
+0.293
+0.293
+0.295
+0.307
+0.311
+0.325
+0.348
+0.356
+0.357
+0.357
+0.360
+0.374
+0.379
+0.384
+0.391
+0.419
+0.438
+0.458
+0.492
+0.493
+0.494
+0.514
+0.517
+0.536
+0.538
+0.550
+0.560
+0.579
+0.581
+0.607
+0.613
+0.624
+0.643
+0.644
+0.656
+0.709
+0.753
+0.755
+0.766
+0.779
+0.792
+0.793
+0.840
+0.842
+0.868
+0.899
+0.911
+0.952
+0.972
+0.974
+1.000
+1.000
+1.000
+110847336.000
+1507661312.000
+182855.000
+195935090.000
+195935090.000
+1969755300.000
+2.000
+2070646272.000
+2070646272.000
+3.000
+3.000
+3.142
+4.000
+4.000
+4.000
+5.000
+5.000
+6.000
+6.000
+600810368.000
+7.000
+7.000
+89812210.000
 
 statement ok
 ROLLBACK
diff --git a/sql/test/odbc-escape-sequences/Tests/literals.test 
b/sql/test/odbc-escape-sequences/Tests/literals.test
--- a/sql/test/odbc-escape-sequences/Tests/literals.test
+++ b/sql/test/odbc-escape-sequences/Tests/literals.test
@@ -81,8 +81,8 @@ 0:03:00
 query TT rowsort
 select {interval '4.567' second}, interval '4.567' second
 
-0:00:04
-0:00:04
+0:00:04.567000
+0:00:04.567000
 
 query TT rowsort
 select {interval '2 6' day to hour}, interval '2 6' day to hour
diff --git a/sql/test/sys-schema/Tests/webExamplesCastFunctionsOperators.test 
b/sql/test/sys-schema/Tests/webExamplesCastFunctionsOperators.test
--- a/sql/test/sys-schema/Tests/webExamplesCastFunctionsOperators.test
+++ b/sql/test/sys-schema/Tests/webExamplesCastFunctionsOperators.test
@@ -102,7 +102,7 @@ 18:40:05
 query T rowsort
 select cast('2 18:40:05.123' as interval day to second(3))
 
-2 days, 18:40:05
+2 days, 18:40:05.123000
 
 query T rowsort
 select cast('2-5' as interval year to month)
@@ -268,7 +268,7 @@ 18:40:05
 query T rowsort
 select interval '2 18:40:05.123' day to second(3)
 
-2 days, 18:40:05
+2 days, 18:40:05.123000
 
 query T rowsort
 select interval '2-5' year to month
diff --git 
a/sql/test/sys-schema/Tests/webExamplesDateTimeFunctionsOperators.test 
b/sql/test/sys-schema/Tests/webExamplesDateTimeFunctionsOperators.test
--- a/sql/test/sys-schema/Tests/webExamplesDateTimeFunctionsOperators.test
+++ b/sql/test/sys-schema/Tests/webExamplesDateTimeFunctionsOperators.test
@@ -2,12 +2,12 @@ statement ok
 SET TIME ZONE interval '+02:00' hour to minute
 
 # Date/Time literal formats
-query T
+query T nosort
 select date '2020-09-28'
 
 2020-09-28
 
-query T
+query T nosort
 select {d '2020-09-28'}
 
 2020-09-28
@@ -18,483 +18,482 @@ 2020-09-28
 #
 #-4712-01-01
 
-query T
+query T nosort
 select time '18:40:05'
 
 18:40:05
 
-query T
+query T nosort
 select {t '18:40:05'}
 
 18:40:05
 
-query T
+query T nosort
 select time(6) '18:40:05.123456'
 
 18:40:05.123456
 
-query T
+query T nosort
 select time(3) with time zone '18:40:05.123+02:00'
 
 18:40:05.123000+02:00
 
-query T
+query T nosort
 select timestamp '2020-09-28 18:40:05'
 
 2020-09-28 18:40:05
 
-query T
+query T nosort
 select {ts '2020-09-28 18:40:05'}
 
 2020-09-28 18:40:05
 
-query T
+query T nosort
 select timestamp(6) '2020-09-28 18:40:05.123456'
 
 2020-09-28 18:40:05.123456
 
-query T
+query T nosort
 select timestamp(3) with time zone '2020-09-28 18:40:05.123+02:00'
 
 2020-09-28 18:40:05.123000+02:00
 
-query T
+query T nosort
 select interval '86399' second
 
 23:59:59
 
-query T
+query T nosort
 select {interval '86399' second}
 
 23:59:59
 
-query T
+query T noso

MonetDB: default - Merge with Jun2023 branch.

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: 81b977053650 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/81b977053650
Branch: default
Log Message:

Merge with Jun2023 branch.


diffs (truncated from 1465 to 300 lines):

diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -1824,7 +1824,7 @@ mergejoin(BAT **r1p, BAT **r2p, BAT *l, 
lvars = li.vh->base;
rvars = ri.vh->base;
} else {
-   assert(ri.vh == NULL);
+   assert(ri.vh == NULL || ri.type == TYPE_void);
lvars = rvars = NULL;
}
/* if the var pointer is not NULL, then so is the val pointer */
diff --git a/monetdb5/ChangeLog.Sep2022 b/monetdb5/ChangeLog.Sep2022
--- a/monetdb5/ChangeLog.Sep2022
+++ b/monetdb5/ChangeLog.Sep2022
@@ -1,3 +1,9 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
+* Tue May 23 2023 Sjoerd Mullender 
+- There is now a new option --set tablet_threads=N to limit the number
+  of threads used for a COPY INTO from CSV file query.  This option can
+  also be set for a specific database using the monetdb command using
+  the ncopyintothreads property.
+
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -1520,10 +1520,18 @@ SQLload_file(Client cntxt, Tablet *as, b
BUN i, attr;
READERtask task;
READERtask ptask[MAXWORKERS];
-   int threads = (maxrow< 0 || maxrow > (1 << 16)) && GDKnr_threads > 1 ? 
(GDKnr_threads < MAXWORKERS ? GDKnr_threads - 1 : MAXWORKERS - 1) : 1;
+   int threads = 1;
lng tio, t1 = 0;
char name[MT_NAME_LEN];
 
+   if (maxrow < 0 || maxrow > (LL_CONSTANT(1) << 16)) {
+   threads = GDKgetenv_int("tablet_threads", GDKnr_threads);
+   if (threads > 1)
+   threads = threads < MAXWORKERS ? threads - 1 : 
MAXWORKERS - 1;
+   else
+   threads = 1;
+   }
+
 /* TRC_DEBUG(MAL_SERVER, "Prepare copy work for '%d' threads col '%s' rec 
'%s' quot '%c'\n", threads, csep, rsep, quote);*/
 
memset(ptask, 0, sizeof(ptask));
diff --git a/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test 
b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
--- a/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
+++ b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.test
@@ -27,7 +27,7 @@ 0:00:00
 query T rowsort
 select time(5) '20:04:04.947' - time(5) '20:04:04.847'
 
-0:00:00
+0:00:00.10
 
 statement ok
 drop table t
diff --git a/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test 
b/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
--- a/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
+++ b/sql/test/BugTracker-2014/Tests/aggregates-intervals.Bug-3533.test
@@ -9,7 +9,7 @@ SELECT count(f1), sum(f1), avg(f1), medi
 
 4
 0:00:10
-0:00:02
+0:00:02.50
 0:00:02
 0:00:04
 0:00:01
diff --git a/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test 
b/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
--- a/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
+++ b/sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.test
@@ -10,8 +10,8 @@ insert into t values ('2015-03-01 00:04:
 query T rowsort
 SELECT count(*) * ((max("end")-min("start")) / 60) FROM t GROUP BY s HAVING 
max("end")-min("start")<> interval '0' second
 
--1 day, 23:59:42
--1 day, 23:59:42
+-1 day, 23:59:41.998000
+-1 day, 23:59:41.998000
 
 statement ok
 drop table t
diff --git a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test 
b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
--- a/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
+++ b/sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
@@ -52,7 +52,7 @@ 1
 query T rowsort
 SELECT INTERVAL '1' SECOND * 1.2
 
-0:00:01
+0:00:01.20
 
 query T rowsort
 SELECT INTERVAL '2' MONTH / -1.4
@@ -68,7 +68,7 @@ SELECT INTERVAL '3' MONTH * INTERVAL '3'
 query T rowsort
 select mya + interval '2' second from (select interval '3' second * 1.2) as 
mya(mya)
 
-0:00:05
+0:00:05.60
 
 statement error
 SELECT 1 / INTERVAL '2' MONTH
@@ -91,12 +91,12 @@ 1
 query T rowsort
 SELECT INTERVAL '1' SECOND * cast(2.44 as double)
 
-0:00:02
+0:00:02.44
 
 query T rowsort
 SELECT INTERVAL '5' SECOND * cast(2.29 as real)
 
-0:00:11
+0:00:11.45
 
 query T rowsort
 SELECT INTERVAL '5' SECOND * cast(1.0 as double)
@@ -111,7 +111,7 @@ 13
 query T rowsort
 SELECT cast(3.1 as real) * INTERVAL '3' SECOND
 
-0:00:09
+0:00:09.30
 
 query T rowsort
 SELECT INTERVAL '1' MONTH / cast(2.0 as double)
@@ -146,12 +146,12 @@ 108
 query T rowsort
 SELECT INTERVAL '1' SECOND / cast(2.0 as double)
 
-0:00:00
+0:00:00.50
 
 query T rowsort
 SELECT INTERVAL '5' SECOND / cast(1.5 as double)
 
-0:00:03
+0:00:03.333000
 
 query T rowsort
 SELE

MonetDB: Jun2023 - Pre-release version number update.

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: 709a5052aad0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/709a5052aad0
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Jun2023
Log Message:

Pre-release version number update.


diffs (191 lines):

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 11.47.2
+current_version = 11.47.3
 commit = False
 tag = False
 
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
 # Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
 
 %global name MonetDB
-%global version 11.47.2
+%global version 11.47.3
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
 # Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
 #define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
 
 1 VERSIONINFO
-  FILEVERSION version(11,47,2)
-  PRODUCTVERSION version(11,47,2)
+  FILEVERSION version(11,47,3)
+  PRODUCTVERSION version(11,47,3)
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
   VALUE "Comments", "\0"
   VALUE "CompanyName", "MonetDB B.V.\0"
   VALUE "FileDescription", "MonetDB Application Interface DLL\0"
-  VALUE "FileVersion", sversion(11,47,2)
+  VALUE "FileVersion", sversion(11,47,3)
   VALUE "InternalName", "Mapi\0"
   VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
   VALUE "LegalTrademarks", "\0"
   VALUE "OriginalFilename", "Mapi.dll\0"
   VALUE "PrivateBuild", "\0"
   VALUE "ProductName", "MonetDB Client Libraries\0"
-  VALUE "ProductVersion", sversion(11,47,2)
+  VALUE "ProductVersion", sversion(11,47,3)
   VALUE "SpecialBuild", "\0"
 END
   END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
 #define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
 
 1 VERSIONINFO
-  FILEVERSION version(11,47,2)
-  PRODUCTVERSION version(11,47,2)
+  FILEVERSION version(11,47,3)
+  PRODUCTVERSION version(11,47,3)
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
   VALUE "Comments", "\0"
   VALUE "CompanyName", "MonetDB B.V.\0"
   VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
-  VALUE "FileVersion", sversion(11,47,2)
+  VALUE "FileVersion", sversion(11,47,3)
   VALUE "InternalName", "MonetODBC\0"
   VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
   VALUE "LegalTrademarks", "\0"
   VALUE "OriginalFilename", "MonetODBC.dll\0"
   VALUE "PrivateBuild", "\0"
   VALUE "ProductName", "MonetDB SQL Server\0"
-  VALUE "ProductVersion", sversion(11,47,2)
+  VALUE "ProductVersion", sversion(11,47,3)
   VALUE "SpecialBuild", "\0"
 END
   END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,47,2)
- PRODUCTVERSION version(11,47,2)
+ FILEVERSION version(11,47,3)
+ PRODUCTVERSION version(11,47,3)
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
 BEGIN
 VALUE "CompanyName", "MonetDB B.V."
 VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,47,2)
+VALUE "FileVersion", sversion(11,47,3)
 VALUE "InternalName", "MonetODBCs.dll"
 VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023"
 VALUE "OriginalFilename", "MonetODBCs.dll"
 VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,47,2)
+VALUE "ProductVersion", sversion(11,47,3)
 END
 END
 BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -10,10 +10,10 @@
 
 set(MONETDB_VERSION_MAJOR "11")
 set(MONETDB_VERSION_MINOR "47")
-set(MONETDB_VERSION_PATCH "2")
+set(MONETDB_VERSION_PATCH "3")
 
 if(RELEASE_VERSION)
-  set(MONETDB_RELEASE "unreleased")
+  set(MONETDB_RELEASE "Jun2023")
 endif()
 set(MONETDB_VERSION 
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
 
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -6,8 +

MonetDB: default - Merge with Jun2023 branch, not changing any f...

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: ea541cf0b705 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ea541cf0b705
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: default
Log Message:

Merge with Jun2023 branch, not changing any files.

___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: Jun2023 - Updated library versions.

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: 434330abba08 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/434330abba08
Modified Files:
cmake/monetdb-versions.cmake
Branch: Jun2023
Log Message:

Updated library versions.


diffs (28 lines):

diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -42,7 +42,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
 # common/options and common/utils)
 set(GDK_VERSION_MAJOR "27")
 set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "0")
+set(GDK_VERSION_PATCH "1")
 set(GDK_VERSION 
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
 
 # version of the MAPI library (subdirectory clients/mapilib)
@@ -54,7 +54,7 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras 
or sql)
 set(MONETDB5_VERSION_MAJOR "34")
 set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "0")
+set(MONETDB5_VERSION_PATCH "1")
 set(MONETDB5_VERSION 
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
 
 # version of the MONETDBE library (subdirectory tools/monetdbe)
@@ -72,5 +72,5 @@ set(STREAM_VERSION "${STREAM_VERSION_MAJ
 # version of the SQL library (subdirectory sql)
 set(SQL_VERSION_MAJOR "14")
 set(SQL_VERSION_MINOR "0")
-set(SQL_VERSION_PATCH "0")
+set(SQL_VERSION_PATCH "1")
 set(SQL_VERSION 
"${SQL_VERSION_MAJOR}.${SQL_VERSION_MINOR}.${SQL_VERSION_PATCH}")
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: Jun2023 - Moved contents of ChangeLog.Jun2023 to MonetD...

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: 79dbf838f044 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/79dbf838f044
Modified Files:
MonetDB.spec
clients/ChangeLog-Archive
clients/ChangeLog.Jun2023
clients/mapiclient/mclient.1
debian/changelog
misc/packages/deb/changelog
misc/packages/rpm/changelog
sql/ChangeLog-Archive
sql/ChangeLog.Jun2023
tools/merovingian/client/monetdb.1
tools/merovingian/daemon/monetdbd.1.in
tools/mserver/mserver5.1.in
Branch: Jun2023
Log Message:

Moved contents of ChangeLog.Jun2023 to MonetDB.spec, debian/changelog and 
ChangeLog-Archive.


diffs (247 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -860,6 +860,30 @@ fi
 %endif
 
 %changelog
+* Thu Jun 22 2023 Sjoerd Mullender  - 11.47.3-20230622
+- Rebuilt.
+- GH#7344: Database upgrade failure due to user object dependency on
+  system procedure
+- GH#7378: MonetDB server crashes at sql_trans_copy_key
+- GH#7379: MonetDB server 11.46.0 crashes at cs_bind_ubat
+- GH#7380: MonetDB server 11.46.0 crashes at `BLOBcmp`
+- GH#7381: MonetDB server 11.46.0 crashes at `log_create_delta`
+- GH#7382: MonetDB server 11.46.0 crashes at `gc_col`
+- GH#7383: MonetDB server 11.46.0 crashes at `list_append`
+- GH#7384: MonetDB server 11.46.0 crashes at `__nss_database_lookup`
+- GH#7386: MonetDB server 11.46.0 crashes in `rel_deps`
+- GH#7387: MonetDB server 11.46.0 crashes in `rel_sequences`
+
+* Tue Jun 20 2023 Sjoerd Mullender  - 11.47.3-20230622
+- clients: The COPY INTO from file ON CLIENT was extended to also look for a
+  relative path name relative to the file from which the query was read.
+  This is only possible if the name of the query file is known, so when
+  it is specified on the command line or read using the interactive
+  \< command.
+
+* Fri Jun 16 2023 Joeri van Ruth  - 
11.47.3-20230622
+- sql: Add MAX_MEMORY and MAX_WORKERS options to the ALTER USER statement
+
 * Fri Jun 16 2023 Sjoerd Mullender  - 11.47.1-20230616
 - Rebuilt.
 - GH#7311: Missing `REGEXP_REPLACE` function.
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,13 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Jun 20 2023 Sjoerd Mullender  - 11.47.3-20230622
+- The COPY INTO from file ON CLIENT was extended to also look for a
+  relative path name relative to the file from which the query was read.
+  This is only possible if the name of the query file is known, so when
+  it is specified on the command line or read using the interactive
+  \< command.
+
 * Mon Apr 17 2023 Sjoerd Mullender  - 11.45.15-20230530
 - If the number of rows in mclient is set to 0 (using either --rows=0
   option or \r0 on the mclient command line), the internal pager is used
diff --git a/clients/ChangeLog.Jun2023 b/clients/ChangeLog.Jun2023
--- a/clients/ChangeLog.Jun2023
+++ b/clients/ChangeLog.Jun2023
@@ -1,10 +1,3 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
-* Tue Jun 20 2023 Sjoerd Mullender 
-- The COPY INTO from file ON CLIENT was extended to also look for a
-  relative path name relative to the file from which the query was read.
-  This is only possible if the name of the query file is known, so when
-  it is specified on the command line or read using the interactive
-  \< command.
-
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -6,7 +6,7 @@
 .\"
 .\" Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
 .\"
-.TH MCLIENT 1 2023-06-16 MonetDB "MonetDB Applications"
+.TH MCLIENT 1 2023-06-22 MonetDB "MonetDB Applications"
 .SH NAME
 mclient \- the MonetDB command-line tool
 .SH SYNOPSIS
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+monetdb (11.47.3) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7344: Database upgrade failure due to user object dependency on
+system procedure
+  * GH#7378: MonetDB server crashes at sql_trans_copy_key
+  * GH#7379: MonetDB server 11.46.0 crashes at cs_bind_ubat
+  * GH#7380: MonetDB server 11.46.0 crashes at `BLOBcmp`
+  * GH#7381: MonetDB server 11.46.0 crashes at `log_create_delta`
+  * GH#7382: MonetDB server 11.46.0 crashes at `gc_col`
+  * GH#7383: MonetDB server 11.46.0 crashes at `list_append`
+  * GH#7384: MonetDB server 11.46.0 crashes at `__nss_database_lookup`
+  * GH#7386: MonetDB server 11.46.0 crashes in `rel_deps`
+  * GH#7387: MonetDB server 11.46.0 crashes in `rel_sequences`
+
+ -- Sjoerd Mullender   Thu, 22 Jun 2023 11:58:29 +0200
+
+monetdb (11.47.3) unstable; urgency=low
+
+  * clients: The COPY INTO from file ON CLIENT was extended to also look for a
+relative path name relative to the file from which the q

MonetDB: Jun2023 - Setting tag Jun2023_3 for the release build.

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: 62088804c987 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/62088804c987
Modified Files:
.hgtags
Branch: Jun2023
Log Message:

Setting tag Jun2023_3 for the release build.


diffs (8 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -805,3 +805,4 @@ d11af9398029c117b92a9be9efa971ac0299ffc4
 8b736d6dcfd63d0560c99fc5427b504c116b74b0 Sep2022_17
 8b736d6dcfd63d0560c99fc5427b504c116b74b0 Sep2022_SP3_release
 aba8c31c60480148cd388a09ac99b42679406258 Jun2023_1
+79dbf838f04483a2d9ccce8332090ff91b18caec Jun2023_3
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: default - Merge with Jun2023 branch.

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: e915d4a508c6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e915d4a508c6
Modified Files:
.hgtags
MonetDB.spec
cmake/monetdb-versions.cmake
debian/changelog
misc/packages/deb/changelog
misc/packages/rpm/changelog
Branch: default
Log Message:

Merge with Jun2023 branch.


diffs (283 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -805,3 +805,4 @@ d11af9398029c117b92a9be9efa971ac0299ffc4
 8b736d6dcfd63d0560c99fc5427b504c116b74b0 Sep2022_17
 8b736d6dcfd63d0560c99fc5427b504c116b74b0 Sep2022_SP3_release
 aba8c31c60480148cd388a09ac99b42679406258 Jun2023_1
+79dbf838f04483a2d9ccce8332090ff91b18caec Jun2023_3
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -860,6 +860,30 @@ fi
 %endif
 
 %changelog
+* Thu Jun 22 2023 Sjoerd Mullender  - 11.47.3-20230622
+- Rebuilt.
+- GH#7344: Database upgrade failure due to user object dependency on
+  system procedure
+- GH#7378: MonetDB server crashes at sql_trans_copy_key
+- GH#7379: MonetDB server 11.46.0 crashes at cs_bind_ubat
+- GH#7380: MonetDB server 11.46.0 crashes at `BLOBcmp`
+- GH#7381: MonetDB server 11.46.0 crashes at `log_create_delta`
+- GH#7382: MonetDB server 11.46.0 crashes at `gc_col`
+- GH#7383: MonetDB server 11.46.0 crashes at `list_append`
+- GH#7384: MonetDB server 11.46.0 crashes at `__nss_database_lookup`
+- GH#7386: MonetDB server 11.46.0 crashes in `rel_deps`
+- GH#7387: MonetDB server 11.46.0 crashes in `rel_sequences`
+
+* Tue Jun 20 2023 Sjoerd Mullender  - 11.47.3-20230622
+- clients: The COPY INTO from file ON CLIENT was extended to also look for a
+  relative path name relative to the file from which the query was read.
+  This is only possible if the name of the query file is known, so when
+  it is specified on the command line or read using the interactive
+  \< command.
+
+* Fri Jun 16 2023 Joeri van Ruth  - 
11.47.3-20230622
+- sql: Add MAX_MEMORY and MAX_WORKERS options to the ALTER USER statement
+
 * Fri Jun 16 2023 Sjoerd Mullender  - 11.47.1-20230616
 - Rebuilt.
 - GH#7311: Missing `REGEXP_REPLACE` function.
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,13 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Jun 20 2023 Sjoerd Mullender  - 11.47.3-20230622
+- The COPY INTO from file ON CLIENT was extended to also look for a
+  relative path name relative to the file from which the query was read.
+  This is only possible if the name of the query file is known, so when
+  it is specified on the command line or read using the interactive
+  \< command.
+
 * Mon Apr 17 2023 Sjoerd Mullender  - 11.45.15-20230530
 - If the number of rows in mclient is set to 0 (using either --rows=0
   option or \r0 on the mclient command line), the internal pager is used
diff --git a/clients/ChangeLog.Jun2023 b/clients/ChangeLog.Jun2023
--- a/clients/ChangeLog.Jun2023
+++ b/clients/ChangeLog.Jun2023
@@ -1,10 +1,3 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
-* Tue Jun 20 2023 Sjoerd Mullender 
-- The COPY INTO from file ON CLIENT was extended to also look for a
-  relative path name relative to the file from which the query was read.
-  This is only possible if the name of the query file is known, so when
-  it is specified on the command line or read using the interactive
-  \< command.
-
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -6,7 +6,7 @@
 .\"
 .\" Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
 .\"
-.TH MCLIENT 1 2023-06-16 MonetDB "MonetDB Applications"
+.TH MCLIENT 1 2023-06-22 MonetDB "MonetDB Applications"
 .SH NAME
 mclient \- the MonetDB command-line tool
 .SH SYNOPSIS
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -42,7 +42,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
 # common/options and common/utils)
 set(GDK_VERSION_MAJOR "27")
 set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "0")
+set(GDK_VERSION_PATCH "1")
 set(GDK_VERSION 
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
 
 # version of the MAPI library (subdirectory clients/mapilib)
@@ -54,7 +54,7 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras 
or sql)
 set(MONETDB5_VERSION_MAJOR "34")
 set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "0")
+set(MONETDB5_VERSION_PATCH "1")
 set(MONETDB5_VERSION 
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
 
 # version of the MONET

MonetDB: Jun2023 - Post release build.

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: e069f4c410ec for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e069f4c410ec
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Jun2023
Log Message:

Post release build.


diffs (191 lines):

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 11.47.3
+current_version = 11.47.4
 commit = False
 tag = False
 
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
 # Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
 
 %global name MonetDB
-%global version 11.47.3
+%global version 11.47.4
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
 # Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
 #define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
 
 1 VERSIONINFO
-  FILEVERSION version(11,47,3)
-  PRODUCTVERSION version(11,47,3)
+  FILEVERSION version(11,47,4)
+  PRODUCTVERSION version(11,47,4)
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
   VALUE "Comments", "\0"
   VALUE "CompanyName", "MonetDB B.V.\0"
   VALUE "FileDescription", "MonetDB Application Interface DLL\0"
-  VALUE "FileVersion", sversion(11,47,3)
+  VALUE "FileVersion", sversion(11,47,4)
   VALUE "InternalName", "Mapi\0"
   VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
   VALUE "LegalTrademarks", "\0"
   VALUE "OriginalFilename", "Mapi.dll\0"
   VALUE "PrivateBuild", "\0"
   VALUE "ProductName", "MonetDB Client Libraries\0"
-  VALUE "ProductVersion", sversion(11,47,3)
+  VALUE "ProductVersion", sversion(11,47,4)
   VALUE "SpecialBuild", "\0"
 END
   END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
 #define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
 
 1 VERSIONINFO
-  FILEVERSION version(11,47,3)
-  PRODUCTVERSION version(11,47,3)
+  FILEVERSION version(11,47,4)
+  PRODUCTVERSION version(11,47,4)
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
   VALUE "Comments", "\0"
   VALUE "CompanyName", "MonetDB B.V.\0"
   VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
-  VALUE "FileVersion", sversion(11,47,3)
+  VALUE "FileVersion", sversion(11,47,4)
   VALUE "InternalName", "MonetODBC\0"
   VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
   VALUE "LegalTrademarks", "\0"
   VALUE "OriginalFilename", "MonetODBC.dll\0"
   VALUE "PrivateBuild", "\0"
   VALUE "ProductName", "MonetDB SQL Server\0"
-  VALUE "ProductVersion", sversion(11,47,3)
+  VALUE "ProductVersion", sversion(11,47,4)
   VALUE "SpecialBuild", "\0"
 END
   END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,47,3)
- PRODUCTVERSION version(11,47,3)
+ FILEVERSION version(11,47,4)
+ PRODUCTVERSION version(11,47,4)
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
 BEGIN
 VALUE "CompanyName", "MonetDB B.V."
 VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,47,3)
+VALUE "FileVersion", sversion(11,47,4)
 VALUE "InternalName", "MonetODBCs.dll"
 VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023"
 VALUE "OriginalFilename", "MonetODBCs.dll"
 VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,47,3)
+VALUE "ProductVersion", sversion(11,47,4)
 END
 END
 BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -10,10 +10,10 @@
 
 set(MONETDB_VERSION_MAJOR "11")
 set(MONETDB_VERSION_MINOR "47")
-set(MONETDB_VERSION_PATCH "3")
+set(MONETDB_VERSION_PATCH "4")
 
 if(RELEASE_VERSION)
-  set(MONETDB_RELEASE "Jun2023")
+  set(MONETDB_RELEASE "unreleased")
 endif()
 set(MONETDB_VERSION 
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
 
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -6,8 +6,8 @@ LANGUAGE

MonetDB: default - Merge with Jun2023 branch, not changing any f...

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: 2f570750dba6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/2f570750dba6
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: default
Log Message:

Merge with Jun2023 branch, not changing any files..

___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: Jun2023 - Fix test for 32 bit architecture.

2023-06-22 Thread Sjoerd Mullender via checkin-list

Changeset: e9f9e3b925a8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e9f9e3b925a8
Modified Files:
clients/odbc/tests/ODBCStmtAttr.c
Branch: Jun2023
Log Message:

Fix test for 32 bit architecture.


diffs (64 lines):

diff --git a/clients/odbc/tests/ODBCStmtAttr.c 
b/clients/odbc/tests/ODBCStmtAttr.c
--- a/clients/odbc/tests/ODBCStmtAttr.c
+++ b/clients/odbc/tests/ODBCStmtAttr.c
@@ -188,12 +188,19 @@ main(int argc, char **argv)
"Set SQL_ATTR_MAX_LENGTH: 2147483641\n"
"Get SQL_ATTR_MAX_LENGTH: 0\n"
" which is different from 2147483641 !!\n");
+#if (SIZEOF_LONG_INT == 8)
GetSetReGetStmtAttr(stmt, SQL_ATTR_MAX_LENGTH, -1,  /* test also 
what happens with a negative value */
"Get SQL_ATTR_MAX_LENGTH: 0\n"
"Set SQL_ATTR_MAX_LENGTH: 18446744073709551615\n"
"Get SQL_ATTR_MAX_LENGTH: 0\n"
" which is different from 18446744073709551615 !!\n");
-
+#else
+   GetSetReGetStmtAttr(stmt, SQL_ATTR_MAX_LENGTH, -1,  /* test also 
what happens with a negative value */
+   "Get SQL_ATTR_MAX_LENGTH: 0\n"
+   "Set SQL_ATTR_MAX_LENGTH: 4294967295\n"
+   "Get SQL_ATTR_MAX_LENGTH: 0\n"
+   " which is different from 4294967295 !!\n");
+#endif
GetSetReGetStmtAttr(stmt, SQL_ATTR_MAX_ROWS, 0,
"Get SQL_ATTR_MAX_ROWS: 0\n"
"Set SQL_ATTR_MAX_ROWS: 0\n"
@@ -208,11 +215,19 @@ main(int argc, char **argv)
"Set SQL_ATTR_MAX_ROWS: 2147483642\n"
"Get SQL_ATTR_MAX_ROWS: 0\n"
" which is different from 2147483642 !!\n");
+#if (SIZEOF_LONG_INT == 8)
GetSetReGetStmtAttr(stmt, SQL_ATTR_MAX_ROWS, -2,/* test also 
what happens with a negative value */
"Get SQL_ATTR_MAX_ROWS: 0\n"
"Set SQL_ATTR_MAX_ROWS: 18446744073709551614\n"
"Get SQL_ATTR_MAX_ROWS: 0\n"
" which is different from 18446744073709551614 !!\n");
+#else
+   GetSetReGetStmtAttr(stmt, SQL_ATTR_MAX_ROWS, -2,/* test also 
what happens with a negative value */
+   "Get SQL_ATTR_MAX_ROWS: 0\n"
+   "Set SQL_ATTR_MAX_ROWS: 4294967294\n"
+   "Get SQL_ATTR_MAX_ROWS: 0\n"
+   " which is different from 4294967294 !!\n");
+#endif
 
GetSetReGetStmtAttr(stmt, SQL_ATTR_QUERY_TIMEOUT, 0,
"Get SQL_ATTR_QUERY_TIMEOUT: 0\n"
@@ -229,11 +244,19 @@ main(int argc, char **argv)
"Set SQL_ATTR_QUERY_TIMEOUT: 2147483643\n"
"Get SQL_ATTR_QUERY_TIMEOUT: 2147483647\n"
" which is different from 2147483643 !!\n");
+#if (SIZEOF_LONG_INT == 8)
GetSetReGetStmtAttr(stmt, SQL_ATTR_QUERY_TIMEOUT, -3,   /* test also 
what happens with a negative value */
"Get SQL_ATTR_QUERY_TIMEOUT: 2147483647\n"
"Set SQL_ATTR_QUERY_TIMEOUT: 18446744073709551613\n"
"Get SQL_ATTR_QUERY_TIMEOUT: 2147483647\n"
" which is different from 18446744073709551613 !!\n");
+#else
+   GetSetReGetStmtAttr(stmt, SQL_ATTR_QUERY_TIMEOUT, -3,   /* test also 
what happens with a negative value */
+   "Get SQL_ATTR_QUERY_TIMEOUT: 2147483647\n"
+   "Set SQL_ATTR_QUERY_TIMEOUT: 4294967293\n"
+   "Get SQL_ATTR_QUERY_TIMEOUT: 2147483647\n"
+   " which is different from 4294967293 !!\n");
+#endif
 
ret = SQLFreeHandle(SQL_HANDLE_STMT, stmt);
check(ret, SQL_HANDLE_STMT, stmt, "SQLFreeHandle (STMT)");
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

monetdb-java: default - Corrected DatabaseMetaData method getCli...

2023-06-22 Thread Martin van Dinther via checkin-list

Changeset: 7f68120de37c for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/7f68120de37c
Modified Files:
ChangeLog
src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java
tests/JDBC_API_Tester.java
Branch: default
Log Message:

Corrected DatabaseMetaData method getClientProperties().
It used to return connection properties instead of client info properties.
Extended tests.

HG En commit message.  Lines beginning with 'HG:' are removed.


diffs (89 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog file for monetdb-java
 # This file is updated with Maddlog
 
+* Thu Jun 22 2023 Martin van Dinther 
+- Corrected DatabaseMetaData method getClientProperties().
+  It used to return connection properties instead of client info properties.
+
 * Thu May  4 2023 Martin van Dinther 
 - Corrected DatabaseMetaData method getStringFunctions() when connected
   to Jun2023 server. It now includes the string functions from the new
diff --git a/src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java 
b/src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java
--- a/src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java
+++ b/src/main/java/org/monetdb/jdbc/MonetDatabaseMetaData.java
@@ -3911,25 +3911,13 @@ public final class MonetDatabaseMetaData
 */
@Override
public ResultSet getClientInfoProperties() throws SQLException {
-   // for a list of connection properties see also 
MonetConnection.java constructor MonetConnection(Properties props)
+   // MonetDB currently does not support any client properties, so 
return an empty ResultSet
final String query =
-   "SELECT * FROM (VALUES " +
-   "('autocommit', cast(5 as int), 'true', 'boolean flag 
true or false to turn autocommit on or off')," +
-   "('database', 1024, 'demo', 'name of database. It 
matches the dbfarm subdirectory name')," +
-   "('debug', 5, 'false', 'boolean flag true or false to 
turn debug logging on or off')," +
-   "('fetchsize', 11, '250', 'number of result rows to 
fetch per round trip')," +  // only supported by servers from version 
11.41.1 onwards
-   "('hash', 128, '', 'hash methods list to use in server 
connection. Supported are SHA512, SHA384, SHA256 and SHA1')," +
-   "('host', 1024, 'localhost', 'DSN or IP-address of 
machine running MonetDB')," +
-   "('language', 16, 'sql', 'language (sql or mal) used to 
parse commands in MonetDB server')," +
-   "('logfile', 1024, 'monet_##.log', 'name of logfile 
used when debug is enabled')," +
-   "('password', 128, '', 'password for user name to login 
to MonetDB server')," +
-   "('port', 5, '5', 'communication port number of 
MonetDB server process')," +
-   "('so_timeout', 10, '0', 'timeout (in milliseconds) of 
communication socket. 0 means no timeout is set')," +
-   "('treat_blob_as_binary', 5, 'true', 'should blob 
columns be mapped to Types.VARBINARY instead of Types.BLOB in ResultSets and 
PreparedStatements')," +
-   "('treat_clob_as_varchar', 5, 'true', 'should clob 
columns be mapped to Types.VARCHAR instead of Types.CLOB in ResultSets and 
PreparedStatements')," +
-   "('user', 1024, '', 'user name to login to MonetDB 
server')" +
-   ") AS t(\"NAME\", \"MAX_LEN\", \"DEFAULT_VALUE\", 
\"DESCRIPTION\")" +
-   " ORDER BY \"NAME\"";
+   "SELECT cast(null as varchar(64)) AS \"NAME\", " +
+   "cast(0 as int) AS \"MAX_LEN\", " +
+   "cast(null as varchar(128)) AS \"DEFAULT_VALUE\", " +
+   "cast(null as varchar(128)) AS \"DESCRIPTION\" " +
+   "WHERE 1=0";
 
return executeMetaDataQuery(query);
}
diff --git a/tests/JDBC_API_Tester.java b/tests/JDBC_API_Tester.java
--- a/tests/JDBC_API_Tester.java
+++ b/tests/JDBC_API_Tester.java
@@ -1344,6 +1344,36 @@ final public class JDBC_API_Tester {
"TABLE_CAT  TABLE_SCHEM TABLE_NAME  
COLUMN_NAME GRANTOR GRANTEE PRIVILEGE   IS_GRANTABLE\n" +
"char(1)varchar(1024)   varchar(1024)   
varchar(1024)   varchar(1024)   varchar(1024)   varchar(40) varchar(3)\n");
 
+   compareResultSet(dbmd.getClientInfoProperties(), 
"getClientInfoProperties()",
+   "Resultset with 4 columns\n" +
+   "NAME   MAX_LEN DEFAULT_VALUE   DESCRIPTION\n" +
+   "varchar(64)int varchar(128)
varchar(128)\n");
+
+   compareResultSet(dbmd.getSuperTables(null, "jdbctst", 
"pk_uc"), "getSuperT

MonetDB: Jul2021 - Approve after pymonetdb upgrade.

MonetDB: Jan2022 - Merge with Jul2021 branch.

MonetDB: Sep2022 - Merge with Jan2022 branch.

MonetDB: Jan2022 - Approve.

MonetDB: Jun2023 - Merge with Sep2022 branch.

MonetDB: Jun2023 - Approve after pymonetdb upgrade.

MonetDB: default - Merge with Jun2023 branch.

MonetDB: Jun2023 - Pre-release version number update.

MonetDB: default - Merge with Jun2023 branch, not changing any f...

MonetDB: Jun2023 - Updated library versions.

MonetDB: Jun2023 - Moved contents of ChangeLog.Jun2023 to MonetD...

MonetDB: Jun2023 - Setting tag Jun2023_3 for the release build.

MonetDB: default - Merge with Jun2023 branch.

MonetDB: Jun2023 - Post release build.

MonetDB: default - Merge with Jun2023 branch, not changing any f...

MonetDB: Jun2023 - Fix test for 32 bit architecture.

monetdb-java: default - Corrected DatabaseMetaData method getCli...

17 matches

Site Navigation

Mail list logo

Footer information