Merge branch 'main' into main

src/backend/columnar/columnar_tableam.c

@@ -3021,6 +3021,8 @@ AvailableExtensionVersionColumnar(void)
 
 	ereport(ERROR, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 					errmsg("citus extension is not found")));
+
+	return NULL; /* keep compiler happy */
 }
 
 

src/backend/distributed/metadata/metadata_cache.c

@@ -2522,6 +2522,8 @@ AvailableExtensionVersion(void)
 
 	ereport(ERROR, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 					errmsg("citus extension is not found")));
+
+	return NULL; /* keep compiler happy */
 }
 
 

src/backend/distributed/planner/insert_select_planner.c

@@ -1810,6 +1810,8 @@ CastExpr(Expr *expr, Oid sourceType, Oid targetType, Oid targetCollation,
 		ereport(ERROR, (errmsg("could not find a conversion path from type %d to %d",
 							   sourceType, targetType)));
 	}
+
+	return NULL; /* keep compiler happy */
 }