Adjust to PG18 PathKey changes

PG18 changes the field for ordering operation from int16 to
CompareType and also changes the field name in PathKey from
pk_strategy to pk_cmptype.
Additionally BTLessStrategyNumber is renamed to COMPARE_LT
and BTGreaterStrategyNumber is renamed to COMPARE_GT.
This patch adds compatibility macros so we can use the PG18
naming everywhere.

postgres/postgres@8123e91f Convert PathKey to use CompareType

Author: svenklemm

src/compat/compat.h

@@ -729,3 +729,14 @@ initReadOnlyStringInfo(StringInfo str, char *data, int len)
 #if PG18_LT
 #define ec_derives_list ec_derives
 #endif
+
+/* PG18 introduces new CompareType for ordering operations
+ * Add macros so we can use the new naming for older versions.
+ * https://github.com/postgres/postgres/commit/8123e91f
+ */
+#if PG18_LT
+#define CompareType int16
+#define COMPARE_LT BTLessStrategyNumber
+#define COMPARE_GT BTGreaterStrategyNumber
+#define pk_cmptype pk_strategy
+#endif

src/import/planner.c

@@ -609,11 +609,11 @@ ts_prepare_sort_from_pathkeys(Plan *lefttree, List *pathkeys, Relids relids,
 		sortop = get_opfamily_member(pathkey->pk_opfamily,
 									 pk_datatype,
 									 pk_datatype,
-									 pathkey->pk_strategy);
+									 pathkey->pk_cmptype);
 		if (!OidIsValid(sortop)) /* should not happen */
 			elog(ERROR,
 				 "missing operator %d(%u,%u) in opfamily %u",
-				 pathkey->pk_strategy,
+				 pathkey->pk_cmptype,
 				 pk_datatype,
 				 pk_datatype,
 				 pathkey->pk_opfamily);

src/sort_transform.c

@@ -454,7 +454,7 @@ ts_sort_transform_get_pathkeys(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry
 	new_pk = make_canonical_pathkey(root,
 									transformed,
 									last_pk->pk_opfamily,
-									last_pk->pk_strategy,
+									last_pk->pk_cmptype,
 									last_pk->pk_nulls_first);
 
 	/*

tsl/src/continuous_aggs/planner.c

@@ -437,7 +437,7 @@ cagg_sort_pushdown(Query *parse, int *cursor_opts)
 			linitial_node(SortGroupClause, mat_rte->subquery->sortClause)->tleSortGroupRef;
 
 		Oid placeholder;
-		int16 strategy;
+		CompareType strategy;
 		get_ordering_op_properties(sort->sortop, &placeholder, &placeholder, &strategy);
 
 		/*

tsl/src/nodes/decompress_chunk/decompress_chunk.c

@@ -89,7 +89,7 @@ append_ec_for_seqnum(PlannerInfo *root, const CompressionInfo *info, const SortI
 	MemoryContext oldcontext = MemoryContextSwitchTo(root->planner_cxt);
 
 	Oid opfamily, opcintype, equality_op;
-	int16 strategy;
+	CompareType strategy;
 	List *opfamilies;
 	EquivalenceClass *newec = makeNode(EquivalenceClass);
 	EquivalenceMember *em = makeNode(EquivalenceMember);
@@ -276,7 +276,7 @@ build_compressed_scan_pathkeys(const SortInfo *sort_info, PlannerInfo *root, Lis
 
 			/* Find the operator in pg_amop --- failure shouldn't happen. */
 			Oid opfamily, opcintype;
-			int16 strategy;
+			CompareType strategy;
 			if (!get_ordering_op_properties(sortop, &opfamily, &opcintype, &strategy))
 				elog(ERROR, "operator %u is not a valid ordering operator", sortop);
 
@@ -314,7 +314,7 @@ build_compressed_scan_pathkeys(const SortInfo *sort_info, PlannerInfo *root, Lis
 					ts_array_get_element_bool(info->settings->fd.orderby_nullsfirst, orderby_index);
 
 				bool nulls_first;
-				int16 strategy;
+				CompareType strategy;
 
 				if (sort_info->reverse)
 				{
@@ -2197,11 +2197,11 @@ match_pathkeys_to_compression_orderby(List *pathkeys, List *chunk_em_exprs,
 									  orderby_index);
 
 		/*
-		 * pk_strategy is either BTLessStrategyNumber (for ASC) or
-		 * BTGreaterStrategyNumber (for DESC)
+		 * In PG18+: pk_cmptype is either COMPARE_LT (for ASC) or COMPARE_GT (for DESC)
+		 * For previous PG versions we have compatibility macros to make these new names available.
 		 */
 		bool this_pathkey_reverse = false;
-		if (pk->pk_strategy == BTLessStrategyNumber)
+		if (pk->pk_cmptype == COMPARE_LT)
 		{
 			if (!orderby_desc && orderby_nullsfirst == pk->pk_nulls_first)
 			{
@@ -2216,7 +2216,7 @@ match_pathkeys_to_compression_orderby(List *pathkeys, List *chunk_em_exprs,
 				return false;
 			}
 		}
-		else if (pk->pk_strategy == BTGreaterStrategyNumber)
+		else if (pk->pk_cmptype == COMPARE_GT)
 		{
 			if (orderby_desc && orderby_nullsfirst == pk->pk_nulls_first)
 			{

tsl/src/nodes/decompress_chunk/planner.c

@@ -1238,11 +1238,11 @@ decompress_chunk_plan_create(PlannerInfo *root, RelOptInfo *rel, CustomPath *pat
 				Oid sortop = get_opfamily_member(pk->pk_opfamily,
 												 var->vartype,
 												 var->vartype,
-												 pk->pk_strategy);
+												 pk->pk_cmptype);
 				if (!OidIsValid(sortop)) /* should not happen */
 					elog(ERROR,
 						 "missing operator %d(%u,%u) in opfamily %u",
-						 pk->pk_strategy,
+						 pk->pk_cmptype,
 						 var->vartype,
 						 var->vartype,
 						 pk->pk_opfamily);
@@ -1279,7 +1279,7 @@ decompress_chunk_plan_create(PlannerInfo *root, RelOptInfo *rel, CustomPath *pat
 
 			/* Find the operator in pg_amop --- failure shouldn't happen */
 			Oid opfamily, opcintype;
-			int16 strategy;
+			CompareType strategy;
 			if (!get_ordering_op_properties(list_nth_oid(sort_ops, i),
 											&opfamily,
 											&opcintype,

tsl/src/nodes/gapfill/gapfill_plan.c

@@ -142,7 +142,7 @@ gapfill_correct_order(PlannerInfo *root, Path *subpath, FuncExpr *func)
 		EquivalenceMember *em = linitial(pk->pk_eclass->ec_members);
 
 		/* time_bucket_gapfill is last element */
-		if (BTLessStrategyNumber == pk->pk_strategy && IsA(em->em_expr, FuncExpr) &&
+		if (pk->pk_cmptype == COMPARE_LT && IsA(em->em_expr, FuncExpr) &&
 			((FuncExpr *) em->em_expr)->funcid == func->funcid)
 		{
 			int i;
@@ -376,7 +376,7 @@ gapfill_path_create(PlannerInfo *root, Path *subpath, FuncExpr *func)
 			if (!pk_func && IsA(em->em_expr, FuncExpr) &&
 				((FuncExpr *) em->em_expr)->funcid == func->funcid)
 			{
-				if (BTLessStrategyNumber == pk->pk_strategy)
+				if (pk->pk_cmptype == COMPARE_LT)
 					pk_func = pk;
 				else
 					pk_func = make_canonical_pathkey(root,