Compare commits
1 Commits
fix/dedup-
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 1c72a37bc8 |
@@ -54,7 +54,7 @@ The database tracks five primary entities and their relationships:
|
|||||||
|
|
||||||
#### File (`database.File`)
|
#### File (`database.File`)
|
||||||
Represents a file or directory in the backup system. Stores metadata needed for restoration:
|
Represents a file or directory in the backup system. Stores metadata needed for restoration:
|
||||||
- Path, timestamps (mtime, ctime)
|
- Path, mtime
|
||||||
- Size, mode, ownership (uid, gid)
|
- Size, mode, ownership (uid, gid)
|
||||||
- Symlink target (if applicable)
|
- Symlink target (if applicable)
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ Stores metadata about files in the filesystem being backed up.
|
|||||||
- `id` (TEXT PRIMARY KEY) - UUID for the file record
|
- `id` (TEXT PRIMARY KEY) - UUID for the file record
|
||||||
- `path` (TEXT NOT NULL UNIQUE) - Absolute file path
|
- `path` (TEXT NOT NULL UNIQUE) - Absolute file path
|
||||||
- `mtime` (INTEGER NOT NULL) - Modification time as Unix timestamp
|
- `mtime` (INTEGER NOT NULL) - Modification time as Unix timestamp
|
||||||
- `ctime` (INTEGER NOT NULL) - Change time as Unix timestamp
|
|
||||||
- `size` (INTEGER NOT NULL) - File size in bytes
|
- `size` (INTEGER NOT NULL) - File size in bytes
|
||||||
- `mode` (INTEGER NOT NULL) - Unix file permissions and type
|
- `mode` (INTEGER NOT NULL) - Unix file permissions and type
|
||||||
- `uid` (INTEGER NOT NULL) - User ID of file owner
|
- `uid` (INTEGER NOT NULL) - User ID of file owner
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ func TestCascadeDeleteDebug(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: "/cascade-test.txt",
|
Path: "/cascade-test.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ func TestChunkFileRepository(t *testing.T) {
|
|||||||
file1 := &File{
|
file1 := &File{
|
||||||
Path: "/file1.txt",
|
Path: "/file1.txt",
|
||||||
MTime: testTime,
|
MTime: testTime,
|
||||||
CTime: testTime,
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -37,7 +36,6 @@ func TestChunkFileRepository(t *testing.T) {
|
|||||||
file2 := &File{
|
file2 := &File{
|
||||||
Path: "/file2.txt",
|
Path: "/file2.txt",
|
||||||
MTime: testTime,
|
MTime: testTime,
|
||||||
CTime: testTime,
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -138,9 +136,9 @@ func TestChunkFileRepositoryComplexDeduplication(t *testing.T) {
|
|||||||
|
|
||||||
// Create test files
|
// Create test files
|
||||||
testTime := time.Now().Truncate(time.Second)
|
testTime := time.Now().Truncate(time.Second)
|
||||||
file1 := &File{Path: "/file1.txt", MTime: testTime, CTime: testTime, Size: 3072, Mode: 0644, UID: 1000, GID: 1000}
|
file1 := &File{Path: "/file1.txt", MTime: testTime, Size: 3072, Mode: 0644, UID: 1000, GID: 1000}
|
||||||
file2 := &File{Path: "/file2.txt", MTime: testTime, CTime: testTime, Size: 3072, Mode: 0644, UID: 1000, GID: 1000}
|
file2 := &File{Path: "/file2.txt", MTime: testTime, Size: 3072, Mode: 0644, UID: 1000, GID: 1000}
|
||||||
file3 := &File{Path: "/file3.txt", MTime: testTime, CTime: testTime, Size: 2048, Mode: 0644, UID: 1000, GID: 1000}
|
file3 := &File{Path: "/file3.txt", MTime: testTime, Size: 2048, Mode: 0644, UID: 1000, GID: 1000}
|
||||||
|
|
||||||
if err := fileRepo.Create(ctx, nil, file1); err != nil {
|
if err := fileRepo.Create(ctx, nil, file1); err != nil {
|
||||||
t.Fatalf("failed to create file1: %v", err)
|
t.Fatalf("failed to create file1: %v", err)
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ func TestFileChunkRepository(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: "/test/file.txt",
|
Path: "/test/file.txt",
|
||||||
MTime: testTime,
|
MTime: testTime,
|
||||||
CTime: testTime,
|
|
||||||
Size: 3072,
|
Size: 3072,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -135,7 +134,6 @@ func TestFileChunkRepositoryMultipleFiles(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: types.FilePath(path),
|
Path: types.FilePath(path),
|
||||||
MTime: testTime,
|
MTime: testTime,
|
||||||
CTime: testTime,
|
|
||||||
Size: 2048,
|
Size: 2048,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
|
|||||||
@@ -25,12 +25,11 @@ func (r *FileRepository) Create(ctx context.Context, tx *sql.Tx, file *File) err
|
|||||||
}
|
}
|
||||||
|
|
||||||
query := `
|
query := `
|
||||||
INSERT INTO files (id, path, source_path, mtime, ctime, size, mode, uid, gid, link_target)
|
INSERT INTO files (id, path, source_path, mtime, size, mode, uid, gid, link_target)
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
ON CONFLICT(path) DO UPDATE SET
|
ON CONFLICT(path) DO UPDATE SET
|
||||||
source_path = excluded.source_path,
|
source_path = excluded.source_path,
|
||||||
mtime = excluded.mtime,
|
mtime = excluded.mtime,
|
||||||
ctime = excluded.ctime,
|
|
||||||
size = excluded.size,
|
size = excluded.size,
|
||||||
mode = excluded.mode,
|
mode = excluded.mode,
|
||||||
uid = excluded.uid,
|
uid = excluded.uid,
|
||||||
@@ -42,10 +41,10 @@ func (r *FileRepository) Create(ctx context.Context, tx *sql.Tx, file *File) err
|
|||||||
var idStr string
|
var idStr string
|
||||||
var err error
|
var err error
|
||||||
if tx != nil {
|
if tx != nil {
|
||||||
LogSQL("Execute", query, file.ID.String(), file.Path.String(), file.SourcePath.String(), file.MTime.Unix(), file.CTime.Unix(), file.Size, file.Mode, file.UID, file.GID, file.LinkTarget.String())
|
LogSQL("Execute", query, file.ID.String(), file.Path.String(), file.SourcePath.String(), file.MTime.Unix(), file.Size, file.Mode, file.UID, file.GID, file.LinkTarget.String())
|
||||||
err = tx.QueryRowContext(ctx, query, file.ID.String(), file.Path.String(), file.SourcePath.String(), file.MTime.Unix(), file.CTime.Unix(), file.Size, file.Mode, file.UID, file.GID, file.LinkTarget.String()).Scan(&idStr)
|
err = tx.QueryRowContext(ctx, query, file.ID.String(), file.Path.String(), file.SourcePath.String(), file.MTime.Unix(), file.Size, file.Mode, file.UID, file.GID, file.LinkTarget.String()).Scan(&idStr)
|
||||||
} else {
|
} else {
|
||||||
err = r.db.QueryRowWithLog(ctx, query, file.ID.String(), file.Path.String(), file.SourcePath.String(), file.MTime.Unix(), file.CTime.Unix(), file.Size, file.Mode, file.UID, file.GID, file.LinkTarget.String()).Scan(&idStr)
|
err = r.db.QueryRowWithLog(ctx, query, file.ID.String(), file.Path.String(), file.SourcePath.String(), file.MTime.Unix(), file.Size, file.Mode, file.UID, file.GID, file.LinkTarget.String()).Scan(&idStr)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -63,7 +62,7 @@ func (r *FileRepository) Create(ctx context.Context, tx *sql.Tx, file *File) err
|
|||||||
|
|
||||||
func (r *FileRepository) GetByPath(ctx context.Context, path string) (*File, error) {
|
func (r *FileRepository) GetByPath(ctx context.Context, path string) (*File, error) {
|
||||||
query := `
|
query := `
|
||||||
SELECT id, path, source_path, mtime, ctime, size, mode, uid, gid, link_target
|
SELECT id, path, source_path, mtime, size, mode, uid, gid, link_target
|
||||||
FROM files
|
FROM files
|
||||||
WHERE path = ?
|
WHERE path = ?
|
||||||
`
|
`
|
||||||
@@ -82,7 +81,7 @@ func (r *FileRepository) GetByPath(ctx context.Context, path string) (*File, err
|
|||||||
// GetByID retrieves a file by its UUID
|
// GetByID retrieves a file by its UUID
|
||||||
func (r *FileRepository) GetByID(ctx context.Context, id types.FileID) (*File, error) {
|
func (r *FileRepository) GetByID(ctx context.Context, id types.FileID) (*File, error) {
|
||||||
query := `
|
query := `
|
||||||
SELECT id, path, source_path, mtime, ctime, size, mode, uid, gid, link_target
|
SELECT id, path, source_path, mtime, size, mode, uid, gid, link_target
|
||||||
FROM files
|
FROM files
|
||||||
WHERE id = ?
|
WHERE id = ?
|
||||||
`
|
`
|
||||||
@@ -100,7 +99,7 @@ func (r *FileRepository) GetByID(ctx context.Context, id types.FileID) (*File, e
|
|||||||
|
|
||||||
func (r *FileRepository) GetByPathTx(ctx context.Context, tx *sql.Tx, path string) (*File, error) {
|
func (r *FileRepository) GetByPathTx(ctx context.Context, tx *sql.Tx, path string) (*File, error) {
|
||||||
query := `
|
query := `
|
||||||
SELECT id, path, source_path, mtime, ctime, size, mode, uid, gid, link_target
|
SELECT id, path, source_path, mtime, size, mode, uid, gid, link_target
|
||||||
FROM files
|
FROM files
|
||||||
WHERE path = ?
|
WHERE path = ?
|
||||||
`
|
`
|
||||||
@@ -123,7 +122,7 @@ func (r *FileRepository) GetByPathTx(ctx context.Context, tx *sql.Tx, path strin
|
|||||||
func (r *FileRepository) scanFile(row *sql.Row) (*File, error) {
|
func (r *FileRepository) scanFile(row *sql.Row) (*File, error) {
|
||||||
var file File
|
var file File
|
||||||
var idStr, pathStr, sourcePathStr string
|
var idStr, pathStr, sourcePathStr string
|
||||||
var mtimeUnix, ctimeUnix int64
|
var mtimeUnix int64
|
||||||
var linkTarget sql.NullString
|
var linkTarget sql.NullString
|
||||||
|
|
||||||
err := row.Scan(
|
err := row.Scan(
|
||||||
@@ -131,7 +130,6 @@ func (r *FileRepository) scanFile(row *sql.Row) (*File, error) {
|
|||||||
&pathStr,
|
&pathStr,
|
||||||
&sourcePathStr,
|
&sourcePathStr,
|
||||||
&mtimeUnix,
|
&mtimeUnix,
|
||||||
&ctimeUnix,
|
|
||||||
&file.Size,
|
&file.Size,
|
||||||
&file.Mode,
|
&file.Mode,
|
||||||
&file.UID,
|
&file.UID,
|
||||||
@@ -149,7 +147,6 @@ func (r *FileRepository) scanFile(row *sql.Row) (*File, error) {
|
|||||||
file.Path = types.FilePath(pathStr)
|
file.Path = types.FilePath(pathStr)
|
||||||
file.SourcePath = types.SourcePath(sourcePathStr)
|
file.SourcePath = types.SourcePath(sourcePathStr)
|
||||||
file.MTime = time.Unix(mtimeUnix, 0).UTC()
|
file.MTime = time.Unix(mtimeUnix, 0).UTC()
|
||||||
file.CTime = time.Unix(ctimeUnix, 0).UTC()
|
|
||||||
if linkTarget.Valid {
|
if linkTarget.Valid {
|
||||||
file.LinkTarget = types.FilePath(linkTarget.String)
|
file.LinkTarget = types.FilePath(linkTarget.String)
|
||||||
}
|
}
|
||||||
@@ -161,7 +158,7 @@ func (r *FileRepository) scanFile(row *sql.Row) (*File, error) {
|
|||||||
func (r *FileRepository) scanFileRows(rows *sql.Rows) (*File, error) {
|
func (r *FileRepository) scanFileRows(rows *sql.Rows) (*File, error) {
|
||||||
var file File
|
var file File
|
||||||
var idStr, pathStr, sourcePathStr string
|
var idStr, pathStr, sourcePathStr string
|
||||||
var mtimeUnix, ctimeUnix int64
|
var mtimeUnix int64
|
||||||
var linkTarget sql.NullString
|
var linkTarget sql.NullString
|
||||||
|
|
||||||
err := rows.Scan(
|
err := rows.Scan(
|
||||||
@@ -169,7 +166,6 @@ func (r *FileRepository) scanFileRows(rows *sql.Rows) (*File, error) {
|
|||||||
&pathStr,
|
&pathStr,
|
||||||
&sourcePathStr,
|
&sourcePathStr,
|
||||||
&mtimeUnix,
|
&mtimeUnix,
|
||||||
&ctimeUnix,
|
|
||||||
&file.Size,
|
&file.Size,
|
||||||
&file.Mode,
|
&file.Mode,
|
||||||
&file.UID,
|
&file.UID,
|
||||||
@@ -187,7 +183,6 @@ func (r *FileRepository) scanFileRows(rows *sql.Rows) (*File, error) {
|
|||||||
file.Path = types.FilePath(pathStr)
|
file.Path = types.FilePath(pathStr)
|
||||||
file.SourcePath = types.SourcePath(sourcePathStr)
|
file.SourcePath = types.SourcePath(sourcePathStr)
|
||||||
file.MTime = time.Unix(mtimeUnix, 0).UTC()
|
file.MTime = time.Unix(mtimeUnix, 0).UTC()
|
||||||
file.CTime = time.Unix(ctimeUnix, 0).UTC()
|
|
||||||
if linkTarget.Valid {
|
if linkTarget.Valid {
|
||||||
file.LinkTarget = types.FilePath(linkTarget.String)
|
file.LinkTarget = types.FilePath(linkTarget.String)
|
||||||
}
|
}
|
||||||
@@ -197,7 +192,7 @@ func (r *FileRepository) scanFileRows(rows *sql.Rows) (*File, error) {
|
|||||||
|
|
||||||
func (r *FileRepository) ListModifiedSince(ctx context.Context, since time.Time) ([]*File, error) {
|
func (r *FileRepository) ListModifiedSince(ctx context.Context, since time.Time) ([]*File, error) {
|
||||||
query := `
|
query := `
|
||||||
SELECT id, path, source_path, mtime, ctime, size, mode, uid, gid, link_target
|
SELECT id, path, source_path, mtime, size, mode, uid, gid, link_target
|
||||||
FROM files
|
FROM files
|
||||||
WHERE mtime >= ?
|
WHERE mtime >= ?
|
||||||
ORDER BY path
|
ORDER BY path
|
||||||
@@ -258,7 +253,7 @@ func (r *FileRepository) DeleteByID(ctx context.Context, tx *sql.Tx, id types.Fi
|
|||||||
|
|
||||||
func (r *FileRepository) ListByPrefix(ctx context.Context, prefix string) ([]*File, error) {
|
func (r *FileRepository) ListByPrefix(ctx context.Context, prefix string) ([]*File, error) {
|
||||||
query := `
|
query := `
|
||||||
SELECT id, path, source_path, mtime, ctime, size, mode, uid, gid, link_target
|
SELECT id, path, source_path, mtime, size, mode, uid, gid, link_target
|
||||||
FROM files
|
FROM files
|
||||||
WHERE path LIKE ? || '%'
|
WHERE path LIKE ? || '%'
|
||||||
ORDER BY path
|
ORDER BY path
|
||||||
@@ -285,7 +280,7 @@ func (r *FileRepository) ListByPrefix(ctx context.Context, prefix string) ([]*Fi
|
|||||||
// ListAll returns all files in the database
|
// ListAll returns all files in the database
|
||||||
func (r *FileRepository) ListAll(ctx context.Context) ([]*File, error) {
|
func (r *FileRepository) ListAll(ctx context.Context) ([]*File, error) {
|
||||||
query := `
|
query := `
|
||||||
SELECT id, path, source_path, mtime, ctime, size, mode, uid, gid, link_target
|
SELECT id, path, source_path, mtime, size, mode, uid, gid, link_target
|
||||||
FROM files
|
FROM files
|
||||||
ORDER BY path
|
ORDER BY path
|
||||||
`
|
`
|
||||||
@@ -315,7 +310,7 @@ func (r *FileRepository) CreateBatch(ctx context.Context, tx *sql.Tx, files []*F
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Each File has 10 values, so batch at 100 to be safe with SQLite's variable limit
|
// Each File has 9 values, so batch at 100 to be safe with SQLite's variable limit
|
||||||
const batchSize = 100
|
const batchSize = 100
|
||||||
|
|
||||||
for i := 0; i < len(files); i += batchSize {
|
for i := 0; i < len(files); i += batchSize {
|
||||||
@@ -325,19 +320,18 @@ func (r *FileRepository) CreateBatch(ctx context.Context, tx *sql.Tx, files []*F
|
|||||||
}
|
}
|
||||||
batch := files[i:end]
|
batch := files[i:end]
|
||||||
|
|
||||||
query := `INSERT INTO files (id, path, source_path, mtime, ctime, size, mode, uid, gid, link_target) VALUES `
|
query := `INSERT INTO files (id, path, source_path, mtime, size, mode, uid, gid, link_target) VALUES `
|
||||||
args := make([]interface{}, 0, len(batch)*10)
|
args := make([]interface{}, 0, len(batch)*9)
|
||||||
for j, f := range batch {
|
for j, f := range batch {
|
||||||
if j > 0 {
|
if j > 0 {
|
||||||
query += ", "
|
query += ", "
|
||||||
}
|
}
|
||||||
query += "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
|
query += "(?, ?, ?, ?, ?, ?, ?, ?, ?)"
|
||||||
args = append(args, f.ID.String(), f.Path.String(), f.SourcePath.String(), f.MTime.Unix(), f.CTime.Unix(), f.Size, f.Mode, f.UID, f.GID, f.LinkTarget.String())
|
args = append(args, f.ID.String(), f.Path.String(), f.SourcePath.String(), f.MTime.Unix(), f.Size, f.Mode, f.UID, f.GID, f.LinkTarget.String())
|
||||||
}
|
}
|
||||||
query += ` ON CONFLICT(path) DO UPDATE SET
|
query += ` ON CONFLICT(path) DO UPDATE SET
|
||||||
source_path = excluded.source_path,
|
source_path = excluded.source_path,
|
||||||
mtime = excluded.mtime,
|
mtime = excluded.mtime,
|
||||||
ctime = excluded.ctime,
|
|
||||||
size = excluded.size,
|
size = excluded.size,
|
||||||
mode = excluded.mode,
|
mode = excluded.mode,
|
||||||
uid = excluded.uid,
|
uid = excluded.uid,
|
||||||
|
|||||||
@@ -39,7 +39,6 @@ func TestFileRepository(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: "/test/file.txt",
|
Path: "/test/file.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -124,7 +123,6 @@ func TestFileRepositorySymlink(t *testing.T) {
|
|||||||
symlink := &File{
|
symlink := &File{
|
||||||
Path: "/test/link",
|
Path: "/test/link",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 0,
|
Size: 0,
|
||||||
Mode: uint32(0777 | os.ModeSymlink),
|
Mode: uint32(0777 | os.ModeSymlink),
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -161,7 +159,6 @@ func TestFileRepositoryTransaction(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: "/test/tx_file.txt",
|
Path: "/test/tx_file.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ type File struct {
|
|||||||
Path types.FilePath // Absolute path of the file
|
Path types.FilePath // Absolute path of the file
|
||||||
SourcePath types.SourcePath // The source directory this file came from (for restore path stripping)
|
SourcePath types.SourcePath // The source directory this file came from (for restore path stripping)
|
||||||
MTime time.Time
|
MTime time.Time
|
||||||
CTime time.Time
|
|
||||||
Size int64
|
Size int64
|
||||||
Mode uint32
|
Mode uint32
|
||||||
UID uint32
|
UID uint32
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ func TestRepositoriesTransaction(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: "/test/tx_file.txt",
|
Path: "/test/tx_file.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -146,7 +145,6 @@ func TestRepositoriesTransactionRollback(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: "/test/rollback_file.txt",
|
Path: "/test/rollback_file.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -202,7 +200,6 @@ func TestRepositoriesReadTransaction(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: "/test/read_file.txt",
|
Path: "/test/read_file.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -226,7 +223,6 @@ func TestRepositoriesReadTransaction(t *testing.T) {
|
|||||||
_ = repos.Files.Create(ctx, tx, &File{
|
_ = repos.Files.Create(ctx, tx, &File{
|
||||||
Path: "/test/should_fail.txt",
|
Path: "/test/should_fail.txt",
|
||||||
MTime: time.Now(),
|
MTime: time.Now(),
|
||||||
CTime: time.Now(),
|
|
||||||
Size: 0,
|
Size: 0,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ func TestFileRepositoryUUIDGeneration(t *testing.T) {
|
|||||||
{
|
{
|
||||||
Path: "/file1.txt",
|
Path: "/file1.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -32,7 +31,6 @@ func TestFileRepositoryUUIDGeneration(t *testing.T) {
|
|||||||
{
|
{
|
||||||
Path: "/file2.txt",
|
Path: "/file2.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 2048,
|
Size: 2048,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -72,7 +70,6 @@ func TestFileRepositoryGetByID(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: "/test.txt",
|
Path: "/test.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -120,7 +117,6 @@ func TestOrphanedFileCleanup(t *testing.T) {
|
|||||||
file1 := &File{
|
file1 := &File{
|
||||||
Path: "/orphaned.txt",
|
Path: "/orphaned.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -129,7 +125,6 @@ func TestOrphanedFileCleanup(t *testing.T) {
|
|||||||
file2 := &File{
|
file2 := &File{
|
||||||
Path: "/referenced.txt",
|
Path: "/referenced.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 2048,
|
Size: 2048,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -218,7 +213,6 @@ func TestOrphanedChunkCleanup(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: "/test.txt",
|
Path: "/test.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -348,7 +342,6 @@ func TestFileChunkRepositoryWithUUIDs(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: "/test.txt",
|
Path: "/test.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 3072,
|
Size: 3072,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -419,7 +412,6 @@ func TestChunkFileRepositoryWithUUIDs(t *testing.T) {
|
|||||||
file1 := &File{
|
file1 := &File{
|
||||||
Path: "/file1.txt",
|
Path: "/file1.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -428,7 +420,6 @@ func TestChunkFileRepositoryWithUUIDs(t *testing.T) {
|
|||||||
file2 := &File{
|
file2 := &File{
|
||||||
Path: "/file2.txt",
|
Path: "/file2.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -586,7 +577,6 @@ func TestComplexOrphanedDataScenario(t *testing.T) {
|
|||||||
files[i] = &File{
|
files[i] = &File{
|
||||||
Path: types.FilePath(fmt.Sprintf("/file%d.txt", i)),
|
Path: types.FilePath(fmt.Sprintf("/file%d.txt", i)),
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -678,7 +668,6 @@ func TestCascadeDelete(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: "/cascade-test.txt",
|
Path: "/cascade-test.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -750,7 +739,6 @@ func TestTransactionIsolation(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: "/tx-test.txt",
|
Path: "/tx-test.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -812,7 +800,6 @@ func TestConcurrentOrphanedCleanup(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: types.FilePath(fmt.Sprintf("/concurrent-%d.txt", i)),
|
Path: types.FilePath(fmt.Sprintf("/concurrent-%d.txt", i)),
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ func TestOrphanedFileCleanupDebug(t *testing.T) {
|
|||||||
file1 := &File{
|
file1 := &File{
|
||||||
Path: "/orphaned.txt",
|
Path: "/orphaned.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -27,7 +26,6 @@ func TestOrphanedFileCleanupDebug(t *testing.T) {
|
|||||||
file2 := &File{
|
file2 := &File{
|
||||||
Path: "/referenced.txt",
|
Path: "/referenced.txt",
|
||||||
MTime: time.Now().Truncate(time.Second),
|
MTime: time.Now().Truncate(time.Second),
|
||||||
CTime: time.Now().Truncate(time.Second),
|
|
||||||
Size: 2048,
|
Size: 2048,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ func TestFileRepositoryEdgeCases(t *testing.T) {
|
|||||||
file: &File{
|
file: &File{
|
||||||
Path: "",
|
Path: "",
|
||||||
MTime: time.Now(),
|
MTime: time.Now(),
|
||||||
CTime: time.Now(),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -42,7 +41,6 @@ func TestFileRepositoryEdgeCases(t *testing.T) {
|
|||||||
file: &File{
|
file: &File{
|
||||||
Path: types.FilePath("/" + strings.Repeat("a", 4096)),
|
Path: types.FilePath("/" + strings.Repeat("a", 4096)),
|
||||||
MTime: time.Now(),
|
MTime: time.Now(),
|
||||||
CTime: time.Now(),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -55,7 +53,6 @@ func TestFileRepositoryEdgeCases(t *testing.T) {
|
|||||||
file: &File{
|
file: &File{
|
||||||
Path: "/test/file with spaces and 特殊文字.txt",
|
Path: "/test/file with spaces and 特殊文字.txt",
|
||||||
MTime: time.Now(),
|
MTime: time.Now(),
|
||||||
CTime: time.Now(),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -68,7 +65,6 @@ func TestFileRepositoryEdgeCases(t *testing.T) {
|
|||||||
file: &File{
|
file: &File{
|
||||||
Path: "/empty.txt",
|
Path: "/empty.txt",
|
||||||
MTime: time.Now(),
|
MTime: time.Now(),
|
||||||
CTime: time.Now(),
|
|
||||||
Size: 0,
|
Size: 0,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -81,7 +77,6 @@ func TestFileRepositoryEdgeCases(t *testing.T) {
|
|||||||
file: &File{
|
file: &File{
|
||||||
Path: "/link",
|
Path: "/link",
|
||||||
MTime: time.Now(),
|
MTime: time.Now(),
|
||||||
CTime: time.Now(),
|
|
||||||
Size: 0,
|
Size: 0,
|
||||||
Mode: 0777 | 0120000, // symlink mode
|
Mode: 0777 | 0120000, // symlink mode
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -123,7 +118,6 @@ func TestDuplicateHandling(t *testing.T) {
|
|||||||
file1 := &File{
|
file1 := &File{
|
||||||
Path: "/duplicate.txt",
|
Path: "/duplicate.txt",
|
||||||
MTime: time.Now(),
|
MTime: time.Now(),
|
||||||
CTime: time.Now(),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -132,7 +126,6 @@ func TestDuplicateHandling(t *testing.T) {
|
|||||||
file2 := &File{
|
file2 := &File{
|
||||||
Path: "/duplicate.txt", // Same path
|
Path: "/duplicate.txt", // Same path
|
||||||
MTime: time.Now().Add(time.Hour),
|
MTime: time.Now().Add(time.Hour),
|
||||||
CTime: time.Now().Add(time.Hour),
|
|
||||||
Size: 2048,
|
Size: 2048,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -192,7 +185,6 @@ func TestDuplicateHandling(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: "/test-dup-fc.txt",
|
Path: "/test-dup-fc.txt",
|
||||||
MTime: time.Now(),
|
MTime: time.Now(),
|
||||||
CTime: time.Now(),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -244,7 +236,6 @@ func TestNullHandling(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: "/regular.txt",
|
Path: "/regular.txt",
|
||||||
MTime: time.Now(),
|
MTime: time.Now(),
|
||||||
CTime: time.Now(),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -349,7 +340,6 @@ func TestLargeDatasets(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: types.FilePath(fmt.Sprintf("/large/file%05d.txt", i)),
|
Path: types.FilePath(fmt.Sprintf("/large/file%05d.txt", i)),
|
||||||
MTime: time.Now(),
|
MTime: time.Now(),
|
||||||
CTime: time.Now(),
|
|
||||||
Size: int64(i * 1024),
|
Size: int64(i * 1024),
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: uint32(1000 + (i % 10)),
|
UID: uint32(1000 + (i % 10)),
|
||||||
@@ -474,7 +464,6 @@ func TestQueryInjection(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: types.FilePath(injection),
|
Path: types.FilePath(injection),
|
||||||
MTime: time.Now(),
|
MTime: time.Now(),
|
||||||
CTime: time.Now(),
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
@@ -513,7 +502,6 @@ func TestTimezoneHandling(t *testing.T) {
|
|||||||
file := &File{
|
file := &File{
|
||||||
Path: "/timezone-test.txt",
|
Path: "/timezone-test.txt",
|
||||||
MTime: nyTime,
|
MTime: nyTime,
|
||||||
CTime: nyTime,
|
|
||||||
Size: 1024,
|
Size: 1024,
|
||||||
Mode: 0644,
|
Mode: 0644,
|
||||||
UID: 1000,
|
UID: 1000,
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ CREATE TABLE IF NOT EXISTS files (
|
|||||||
path TEXT NOT NULL UNIQUE,
|
path TEXT NOT NULL UNIQUE,
|
||||||
source_path TEXT NOT NULL DEFAULT '', -- The source directory this file came from (for restore path stripping)
|
source_path TEXT NOT NULL DEFAULT '', -- The source directory this file came from (for restore path stripping)
|
||||||
mtime INTEGER NOT NULL,
|
mtime INTEGER NOT NULL,
|
||||||
ctime INTEGER NOT NULL,
|
|
||||||
size INTEGER NOT NULL,
|
size INTEGER NOT NULL,
|
||||||
mode INTEGER NOT NULL,
|
mode INTEGER NOT NULL,
|
||||||
uid INTEGER NOT NULL,
|
uid INTEGER NOT NULL,
|
||||||
|
|||||||
@@ -345,7 +345,6 @@ func (b *BackupEngine) Backup(ctx context.Context, fsys fs.FS, root string) (str
|
|||||||
Size: info.Size(),
|
Size: info.Size(),
|
||||||
Mode: uint32(info.Mode()),
|
Mode: uint32(info.Mode()),
|
||||||
MTime: info.ModTime(),
|
MTime: info.ModTime(),
|
||||||
CTime: info.ModTime(), // Use mtime as ctime for test
|
|
||||||
UID: 1000, // Default UID for test
|
UID: 1000, // Default UID for test
|
||||||
GID: 1000, // Default GID for test
|
GID: 1000, // Default GID for test
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -785,7 +785,6 @@ func (s *Scanner) checkFileInMemory(path string, info os.FileInfo, knownFiles ma
|
|||||||
Path: types.FilePath(path),
|
Path: types.FilePath(path),
|
||||||
SourcePath: types.SourcePath(s.currentSourcePath), // Store source directory for restore path stripping
|
SourcePath: types.SourcePath(s.currentSourcePath), // Store source directory for restore path stripping
|
||||||
MTime: info.ModTime(),
|
MTime: info.ModTime(),
|
||||||
CTime: info.ModTime(), // afero doesn't provide ctime
|
|
||||||
Size: info.Size(),
|
Size: info.Size(),
|
||||||
Mode: uint32(info.Mode()),
|
Mode: uint32(info.Mode()),
|
||||||
UID: uid,
|
UID: uid,
|
||||||
|
|||||||
@@ -988,7 +988,6 @@ func (v *Vaultik) listAllRemoteSnapshotIDs() ([]string, error) {
|
|||||||
log.Info("Listing all snapshots")
|
log.Info("Listing all snapshots")
|
||||||
objectCh := v.Storage.ListStream(v.ctx, "metadata/")
|
objectCh := v.Storage.ListStream(v.ctx, "metadata/")
|
||||||
|
|
||||||
seen := make(map[string]bool)
|
|
||||||
var snapshotIDs []string
|
var snapshotIDs []string
|
||||||
for object := range objectCh {
|
for object := range objectCh {
|
||||||
if object.Err != nil {
|
if object.Err != nil {
|
||||||
@@ -1003,8 +1002,14 @@ func (v *Vaultik) listAllRemoteSnapshotIDs() ([]string, error) {
|
|||||||
}
|
}
|
||||||
if strings.HasSuffix(object.Key, "/") || strings.Contains(object.Key, "/manifest.json.zst") {
|
if strings.HasSuffix(object.Key, "/") || strings.Contains(object.Key, "/manifest.json.zst") {
|
||||||
sid := parts[1]
|
sid := parts[1]
|
||||||
if !seen[sid] {
|
found := false
|
||||||
seen[sid] = true
|
for _, id := range snapshotIDs {
|
||||||
|
if id == sid {
|
||||||
|
found = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
snapshotIDs = append(snapshotIDs, sid)
|
snapshotIDs = append(snapshotIDs, sid)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user