refactor/meta: dir filtering and pointer parameter (#6579)

Author: Xuyuchao-juice

pkg/meta/base.go

@@ -115,7 +115,7 @@ type engine interface {
 	doLink(ctx Context, inode, parent Ino, name string, attr *Attr) syscall.Errno
 	doUnlink(ctx Context, parent Ino, name string, attr *Attr, skipCheckTrash ...bool) syscall.Errno
 	doRmdir(ctx Context, parent Ino, name string, inode *Ino, attr *Attr, skipCheckTrash ...bool) syscall.Errno
-	doBatchUnlink(ctx Context, parent Ino, entries []Entry, length *int64, space *int64, inodes *int64, userGroupQuotas *[]userGroupQuotaDelta, skipCheckTrash ...bool) (errno syscall.Errno)
+	doBatchUnlink(ctx Context, parent Ino, entries []*Entry, length *int64, space *int64, inodes *int64, userGroupQuotas *[]userGroupQuotaDelta, skipCheckTrash ...bool) (errno syscall.Errno)
 	doReadlink(ctx Context, inode Ino, noatime bool) (int64, []byte, error)
 	doReaddir(ctx Context, inode Ino, plus uint8, entries *[]*Entry, limit int) syscall.Errno
 	doRename(ctx Context, parentSrc Ino, nameSrc string, parentDst Ino, nameDst string, flags uint32, inode, tinode *Ino, attr, tattr *Attr) syscall.Errno
@@ -1652,7 +1652,10 @@ func (m *baseMeta) Rmdir(ctx Context, parent Ino, name string, skipCheckTrash ..
 	return st
 }
 
-func (m *baseMeta) BatchUnlink(ctx Context, parent Ino, entries []Entry, count *uint64, skipCheckTrash bool) syscall.Errno {
+func (m *baseMeta) BatchUnlink(ctx Context, parent Ino, entries []*Entry, count *uint64, skipCheckTrash bool) syscall.Errno {
+	if len(entries) == 0 {
+		return 0
+	}
 	var length int64
 	var space int64
 	var inodes int64

pkg/meta/base_test.go

@@ -4735,13 +4735,13 @@ func testBatchUnlinkWithUserGroupQuota(t *testing.T, m Meta, ctx Context, parent
 		t.Fatalf("User group quota not found before batch unlink")
 	}
 
-	var entries []Entry
+	var entries []*Entry
 	for i, fileName := range fileNames {
 		var attr Attr
 		if st := m.GetAttr(ctx, fileInodes[i], &attr); st != 0 {
 			t.Fatalf("GetAttr for %s: %s", fileName, st)
 		}
-		entries = append(entries, Entry{
+		entries = append(entries, &Entry{
 			Inode: fileInodes[i],
 			Name:  []byte(fileName),
 			Attr:  &attr,
@@ -4835,7 +4835,7 @@ func testBatchUnlinkWithUserGroupQuota(t *testing.T, m Meta, ctx Context, parent
 	if st := m.GetAttr(ctx, hardlinkInode, &hardlinkEntry); st != 0 {
 		t.Fatalf("GetAttr for hardlink: %s", st)
 	}
-	hardlinkEntries := []Entry{
+	hardlinkEntries := []*Entry{
 		{
 			Inode: hardlinkInode,
 			Name:  []byte(hardlinkFileName2),

pkg/meta/redis.go

@@ -1721,7 +1721,7 @@ func (m *redisMeta) doUnlink(ctx Context, parent Ino, name string, attr *Attr, s
 	return errno(err)
 }
 
-func (m *redisMeta) doBatchUnlink(ctx Context, parent Ino, entries []Entry, length *int64, space *int64, inodes *int64, userGroupQuotas *[]userGroupQuotaDelta, skipCheckTrash ...bool) syscall.Errno {
+func (m *redisMeta) doBatchUnlink(ctx Context, parent Ino, entries []*Entry, length *int64, space *int64, inodes *int64, userGroupQuotas *[]userGroupQuotaDelta, skipCheckTrash ...bool) syscall.Errno {
 	if len(entries) == 0 {
 		return 0
 	}

pkg/meta/sql.go

@@ -2614,7 +2614,7 @@ func recordUserGroupDeletionStats(
 	}
 }
 
-func (m *dbMeta) doBatchUnlink(ctx Context, parent Ino, entries []Entry, length *int64, space *int64, inodes *int64, userGroupQuotas *[]userGroupQuotaDelta, skipCheckTrash ...bool) syscall.Errno {
+func (m *dbMeta) doBatchUnlink(ctx Context, parent Ino, entries []*Entry, length *int64, space *int64, inodes *int64, userGroupQuotas *[]userGroupQuotaDelta, skipCheckTrash ...bool) syscall.Errno {
 	if len(entries) == 0 {
 		return 0
 	}
@@ -2672,6 +2672,9 @@ func (m *dbMeta) doBatchUnlink(ctx Context, parent Ino, entries []Entry, length
 		for _, entry := range entries {
 			e := &edge{Parent: parent, Name: entry.Name, Inode: entry.Inode}
 			if entry.Attr != nil {
+				if entry.Attr.Typ == TypeDirectory {
+					continue
+				}
 				e.Type = entry.Attr.Typ
 			}
 			entryInfos = append(entryInfos, &entryInfo{e: e, trash: trash})
@@ -2715,10 +2718,6 @@ func (m *dbMeta) doBatchUnlink(ctx Context, parent Ino, entries []Entry, length
 		}
 
 		for _, info := range entryInfos {
-			if info.e.Type == TypeDirectory {
-				continue
-			}
-
 			if info.trash > 0 && info.n.Nlink > 1 {
 				info.trashName = m.trashEntry(parent, info.e.Inode, string(info.e.Name))
 				te := edge{
@@ -2771,10 +2770,6 @@ func (m *dbMeta) doBatchUnlink(ctx Context, parent Ino, entries []Entry, length
 
 		// walk each edge to decide whether to move to trash, decrement nlink or delete inode & xattrs
 		for _, info := range entryInfos {
-			if info.n.Type == TypeDirectory {
-				continue
-			}
-
 			edgesDel = append(edgesDel, edge{Parent: parent, Name: info.e.Name})
 			if !visited[info.n.Inode] {
 				if info.n.Nlink > 0 {

pkg/meta/tkv.go

@@ -1427,7 +1427,7 @@ func (m *kvMeta) doUnlink(ctx Context, parent Ino, name string, attr *Attr, skip
 	return errno(err)
 }
 
-func (m *kvMeta) doBatchUnlink(ctx Context, parent Ino, entries []Entry, length *int64, space *int64, inodes *int64, userGroupQuotas *[]userGroupQuotaDelta, skipCheckTrash ...bool) syscall.Errno {
+func (m *kvMeta) doBatchUnlink(ctx Context, parent Ino, entries []*Entry, length *int64, space *int64, inodes *int64, userGroupQuotas *[]userGroupQuotaDelta, skipCheckTrash ...bool) syscall.Errno {
 	return syscall.ENOTSUP
 }
 

pkg/meta/utils.go

@@ -301,7 +301,7 @@ func (m *baseMeta) emptyDir(ctx Context, inode Ino, skipCheckTrash bool, count *
 		}
 		var wg sync.WaitGroup
 		var status syscall.Errno
-		var nonDirEntries []Entry
+		var nonDirEntries []*Entry
 		for i, e := range entries {
 			if e.Attr.Typ == TypeDirectory {
 				select {
@@ -322,7 +322,7 @@ func (m *baseMeta) emptyDir(ctx Context, inode Ino, skipCheckTrash bool, count *
 					}
 				}
 			} else {
-				nonDirEntries = append(nonDirEntries, *e)
+				nonDirEntries = append(nonDirEntries, e)
 			}
 			if ctx.Canceled() {
 				return syscall.EINTR