Skip to content

Commit

Permalink
[#24435] YSQL: Remove trailing whitespace in pg_upgrade
Browse files Browse the repository at this point in the history
Summary:
Commits 8b270c2 and 9ca9c2a added some trailing whitespace to pg_upgrade. Remove it.
Jira: DB-13341

Test Plan: Jenkins: compile only

Reviewers: fizaa, telgersma

Reviewed By: fizaa

Subscribers: yql

Differential Revision: https://phorge.dev.yugabyte.com/D39027
  • Loading branch information
foucher committed Oct 15, 2024
1 parent 98363eb commit 8daefcd
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/postgres/src/bin/pg_upgrade/check.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ check_and_dump_old_cluster(bool live_check)
/*
* Check for various failure cases
*/
/*
/*
* YB: this check requires the following conditions:
* 1. The logged in user is 'postgres' (oid = 10)
* 2. New cluster does not have any users
Expand All @@ -129,7 +129,7 @@ check_and_dump_old_cluster(bool live_check)
* need to be changed to match the new signature.
*/
if (!is_yugabyte_enabled() && GET_MAJOR_VERSION(old_cluster.major_version) <= 1300)
/*
/*
* CREATE CONVERSION is not supported by YB,
* cannot have user-defined encoding conversions.
*/
Expand Down
16 changes: 8 additions & 8 deletions src/postgres/src/bin/pg_upgrade/pg_upgrade.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ main(int argc, char **argv)

output_check_banner(live_check);

/*
* This checks for Postgres versions.
/*
* This checks for Postgres versions.
* The check isn't relevant to Yugabyte right now.
*/
if (!is_yugabyte_enabled())
Expand All @@ -147,8 +147,8 @@ main(int argc, char **argv)
get_sock_dir(&old_cluster, live_check);
get_sock_dir(&new_cluster, false);

/*
* This checks for global state information initialized
/*
* This checks for global state information initialized
* during initdb and is not relevant for YB currently.
*/
if (!is_yugabyte_enabled())
Expand Down Expand Up @@ -350,7 +350,7 @@ setup(char *argv0, bool *live_check)
* make sure the user has a clean environment, otherwise, we may confuse
* libpq when we connect to one (or both) of the servers.
*/
#ifdef YB_TODO
#ifdef YB_TODO
/* Investigate/implement this check */
check_pghost_envvar();
#endif
Expand Down Expand Up @@ -478,10 +478,10 @@ create_new_objects(void)
* So handle it in a separate non-parallelized pass.
*/
#ifdef YB_TODO
/*
* Fix template1 restore, currently throws
/*
* Fix template1 restore, currently throws
* UPDATE pg_catalog.pg_database SET datistemplate = false WHERE datname = 'template1';
* pg_database not found
* pg_database not found
*/
for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++)
{
Expand Down

0 comments on commit 8daefcd

Please sign in to comment.