Minor cleanup

Author: dr-m

storage/innobase/handler/backup_innodb.cc

@@ -93,19 +93,18 @@ class InnoDB_backup
 
     if (!fail)
     {
-      ctx= new backup_context{};
-      ctx->first_lsn= log_sys.get_first_lsn();
-      ctx->max_first_lsn= 1;
-      ctx->first_size= log_sys.file_size;
-      const lsn_t start= ctx->checkpoint=
+      lsn_t start_end;
+      const lsn_t start=
 #if 1 /* TODO: for incremental backup, allow the start to be specified */
-        log_sys.get_latest_checkpoint(ctx->checkpoint_end_lsn);
+        log_sys.get_latest_checkpoint(start_end);
 #else
         log_sys.archived_checkpoint;
-      ctx->checkpoint_end_lsn= log_sys.archived_lsn;
+      start_end= log_sys.archived_lsn;
 #endif
-      ctx->last_lsn= 0;
-      ctx->archived= !old_size;
+      ctx= new backup_context{
+        log_sys.get_first_lsn(), 1, log_sys.file_size,
+        start, start_end, 0, !old_size
+      };
 
       /* Collect all tablespaces that have been created before our
       start checkpoint. Newer tablespaces will be recovered by the
@@ -144,14 +143,12 @@ class InnoDB_backup
   /**
      Process a file that was collected at init().
      This may be invoked from multiple concurrent threads.
-     @param thd     current session
      @param target  backup target
      @param sink    backup worker context
      @return number of files remaining, or negative on error
      @retval 0 on completion
   */
-  int step(THD *thd, const backup_target &target, const backup_sink &sink)
-    noexcept
+  int step(const backup_target &target, const backup_sink &sink) noexcept
   {
     uint32_t id= FIL_NULL;
     lsn_t lsn= 0;
@@ -241,13 +238,11 @@ class InnoDB_backup
           const backup_sink &sink) noexcept
   {
     ut_ad(ctx ? ctx == sink.ha_data : phase == BACKUP_PHASE_FINISH);
-    ut_ad(sink.stream == sink.NO_STREAM); // FIXME
 
     switch (phase) {
     default:
       return 0;
     case BACKUP_PHASE_FINISH:
-      return fini(thd, target, sink);
     case BACKUP_PHASE_NO_COMMIT:
     case BACKUP_PHASE_ABORT:
       break;
@@ -265,7 +260,7 @@ class InnoDB_backup
       if (!ctx)
         cleanup();
       log_sys.latch.wr_unlock();
-      return fini(thd, target, sink);
+      return fini(target, sink);
     default:
       /* Determine the logical time of the backup snapshot */
       ut_ad(phase == BACKUP_PHASE_NO_COMMIT);
@@ -355,14 +350,12 @@ class InnoDB_backup
 
   /**
      Clean up after end().
-     @param thd     the parameter that had been passed to end()
      @param target  backup target
      @param sink    backup worker context
      @return error code
      @retval 0 on success
   */
-  int fini(THD *thd, const backup_target &target, const backup_sink &sink)
-    noexcept
+  int fini(const backup_target &target, const backup_sink &sink) noexcept
   {
     int fail= 0;
 
@@ -1022,11 +1015,11 @@ void *innodb_backup_start(THD *thd, const backup_target *target,
     : sink->ha_data;
 }
 
-int innodb_backup_step(THD *thd, const backup_target *target,
+int innodb_backup_step(THD *, const backup_target *target,
                        backup_phase phase, const backup_sink *sink) noexcept
 {
   return phase == BACKUP_PHASE_START &&
-    innodb_backup.step(thd, *target, *sink);
+    innodb_backup.step(*target, *sink);
 }
 
 int innodb_backup_end(THD *thd, const backup_target *target,