pg_upgrade; change major version comparisons to use <=, not <

bmomjian · bmomjian · commit dc3953421b43 · 2020-10-06T12:12:09.000-04:00
This makes checking for older major versions more consistent.

Backpatch-through: 9.5
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
@@ -268,7 +268,7 @@ check_cluster_versions(void)
 	 * upgrades
 	 */
 
-	if (GET_MAJOR_VERSION(old_cluster.major_version) < 804)
+	if (GET_MAJOR_VERSION(old_cluster.major_version) <= 803)
 		pg_fatal("This utility can only upgrade from PostgreSQL version 8.4 and later.\n");
 
 	/* Only current PG version is supported as a target */
@@ -305,7 +305,7 @@ check_cluster_compatibility(bool live_check)
 	check_control_data(&old_cluster.controldata, &new_cluster.controldata);
 
 	/* We read the real port number for PG >= 9.1 */
-	if (live_check && GET_MAJOR_VERSION(old_cluster.major_version) < 901 &&
+	if (live_check && GET_MAJOR_VERSION(old_cluster.major_version) <= 900 &&
 		old_cluster.port == DEF_PGUPORT)
 		pg_fatal("When checking a pre-PG 9.1 live old server, "
 				 "you must specify the old server's port number.\n");
@@ -513,7 +513,7 @@ create_script_for_cluster_analyze(char **analyze_script_file_name)
 	fprintf(script, "\"%s/vacuumdb\" %s--all --analyze-in-stages\n",
 			new_cluster.bindir, user_specification.data);
 	/* Did we copy the free space files? */
-	if (GET_MAJOR_VERSION(old_cluster.major_version) < 804)
+	if (GET_MAJOR_VERSION(old_cluster.major_version) <= 803)
 		fprintf(script, "\"%s/vacuumdb\" %s--all\n", new_cluster.bindir,
 				user_specification.data);
 
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
@@ -180,7 +180,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
 	}
 
 	/* pg_resetxlog has been renamed to pg_resetwal in version 10 */
-	if (GET_MAJOR_VERSION(cluster->bin_version) < 1000)
+	if (GET_MAJOR_VERSION(cluster->bin_version) <= 906)
 		resetwal_bin = "pg_resetxlog\" -n";
 	else
 		resetwal_bin = "pg_resetwal\" -n";
diff --git a/src/bin/pg_upgrade/exec.c b/src/bin/pg_upgrade/exec.c
@@ -341,13 +341,13 @@ check_data_dir(ClusterInfo *cluster)
 	check_single_dir(pg_data, "pg_twophase");
 
 	/* pg_xlog has been renamed to pg_wal in v10 */
-	if (GET_MAJOR_VERSION(cluster->major_version) < 1000)
+	if (GET_MAJOR_VERSION(cluster->major_version) <= 906)
 		check_single_dir(pg_data, "pg_xlog");
 	else
 		check_single_dir(pg_data, "pg_wal");
 
 	/* pg_clog has been renamed to pg_xact in v10 */
-	if (GET_MAJOR_VERSION(cluster->major_version) < 1000)
+	if (GET_MAJOR_VERSION(cluster->major_version) <= 906)
 		check_single_dir(pg_data, "pg_clog");
 	else
 		check_single_dir(pg_data, "pg_xact");
@@ -386,7 +386,7 @@ check_bin_dir(ClusterInfo *cluster)
 	get_bin_version(cluster);
 
 	/* pg_resetxlog has been renamed to pg_resetwal in version 10 */
-	if (GET_MAJOR_VERSION(cluster->bin_version) < 1000)
+	if (GET_MAJOR_VERSION(cluster->bin_version) <= 906)
 		validate_exec(cluster->bindir, "pg_resetxlog");
 	else
 		validate_exec(cluster->bindir, "pg_resetwal");
diff --git a/src/bin/pg_upgrade/function.c b/src/bin/pg_upgrade/function.c
@@ -92,7 +92,7 @@ get_loadable_libraries(void)
 		 * http://archives.postgresql.org/pgsql-hackers/2012-03/msg01101.php
 		 * http://archives.postgresql.org/pgsql-bugs/2012-05/msg00206.php
 		 */
-		if (GET_MAJOR_VERSION(old_cluster.major_version) < 901)
+		if (GET_MAJOR_VERSION(old_cluster.major_version) <= 900)
 		{
 			PGresult   *res;
 
@@ -224,7 +224,7 @@ check_loadable_libraries(void)
 			 * works for languages, and does not help with function shared
 			 * objects, so we just do a general fix.
 			 */
-			if (GET_MAJOR_VERSION(old_cluster.major_version) < 901 &&
+			if (GET_MAJOR_VERSION(old_cluster.major_version) <= 900 &&
 				strcmp(lib, "$libdir/plpython") == 0)
 			{
 				lib = "$libdir/plpython2";
diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c
@@ -406,7 +406,7 @@ create_new_objects(void)
 	 * We don't have minmxids for databases or relations in pre-9.3 clusters,
 	 * so set those after we have restored the schema.
 	 */
-	if (GET_MAJOR_VERSION(old_cluster.major_version) < 903)
+	if (GET_MAJOR_VERSION(old_cluster.major_version) <= 902)
 		set_frozenxids(true);
 
 	/* update new_cluster info now that we have objects in the databases */
@@ -465,9 +465,9 @@ copy_xact_xlog_xid(void)
 	 * Copy old commit logs to new data dir. pg_clog has been renamed to
 	 * pg_xact in post-10 clusters.
 	 */
-	copy_subdir_files(GET_MAJOR_VERSION(old_cluster.major_version) < 1000 ?
+	copy_subdir_files(GET_MAJOR_VERSION(old_cluster.major_version) <= 906 ?
 					  "pg_clog" : "pg_xact",
-					  GET_MAJOR_VERSION(new_cluster.major_version) < 1000 ?
+					  GET_MAJOR_VERSION(new_cluster.major_version) <= 906 ?
 					  "pg_clog" : "pg_xact");
 
 	/* set the next transaction id and epoch of the new cluster */
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
@@ -221,7 +221,7 @@ start_postmaster(ClusterInfo *cluster, bool report_and_exit_on_error)
 		snprintf(socket_string + strlen(socket_string),
 				 sizeof(socket_string) - strlen(socket_string),
 				 " -c %s='%s'",
-				 (GET_MAJOR_VERSION(cluster->major_version) < 903) ?
+				 (GET_MAJOR_VERSION(cluster->major_version) <= 902) ?
 				 "unix_socket_directory" : "unix_socket_directories",
 				 cluster->sockdir);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`/* pg_resetxlog has been renamed to pg_resetwal in version 10 */`
`183`		`- if (GET_MAJOR_VERSION(cluster->bin_version) < 1000)`
	`183`	`+ if (GET_MAJOR_VERSION(cluster->bin_version) <= 906)`
`184`	`184`	`resetwal_bin = "pg_resetxlog\" -n";`
`185`	`185`	`else`
`186`	`186`	`resetwal_bin = "pg_resetwal\" -n";`