Merge pull request #1633 from citusdata/fix_pg_11

Get PostgreSQL 11 build passing

cr: @pykello

.gitattributes

@@ -28,4 +28,5 @@ configure				-whitespace
 src/backend/distributed/utils/citus_outfuncs.c -citus-style
 src/backend/distributed/utils/ruleutils_96.c -citus-style
 src/backend/distributed/utils/ruleutils_10.c -citus-style
+src/backend/distributed/utils/ruleutils_11.c -citus-style
 src/include/distributed/citus_nodes.h -citus-style

src/backend/distributed/commands/create_distributed_table.c

@@ -46,6 +46,7 @@
 #include "distributed/remote_commands.h"
 #include "distributed/worker_protocol.h"
 #include "distributed/worker_transaction.h"
+#include "distributed/version_compat.h"
 #include "executor/executor.h"
 #include "executor/spi.h"
 #include "nodes/execnodes.h"
@@ -635,7 +636,8 @@ EnsureRelationCanBeDistributed(Oid relationId, Var *distributionColumn,
 	if (distributionMethod == DISTRIBUTE_BY_HASH)
 	{
 		Oid hashSupportFunction = SupportFunctionForColumn(distributionColumn,
-														   HASH_AM_OID, HASHPROC);
+														   HASH_AM_OID,
+														   HASHSTANDARD_PROC);
 		if (hashSupportFunction == InvalidOid)
 		{
 			ereport(ERROR, (errcode(ERRCODE_UNDEFINED_FUNCTION),
@@ -1284,7 +1286,7 @@ TupleDescColumnNameList(TupleDesc tupleDescriptor)
 
 	for (columnIndex = 0; columnIndex < tupleDescriptor->natts; columnIndex++)
 	{
-		Form_pg_attribute currentColumn = tupleDescriptor->attrs[columnIndex];
+		Form_pg_attribute currentColumn = TupleDescAttr(tupleDescriptor, columnIndex);
 		char *columnName = NameStr(currentColumn->attname);
 
 		if (currentColumn->attisdropped)
@@ -1311,7 +1313,7 @@ RelationUsesIdentityColumns(TupleDesc relationDesc)
 
 	for (attributeIndex = 0; attributeIndex < relationDesc->natts; attributeIndex++)
 	{
-		Form_pg_attribute attributeForm = relationDesc->attrs[attributeIndex];
+		Form_pg_attribute attributeForm = TupleDescAttr(relationDesc, attributeIndex);
 
 		if (attributeForm->attidentity != '\0')
 		{

src/backend/distributed/commands/multi_copy.c

@@ -69,6 +69,7 @@
 #include "distributed/remote_commands.h"
 #include "distributed/resource_lock.h"
 #include "distributed/shard_pruning.h"
+#include "distributed/version_compat.h"
 #include "executor/executor.h"
 #include "nodes/makefuncs.h"
 #include "tsearch/ts_locale.h"
@@ -334,7 +335,7 @@ CopyToExistingShards(CopyStmt *copyStatement, char *completionTag)
 	/* build the list of column names for remote COPY statements */
 	for (columnIndex = 0; columnIndex < columnCount; columnIndex++)
 	{
-		Form_pg_attribute currentColumn = tupleDescriptor->attrs[columnIndex];
+		Form_pg_attribute currentColumn = TupleDescAttr(tupleDescriptor, columnIndex);
 		char *columnName = NameStr(currentColumn->attname);
 
 		if (currentColumn->attisdropped)
@@ -892,7 +893,7 @@ CanUseBinaryCopyFormat(TupleDesc tupleDescription)
 
 	for (columnIndex = 0; columnIndex < totalColumnCount; columnIndex++)
 	{
-		Form_pg_attribute currentColumn = tupleDescription->attrs[columnIndex];
+		Form_pg_attribute currentColumn = TupleDescAttr(tupleDescription, columnIndex);
 		Oid typeId = InvalidOid;
 		char typeCategory = '\0';
 		bool typePreferred = false;
@@ -1231,7 +1232,7 @@ ColumnOutputFunctions(TupleDesc rowDescriptor, bool binaryFormat)
 	for (columnIndex = 0; columnIndex < columnCount; columnIndex++)
 	{
 		FmgrInfo *currentOutputFunction = &columnOutputFunctions[columnIndex];
-		Form_pg_attribute currentColumn = rowDescriptor->attrs[columnIndex];
+		Form_pg_attribute currentColumn = TupleDescAttr(rowDescriptor, columnIndex);
 		Oid columnTypeId = currentColumn->atttypid;
 		Oid outputFunctionId = InvalidOid;
 		bool typeVariableLength = false;
@@ -1282,7 +1283,7 @@ AppendCopyRowData(Datum *valueArray, bool *isNullArray, TupleDesc rowDescriptor,
 	}
 	for (columnIndex = 0; columnIndex < totalColumnCount; columnIndex++)
 	{
-		Form_pg_attribute currentColumn = rowDescriptor->attrs[columnIndex];
+		Form_pg_attribute currentColumn = TupleDescAttr(rowDescriptor, columnIndex);
 		Datum value = valueArray[columnIndex];
 		bool isNull = isNullArray[columnIndex];
 		bool lastColumn = false;
@@ -1357,7 +1358,7 @@ AvailableColumnCount(TupleDesc tupleDescriptor)
 
 	for (columnIndex = 0; columnIndex < tupleDescriptor->natts; columnIndex++)
 	{
-		Form_pg_attribute currentColumn = tupleDescriptor->attrs[columnIndex];
+		Form_pg_attribute currentColumn = TupleDescAttr(tupleDescriptor, columnIndex);
 
 		if (!currentColumn->attisdropped)
 		{

src/backend/distributed/commands/transmit.c

@@ -17,6 +17,7 @@
 
 #include "distributed/relay_utility.h"
 #include "distributed/transmit.h"
+#include "distributed/version_compat.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "storage/fd.h"
@@ -166,7 +167,7 @@ FileOpenForTransmit(const char *filename, int fileFlags, int fileMode)
 		}
 	}
 
-	fileDesc = PathNameOpenFile((char *) filename, fileFlags, fileMode);
+	fileDesc = PathNameOpenFilePerm((char *) filename, fileFlags, fileMode);
 	if (fileDesc < 0)
 	{
 		ereport(ERROR, (errcode_for_file_access(),

src/backend/distributed/executor/multi_real_time_executor.c

@@ -29,6 +29,7 @@
 #include "distributed/multi_physical_planner.h"
 #include "distributed/multi_server_executor.h"
 #include "distributed/worker_protocol.h"
+#include "distributed/version_compat.h"
 #include "storage/fd.h"
 #include "utils/timestamp.h"
 
@@ -521,7 +522,7 @@ ManageTaskExecution(Task *task, TaskExecution *taskExecution,
 				int fileFlags = (O_APPEND | O_CREAT | O_RDWR | O_TRUNC | PG_BINARY);
 				int fileMode = (S_IRUSR | S_IWUSR);
 
-				int32 fileDescriptor = BasicOpenFile(filename, fileFlags, fileMode);
+				int32 fileDescriptor = BasicOpenFilePerm(filename, fileFlags, fileMode);
 				if (fileDescriptor >= 0)
 				{
 					/*

src/backend/distributed/executor/multi_task_tracker_executor.c

@@ -33,6 +33,7 @@
 #include "distributed/multi_server_executor.h"
 #include "distributed/pg_dist_partition.h"
 #include "distributed/worker_protocol.h"
+#include "distributed/version_compat.h"
 #include "storage/fd.h"
 #include "utils/builtins.h"
 #include "utils/hsearch.h"
@@ -1340,7 +1341,7 @@ ManageTransmitExecution(TaskTracker *transmitTracker,
 				int fileFlags = (O_APPEND | O_CREAT | O_RDWR | O_TRUNC | PG_BINARY);
 				int fileMode = (S_IRUSR | S_IWUSR);
 
-				int32 fileDescriptor = BasicOpenFile(filename, fileFlags, fileMode);
+				int32 fileDescriptor = BasicOpenFilePerm(filename, fileFlags, fileMode);
 				if (fileDescriptor >= 0)
 				{
 					/*

src/backend/distributed/executor/multi_utility.c

@@ -56,6 +56,7 @@
 #include "distributed/transmit.h"
 #include "distributed/worker_protocol.h"
 #include "distributed/worker_transaction.h"
+#include "distributed/version_compat.h"
 #include "executor/executor.h"
 #include "foreign/foreign.h"
 #include "lib/stringinfo.h"
@@ -3257,16 +3258,13 @@ CopyGetAttnums(TupleDesc tupDesc, Relation rel, List *attnamelist)
 	if (attnamelist == NIL)
 	{
 		/* Generate default column list */
-		Form_pg_attribute *attr = tupDesc->attrs;
 		int			attr_count = tupDesc->natts;
 		int			i;
 
 		for (i = 0; i < attr_count; i++)
 		{
-			if (attr[i]->attisdropped)
+			if (TupleDescAttr(tupDesc, i)->attisdropped)
-			{
 				continue;
-			}
 			attnums = lappend_int(attnums, i + 1);
 		}
 	}
@@ -3285,41 +3283,35 @@ CopyGetAttnums(TupleDesc tupDesc, Relation rel, List *attnamelist)
 			attnum = InvalidAttrNumber;
 			for (i = 0; i < tupDesc->natts; i++)
 			{
-				if (tupDesc->attrs[i]->attisdropped)
+				Form_pg_attribute att = TupleDescAttr(tupDesc, i);
-				{
+
+				if (att->attisdropped)
 					continue;
-				}
+				if (namestrcmp(&(att->attname), name) == 0)
-				if (namestrcmp(&(tupDesc->attrs[i]->attname), name) == 0)
 				{
-					attnum = tupDesc->attrs[i]->attnum;
+					attnum = att->attnum;
 					break;
 				}
 			}
 			if (attnum == InvalidAttrNumber)
 			{
 				if (rel != NULL)
-				{
 					ereport(ERROR,
 							(errcode(ERRCODE_UNDEFINED_COLUMN),
-					errmsg("column \"%s\" of relation \"%s\" does not exist",
+							 errmsg("column \"%s\" of relation \"%s\" does not exist",
-						   name, RelationGetRelationName(rel))));
+									name, RelationGetRelationName(rel))));
-				}
 				else
-				{
 					ereport(ERROR,
 							(errcode(ERRCODE_UNDEFINED_COLUMN),
 							 errmsg("column \"%s\" does not exist",
 									name)));
-				}
 			}
 			/* Check for duplicates */
 			if (list_member_int(attnums, attnum))
-			{
 				ereport(ERROR,
 						(errcode(ERRCODE_DUPLICATE_COLUMN),
 						 errmsg("column \"%s\" specified more than once",
 								name)));
-			}
 			attnums = lappend_int(attnums, attnum);
 		}
 	}

src/backend/distributed/master/master_citus_tools.c

@@ -23,6 +23,7 @@
 #include "distributed/multi_server_executor.h"
 #include "distributed/remote_commands.h"
 #include "distributed/worker_protocol.h"
+#include "distributed/version_compat.h"
 #include "lib/stringinfo.h"
 #include "utils/builtins.h"
 
@@ -108,10 +109,10 @@ master_run_on_worker(PG_FUNCTION_ARGS)
 	 * Check to make sure we have correct tuple descriptor
 	 */
 	if (tupleDescriptor->natts != 4 ||
-		tupleDescriptor->attrs[0]->atttypid != TEXTOID ||
+		TupleDescAttr(tupleDescriptor, 0)->atttypid != TEXTOID ||
-		tupleDescriptor->attrs[1]->atttypid != INT4OID ||
+		TupleDescAttr(tupleDescriptor, 1)->atttypid != INT4OID ||
-		tupleDescriptor->attrs[2]->atttypid != BOOLOID ||
+		TupleDescAttr(tupleDescriptor, 2)->atttypid != BOOLOID ||
-		tupleDescriptor->attrs[3]->atttypid != TEXTOID)
+		TupleDescAttr(tupleDescriptor, 3)->atttypid != TEXTOID)
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_COLUMN_DEFINITION),

src/backend/distributed/metadata/metadata_sync.c

@@ -38,6 +38,7 @@
 #include "distributed/pg_dist_node.h"
 #include "distributed/worker_manager.h"
 #include "distributed/worker_transaction.h"
+#include "distributed/version_compat.h"
 #include "foreign/foreign.h"
 #include "nodes/pg_list.h"
 #include "utils/builtins.h"
@@ -984,7 +985,7 @@ TypeOfColumn(Oid tableId, int16 columnId)
 {
 	Relation tableRelation = relation_open(tableId, NoLock);
 	TupleDesc tupleDescriptor = RelationGetDescr(tableRelation);
-	Form_pg_attribute attrForm = tupleDescriptor->attrs[columnId - 1];
+	Form_pg_attribute attrForm = TupleDescAttr(tupleDescriptor, columnId - 1);
 	relation_close(tableRelation, NoLock);
 	return attrForm->atttypid;
 }

src/backend/distributed/planner/deparse_shard_query.c

@@ -20,6 +20,7 @@
 #include "distributed/metadata_cache.h"
 #include "distributed/multi_physical_planner.h"
 #include "distributed/multi_router_planner.h"
+#include "distributed/version_compat.h"
 #include "lib/stringinfo.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
@@ -262,7 +263,8 @@ ConvertRteToSubqueryWithEmptyResult(RangeTblEntry *rte)
 
 	for (columnIndex = 0; columnIndex < columnCount; columnIndex++)
 	{
-		FormData_pg_attribute *attributeForm = tupleDescriptor->attrs[columnIndex];
+		FormData_pg_attribute *attributeForm = TupleDescAttr(tupleDescriptor,
+															 columnIndex);
 		TargetEntry *targetEntry = NULL;
 		StringInfo resname = NULL;
 		Const *constValue = NULL;

src/backend/distributed/planner/multi_explain.c

@@ -92,6 +92,7 @@ static void ExplainOneQuery(Query *query, int cursorOptions,
 static void ExplainOneQuery(Query *query, IntoClause *into, ExplainState *es,
 							const char *queryString, ParamListInfo params);
 #endif
+#if (PG_VERSION_NUM < 110000)
 static void ExplainOpenGroup(const char *objtype, const char *labelname,
 							 bool labeled, ExplainState *es);
 static void ExplainCloseGroup(const char *objtype, const char *labelname,
@@ -99,6 +100,7 @@ static void ExplainCloseGroup(const char *objtype, const char *labelname,
 static void ExplainXMLTag(const char *tagname, int flags, ExplainState *es);
 static void ExplainJSONLineEnding(ExplainState *es);
 static void ExplainYAMLLineStarting(ExplainState *es);
+#endif
 
 
 /*
@@ -635,6 +637,7 @@ ExplainOneQuery(Query *query, IntoClause *into, ExplainState *es,
 	}
 }
 
+#if (PG_VERSION_NUM < 110000)
 /*
  * Open a group of related objects.
  *
@@ -811,3 +814,4 @@ ExplainYAMLLineStarting(ExplainState *es)
 		appendStringInfoSpaces(es->str, es->indent * 2);
 	}
 }
+#endif

src/backend/distributed/utils/citus_ruleutils.c

@@ -37,6 +37,7 @@
 #include "distributed/multi_partitioning_utils.h"
 #include "distributed/relay_utility.h"
 #include "distributed/master_metadata_utility.h"
+#include "distributed/version_compat.h"
 #include "foreign/foreign.h"
 #include "lib/stringinfo.h"
 #include "nodes/nodes.h"
@@ -333,7 +334,7 @@ pg_get_tableschemadef_string(Oid tableRelationId, bool includeSequenceDefaults)
 
 	for (attributeIndex = 0; attributeIndex < tupleDescriptor->natts; attributeIndex++)
 	{
-		Form_pg_attribute attributeForm = tupleDescriptor->attrs[attributeIndex];
+		Form_pg_attribute attributeForm = TupleDescAttr(tupleDescriptor, attributeIndex);
 
 		/*
 		 * We disregard the inherited attributes (i.e., attinhcount > 0) here. The
@@ -545,7 +546,7 @@ pg_get_tablecolumnoptionsdef_string(Oid tableRelationId)
 
 	for (attributeIndex = 0; attributeIndex < tupleDescriptor->natts; attributeIndex++)
 	{
-		Form_pg_attribute attributeForm = tupleDescriptor->attrs[attributeIndex];
+		Form_pg_attribute attributeForm = TupleDescAttr(tupleDescriptor, attributeIndex);
 		char *attributeName = NameStr(attributeForm->attname);
 		char defaultStorageType = get_typstorage(attributeForm->atttypid);
 

src/backend/distributed/utils/ruleutils_10.c

@@ -17,7 +17,7 @@
 
 #include "postgres.h"
 
-#if (PG_VERSION_NUM >= 100000)
+#if (PG_VERSION_NUM >= 100000 && PG_VERSION_NUM < 110000)
 
 #include <ctype.h>
 #include <unistd.h>
@@ -7905,4 +7905,4 @@ get_range_partbound_string(List *bound_datums)
 	return buf->data;
 }
 
-#endif /* (PG_VERSION_NUM >= 100000) */
+#endif /* (PG_VERSION_NUM >= 100000 && PG_VERSION_NUM < 110000) */

src/backend/distributed/worker/worker_data_fetch_protocol.c

@@ -39,6 +39,7 @@
 #include "distributed/resource_lock.h"
 #include "distributed/task_tracker.h"
 #include "distributed/worker_protocol.h"
+#include "distributed/version_compat.h"
 #include "nodes/makefuncs.h"
 #include "storage/lmgr.h"
 #include "tcop/tcopprot.h"
@@ -263,7 +264,7 @@ ReceiveRegularFile(const char *nodeName, uint32 nodePort,
 	/* create local file to append remote data to */
 	snprintf(filename, MAXPGPATH, "%s", filePath->data);
 
-	fileDescriptor = BasicOpenFile(filename, fileFlags, fileMode);
+	fileDescriptor = BasicOpenFilePerm(filename, fileFlags, fileMode);
 	if (fileDescriptor < 0)
 	{
 		ereport(WARNING, (errcode_for_file_access(),

src/backend/distributed/worker/worker_partition_protocol.c

@@ -35,6 +35,7 @@
 #include "distributed/resource_lock.h"
 #include "distributed/transmit.h"
 #include "distributed/worker_protocol.h"
+#include "distributed/version_compat.h"
 #include "executor/spi.h"
 #include "mb/pg_wchar.h"
 #include "storage/lmgr.h"
@@ -191,7 +192,7 @@ worker_hash_partition_table(PG_FUNCTION_ARGS)
 	CheckCitusVersion(ERROR);
 
 	/* use column's type information to get the hashing function */
-	hashFunction = GetFunctionInfo(partitionColumnType, HASH_AM_OID, HASHPROC);
+	hashFunction = GetFunctionInfo(partitionColumnType, HASH_AM_OID, HASHSTANDARD_PROC);
 
 	/* create hash partition context object */
 	partitionContext = palloc0(sizeof(HashPartitionContext));
@@ -409,7 +410,7 @@ OpenPartitionFiles(StringInfo directoryName, uint32 fileCount)
 	{
 		StringInfo filePath = PartitionFilename(directoryName, fileIndex);
 
-		fileDescriptor = PathNameOpenFile(filePath->data, fileFlags, fileMode);
+		fileDescriptor = PathNameOpenFilePerm(filePath->data, fileFlags, fileMode);
 		if (fileDescriptor < 0)
 		{
 			ereport(ERROR, (errcode_for_file_access(),

src/include/distributed/version_compat.h

@@ -0,0 +1,49 @@
+/*-------------------------------------------------------------------------
+ *
+ * version_compat.h
+ *	  Compatibility macros for writing code agnostic to PostgreSQL versions
+ *
+ * Copyright (c) 2017, Citus Data, Inc.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef VERSION_COMPAT_H
+#define VERSION_COMPAT_H
+
+#include "postgres.h"
+
+#if (PG_VERSION_NUM >= 90600 && PG_VERSION_NUM < 90700)
+
+/* Backports from PostgreSQL 10 */
+/* Accessor for the i'th attribute of tupdesc. */
+#define TupleDescAttr(tupdesc, i) ((tupdesc)->attrs[(i)])
+
+#endif
+
+#if (PG_VERSION_NUM >= 90600 && PG_VERSION_NUM < 110000)
+
+#include "access/hash.h"
+#include "storage/fd.h"
+
+/* PostgreSQL 11 splits hash procs into "standard" and "extended" */
+#define HASHSTANDARD_PROC HASHPROC
+
+
+static inline int
+BasicOpenFilePerm(FileName fileName, int fileFlags, int fileMode)
+{
+	return BasicOpenFile(fileName, fileFlags, fileMode);
+}
+
+
+static inline File
+PathNameOpenFilePerm(FileName fileName, int fileFlags, int fileMode)
+{
+	return PathNameOpenFile(fileName, fileFlags, fileMode);
+}
+
+
+#endif
+
+#endif   /* VERSION_COMPAT_H */

src/test/regress/expected/multi_explain.out

@@ -2,11 +2,12 @@
 -- MULTI_EXPLAIN
 --
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 570000;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
-SELECT substring(version(), '\d+(?:\.\d+)?') AS major_version;
+SHOW server_version \gset
- major_version 
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
----------------
+ version_above_nine 
- 10
+--------------------
+ t
 (1 row)
 
 \a\t

src/test/regress/expected/multi_explain_0.out

@@ -2,11 +2,12 @@
 -- MULTI_EXPLAIN
 --
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 570000;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
-SELECT substring(version(), '\d+(?:\.\d+)?') AS major_version;
+SHOW server_version \gset
- major_version 
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
----------------
+ version_above_nine 
- 9.6
+--------------------
+ f
 (1 row)
 
 \a\t

src/test/regress/expected/multi_large_table_join_planning.out

@@ -7,12 +7,12 @@
 -- executor here, as we cannot run repartition jobs with real time executor.
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 690000;
 SET citus.enable_unique_job_ids TO off;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
- major_version 
+ version_above_nine 
----------------
+--------------------
- 10
+ t
 (1 row)
 
 BEGIN;

src/test/regress/expected/multi_large_table_join_planning_0.out

@@ -7,12 +7,12 @@
 -- executor here, as we cannot run repartition jobs with real time executor.
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 690000;
 SET citus.enable_unique_job_ids TO off;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
- major_version 
+ version_above_nine 
----------------
+--------------------
- 9
+ f
 (1 row)
 
 BEGIN;

src/test/regress/expected/multi_large_table_task_assignment.out

@@ -6,12 +6,12 @@
 -- from a sql task to its depended tasks. Note that we set the executor type to task
 -- tracker executor here, as we cannot run repartition jobs with real time executor.
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 710000;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
- major_version 
+ version_above_nine 
----------------
+--------------------
- 10
+ t
 (1 row)
 
 BEGIN;

src/test/regress/expected/multi_large_table_task_assignment_0.out

@@ -6,12 +6,12 @@
 -- from a sql task to its depended tasks. Note that we set the executor type to task
 -- tracker executor here, as we cannot run repartition jobs with real time executor.
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 710000;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
- major_version 
+ version_above_nine 
----------------
+--------------------
- 9
+ f
 (1 row)
 
 BEGIN;

src/test/regress/expected/multi_null_minmax_value_pruning.out

@@ -4,12 +4,12 @@
 -- This test checks that we can handle null min/max values in shard statistics
 -- and that we don't partition or join prune shards that have null values.
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 760000;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
- major_version 
+ version_above_nine 
----------------
+--------------------
- 10
+ t
 (1 row)
 
 SET client_min_messages TO DEBUG2;

src/test/regress/expected/multi_null_minmax_value_pruning_0.out

@@ -4,12 +4,12 @@
 -- This test checks that we can handle null min/max values in shard statistics
 -- and that we don't partition or join prune shards that have null values.
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 760000;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
- major_version 
+ version_above_nine 
----------------
+--------------------
- 9
+ f
 (1 row)
 
 SET client_min_messages TO DEBUG2;

src/test/regress/expected/multi_task_assignment_policy.out

@@ -2,12 +2,12 @@
 -- MULTI_TASK_ASSIGNMENT
 --
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 880000;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
- major_version 
+ version_above_nine 
----------------
+--------------------
- 10
+ t
 (1 row)
 
 SET citus.explain_distributed_queries TO off;

src/test/regress/expected/multi_task_assignment_policy_0.out

@@ -2,12 +2,12 @@
 -- MULTI_TASK_ASSIGNMENT
 --
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 880000;
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
- major_version 
+ version_above_nine 
----------------
+--------------------
- 9
+ f
 (1 row)
 
 SET citus.explain_distributed_queries TO off;

src/test/regress/sql/multi_create_table_new_features.sql

@@ -2,9 +2,9 @@
 -- MULTI_CREATE_TABLE_NEW_FEATURES
 --
 
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
 
 -- Verify that the GENERATED ... AS IDENTITY feature in PostgreSQL 10
 -- is forbidden in distributed tables.

src/test/regress/sql/multi_explain.sql

@@ -4,8 +4,9 @@
 
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 570000;
 
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
-SELECT substring(version(), '\d+(?:\.\d+)?') AS major_version;
+SHOW server_version \gset
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
 
 \a\t
 

src/test/regress/sql/multi_large_table_join_planning.sql

@@ -10,9 +10,9 @@
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 690000;
 SET citus.enable_unique_job_ids TO off;
 
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
 
 BEGIN;
 SET client_min_messages TO DEBUG4;

src/test/regress/sql/multi_large_table_task_assignment.sql

@@ -9,9 +9,9 @@
 
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 710000;
 
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
 
 
 BEGIN;

src/test/regress/sql/multi_null_minmax_value_pruning.sql

@@ -8,9 +8,9 @@
 
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 760000;
 
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
 
 SET client_min_messages TO DEBUG2;
 SET citus.explain_all_tasks TO on;

src/test/regress/sql/multi_task_assignment_policy.sql

@@ -5,9 +5,9 @@
 
 ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 880000;
 
--- print major version to make version-specific tests clear
+-- print whether we're using version > 9 to make version-specific tests clear
 SHOW server_version \gset
-SELECT substring(:'server_version', '\d+') AS major_version;
+SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine;
 
 
 SET citus.explain_distributed_queries TO off;