remove obsolete block of code, improve comments

alubennikova · alubennikova · commit 126c42440365 · 2017-06-14T15:49:18.000+03:00
diff --git a/configure.c b/configure.c
@@ -86,9 +86,9 @@ pgBackupConfigInit(pgBackupConfig *config)
 	config->master_port = NULL;
 	config->master_db = NULL;
 	config->master_user = NULL;
-	config->replica_timeout = INT_MIN;	// INT_MIN means "undefined"
+	config->replica_timeout = INT_MIN;	/* INT_MIN means "undefined" */
 
-	config->log_level = INT_MIN;		// INT_MIN means "undefined"
+	config->log_level = INT_MIN;		/* INT_MIN means "undefined" */
 	config->log_filename = NULL;
 	config->error_log_filename = NULL;
 	config->log_directory = NULL;
diff --git a/data.c b/data.c
@@ -253,6 +253,9 @@ backup_data_page(pgFile *file, XLogRecPtr prev_backup_start_lsn,
  * Backup data file in the from_root directory to the to_root directory with
  * same relative path. If prev_backup_start_lsn is not NULL, only pages with
  * higher lsn will be copied.
+ * Not just copy file, but read it block by block (use bitmap in case of
+ * incremental backup), validate checksum, optionally compress and write to
+ * backup with special header.
  */
 bool
 backup_data_file(const char *from_root, const char *to_root,
@@ -455,8 +458,6 @@ restore_file_partly(const char *from_root,const char *to_root, pgFile *file)
 		write_size += read_len;
 	}
 
-// 	elog(LOG, "restore_file_partly(). %s write_size %lu, file->write_size %lu",
-// 			   file->path, write_size, file->write_size);
 
 	/* update file permission */
 	if (chmod(to_path, file->mode) == -1)
@@ -572,27 +573,8 @@ restore_data_file(const char *from_root,
 		else
 			memcpy(page.data, compressed_page.data, BLCKSZ);
 
-		/* update checksum because we are not save whole */
-		if(backup->checksum_version)
-		{
-			bool is_zero_page = false;
-
-			if(page.page_data.pd_upper == 0)
-			{
-				int i;
-				for(i = 0; i < BLCKSZ && page.data[i] == 0; i++);
-				if (i == BLCKSZ)
-					is_zero_page = true;
-			}
-
-			/* skip calc checksum if zero page */
-			if (!is_zero_page)
-				((PageHeader) page.data)->pd_checksum = pg_checksum_page(page.data, file->segno * RELSEG_SIZE + header.block);
-		}
-
 		/*
-		 * Seek and write the restored page. Backup might have holes in
-		 * differential backups.
+		 * Seek and write the restored page.
 		 */
 		blknum = header.block;
 		if (fseek(out, blknum * BLCKSZ, SEEK_SET) < 0)
@@ -619,9 +601,9 @@ restore_data_file(const char *from_root,
 }
 
 /*
- * Add check that file is not bigger than RELSEG_SIZE.
- * WARNING cfs_compressed file can be exceed this limit.
- * Add compression.
+ * Copy file to backup.
+ * We do not apply compression to these files, because
+ * it is either small control file or already compressed cfs file.
  */
 bool
 copy_file(const char *from_root, const char *to_root, pgFile *file)
diff --git a/util.c b/util.c
@@ -27,7 +27,7 @@ base36enc(long unsigned int value)
 		buffer[--offset] = base36[value % 36];
 	} while (value /= 36);
 
-	return strdup(&buffer[offset]); // warning: this must be free-d by the user
+	return strdup(&buffer[offset]); /* warning: this must be free-d by the user */
 }
 
 long unsigned int

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ base36enc(long unsigned int value)`
`27`	`27`	`buffer[--offset] = base36[value % 36];`
`28`	`28`	`} while (value /= 36);`
`29`	`29`
`30`		`- return strdup(&buffer[offset]); // warning: this must be free-d by the user`
	`30`	`+ return strdup(&buffer[offset]); /* warning: this must be free-d by the user */`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`long unsigned int`