New option: delete --expired. Minor bugfixes.

alubennikova · alubennikova · commit 5e0e881ce064 · 2017-04-19T17:58:58.000+03:00
diff --git a/dir.c b/dir.c
@@ -128,12 +128,23 @@ pgFileNew(const char *path, bool omit_symlink)
 			strerror(errno));
 	}
 
+	file = pgFileInit(path);
+	file->size = st.st_size;
+	file->mode = st.st_mode;
+
+	return file;
+}
+
+pgFile *
+pgFileInit(const char *path)
+{
+	pgFile		   *file;
 	file = (pgFile *) pgut_malloc(sizeof(pgFile));
 
-	file->size = st.st_size;
+	file->size = 0;
+	file->mode = 0;
 	file->read_size = 0;
 	file->write_size = 0;
-	file->mode = st.st_mode;
 	file->crc = 0;
 	file->is_datafile = false;
 	file->linked = NULL;
@@ -142,10 +153,9 @@ pgFileNew(const char *path, bool omit_symlink)
 	file->ptrack_path = NULL;
 	file->segno = 0;
 	file->path = pgut_malloc(strlen(path) + 1);
+	strcpy(file->path, path);		/* enough buffer size guaranteed */
 	file->generation = -1;
 	file->is_partial_copy = 0;
-	strcpy(file->path, path);		/* enough buffer size guaranteed */
-
 	return file;
 }
 
@@ -725,7 +735,7 @@ dir_read_file_list(const char *root, const char *file_txt)
 		else
 			strcpy(filepath, path);
 
-		file = pgFileNew(filepath, false);
+		file = pgFileInit(filepath);
 
 		file->write_size = write_size;
 		file->mode = mode;
diff --git a/pg_probackup.c b/pg_probackup.c
@@ -83,10 +83,11 @@ static pgut_option options[] =
 	{ 'b', 12, "wal",					&delete_wal,		SOURCE_CMDLINE },
 	{ 'b', 16, "expired",				&delete_expired,	SOURCE_CMDLINE },
 	{ 'b', 17, "all",					&apply_to_all,		SOURCE_CMDLINE },
+	/* TODO not implemented yet */
 	{ 'b', 18, "force",					&force_delete,		SOURCE_CMDLINE },
 	/* configure options */
-	{ 'u', 13, "set-retention-redundancy", &retention_redundancy,	SOURCE_CMDLINE },
-	{ 'u', 14, "set-retention-window",	&retention_window,		SOURCE_CMDLINE },
+	{ 'u', 13, "retention-redundancy", &retention_redundancy,	SOURCE_CMDLINE },
+	{ 'u', 14, "retention-window",	&retention_window,		SOURCE_CMDLINE },
 	/* other */
 	{ 'U', 15, "system-identifier",		&system_identifier,		SOURCE_FILE_STRICT },
 
@@ -235,7 +236,12 @@ main(int argc, char *argv[])
 		case SHOW:
 			return do_show(current.backup_id);
 		case DELETE:
-			return do_delete(current.backup_id);
+			if (delete_expired && backup_id_string_param)
+				elog(ERROR, "You cannot specify --delete-expired and --backup-id options together");
+			if (delete_expired)
+				return do_retention_purge();
+			else
+				return do_delete(current.backup_id);
 		case CONFIGURE:
 			/* TODO fixit */
 			if (argc == 4)
diff --git a/pg_probackup.h b/pg_probackup.h
@@ -329,6 +329,7 @@ extern int dir_create_dir(const char *path, mode_t mode);
 extern bool dir_is_empty(const char *path);
 
 extern pgFile *pgFileNew(const char *path, bool omit_symlink);
+extern pgFile *pgFileInit(const char *path);
 extern void pgFileDelete(pgFile *file);
 extern void pgFileFree(void *file);
 extern pg_crc32 pgFileGetCRC(pgFile *file);
