Last try... Seriously

Author: carlosganzerla

.github/workflows/ci.yml

@@ -43,15 +43,14 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Update repositories
-        run: sudo apt install curl ca-certificates
-          sudo install -d /usr/share/postgresql-common/pgdg &&
-          sudo curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc &&
-          . /etc/os-release &&
-          sudo sh -c "echo 'deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $VERSION_CODENAME-pgdg main' > /etc/apt/sources.list.d/pgdg.list" &&
+        run: sudo apt -y install wget ca-certificates &&
+          wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - &&
+          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' &&
+          sudo apt-get --purge remove postgresql &&
           sudo apt update
 
       - name: Install postgres
-        run: sudo apt install -y postgresql-18 libpq-dev clang-format postgresql-server-dev-18
+        run: sudo apt install -y postgresql-16 libpq-dev clang-format postgresql-server-dev-16
 
       - name: Start Postgres
         run: sudo systemctl restart postgresql && sleep 5

hash_set.c

@@ -1,5 +1,4 @@
 #include "c.h"
-#include "common/int.h"
 #include "pg_set.h"
 #include "varatt.h"
 #define EXPANDED_CAPACITY(capacity_) (capacity_ * 2)
@@ -92,7 +91,7 @@ pg_set_element_cmp(const void *p1, const void *p2)
 	PgSetElement v1 = *((const PgSetElement *) p1);
 	PgSetElement v2 = *((const PgSetElement *) p2);
 
-	return pg_cmp_s32(v1, v2);
+	return CMP(v1, v2);
 }
 
 PgSet *

pg_set.h

@@ -79,3 +79,4 @@ ArrayType *cast_to_array(PgSet *args);
 #define PgSetEqualsStrategyNumber 6
 #define PgSetSubsetStrategyNumber 7
 #define PgSetContainsStrategyNumber 13
+#define CMP(a, b) ((a > b) - (a < b));

pg_set_gist.c

@@ -1,7 +1,6 @@
 #include "postgres.h"
 #include "access/gist.h"
 #include "access/reloptions.h"
-#include "common/int.h"
 #include "fmgr.h"
 #include "pg_set.h"
 #include "port/pg_bitutils.h"
@@ -682,6 +681,6 @@ calc_penalty(GistPgSet *left, GistPgSet *right, uint32 masklen)
 static int
 comparecost(const void *a, const void *b)
 {
-	return pg_cmp_s32(((const GistSplitCost *) a)->cost,
-					  ((const GistSplitCost *) b)->cost);
+	return CMP(((const GistSplitCost *) a)->cost,
+			   ((const GistSplitCost *) b)->cost);
 }