Merge branch 'PGPROEE9_6' into CORE-470-test_64_xid

Author: vbwagner

.ci/build_and_test_world

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+#
+# script which exececutes all the build stages. If script executed with
+# no arguments and something fails, every bit of logs, stack traces and
+# regression.diffs found would be printed, unless DESKTOP_SESSION
+# environment varible is defined
+# Use -i option to
+#
+#  Following environment variables affect behavoir of this script.
+#  TCLCONFIG - point to directory where tclConfig.sh resides.
+#              required on debian-based system, where configure cannot 
+#              find it automatically
+#  PYTHON    - points to python binary to use. Allows to build with  python3
+#              on systems where default python in PATH is python2 or
+#              vice versa
+#  CC        - C compiler to use
+#  CFLAGS, LDFLAGS - on some systems requried to find 3rd party software
+#  
+stage() {
+	echo ====================================================================
+	printf "==  %-60s  ==\\n" "$*"
+	echo ====================================================================
+}
+
+# Dump logs on exit unless interactive
+[ "$1" = "-i" -o -n "$DESKTOP_SESSION" ]|| trap .ci/collect_logs EXIT
+set -e
+stage configure
+./configure --enable-tap-tests --enable-debug --enable-cassert --enable-nls \
+	--with-openssl --with-perl --with-tcl --with-python \
+	--with-gssapi --with-libxml --with-libxslt --with-ldap \
+	--with-icu --with-zstd ${TCLCONFIG:+--with-tclconfig=${TCLCONFIG}}
+stage make
+make
+stage "make contrib"
+make -C contrib
+stage "make check"
+make check-world
+stage "make installcheck"
+.ci/run_install_check
+trap true EXIT
+
+

.ci/collect_logs

@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+"""
+Prints out all the files with .log extension
+"""
+import os,re,subprocess
+cores=[]
+for root,dirs,files in os.walk("."):
+    for name in files:
+        path= root+"/"+name
+        if name.endswith(".log") or name=="regression.diffs":
+            print "*" * 76
+            print "* %-72s *"%path
+            print "*" * 76
+            with open(path,"r") as f:
+                print f.read()
+        if name == "core" or re.match("core\\.[0-9]+",name) or re.match(".*\\.core",name):
+            cores.append(path)
+print ", ".join(cores)            
+for f in cores:
+    print "*" * 76
+    print "* %-72s *"%f
+    print "*" * 76
+    gdb=subprocess.Popen(["gdb","src/backend/postgres",f],
+        stderr=subprocess.PIPE,stdout=subprocess.PIPE,stdin=subprocess.PIPE)
+    out,err=gdb.communicate("bt\nq\n")
+    if err.find("core file may not match specified")>=0:
+        m=re.search("Core was generated by `(.*)'",out)
+        if m:
+            gdb=subprocess.Popen(["gdb",m.group(1),f],
+                                 stdout=subprocess.PIPE,stdin=subprocess.PIPE)
+            out,err=gdb.communicate("bt\nq\n")
+            
+    
+    print out
+
+    
+ 
+

.ci/find_free_port

@@ -0,0 +1,22 @@
+#!/usr/bin/python
+import sys,socket,errno
+if len(sys.argv)>1:
+	port=int(sys.argv[1])
+else:
+	port=5900
+    
+s=socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+while True:
+    try:
+        s.bind(("",port))
+    except socket.error as e:
+        if e.errno== errno.EADDRINUSE:
+            port+=1
+            continue
+        else:
+            raise e
+    break
+
+s.close()
+print port
+    

.ci/make_test_base

@@ -0,0 +1,77 @@
+#!/usr/bin/env python
+"""
+Receives one parameter - PGDATA directory
+Creates test base using first initdb found in the PATH 
+Searches contrib directory for additional directives to 
+put into postgresql conf.
+
+On success, starts database
+"""
+import os,sys,subprocess,glob,re,os.path,time
+
+if len(sys.argv)!=2:
+    print >>sys.stderr,"Usage %s data-directory" % sys.argv[0]
+    sys.exit(1)
+
+datadir=sys.argv[1]
+
+if os.access(datadir,os.R_OK):
+    import shutil
+    shutil.rmtree(datadir)
+os.mkdir(datadir)
+env=os.environ.copy()
+env["LANG"]="C"
+with open("initdb.log","w") as f:
+    exitcode=subprocess.call(["initdb","-E","UTF8",datadir],env=env,stdout=f,stderr=subprocess.STDOUT)
+if exitcode:
+    sys.exit(exitcode)
+# Collect extra config option
+addopts={}
+for module in glob.glob("contrib/*"):
+    if not os.path.isdir(module):
+        continue
+    if not os.access(module+"/Makefile",os.R_OK):
+        continue
+    with open(module+"/Makefile","r") as makefile:
+        var={"top_srcdir":os.getcwd()}
+        for line in makefile:
+            m=re.match("\s*(\w+)\s*=\s*(.*)",line)
+            if m:
+                var[m.group(1)]=m.group(2)
+    if "EXTRA_REGRESS_OPTS" in var:
+        m=re.search("--temp-config=(\S+)",var["EXTRA_REGRESS_OPTS"])
+        if m:
+            filename=re.sub("\\$[{(](\w+)[})]",lambda m: var[m.group(1)],m.group(1))
+            with open(filename,"r") as config:
+                for line in config:
+                    m=re.match("(\w\S*\w)\s*=\s*(\S.*)\s*",line)
+                    if m:
+                        opt=m.group(1)
+                        value=m.group(2)
+                        if opt in addopts:
+                            if value[0]=="'":
+                                addopts[opt]=addopts[opt][:-1]+", "+value[1:]
+                            else:
+                                addopts[opt]+=", ".value
+                        else:
+                            addopts[opt]=value
+                                
+if addopts:                     
+    with open(datadir+"/postgresql.conf","a") as f:
+        for opt,value in addopts.items():
+            print >> f,"%s=%s"%(opt,value)
+with open("initdb.log","a") as f:
+    exitcode=subprocess.call(["pg_ctl","start","-D",datadir,"-l",datadir+"/postmaster.log"],env=env,stdout=f,stderr=subprocess.STDOUT)
+if exitcode:
+    sys.exit(exitcode)
+
+failtime=time.time()+60
+print "Waiting for database to start"
+while time.time() < failtime:
+    exitcode=subprocess.call(["psql","postgres","-c","select version()"],stderr=subprocess.STDOUT)
+    if exitcode == 0:
+        sys.exit(0)
+print >>sys.stderr,"Database havent't started in 60 seconds"
+sys.exit(1)
+
+

