Add support for PostgreSQL 10

The extension now works with PostgreSQL 10, while
retaining compatibility with version 9.6.

PostgreSQL 10 has numerous internal changes to functions and
APIs, which necessitates various glue code and compatibility
wrappers to seamlessly retain backwards compatiblity with older
versions.

Test output might also differ between versions. In particular,
the psql client generates version-specific output with `\d` and
EXPLAINs might differ due to new query optimizations. The test
suite has been modified as follows to handle these issues. First,
tests now use version-independent functions to query system
catalogs instead of using `\d`. Second, changes have been made to
the test suite to be able to verify some test outputs against
version-dependent reference files.

Author: erimatnor

.travis.yml

@@ -1,24 +1,26 @@
 sudo: required
-
 language: c
-os: linux
-dist: trusty
-
+os:
+  - linux
 services:
   - docker
+env:
+  - PG_VERSION=9.6.5
+  - PG_VERSION=10.0
+
+before_install:
+  - docker run -d --name pgbuild -v ${TRAVIS_BUILD_DIR}:/build postgres:${PG_VERSION}-alpine
+install:
+  - docker exec -it pgbuild /bin/sh -c "apk add --no-cache --virtual .build-deps coreutils dpkg-dev gcc libc-dev make util-linux-dev diffutils cmake && mkdir -p /build/debug && cd /build/debug && cmake .. -DCMAKE_BUILD_TYPE=Debug && make install && chown -R postgres:postgres /build/"
+script:
+  - docker exec -u postgres -it pgbuild /bin/sh -c "make -C /build/debug installcheck PG_REGRESS_OPTS='--temp-instance=/tmp/pgdata'"
+after_failure:
+  - docker exec -it pgbuild cat /build/debug/test/regression.diffs
+after_script:
+  - docker rm -f pgbuild
 
 jobs:
   include:
     - stage: test
-      before_install:
-        - docker run -d --name pgbuild -v ${TRAVIS_BUILD_DIR}:/build postgres:9.6.3-alpine
-      install:
-        - docker exec -it pgbuild /bin/sh -c "apk add --no-cache --virtual .build-deps coreutils dpkg-dev gcc libc-dev make util-linux-dev diffutils cmake && mkdir -p /build/debug && cd /build/debug && cmake .. -DCMAKE_BUILD_TYPE=Debug && make install && chown -R postgres:postgres /build/"
       script:
-        - docker exec -u postgres -it pgbuild /bin/sh -c "make -C /build/debug installcheck PG_REGRESS_OPTS='--temp-instance=/tmp/pgdata'"
-      after_failure:
-        - docker exec -it pgbuild cat /build/debug/test/regression.diffs
-      after_script:
-        - docker rm -f pgbuild
-    - stage: test
-      script: PGTEST_TMPDIR=$TRAVIS_BUILD_DIR bash -x ./scripts/test_updates.sh
+        - PGTEST_TMPDIR=/tmp/ bash -x ./scripts/test_updates.sh

CMakeLists.txt

@@ -58,21 +58,26 @@ execute_process(
   OUTPUT_VARIABLE PG_VERSION_STRING
   OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-if (NOT ${PG_VERSION_STRING} MATCHES "^PostgreSQL[ ]+([0-9]+)\\.([0-9]+)\\.([0-9]+)$")
+if (NOT ${PG_VERSION_STRING} MATCHES "^PostgreSQL[ ]+([0-9]+)\\.([0-9]+)(\\.([0-9]+))*$")
   message(FATAL_ERROR "Could not parse PostgreSQL version ${PG_VERSION}")
 endif ()
 
 set(PG_VERSION_MAJOR ${CMAKE_MATCH_1})
 set(PG_VERSION_MINOR ${CMAKE_MATCH_2})
-set(PG_VERSION_PATCH ${CMAKE_MATCH_3})
-set(PG_VERSION "${PG_VERSION_MAJOR}.${PG_VERSION_MINOR}.${PG_VERSION_PATCH}")
+set(PG_VERSION_PATCH ${CMAKE_MATCH_4})
+
+if (NOT ${PG_VERSION_PATCH} OR ${PG_VERSION_PATCH} EQUAL "")
+  set(PG_VERSION "${PG_VERSION_MAJOR}.${PG_VERSION_MINOR}")
+else ()
+  set(PG_VERSION "${PG_VERSION_MAJOR}.${PG_VERSION_MINOR}.${PG_VERSION_PATCH}")
+endif ()
 
 message(STATUS "Compiling against PostgreSQL version ${PG_VERSION}")
 
 if ((${PG_VERSION} VERSION_LESS "9.6")
-    OR (${PG_VERSION} VERSION_EQUAL "10")
-    OR (${PG_VERSION} VERSION_GREATER "10"))
-  message(FATAL_ERROR "TimescaleDB only supports PostgreSQL 9.6")
+    OR (${PG_VERSION} VERSION_EQUAL "11")
+    OR (${PG_VERSION} VERSION_GREATER "11"))
+  message(FATAL_ERROR "TimescaleDB only supports PostgreSQL 9.6 or 10")
 endif ()
 
 # Get PostgreSQL configuration from pg_config

