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

[FEAT MERGE] merge transfer

Browse Source 
Co-authored-by: wxhwang <wxhwang@126.com>
Co-authored-by: godyangfight <godyangfight@gmail.com>
Co-authored-by: Tyshawn <tuyunshan@gmail.com>
This commit is contained in:
xuhuleon
2023-06-21 11:42:26 +00:00
committed by ob-robot
parent d06678002e
commit 9dae112952
1280 changed files with 149724 additions and 48813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
unittest/sql/optimizer/storage_perf/ob_storage_perf_data.cpp
View File

@ -232,7 +232,6 @@ int ObStoragePerfData::backup_sstable_meta(ObSSTable &sstable)
int64_t pos = 0;
char *buf = NULL;
ObArenaAllocator allocator(ObModIds::TEST);
ObIAllocator &tenant_allocator = MTL(ObTenantMetaMemMgr*)->get_tenant_allocator();
if(-1 == (fd = open(sstable_meta_path_, O_RDONLY, 0777))){
ret = OB_ERR_UNEXPECTED;
@ -249,9 +248,7 @@ int ObStoragePerfData::backup_sstable_meta(ObSSTable &sstable)
} else if (size != read(fd, buf, size)){
ret = OB_ERR_UNEXPECTED;
STORAGE_LOG(ERROR, "fail to read meta");
} else if(OB_SUCCESS != (ret = sstable.deserialize(tenant_allocator, buf, size, pos))){
STORAGE_LOG(WARN, "fail to deserialize sstable", K(ret));
} else if(OB_SUCCESS != (ret = sstable.deserialize_post_work())){
} else if(OB_SUCCESS != (ret = sstable.deserialize(allocator_, buf, size, pos))){
STORAGE_LOG(WARN, "fail to deserialize sstable", K(ret));
} else {
STORAGE_LOG(INFO, "backup sstable meta success");

5
unittest/sql/optimizer/storage_perf/ob_storage_perf_read.cpp
View File

@ -1111,7 +1111,6 @@ int ObStoragePerfRead::backup_sstable_meta(ObSSTable &sstable)
int64_t pos = 0;
char *buf = NULL;
ObArenaAllocator allocator(ObModIds::TEST);
ObIAllocator &tenant_allocator = MTL(ObTenantMetaMemMgr*)->get_tenant_allocator();
if(-1 == (fd = open(sstable_meta_path_, O_RDONLY, 0777))){
ret = OB_ERR_UNEXPECTED;
@ -1128,9 +1127,7 @@ int ObStoragePerfRead::backup_sstable_meta(ObSSTable &sstable)
} else if (size != read(fd, buf, size)){
ret = OB_ERR_UNEXPECTED;
STORAGE_LOG(ERROR, "fail to read meta");
} else if(OB_SUCCESS != (ret = sstable.deserialize(tenant_allocator, buf, size, pos))){
STORAGE_LOG(WARN, "fail to deserialize sstable", K(ret));
} else if(OB_SUCCESS != (ret = sstable.deserialize_post_work())){
} else if(OB_SUCCESS != (ret = sstable.deserialize(allocator_, buf, size, pos))){
STORAGE_LOG(WARN, "fail to deserialize sstable", K(ret));
} else {
STORAGE_LOG(INFO, "backup sstable meta success");