Merge branch 'main' into upgrade_CI

Author: PiyushRaj927

.github/workflows/smoke-test.yml

@@ -85,6 +85,10 @@ jobs:
               echo "Test pgautofailover Extension"
               psql -c "CREATE EXTENSION pgautofailover CASCADE;"
               psql -c "SELECT pgautofailover.formation_settings();"
+              
+              echo "Test HyperLogLog Extension"
+              psql -c "CREATE EXTENSION hll;"
+              psql -c "select hll_hash_text('hello world');"
               break
             fi
             sleep 1

Dockerfile

@@ -249,7 +249,7 @@ RUN apk add --no-cache --virtual .zombodb-build-deps \
     && gem install --no-document fpm \
     && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y \
     && PATH=$HOME/.cargo/bin:$PATH \
-    && cargo install cargo-pgrx --version 0.8.3 \
+    && cargo install cargo-pgrx --version 0.9.3 \
     && cargo pgrx init --${PG_VER}=$(which pg_config) \
     && git clone https://github.com/zombodb/zombodb.git \
     && cd ./zombodb \
@@ -312,4 +312,32 @@ RUN set -eux \
 # clean 
     && cd / \
     && rm -rf /tmp/pg_auto_failove-${PG_AUTO_FAILOVER_VERSION} /tmp/pg_auto_failove-${PG_AUTO_FAILOVER_VERSION}.zip \
-    && apk del .pg_auto_failover-build-deps
+    && apk del .pg_auto_failover-build-deps
+
+
+## Adding postgresql-hll
+ARG POSTGRES_HLL_VERSION
+RUN set -eux \
+    && apk add --no-cache --virtual .postgresql-hll-build-deps \
+        openssl-dev \
+        zstd-dev \
+        lz4-dev \
+        zlib-dev \ 
+        make \
+        git \
+        clang15 \
+        gawk \
+        llvm15 \
+        g++ \
+        musl-dev \
+# build postgresql-hll
+    && wget  -O /tmp/postgresql-hll-${POSTGRES_HLL_VERSION}.zip "https://github.com/citusdata/postgresql-hll/archive/refs/tags/v${POSTGRES_HLL_VERSION}.zip" \
+    && unzip  /tmp/postgresql-hll-${POSTGRES_HLL_VERSION}.zip -d /tmp \
+    && cd /tmp/postgresql-hll-${POSTGRES_HLL_VERSION} \
+    && make \
+    && make install \
+# clean 
+    && cd / \
+    && rm -rf /tmp/postgresql-hll-${POSTGRES_HLL_VERSION} /tmp/postgresql-hll-${POSTGRES_HLL_VERSION}.zip \
+    && apk del .postgresql-hll-build-deps 
+

Makefile

@@ -7,6 +7,7 @@ CITUS_VERSION="11.2.0"
 POSTGIS_VERSION=3.3.2
 PG_REPACK_VERSION = 1.4.8
 PG_AUTO_FAILOVER_VERSION = 2.0
+POSTGRES_HLL_VERSION = 2.17
 POSTGIS_SHA256=2a6858d1df06de1c5f85a5b780773e92f6ba3a5dc09ac31120ac895242f5a77b
 PG_VER_NUMBER=$(shell echo $(PG_VER) | cut -c3-)
 TS_VERSION=main
@@ -33,7 +34,8 @@ DOCKER_BUILD_ARGS = --build-arg PG_VERSION=$(PG_VER_NUMBER) \
 					--build-arg POSTGIS_VERSION=$(POSTGIS_VERSION) \
 					--build-arg PG_AUTO_FAILOVER_VERSION=$(PG_AUTO_FAILOVER_VERSION) \
 					--build-arg POSTGIS_VERSION=$(POSTGIS_VERSION) \
-					--build-arg POSTGIS_SHA256=$(POSTGIS_SHA256)  
+					--build-arg POSTGIS_SHA256=$(POSTGIS_SHA256)  \
+					--build-arg POSTGRES_HLL_VERSION=$(POSTGRES_HLL_VERSION)
 
 default: image
 

bitnami/Dockerfile