.ci/run_install_check

@@ -0,0 +1,44 @@
+#!/bin/sh
+# Makes temporary installation and runs installcheck-world on it
+# Should be run as non-privileged user.
+# Exit on all errors
+# If run without arguments, makes installcheck-world
+# Otherwise first argument is interpreted as subdirectory 
+# to change before runnning make installchedk
+# i.e
+#    run_install_check . 
+# test core only
+#    run_install_check contrib
+# tests contrib only
+# etc.
+# All other arguments are passed to Makefile intact
+# To make possible pass arguments to installcheck-world
+#    run_install_check world
+# does the same as no args
+set -e
+# Install
+make install prefix=`pwd`/tmp_install
+make install prefix=`pwd`/tmp_install -C contrib
+
+# Setup an environment
+LD_LIBRARY_PATH=$(pwd)/tmp_install/lib
+PATH=$(pwd)/tmp_install/bin:${PATH}
+PGDATA=$(pwd)/tmp_base
+export LD_LIBRARY_PATH PATH PG_DATA
+
+# create installation
+PGPORT=`./.ci/find_free_port 5432`
+export PGPORT
+./.ci/make_test_base $PGDATA
+#run checks
+set +e
+if [  -z "$1" -o "$1" = "world" ]; then
+make installcheck-world  prefix=`pwd`/tmp_install NO_LOCALE=1
+else
+dir=$1
+shift
+make -C "$dir" installcheck prefix=`pwd`/tmp_install NO_LOCALE=1 ${@:+"$@"}
+fi
+code=$?
+pg_ctl stop -D $PGDATA
+exit $code

.gitlab-ci.yml

@@ -1,23 +1,58 @@
-image: debian
-
 stages:
+  - prepare
+  - build
   - test
 
-before_script:
+.prepare-deb:
+  stage: prepare
+  image: ubuntu:16.04
+  tags: 
+   - deb 
+   - docker
+  only: 
+   - /^PGPRO.*9_[56]$/
+  before_script:
   - export DEBIAN_FRONTEND=noninteractive
   - export CORES=$(grep -c ^processor /proc/cpuinfo)
   - uname -a
   - df -h
-
-test:ubuntu-16.04:
-  stage: test
-  image: ubuntu:16.04
-  only:
-    - PGPROEE9_6
-  before_script:
-    - apt-get update && apt-get install -y sudo gcc make flex bison libreadline-dev zlib1g-dev openjade libzstd-dev opensp docbook docbook-xml docbook-xsl libxml2-utils xsltproc python-dev libicu-dev
   script:
-    - ./configure --prefix=/opt/pgproee  --with-zstd --with-icu --with-python
-    - make -j $CORES world
-    - make check-world
+    - echo "Current user id is `id`"
+    - apt-get update && apt-get install -y sudo gcc make flex bison libreadline-dev zlib1g-dev openjade libzstd-dev opensp docbook docbook-xml docbook-xsl libxml2-utils xsltproc python-dev libicu-dev
+    - id -u postgres || adduser --disabled-login --gecos "Postgres"  postgres
+# Template build
+.build_unix: &build_unix_def
+  stage: build
+  tags:
+    - unix
+  only:
+    - /^PGPRO.*9_[56]$/
+  script: 
+    - .ci/build_and_test_world
+  when: always
+
+build_docs_job:
+  stage: build
   when: always
+  only: 
+    - /^PGPRO.*9_[56]$/
+  tags: 
+    - docs
+  script: 
+    - ./configure
+    - make -C doc
+
+# Here definitions of particular build enviroments start
+
+build_debian_8:
+    <<: *build_unix_def
+    tags:
+      - jessie
+      - 64bit
+
+build_debian_7_32:
+    <<: *build_unix_def
+    tags:
+      - wheezy
+      - 32bit
+

COPYRIGHT

@@ -1,7 +1,7 @@
 PostgreSQL Database Management System
 (formerly known as Postgres, then as Postgres95)
 
-Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
 
 Portions Copyright (c) 1994, The Regents of the University of California