do not invalidate indexes in case when upgrading from the same version

Author: zilder

src/bin/pg_upgrade/check.c

@@ -59,6 +59,12 @@ fix_path_separator(char *path)
 #endif
 }
 
+#define same_version_edition(cluster1, cluster2) \
+	( \
+		GET_MAJOR_VERSION((cluster1).major_version) == GET_MAJOR_VERSION((cluster2).major_version) \
+		&& (cluster1).edition == (cluster2).edition \
+	)
+
 void
 output_check_banner(bool live_check)
 {
@@ -113,7 +119,7 @@ check_and_dump_old_cluster(bool live_check)
 	 * PgPro 10 Enterprise requires hash indexes to be reindexed regardless
 	 * of old cluster version
 	 */
-	if (user_opts.check)
+	if (user_opts.check && !same_version_edition(old_cluster, new_cluster))
 		old_9_6_invalidate_hash_indexes(&old_cluster, true);
 
 	/* 9.5 and below should not have roles starting with pg_ */
@@ -206,23 +212,27 @@ issue_warnings_and_set_wal_level(void)
 	 * Reindex hash indexes for old < 10.0
 	 * PgPro 10 Enterprise requires hash indexes to be reindexed
 	 */
-	old_9_6_invalidate_hash_indexes(&new_cluster, false);
+	if (!same_version_edition(old_cluster, new_cluster))
+		old_9_6_invalidate_hash_indexes(&new_cluster, false);
 
 	/* Invalidate incompatible indexes */
 	/*
 	 * TODO: should we try to convert sp-gist indexes when upgrading from
 	 * previous Enterprise edition?
 	 */
-	invalidate_spgist_indexes(&new_cluster, false);
+	if (!same_version_edition(old_cluster, new_cluster))
+		invalidate_spgist_indexes(&new_cluster, false);
 
-	if (GET_MAJOR_VERSION(old_cluster.major_version) <= 1000
+	if ((GET_MAJOR_VERSION(old_cluster.major_version) <= 1000
 		&& old_cluster.edition == PGPRO_ENTERPRISE)
+		&& !same_version_edition(old_cluster, new_cluster))
 		invalidate_brin_indexes(&new_cluster, false);
 
 	/*
 	 * Invalidate external indexes
 	 */
-	invalidate_external_indexes(&new_cluster, false);
+	if (!same_version_edition(old_cluster, new_cluster))
+		invalidate_external_indexes(&new_cluster, false);
 
 	if (old_cluster.edition != PG_ORIGINAL &&
 			GET_MAJOR_VERSION(old_cluster.major_version) <= 906)