fix ut

Author: Xuyuchao-juice

pkg/meta/base.go

@@ -2904,7 +2904,11 @@ func (m *baseMeta) cloneEntry(ctx Context, srcIno Ino, parent Ino, name string,
 	if eno = m.Access(ctx, srcIno, MODE_MASK_R|MODE_MASK_X, &attr); eno != 0 {
 		return eno
 	}
+	// Use DirHandler for batch processing to avoid loading all entries at once
 	handler, eno := m.NewDirHandler(ctx, srcIno, false, nil)
+	if eno == syscall.ENOENT {
+		eno = 0 // empty dir
+	}
 	if eno != 0 {
 		return eno
 	}
@@ -2925,70 +2929,107 @@ func (m *baseMeta) cloneEntry(ctx Context, srcIno Ino, parent Ino, name string,
 		return eno
 	}
 
+	// Process entries in batches: directories first, then files
+	offset := 0
 	var dirEntries []*Entry
 	var fileEntries []*Entry
-	offset := 0
+LOOP:
 	for {
-		ets, err := handler.List(ctx, offset)
-		if err != 0 {
-			if err == syscall.ENOENT {
-				err = 0 // empty dir
-			}
-			if err != 0 {
-				return err
+		// Fetch next batch
+		batchEntries, batchEno := handler.List(ctx, offset)
+		if batchEno != 0 {
+			if batchEno == syscall.ENOENT {
+				break // end of directory
 			}
-			break
+			eno = batchEno
+			break LOOP
 		}
-		if len(ets) == 0 {
-			break
+		if len(batchEntries) == 0 {
+			break // no more entries
 		}
-		for _, e := range ets {
-			if len(e.Name) == 1 && e.Name[0] == '.' {
-				continue
-			}
-			if len(e.Name) == 2 && e.Name[0] == '.' && e.Name[1] == '.' {
+
+		// Separate directories and files in this batch
+		actualCount := 0
+		for _, e := range batchEntries {
+			// Skip "." and ".."
+			if len(e.Name) > 0 && (e.Name[0] == '.' && (len(e.Name) == 1 || (len(e.Name) == 2 && e.Name[1] == '.'))) {
 				continue
 			}
+			actualCount++
 			if e.Attr.Typ == TypeDirectory {
 				dirEntries = append(dirEntries, e)
 			} else {
 				fileEntries = append(fileEntries, e)
 			}
 		}
-		offset += len(ets)
-		if ctx.Canceled() {
-			return syscall.EINTR
-		}
-	}
-
-	entries := make([]*Entry, 0, len(dirEntries)+len(fileEntries))
-	entries = append(entries, dirEntries...)
-	entries = append(entries, fileEntries...)
 
-LOOP:
-	for i, entry := range entries {
-		select {
-		case e := <-errCh:
-			eno = e
-			ctx.Cancel()
-			break LOOP
-		case concurrent <- struct{}{}:
-			wg.Add(1)
-			go func(e *Entry) {
-				defer wg.Done()
-				eno := cloneChild(e)
-				if eno != 0 {
-					errCh <- eno
+		// Process directories first
+		for _, entry := range dirEntries {
+			select {
+			case e := <-errCh:
+				eno = e
+				ctx.Cancel()
+				break LOOP
+			case concurrent <- struct{}{}:
+				wg.Add(1)
+				go func(e *Entry) {
+					defer wg.Done()
+					eno := cloneChild(e)
+					if eno != 0 {
+						errCh <- eno
+					}
+					<-concurrent
+				}(entry)
+			default:
+				if e := cloneChild(entry); e != 0 {
+					eno = e
+					break LOOP
 				}
-				<-concurrent
-			}(entry)
-		default:
-			if e := cloneChild(entry); e != 0 {
+			}
+			if ctx.Canceled() {
+				eno = syscall.EINTR
+				break LOOP
+			}
+		}
+		dirEntries = dirEntries[:0] // clear for next batch
+
+		// Process files
+		for _, entry := range fileEntries {
+			select {
+			case e := <-errCh:
 				eno = e
+				ctx.Cancel()
+				break LOOP
+			case concurrent <- struct{}{}:
+				wg.Add(1)
+				go func(e *Entry) {
+					defer wg.Done()
+					eno := cloneChild(e)
+					if eno != 0 {
+						errCh <- eno
+					}
+					<-concurrent
+				}(entry)
+			default:
+				if e := cloneChild(entry); e != 0 {
+					eno = e
+					break LOOP
+				}
+			}
+			if ctx.Canceled() {
+				eno = syscall.EINTR
 				break LOOP
 			}
 		}
-		entries[i] = nil // release memory
+		fileEntries = fileEntries[:0] // clear for next batch
+
+		// Update offset: List returns entries including initEntries (".", "..")
+		// so we need to advance by the total number of entries returned
+		offset += len(batchEntries)
+		// If we got no actual entries in this batch, we've reached the end
+		if actualCount == 0 {
+			break
+		}
 		if ctx.Canceled() {
 			eno = syscall.EINTR
 			break
@@ -3278,7 +3319,7 @@ func (m *baseMeta) NewDirHandler(ctx Context, inode Ino, plus bool, initEntries
 	initEntries = append(initEntries, parent)
 
 	return m.en.newDirHandler(inode, plus, initEntries), 0
-}
+}	
 
 type dirBatch struct {
 	isEnd   bool

pkg/meta/sql_test.go

@@ -45,7 +45,7 @@ func TestPostgreSQLClient(t *testing.T) { //skip mutate
 	if os.Getenv("SKIP_NON_CORE") == "true" {
 		t.Skipf("skip non-core test")
 	}
-	m, err := newSQLMeta("postgres", "localhost:5432/test?sslmode=disable", testConfig())
+	m, err := newSQLMeta("postgres", "localhost:5432/test?sslmode=disable", testConfig())	
 	if err != nil || m.Name() != "postgres" {
 		t.Fatalf("create meta: %s", err)
 	}