From 27c0db4100ebbcb9f270ee92123326d6aa29095e Mon Sep 17 00:00:00 2001 From: ZhaoShuai <202122280606@std.uestc.edu.cn> Date: Sun, 2 Jul 2023 20:35:57 +0800 Subject: [PATCH] =?UTF-8?q?=C3=A2=C2=80=C3=A2=C2=80fix=20test=20function?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/data_file_test.go | 17 ++++++++++------- fio/io_manager.go | 2 ++ fio/mmap_io_test.go | 16 ++++++++-------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/data/data_file_test.go b/data/data_file_test.go index 98b5a821..545ae58c 100644 --- a/data/data_file_test.go +++ b/data/data_file_test.go @@ -1,27 +1,30 @@ package data import ( + "github.com/ByteStorage/FlyDB/fio" "github.com/stretchr/testify/assert" "os" "testing" ) +const DefaultFileSize = 256 * 1024 * 1024 + func TestOpenDataFile(t *testing.T) { - dataFile1, err := OpenDataFile(os.TempDir(), 0) + dataFile1, err := OpenDataFile(os.TempDir(), 0, DefaultFileSize, fio.FileIOType) assert.Nil(t, err) assert.NotNil(t, dataFile1) - dataFile2, err := OpenDataFile(os.TempDir(), 1) + dataFile2, err := OpenDataFile(os.TempDir(), 1, DefaultFileSize, fio.FileIOType) assert.Nil(t, err) assert.NotNil(t, dataFile2) - dataFile3, err := OpenDataFile(os.TempDir(), 1) + dataFile3, err := OpenDataFile(os.TempDir(), 1, DefaultFileSize, fio.FileIOType) assert.Nil(t, err) assert.NotNil(t, dataFile3) } func TestDataFile_Write(t *testing.T) { - dataFile, err := OpenDataFile(os.TempDir(), 12312) + dataFile, err := OpenDataFile(os.TempDir(), 12312, DefaultFileSize, fio.FileIOType) assert.Nil(t, err) assert.NotNil(t, dataFile) @@ -36,7 +39,7 @@ func TestDataFile_Write(t *testing.T) { } func TestDataFile_Close(t *testing.T) { - dataFile, err := OpenDataFile(os.TempDir(), 1111111) + dataFile, err := OpenDataFile(os.TempDir(), 1111111, DefaultFileSize, fio.FileIOType) assert.Nil(t, err) assert.NotNil(t, dataFile) @@ -45,7 +48,7 @@ func TestDataFile_Close(t *testing.T) { } func TestDataFile_Sync(t *testing.T) { - dataFile, err := OpenDataFile(os.TempDir(), 2222222) + dataFile, err := OpenDataFile(os.TempDir(), 2222222, DefaultFileSize, fio.FileIOType) assert.Nil(t, err) assert.NotNil(t, dataFile) @@ -54,7 +57,7 @@ func TestDataFile_Sync(t *testing.T) { } func TestDataFile_ReadLogRecord(t *testing.T) { - dataFile, err := OpenDataFile(os.TempDir(), 123) + dataFile, err := OpenDataFile(os.TempDir(), 123, DefaultFileSize, fio.FileIOType) assert.Nil(t, err) assert.NotNil(t, dataFile) diff --git a/fio/io_manager.go b/fio/io_manager.go index 144e4bd6..f2898024 100644 --- a/fio/io_manager.go +++ b/fio/io_manager.go @@ -2,6 +2,8 @@ package fio const DataFilePerm = 0644 //0644 表示创建了一个文件,文件所有者可以读写,其他人只能读 +const DefaultFileSize = 256 * 1024 * 1024 + const ( FileIOType = iota + 1 // Standard File IO BufIOType // File IO with buffer diff --git a/fio/mmap_io_test.go b/fio/mmap_io_test.go index d450018b..82dc4bfd 100644 --- a/fio/mmap_io_test.go +++ b/fio/mmap_io_test.go @@ -8,7 +8,7 @@ import ( func TestNewMMapIOManager(t *testing.T) { path := filepath.Join("/tmp", "a.data") - mio, err := NewMMapIOManager(path, 256*1024*1024) + mio, err := NewMMapIOManager(path, DefaultFileSize) defer destoryFile(path) assert.Nil(t, err) @@ -17,7 +17,7 @@ func TestNewMMapIOManager(t *testing.T) { func TestMMapIO_Write(t *testing.T) { path := filepath.Join("/tmp", "a.data") - mio, err := NewMMapIOManager(path, 256*1024*1024) + mio, err := NewMMapIOManager(path, DefaultFileSize) defer destoryFile(path) assert.Nil(t, err) assert.NotNil(t, mio) @@ -36,7 +36,7 @@ func TestMMapIO_Write(t *testing.T) { func TestMMapIO_Read(t *testing.T) { path := filepath.Join("/tmp", "a.data") - mio, err := NewMMapIOManager(path, 256*1024*1024) + mio, err := NewMMapIOManager(path, DefaultFileSize) defer destoryFile(path) assert.Nil(t, err) @@ -60,7 +60,7 @@ func TestMMapIO_Read(t *testing.T) { func TestMMapIO_Sync(t *testing.T) { path := filepath.Join("/tmp", "a.data") - mio, err := NewMMapIOManager(path, 256*1024*1024) + mio, err := NewMMapIOManager(path, DefaultFileSize) defer destoryFile(path) assert.Nil(t, err) @@ -73,8 +73,8 @@ func TestMMapIO_Sync(t *testing.T) { func TestMMapIO_Close(t *testing.T) { path := filepath.Join("/tmp", "a.data") - mio, err := NewMMapIOManager(path, 256*1024*1024) - //defer destoryFile(path) + mio, err := NewMMapIOManager(path, DefaultFileSize) + defer destoryFile(path) assert.Nil(t, err) assert.NotNil(t, mio) @@ -88,7 +88,7 @@ func TestMMapIO_Close(t *testing.T) { func TestMMapIO_Write_Speed(t *testing.T) { path := filepath.Join("/tmp", "a.data") - mio, err := NewMMapIOManager(path, 256*1024*1024) + mio, err := NewMMapIOManager(path, DefaultFileSize) assert.Nil(t, err) assert.NotNil(t, mio) @@ -104,7 +104,7 @@ func TestMMapIO_Write_Speed(t *testing.T) { func TestMMapIO_Read_Speed(t *testing.T) { path := filepath.Join("/tmp", "a.data") - mio, err := NewMMapIOManager(path, 256*1024*1024) + mio, err := NewMMapIOManager(path, DefaultFileSize) defer destoryFile(path) assert.Nil(t, err) assert.NotNil(t, mio)