scripts/docker-build.sh

@@ -5,7 +5,8 @@
 #
 SCRIPT_DIR=$(dirname $0)
 BASE_DIR=${PWD}/${SCRIPT_DIR}/..
-PG_IMAGE_TAG=${PG_IMAGE_TAG:-9.6.3-alpine}
+PG_VERSION=${PG_VERSION:-10.0}
+PG_IMAGE_TAG=${PG_IMAGE_TAG:-${PG_VERSION}-alpine}
 BUILD_CONTAINER_NAME=${BUILD_CONTAINER_NAME:-pgbuild}
 BUILD_IMAGE_NAME=${BUILD_IMAGE_NAME:-$USER/pgbuild}
 IMAGE_NAME=${IMAGE_NAME:-$USER/timescaledb}

scripts/test_updates.sh

@@ -8,13 +8,17 @@ BASE_DIR=${PWD}/${SCRIPT_DIR}/..
 PGTEST_TMPDIR=${PGTEST_TMPDIR:-$(mktemp -d 2>/dev/null || mktemp -d -t 'timescaledb_update_test')}
 UPDATE_PG_PORT=${UPDATE_PG_PORT:-6432}
 CLEAN_PG_PORT=${CLEAN_PG_PORT:-6433}
-
+PG_VERSION=${PG_VERSION:-9.6.5} # Need 9.6.x version since we are
+                                # upgrading the extension from
+                                # versions that didn't support PG10.
 UPDATE_FROM_IMAGE=${UPDATE_FROM_IMAGE:-timescale/timescaledb}
 UPDATE_FROM_TAG=${UPDATE_FROM_TAG:-0.1.0}
 UPDATE_TO_IMAGE=${UPDATE_TO_IMAGE:-update_test}
 UPDATE_TO_TAG=${UPDATE_TO_TAG:-latest}
 DO_CLEANUP=true
 
+export PG_VERSION
+
 while getopts "d" opt;
 do
     case $opt in
@@ -142,4 +146,3 @@ docker_pgcmd timescaledb-clean-restore "ALTER DATABASE single SET timescaledb.re
 
 echo "Testing restored"
 docker_pgdiff timescaledb-updated timescaledb-clean-restore /src/test/sql/updates/test-0.1.1.sql
-

sql/ddl_api.sql

@@ -89,6 +89,9 @@ BEGIN
         USING ERRCODE = 'IO102';
     END IF;
 
