Changeset: 1f11e3e0e7d9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1f11e3e0e7d9
Modified Files:
        MonetDB.spec
        cmake/monetdb-versions.cmake
Branch: default
Log Message:

Merge with Jan2022 branch.


diffs (truncated from 405 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -827,3 +827,6 @@ e730f4981db58bb336d6b17a022eec95d9f0eae5
 34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74 Jan2022_3
 e730f4981db58bb336d6b17a022eec95d9f0eae5 Jan2022_release
 34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74 Jan2022_release
+9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_5
+34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74 Jan2022_release
+9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_release
diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,9 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Wed Jan 12 2022 Sjoerd Mullender <[email protected]> - 11.43.5-20220118
+- A couple of concurrency issues have been fixed.
+
 * Mon Aug 10 2020 Ying Zhang <[email protected]> - 11.39.1-20201006
 - Finished a first version of the new monitoring function
   user_statistics(), which is only intended for the DBAs.
diff --git a/ChangeLog.Jan2022 b/ChangeLog.Jan2022
--- a/ChangeLog.Jan2022
+++ b/ChangeLog.Jan2022
@@ -1,6 +1,3 @@
 # ChangeLog file for devel
 # This file is updated with Maddlog
 
-* Wed Jan 12 2022 Sjoerd Mullender <[email protected]>
-- A couple of concurrency issues have been fixed.
-
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -850,6 +850,28 @@ fi
 %endif
 
 %changelog
+* Tue Jan 18 2022 Sjoerd Mullender <[email protected]> - 11.43.5-20220118
+- Rebuilt.
+
+* Thu Jan 13 2022 Sjoerd Mullender <[email protected]> - 11.43.5-20220118
+- NT: We now build Windows binaries using Visual Studio 2022.
+
+* Wed Jan 12 2022 Panagiotis Koutsourakis <[email protected]> - 
11.43.5-20220118
+- gdk: Implement string imprints (strimps for short) a pre-filter structure
+  for strings in order to accelerate LIKE queries. If a strimp exists
+  for a specific string column the strings are pre-filtered, rejecting
+  strings that cannot possibly match, before the more expensive and
+  accurate matching algorithms run.
+
+* Wed Jan 12 2022 Panagiotis Koutsourakis <[email protected]> - 
11.43.5-20220118
+- sql: Add string imprints to the existing imprints index creation syntax. On
+  string column "col" of a table "tbl" marked read only ("ALTER TABLE tbl
+  SET READ ONLY") the user can create a string imprint using the syntax:
+  "CREATE IMPRINTS INDEX index_name ON tbl(col);".
+
+* Wed Jan 12 2022 Sjoerd Mullender <[email protected]> - 11.43.5-20220118
+- MonetDB: A couple of concurrency issues have been fixed.
+
 * Tue Jan 11 2022 Sjoerd Mullender <[email protected]> - 11.43.3-20220111
 - Rebuilt.
 - GH#7215: ODBC Driver SQLStatistics returns duplicate rows/rows for other
diff --git a/NT/ChangeLog-Archive b/NT/ChangeLog-Archive
--- a/NT/ChangeLog-Archive
+++ b/NT/ChangeLog-Archive
@@ -1,6 +1,9 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Thu Jan 13 2022 Sjoerd Mullender <[email protected]> - 11.43.5-20220118
+- We now build Windows binaries using Visual Studio 2022.
+
 * Fri Apr 23 2021 Sjoerd Mullender <[email protected]> - 11.39.17-20210503
 - Added the monetdbe library to the Windows installer.
 
diff --git a/NT/ChangeLog.Jan2022 b/NT/ChangeLog.Jan2022
--- a/NT/ChangeLog.Jan2022
+++ b/NT/ChangeLog.Jan2022
@@ -1,6 +1,3 @@
 # ChangeLog file for NT
 # This file is updated with Maddlog
 
-* Thu Jan 13 2022 Sjoerd Mullender <[email protected]>
-- We now build Windows binaries using Visual Studio 2022.
-
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -38,9 +38,9 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
 
 # version of the GDK library (subdirectory gdk; also includes
 # common/options and common/utils)
-set(GDK_VERSION_MAJOR "24")
+set(GDK_VERSION_MAJOR "25")
 set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "1")
+set(GDK_VERSION_PATCH "0")
 set(GDK_VERSION 
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
 
 # version of the MAPI library (subdirectory clients/mapilib)
@@ -52,13 +52,13 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras 
or sql)
 set(MONETDB5_VERSION_MAJOR "32")
 set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "1")
