hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'column_store'

Browse Source 
Co-authored-by: wangt1xiuyi <13547954130@163.com>
Co-authored-by: yangqise7en <877793735@qq.com>
Co-authored-by: Zach41 <zach_41@163.com>
This commit is contained in:
chaser-ch
2023-10-31 15:39:20 +00:00
committed by ob-robot
parent 4057fbc4ae
commit 566e920620
1375 changed files with 239147 additions and 56014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
unittest/storage/blocksstable/test_tmp_file.cpp
View File

@ -267,13 +267,14 @@ void TestTmpFileStress::write_data(const int64_t macro_block_size)
io_info.size_ = macro_block_size;
io_info.tenant_id_ = 1;
io_info.io_desc_.set_wait_event(2);
io_info.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
char *buf = new char[BUF_COUNT * macro_block_size];
const int64_t timeout_ms = 5000;
prepare_data(buf, macro_block_size);
for (int64_t i = 0; i < BUF_COUNT; ++i) {
io_info.buf_ = buf + i * macro_block_size;
check_data(io_info.buf_, macro_block_size);
ret = ObTmpFileManager::get_instance().write(io_info, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info);
ASSERT_EQ(OB_SUCCESS, ret);
}
}
@ -287,6 +288,7 @@ void TestTmpFileStress::write_plain_data(char *&buf, const int64_t macro_block_s
io_info.fd_ = fd_;
io_info.tenant_id_ = 1;
io_info.io_desc_.set_wait_event(2);
io_info.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
buf = new char[BUF_COUNT * macro_block_size];
const int64_t timeout_ms = 5000;
int64_t sum_size = 0;
@ -294,7 +296,7 @@ void TestTmpFileStress::write_plain_data(char *&buf, const int64_t macro_block_s
for (int64_t i = 0; i < size_array.count(); ++i) {
io_info.buf_ = buf + sum_size;
io_info.size_ = size_array.at(i);
ret = ObTmpFileManager::get_instance().write(io_info, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info);
ASSERT_EQ(OB_SUCCESS, ret);
sum_size += size_array.at(i);
}
@ -305,17 +307,17 @@ void TestTmpFileStress::write_plain_data(char *&buf, const int64_t macro_block_s
void TestTmpFileStress::read_data(const int64_t macro_block_size)
{
int ret = OB_SUCCESS;
const int64_t timeout_ms = 5000;
ObTmpFileIOInfo io_info;
ObTmpFileIOHandle handle;
io_info.fd_ = fd_;
io_info.size_ = macro_block_size;
io_info.tenant_id_ = 1;
io_info.io_desc_.set_wait_event(2);
io_info.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
char *buf = new char[macro_block_size];
for (int64_t i = 0; i < BUF_COUNT; ++i) {
io_info.buf_ = buf;
ret = ObTmpFileManager::get_instance().read(io_info, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().read(io_info, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(macro_block_size, handle.get_data_size());
check_data(handle.get_buffer(), handle.get_data_size());
@ -327,23 +329,23 @@ void TestTmpFileStress::read_data(const int64_t macro_block_size)
void TestTmpFileStress::read_plain_data(const char *read_buf, const int64_t macro_block_size)
{
int ret = OB_SUCCESS;
const int64_t timeout_ms = 5000;
ObTmpFileIOInfo io_info;
ObTmpFileIOHandle handle;
io_info.fd_ = fd_;
io_info.size_ = macro_block_size;
io_info.tenant_id_ = 1;
io_info.io_desc_.set_wait_event(2);
io_info.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
char *buf = new char[BUF_COUNT * macro_block_size];
int64_t offset = 0;
for (int64_t i = 0; i < BUF_COUNT; ++i) {
io_info.buf_ = buf + i * macro_block_size;
offset = i * macro_block_size;
ret = ObTmpFileManager::get_instance().pread(io_info, offset, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, offset, handle);
ASSERT_EQ(OB_SUCCESS, ret);
}
offset += macro_block_size;
ret = ObTmpFileManager::get_instance().pread(io_info, offset, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, offset, handle);
ASSERT_EQ(OB_ITER_END, ret);
check_plain_data(read_buf, buf, BUF_COUNT * macro_block_size);
handle.reset();
@ -607,9 +609,9 @@ TEST_F(TestTmpFile, test_big_file)
io_info.io_desc_.set_wait_event(2);
io_info.buf_ = write_buf;
io_info.size_ = write_size;
const int64_t timeout_ms = 5000;
io_info.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
int64_t write_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().write(io_info, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info);
ASSERT_EQ(OB_SUCCESS, ret);
write_time = ObTimeUtility::current_time() - write_time;
io_info.buf_ = read_buf;
@ -618,13 +620,13 @@ TEST_F(TestTmpFile, test_big_file)
ret = ObTmpFileManager::get_instance().aio_read(io_info, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_TRUE(handle.size_ < handle.expect_read_size_);
ASSERT_EQ(OB_SUCCESS, handle.wait(timeout_ms));
ASSERT_EQ(OB_SUCCESS, handle.wait());
ASSERT_EQ(write_size, handle.get_data_size());
int cmp = memcmp(handle.get_buffer(), write_buf, handle.get_data_size());
ASSERT_EQ(0, cmp);
io_info.size_ = macro_block_size;
ret = ObTmpFileManager::get_instance().pread(io_info, 100, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 100, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(macro_block_size, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf + 100, handle.get_data_size());
@ -632,7 +634,7 @@ TEST_F(TestTmpFile, test_big_file)
io_info.size_ = write_size;
int64_t read_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().pread(io_info, 0, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 0, handle);
read_time = ObTimeUtility::current_time() - read_time;
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(write_size, handle.get_data_size());
@ -640,7 +642,7 @@ TEST_F(TestTmpFile, test_big_file)
ASSERT_EQ(0, cmp);
io_info.size_ = 200;
ret = ObTmpFileManager::get_instance().pread(io_info, 200, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 200, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(200, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf + 200, 200);
@ -742,16 +744,16 @@ TEST_F(TestTmpFile, test_inner_read_offset_and_seek)
io_info.io_desc_.set_wait_event(2);
io_info.buf_ = write_buf;
io_info.size_ = macro_block_size + 256;
const int64_t timeout_ms = 5000;
io_info.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
int64_t write_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().write(io_info, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info);
write_time = ObTimeUtility::current_time() - write_time;
ASSERT_EQ(OB_SUCCESS, ret);
io_info.buf_ = read_buf;
int64_t read_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().read(io_info, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().read(io_info, handle);
read_time = ObTimeUtility::current_time() - read_time;
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(macro_block_size + 256, handle.get_data_size());
@ -760,7 +762,7 @@ TEST_F(TestTmpFile, test_inner_read_offset_and_seek)
io_info.size_ = 200;
ret = ObTmpFileManager::get_instance().read(io_info, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().read(io_info, handle);
ASSERT_EQ(OB_ITER_END, ret);
@ -768,7 +770,7 @@ TEST_F(TestTmpFile, test_inner_read_offset_and_seek)
ASSERT_EQ(OB_SUCCESS, ret);
io_info.size_ = 201;
ret = ObTmpFileManager::get_instance().read(io_info, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().read(io_info, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(201, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf, 201);
@ -779,7 +781,7 @@ TEST_F(TestTmpFile, test_inner_read_offset_and_seek)
ASSERT_EQ(OB_SUCCESS, ret);
io_info.size_ = 199;
ret = ObTmpFileManager::get_instance().read(io_info, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().read(io_info, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(199, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf + 400, 199);
@ -853,11 +855,11 @@ TEST_F(TestTmpFile, test_aio_read_and_write)
io_info.io_desc_.set_wait_event(2);
io_info.buf_ = write_buf;
io_info.size_ = macro_block_size + 256;
const int64_t timeout_ms = 5000;
io_info.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
int64_t write_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().aio_write(io_info, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ret = handle.wait(timeout_ms);
ret = handle.wait();
write_time = ObTimeUtility::current_time() - write_time;
ASSERT_EQ(OB_SUCCESS, ret);
handle.reset();
@ -865,7 +867,7 @@ TEST_F(TestTmpFile, test_aio_read_and_write)
io_info.buf_ = read_buf;
int64_t read_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().read(io_info, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().read(io_info, handle);
read_time = ObTimeUtility::current_time() - read_time;
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(macro_block_size + 256, handle.get_data_size());
@ -880,7 +882,7 @@ TEST_F(TestTmpFile, test_aio_read_and_write)
io_info.size_ = macro_block_size;
ret = ObTmpFileManager::get_instance().aio_read(io_info, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ret = handle.wait(timeout_ms);
ret = handle.wait();
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(macro_block_size, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf + 100, macro_block_size);
@ -891,7 +893,7 @@ TEST_F(TestTmpFile, test_aio_read_and_write)
io_info.size_ = macro_block_size;
ret = ObTmpFileManager::get_instance().aio_pread(io_info, 0, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ret = handle.wait(timeout_ms);
ret = handle.wait();
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(macro_block_size, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf, macro_block_size);
@ -1095,16 +1097,16 @@ TEST_F(TestTmpFile, test_write_less_than_macro_block_size)
io_info.io_desc_.set_wait_event(2);
io_info.buf_ = write_buf;
io_info.size_ = 256;
const int64_t timeout_ms = 5000;
io_info.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
int64_t write_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().write(io_info, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info);
write_time = ObTimeUtility::current_time() - write_time;
ASSERT_EQ(OB_SUCCESS, ret);
io_info.buf_ = read_buf;
int64_t read_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().pread(io_info, 0, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 0, handle);
read_time = ObTimeUtility::current_time() - read_time;
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(256, handle.get_data_size());
@ -1113,14 +1115,14 @@ TEST_F(TestTmpFile, test_write_less_than_macro_block_size)
io_info.size_ = 255;
ret = ObTmpFileManager::get_instance().pread(io_info, 0, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 0, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(255, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf, 255);
ASSERT_EQ(0, cmp);
ret = ObTmpFileManager::get_instance().pread(io_info, 20, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 20, handle);
ASSERT_EQ(OB_ITER_END, ret);
ASSERT_EQ(256 - 20, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf + 20, 256 - 20);
@ -1128,7 +1130,7 @@ TEST_F(TestTmpFile, test_write_less_than_macro_block_size)
io_info.size_ = 20;
ret = ObTmpFileManager::get_instance().pread(io_info, 40, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 40, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(20, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf + 40, handle.get_data_size());
@ -1136,14 +1138,14 @@ TEST_F(TestTmpFile, test_write_less_than_macro_block_size)
io_info.size_ = 100;
ret = ObTmpFileManager::get_instance().pread(io_info, 156, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 156, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(100, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf + 156, handle.get_data_size());
ASSERT_EQ(0, cmp);
ret = ObTmpFileManager::get_instance().pread(io_info, 256, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 256, handle);
ASSERT_EQ(OB_ITER_END, ret);
@ -1182,15 +1184,15 @@ TEST_F(TestTmpFile, test_write_more_than_one_macro_block)
io_info.io_desc_.set_wait_event(2);
io_info.buf_ = write_buf;
io_info.size_ = macro_block_size + 256;
const int64_t timeout_ms = 5000;
io_info.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
int64_t write_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().write(io_info, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info);
write_time = ObTimeUtility::current_time() - write_time;
ASSERT_EQ(OB_SUCCESS, ret);
io_info.buf_ = read_buf;
int64_t read_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().pread(io_info, 0, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 0, handle);
read_time = ObTimeUtility::current_time() - read_time;
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(macro_block_size + 256, handle.get_data_size());
@ -1198,35 +1200,35 @@ TEST_F(TestTmpFile, test_write_more_than_one_macro_block)
ASSERT_EQ(0, cmp);
io_info.size_ = 200;
ret = ObTmpFileManager::get_instance().pread(io_info, 200, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 200, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(200, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf + 200, 200);
ASSERT_EQ(0, cmp);
io_info.size_ = macro_block_size;
ret = ObTmpFileManager::get_instance().pread(io_info, 200, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 200, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(macro_block_size, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf + 200, macro_block_size);
ASSERT_EQ(0, cmp);
io_info.size_ = macro_block_size;
ret = ObTmpFileManager::get_instance().pread(io_info, 400, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 400, handle);
ASSERT_EQ(OB_ITER_END, ret);
ASSERT_EQ(macro_block_size + 256 - 400, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf + 400, macro_block_size + 256 - 400);
ASSERT_EQ(0, cmp);
io_info.size_ = 100;
ret = ObTmpFileManager::get_instance().pread(io_info, macro_block_size, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, macro_block_size, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(100, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf + macro_block_size, handle.get_data_size());
ASSERT_EQ(0, cmp);
io_info.size_ = 100;
ret = ObTmpFileManager::get_instance().pread(io_info, macro_block_size + 10, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, macro_block_size + 10, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(100, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf + macro_block_size + 10, handle.get_data_size());
@ -1234,13 +1236,13 @@ TEST_F(TestTmpFile, test_write_more_than_one_macro_block)
io_info.size_ = 200;
ret = ObTmpFileManager::get_instance().pread(io_info, macro_block_size + 100, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, macro_block_size + 100, handle);
ASSERT_EQ(OB_ITER_END, ret);
ASSERT_EQ(156, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf + macro_block_size + 100, handle.get_data_size());
ASSERT_EQ(0, cmp);
ret = ObTmpFileManager::get_instance().pread(io_info, macro_block_size + 256, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, macro_block_size + 256, handle);
ASSERT_EQ(OB_ITER_END, ret);
@ -1284,6 +1286,8 @@ TEST_F(TestTmpFile, test_single_dir_two_file)
io_info1.io_desc_.set_wait_event(2);
io_info1.buf_ = write_buf;
io_info1.size_ = macro_block_size + 256;
io_info1.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
ret = ObTmpFileManager::get_instance().open(fd_2, dir);
ASSERT_EQ(OB_SUCCESS, ret);
@ -1292,22 +1296,23 @@ TEST_F(TestTmpFile, test_single_dir_two_file)
io_info2.io_desc_.set_wait_event(2);
io_info2.buf_ = write_buf;
io_info2.size_ = macro_block_size + 256;
io_info2.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
const int64_t timeout_ms = 5000;
int64_t write_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().write(io_info1, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info1);
write_time = ObTimeUtility::current_time() - write_time;
ASSERT_EQ(OB_SUCCESS, ret);
write_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().write(io_info2, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info2);
write_time = ObTimeUtility::current_time() - write_time;
ASSERT_EQ(OB_SUCCESS, ret);
io_info1.buf_ = read_buf;
int64_t read_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().pread(io_info1, 0, timeout_ms, handle1);
ret = ObTmpFileManager::get_instance().pread(io_info1, 0, handle1);
read_time = ObTimeUtility::current_time() - read_time;
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(macro_block_size + 256, handle1.get_data_size());
@ -1317,7 +1322,7 @@ TEST_F(TestTmpFile, test_single_dir_two_file)
io_info2.buf_ = read_buf;
read_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().pread(io_info2, 0, timeout_ms, handle2);
ret = ObTmpFileManager::get_instance().pread(io_info2, 0, handle2);
read_time = ObTimeUtility::current_time() - read_time;
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(macro_block_size + 256, handle2.get_data_size());
@ -1510,23 +1515,23 @@ TEST_F(TestTmpFile, test_handle_double_wait)
io_info.io_desc_.set_wait_event(2);
io_info.buf_ = write_buf;
io_info.size_ = 256;
const int64_t timeout_ms = 5000;
io_info.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
int64_t write_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().write(io_info, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info);
write_time = ObTimeUtility::current_time() - write_time;
ASSERT_EQ(OB_SUCCESS, ret);
io_info.buf_ = read_buf;
int64_t read_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().pread(io_info, 0, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 0, handle);
read_time = ObTimeUtility::current_time() - read_time;
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(256, handle.get_data_size());
int cmp = memcmp(handle.get_buffer(), write_buf, 256);
ASSERT_EQ(0, cmp);
ASSERT_EQ(OB_SUCCESS, handle.wait(timeout_ms));
ASSERT_EQ(OB_SUCCESS, handle.wait());
STORAGE_LOG(INFO, "test_handle_double_wait");
STORAGE_LOG(INFO, "io time", K(write_time), K(read_time));
@ -1567,7 +1572,7 @@ TEST_F(TestTmpFile, test_sql_workload)
io_info.io_desc_.set_wait_event(2);
io_info.buf_ = write_buf;
io_info.size_ = write_size;
const int64_t timeout_ms = 5000;
io_info.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
int64_t write_time = ObTimeUtility::current_time();
const int cnt = 1;
@ -1578,7 +1583,7 @@ TEST_F(TestTmpFile, test_sql_workload)
for (int64_t j = 0; j < sql_cnt; j++) {
io_info.size_ = sql_read_size;
io_info.buf_ = write_buf + j * sql_read_size;
ret = ObTmpFileManager::get_instance().write(io_info, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info);
ASSERT_EQ(OB_SUCCESS, ret);
}
}
@ -1588,7 +1593,7 @@ TEST_F(TestTmpFile, test_sql_workload)
io_info.buf_ = read_buf;
io_info.size_ = macro_block_size;
ret = ObTmpFileManager::get_instance().pread(io_info, 100, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 100, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(macro_block_size, handle.get_data_size());
int cmp = memcmp(handle.get_buffer(), write_buf + 100, handle.get_data_size());
@ -1605,7 +1610,7 @@ TEST_F(TestTmpFile, test_sql_workload)
for (int64_t j = 0; j < sql_cnt; j++) {
io_info.size_ = sql_read_size;
io_info.buf_ = read_buf + j * sql_read_size;
ret = ObTmpFileManager::get_instance().read(io_info, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().read(io_info, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(sql_read_size, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf + j * sql_read_size, sql_read_size);
@ -1615,7 +1620,7 @@ TEST_F(TestTmpFile, test_sql_workload)
read_time = ObTimeUtility::current_time() - read_time;
io_info.size_ = 200;
ret = ObTmpFileManager::get_instance().pread(io_info, 200, timeout_ms, handle);
ret = ObTmpFileManager::get_instance().pread(io_info, 200, handle);
ASSERT_EQ(OB_SUCCESS, ret);
ASSERT_EQ(200, handle.get_data_size());
cmp = memcmp(handle.get_buffer(), write_buf + 200, 200);
@ -1737,9 +1742,9 @@ TEST_F(TestTmpFile, test_tmp_file_sync)
io_info.io_desc_.set_wait_event(2);
io_info.buf_ = write_buf;
io_info.size_ = write_size;
const int64_t timeout_ms = 5000;
io_info.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
int64_t write_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().write(io_info, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info);
write_time = ObTimeUtility::current_time() - write_time;
ASSERT_EQ(OB_SUCCESS, ret);
free(write_buf);
@ -1779,6 +1784,7 @@ TEST_F(TestTmpFile, test_tmp_file_sync_same_block)
}
io_info.buf_ = write_buf;
io_info.size_ = write_size;
io_info.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
ret = ObTmpFileManager::get_instance().alloc_dir(dir);
ASSERT_EQ(OB_SUCCESS, ret);
@ -1787,7 +1793,7 @@ TEST_F(TestTmpFile, test_tmp_file_sync_same_block)
ASSERT_EQ(OB_SUCCESS, ret);
io_info.fd_ = fd1;
int64_t write_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().write(io_info, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info);
write_time = ObTimeUtility::current_time() - write_time;
ASSERT_EQ(OB_SUCCESS, ret);
@ -1795,7 +1801,7 @@ TEST_F(TestTmpFile, test_tmp_file_sync_same_block)
ASSERT_EQ(OB_SUCCESS, ret);
io_info.fd_ = fd2;
write_time = ObTimeUtility::current_time();
ret = ObTmpFileManager::get_instance().write(io_info, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info);
write_time = ObTimeUtility::current_time() - write_time;
ASSERT_EQ(OB_SUCCESS, ret);
@ -1840,6 +1846,7 @@ TEST_F(TestTmpFile, test_tmp_file_wash)
}
io_info.buf_ = write_buf;
io_info.size_ = write_size;
io_info.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
io_info_2 = io_info;
@ -1850,6 +1857,7 @@ TEST_F(TestTmpFile, test_tmp_file_wash)
}
io_info_2.buf_ = write_buf_2;
io_info_2.size_ = write_size_2;
io_info_2.io_timeout_ms_ = DEFAULT_IO_WAIT_TIME_MS;
STORAGE_LOG(INFO, "test_tmp_file_wash");
ObTmpTenantFileStoreHandle store_handle;
@ -1863,11 +1871,11 @@ TEST_F(TestTmpFile, test_tmp_file_wash)
if (i == count/2) {
// This macro block will be freed immediately because its memory has been exhausted.
io_info_2.fd_ = fd;
ret = ObTmpFileManager::get_instance().write(io_info_2, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info_2);
ASSERT_EQ(OB_SUCCESS, ret);
} else {
io_info.fd_ = fd;
ret = ObTmpFileManager::get_instance().write(io_info, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info);
ASSERT_EQ(OB_SUCCESS, ret);
}
}
@ -1905,7 +1913,7 @@ TEST_F(TestTmpFile, test_tmp_file_wash)
ret = ObTmpFileManager::get_instance().open(fd, dir);
ASSERT_EQ(OB_SUCCESS, ret);
io_info.fd_ = fd;
ret = ObTmpFileManager::get_instance().write(io_info, timeout_ms);
ret = ObTmpFileManager::get_instance().write(io_info);
ASSERT_EQ(OB_SUCCESS, ret);
}