Merge pull request #7 from CherkashinSergey/refactoring

Improve tests, remove deprecated functions, update postgres patches

Author: ildus

.dockerignore

@@ -0,0 +1,5 @@
+*.gcno
+*.gcda
+*.gcov
+*.so
+*.o

.gitignore

@@ -1,5 +1,11 @@
 *.o
 *.so
 *.swp
+*.pyc
+*.gcda
+*.gcno
+*.gcov
+pg_query_state--*.sql
 cscope.out
 tags
+Dockerfile

.travis.yml

@@ -0,0 +1,31 @@
+sudo: required
+
+language: c
+
+services:
+    - docker
+
+install:
+    - ./mk_dockerfile.sh
+    - docker-compose build
+
+script:
+    - docker-compose run $(bash <(curl -s https://codecov.io/env)) tests
+
+notifications:
+    email:
+        on_success: change
+        on_failure: always
+
+env:
+    - PG_VERSION=11 LEVEL=hardcore
+    - PG_VERSION=11
+    - PG_VERSION=10 LEVEL=hardcore
+    - PG_VERSION=10
+    - PG_VERSION=9.6 LEVEL=hardcore
+    - PG_VERSION=9.6
+
+matrix:
+    allow_failures:
+        - env: PG_VERSION=10 LEVEL=nightmare
+        - env: PG_VERSION=9.6 LEVEL=nightmare

Dockerfile.tmpl

@@ -0,0 +1,38 @@
+FROM postgres:${PG_VERSION}-alpine
+
+# Install dependencies
+RUN apk add --no-cache \
+	openssl curl \
+	perl perl-ipc-run \
+	make musl-dev gcc bison flex coreutils \
+	zlib-dev libedit-dev \
+	clang clang-analyzer \
+	python2 python2-dev py2-virtualenv;
+
+
+# Install fresh valgrind
+RUN apk add valgrind \
+	--update-cache \
+	--repository http://dl-3.alpinelinux.org/alpine/edge/main;
+
+# Environment
+ENV LANG=C.UTF-8 PGDATA=/pg/data
+
+# Make directories
+RUN	mkdir -p ${PGDATA} && \
+	mkdir -p /pg/testdir
+
+# Grant privileges
+RUN	chown postgres:postgres ${PGDATA} && \
+	chown postgres:postgres /pg/testdir && \
+	chmod -R a+rwx /usr/local/lib/postgresql && \
+	chmod a+rwx /usr/local/share/postgresql/extension
+
+COPY run_tests.sh /run.sh
+RUN chmod 755 /run.sh
+
+ADD . /pg/testdir
+WORKDIR /pg/testdir
+
+USER postgres
+ENTRYPOINT LEVEL=${LEVEL} /run.sh

Makefile

@@ -3,11 +3,13 @@
 MODULE_big = pg_query_state
 OBJS = pg_query_state.o signal_handler.o $(WIN32RES)
 EXTENSION = pg_query_state
-EXTVERSION = 1.0
-DATA = $(EXTENSION)--$(EXTVERSION).sql
+EXTVERSION = 1.1
+DATA = pg_query_state--1.0--1.1.sql
+DATA_built = $(EXTENSION)--$(EXTVERSION).sql
 PGFILEDESC = "pg_query_state - facility to track progress of plan execution"
 
-EXTRA_CLEAN = ./isolation_output
+EXTRA_CLEAN = ./isolation_output $(EXTENSION)--$(EXTVERSION).sql \
+	Dockerfile ./tests/*.pyc
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
@@ -20,6 +22,9 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
+$(EXTENSION)--$(EXTVERSION).sql: init.sql
+	cat $^ > $@
+
 check: isolationcheck
 
 ISOLATIONCHECKS=corner_cases

README.md

@@ -0,0 +1,2 @@
+tests:
+    build: .

docker-compose.yml

@@ -15,11 +15,3 @@ CREATE FUNCTION pg_query_state(pid 		integer
 				 , leader_pid integer)
 	AS 'MODULE_PATHNAME'
 	LANGUAGE C STRICT VOLATILE;
-
-CREATE FUNCTION executor_step(pid integer) RETURNS VOID
-	AS 'MODULE_PATHNAME'
-	LANGUAGE C VOLATILE;
-
-CREATE FUNCTION executor_continue(pid integer) RETURNS VOID
-	AS 'MODULE_PATHNAME'
-	LANGUAGE C VOLATILE;

executor_hooks.patch

@@ -0,0 +1,16 @@
+if [ -z ${PG_VERSION+x} ]; then
+	echo PG_VERSION is not set!
+	exit 1
+fi
+
+if [ -z ${LEVEL+x} ]; then
+	LEVEL=scan-build
+fi
+
+echo PG_VERSION=${PG_VERSION}
+echo LEVEL=${LEVEL}
+
+sed \
+	-e 's/${PG_VERSION}/'${PG_VERSION}/g \
+	-e 's/${LEVEL}/'${LEVEL}/g \
+	Dockerfile.tmpl > Dockerfile