Add Pg14 support

.circleci/config.yml

@@ -448,6 +448,10 @@ workflows:
           name: build-13
           pg_major: 13
           image_tag: '13.4'
+      - build:
+          name: build-14
+          pg_major: 14
+          image_tag: '14beta3-dev202108191715'
 
       - check-style
       - check-sql-snapshots
@@ -600,13 +604,101 @@ workflows:
           make: check-failure
           requires: [build-13]
 
+      - test-citus:
+          name: 'test-14_check-multi'
+          pg_major: 14
+          image_tag: '14beta3-dev202108191715'
+          make: check-multi
+          requires: [build-14]
+      - test-citus:
+          name: 'test-14_check-multi-1'
+          pg_major: 14
+          image_tag: '14beta3-dev202108191715'
+          make: check-multi-1
+          requires: [build-14]
+      - test-citus:
+          name: 'test-14_check-mx'
+          pg_major: 14
+          image_tag: '14beta3-dev202108191715'
+          make: check-multi-mx
+          requires: [build-14]
+      - test-citus:
+          name: 'test-14_check-vanilla'
+          pg_major: 14
+          image_tag: '14beta3-dev202108191715'
+          make: check-vanilla
+          requires: [build-14]
+      - test-citus:
+          name: 'test-14_check-isolation'
+          pg_major: 14
+          image_tag: '14beta3-dev202108191715'
+          make: check-isolation
+          requires: [build-14]
+      - test-citus:
+          name: 'test-14_check-worker'
+          pg_major: 14
+          image_tag: '14beta3-dev202108191715'
+          make: check-worker
+          requires: [build-14]
+      - test-citus:
+          name: 'test-14_check-operations'
+          pg_major: 14
+          image_tag: '14beta3-dev202108191715'
+          make: check-operations
+          requires: [build-14]
+      - test-citus:
+          name: 'test-14_check-follower-cluster'
+          pg_major: 14
+          image_tag: '14beta3-dev202108191715'
+          make: check-follower-cluster
+          requires: [build-14]
+      - test-citus:
+          name: 'test-14_check-columnar'
+          pg_major: 14
+          image_tag: '14beta3-dev202108191715'
+          make: check-columnar
+          requires: [build-14]
+      - test-citus:
+          name: 'test-14_check-columnar-isolation'
+          pg_major: 14
+          image_tag: '14beta3-dev202108191715'
+          make: check-columnar-isolation
+          requires: [build-14]
+      - tap-test-citus:
+          name: 'test_14_tap-recovery'
+          pg_major: 14
+          image_tag: '14beta3-dev202108191715'
+          suite: recovery
+          requires: [build-14]
+      - test-citus:
+          name: 'test-14_check-failure'
+          pg_major: 14
+          image: citus/failtester
+          image_tag: '14beta3-dev202108191715'
+          make: check-failure
+          requires: [build-14]
+
       - test-pg-upgrade:
           name: 'test-12-13_check-pg-upgrade'
           old_pg_major: 12
           new_pg_major: 13
           image_tag: '12.8-13.4'
           requires: [build-12,build-13]
 
+      - test-pg-upgrade:
+          name: 'test-12-14_check-pg-upgrade'
+          old_pg_major: 12
+          new_pg_major: 14
+          image_tag: '12-13-14-dev202108191715'
+          requires: [build-12,build-14]
+
+      - test-pg-upgrade:
+          name: 'test-13-14_check-pg-upgrade'
+          old_pg_major: 13
+          new_pg_major: 14
+          image_tag: '12-13-14-dev202108191715'
+          requires: [build-13,build-14]
+
       - test-citus-upgrade:
           name: test-12_check-citus-upgrade
           pg_major: 12

.gitattributes

@@ -30,6 +30,7 @@ src/backend/distributed/utils/pg11_snprintf.c -citus-style
 src/backend/distributed/deparser/ruleutils_11.c -citus-style
 src/backend/distributed/deparser/ruleutils_12.c -citus-style
 src/backend/distributed/deparser/ruleutils_13.c -citus-style
