Merge pull request #1 from nad2000/V10

V10

Author: nad2000

.travis.yml

@@ -1,30 +1,43 @@
 sudo: required
+matrix:
+  include:
+    - env: PG_VERSION=9
+    - env: PG_VERSION=10
+    - env: PG_VERSION=11
+    # - env: PG_VERSION=12
 
 services:
-        - docker
+  - docker
 
 before_install:
-        - docker build -t image .
+  - docker build --build-arg PG_VERSION=${PG_VERSION} -t image .
 
 install:
-        - docker run --name TEST -d image
-        # wait for the database to come up
-        - until docker exec TEST psql -U postgres -l; do echo "Waiting for postgres to start..."; sleep 0.5; done
+  - docker run --name TEST -d image
+  # wait for the database to come up
+  - until docker exec TEST psql -U postgres -l; do echo "Waiting for postgres to start..."; sleep 0.5; done
 
 script:
-        - docker exec TEST psql -U postgres -c "CREATE EXTENSION uint" && echo "SUCCESS"
-        - docker exec TEST psql -U postgres -c "CREATE TABLE test(col1 uint1, col2 uint2, col4 uint4);" && echo "SUCCESS"
-        - docker exec TEST psql -U postgres -c "INSERT INTO test(col1, col2, col4) SELECT v % 127, v % 16256, v FROM generate_series(1, 100000) AS d(v)" && echo "SUCCESS"
-        - docker exec TEST psql -U postgres -c "WITH t AS (SELECT DISTINCT col1 FROM test) SELECT count(*) FROM t" && echo "SUCCESS"
+  - docker exec TEST psql -U postgres -c "CREATE EXTENSION uint" && echo "SUCCESS"
+  - >-
+    docker exec TEST psql -U postgres -c "CREATE TABLE IF NOT EXISTS test (
+      col1 uint1, col2 uint2, col4 uint4); 
+      INSERT INTO test(col1, col2, col4) 
+      SELECT v % 127, v % 16256, v 
+      FROM generate_series(1, 100000, 42) AS d(v); 
+      WITH t AS (SELECT DISTINCT col1 FROM test) SELECT count(*) FROM t;" && echo "SUCCESS"
+  - docker logs TEST
 
 after_success:
-        - docker login -e $DOCKER_HUB_EMAIL -u $DOCKER_HUB_USER_ID -p $DOCKER_HUB_PWD
-        - docker tag image $DOCKER_HUB_USER_ID/postgres-uint:$TRAVIS_COMMIT
-        - docker tag image $DOCKER_HUB_USER_ID/postgres-uint:latest
-        - docker push $DOCKER_HUB_USER_ID/postgres-uint:$TRAVIS_COMMIT
-        - docker push $DOCKER_HUB_USER_ID/postgres-uint:latest
+  - docker login -u $DOCKER_HUB_USER_ID -p $DOCKER_HUB_PWD
+  - docker tag image $DOCKER_HUB_USER_ID/postgres-uint:v$PG_VERSION
+  - docker push $DOCKER_HUB_USER_ID/postgres-uint:v$PG_VERSION
+  - >
+    if [ $PG_VERSION == 11 ] ; then
+      docker tag image $DOCKER_HUB_USER_ID/postgres-uint:latest
+      docker push $DOCKER_HUB_USER_ID/postgres-uint:latest
+    fi
 
 after_script:
-        - docker stop TEST
-        - docker rm -f TEST
-
+  - docker stop TEST
+  - docker rm -f TEST

Dockerfile

@@ -1,13 +1,14 @@
-FROM postgres:9
+ARG PG_VERSION
+FROM postgres:${PG_VERSION:-9}
 COPY . /uint
 RUN apt-get update -y && apt-get upgrade -y \
     && apt-get install -y --no-install-recommends \
       gcc  \
       build-essential \
       postgresql-server-dev-all \
     && cd /uint && PATH=/usr/lib/postgresql/${PG_MAJOR}/bin:$PATH make install \
