MonetDB: Dec2023 - Dec2023 was released.

2023-12-28 Thread Sjoerd Mullender via checkin-list
Changeset: d1e91c2386f9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d1e91c2386f9
Modified Files:
.hgtags
Branch: Dec2023
Log Message:

Dec2023 was released.


diffs (8 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -819,3 +819,4 @@ c5b17681b55e6ca155db28be59913699e561502a
 c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_17
 c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_SP3_release
 1230526af30f40eeea30fb87c47c3e414920561f Dec2023_1
+1230526af30f40eeea30fb87c47c3e414920561f Dec2023_release
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org


MonetDB: Dec2023 - Dec2023 has been released, so upgrades from d...

2023-12-28 Thread Sjoerd Mullender via checkin-list
Changeset: 01ee70b5e6f8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/01ee70b5e6f8
Modified Files:

sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128

sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-hge/Tests/dump.stable.out
sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade/Tests/dump.stable.out
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: Dec2023
Log Message:

Dec2023 has been released, so upgrades from different source.


diffs (truncated from 12648 to 300 lines):

diff --git 
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- 
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ 
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -1,369 +1,6 @@
 Running database upgrade commands to update system tables.
 
 Running database upgrade commands:
-drop procedure if exists wlc.master() cascade;
-drop procedure if exists wlc.master(string) cascade;
-drop procedure if exists wlc.stop() cascade;
-drop procedure if exists wlc.flush() cascade;
-drop procedure if exists wlc.beat(int) cascade;
-drop function if exists wlc.clock() cascade;
-drop function if exists wlc.tick() cascade;
-drop procedure if exists wlr.master(string) cascade;
-drop procedure if exists wlr.stop() cascade;
-drop procedure if exists wlr.accept() cascade;
-drop procedure if exists wlr.replicate() cascade;
-drop procedure if exists wlr.replicate(timestamp) cascade;
-drop procedure if exists wlr.replicate(tinyint) cascade;
-drop procedure if exists wlr.replicate(smallint) cascade;
-drop procedure if exists wlr.replicate(integer) cascade;
-drop procedure if exists wlr.replicate(bigint) cascade;
-drop procedure if exists wlr.beat(integer) cascade;
-drop function if exists wlr.clock() cascade;
-drop function if exists wlr.tick() cascade;
-drop schema if exists wlc cascade;
-drop schema if exists wlr cascade;
-
-Running database upgrade commands:
-create function sys.regexp_replace(ori string, pat string, rep string, flg 
string)
-returns string external name pcre.replace;
-grant execute on function regexp_replace(string, string, string, string) to 
public;
-create function sys.regexp_replace(ori string, pat string, rep string)
-returns string
-begin
- return sys.regexp_replace(ori, pat, rep, '');
-end;
-grant execute on function regexp_replace(string, string, string) to public;
-update sys.functions set system = true where system <> true and name = 
'regexp_replace' and schema_id = 2000 and type = 1;
-
-Running database upgrade commands:
-drop function if exists sys.dump_database(boolean) cascade;
-drop procedure if exists sys.dump_table_data() cascade;
-drop procedure if exists sys.dump_table_data(string, string) cascade;
-drop view if exists sys.dump_tables cascade;
-drop view if exists sys.dump_comments cascade;
-drop function if exists sys.prepare_esc(string, string) cascade;
-drop view if exists sys.dump_partition_tables cascade;
-drop view if exists sys.dump_create_users cascade;
-drop view if exists sys.describe_tables cascade;
-drop function if exists sys.get_remote_table_expressions(string, string) 
cascade;
-drop function if exists sys.remote_table_credentials(string) cascade;
-drop function if exists sys.sq(string) ca

MonetDB: default - Merge with Dec2023 branch.

2023-12-28 Thread Sjoerd Mullender via checkin-list
Changeset: fd47d316bd86 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fd47d316bd86
Branch: default
Log Message:

Merge with Dec2023 branch.


diffs (truncated from 12656 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -819,3 +819,4 @@ c5b17681b55e6ca155db28be59913699e561502a
 c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_17
 c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_SP3_release
 1230526af30f40eeea30fb87c47c3e414920561f Dec2023_1
+1230526af30f40eeea30fb87c47c3e414920561f Dec2023_release
diff --git 
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- 
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ 
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -1,369 +1,6 @@
 Running database upgrade commands to update system tables.
 
 Running database upgrade commands:
-drop procedure if exists wlc.master() cascade;
-drop procedure if exists wlc.master(string) cascade;
-drop procedure if exists wlc.stop() cascade;
-drop procedure if exists wlc.flush() cascade;
-drop procedure if exists wlc.beat(int) cascade;
-drop function if exists wlc.clock() cascade;
-drop function if exists wlc.tick() cascade;
-drop procedure if exists wlr.master(string) cascade;
-drop procedure if exists wlr.stop() cascade;
-drop procedure if exists wlr.accept() cascade;
-drop procedure if exists wlr.replicate() cascade;
-drop procedure if exists wlr.replicate(timestamp) cascade;
-drop procedure if exists wlr.replicate(tinyint) cascade;
-drop procedure if exists wlr.replicate(smallint) cascade;
-drop procedure if exists wlr.replicate(integer) cascade;
-drop procedure if exists wlr.replicate(bigint) cascade;
-drop procedure if exists wlr.beat(integer) cascade;
-drop function if exists wlr.clock() cascade;
-drop function if exists wlr.tick() cascade;
-drop schema if exists wlc cascade;
-drop schema if exists wlr cascade;
-
-Running database upgrade commands:
-create function sys.regexp_replace(ori string, pat string, rep string, flg 
string)
-returns string external name pcre.replace;
-grant execute on function regexp_replace(string, string, string, string) to 
public;
-create function sys.regexp_replace(ori string, pat string, rep string)
-returns string
-begin
- return sys.regexp_replace(ori, pat, rep, '');
-end;
-grant execute on function regexp_replace(string, string, string) to public;
-update sys.functions set system = true where system <> true and name = 
'regexp_replace' and schema_id = 2000 and type = 1;
-
-Running database upgrade commands:
-drop function if exists sys.dump_database(boolean) cascade;
-drop procedure if exists sys.dump_table_data() cascade;
-drop procedure if exists sys.dump_table_data(string, string) cascade;
-drop view if exists sys.dump_tables cascade;
-drop view if exists sys.dump_comments cascade;
-drop function if exists sys.prepare_esc(string, string) cascade;
-drop view if exists sys.dump_partition_tables cascade;
-drop view if exists sys.dump_create_users cascade;
-drop view if exists sys.describe_tables cascade;
-drop function if exists sys.get_remote_table_expressions(string, string) 
cascade;
-drop function if exists sys.remote_table_credentials(string) cascade;
-drop function if exists sys.sq(string) cascade;
-create table sys.remote_user_info (table_id int, username varchar(1024), 
password varchar(256));
-create function sys.decypher (cypher string) returns string external name 
sql.decypher;
-update sys.functions set system = true where system <> true and name = 
'decypher' and schema_id = 2000 and type = 1;
-update sys._tables set system = true where system <> true and name = 
'remote_user_info' and schema_id = 2000;
-CREATE FUNCTION sys.SQ (s STRING) RETURNS STRING BEGIN RETURN  || 
sys.replace(s,,'') || ; END;
-CREATE FUNCTION sys.get_remote_table_expressions(s STRING, t STRING) RETURNS 
STRING BEGIN
- RETURN SELECT ' ON ' || sys.SQ(tt.query) || ' WITH USER ' || sys.SQ(username) 
|| ' ENCRYPTED PASSWORD ' || sys.SQ(sys.decypher("password")) FROM 
sys.remote_user_info r, sys._tables tt, sys.schemas ss where tt.name = t and 
ss.name = s and tt.schema_id = ss.id and r.table_id = tt.id;
-END;
-CREATE VIEW sys.describe_tables AS
- SELECT
- t.id o,
- s.name sch,
- t.name tab,
- ts.table_type_name typ,
- (SELECT
- ' (' ||
- GROUP_CONCAT(
- sys.DQ(c.name) || ' ' ||
- sys.describe_type(c.type, c.type_digits, c.type_scale) ||
- ifthenelse(c."null" = 'false', ' NOT NULL', '')
- , ', ') || ')'
- FROM sys._columns c
- WHERE c.table_id = t.id) col,
- CASE ts.table_type_name
- WHEN 'REMOTE TABLE' THEN
- sys.get_remote_table_expressions(s.name, t.name)
- WHEN 'MERGE TABLE' THEN
- sys.get_merge_table_partition_expressions(t.id)
- WHEN 'VIEW' THEN
- sys.schema_guard(s.name, t.name, t.query)
- ELSE
- ''
- END opt
- FROM sys.schemas s, sys.table_types ts, sys.tables t
- WHERE ts.table_typ

MonetDB: Dec2023 - Changed some error messages.

2023-12-28 Thread Sjoerd Mullender via checkin-list
Changeset: 8b3a780eb4d8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8b3a780eb4d8
Modified Files:
gdk/gdk_logger.c
gdk/gdk_logger_old.c
Branch: Dec2023
Log Message:

Changed some error messages.


diffs (42 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -207,7 +207,7 @@ logbat_new(int tt, BUN size, role_t role
if (role == PERSISTENT)
BATmode(nb, false);
} else {
-   TRC_CRITICAL(GDK, "creating new BAT[void:%s]#" BUNFMT " 
failed\n", ATOMname(tt), size);
+   TRC_CRITICAL(GDK, "creating new BAT[%s]#" BUNFMT " failed\n", 
ATOMname(tt), size);
}
return nb;
 }
@@ -2308,7 +2308,7 @@ log_new(int debug, const char *fn, const
lg->dir == NULL ||
lg->rbuf == NULL ||
lg->wbuf == NULL) {
-   TRC_CRITICAL(GDK, "strdup failed\n");
+   TRC_CRITICAL(GDK, "allocating for logger structure failed\n");
GDKfree(lg->fn);
GDKfree(lg->dir);
GDKfree(lg->rbuf);
@@ -2582,7 +2582,7 @@ log_flush(logger *lg, ulng ts)
}
if (strlen(filename) >= FILENAME_MAX) {
GDKfree(updated);
-   GDKerror("Logger filename path is too large\n");
+   TRC_CRITICAL(GDK, "Logger filename path is too 
large\n");
GDKfree(filename);
return GDK_FAIL;
}
diff --git a/gdk/gdk_logger_old.c b/gdk/gdk_logger_old.c
--- a/gdk/gdk_logger_old.c
+++ b/gdk/gdk_logger_old.c
@@ -211,7 +211,7 @@ logbat_new(int tt, BUN size, role_t role
if (role == PERSISTENT)
BATmode(nb, false);
} else {
-   TRC_CRITICAL(GDK, "creating new BAT[void:%s]#" BUNFMT " 
failed\n", ATOMname(tt), size);
+   TRC_CRITICAL(GDK, "creating new BAT[%s]#" BUNFMT " failed\n", 
ATOMname(tt), size);
}
return nb;
 }
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org


monetdb-java: default - In ResultSet.getObject(column, Class ...

2023-12-28 Thread Martin van Dinther via checkin-list
Changeset: 7eb05cbf67dc for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/7eb05cbf67dc
Modified Files:
ChangeLog
src/main/java/org/monetdb/jdbc/MonetResultSet.java
tests/JDBC_API_Tester.java
Branch: default
Log Message:

In ResultSet.getObject(column, Class type) and ResultSet.getObject(column, 
Map>) methods added support to return objects for classes: 
java.time.LocalDate, java.time.LocalDateTime.


diffs (truncated from 329 to 300 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog file for monetdb-java
 # This file is updated with Maddlog
 
+* Thu Dec 28 2023 Martin van Dinther 
+- In ResultSet.getObject(column, Class type) and
+  ResultSet.getObject(column, Map>) methods added support
+  to return objects for classes: java.time.LocalDate, java.time.LocalDateTime
+  and java.time.LocalTime.
+
 * Wed Dec 20 2023 Martin van Dinther 
 - Enhanced DatabaseMetaData.getTables() method by adding support for SQL
   table type names: 'BASE TABLE', 'GLOBAL TEMPORARY' and 'LOCAL TEMPORARY'
diff --git a/src/main/java/org/monetdb/jdbc/MonetResultSet.java 
b/src/main/java/org/monetdb/jdbc/MonetResultSet.java
--- a/src/main/java/org/monetdb/jdbc/MonetResultSet.java
+++ b/src/main/java/org/monetdb/jdbc/MonetResultSet.java
@@ -38,8 +38,12 @@ import java.sql.Time;
 import java.sql.Timestamp;
 import java.sql.Types;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.OffsetDateTime;
 import java.time.OffsetTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Map;
 import java.util.TimeZone;
@@ -1546,12 +1550,21 @@ public class MonetResultSet
if (type == Timestamp.class) {
return getTimestamp(columnIndex, null);
}
-   if (type == OffsetTime.class) {
-   return getOffsetTime(columnIndex);
+   if (type == LocalDate.class) {
+   return getLocalDate(columnIndex);
+   }
+   if (type == LocalDateTime.class) {
+   return getLocalDateTime(columnIndex);
+   }
+   if (type == LocalTime.class) {
+   return getLocalTime(columnIndex);
}
if (type == OffsetDateTime.class) {
return getOffsetDateTime(columnIndex);
}
+   if (type == OffsetTime.class) {
+   return getOffsetTime(columnIndex);
+   }
if (type == Clob.class) {
return getClob(columnIndex);
}
@@ -3277,12 +3290,21 @@ public class MonetResultSet
if (type == Timestamp.class) {
return type.cast(getTimestamp(columnIndex, null));
}
-   if (type == OffsetTime.class) {
-   return type.cast(getOffsetTime(columnIndex));
+   if (type == LocalDate.class) {
+   return type.cast(getLocalDate(columnIndex));
+   }
+   if (type == LocalDateTime.class) {
+   return type.cast(getLocalDateTime(columnIndex));
+   }
+   if (type == LocalTime.class) {
+   return type.cast(getLocalTime(columnIndex));
}
if (type == OffsetDateTime.class) {
return type.cast(getOffsetDateTime(columnIndex));
}
+   if (type == OffsetTime.class) {
+   return type.cast(getOffsetTime(columnIndex));
+   }
if (type == java.util.Date.class) {
final Timestamp timestamp = getTimestamp(columnIndex, 
null);
return type.cast(new 
java.util.Date(timestamp.getTime()));
@@ -3392,14 +3414,14 @@ public class MonetResultSet
 
/**
 * Retrieves the value of the designated column in the current row
-* of this ResultSet object and will convert to OffsetTime.
+* of this ResultSet object and will convert to LocalDate.
 * If the conversion is not supported a SQLException is thrown.
 *
 * @param columnIndex the first column is 1, the second is 2, ...
-* @return OffsetTime object or null
+* @return LocalDate object or null
 * @throws SQLException if conversion is not supported
 */
-   private OffsetTime getOffsetTime(final int columnIndex) throws 
SQLException {
+   private LocalDate getLocalDate(final int columnIndex) throws 
SQLException {
final String val;
try {
val = tlp.values[columnIndex - 1];
@@ -3408,11 +3430,78 @@ public class MonetResultSet
return null;
}