Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optimize fast summary #3317

Merged
merged 4 commits into from
Mar 12, 2023
+20 −8
Merged

optimize fast summary #3317

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e8019d
fix redis doSyncDirStat
Hexilee Mar 10, 2023
5132e72
do not read the leaf dir
Hexilee Mar 10, 2023
4ff1929
replace strconv.FormatUint(uint64(ino), 10) with ino.String()
Hexilee Mar 10, 2023
f88dba2
ignore ENOENT
Hexilee Mar 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkg/meta/redis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2241,7 +2241,7 @@ func (m *redisMeta) doGetParents(ctx Context, inode Ino) map[Ino]int {
}

func (m *redisMeta) doSyncDirStat(ctx Context, ino Ino) (*dirStat, error) {
field := strconv.FormatUint(uint64(ino), 16)
field := ino.String()
space, inodes, err := m.calcDirStat(ctx, ino)
if err != nil {
return nil, err
Expand All @@ -2261,7 +2261,7 @@ func (m *redisMeta) doUpdateDirStat(ctx Context, batch map[Ino]dirStat) error {
statList := make([]Ino, 0, len(batch))
pipeline := m.rdb.Pipeline()
for ino := range batch {
pipeline.HExists(ctx, spaceKey, strconv.FormatUint(uint64(ino), 10))
pipeline.HExists(ctx, spaceKey, ino.String())
statList = append(statList, ino)
}
rets, err := pipeline.Exec(ctx)
Expand All @@ -2284,7 +2284,7 @@ func (m *redisMeta) doUpdateDirStat(ctx Context, batch map[Ino]dirStat) error {
for _, group := range m.groupBatch(batch, 1000) {
_, err := m.rdb.Pipelined(ctx, func(pipe redis.Pipeliner) error {
for _, ino := range group {
field := strconv.FormatUint(uint64(ino), 10)
field := ino.String()
if nonexist[ino] {
continue
}
Expand All @@ -2308,7 +2308,7 @@ func (m *redisMeta) doUpdateDirStat(ctx Context, batch map[Ino]dirStat) error {
func (m *redisMeta) doGetDirStat(ctx Context, ino Ino, trySync bool) (*dirStat, error) {
spaceKey := m.dirUsedSpaceKey()
inodesKey := m.dirUsedInodesKey()
field := strconv.FormatUint(uint64(ino), 10)
field := ino.String()
usedSpace, errSpace := m.rdb.HGet(ctx, spaceKey, field).Int64()
if errSpace != nil && errSpace != redis.Nil {
return nil, errSpace
Expand Down
23 changes: 16 additions & 7 deletions pkg/meta/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,8 @@ func FastGetSummary(r Meta, ctx Context, inode Ino, summary *Summary, recursive
return st
}
if attr.Typ == TypeDirectory {
return fastGetSummary(r, ctx, inode, summary, recursive)
summary.Dirs++
return fastGetSummary(r, ctx, inode, &attr, summary, recursive)
} else {
summary.Files++
summary.Length += attr.Length
Expand All @@ -385,14 +386,23 @@ func FastGetSummary(r Meta, ctx Context, inode Ino, summary *Summary, recursive
return 0
}

func fastGetSummary(r Meta, ctx Context, inode Ino, summary *Summary, recursive bool) syscall.Errno {
space, _, err := r.GetDirStat(ctx, inode)
func fastGetSummary(r Meta, ctx Context, inode Ino, attr *Attr, summary *Summary, recursive bool) syscall.Errno {
davies marked this conversation as resolved.
Show resolved Hide resolved
space, inodes, err := r.GetDirStat(ctx, inode)
if err != nil {
return errno(err)
}
summary.Size += space
summary.Length += space
summary.Dirs++

if !attr.Full {
if st := r.GetAttr(ctx, inode, attr); st != 0 {
davies marked this conversation as resolved.
Show resolved Hide resolved
return st
}
}
if attr.Nlink == 2 {
summary.Files += inodes
return 0
}

var entries []*Entry
if st := r.Readdir(ctx, inode, 0, &entries); st != 0 {
Expand All @@ -403,12 +413,11 @@ func fastGetSummary(r Meta, ctx Context, inode Ino, summary *Summary, recursive
continue
}
if e.Attr.Typ == TypeDirectory {
summary.Dirs++
if recursive {
if st := fastGetSummary(r, ctx, e.Inode, summary, recursive); st != 0 {
if st := fastGetSummary(r, ctx, e.Inode, e.Attr, summary, recursive); st != 0 {
return st
}
} else {
summary.Dirs++
}
} else {
summary.Files++
Expand Down