-    && apt-get purge -y build-essential binutils comerr-dev cpp dctrl-tools gcc krb5-multidev libasan* libatomic1 libc-dev-bin libc6-dev libcilkrts5 libcloog-isl4 libgomp1 libgssrpc4 libisl* libitm1 libkadm5clnt-mit9 libkadm5srv-mit9 libkdb5-7 liblsan0 libmpc3 libmpfr4 libpq-dev libquadmath0 libssl-dev libtsan0 libubsan0 linux-libc-dev make postgresql-server-dev-all zlib1g-dev \
-    && apt-get autoremove -y \
+    && apt-get purge -y build-essential binutils comerr-dev cpp dctrl-tools gcc krb5-multidev libasan* libatomic1 libc-dev-bin libc6-dev libcilkrts5 libcloog-isl4 libgomp1 libgssrpc4 libisl* libitm1 libkadm5clnt-mit9 libkadm5srv-mit9 libkdb5-7 liblsan0 libmpc3 libmpfr4 libpq-dev libquadmath0 libssl-dev libtsan0 libubsan0 linux-libc-dev make postgresql-server-dev-all zlib1g-dev ; \
+    apt-get autoremove -y \
     && apt-get autoclean -y \
     && cd / && rm -rf /uint \
     && rm -rf /var/lib/apt/lists/*

uint.c

@@ -20,18 +20,21 @@
 #define PG_RETURN_UINT8(x) return UInt8GetDatum(x)
 #define PG_RETURN_UINT16(x) return UInt16GetDatum(x)
 
-#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
-#   define likely(x) __builtin_expect((x),1)
-#   define unlikely(x) __builtin_expect((x),0)
-#else
-#   define likely(x) (x)
-#   define unlikely(x) (x)
+#if !defined(likely) && !defined(unlikely)
+#  if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
+#    define likely(x) __builtin_expect((x),1)
+#    define unlikely(x) __builtin_expect((x),0)
+#  else
+#    define likely(x) (x)
+#    define unlikely(x) (x)
+#  endif
 #endif
 
 #ifdef PG_MODULE_MAGIC
 PG_MODULE_MAGIC;
 #endif
 
+
 /*
  *  ==================
  *  UINT1 DECLARATIONS
@@ -214,6 +217,7 @@ PG_FUNCTION_INFO_V1(uint1le);
 PG_FUNCTION_INFO_V1(uint1gt);
 PG_FUNCTION_INFO_V1(uint1ge);
 PG_FUNCTION_INFO_V1(uint1int4eq);
+PG_FUNCTION_INFO_V1(int4uint1eq);
 
 /**
  * This function implements the "equal" (=) operator for the uint1 datatype.
@@ -743,6 +747,7 @@ PG_FUNCTION_INFO_V1(uint2le);
 PG_FUNCTION_INFO_V1(uint2gt);
 PG_FUNCTION_INFO_V1(uint2ge);
 PG_FUNCTION_INFO_V1(uint2int4eq);
+PG_FUNCTION_INFO_V1(int4uint2eq);
 
 /**
  * This function implements the "equal" (=) operator for the uint2 datatype.
@@ -2029,8 +2034,12 @@ uint_histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc,
                            double (*convert_stats)(Datum))
 {
    double hist_selec;
+#if PG_VERSION_NUM < 100000
    Datum *values;
    int nvalues;
+#else
+   AttStatsSlot sslot;
+#endif
 
    hist_selec = 0.0;
 
@@ -2045,13 +2054,29 @@ uint_histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc,
     * the reverse way if isgt is TRUE.
     */
    if(HeapTupleIsValid(vardata->statsTuple) &&
+#if PG_VERSION_NUM < 90000
+      get_attstatsslot(vardata->statsTuple, vardata->atttype,
+                       vardata->atttypmod, STATISTIC_KIND_HISTOGRAM,
+                       InvalidOid,
+                       &values, &nvalues, NULL, NULL)
+#elif PG_VERSION_NUM < 100000
       get_attstatsslot(vardata->statsTuple, vardata->atttype,
                        vardata->atttypmod, STATISTIC_KIND_HISTOGRAM,
                        InvalidOid,
                        NULL,  /* Added for postgresql 9 compatibality */
-                       &values, &nvalues, NULL, NULL))
+                       &values, &nvalues, NULL, NULL)
+#else
+      get_attstatsslot(&sslot,
+		       vardata->statsTuple, vardata->atttype,
+                       vardata->atttypmod, STATISTIC_KIND_HISTOGRAM)
+#endif
+      )
    {
-      if(nvalues > 1) {
+      if(
+#if PG_VERSION_NUM >= 100000
+	 sslot.
+#endif
+	 nvalues > 1) {
          /*
           * Use binary search to find proper location, ie, the first slot
           * at which the comparison fails.  (If the given operator isn't
@@ -2061,13 +2086,21 @@ uint_histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc,
           */
          double histfrac;
          int lobound = 0;        /* first possible slot to search */
-         int hibound = nvalues;  /* last+1 slot to search */
+         int hibound = 
+#if PG_VERSION_NUM >= 100000
+		 sslot.
+#endif
+		 nvalues;  /* last+1 slot to search */
 
          while(lobound < hibound) {
             int probe = (lobound + hibound) / 2;
             bool ltcmp;
 
-            ltcmp = DatumGetBool(FunctionCall2(opproc, values[probe], constval));
+            ltcmp = DatumGetBool(FunctionCall2(opproc,
+#if PG_VERSION_NUM >= 100000
+                                                       sslot.
+#endif
+					               values[probe], constval));
             if(isgt)
                ltcmp = !ltcmp;
 
@@ -2077,7 +2110,11 @@ uint_histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc,
                hibound = probe;
          }
 
-         if(lobound >= nvalues) {
+         if(lobound >= 
+#if PG_VERSION_NUM >= 100000
+	 sslot.
+#endif
+	    nvalues) {
             /* Constant is above upper histogram boundary. */
             histfrac = 1.0;
          }
@@ -2096,8 +2133,16 @@ uint_histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc,
              */
 
             val = (*convert_value)(constval);
-            low = (*convert_stats)(values[i - 1]);
-            high = (*convert_stats)(values[i]);
+            low = (*convert_stats)(
+#if PG_VERSION_NUM >= 100000
+	                           sslot.
+#endif
+				   values[i - 1]);
+            high = (*convert_stats)(
+#if PG_VERSION_NUM >= 100000
+	                            sslot.
+#endif
+				    values[i]);
 
             if(high <= low)
                binfrac = 0.5; /* cope if bin boundaries appear identical */
@@ -2124,7 +2169,11 @@ uint_histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc,
              * binfrac partial bin below the constant.
              */
             histfrac = (double) (i - 1) + binfrac;
-            histfrac /= (double) (nvalues - 1);
+            histfrac /= (double) (
+#if PG_VERSION_NUM >= 100000
+	 sslot.
+#endif
+				  nvalues - 1);
          }
 
          /*
@@ -2145,7 +2194,11 @@ uint_histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc,
          else if (hist_selec > 0.9999)
             hist_selec = 0.9999;
       }
+#if PG_VERSION_NUM < 100000
       free_attstatsslot(vardata->atttype, values, nvalues, NULL, 0);
+#else
+      free_attstatsslot(&sslot);
+#endif
    }
    return hist_selec;
 }