Skip to content

Commit 9881448

Browse files
reshkemy-ship-it
authored andcommitted
Update check.c: fixed Cloudberry incorrect references
As I understand there was a commit where all instances of `Greenplum` was changed via something like sed to `Cloudberry` In is not correct in number of cases, and I did take care of few places in upgrade utility.
1 parent c9b8184 commit 9881448

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

src/bin/pg_upgrade/check.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ check_and_dump_old_cluster(bool live_check, char **sequence_script_file_name)
111111
check_for_isn_and_int8_passing_mismatch(&old_cluster);
112112

113113
/*
114-
* Check for various Cloudberry failure cases
114+
* Check for various Greenplum failure cases
115115
*/
116116
check_greenplum();
117117

@@ -217,7 +217,7 @@ check_and_dump_old_cluster(bool live_check, char **sequence_script_file_name)
217217
}
218218

219219
/*
220-
* Upgrading from Cloudberry 4.3.x which is based on PostgreSQL 8.2.
220+
* Upgrading from Greenplum 4.3.x which is based on PostgreSQL 8.2.
221221
* Upgrading from one version of 4.3.x to another 4.3.x version is not
222222
* supported.
223223
*/
@@ -396,7 +396,7 @@ check_cluster_versions(void)
396396
GET_MAJOR_VERSION(new_cluster.major_version) == 802)
397397
{
398398
pg_log(PG_FATAL,
399-
"old and new cluster cannot both be Cloudberry 4.3.x installations\n");
399+
"old and new cluster cannot both be Greenplum 4.3.x installations\n");
400400
}
401401

402402
/*
@@ -405,17 +405,17 @@ check_cluster_versions(void)
405405
*/
406406

407407
/*
408-
* Upgrading from anything older than an 8.2 based Cloudberry is not
408+
* Upgrading from anything older than an 8.2 based Greenplum is not
409409
* supported. TODO: This needs to be amended to check for the actual
410410
* 4.3.x version we target and not a blanket 8.2 check, but for now
411411
* this will cover most cases.
412412
*/
413413
if (GET_MAJOR_VERSION(old_cluster.major_version) < 802)
414-
pg_fatal("This utility can only upgrade from Cloudberry version 4.3.x and later.\n");
414+
pg_fatal("This utility can only upgrade from Greenplum version 4.3.x and later.\n");
415415

416416
/* Only current PG version is supported as a target */
417417
if (GET_MAJOR_VERSION(new_cluster.major_version) != GET_MAJOR_VERSION(PG_VERSION_NUM))
418-
pg_fatal("This utility can only upgrade to Cloudberry version %s.\n",
418+
pg_fatal("This utility can only upgrade to Greenplum version %s.\n",
419419
PG_MAJORVERSION);
420420

421421
/*
@@ -424,7 +424,7 @@ check_cluster_versions(void)
424424
* older versions.
425425
*/
426426
if (old_cluster.major_version > new_cluster.major_version)
427-
pg_fatal("This utility cannot be used to downgrade to older major Cloudberry versions.\n");
427+
pg_fatal("This utility cannot be used to downgrade to older major Greenplum versions.\n");
428428

429429
/* Ensure binaries match the designated data directories */
430430
if (GET_MAJOR_VERSION(old_cluster.major_version) !=

0 commit comments

Comments
 (0)