From b805447199e59deeeadd1f599dcbb31213cc31bf Mon Sep 17 00:00:00 2001
From: Julong-Li <584147810@qq.com>
Date: Mon, 11 Dec 2023 17:28:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=91=8A=E8=AD=A6=E6=B8=85?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/bin/pg_ctl/backup.cpp         | 7 +++----
 src/bin/pg_probackup/validate.cpp | 2 +-
 src/bin/pg_rewind/fetch.cpp       | 4 ++--
 src/bin/pg_rewind/logging.cpp     | 1 -
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/bin/pg_ctl/backup.cpp b/src/bin/pg_ctl/backup.cpp
index fe58dea8d..d9be142ee 100755
--- a/src/bin/pg_ctl/backup.cpp
+++ b/src/bin/pg_ctl/backup.cpp
@@ -671,7 +671,6 @@ static void progress_report(int tablespacenum, const char* filename, bool force)
     pg_time_t now = 0;
     int elapsed_secs = 0;
     int caculate_secs = 0;
-    static bool print = true;
 
     /*
      * report and cacluate speed for every report_timeout or the sync percent changed.
@@ -1558,7 +1557,7 @@ static bool BaseBackup(const char* dirname, uint32 term)
     /* Print the progress of the tool execution through a new thread. */
     g_totalTableSpace = PQntuples(res);
     fprintf(stderr, "Begin Receiving files \n");
-    pthread_t progressThread = NULL;
+    pthread_t progressThread;
     pthread_create(&progressThread, NULL, ProgressReportFullBuild, NULL);
 
     /*
@@ -2808,7 +2807,7 @@ static void *ProgressReportFullBuild(void *arg) {
         /* progress report */
         percent = (int)((totaldone / 1024) * 100 / totalsize);
         GenerateProgressBar(percent, progressBar);
-        fprintf(stderr, "Progress: %s %d%% (%d/%dKB). (%d/%d)tablespaces. Receive files \r",
+        fprintf(stderr, "Progress: %s %d%% (%lu/%luKB). (%d/%d)tablespaces. Receive files \r",
             progressBar, percent, (totaldone / 1024), totalsize, g_curTableSpace, g_totalTableSpace);
         pthread_mutex_lock(&g_mutex);
         timespec timeout;
@@ -2826,7 +2825,7 @@ static void *ProgressReportFullBuild(void *arg) {
     } while (((totaldone / 1024) < totalsize) && !g_progressFlag);
     percent = 100;
     GenerateProgressBar(percent, progressBar);
-    fprintf(stderr, "Progress: %s %d%% (%d/%dKB). (%d/%d)tablespaces. Receive files \n",
+    fprintf(stderr, "Progress: %s %d%% (%lu/%luKB). (%d/%d)tablespaces. Receive files \n",
             progressBar, percent, totalsize, totalsize, g_curTableSpace, g_totalTableSpace);
     return nullptr;
 }
diff --git a/src/bin/pg_probackup/validate.cpp b/src/bin/pg_probackup/validate.cpp
index 9134cdd85..a4ac6e880 100644
--- a/src/bin/pg_probackup/validate.cpp
+++ b/src/bin/pg_probackup/validate.cpp
@@ -189,7 +189,7 @@ pgBackupValidate(pgBackup *backup, pgRestoreParams *params)
     }
 
     /* setup threads */
-    for (i = 0; (size_t)i < g_totalFiles; i++)
+    for (i = 0; i < g_totalFiles; i++)
     {
         pgFile       *file = (pgFile *) parray_get(files, i);
         pg_atomic_clear_flag(&file->lock);
diff --git a/src/bin/pg_rewind/fetch.cpp b/src/bin/pg_rewind/fetch.cpp
index 9eaa61f44..8c0585a41 100755
--- a/src/bin/pg_rewind/fetch.cpp
+++ b/src/bin/pg_rewind/fetch.cpp
@@ -1337,7 +1337,7 @@ static void *ProgressReportIncrementalBuild(void *arg)
         /* progress report */
         percent = (int)(fetch_done * 100 / fetch_size);
         GenerateProgressBar(percent, progressBar);
-        fprintf(stderr, "Progress: %s %d%% (%d/%dKB). fetch files \r",
+        fprintf(stderr, "Progress: %s %d%% (%lu/%luKB). fetch files \r",
             progressBar, percent, fetch_done, fetch_size);
         pthread_mutex_lock(&g_mutex);
         timespec timeout;
@@ -1355,7 +1355,7 @@ static void *ProgressReportIncrementalBuild(void *arg)
     } while ((fetch_done < fetch_size) && !g_progressFlag);
     percent = 100;
     GenerateProgressBar(percent, progressBar);
-    fprintf(stderr, "Progress: %s %d%% (%d/%dKB). fetch files \n",
+    fprintf(stderr, "Progress: %s %d%% (%lu/%luKB). fetch files \n",
             progressBar, percent, fetch_done, fetch_size);
     return nullptr;
 }
\ No newline at end of file
diff --git a/src/bin/pg_rewind/logging.cpp b/src/bin/pg_rewind/logging.cpp
index 4ab3b8321..7911bbb1a 100644
--- a/src/bin/pg_rewind/logging.cpp
+++ b/src/bin/pg_rewind/logging.cpp
@@ -159,7 +159,6 @@ void progress_report(bool force)
     GaussState g_state;
     int elapsed_secs = 0;
     int caculate_secs = 0;
-    static bool print = true;
 
     now = (pg_time_t)time(NULL);
     percent = fetch_size ? (int)((fetch_done)*100 / fetch_size) : 0;