From 98780f7d5989f243ec991ab352fd9f21bdafc32d Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <36882414+akuzm@users.noreply.github.com>
Date: Thu, 7 Nov 2024 13:30:15 +0100
Subject: [PATCH] Release 2.17.2 -- main branch (#7421)

---
 .github/workflows/pr-approvals.yaml | 12 +++++++++++-
 .unreleased/pr_7399                 |  2 --
 .unreleased/segmentby-grouping-uaf  |  1 -
 CHANGELOG.md                        | 14 ++++++++++++++
 sql/CMakeLists.txt                  |  6 ++++--
 sql/updates/2.17.1--2.17.2.sql      |  0
 sql/updates/2.17.2--2.17.1.sql      |  0
 version.config                      |  4 ++--
 8 files changed, 31 insertions(+), 8 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/.github/workflows/pr-approvals.yaml b/.github/workflows/pr-approvals.yaml
index 60696c351..ca8edd561 100644
--- a/.github/workflows/pr-approvals.yaml
+++ b/.github/workflows/pr-approvals.yaml
@@ -23,13 +23,23 @@ jobs:
         env:
           BODY: ${{ github.event.pull_request.body }}
           GH_TOKEN: ${{ github.token }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
+          PR_NUMBER: ${{ github.event.number }}
         run: |
+          echo "Event is: "
+          cat <<EOF
+            ${{ toJSON(github.event) }}
+          EOF
+          echo "PR number is $PR_NUMBER"
           echo "$BODY" | egrep -qsi '^disable-check:.*\<approval-count\>'
           if [[ $? -ne 0 ]]; then
             # Get the list of modified files in this pull request
+            echo "Modified files: "
+            gh pr view $PR_NUMBER --json files
             files=$(gh pr view $PR_NUMBER --json files --jq '.files.[].path | select(startswith(".github") | not)')
+
             # Get the number of approvals in this pull request
+            echo "Reviews: "
+            gh pr view $PR_NUMBER --json reviews
             approvals=$(gh pr view $PR_NUMBER --json reviews --jq '[.reviews.[] | select((.authorAssociation == "MEMBER" or .authorAssociation == "CONTRIBUTOR") and .state == "APPROVED")] | length')
 
             if [[ $approvals -lt 2 ]] && [[ "${files}" ]] ; then
diff --git a/.unreleased/pr_7399 b/.unreleased/pr_7399
deleted file mode 100644
index ff5454158..000000000
--- 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 788e5e012..000000000
--- 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 dcefc84e1..d745eb8a0 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 96493ac7b..b3d7f3d39 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -44,7 +44,8 @@ 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
@@ -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 000000000..e69de29bb
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 000000000..e69de29bb
diff --git a/version.config b/version.config
index c19114dea..69be6f54f 100644
--- a/version.config
+++ b/version.config
@@ -1,3 +1,3 @@
 version = 2.18.0-dev
-update_from_version = 2.17.1
-downgrade_to_version = 2.17.1
+update_from_version = 2.17.2
+downgrade_to_version = 2.17.2