MonetDB: default - Add creation of view INFORMATION_SCHEMA.PARAM...
Changeset: f9ff163befca for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f9ff163befca
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/scripts/91_information_schema.sql
sql/test/Dependencies/Tests/dependency_owner_schema_3.test
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
Branch: default
Log Message:
Add creation of view INFORMATION_SCHEMA.PARAMETERS.
Also simplified the logic for INTERVAL_TYPE of view INFORMATION_SCHEMA.COLUMNS.
diffs (truncated from 714 to 300 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -6149,10 +6149,7 @@ sql_update_default(Client c, mvc *sql, s
" cast(sys.ifthenelse(c.\"type\" IN
('int','smallint','tinyint','bigint','hugeint','float','real','double','oid'),
2, sys.ifthenelse(c.\"type\" IN ('decimal','numeric'), 10, NULL)) AS int) AS
NUMERIC_PRECISION_RADIX,\n"
" cast(sys.ifthenelse(c.\"type\" IN
('int','smallint','tinyint','bigint','hugeint','float','real','double','decimal','numeric','oid'),
c.\"type_scale\", NULL) AS int) AS NUMERIC_SCALE,\n"
" cast(sys.ifthenelse(c.\"type\" IN
('date','timestamp','timestamptz','time','timetz'),
sys.ifthenelse(c.\"type_scale\" > 0, c.\"type_scale\" -1, 0), NULL) AS int) AS
DATETIME_PRECISION,\n"
- " cast(CASE c.\"type\" WHEN 'day_interval' THEN 'interval day'
WHEN 'month_interval' THEN (CASE c.\"type_digits\" WHEN 1 THEN 'interval year'
WHEN 2 THEN 'interval year to month' WHEN 3 THEN 'interval month' ELSE NULL
END)"
- " WHEN 'sec_interval' THEN (CASE c.\"type_digits\" WHEN 5 THEN
'interval day to hour' WHEN 6 THEN 'interval day to minute' WHEN 7 THEN
'interval day to second'"
- " WHEN 8 THEN 'interval hour' WHEN 9 THEN 'interval hour to
minute' WHEN 10 THEN 'interval hour to second' WHEN 11 THEN 'interval minute'
WHEN 12 THEN 'interval minute to second'"
- " WHEN 13 THEN 'interval second' ELSE NULL END) ELSE NULL END
AS varchar(40)) AS INTERVAL_TYPE,\n"
+ " cast(sys.ifthenelse(c.\"type\" IN
('day_interval','month_interval','sec_interval'),
sys.\"describe_type\"(c.\"type\", c.\"type_digits\", c.\"type_scale\"), NULL)
AS varchar(40)) AS INTERVAL_TYPE,\n"
" cast(CASE c.\"type\" WHEN 'day_interval' THEN 0 WHEN
'month_interval' THEN 0 WHEN 'sec_interval' THEN
(sys.ifthenelse(c.\"type_digits\" IN (7, 10, 12, 13),
sys.ifthenelse(c.\"type_scale\" > 0, c.\"type_scale\", 3), 0)) ELSE NULL END AS
int) AS INTERVAL_PRECISION,\n"
" cast(NULL AS varchar(1)) AS CHARACTER_SET_CATALOG,\n"
" cast(NULL AS varchar(1)) AS CHARACTER_SET_SCHEMA,\n"
@@ -6263,7 +6260,7 @@ sql_update_default(Client c, mvc *sql, s
"CREATE VIEW INFORMATION_SCHEMA.ROUTINES AS SELECT\n"
" cast(NULL AS varchar(1)) AS SPECIFIC_CATALOG,\n"
" s.\"name\" AS SPECIFIC_SCHEMA,\n"
- " cast(f.\"id\" as varchar(10)) AS SPECIFIC_NAME,\n"
+ " cast(f.\"name\"||'('||f.\"id\"||')' AS varchar(270)) AS
SPECIFIC_NAME,\n"
" cast(NULL AS varchar(1)) AS ROUTINE_CATALOG,\n"
" s.\"name\" AS ROUTINE_SCHEMA,\n"
" f.\"name\" AS ROUTINE_NAME,\n"
@@ -6365,6 +6362,60 @@ sql_update_default(Client c, mvc *sql, s
" ORDER BY s.\"name\", f.\"name\";\n"
"GRANT SELECT ON TABLE INFORMATION_SCHEMA.ROUTINES TO PUBLIC
WITH GRANT OPTION;\n"
+ "CREATE VIEW INFORMATION_SCHEMA.PARAMETERS AS SELECT\n"
+ " cast(NULL AS varchar(1)) AS SPECIFIC_CATALOG,\n"
+ " s.\"name\" AS SPECIFIC_SCHEMA,\n"
+ " cast(f.\"name\"||'('||f.\"id\"||')' AS varchar(270)) AS
SPECIFIC_NAME,\n"
+ " cast(sys.ifthenelse((a.\"inout\" = 0 OR f.\"type\" = 2), 1 +
a.\"number\", sys.ifthenelse(f.\"type\" = 1, a.\"number\", (1 + a.\"number\" -
f.count_out_cols))) AS int) AS ORDINAL_POSITION,\n"
+ " cast(sys.ifthenelse(a.\"inout\" = 0, 'OUT',
sys.ifthenelse(a.\"inout\" = 1, 'IN', 'INOUT')) as varchar(5)) AS
PARAMETER_MODE,\n"
+ " cast(sys.ifthenelse(a.\"inout\" = 0, 'YES', 'NO') as
varchar(3)) AS IS_RESULT,\n"
+ " cast(NULL AS varchar(1)) AS AS_LOCATOR,\n"
+ " a.\"name\" AS PARAMETER_NAME,\n"
+ " cast(NULL AS varchar(1)) AS FROM_SQL_SPECIFIC_CATALOG,\n"
+ " cast(NULL AS varchar(1)) AS FROM_SQL_SPECIFIC_SCHEMA,\n"
+ " cast(NULL AS varchar(1)) AS FROM_SQL_SPECIFIC_NAME,\n"
+ " cast(NULL AS varchar(1)) AS TO_SQL_SPECIFIC_CATALOG,\n"
+ " cast(NULL AS varchar(1)) AS TO_SQL_SPECIFIC_SCHEMA,\n"
+ " cast(NULL AS
MonetDB: Jun2023 - Post release build.
Changeset: bffecf255533 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bffecf255533
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.15
+current_version = 11.47.16
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.15
+%global version 11.47.16
%{!?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,15)
- PRODUCTVERSION version(11,47,15)
+ FILEVERSION version(11,47,16)
+ PRODUCTVERSION version(11,47,16)
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,15)
+ VALUE "FileVersion", sversion(11,47,16)
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,15)
+ VALUE "ProductVersion", sversion(11,47,16)
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,15)
- PRODUCTVERSION version(11,47,15)
+ FILEVERSION version(11,47,16)
+ PRODUCTVERSION version(11,47,16)
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,15)
+ VALUE "FileVersion", sversion(11,47,16)
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,15)
+ VALUE "ProductVersion", sversion(11,47,16)
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,15)
- PRODUCTVERSION version(11,47,15)
+ FILEVERSION version(11,47,16)
+ PRODUCTVERSION version(11,47,16)
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,15)
+VALUE "FileVersion", sversion(11,47,16)
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,15)
+VALUE "ProductVersion", sversion(11,47,16)
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 "15")
+set(MONETDB_VERSION_PATCH "16")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "Jun2023-SP3")
+ 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
+++
MonetDB: default - Merge with Jun2023 branch, not changing any f...
Changeset: 13e88f64a32a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/13e88f64a32a 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: default - Merge with Jun2023 branch.
Changeset: 60f1ae2bf159 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/60f1ae2bf159
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 (138 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -814,3 +814,4 @@ 1efa83c6409769d13b2ee30e497d5f7ab42fa955
6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_11
6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_SP2_release
e6eb06773c17035954ac5d001cfe1f09ff3425cc Jun2023_13
+5683fd900f28d65ad7c98d1ed1efd992023a7fa4 Jun2023_15
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -867,6 +867,17 @@ fi
%endif
%changelog
+* Thu Nov 09 2023 Sjoerd Mullender - 11.47.15-20231109
+- Rebuilt.
+- GH#7410: SIGSEGV cause database corruption
+
+* Tue Nov 7 2023 Sjoerd Mullender - 11.47.15-20231109
+- gdk: When saving the SQL catalog during a low-level commit, we should
+ only save the part of the catalog that corresponds to the part of the
+ write-ahead log that has been processed. What we did was save more,
+ which resulted in the catalog containing references to tables and
+ columns whose disk presence is otherwise only in the write-ahead log.
+
* Fri Nov 03 2023 Sjoerd Mullender - 11.47.13-20231103
- Rebuilt.
- GH#7300: Implement missing standard SQL DATE and TIMESTAMP functions
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 "5")
+set(GDK_VERSION_PATCH "6")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
# version of the MAPI library (subdirectory clients/mapilib)
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+monetdb (11.47.15) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#7410: SIGSEGV cause database corruption
+
+ -- Sjoerd Mullender Thu, 09 Nov 2023 17:03:15 +0100
+
+monetdb (11.47.15) unstable; urgency=low
+
+ * gdk: When saving the SQL catalog during a low-level commit, we should
+only save the part of the catalog that corresponds to the part of the
+write-ahead log that has been processed. What we did was save more,
+which resulted in the catalog containing references to tables and
+columns whose disk presence is otherwise only in the write-ahead log.
+
+ -- Sjoerd Mullender Tue, 7 Nov 2023 17:03:15 +0100
+
monetdb (11.47.13) unstable; urgency=low
* Rebuilt.
diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive
--- a/gdk/ChangeLog-Archive
+++ b/gdk/ChangeLog-Archive
@@ -1,6 +1,13 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Nov 7 2023 Sjoerd Mullender - 11.47.15-20231109
+- When saving the SQL catalog during a low-level commit, we should
+ only save the part of the catalog that corresponds to the part of the
+ write-ahead log that has been processed. What we did was save more,
+ which resulted in the catalog containing references to tables and
+ columns whose disk presence is otherwise only in the write-ahead log.
+
* Tue Oct 31 2023 Sjoerd Mullender - 11.47.13-20231103
- A bug was fixed where the administration of which bats were in use was
interpreted incorrectly during startup, causing problems later. One
diff --git a/gdk/ChangeLog.Jun2023 b/gdk/ChangeLog.Jun2023
--- a/gdk/ChangeLog.Jun2023
+++ b/gdk/ChangeLog.Jun2023
@@ -1,10 +1,3 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
-* Tue Nov 7 2023 Sjoerd Mullender
-- When saving the SQL catalog during a low-level commit, we should
- only save the part of the catalog that corresponds to the part of the
- write-ahead log that has been processed. What we did was save more,
- which resulted in the catalog containing references to tables and
- columns whose disk presence is otherwise only in the write-ahead log.
-
diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog
--- a/misc/packages/deb/changelog
+++ b/misc/packages/deb/changelog
@@ -1,3 +1,20 @@
+monetdb (11.47.15) unstable; urgency=low
+
+ * Rebuilt.
+ * GH#7410: SIGSEGV cause database corruption
+
+ -- Sjoerd Mullender Thu, 09 Nov 2023 17:03:15 +0100
+
+monetdb (11.47.15) unstable; urgency=low
+
+ * gdk: When saving the SQL catalog during a low-level commit, we should
+only save the part of the catalog that corresponds to the part of the
+write-ahead log that has been processed. What we did was save more,
+which resulted in the catalog containing references to tables and
+columns whose
MonetDB: Jun2023 - Setting tag Jun2023_15 for the release build.
Changeset: 5601a7ae8e5f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/5601a7ae8e5f Modified Files: .hgtags Branch: Jun2023 Log Message: Setting tag Jun2023_15 for the release build. diffs (8 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -814,3 +814,4 @@ 1efa83c6409769d13b2ee30e497d5f7ab42fa955 6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_11 6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_SP2_release e6eb06773c17035954ac5d001cfe1f09ff3425cc Jun2023_13 +5683fd900f28d65ad7c98d1ed1efd992023a7fa4 Jun2023_15 ___ 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...
Changeset: 5683fd900f28 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/5683fd900f28 Modified Files: MonetDB.spec debian/changelog gdk/ChangeLog-Archive gdk/ChangeLog.Jun2023 misc/packages/deb/changelog misc/packages/rpm/changelog Branch: Jun2023 Log Message: Moved contents of ChangeLog.Jun2023 to MonetDB.spec, debian/changelog and ChangeLog-Archive. diffs (118 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -860,6 +860,17 @@ fi %endif %changelog +* Thu Nov 09 2023 Sjoerd Mullender - 11.47.15-20231109 +- Rebuilt. +- GH#7410: SIGSEGV cause database corruption + +* Tue Nov 7 2023 Sjoerd Mullender - 11.47.15-20231109 +- gdk: When saving the SQL catalog during a low-level commit, we should + only save the part of the catalog that corresponds to the part of the + write-ahead log that has been processed. What we did was save more, + which resulted in the catalog containing references to tables and + columns whose disk presence is otherwise only in the write-ahead log. + * Fri Nov 03 2023 Sjoerd Mullender - 11.47.13-20231103 - Rebuilt. - GH#7300: Implement missing standard SQL DATE and TIMESTAMP functions diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +monetdb (11.47.15) unstable; urgency=low + + * Rebuilt. + * GH#7410: SIGSEGV cause database corruption + + -- Sjoerd Mullender Thu, 09 Nov 2023 17:03:15 +0100 + +monetdb (11.47.15) unstable; urgency=low + + * gdk: When saving the SQL catalog during a low-level commit, we should +only save the part of the catalog that corresponds to the part of the +write-ahead log that has been processed. What we did was save more, +which resulted in the catalog containing references to tables and +columns whose disk presence is otherwise only in the write-ahead log. + + -- Sjoerd Mullender Tue, 7 Nov 2023 17:03:15 +0100 + monetdb (11.47.13) unstable; urgency=low * Rebuilt. diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive --- a/gdk/ChangeLog-Archive +++ b/gdk/ChangeLog-Archive @@ -1,6 +1,13 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Nov 7 2023 Sjoerd Mullender - 11.47.15-20231109 +- When saving the SQL catalog during a low-level commit, we should + only save the part of the catalog that corresponds to the part of the + write-ahead log that has been processed. What we did was save more, + which resulted in the catalog containing references to tables and + columns whose disk presence is otherwise only in the write-ahead log. + * Tue Oct 31 2023 Sjoerd Mullender - 11.47.13-20231103 - A bug was fixed where the administration of which bats were in use was interpreted incorrectly during startup, causing problems later. One diff --git a/gdk/ChangeLog.Jun2023 b/gdk/ChangeLog.Jun2023 --- a/gdk/ChangeLog.Jun2023 +++ b/gdk/ChangeLog.Jun2023 @@ -1,10 +1,3 @@ # ChangeLog file for GDK # This file is updated with Maddlog -* Tue Nov 7 2023 Sjoerd Mullender -- When saving the SQL catalog during a low-level commit, we should - only save the part of the catalog that corresponds to the part of the - write-ahead log that has been processed. What we did was save more, - which resulted in the catalog containing references to tables and - columns whose disk presence is otherwise only in the write-ahead log. - diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog --- a/misc/packages/deb/changelog +++ b/misc/packages/deb/changelog @@ -1,3 +1,20 @@ +monetdb (11.47.15) unstable; urgency=low + + * Rebuilt. + * GH#7410: SIGSEGV cause database corruption + + -- Sjoerd Mullender Thu, 09 Nov 2023 17:03:15 +0100 + +monetdb (11.47.15) unstable; urgency=low + + * gdk: When saving the SQL catalog during a low-level commit, we should +only save the part of the catalog that corresponds to the part of the +write-ahead log that has been processed. What we did was save more, +which resulted in the catalog containing references to tables and +columns whose disk presence is otherwise only in the write-ahead log. + + -- Sjoerd Mullender Tue, 7 Nov 2023 17:03:15 +0100 + monetdb (11.47.13) unstable; urgency=low * Rebuilt. diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog --- a/misc/packages/rpm/changelog +++ b/misc/packages/rpm/changelog @@ -1,3 +1,14 @@ +* Thu Nov 09 2023 Sjoerd Mullender - 11.47.15-20231109 +- Rebuilt. +- GH#7410: SIGSEGV cause database corruption + +* Tue Nov 7 2023 Sjoerd Mullender - 11.47.15-20231109 +- gdk: When saving the SQL catalog during a low-level commit, we should + only save the part of the catalog that corresponds to the part of the + write-ahead log that has been processed. What we did was save more, + which resulted in the catalog containing references to tables and + columns whose disk presence is otherwise
MonetDB: Jun2023 - Updated library versions.
Changeset: 186104de312c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/186104de312c
Modified Files:
cmake/monetdb-versions.cmake
Branch: Jun2023
Log Message:
Updated library versions.
diffs (12 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 "5")
+set(GDK_VERSION_PATCH "6")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
# version of the MAPI library (subdirectory clients/mapilib)
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Jun2023 - Pre-release version number update.
Changeset: e81f64d3b248 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e81f64d3b248
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.14
+current_version = 11.47.15
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.14
+%global version 11.47.15
%{!?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,14)
- PRODUCTVERSION version(11,47,14)
+ FILEVERSION version(11,47,15)
+ PRODUCTVERSION version(11,47,15)
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,14)
+ VALUE "FileVersion", sversion(11,47,15)
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,14)
+ VALUE "ProductVersion", sversion(11,47,15)
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,14)
- PRODUCTVERSION version(11,47,14)
+ FILEVERSION version(11,47,15)
+ PRODUCTVERSION version(11,47,15)
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,14)
+ VALUE "FileVersion", sversion(11,47,15)
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,14)
+ VALUE "ProductVersion", sversion(11,47,15)
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,14)
- PRODUCTVERSION version(11,47,14)
+ FILEVERSION version(11,47,15)
+ PRODUCTVERSION version(11,47,15)
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,14)
+VALUE "FileVersion", sversion(11,47,15)
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,14)
+VALUE "ProductVersion", sversion(11,47,15)
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 "14")
+set(MONETDB_VERSION_PATCH "15")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "unreleased")
+ set(MONETDB_RELEASE "Jun2023-SP3")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
---
MonetDB: default - Merge with Jun2023 branch, not changing any f...
Changeset: ba97968c8613 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/ba97968c8613 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: default - Approve upgrade output.
Changeset: 546e048a5ca0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/546e048a5ca0
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/upgrade.stable.out.int128
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: default
Log Message:
Approve upgrade output.
diffs (truncated from 2800 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
@@ -530,7 +530,6 @@ CREATE VIEW INFORMATION_SCHEMA.SCHEMATA
cast(NULL AS varchar(1)) AS DEFAULT_CHARACTER_SET_SCHEMA,
cast('UTF-8' AS varchar(16)) AS DEFAULT_CHARACTER_SET_NAME,
cast(NULL AS varchar(1)) AS SQL_PATH,
- -- MonetDB column extensions
s."id" AS schema_id,
s."system" AS is_system,
cm."remark" AS comments
@@ -552,7 +551,6 @@ CREATE VIEW INFORMATION_SCHEMA.TABLES AS
cast(sys.ifthenelse((t."type" IN (0, 3, 7, 20, 30) AND t."access" IN (0,
2)), 'YES', 'NO') AS varchar(3)) AS IS_INSERTABLE_INTO,
cast('NO' AS varchar(3)) AS IS_TYPED,
cast((CASE t."commit_action" WHEN 1 THEN 'DELETE' WHEN 2 THEN 'PRESERVE'
WHEN 3 THEN 'DROP' ELSE NULL END) AS varchar(10)) AS COMMIT_ACTION,
- -- MonetDB column extensions
t."schema_id" AS schema_id,
t."id" AS table_id,
t."type" AS table_type_id,
@@ -579,7 +577,6 @@ CREATE VIEW INFORMATION_SCHEMA.VIEWS AS
cast('NO' AS varchar(3)) AS IS_TRIGGER_UPDATABLE,
cast('NO' AS varchar(3)) AS IS_TRIGGER_DELETABLE,
cast('NO' AS varchar(3)) AS IS_TRIGGER_INSERTABLE_INTO,
- -- MonetDB column extensions
t."schema_id" AS schema_id,
t."id" AS table_id,
cast(sys.ifthenelse(t."system", t."type" + 10 , t."type") AS smallint) AS
table_type_id,
@@ -605,7 +602,7 @@ CREATE VIEW INFORMATION_SCHEMA.COLUMNS A
cast(sys.ifthenelse(c."type" IN
('int','smallint','tinyint','bigint','hugeint','float','real','double','decimal','numeric','oid'),
c."type_digits", NULL) AS int) AS NUMERIC_PRECISION,
cast(sys.ifthenelse(c."type" IN
('int','smallint','tinyint','bigint','hugeint','float','real','double','oid'),
2, sys.ifthenelse(c."type" IN ('decimal','numeric'), 10, NULL)) AS int) AS
NUMERIC_PRECISION_RADIX,
cast(sys.ifthenelse(c."type" IN
('int','smallint','tinyint','bigint','hugeint','float','real','double','decimal','numeric','oid'),
c."type_scale", NULL) AS int) AS NUMERIC_SCALE,
- cast(sys.ifthenelse(c."type" IN
('date','timestamp','timestamptz','time','timetz'), c."type_scale" -1, NULL) AS
int) AS DATETIME_PRECISION,
+ cast(sys.ifthenelse(c."type" IN
('date','timestamp','timestamptz','time','timetz'),
sys.ifthenelse(c."type_scale" > 0, c."type_scale" -1, 0), NULL) AS int) AS
DATETIME_PRECISION,
cast(CASE c."type" WHEN 'day_interval' THEN 'interval day' WHEN
'month_interval' THEN (CASE c."type_digits" WHEN 1 THEN 'interval year' WHEN 2
THEN 'interval year to month' WHEN 3 THEN 'interval month' ELSE NULL END) WHEN
'sec_interval' THEN (CASE c."type_digits" WHEN 5 THEN 'interval day to hour'
WHEN 6 THEN 'interval day to minute' WHEN 7 THEN 'interval day to second' WHEN
8 THEN 'interval hour' WHEN 9 THEN 'interval hour to minute' WHEN
MonetDB: default - Merge with Jun2023 branch.
Changeset: 6338bd3b9ffe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6338bd3b9ffe
Modified Files:
testing/Mconvert.py.in
testing/Mtest.py.in
tools/mserver/mserver5.1.in
Branch: default
Log Message:
Merge with Jun2023 branch.
diffs (truncated from 324 to 300 lines):
diff --git a/clients/examples/python/mclient-python3.py
b/clients/examples/python/mclient-python3.py
--- a/clients/examples/python/mclient-python3.py
+++ b/clients/examples/python/mclient-python3.py
@@ -65,7 +65,7 @@ def main() :
line = fi.readline()
if encoding != 'utf-8':
prompt = str(prompt, 'utf-8').encode(encoding, 'replace')
-while line and line != "\q\n":
+while line and line != "\\q\n":
if encoding != 'utf-8':
line = str(line, encoding).encode('utf-8')
res = s.cmd('s' + line)
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -212,7 +212,7 @@ The possible values are
.BR expanded ,
.BR x ,
.BR csv ,
-.BR csv-noquote ,
+.BR csv\-noquote ,
.BR tab ,
.BR raw ,
.BR xml ,
@@ -221,7 +221,7 @@ and
.BR rowcount .
.B csv
is comma-separated values;
-.B csv-noquote
+.B csv\-noquote
is comma-separated values without escaping any quotes;
.B tab
is tab-separated values;
@@ -248,7 +248,7 @@ is a variation on
where only the number of affected rows is printed.
Normal \fBcsv\fP and \fBtab\fP formatting will use double quotes
around any fields that contain double quotes, white space or the
-separator. The \fBcsv-noquote\fP format will prevent that and dump
+separator. The \fBcsv\-noquote\fP format will prevent that and dump
the contents of the field without any interpretation.
In addition to plain \fBcsv\fP, two other forms are possible.
\fBcsv=\fP\fIc\fP uses \fIc\fP as column separator; \fBcsv+\fP\fIc\fP
@@ -539,7 +539,7 @@ in the above query can also be a URL. I
.IR e . g .,
.IR https://www.example.org/dumpdata.csv .
.PP
-See
https://www.monetdb.org/documentation/user-guide/sql-manual/data-loading/copy-from/
+See
https://www.monetdb.org/documentation/user\-guide/sql\-manual/data\-loading/copy\-from/
for more information about the COPY INTO query.
.SH SEE ALSO
.IR msqldump (1),
diff --git a/documentation/source/manual_pages/monetdb.rst
b/documentation/source/manual_pages/monetdb.rst
--- a/documentation/source/manual_pages/monetdb.rst
+++ b/documentation/source/manual_pages/monetdb.rst
@@ -71,7 +71,7 @@ allows to do wildcard matches. For detai
maintenance mode. This allows the database administrator to perform
initialization steps before releasing it to users, unless the **-p**
argument is supplied. See also **monetdb lock**. The name of the
- database must match the expression [A-Za-z0-9-_]+.
+ database must match the expression [A-Za-z0-9_-]+.
**-m**\ *pattern*
With the **-m** flag, instead of creating a database, a
@@ -259,6 +259,17 @@ successful.
server to use less parallelism when executing queries, or none at
all if set to **1**.
+ **ncopyintothreads=**\ *number*
+ Defines the maximum number of worker threads the server should use
+ to perform COPY INTO from a CSV file. The actual number of threads
+ used is never higher than the number of columns, and is **1** if the
+ number of rows is small. Normally, this number is equal to the
+ value of the **nthreads** property. Using this number forces the
+ server to use more or less parallelism when executing COPY INTO.
+ Note, COPY INTO threads are created in addition to normal worker
+ threads for each COPY INTO query that is being executed and
+ therefore contend for the CPU with other queries.
+
**optpipe=**\ *string*
Each server operates with a given optimizer pipeline. While the
default usually is the best setting, for some experimental uses
diff --git a/documentation/source/manual_pages/monetdbd.rst.in
b/documentation/source/manual_pages/monetdbd.rst.in
--- a/documentation/source/manual_pages/monetdbd.rst.in
+++ b/documentation/source/manual_pages/monetdbd.rst.in
@@ -373,8 +373,8 @@ used with the funnel, as the results wil
limited query buffer. Applications using the funnel should aim for short
and single-statement queries that require no transactions.
-See the **create** command in the *monetdb*\ (1) man-page for details on
-how to setup a multiplex-funnel.
+See the **create** command in *monetdb*\ (1) for details on how to setup
+a multiplex-funnel.
SIGNALS
===
diff --git a/documentation/source/manual_pages/mserver5.rst.in
b/documentation/source/manual_pages/mserver5.rst.in
--- a/documentation/source/manual_pages/mserver5.rst.in
+++ b/documentation/source/manual_pages/mserver5.rst.in
@@ -23,7 +23,7 @@ Note that while *mserver5* is the proces
is usually more common to start, monitor and connect to the *mserver5*
process through *monetdbd*\ (1).
-This
MonetDB: Jun2023 - Some small updates to the manual pages.
Changeset: a47be1383756 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/a47be1383756 Modified Files: clients/mapiclient/mclient.1 documentation/source/manual_pages/monetdb.rst documentation/source/manual_pages/monetdbd.rst.in documentation/source/manual_pages/mserver5.rst.in tools/merovingian/client/monetdb.1 tools/merovingian/daemon/monetdbd.1.in tools/mserver/mserver5.1.in Branch: Jun2023 Log Message: Some small updates to the manual pages. diffs (152 lines): diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1 --- a/clients/mapiclient/mclient.1 +++ b/clients/mapiclient/mclient.1 @@ -212,7 +212,7 @@ The possible values are .BR expanded , .BR x , .BR csv , -.BR csv-noquote , +.BR csv\-noquote , .BR tab , .BR raw , .BR xml , @@ -221,7 +221,7 @@ and .BR rowcount . .B csv is comma-separated values; -.B csv-noquote +.B csv\-noquote is comma-separated values without escaping any quotes; .B tab is tab-separated values; @@ -248,7 +248,7 @@ is a variation on where only the number of affected rows is printed. Normal \fBcsv\fP and \fBtab\fP formatting will use double quotes around any fields that contain double quotes, white space or the -separator. The \fBcsv-noquote\fP format will prevent that and dump +separator. The \fBcsv\-noquote\fP format will prevent that and dump the contents of the field without any interpretation. In addition to plain \fBcsv\fP, two other forms are possible. \fBcsv=\fP\fIc\fP uses \fIc\fP as column separator; \fBcsv+\fP\fIc\fP @@ -539,7 +539,7 @@ in the above query can also be a URL. I .IR e . g ., .IR https://www.example.org/dumpdata.csv . .PP -See https://www.monetdb.org/documentation/user-guide/sql-manual/data-loading/copy-from/ +See https://www.monetdb.org/documentation/user\-guide/sql\-manual/data\-loading/copy\-from/ for more information about the COPY INTO query. .SH SEE ALSO .IR msqldump (1), diff --git a/documentation/source/manual_pages/monetdb.rst b/documentation/source/manual_pages/monetdb.rst --- a/documentation/source/manual_pages/monetdb.rst +++ b/documentation/source/manual_pages/monetdb.rst @@ -71,7 +71,7 @@ allows to do wildcard matches. For detai maintenance mode. This allows the database administrator to perform initialization steps before releasing it to users, unless the **-p** argument is supplied. See also **monetdb lock**. The name of the - database must match the expression [A-Za-z0-9-_]+. + database must match the expression [A-Za-z0-9_-]+. **-m**\ *pattern* With the **-m** flag, instead of creating a database, a @@ -259,6 +259,17 @@ successful. server to use less parallelism when executing queries, or none at all if set to **1**. + **ncopyintothreads=**\ *number* + Defines the maximum number of worker threads the server should use + to perform COPY INTO from a CSV file. The actual number of threads + used is never higher than the number of columns, and is **1** if the + number of rows is small. Normally, this number is equal to the + value of the **nthreads** property. Using this number forces the + server to use more or less parallelism when executing COPY INTO. + Note, COPY INTO threads are created in addition to normal worker + threads for each COPY INTO query that is being executed and + therefore contend for the CPU with other queries. + **optpipe=**\ *string* Each server operates with a given optimizer pipeline. While the default usually is the best setting, for some experimental uses diff --git a/documentation/source/manual_pages/monetdbd.rst.in b/documentation/source/manual_pages/monetdbd.rst.in --- a/documentation/source/manual_pages/monetdbd.rst.in +++ b/documentation/source/manual_pages/monetdbd.rst.in @@ -373,8 +373,8 @@ used with the funnel, as the results wil limited query buffer. Applications using the funnel should aim for short and single-statement queries that require no transactions. -See the **create** command in the *monetdb*\ (1) man-page for details on -how to setup a multiplex-funnel. +See the **create** command in *monetdb*\ (1) for details on how to setup +a multiplex-funnel. SIGNALS === diff --git a/documentation/source/manual_pages/mserver5.rst.in b/documentation/source/manual_pages/mserver5.rst.in --- a/documentation/source/manual_pages/mserver5.rst.in +++ b/documentation/source/manual_pages/mserver5.rst.in @@ -23,7 +23,7 @@ Note that while *mserver5* is the proces is usually more common to start, monitor and connect to the *mserver5* process through *monetdbd*\ (1). -This man-page describes the options that *mserver5* understands. It is +This manual describes the options that *mserver5* understands. It is intended for people who really need to work with *mserver5* itself. In regular cases, the programs *monetdbd*\ (1) and *monetdb*\ (1) control the many options, and allow to adjust
MonetDB: default - Improved implementation of view INFORMATION_S...
Changeset: d624ab51d772 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d624ab51d772
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/scripts/91_information_schema.sql
sql/test/Dependencies/Tests/dependency_owner_schema_3.test
sql/test/bugs/Tests/groupby_having-bug-sf-947600.test
sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.test
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
Branch: default
Log Message:
Improved implementation of view INFORMATION_SCHEMA.COLUMNS for columns
DATETIME_PRECISION, IS_IDENTITY, IDENTITY_GENERATION, IDENTITY_START,
IDENTITY_INCREMENT, IDENTITY_MAXIMUM, IDENTITY_MINIMUM, IDENTITY_CYCLE,
IS_GENERATED, GENERATION_EXPRESSION.
The identity column information is pulled from the sequence definition which is
generated when using a serial data type.
diffs (truncated from 418 to 300 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -6073,7 +6073,6 @@ sql_update_default(Client c, mvc *sql, s
" cast(NULL AS varchar(1)) AS DEFAULT_CHARACTER_SET_SCHEMA,\n"
" cast('UTF-8' AS varchar(16)) AS
DEFAULT_CHARACTER_SET_NAME,\n"
" cast(NULL AS varchar(1)) AS SQL_PATH,\n"
- " -- MonetDB column extensions\n"
" s.\"id\" AS schema_id,\n"
" s.\"system\" AS is_system,\n"
" cm.\"remark\" AS comments\n"
@@ -6096,7 +6095,6 @@ sql_update_default(Client c, mvc *sql, s
" cast(sys.ifthenelse((t.\"type\" IN (0, 3, 7, 20, 30) AND
t.\"access\" IN (0, 2)), 'YES', 'NO') AS varchar(3)) AS IS_INSERTABLE_INTO,\n"
" cast('NO' AS varchar(3)) AS IS_TYPED,\n"
" cast((CASE t.\"commit_action\" WHEN 1 THEN 'DELETE' WHEN 2
THEN 'PRESERVE' WHEN 3 THEN 'DROP' ELSE NULL END) AS varchar(10)) AS
COMMIT_ACTION,\n"
- " -- MonetDB column extensions\n"
" t.\"schema_id\" AS schema_id,\n"
" t.\"id\" AS table_id,\n"
" t.\"type\" AS table_type_id,\n"
@@ -6124,7 +6122,6 @@ sql_update_default(Client c, mvc *sql, s
" cast('NO' AS varchar(3)) AS IS_TRIGGER_UPDATABLE,\n"
" cast('NO' AS varchar(3)) AS IS_TRIGGER_DELETABLE,\n"
" cast('NO' AS varchar(3)) AS IS_TRIGGER_INSERTABLE_INTO,\n"
- " -- MonetDB column extensions\n"
" t.\"schema_id\" AS schema_id,\n"
" t.\"id\" AS table_id,\n"
" cast(sys.ifthenelse(t.\"system\", t.\"type\" + 10 ,
t.\"type\") AS smallint) AS table_type_id,\n"
@@ -6151,7 +6148,7 @@ sql_update_default(Client c, mvc *sql, s
" cast(sys.ifthenelse(c.\"type\" IN
('int','smallint','tinyint','bigint','hugeint','float','real','double','decimal','numeric','oid'),
c.\"type_digits\", NULL) AS int) AS NUMERIC_PRECISION,\n"
" cast(sys.ifthenelse(c.\"type\" IN
('int','smallint','tinyint','bigint','hugeint','float','real','double','oid'),
2, sys.ifthenelse(c.\"type\" IN ('decimal','numeric'), 10, NULL)) AS int) AS
NUMERIC_PRECISION_RADIX,\n"
" cast(sys.ifthenelse(c.\"type\" IN
('int','smallint','tinyint','bigint','hugeint','float','real','double','decimal','numeric','oid'),
c.\"type_scale\", NULL) AS int) AS NUMERIC_SCALE,\n"
- " cast(sys.ifthenelse(c.\"type\" IN
('date','timestamp','timestamptz','time','timetz'), c.\"type_scale\" -1, NULL)
AS int) AS DATETIME_PRECISION,\n"
+ " cast(sys.ifthenelse(c.\"type\" IN
('date','timestamp','timestamptz','time','timetz'),
sys.ifthenelse(c.\"type_scale\" > 0, c.\"type_scale\" -1, 0), NULL) AS int) AS
DATETIME_PRECISION,\n"
" cast(CASE c.\"type\" WHEN 'day_interval' THEN 'interval day'
WHEN 'month_interval' THEN (CASE c.\"type_digits\" WHEN 1 THEN 'interval year'
WHEN 2 THEN 'interval year to month' WHEN 3 THEN 'interval month' ELSE NULL
END)"
" WHEN 'sec_interval' THEN (CASE c.\"type_digits\" WHEN 5 THEN
'interval day to hour' WHEN 6 THEN 'interval day to minute' WHEN 7 THEN
'interval day to second'"
" WHEN 8 THEN 'interval hour' WHEN 9 THEN 'interval hour to
minute' WHEN 10 THEN 'interval hour to second' WHEN 11 THEN 'interval minute'
WHEN 12 THEN 'interval minute to second'"
@@ -6175,15 +6172,15 @@ sql_update_default(Client c, mvc *sql, s
" cast(NULL AS int) AS MAXIMUM_CARDINALITY,\n"
" cast(NULL AS varchar(1)) AS DTD_IDENTIFIER,\n"
" cast('NO' AS varchar(3)) AS IS_SELF_REFERENCING,\n"
- " cast(CASE WHEN c.\"default\" LIKE 'next value for %' THEN
'YES' ELSE 'NO' END AS varchar(3)) AS IS_IDENTITY,\n"
- " cast(NULL AS
MonetDB: literal_features - use 'nndunique' suffix for instantia...
Changeset: 203dd9ac1149 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/203dd9ac1149
Modified Files:
sql/server/rel_schema.c
sql/server/sql_partition.c
Branch: literal_features
Log Message:
use 'nndunique' suffix for instantiated UNIQUE NULLS NOT DISTINCT keys
diffs (25 lines):
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -325,6 +325,9 @@ column_constraint_name(mvc *sql, symbol
case SQL_UNIQUE:
suffix = "unique";
break;
+ case SQL_UNIQUE_NULLS_NOT_DISTINCT:
+ suffix = "nndunique";
+ break;
case SQL_PRIMARY_KEY:
suffix = "pkey";
break;
diff --git a/sql/server/sql_partition.c b/sql/server/sql_partition.c
--- a/sql/server/sql_partition.c
+++ b/sql/server/sql_partition.c
@@ -53,7 +53,7 @@ str
sql_partition_validate_key(mvc *sql, sql_table *nt, sql_key *k, const char* op)
{
if (k->type != fkey) {
- const char *keys = (k->type == pkey) ? "primary" : "unique";
+ const char *keys = (k->type == pkey) ? "primary" : k->type ==
unndkey ? "nndunique" : "unique";
assert(k->type == pkey || k->type == ukey || k->type ==
unndkey);
if (isPartitionedByColumnTable(nt)) {
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