+    -- Validate that the hypertable supports the triggers in the main table
+    PERFORM _timescaledb_internal.validate_triggers(main_table);
+
     time_type := _timescaledb_internal.dimension_type(main_table, time_column_name, true);
 
     chunk_time_interval_actual := _timescaledb_internal.time_interval_specification_to_internal(

sql/util_internal_table_ddl.sql

@@ -221,3 +221,6 @@ BEGIN
         END LOOP;
 END
 $BODY$;
+
+CREATE OR REPLACE FUNCTION _timescaledb_internal.validate_triggers(main_table REGCLASS) RETURNS VOID
+    AS '$libdir/timescaledb', 'hypertable_validate_triggers' LANGUAGE C IMMUTABLE STRICT;

src/CMakeLists.txt

@@ -51,6 +51,7 @@ set(HEADERS
   hypertable.h
   hypertable_insert.h
   indexing.h
+  parse_rewrite.h
   partitioning.h
   planner_utils.h
   process_utility.h
@@ -89,6 +90,8 @@ set(SOURCES
   hypertable_insert.c
   indexing.c
   init.c
+  parse_analyze.c
+  parse_rewrite.c
   partitioning.c
   planner.c
   planner_utils.c

src/catalog.c

@@ -12,9 +12,14 @@
 #include <commands/sequence.h>
 #include <access/xact.h>
 
+#include "compat.h"
 #include "catalog.h"
 #include "extension.h"
 
+#if PG10
+#include <utils/regproc.h>
+#endif
+
 static const char *catalog_table_names[_MAX_CATALOG_TABLES] = {
 	[HYPERTABLE] = HYPERTABLE_TABLE_NAME,
 	[DIMENSION] = DIMENSION_TABLE_NAME,
@@ -360,14 +365,32 @@ catalog_table_next_seq_id(Catalog *catalog, enum CatalogTable table)
 	return DatumGetInt64(DirectFunctionCall1(nextval_oid, ObjectIdGetDatum(relid)));
 }
 
+#if PG96
+#define CatalogTupleInsert(relation, tuple)		\
+	do {										\
+		simple_heap_insert(relation, tuple);	\
+		CatalogUpdateIndexes(relation, tuple);	\
+	} while (0);
+
+#define CatalogTupleUpdate(relation, tid, tuple)	\
+	do {											\
+		simple_heap_update(relation, tid, tuple);	\
+		CatalogUpdateIndexes(relation, tuple);		\
+	} while (0);
+
+#define CatalogTupleDelete(relation, tid)		\
+	simple_heap_delete(relation, tid);
+
+#endif   /* PG96 */
+
 /*
  * Insert a new row into a catalog table.
  */
 void
 catalog_insert(Relation rel, HeapTuple tuple)
 {
-	simple_heap_insert(rel, tuple);
-	CatalogUpdateIndexes(rel, tuple);
+	CatalogTupleInsert(rel, tuple);
+
 	/* Make changes visible */
 	CommandCounterIncrement();
 }
@@ -387,16 +410,15 @@ catalog_insert_values(Relation rel, TupleDesc tupdesc, Datum *values, bool *null
 void
 catalog_update(Relation rel, HeapTuple tuple)
 {
-	simple_heap_update(rel, &tuple->t_self, tuple);
-	CatalogUpdateIndexes(rel, tuple);
+	CatalogTupleUpdate(rel, &tuple->t_self, tuple);
 	/* Make changes visible */
 	CommandCounterIncrement();
 }
 
 void
 catalog_delete_tid(Relation rel, ItemPointer tid)
 {
-	simple_heap_delete(rel, tid);
+	CatalogTupleDelete(rel, tid);
 	CommandCounterIncrement();
 }
 

src/chunk.c

@@ -315,7 +315,7 @@ chunk_create_after_lock(Hypertable *ht, Point *p, const char *schema, const char
 
 	chunk->table_id = get_relname_relid(NameStr(chunk->fd.table_name), schema_oid);
 
-	trigger_create_on_all_chunks(ht, chunk);
+	trigger_create_all_on_chunk(ht, chunk);
 
 	/* Create all indexes on the chunk */
 	chunk_index_create_all(ht->fd.id, ht->main_table_relid, chunk->fd.id, chunk->table_id);

src/chunk_dispatch.c

@@ -13,20 +13,21 @@
 ChunkDispatch *
 chunk_dispatch_create(Hypertable *ht, EState *estate, Query *parse)
 {
-	ChunkDispatch *cp = palloc(sizeof(ChunkDispatch));
+	ChunkDispatch *cd = palloc0(sizeof(ChunkDispatch));
 
-	cp->hypertable = ht;
-	cp->estate = estate;
-	cp->hypertable_result_rel_info = NULL;
-	cp->parse = parse;
-	cp->cache = subspace_store_init(ht->space->num_dimensions, estate->es_query_cxt);
-	return cp;
+	cd->hypertable = ht;
+	cd->estate = estate;
+	cd->hypertable_result_rel_info = NULL;
+	cd->parse = parse;
+	cd->cache = subspace_store_init(ht->space->num_dimensions, estate->es_query_cxt);
+
+	return cd;
 }
 
 void
-chunk_dispatch_destroy(ChunkDispatch *cp)
+chunk_dispatch_destroy(ChunkDispatch *cd)
 {
-	subspace_store_free(cp->cache);
+	subspace_store_free(cd->cache);
 }
 
 static void
@@ -40,7 +41,7 @@ destroy_chunk_insert_state(void *cis)
  * partitioned hyperspace.
  */
 extern ChunkInsertState *
-chunk_dispatch_get_chunk_insert_state(ChunkDispatch *dispatch, Point *point)
+chunk_dispatch_get_chunk_insert_state(ChunkDispatch *dispatch, Point *point, CmdType operation)
 {
 	ChunkInsertState *cis;
 
@@ -55,7 +56,7 @@ chunk_dispatch_get_chunk_insert_state(ChunkDispatch *dispatch, Point *point)
 		if (NULL == new_chunk)
 			elog(ERROR, "No chunk found or created");
 
-		cis = chunk_insert_state_create(new_chunk, dispatch);
+		cis = chunk_insert_state_create(new_chunk, dispatch, operation);
 		subspace_store_add(dispatch->cache, new_chunk->cube, cis, destroy_chunk_insert_state);
 	}