@@ -205,6 +205,39 @@ RUN apt-get update \
         /tmp/*               \
         /var/tmp/* 
 
+## Adding postgresql-hll
+ARG POSTGRES_HLL_VERSION
+RUN apt-get update \
+    && apt-get install -y  unzip \
+        build-essential \
+        liblz4-dev \
+        zlib1g-dev \
+        libedit-dev \
+        libssl-dev \
+        wget \
+# build postgresql-hll
+    && wget  -O /tmp/postgresql-hll-${POSTGRES_HLL_VERSION}.zip "https://github.com/citusdata/postgresql-hll/archive/refs/tags/v${POSTGRES_HLL_VERSION}.zip" \
+    && unzip  /tmp/postgresql-hll-${POSTGRES_HLL_VERSION}.zip -d /tmp \
+    && cd /tmp/postgresql-hll-${POSTGRES_HLL_VERSION} \
+    && make \
+    && make install \
+# clean 
+    && cd / \
+    && rm -rf /tmp/postgresql-hll-${POSTGRES_HLL_VERSION} /tmp/postgresql-hll-${POSTGRES_HLL_VERSION}.zip \
+    && apt-get autoremove --purge -y \
+        unzip \
+        build-essential \
+        liblz4-dev \
+        zlib1g-dev \
+        libedit-dev \
+        libssl-dev \
+        wget \
+    && apt-get clean -y \
+    && rm -rf \
+        /var/lib/apt/lists/* \
+        /tmp/*               \
+        /var/tmp/* 
+
 # Install zombodb extension
 RUN apt-get update -y -qq --fix-missing \
     && apt-get install -y wget gnupg \
@@ -234,7 +267,7 @@ RUN apt-get update -y -qq --fix-missing \
     && export PATH="/.cargo/bin:$PATH" \
     && export PGRX_HOME="/.pgrx/" \
     && mkdir -p $PGRX_HOME \
-    && cargo install cargo-pgrx --version 0.8.3 \
+    && cargo install cargo-pgrx --version 0.9.3 \
     && cargo pgrx init --pg${PG_MAJOR}=/opt/bitnami/postgresql/bin/pg_config \
     && git clone https://github.com/zombodb/zombodb.git \
     && cd zombodb \

bitnami/Makefile

@@ -9,6 +9,7 @@ PG_MAJOR=15
 POSTGIS_VERSION=3.3.3+dfsg-1~exp1.pgdg110+1
 PG_REPACK_VERSION = 1.4.8
 PG_AUTO_FAILOVER_VERSION = 2.0
+POSTGRES_HLL_VERSION = 2.17
 PG_VER_NUMBER=$(shell echo $(PG_VER) | cut -c3-)
 
 TS_VERSION=main
@@ -30,7 +31,8 @@ DOCKER_BUILD_ARGS = --build-arg PG_VERSION=$(PG_VER_NUMBER) \
 					--build-arg PG_AUTO_FAILOVER_VERSION=$(PG_AUTO_FAILOVER_VERSION)  \
 					--build-arg POSTGIS_MAJOR=$(POSTGIS_MAJOR) \
 					--build-arg PG_MAJOR=$(PG_MAJOR) \
-					--build-arg POSTGIS_VERSION=$(POSTGIS_VERSION)
+					--build-arg POSTGIS_VERSION=$(POSTGIS_VERSION) \
+					--build-arg POSTGRES_HLL_VERSION=$(POSTGRES_HLL_VERSION)
 
 default: image
 

bitnami/timescaledb-bitnami-entrypoint.sh

@@ -4,9 +4,9 @@
 # the shared preload list, or else it gets overwritten.
 if [ -z "$POSTGRESQL_SHARED_PRELOAD_LIBRARIES" ]
 then
-    POSTGRESQL_SHARED_PRELOAD_LIBRARIES="citus,timescaledb,zombodb,pg_repack,pgautofailover"
+    POSTGRESQL_SHARED_PRELOAD_LIBRARIES="citus,timescaledb,zombodb,pg_repack,pgautofailover,hll"
 else
-    POSTGRESQL_SHARED_PRELOAD_LIBRARIES="citus,timescaledb,zombodb,pg_repack,pgautofailover,$POSTGRESQL_SHARED_PRELOAD_LIBRARIES"
+    POSTGRESQL_SHARED_PRELOAD_LIBRARIES="citus,timescaledb,zombodb,pg_repack,pgautofailover,hll,$POSTGRESQL_SHARED_PRELOAD_LIBRARIES"
 fi
 export POSTGRESQL_SHARED_PRELOAD_LIBRARIES