+src/backend/distributed/deparser/ruleutils_14.c -citus-style
 src/backend/distributed/commands/index_pg_source.c -citus-style
 
 src/include/distributed/citus_nodes.h -citus-style

configure

@@ -2555,7 +2555,7 @@ if test -z "$version_num"; then
   as_fn_error $? "Could not detect PostgreSQL version from pg_config." "$LINENO" 5
 fi
 
-if test "$version_num" != '12' -a "$version_num" != '13'; then
+if test "$version_num" != '12' -a "$version_num" != '13' -a "$version_num" != '14'; then
    as_fn_error $? "Citus is not compatible with the detected PostgreSQL version ${version_num}." "$LINENO" 5
 else
    { $as_echo "$as_me:${as_lineno-$LINENO}: building against PostgreSQL $version_num" >&5

configure.in

@@ -74,7 +74,7 @@ if test -z "$version_num"; then
   AC_MSG_ERROR([Could not detect PostgreSQL version from pg_config.])
 fi
 
-if test "$version_num" != '12' -a "$version_num" != '13'; then
+if test "$version_num" != '12' -a "$version_num" != '13' -a "$version_num" != '14'; then
    AC_MSG_ERROR([Citus is not compatible with the detected PostgreSQL version ${version_num}.])
 else
    AC_MSG_NOTICE([building against PostgreSQL $version_num])

src/backend/columnar/columnar_debug.c

@@ -17,6 +17,7 @@
 #include "catalog/pg_type.h"
 #include "distributed/pg_version_constants.h"
 #include "distributed/tuplestore.h"
+#include "distributed/version_compat.h"
 #include "miscadmin.h"
 #include "storage/fd.h"
 #include "storage/smgr.h"
@@ -161,5 +162,5 @@ MemoryContextTotals(MemoryContext context, MemoryContextCounters *counters)
 		MemoryContextTotals(child, counters);
 	}
 
-	context->methods->stats(context, NULL, NULL, counters);
+	context->methods->stats_compat(context, NULL, NULL, counters, true);
 }

src/backend/columnar/columnar_metadata.c

@@ -64,6 +64,7 @@ typedef struct
 {
 	Relation rel;
 	EState *estate;
+	ResultRelInfo *resultRelInfo;
 } ModifyState;
 
 /* RowNumberLookupMode to be used in StripeMetadataLookupRowNumber */
@@ -1314,12 +1315,20 @@ StartModifyRelation(Relation rel)
 {
 	EState *estate = create_estate_for_relation(rel);
 
+#if PG_VERSION_NUM >= PG_VERSION_14
+	ResultRelInfo *resultRelInfo = makeNode(ResultRelInfo);
+	InitResultRelInfo(resultRelInfo, rel, 1, NULL, 0);
+#else
+	ResultRelInfo *resultRelInfo = estate->es_result_relation_info;
+#endif
+
 	/* ExecSimpleRelationInsert, ... require caller to open indexes */
-	ExecOpenIndices(estate->es_result_relation_info, false);
+	ExecOpenIndices(resultRelInfo, false);
 
 	ModifyState *modifyState = palloc(sizeof(ModifyState));
 	modifyState->rel = rel;
 	modifyState->estate = estate;
+	modifyState->resultRelInfo = resultRelInfo;
 
 	return modifyState;
 }
@@ -1341,7 +1350,7 @@ InsertTupleAndEnforceConstraints(ModifyState *state, Datum *values, bool *nulls)
 	ExecStoreHeapTuple(tuple, slot, false);
 
 	/* use ExecSimpleRelationInsert to enforce constraints */
-	ExecSimpleRelationInsert(state->estate, slot);
+	ExecSimpleRelationInsert_compat(state->resultRelInfo, state->estate, slot);
 }
 
 
