From 660190b2a029e962b1d5efadef1a1a06411fe6f2 Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Thu, 26 Jun 2025 12:12:34 +0200 Subject: [PATCH 1/6] Update PGSM version in PGXN conf file --- META.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/META.json b/META.json index 257087f..224c712 100644 --- a/META.json +++ b/META.json @@ -2,7 +2,7 @@ "name": "pg_stat_monitor", "abstract": "PostgreSQL Query Performance Monitoring Tool", "description": "pg_stat_monitor is a PostgreSQL Query Performance Monitoring tool, based on PostgreSQL's contrib module pg_stat_statements. PostgreSQL’s pg_stat_statements provides the basic statistics, which is sometimes not enough. The major shortcoming in pg_stat_statements is that it accumulates all the queries and their statistics and does not provide aggregated statistics nor histogram information. In this case, a user would need to calculate the aggregates, which is quite an expensive operation.", - "version": "2.1.1", + "version": "2.2.0", "maintainer": [ "Artem Gavrilov ", "Diego dos Santos Fronza " @@ -13,9 +13,9 @@ "provides": { "pg_stat_monitor": { "abstract": "PostgreSQL Query Performance Monitoring Tool", - "file": "pg_stat_monitor--2.0--2.1.sql", + "file": "pg_stat_monitor--2.1--2.2.sql", "docfile": "README.md", - "version": "2.1.1" + "version": "2.2.0" } }, "prereqs": { From 1f3754f04693bf799532e0802b17d2cc9e282856 Mon Sep 17 00:00:00 2001 From: EvgeniyPatlan Date: Thu, 26 Jun 2025 19:00:01 +0300 Subject: [PATCH 2/6] Correctly get version from release branch --- percona-packaging/scripts/pg_stat_monitor_builder.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/percona-packaging/scripts/pg_stat_monitor_builder.sh b/percona-packaging/scripts/pg_stat_monitor_builder.sh index 8e8b0a4..0868d85 100755 --- a/percona-packaging/scripts/pg_stat_monitor_builder.sh +++ b/percona-packaging/scripts/pg_stat_monitor_builder.sh @@ -119,7 +119,10 @@ get_sources(){ fi PRODUCT=percona-pg-stat-monitor${PG_RELEASE} PRODUCT_FULL=${PRODUCT}-${VERSION} - + IS_RELEASE_BRANCH=$(echo ${BRANCH} | grep -c release); + if [ ${IS_RELEASE_BRANCH} != 0 ]; then + VERSION=$(echo $BRANCH | awk -F'-' '{print $2}') + fi echo "PRODUCT=${PRODUCT}" > pg-stat-monitor.properties echo "PRODUCT_FULL=${PRODUCT_FULL}" >> pg-stat-monitor.properties echo "VERSION=${VERSION}" >> pg-stat-monitor.properties From 298a8e08a2aca685d36aae6f9937ff830ac3b5e6 Mon Sep 17 00:00:00 2001 From: EvgeniyPatlan Date: Thu, 26 Jun 2025 19:35:26 +0300 Subject: [PATCH 3/6] Fix place for version --- percona-packaging/scripts/pg_stat_monitor_builder.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/percona-packaging/scripts/pg_stat_monitor_builder.sh b/percona-packaging/scripts/pg_stat_monitor_builder.sh index 0868d85..e46d8f8 100755 --- a/percona-packaging/scripts/pg_stat_monitor_builder.sh +++ b/percona-packaging/scripts/pg_stat_monitor_builder.sh @@ -117,12 +117,13 @@ get_sources(){ echo "Sources will not be downloaded" return 0 fi - PRODUCT=percona-pg-stat-monitor${PG_RELEASE} - PRODUCT_FULL=${PRODUCT}-${VERSION} - IS_RELEASE_BRANCH=$(echo ${BRANCH} | grep -c release); if [ ${IS_RELEASE_BRANCH} != 0 ]; then VERSION=$(echo $BRANCH | awk -F'-' '{print $2}') fi + PRODUCT=percona-pg-stat-monitor${PG_RELEASE} + PRODUCT_FULL=${PRODUCT}-${VERSION} + IS_RELEASE_BRANCH=$(echo ${BRANCH} | grep -c release); + echo "PRODUCT=${PRODUCT}" > pg-stat-monitor.properties echo "PRODUCT_FULL=${PRODUCT_FULL}" >> pg-stat-monitor.properties echo "VERSION=${VERSION}" >> pg-stat-monitor.properties From 65d65ccd05358b59162597b326d16456db3bef32 Mon Sep 17 00:00:00 2001 From: EvgeniyPatlan Date: Fri, 27 Jun 2025 00:08:13 +0300 Subject: [PATCH 4/6] Fix build --- percona-packaging/scripts/pg_stat_monitor_builder.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/percona-packaging/scripts/pg_stat_monitor_builder.sh b/percona-packaging/scripts/pg_stat_monitor_builder.sh index e46d8f8..20df969 100755 --- a/percona-packaging/scripts/pg_stat_monitor_builder.sh +++ b/percona-packaging/scripts/pg_stat_monitor_builder.sh @@ -117,13 +117,13 @@ get_sources(){ echo "Sources will not be downloaded" return 0 fi - if [ ${IS_RELEASE_BRANCH} != 0 ]; then + IS_RELEASE_BRANCH=$(echo ${BRANCH} | grep -c release); + if [ ${IS_RELEASE_BRANCH} != 0 ]; then VERSION=$(echo $BRANCH | awk -F'-' '{print $2}') fi PRODUCT=percona-pg-stat-monitor${PG_RELEASE} PRODUCT_FULL=${PRODUCT}-${VERSION} - IS_RELEASE_BRANCH=$(echo ${BRANCH} | grep -c release); - + echo "PRODUCT=${PRODUCT}" > pg-stat-monitor.properties echo "PRODUCT_FULL=${PRODUCT_FULL}" >> pg-stat-monitor.properties echo "VERSION=${VERSION}" >> pg-stat-monitor.properties From 804059ce75a5b2ae4790591e5e64e1caf792fb36 Mon Sep 17 00:00:00 2001 From: EvgeniyPatlan Date: Fri, 27 Jun 2025 00:36:59 +0300 Subject: [PATCH 5/6] Fix param --- percona-packaging/scripts/pg_stat_monitor_builder.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/percona-packaging/scripts/pg_stat_monitor_builder.sh b/percona-packaging/scripts/pg_stat_monitor_builder.sh index 20df969..72c8d5a 100755 --- a/percona-packaging/scripts/pg_stat_monitor_builder.sh +++ b/percona-packaging/scripts/pg_stat_monitor_builder.sh @@ -117,8 +117,8 @@ get_sources(){ echo "Sources will not be downloaded" return 0 fi - IS_RELEASE_BRANCH=$(echo ${BRANCH} | grep -c release); - if [ ${IS_RELEASE_BRANCH} != 0 ]; then + IS_RELEASE_BRANCH=$(echo ${VERSION} | grep -c release) + if [ ${IS_RELEASE_BRANCH} != 0 ]; then VERSION=$(echo $BRANCH | awk -F'-' '{print $2}') fi PRODUCT=percona-pg-stat-monitor${PG_RELEASE} From f334af03a6348066133c5e3a73117a5a6b982faa Mon Sep 17 00:00:00 2001 From: EvgeniyPatlan Date: Fri, 27 Jun 2025 00:41:31 +0300 Subject: [PATCH 6/6] fix branch detection --- percona-packaging/scripts/pg_stat_monitor_builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/percona-packaging/scripts/pg_stat_monitor_builder.sh b/percona-packaging/scripts/pg_stat_monitor_builder.sh index 72c8d5a..53cc363 100755 --- a/percona-packaging/scripts/pg_stat_monitor_builder.sh +++ b/percona-packaging/scripts/pg_stat_monitor_builder.sh @@ -119,7 +119,7 @@ get_sources(){ fi IS_RELEASE_BRANCH=$(echo ${VERSION} | grep -c release) if [ ${IS_RELEASE_BRANCH} != 0 ]; then - VERSION=$(echo $BRANCH | awk -F'-' '{print $2}') + VERSION=$(echo $VERSION | awk -F'-' '{print $2}') fi PRODUCT=percona-pg-stat-monitor${PG_RELEASE} PRODUCT_FULL=${PRODUCT}-${VERSION}