+set(MONETDB5_VERSION_PATCH "2")
 set(MONETDB5_VERSION 
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
 
 # version of the MONETDBE library (subdirectory tools/monetdbe)
 set(MONETDBE_VERSION_MAJOR "3")
 set(MONETDBE_VERSION_MINOR "0")
-set(MONETDBE_VERSION_PATCH "1")
+set(MONETDBE_VERSION_PATCH "2")
 set(MONETDBE_VERSION 
"${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_MINOR}.${MONETDBE_VERSION_PATCH}")
 
 # version of the STREAM library (subdirectory common/stream)
@@ -68,7 +68,7 @@ set(STREAM_VERSION_PATCH "0")
 set(STREAM_VERSION 
"${STREAM_VERSION_MAJOR}.${STREAM_VERSION_MINOR}.${STREAM_VERSION_PATCH}")
 
 # version of the SQL library (subdirectory sql)
-set(SQL_VERSION_MAJOR "11")
-set(SQL_VERSION_MINOR "43")
-set(SQL_VERSION_PATCH "4")
+set(SQL_VERSION_MAJOR "12")
+set(SQL_VERSION_MINOR "0")
+set(SQL_VERSION_PATCH "0")
 set(SQL_VERSION 
"${SQL_VERSION_MAJOR}.${SQL_VERSION_MINOR}.${SQL_VERSION_PATCH}")
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,40 @@
+monetdb (11.43.5) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]>  Tue, 18 Jan 2022 10:05:33 +0100
+
+monetdb (11.43.5) unstable; urgency=low
+
+  * NT: We now build Windows binaries using Visual Studio 2022.
+
+ -- Sjoerd Mullender <[email protected]>  Thu, 13 Jan 2022 10:05:33 +0100
+
+monetdb (11.43.5) unstable; urgency=low
+
+  * gdk: Implement string imprints (strimps for short) a pre-filter structure
+    for strings in order to accelerate LIKE queries. If a strimp exists
+    for a specific string column the strings are pre-filtered, rejecting
+    strings that cannot possibly match, before the more expensive and
+    accurate matching algorithms run.
+
+ -- Panagiotis Koutsourakis <[email protected]>  Wed, 12 Jan 2022 
10:05:33 +0100
+
+monetdb (11.43.5) unstable; urgency=low
+
+  * sql: Add string imprints to the existing imprints index creation syntax. On
+    string column "col" of a table "tbl" marked read only ("ALTER TABLE tbl
+    SET READ ONLY") the user can create a string imprint using the syntax:
+    "CREATE IMPRINTS INDEX index_name ON tbl(col);".
+
+ -- Panagiotis Koutsourakis <[email protected]>  Wed, 12 Jan 2022 
10:05:33 +0100
+
+monetdb (11.43.5) unstable; urgency=low
+
+  * MonetDB: A couple of concurrency issues have been fixed.
+
+ -- Sjoerd Mullender <[email protected]>  Wed, 12 Jan 2022 10:05:33 +0100
+
 monetdb (11.43.3) unstable; urgency=low
 
   * Rebuilt.
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9), cmake (
 Standards-Version: 3.8.0
 X-Python-Version: >= 2.6
 
-Package: libmonetdb24
+Package: libmonetdb25
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libmonetdb5-server-geom (<< ${source:Version})
@@ -34,7 +34,7 @@ Description: MonetDB core library
 Package: libmonetdb-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb24, libmonetdb-stream-dev
+ libmonetdb25, libmonetdb-stream-dev
 Description: MonetDB development files
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
@@ -44,7 +44,7 @@ Description: MonetDB development files
  This package contains files needed to develop extensions to the core
  functionality of MonetDB.
 
-Package: libmonetdb-stream16
+Package: libmonetdb-stream25
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: MonetDB stream library
@@ -59,7 +59,7 @@ Description: MonetDB stream library
 Package: libmonetdb-stream-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb-stream16 (= ${source:Version})
+ libmonetdb-stream25 (= ${source:Version})
 Description: MonetDB stream library development files
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
@@ -67,9 +67,9 @@ Description: MonetDB stream library deve
  accelerators.  It also has an SQL front end.
  .
  This package contains the files to develop with the
- libmonetdb-stream16 library.
+ libmonetdb-stream25 library.
 
-Package: libmonetdb-client14
+Package: libmonetdb-client25
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: MonetDB client/server interface library
@@ -84,14 +84,14 @@ Description: MonetDB client/server inter
 Package: libmonetdb-client-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb-client14 (= ${source:Version})
+ libmonetdb-client25 (= ${source:Version})
 Description: MonetDB client/server interface library development files
  MonetDB is a database management system that is developed from a
  main-memory perspective with use of a fully decomposed storage model,
  automatic index management, extensibility of data types and search
  accelerators.  It also has an SQL front end.
  .
- This package contains the files to develop with the libmonetdb-client14
+ This package contains the files to develop with the libmonetdb-client25
  library.
 
 Package: monetdb-client
@@ -262,7 +262,7 @@ Description: Integration of MonetDB and 
  know how this package affects the security of your system, do not
  install it.
 
-Package: libmonetdbe3
+Package: libmonetdbe25
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
  monetdb5-server (= ${source:Version})
@@ -278,7 +278,7 @@ Description: MonetDB as an embedded libr
 Package: libmonetdbe-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdbe3 (= ${source:Version}),
+ libmonetdbe25 (= ${source:Version}),
  libmonetdb-dev (= ${source:Version})
 Description: MonetDB development files
  MonetDB is a database management system that is developed from a
diff --git a/debian/libmonetdb-client14.install 
b/debian/libmonetdb-client25.install
rename from debian/libmonetdb-client14.install
rename to debian/libmonetdb-client25.install
diff --git a/debian/libmonetdb-stream16.install 
b/debian/libmonetdb-stream25.install
rename from debian/libmonetdb-stream16.install
rename to debian/libmonetdb-stream25.install
diff --git a/debian/libmonetdb24.install b/debian/libmonetdb25.install
rename from debian/libmonetdb24.install
rename to debian/libmonetdb25.install
diff --git a/debian/libmonetdbe3.install b/debian/libmonetdbe25.install
rename from debian/libmonetdbe3.install
rename to debian/libmonetdbe25.install
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
 
+* Wed Jan 12 2022 Panagiotis Koutsourakis <[email protected]> - 
11.43.5-20220118
+- Implement string imprints (strimps for short) a pre-filter structure
+  for strings in order to accelerate LIKE queries. If a strimp exists
+  for a specific string column the strings are pre-filtered, rejecting
+  strings that cannot possibly match, before the more expensive and
+  accurate matching algorithms run.
+
 * Tue Jan 11 2022 Sjoerd Mullender <[email protected]> - 11.43.3-20220111
 - On Windows, files and directories we create now get the attribute
   FILE_ATTIBUTE_NOT_CONTENT_INDEXED, meaning that they should not be
diff --git a/gdk/ChangeLog.Jan2022 b/gdk/ChangeLog.Jan2022
--- a/gdk/ChangeLog.Jan2022
+++ b/gdk/ChangeLog.Jan2022
@@ -1,10 +1,3 @@
 # ChangeLog file for GDK
 # This file is updated with Maddlog
 
-* Wed Jan 12 2022 Panagiotis Koutsourakis <[email protected]>
-- Implement string imprints (strimps for short) a pre-filter structure
-  for strings in order to accelerate LIKE queries. If a strimp exists
-  for a specific string column the strings are pre-filtered, rejecting
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to