@@ -1353,7 +1362,7 @@ static void
 DeleteTupleAndEnforceConstraints(ModifyState *state, HeapTuple heapTuple)
 {
 	EState *estate = state->estate;
-	ResultRelInfo *resultRelInfo = estate->es_result_relation_info;
+	ResultRelInfo *resultRelInfo = state->resultRelInfo;
 
 	ItemPointer tid = &(heapTuple->t_self);
 	simple_heap_delete(state->rel, tid);
@@ -1369,10 +1378,15 @@ DeleteTupleAndEnforceConstraints(ModifyState *state, HeapTuple heapTuple)
 static void
 FinishModifyRelation(ModifyState *state)
 {
-	ExecCloseIndices(state->estate->es_result_relation_info);
+	ExecCloseIndices(state->resultRelInfo);
 
 	AfterTriggerEndQuery(state->estate);
+#if PG_VERSION_NUM >= PG_VERSION_14
+	ExecCloseResultRelations(state->estate);
+	ExecCloseRangeTableRelations(state->estate);
+#else
 	ExecCleanUpTriggerState(state->estate);
+#endif
 	ExecResetTupleTable(state->estate->es_tupleTable, false);
 	FreeExecutorState(state->estate);
 
@@ -1401,12 +1415,14 @@ create_estate_for_relation(Relation rel)
 	rte->rellockmode = AccessShareLock;
 	ExecInitRangeTable(estate, list_make1(rte));
 
+#if PG_VERSION_NUM < PG_VERSION_14
 	ResultRelInfo *resultRelInfo = makeNode(ResultRelInfo);
 	InitResultRelInfo(resultRelInfo, rel, 1, NULL, 0);
 
 	estate->es_result_relations = resultRelInfo;
 	estate->es_num_result_relations = 1;
 	estate->es_result_relation_info = resultRelInfo;
+#endif
 
 	estate->es_output_cid = GetCurrentCommandId(true);
 

src/backend/columnar/columnar_tableam.c

@@ -118,6 +118,9 @@ static void ColumnarTableAMObjectAccessHook(ObjectAccessType access, Oid classId
 											void *arg);
 static void ColumnarProcessUtility(PlannedStmt *pstmt,
 								   const char *queryString,
+#if PG_VERSION_NUM >= PG_VERSION_14
+								   bool readOnlyTree,
+#endif
 								   ProcessUtilityContext context,
 								   ParamListInfo params,
 								   struct QueryEnvironment *queryEnv,
@@ -634,6 +637,16 @@ columnar_tuple_satisfies_snapshot(Relation rel, TupleTableSlot *slot,
 }
 
 
+#if PG_VERSION_NUM >= PG_VERSION_14
+static TransactionId
+columnar_index_delete_tuples(Relation rel,
+							 TM_IndexDeleteOp *delstate)
+{
+	elog(ERROR, "columnar_index_delete_tuples not implemented");
+}
+
+
+#else
 static TransactionId
 columnar_compute_xid_horizon_for_tuples(Relation rel,
 										ItemPointerData *tids,
@@ -643,6 +656,9 @@ columnar_compute_xid_horizon_for_tuples(Relation rel,
 }
 
 
+#endif
+
+
 static void
 columnar_tuple_insert(Relation relation, TupleTableSlot *slot, CommandId cid,
 					  int options, BulkInsertState bistate)
@@ -953,15 +969,15 @@ columnar_vacuum_rel(Relation rel, VacuumParams *params,
 	int elevel = (params->options & VACOPT_VERBOSE) ? INFO : DEBUG2;
 
 	/* this should have been resolved by vacuum.c until now */
-	Assert(params->truncate != VACOPT_TERNARY_DEFAULT);
+	Assert(params->truncate != VACOPTVALUE_UNSPECIFIED);
 
 	LogRelationStats(rel, elevel);
 
 	/*
 	 * We don't have updates, deletes, or concurrent updates, so all we
 	 * care for now is truncating the unused space at the end of storage.
 	 */
-	if (params->truncate == VACOPT_TERNARY_ENABLED)
+	if (params->truncate == VACOPTVALUE_ENABLED)
 	{
 		TruncateColumnar(rel, elevel);
 	}
@@ -1290,7 +1306,8 @@ columnar_index_build_range_scan(Relation columnarRelation,
 	if (!IsBootstrapProcessingMode() && !indexInfo->ii_Concurrent)
 	{
 		/* ignore lazy VACUUM's */
-		OldestXmin = GetOldestXmin(columnarRelation, PROCARRAY_FLAGS_VACUUM);
+		OldestXmin = GetOldestNonRemovableTransactionId_compat(columnarRelation,
+															   PROCARRAY_FLAGS_VACUUM);
 	}
 
 	Snapshot snapshot = { 0 };
@@ -1636,8 +1653,8 @@ ColumnarReadMissingRowsIntoIndex(TableScanDesc scan, Relation indexRelation,
 		Relation columnarRelation = scan->rs_rd;
 		IndexUniqueCheck indexUniqueCheck =
 			indexInfo->ii_Unique ? UNIQUE_CHECK_YES : UNIQUE_CHECK_NO;
-		index_insert(indexRelation, indexValues, indexNulls, columnarItemPointer,
-					 columnarRelation, indexUniqueCheck, indexInfo);
+		index_insert_compat(indexRelation, indexValues, indexNulls, columnarItemPointer,
+							columnarRelation, indexUniqueCheck, false, indexInfo);
 
 		validateIndexState->tups_inserted += 1;
 	}
@@ -1993,12 +2010,22 @@ ColumnarTableAMObjectAccessHook(ObjectAccessType access, Oid classId, Oid object
 static void
 ColumnarProcessUtility(PlannedStmt *pstmt,
 					   const char *queryString,
+#if PG_VERSION_NUM >= PG_VERSION_14
+					   bool readOnlyTree,
+#endif
 					   ProcessUtilityContext context,
 					   ParamListInfo params,
 					   struct QueryEnvironment *queryEnv,
 					   DestReceiver *dest,
 					   QueryCompletionCompat *completionTag)
 {
+#if PG_VERSION_NUM >= PG_VERSION_14
+	if (readOnlyTree)
+	{
+		pstmt = copyObject(pstmt);
+	}
+#endif
+
 	Node *parsetree = pstmt->utilityStmt;
 
 	if (IsA(parsetree, IndexStmt))
@@ -2021,8 +2048,8 @@ ColumnarProcessUtility(PlannedStmt *pstmt,
 		RelationClose(rel);
 	}
 
-	PrevProcessUtilityHook(pstmt, queryString, context,
-						   params, queryEnv, dest, completionTag);
+	PrevProcessUtilityHook_compat(pstmt, queryString, false, context,
+								  params, queryEnv, dest, completionTag);
 }
 
 
@@ -2096,7 +2123,11 @@ static const TableAmRoutine columnar_am_methods = {
 	.tuple_get_latest_tid = columnar_get_latest_tid,
 	.tuple_tid_valid = columnar_tuple_tid_valid,
 	.tuple_satisfies_snapshot = columnar_tuple_satisfies_snapshot,
+#if PG_VERSION_NUM >= PG_VERSION_14
+	.index_delete_tuples = columnar_index_delete_tuples,
+#else
 	.compute_xid_horizon_for_tuples = columnar_compute_xid_horizon_for_tuples,
+#endif
 
 	.tuple_insert = columnar_tuple_insert,
 	.tuple_insert_speculative = columnar_tuple_insert_speculative,

src/backend/columnar/write_state_management.c

@@ -16,6 +16,7 @@
 #include "access/tsmapi.h"
 #if PG_VERSION_NUM >= 130000
 #include "access/heaptoast.h"
+#include "common/hashfn.h"
 #else
 #include "access/tuptoaster.h"
 #endif
@@ -132,9 +133,10 @@ columnar_init_write_state(Relation relation, TupleDesc tupdesc,
 				"Column Store Write State Management Context",
 				ALLOCSET_DEFAULT_SIZES);
 		HASHCTL info;
-		uint32 hashFlags = (HASH_ELEM | HASH_CONTEXT);
+		uint32 hashFlags = (HASH_ELEM | HASH_FUNCTION | HASH_CONTEXT);
 		memset(&info, 0, sizeof(info));
 		info.keysize = sizeof(Oid);
+		info.hash = oid_hash;
 		info.entrysize = sizeof(WriteStateMapEntry);
 		info.hcxt = WriteStateContext;