MonetDB: Jun2023 - There are no cached bats (since 2012).
Changeset: 08d72e4e6a7a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/08d72e4e6a7a Modified Files: gdk/gdk_bbp.c Branch: Jun2023 Log Message: There are no cached bats (since 2012). diffs (74 lines): diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c --- a/gdk/gdk_bbp.c +++ b/gdk/gdk_bbp.c @@ -2206,8 +2206,7 @@ void BBPdump(void) { size_t mem = 0, vm = 0; - size_t cmem = 0, cvm = 0; - int n = 0, nc = 0; + int n = 0; for (bat i = 0; i < (bat) ATOMIC_GET(&BBPsize); i++) { if (BBP_refs(i) == 0 && BBP_lrefs(i) == 0) @@ -2239,15 +2238,9 @@ BBPdump(void) b->theap->farmid, b->theap->base == NULL ? "X" : b->theap->storage == STORE_MMAP ? "M" : "", status & BBPSWAPPED ? "(Swapped)" : b->theap->dirty ? "(Dirty)" : ""); - if (BBP_logical(i) && BBP_logical(i)[0] == '.') { - cmem += HEAPmemsize(b->theap); - cvm += HEAPvmsize(b->theap); - nc++; - } else { - mem += HEAPmemsize(b->theap); - vm += HEAPvmsize(b->theap); - n++; - } + mem += HEAPmemsize(b->theap); + vm += HEAPvmsize(b->theap); + n++; } } if (b->tvheap) { @@ -2263,13 +2256,8 @@ BBPdump(void) b->tvheap->farmid, b->tvheap->base == NULL ? "X" : b->tvheap->storage == STORE_MMAP ? "M" : "", b->tvheap->dirty ? "(Dirty)" : ""); - if (BBP_logical(i) && BBP_logical(i)[0] == '.') { - cmem += HEAPmemsize(b->tvheap); - cvm += HEAPvmsize(b->tvheap); - } else { - mem += HEAPmemsize(b->tvheap); - vm += HEAPvmsize(b->tvheap); - } + mem += HEAPmemsize(b->tvheap); + vm += HEAPvmsize(b->tvheap); } } if (MT_rwlock_rdtry(&b->thashlock)) { @@ -2279,22 +2267,15 @@ BBPdump(void) fprintf(stderr, " Thash=[%zu,%zu,f=%d/%d]", m, v, b->thash->heaplink.farmid, b->thash->heapbckt.farmid); - if (BBP_logical(i) && BBP_logical(i)[0] == '.') { - cmem += m; - cvm += v; - } else { - mem += m; - vm += v; - } + mem += m; + vm += v; } MT_rwlock_rdunlock(&b->thashlock); } fprintf(stderr, " role: %s\n", b->batRole == PERSISTENT ? "persistent" : "transient"); } - fprintf(stderr, - "# %d bats: mem=%zu, vm=%zu %d cached bats: mem=%zu, vm=%zu\n", - n, mem, vm, nc, cmem, cvm); + fprintf(stderr, "# %d bats: mem=%zu, vm=%zu\n", n, mem, vm); fflush(stderr); } ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
monetdb-java: default - Improve the implementation of abort() by...
Changeset: c85c2d90d31f for monetdb-java URL: https://dev.monetdb.org/hg/monetdb-java/rev/c85c2d90d31f Modified Files: src/main/java/org/monetdb/jdbc/MonetConnection.java Branch: default Log Message: Improve the implementation of abort() by using the provided Executor object. diffs (22 lines): diff --git a/src/main/java/org/monetdb/jdbc/MonetConnection.java b/src/main/java/org/monetdb/jdbc/MonetConnection.java --- a/src/main/java/org/monetdb/jdbc/MonetConnection.java +++ b/src/main/java/org/monetdb/jdbc/MonetConnection.java @@ -1585,9 +1585,15 @@ public class MonetConnection return; if (executor == null) throw new SQLException("executor is null", "M1M05"); - // this is really the simplest thing to do, it destroys - // everything (in particular the server connection) - close(); + + executor.execute(new Runnable() { + @Override + public void run() { + // this is really the simplest thing to do, it destroys + // everything (in particular the server connection) + close(); + } + }); } /** ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - add unregister function
Changeset: eecb5f4c9094 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/eecb5f4c9094 Modified Files: sql/backends/monet5/vaults/csv/csv.c sql/server/rel_file_loader.c sql/server/rel_file_loader.h Branch: default Log Message: add unregister function diffs (43 lines): diff --git a/sql/backends/monet5/vaults/csv/csv.c b/sql/backends/monet5/vaults/csv/csv.c --- a/sql/backends/monet5/vaults/csv/csv.c +++ b/sql/backends/monet5/vaults/csv/csv.c @@ -497,6 +497,7 @@ CSVprelude(Client cntxt, MalBlkPtr mb, M static str CSVepilogue(void *ret) { + fl_unregister("csv"); (void)ret; return MAL_SUCCEED; } diff --git a/sql/server/rel_file_loader.c b/sql/server/rel_file_loader.c --- a/sql/server/rel_file_loader.c +++ b/sql/server/rel_file_loader.c @@ -14,6 +14,17 @@ fl_exit(void) } } +void +fl_unregister(char *name) +{ + file_loader_t *fl = fl_find(name); + + if (fl) { + GDKfree(fl->name); + fl->name = NULL; + } +} + int fl_register(char *name, fl_add_types_fptr add_types, fl_load_fptr load) { diff --git a/sql/server/rel_file_loader.h b/sql/server/rel_file_loader.h --- a/sql/server/rel_file_loader.h +++ b/sql/server/rel_file_loader.h @@ -23,6 +23,7 @@ typedef struct file_loader_t { } file_loader_t; sql_export int fl_register(char *name, fl_add_types_fptr add_types, fl_load_fptr fl_load); +sql_export void fl_unregister(char *name); extern file_loader_t* fl_find(char *name); extern void fl_exit(void); ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Fix up changelog files.
Changeset: 1fc92cb11501 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/1fc92cb11501 Removed Files: ChangeLog.Sep2022 clients/ChangeLog.Sep2022 clients/mapilib/ChangeLog.Sep2022 clients/odbc/ChangeLog.Sep2022 common/stream/ChangeLog.Sep2022 gdk/ChangeLog.Sep2022 geom/ChangeLog.Sep2022 misc/ChangeLog.Sep2022 monetdb5/ChangeLog.Sep2022 sql/ChangeLog.Sep2022 testing/ChangeLog.Sep2022 tools/merovingian/ChangeLog.Sep2022 Modified Files: monetdb5/ChangeLog.Jun2023 sql/ChangeLog.Jun2023 Branch: Jun2023 Log Message: Fix up changelog files. We'll add the messages to the SP1 release, even though they already exist in the feature release. diffs (134 lines): diff --git a/ChangeLog.Sep2022 b/ChangeLog.Sep2022 deleted file mode 100644 --- a/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for devel -# This file is updated with Maddlog - diff --git a/clients/ChangeLog.Sep2022 b/clients/ChangeLog.Sep2022 deleted file mode 100644 --- a/clients/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for clients -# This file is updated with Maddlog - diff --git a/clients/mapilib/ChangeLog.Sep2022 b/clients/mapilib/ChangeLog.Sep2022 deleted file mode 100644 --- a/clients/mapilib/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for mapilib -# This file is updated with Maddlog - diff --git a/clients/odbc/ChangeLog.Sep2022 b/clients/odbc/ChangeLog.Sep2022 deleted file mode 100644 --- a/clients/odbc/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for odbc -# This file is updated with Maddlog - diff --git a/common/stream/ChangeLog.Sep2022 b/common/stream/ChangeLog.Sep2022 deleted file mode 100644 --- a/common/stream/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for stream -# This file is updated with Maddlog - diff --git a/gdk/ChangeLog.Sep2022 b/gdk/ChangeLog.Sep2022 deleted file mode 100644 --- a/gdk/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for GDK -# This file is updated with Maddlog - diff --git a/geom/ChangeLog.Sep2022 b/geom/ChangeLog.Sep2022 deleted file mode 100644 --- a/geom/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for geom -# This file is updated with Maddlog - diff --git a/misc/ChangeLog.Sep2022 b/misc/ChangeLog.Sep2022 deleted file mode 100644 --- a/misc/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for buildtools -# This file is updated with Maddlog - diff --git a/monetdb5/ChangeLog.Jun2023 b/monetdb5/ChangeLog.Jun2023 --- a/monetdb5/ChangeLog.Jun2023 +++ b/monetdb5/ChangeLog.Jun2023 @@ -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/ChangeLog.Sep2022 b/monetdb5/ChangeLog.Sep2022 deleted file mode 100644 --- a/monetdb5/ChangeLog.Sep2022 +++ /dev/null @@ -1,9 +0,0 @@ -# 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/sql/ChangeLog.Jun2023 b/sql/ChangeLog.Jun2023 --- a/sql/ChangeLog.Jun2023 +++ b/sql/ChangeLog.Jun2023 @@ -1,3 +1,9 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Fri Jun 9 2023 Sjoerd Mullender +- An upgrade that both creates a new .snapshot user and extends the + sys.db_user_info table with (among others) a password column did + these in such a way that the passord value for the new user was NULL. + This is fixed by updating the password. + diff --git a/sql/ChangeLog.Sep2022 b/sql/ChangeLog.Sep2022 deleted file mode 100644 --- a/sql/ChangeLog.Sep2022 +++ /dev/null @@ -1,9 +0,0 @@ -# ChangeLog file for sql -# This file is updated with Maddlog - -* Fri Jun 9 2023 Sjoerd Mullender -- An upgrade that both creates a new .snapshot user and extends the - sys.db_user_info table with (among others) a password column did - these in such a way that the passord value for the new user was NULL. - This is fixed by updating the password. - diff --git a/testing/ChangeLog.Sep2022 b/testing/ChangeLog.Sep2022 deleted file mode 100644 --- a/testing/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for testing -# This file is updated with Maddlog - diff --git a/tools/merovingian/ChangeLog.Sep2022 b/tools/merovingian/ChangeLog.Sep2022 deleted file mode 100644 --- a/tools/merovingian/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for
MonetDB: default - merged with jun2023
Changeset: 633b99a61e7e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/633b99a61e7e Modified Files: gdk/CMakeLists.txt gdk/gdk_bat.c gdk/gdk_bbp.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_statement.c sql/common/sql_list.c sql/server/rel_select.c Branch: default Log Message: merged with jun2023 diffs (truncated from 1721 to 300 lines): diff --git a/ChangeLog.Sep2022 b/ChangeLog.Sep2022 deleted file mode 100644 --- a/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for devel -# This file is updated with Maddlog - diff --git a/clients/ChangeLog.Sep2022 b/clients/ChangeLog.Sep2022 deleted file mode 100644 --- a/clients/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for clients -# This file is updated with Maddlog - diff --git a/clients/mapilib/ChangeLog.Sep2022 b/clients/mapilib/ChangeLog.Sep2022 deleted file mode 100644 --- a/clients/mapilib/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for mapilib -# This file is updated with Maddlog - diff --git a/clients/odbc/ChangeLog.Sep2022 b/clients/odbc/ChangeLog.Sep2022 deleted file mode 100644 --- a/clients/odbc/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for odbc -# This file is updated with Maddlog - diff --git a/common/stream/ChangeLog.Sep2022 b/common/stream/ChangeLog.Sep2022 deleted file mode 100644 --- a/common/stream/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for stream -# This file is updated with Maddlog - diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt --- a/gdk/CMakeLists.txt +++ b/gdk/CMakeLists.txt @@ -145,6 +145,7 @@ install(TARGETS EXPORT gdkTargets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT monetdb LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT monetdb @@ -155,8 +156,7 @@ install(TARGETS PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb COMPONENT monetdbdev - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT monetdbdev) + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(EXPORT gdkTargets FILE gdkTargets.cmake diff --git a/gdk/ChangeLog.Sep2022 b/gdk/ChangeLog.Sep2022 deleted file mode 100644 --- a/gdk/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for GDK -# This file is updated with Maddlog - diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk/gdk_bat.c @@ -283,10 +283,12 @@ COLnew2(oid hseq, int tt, BUN cap, role_ } if (bn->tvheap && width == 0 && ATOMheap(tt, bn->tvheap, cap) != GDK_SUCCEED) { + HEAPfree(bn->theap, true); goto bailout; } DELTAinit(bn); if (BBPcacheit(bn, true) != GDK_SUCCEED) { + /* cannot happen, function always returns success */ goto bailout; } TRC_DEBUG(ALGO, "-> " ALGOBATFMT "\n", ALGOBATPAR(bn)); diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c --- a/gdk/gdk_bbp.c +++ b/gdk/gdk_bbp.c @@ -2207,8 +2207,7 @@ void BBPdump(void) { size_t mem = 0, vm = 0; - size_t cmem = 0, cvm = 0; - int n = 0, nc = 0; + int n = 0; for (bat i = 0; i < (bat) ATOMIC_GET(&BBPsize); i++) { if (BBP_refs(i) == 0 && BBP_lrefs(i) == 0) @@ -2240,15 +2239,9 @@ BBPdump(void) b->theap->farmid, b->theap->base == NULL ? "X" : b->theap->storage == STORE_MMAP ? "M" : "", status & BBPSWAPPED ? "(Swapped)" : b->theap->dirty ? "(Dirty)" : ""); - if (BBP_logical(i) && BBP_logical(i)[0] == '.') { - cmem += HEAPmemsize(b->theap); - cvm += HEAPvmsize(b->theap); - nc++; - } else { - mem += HEAPmemsize(b->theap); - vm += HEAPvmsize(b->theap); - n++; - } + mem += HEAPmemsize(b->theap); + vm += HEAPvmsize(b->theap); + n++; } } if (b->tvheap) { @@ -2264,13 +2257,8 @@ BBPdump(void) b->tvheap->farmid, b->tvheap->base == NULL ? "X" : b->tvheap->storage == STORE_MMAP ? "M" : "", b->tvheap->dirty ? "(Dirty)" : ""); - if (BBP_logical(i) && BBP_logical(i)[0] == '.') { - cmem += HEAPmemsize(b->tvheap); - cvm += HEAPvmsize(b->tvheap); - } else { -
MonetDB: Jun2023 - more component fixing in resulting cmake files
Changeset: 15d8d02b7f87 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/15d8d02b7f87 Modified Files: common/stream/CMakeLists.txt gdk/CMakeLists.txt Branch: Jun2023 Log Message: more component fixing in resulting cmake files diffs (27 lines): diff --git a/common/stream/CMakeLists.txt b/common/stream/CMakeLists.txt --- a/common/stream/CMakeLists.txt +++ b/common/stream/CMakeLists.txt @@ -129,10 +129,9 @@ install(TARGETS DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT stream PUBLIC_HEADER + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb COMPONENT streamdev - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT streamdev) + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(EXPORT streamTargets FILE streamTargets.cmake diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt --- a/gdk/CMakeLists.txt +++ b/gdk/CMakeLists.txt @@ -138,7 +138,6 @@ endif() install(TARGETS bat - COMPONENT monetdb EXPORT gdkTargets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - fix leak of lockfile memory
Changeset: 1e9d53caa56e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/1e9d53caa56e Modified Files: gdk/gdk_bbp.c Branch: Jun2023 Log Message: fix leak of lockfile memory diffs (31 lines): diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c --- a/gdk/gdk_bbp.c +++ b/gdk/gdk_bbp.c @@ -1845,6 +1845,7 @@ BBPinit(void) */ static int backup_files = 0, backup_dir = 0, backup_subdir = 0; +static char *lockfile = NULL; void BBPexit(void) @@ -1902,7 +1903,10 @@ BBPexit(void) backup_files = 0; backup_dir = 0; backup_subdir = 0; - + if (lockfile) { + GDKfree(lockfile); + lockfile = NULL; + } } /* @@ -4491,7 +4495,6 @@ BBPcallbacks(void) * This is at the end of the file on purpose: we don't want people to * accidentally use GDKtmLock directly. */ static MT_Lock GDKtmLock = MT_LOCK_INITIALIZER(GDKtmLock); -static char *lockfile; static int lockfd; void ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - merged
Changeset: 46c883f34b63 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/46c883f34b63 Branch: Jun2023 Log Message: merged diffs (134 lines): diff --git a/ChangeLog.Sep2022 b/ChangeLog.Sep2022 deleted file mode 100644 --- a/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for devel -# This file is updated with Maddlog - diff --git a/clients/ChangeLog.Sep2022 b/clients/ChangeLog.Sep2022 deleted file mode 100644 --- a/clients/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for clients -# This file is updated with Maddlog - diff --git a/clients/mapilib/ChangeLog.Sep2022 b/clients/mapilib/ChangeLog.Sep2022 deleted file mode 100644 --- a/clients/mapilib/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for mapilib -# This file is updated with Maddlog - diff --git a/clients/odbc/ChangeLog.Sep2022 b/clients/odbc/ChangeLog.Sep2022 deleted file mode 100644 --- a/clients/odbc/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for odbc -# This file is updated with Maddlog - diff --git a/common/stream/ChangeLog.Sep2022 b/common/stream/ChangeLog.Sep2022 deleted file mode 100644 --- a/common/stream/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for stream -# This file is updated with Maddlog - diff --git a/gdk/ChangeLog.Sep2022 b/gdk/ChangeLog.Sep2022 deleted file mode 100644 --- a/gdk/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for GDK -# This file is updated with Maddlog - diff --git a/geom/ChangeLog.Sep2022 b/geom/ChangeLog.Sep2022 deleted file mode 100644 --- a/geom/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for geom -# This file is updated with Maddlog - diff --git a/misc/ChangeLog.Sep2022 b/misc/ChangeLog.Sep2022 deleted file mode 100644 --- a/misc/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for buildtools -# This file is updated with Maddlog - diff --git a/monetdb5/ChangeLog.Jun2023 b/monetdb5/ChangeLog.Jun2023 --- a/monetdb5/ChangeLog.Jun2023 +++ b/monetdb5/ChangeLog.Jun2023 @@ -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/ChangeLog.Sep2022 b/monetdb5/ChangeLog.Sep2022 deleted file mode 100644 --- a/monetdb5/ChangeLog.Sep2022 +++ /dev/null @@ -1,9 +0,0 @@ -# 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/sql/ChangeLog.Jun2023 b/sql/ChangeLog.Jun2023 --- a/sql/ChangeLog.Jun2023 +++ b/sql/ChangeLog.Jun2023 @@ -1,3 +1,9 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Fri Jun 9 2023 Sjoerd Mullender +- An upgrade that both creates a new .snapshot user and extends the + sys.db_user_info table with (among others) a password column did + these in such a way that the passord value for the new user was NULL. + This is fixed by updating the password. + diff --git a/sql/ChangeLog.Sep2022 b/sql/ChangeLog.Sep2022 deleted file mode 100644 --- a/sql/ChangeLog.Sep2022 +++ /dev/null @@ -1,9 +0,0 @@ -# ChangeLog file for sql -# This file is updated with Maddlog - -* Fri Jun 9 2023 Sjoerd Mullender -- An upgrade that both creates a new .snapshot user and extends the - sys.db_user_info table with (among others) a password column did - these in such a way that the passord value for the new user was NULL. - This is fixed by updating the password. - diff --git a/testing/ChangeLog.Sep2022 b/testing/ChangeLog.Sep2022 deleted file mode 100644 --- a/testing/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for testing -# This file is updated with Maddlog - diff --git a/tools/merovingian/ChangeLog.Sep2022 b/tools/merovingian/ChangeLog.Sep2022 deleted file mode 100644 --- a/tools/merovingian/ChangeLog.Sep2022 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for sql/src/backends/monet5/merovingian -# This file is updated with mchangelog - ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - merged with jun2023
Changeset: 5863ea78ff21 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/5863ea78ff21 Modified Files: common/stream/CMakeLists.txt gdk/CMakeLists.txt gdk/gdk_bbp.c Branch: default Log Message: merged with jun2023 diffs (58 lines): diff --git a/common/stream/CMakeLists.txt b/common/stream/CMakeLists.txt --- a/common/stream/CMakeLists.txt +++ b/common/stream/CMakeLists.txt @@ -130,10 +130,9 @@ install(TARGETS DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT stream PUBLIC_HEADER + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb COMPONENT streamdev - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT streamdev) + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(EXPORT streamTargets FILE streamTargets.cmake diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt --- a/gdk/CMakeLists.txt +++ b/gdk/CMakeLists.txt @@ -141,7 +141,6 @@ endif() install(TARGETS bat - COMPONENT monetdb EXPORT gdkTargets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c --- a/gdk/gdk_bbp.c +++ b/gdk/gdk_bbp.c @@ -1846,6 +1846,7 @@ BBPinit(void) */ static int backup_files = 0, backup_dir = 0, backup_subdir = 0; +static char *lockfile = NULL; void BBPexit(void) @@ -1903,7 +1904,10 @@ BBPexit(void) backup_files = 0; backup_dir = 0; backup_subdir = 0; - + if (lockfile) { + GDKfree(lockfile); + lockfile = NULL; + } } /* @@ -4492,7 +4496,6 @@ BBPcallbacks(void) * This is at the end of the file on purpose: we don't want people to * accidentally use GDKtmLock directly. */ static MT_Lock GDKtmLock = MT_LOCK_INITIALIZER(GDKtmLock); -static char *lockfile; static int lockfd; void ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Missing parenthesis.
Changeset: 6eadc519fbee for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/6eadc519fbee Modified Files: gdk/gdk_system.h Branch: Jun2023 Log Message: Missing parenthesis. diffs (32 lines): diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h --- a/gdk/gdk_system.h +++ b/gdk/gdk_system.h @@ -468,17 +468,17 @@ typedef struct MT_Lock { #define MT_lock_try(l) (pthread_mutex_trylock(&(l)->lock) == 0 && (_DBG_LOCK_LOCKER(l), true)) #ifdef LOCK_STATS -#define MT_lock_set(l) \ - do {\ - _DBG_LOCK_COUNT_0(l); \ - if (pthread_mutex_trylock(&(l)->lock) { \ - _DBG_LOCK_CONTENTION(l);\ - MT_thread_setlockwait(l); \ - pthread_mutex_lock(&(l)->lock); \ - MT_thread_setlockwait(NULL);\ - } \ - _DBG_LOCK_LOCKER(l);\ - _DBG_LOCK_COUNT_2(l); \ +#define MT_lock_set(l) \ + do {\ + _DBG_LOCK_COUNT_0(l); \ + if (pthread_mutex_trylock(&(l)->lock)) {\ + _DBG_LOCK_CONTENTION(l);\ + MT_thread_setlockwait(l); \ + pthread_mutex_lock(&(l)->lock); \ + MT_thread_setlockwait(NULL);\ + } \ + _DBG_LOCK_LOCKER(l);\ + _DBG_LOCK_COUNT_2(l); \ } while (0) #else #define MT_lock_set(l) \ ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Add tests for new SQL syntax [ OFFSET pos_lng...
Changeset: 9dc910c06aab for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/9dc910c06aab Added Files: sql/test/Tests/limit_offset_fetchfirst.test Modified Files: sql/ChangeLog sql/test/Tests/All Branch: default Log Message: Add tests for new SQL syntax [ OFFSET pos_lng [ {ROW|ROWS} ] ] [ FETCH {FIRST|NEXT} nonzero_lng {ROW|ROWS} ONLY ] Also added entry to ChangeLog diffs (226 lines): diff --git a/sql/ChangeLog b/sql/ChangeLog --- a/sql/ChangeLog +++ b/sql/ChangeLog @@ -1,3 +1,18 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Fri Jul 7 2023 Niels Nes +- Added SQL support for: and + in ::= + [ ] + [ ] + [ ] + [ ] + [ ] + + ::= + OFFSET [ {ROW|ROWS} ] + + ::= + FETCH {FIRST|NEXT} {ROW|ROWS} ONLY + diff --git a/sql/test/Tests/All b/sql/test/Tests/All --- a/sql/test/Tests/All +++ b/sql/test/Tests/All @@ -70,6 +70,7 @@ create_in_schema null-byte-hang orderby_limit orderby_non_selection_column +limit_offset_fetchfirst psm diff --git a/sql/test/Tests/limit_offset_fetchfirst.test b/sql/test/Tests/limit_offset_fetchfirst.test new file mode 100644 --- /dev/null +++ b/sql/test/Tests/limit_offset_fetchfirst.test @@ -0,0 +1,188 @@ +-- tests [ LIMIT y ] [ OFFSET x ] + +statement ok +drop table if exists limittest + +statement ok +create table limittest as select * from "sys"."generate_series"(1, 221) + +query I nosort +select * from limittest LIMIT 5 + +1 +2 +3 +4 +5 + +statement error +select * from limittest LIMIT +5 + +statement error +select * from limittest LIMIT 0 + +statement error +select * from limittest LIMIT -5 + +statement error +select * from limittest LIMIT 20, 50 + +statement error +select * from limittest LIMIT OFFSET 20, 50 + +statement error +select * from limittest OFFSET 20 LIMIT 50 + +query I rowsort +select * from limittest LIMIT 5 OFFSET 20 + +21 +22 +23 +24 +25 + +statement error +select * from limittest LIMIT 5 OFFSET 20 ROWS + +statement error +select * from limittest LIMIT 5 ROWS OFFSET 20 + + +-- tests [ OFFSET pos_lng [ {ROW|ROWS} ] ] [ FETCH {FIRST|NEXT} nonzero_lng {ROW|ROWS} ONLY ] + +statement error +select * from limittest OFFSET + +statement error +select * from limittest OFFSET ROW + +query I rowsort +select * from limittest OFFSET 218 + +219 +220 + +query I rowsort +select * from limittest OFFSET 219 ROW + +220 + +query I rowsort +select * from limittest OFFSET 218 ROWS + +219 +220 + +statement error +select * from limittest OFFSET (200 + 18) ROWS + +statement error +select * from limittest FETCH ROWS + +statement error +select * from limittest FETCH ROWS ONLY + +statement error +select * from limittest FETCH 0 ROWS ONLY + +query I rowsort +select * from limittest FETCH NEXT ROW ONLY + +1 + +query I rowsort +select * from limittest FETCH FIRST 4 ROWS ONLY + +1 +2 +3 +4 + +query I rowsort +select * from limittest OFFSET 5 FETCH FIRST 4 ROWS ONLY + +6 +7 +8 +9 + +query I rowsort +select * from limittest OFFSET 5 FETCH NEXT 4 ROWS ONLY + +6 +7 +8 +9 + +query I rowsort +select * from limittest FETCH FIRST ROW ONLY + +1 + +query I rowsort +select * from limittest FETCH FIRST 3 ROWS ONLY + +1 +2 +3 + +query I rowsort +select * from limittest OFFSET 10 FETCH FIRST 3 ROWS ONLY + +11 +12 +13 + +query I rowsort +select * from limittest OFFSET 218 + +219 +220 + +query I rowsort +select * from limittest OFFSET 220 + + +query I rowsort +select * from limittest OFFSET 222 + + + +statement error +select * from limittest LIMIT 6 OFFSET 5 FETCH NEXT 4 ROWS ONLY + +statement error +select * from limittest LIMIT 6 FETCH NEXT 4 ROWS ONLY + +statement error +select * from limittest FETCH NEXT 4 ROWS ONLY LIMIT 6 + +statement error +select * from limittest FETCH NEXT 4 ROWS ONLY OFFSET 5 + +query I rowsort +select * from limittest FETCH FIRST 3 ROWS ONLY + +1 +2 +3 + +query I rowsort +select * from (select * from limittest OFFSET 50 ROWS FETCH FIRST 10 ROWS ONLY) t OFFSET 5 ROW FETCH FIRST 4 ROWS ONLY + +56 +57 +58 +59 + +query I rowsort +select * from (select * from limittest order by 1 desc OFFSET 50 ROWS FETCH FIRST 10 ROWS ONLY) t order by 1 asc OFFSET 5 ROW FETCH FIRST 4 ROWS ONLY + +166 +167 +168 +169 + +statement ok +drop table if exists limittest ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Extended mclient help system with new offset_...
Changeset: 14a0d91499ca for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/14a0d91499ca Modified Files: clients/mapiclient/mhelp.c Branch: default Log Message: Extended mclient help system with new offset_fetchfirst_clause as alternative for limit_offset_clause. Also added missing order_by_clause help info. diffs (46 lines): diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c --- a/clients/mapiclient/mhelp.c +++ b/clients/mapiclient/mhelp.c @@ -484,8 +484,7 @@ SQLhelp sqlhelp1[] = { "[ HAVING condition [',' ...] ]\n" "[ { UNION | INTERSECT | EXCEPT } [ ALL | DISTINCT ] [ CORRESPONDING ] select ]\n" "[ ORDER BY expression [ ASC | DESC ] [ NULLS { FIRST | LAST } ] [',' ...] ]\n" -"[ LIMIT { count | param } ]\n" -"[ OFFSET { count | param } ]\n" +"[ limit_offset_clause | offset_fetchfirst_clause ]\n" "[ SAMPLE size [ SEED size ] ]", "cte_list,expression,group_by_element,window_definition", "See also https://www.monetdb.org/documentation/user-guide/sql-manual/data-manipulation/table-expressions/"}, @@ -832,8 +831,8 @@ SQLhelp sqlhelp2[] = { NULL}, {"query_expression", NULL, -"select_no_parens [ order_by_clause ] [ limit_clause ] [ offset_clause ] [ sample_clause ]", - "select_no_parens,order_by_clause,limit_clause,offset_clause,sample_clause", +"select_no_parens [ order_by_clause ] [ limit_offset_clause | offset_fetchfirst_clause ] [ sample_clause ]", +"select_no_parens", NULL}, {"select_no_parens", NULL, @@ -842,6 +841,21 @@ SQLhelp sqlhelp2[] = { "| '(' select_no_parens ')' }", "column_exp_commalist,from_clause,window_clause,where_clause,group_by_clause,having_clause,corresponding", NULL}, + {"order_by_clause", +NULL, +"ORDER BY expression [ ASC | DESC ] [ NULLS { FIRST | LAST } ] [',' ...]", +"", +NULL}, + {"limit_offset_clause", +NULL, +"[ LIMIT { count | param } ] [ OFFSET { count | param } ]", +"", +NULL}, + {"offset_fetchfirst_clause", +NULL, +"[ OFFSET { count | param } [ {ROW|ROWS} ] ] [ FETCH {FIRST|NEXT} [ count | param ] {ROW|ROWS} ONLY ]", +"", +NULL}, {"corresponding", NULL, "{ CORRESPONDING | CORRESPONDING BY '(' column_ref_commalist ')' }", ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - case insensitive extension resolution
Changeset: 105389b60f27 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/105389b60f27 Modified Files: sql/server/rel_file_loader.c sql/server/rel_select.c Branch: default Log Message: case insensitive extension resolution bit more protection against null ptr diffs (27 lines): diff --git a/sql/server/rel_file_loader.c b/sql/server/rel_file_loader.c --- a/sql/server/rel_file_loader.c +++ b/sql/server/rel_file_loader.c @@ -49,6 +49,8 @@ fl_register(char *name, fl_add_types_fpt file_loader_t* fl_find(char *name) { + if (!name) + return NULL; for (int i = 0; idata.val.sval; char *ext = strrchr(filename, '.'); - if (ext) + if (ext) { ext=ext+1; + ext = toLower(ext); + } file_loader_t *fl = fl_find(ext); if (!fl) ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - merged
Changeset: 636832e361e7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/636832e361e7 Branch: default Log Message: merged diffs (272 lines): diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c --- a/clients/mapiclient/mhelp.c +++ b/clients/mapiclient/mhelp.c @@ -484,8 +484,7 @@ SQLhelp sqlhelp1[] = { "[ HAVING condition [',' ...] ]\n" "[ { UNION | INTERSECT | EXCEPT } [ ALL | DISTINCT ] [ CORRESPONDING ] select ]\n" "[ ORDER BY expression [ ASC | DESC ] [ NULLS { FIRST | LAST } ] [',' ...] ]\n" -"[ LIMIT { count | param } ]\n" -"[ OFFSET { count | param } ]\n" +"[ limit_offset_clause | offset_fetchfirst_clause ]\n" "[ SAMPLE size [ SEED size ] ]", "cte_list,expression,group_by_element,window_definition", "See also https://www.monetdb.org/documentation/user-guide/sql-manual/data-manipulation/table-expressions/"}, @@ -832,8 +831,8 @@ SQLhelp sqlhelp2[] = { NULL}, {"query_expression", NULL, -"select_no_parens [ order_by_clause ] [ limit_clause ] [ offset_clause ] [ sample_clause ]", - "select_no_parens,order_by_clause,limit_clause,offset_clause,sample_clause", +"select_no_parens [ order_by_clause ] [ limit_offset_clause | offset_fetchfirst_clause ] [ sample_clause ]", +"select_no_parens", NULL}, {"select_no_parens", NULL, @@ -842,6 +841,21 @@ SQLhelp sqlhelp2[] = { "| '(' select_no_parens ')' }", "column_exp_commalist,from_clause,window_clause,where_clause,group_by_clause,having_clause,corresponding", NULL}, + {"order_by_clause", +NULL, +"ORDER BY expression [ ASC | DESC ] [ NULLS { FIRST | LAST } ] [',' ...]", +"", +NULL}, + {"limit_offset_clause", +NULL, +"[ LIMIT { count | param } ] [ OFFSET { count | param } ]", +"", +NULL}, + {"offset_fetchfirst_clause", +NULL, +"[ OFFSET { count | param } [ {ROW|ROWS} ] ] [ FETCH {FIRST|NEXT} [ count | param ] {ROW|ROWS} ONLY ]", +"", +NULL}, {"corresponding", NULL, "{ CORRESPONDING | CORRESPONDING BY '(' column_ref_commalist ')' }", diff --git a/sql/ChangeLog b/sql/ChangeLog --- a/sql/ChangeLog +++ b/sql/ChangeLog @@ -1,3 +1,18 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Fri Jul 7 2023 Niels Nes +- Added SQL support for: and + in ::= + [ ] + [ ] + [ ] + [ ] + [ ] + + ::= + OFFSET [ {ROW|ROWS} ] + + ::= + FETCH {FIRST|NEXT} {ROW|ROWS} ONLY + diff --git a/sql/test/Tests/All b/sql/test/Tests/All --- a/sql/test/Tests/All +++ b/sql/test/Tests/All @@ -70,6 +70,7 @@ create_in_schema null-byte-hang orderby_limit orderby_non_selection_column +limit_offset_fetchfirst psm diff --git a/sql/test/Tests/limit_offset_fetchfirst.test b/sql/test/Tests/limit_offset_fetchfirst.test new file mode 100644 --- /dev/null +++ b/sql/test/Tests/limit_offset_fetchfirst.test @@ -0,0 +1,188 @@ +-- tests [ LIMIT y ] [ OFFSET x ] + +statement ok +drop table if exists limittest + +statement ok +create table limittest as select * from "sys"."generate_series"(1, 221) + +query I nosort +select * from limittest LIMIT 5 + +1 +2 +3 +4 +5 + +statement error +select * from limittest LIMIT +5 + +statement error +select * from limittest LIMIT 0 + +statement error +select * from limittest LIMIT -5 + +statement error +select * from limittest LIMIT 20, 50 + +statement error +select * from limittest LIMIT OFFSET 20, 50 + +statement error +select * from limittest OFFSET 20 LIMIT 50 + +query I rowsort +select * from limittest LIMIT 5 OFFSET 20 + +21 +22 +23 +24 +25 + +statement error +select * from limittest LIMIT 5 OFFSET 20 ROWS + +statement error +select * from limittest LIMIT 5 ROWS OFFSET 20 + + +-- tests [ OFFSET pos_lng [ {ROW|ROWS} ] ] [ FETCH {FIRST|NEXT} nonzero_lng {ROW|ROWS} ONLY ] + +statement error +select * from limittest OFFSET + +statement error +select * from limittest OFFSET ROW + +query I rowsort +select * from limittest OFFSET 218 + +219 +220 + +query I rowsort +select * from limittest OFFSET 219 ROW + +220 + +query I rowsort +select * from limittest OFFSET 218 ROWS + +219 +220 + +statement error +select * from limittest OFFSET (200 + 18) ROWS + +statement error +select * from limittest FETCH ROWS + +statement error +select * from limittest FETCH ROWS ONLY + +statement error +select * from limittest FETCH 0 ROWS ONLY + +query I rowsort +select * from limittest FETCH NEXT ROW ONLY + +1 + +query I rowsort +select * from limittest FETCH FIRST 4 ROWS ONLY + +1 +2 +3 +4 + +query I rowsort +select * from limittest OFFSET 5 FETCH FIRST 4 ROWS ONLY + +6 +7 +8 +9 + +query I rowsort +select * from limittest OFFSET 5 FETCH NEXT 4 ROWS ONLY + +6 +7 +8 +9 + +query I rowsort +select * from limittest FETCH FIRST ROW ONLY +---
MonetDB: default - approved output
Changeset: 0fd23d7dac4d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/0fd23d7dac4d Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: approved output diffs (11 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -1514,6 +1514,7 @@ sql_exp *exp_column(sql_allocator *sa, c sql_exp *exp_op(sql_allocator *sa, list *l, sql_subfunc *f); sql_table *find_table_or_view_on_scope(mvc *sql, sql_schema *s, const char *sname, const char *tname, const char *error, bool isView); int fl_register(char *name, fl_add_types_fptr add_types, fl_load_fptr fl_load); +void fl_unregister(char *name); str flt_num2dec_bte(bte *res, const flt *v, const int *d2, const int *s2); str flt_num2dec_int(int *res, const flt *v, const int *d2, const int *s2); str flt_num2dec_lng(lng *res, const flt *v, const int *d2, const int *s2); ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org