KurlesHS/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

sftp: use uint32 for mtime

Browse source 
The SFTP protocol (and the golang sftp package) internally uses uint32 unix
time for expressing mtime. Hence it is a waste of memory to store it as 24-byte
time.Time data structure in long-lived data structures. So despite that the
golang sftp package uses time.Time as external interface, we can re-encode the
value back to the original format and save memory.

Co-authored-by: Tomasz Melcer <tomasz@melcer.pl>
This commit is contained in:
Tomasz Melcer 2024-07-09 11:23:11 +02:00 committed by GitHub
parent cdcf0e5cb8
commit 27267547b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
backend/sftp/sftp.go
View file

@ -561,7 +561,7 @@ type Object struct {
fs *Fs fs *Fs
remote string remote string
size int64 // size of the object size int64 // size of the object
modTime time.Time // modification time of the object modTime uint32 // modification time of the object as unix time
mode os.FileMode // mode bits from the file mode os.FileMode // mode bits from the file
md5sum *string // Cached MD5 checksum md5sum *string // Cached MD5 checksum
sha1sum *string // Cached SHA1 checksum sha1sum *string // Cached SHA1 checksum
@ -1957,7 +1957,7 @@ func (o *Object) Size() int64 {
// ModTime returns the modification time of the remote sftp file // ModTime returns the modification time of the remote sftp file
func (o *Object) ModTime(ctx context.Context) time.Time { func (o *Object) ModTime(ctx context.Context) time.Time {
return o.modTime return time.Unix(int64(o.modTime), 0)
} }
// path returns the native SFTP path of the object // path returns the native SFTP path of the object
@ -1972,7 +1972,7 @@ func (o *Object) shellPath() string {
// setMetadata updates the info in the object from the stat result passed in // setMetadata updates the info in the object from the stat result passed in
func (o *Object) setMetadata(info os.FileInfo) { func (o *Object) setMetadata(info os.FileInfo) {
o.modTime = info.ModTime() o.modTime = info.Sys().(*sftp.FileStat).Mtime
o.size = info.Size() o.size = info.Size()
o.mode = info.Mode() o.mode = info.Mode()
} }
@ -2195,7 +2195,7 @@ func (o *Object) Update(ctx context.Context, in io.Reader, src fs.ObjectInfo, op
// In the specific case of o.fs.opt.SetModTime == false // In the specific case of o.fs.opt.SetModTime == false
// if the object wasn't found then don't return an error // if the object wasn't found then don't return an error
fs.Debugf(o, "Not found after upload with set_modtime=false so returning best guess") fs.Debugf(o, "Not found after upload with set_modtime=false so returning best guess")
o.modTime = src.ModTime(ctx) o.modTime = uint32(src.ModTime(ctx).Unix())
o.size = src.Size() o.size = src.Size()
o.mode = os.FileMode(0666) // regular file o.mode = os.FileMode(0666) // regular file
} else if err != nil { } else if err != nil {