From b359d26de186ea43f93c28c08cd1b8c6449c91bd Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Wed, 6 Nov 2024 19:23:51 +0100
Subject: [PATCH] Release 2.17.2 -- release branch (#7420)

This release contains performance improvements and bug fixes since the
2.17.1 release. We recommend that you upgrade at the next available
opportunity.

**Features**

**Bugfixes**
* #7384 Fix using OIDs with bitmapsets
* #7388 Use-after-free in vectorized grouping by segmentby columns

**Thanks**
* @dx034 for reporting an issue with negative bitmapset members due to
large OIDs
---
 .unreleased/pr_7399                |  2 --
 .unreleased/segmentby-grouping-uaf |  1 -
 CHANGELOG.md                       | 14 ++++++++++++++
 sql/CMakeLists.txt                 |  8 +++++---
 sql/updates/2.17.1--2.17.2.sql     |  0
 sql/updates/2.17.2--2.17.1.sql     |  0
 version.config                     |  6 +++---
 7 files changed, 22 insertions(+), 9 deletions(-)
 delete mode 100644 .unreleased/pr_7399
 delete mode 100644 .unreleased/segmentby-grouping-uaf
 create mode 100644 sql/updates/2.17.1--2.17.2.sql
 create mode 100644 sql/updates/2.17.2--2.17.1.sql

diff --git a/.unreleased/pr_7399 b/.unreleased/pr_7399
deleted file mode 100644
index ff545415833..00000000000
--- a/.unreleased/pr_7399
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes: #7384 Fix using OIDs with bitmapsets
-Thanks: @dx034 for reporting an issue with negative bitmapset members due to large OIDs
diff --git a/.unreleased/segmentby-grouping-uaf b/.unreleased/segmentby-grouping-uaf
deleted file mode 100644
index 788e5e01296..00000000000
--- a/.unreleased/segmentby-grouping-uaf
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #7388 Use-after-free in vectorized grouping by segmentby columns.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcefc84e1ac..d745eb8a037 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,20 @@
 `psql` with the `-X` flag to prevent any `.psqlrc` commands from
 accidentally triggering the load of a previous DB version.**
 
+## 2.17.2 (2024-11-06)
+
+This release contains bug fixes since the 2.17.1 release. We recommend that you
+upgrade at the next available opportunity.
+
+**Bugfixes**
+* #7384 Fix "negative bitmapset member not allowed" and performance degradation
+on queries to compressed tables with ORDER BY clause matching the order of the
+compressed data
+* #7388 Use-after-free in vectorized grouping by segmentby columns
+
+**Thanks**
+* @dx034 for reporting an issue with negative bitmapset members due to large OIDs
+
 ## 2.17.1 (2024-10-21)
 
 This release contains performance improvements and bug fixes since
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 26a01728a03..743bb046d4f 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -44,11 +44,12 @@ set(MOD_FILES
     updates/2.15.3--2.16.0.sql
     updates/2.16.0--2.16.1.sql
     updates/2.16.1--2.17.0.sql
-    updates/2.17.0--2.17.1.sql)
+    updates/2.17.0--2.17.1.sql
+    updates/2.17.1--2.17.2.sql)
 
 # The downgrade file to generate a downgrade script for the current version, as
 # specified in version.config
-set(CURRENT_REV_FILE 2.17.1--2.17.0.sql)
+set(CURRENT_REV_FILE 2.17.2--2.17.1.sql)
 # Files for generating old downgrade scripts. This should only include files for
 # downgrade from one version to its previous version since we do not support
 # skipping versions when downgrading.
@@ -88,7 +89,8 @@ set(OLD_REV_FILES
     2.16.0--2.15.3.sql
     2.16.1--2.16.0.sql
     2.17.0--2.16.1.sql
-    2.17.1--2.17.0.sql)
+    2.17.1--2.17.0.sql
+    2.17.2--2.17.1.sql)
 
 set(MODULE_PATHNAME "$libdir/timescaledb-${PROJECT_VERSION_MOD}")
 set(LOADER_PATHNAME "$libdir/timescaledb")
diff --git a/sql/updates/2.17.1--2.17.2.sql b/sql/updates/2.17.1--2.17.2.sql
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/sql/updates/2.17.2--2.17.1.sql b/sql/updates/2.17.2--2.17.1.sql
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/version.config b/version.config
index 86166c0fd85..e8aca1004cc 100644
--- a/version.config
+++ b/version.config
@@ -1,3 +1,3 @@
-version = 2.17.1
-update_from_version = 2.17.0
-downgrade_to_version = 2.17.0
+version = 2.17.2
+update_from_version = 2.17.1
+downgrade_to_version = 2.17.1