PG14 changes

.github/workflows/postgres_dev.yaml

@@ -10,7 +10,7 @@ jobs:
       PG_INSTALL_DIR: postgresql
       MAKE_JOBS: 2
       # postgres version to build against this can either be commit hash, branch or tag
-      PG_COMMIT: 3d351d916b
+      PG_COMMIT: 1375422
       CLANG: clang-9
       LLVM_CONFIG: llvm-config-9
       CC: gcc

src/copy.c

@@ -241,8 +241,10 @@ copyfrom(CopyChunkState *ccstate, List *range_table, Hypertable *ht, void (*call
 
 	ExecOpenIndices(resultRelInfo, false);
 
+#if PG14_LT
 	estate->es_result_relations = resultRelInfo;
 	estate->es_num_result_relations = 1;
+#endif
 	estate->es_result_relation_info = resultRelInfo;
 	estate->es_range_table = range_table;
 
@@ -446,7 +448,12 @@ copyfrom(CopyChunkState *ccstate, List *range_table, Hypertable *ht, void (*call
 
 	ExecCloseIndices(resultRelInfo);
 	/* Close any trigger target relations */
+#if PG14_LT
 	ExecCleanUpTriggerState(estate);
+#else
+	ExecCloseResultRelations(estate);
+	ExecCloseRangeTableRelations(estate);
+#endif
 
 	/*
 	 * If we skipped writing WAL, then we need to sync the heap (but not

src/planner.c

@@ -330,7 +330,8 @@ timescaledb_planner(Query *parse, int cursor_opts, ParamListInfo bound_params)
 			{
 				Plan *subplan = (Plan *) lfirst(lc);
 
-				ts_hypertable_insert_fixup_tlist(subplan);
+				if (subplan)
+					ts_hypertable_insert_fixup_tlist(subplan);
 			}
 		}
 	}

src/process_utility.c

@@ -1489,8 +1489,14 @@ reindex_chunk(Hypertable *ht, Oid chunk_relid, void *arg)
 			stmt->relation->relname = NameStr(chunk->fd.table_name);
 			stmt->relation->schemaname = NameStr(chunk->fd.schema_name);
 			ReindexTable(stmt->relation,
-						 stmt->options,
+						 stmt->options
+#if PG14_LT
+						 ,
 						 stmt->concurrent /* should test for deadlocks */
+#elif PG14_GE
+						 ,
+						 false /* isTopLevel */
+#endif
 			);
 			break;
 		case REINDEX_OBJECT_INDEX:
@@ -1534,7 +1540,11 @@ process_reindex(ProcessUtilityArgs *args)
 			{
 				PreventCommandDuringRecovery("REINDEX");
 				ts_hypertable_permissions_check_by_id(ht->fd.id);
+#if PG14_LT
 				if (stmt->concurrent)
+#else
+				if (stmt->options & REINDEXOPT_CONCURRENTLY)
+#endif
 					ereport(ERROR,
 							(errmsg("concurrent index creation on hypertables is not supported")));
 
@@ -2635,7 +2645,14 @@ process_cluster_start(ProcessUtilityArgs *args)
 			 * Since we keep OIDs between transactions, there is a potential
 			 * issue if an OID gets reassigned between two subtransactions
 			 */
-			cluster_rel(cim->chunkoid, cim->indexoid, stmt->options);
+			cluster_rel(cim->chunkoid,
+						cim->indexoid,
+						stmt->options
+#if PG14_GE
+						,
+						args->context == PROCESS_UTILITY_TOPLEVEL
+#endif
+			);
 			PopActiveSnapshot();
 			CommitTransactionCommand();
 		}

tsl/src/reorder.c

@@ -627,6 +627,9 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex, bool verbose,
 						  0,
 						  0,
 						  0,
+#if PG14_GE
+						  true,
+#endif
 						  &OldestXmin,
 						  &FreezeXid,
 						  NULL,