This is an automated email from the ASF dual-hosted git repository.

hanahmily pushed a commit to branch buffer
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git

commit 4b9ad8168e4ae9feb019c4bff07d45d2756443f7
Merge: e5acde1d 80f22bb8
Author: Gao Hongtao <[email protected]>
AuthorDate: Tue Oct 10 05:45:13 2023 +0000

    Merge remote-tracking branch 'origin/main' into buffer

 banyand/tsdb/buffer_test.go | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --cc banyand/tsdb/buffer_test.go
index cd02eec5,6b46eea3..82df4251
--- a/banyand/tsdb/buffer_test.go
+++ b/banyand/tsdb/buffer_test.go
@@@ -185,26 -181,25 +185,24 @@@ var _ = Describe("Buffer", func() 
                                flushSize,
                                writeConcurrency,
                                numShards,
 -                              func(shardIndex int, skl *skl.Skiplist) error {
 -                                      flushMutex.Lock()
 -                                      defer flushMutex.Unlock()
 -
 -                                      shardWalDir := filepath.Join(path, 
"buffer-"+strconv.Itoa(shardIndex))
 -                                      var shardWalList []os.DirEntry
 -                                      shardWalList, err = 
os.ReadDir(shardWalDir)
 -                                      Expect(err).ToNot(HaveOccurred())
 -                                      for _, shardWalFile := range 
shardWalList {
 -                                              
Expect(shardWalFile.IsDir()).To(BeFalse())
 -                                              
Expect(shardWalFile.Name()).To(HaveSuffix(".wal"))
 -                                              shardWalFileHistory[shardIndex] 
= append(shardWalFileHistory[shardIndex], shardWalFile.Name())
 -                                      }
 -                                      return nil
 -                              },
                                true,
 -                              &path)
 +                              path)
                        Expect(err).ToNot(HaveOccurred())
-                       defer buffer.Close()
 +                      buffer.Register("test", func(shardIndex int, skl 
*skl.Skiplist) error {
 +                              flushMutex.Lock()
 +                              defer flushMutex.Unlock()
  
 +                              shardWalDir := filepath.Join(path, 
"buffer-"+strconv.Itoa(shardIndex))
 +                              var shardWalList []os.DirEntry
 +                              shardWalList, err = os.ReadDir(shardWalDir)
 +                              Expect(err).ToNot(HaveOccurred())
 +                              for _, shardWalFile := range shardWalList {
 +                                      
Expect(shardWalFile.IsDir()).To(BeFalse())
 +                                      
Expect(shardWalFile.Name()).To(HaveSuffix(".wal"))
 +                                      shardWalFileHistory[shardIndex] = 
append(shardWalFileHistory[shardIndex], shardWalFile.Name())
 +                              }
 +                              return nil
 +                      })
- 
                        // Write buffer & wal
                        var wg sync.WaitGroup
                        wg.Add(writeConcurrency)

Reply via email to