xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

vnode/cos: fix get callback buffer

This commit is contained in:
Minglei Jin 2023-10-18 15:30:02 +08:00
parent a9dfb40069
commit f26ec41b8e
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/common/CMakeLists.txt
View File

@ -22,6 +22,9 @@ IF (TD_STORAGE)
add_definitions(-DUSE_COS) add_definitions(-DUSE_COS)
ENDIF(${BUILD_WITH_COS}) ENDIF(${BUILD_WITH_COS})
IF(${BUILD_WITH_S3})
add_definitions(-DUSE_S3)
ENDIF(${BUILD_WITH_S3})
ENDIF(${TD_LINUX}) ENDIF(${TD_LINUX})
ENDIF () ENDIF ()

2
source/common/src/tglobal.c
View File

@ -329,7 +329,7 @@ int32_t taosSetS3Cfg(SConfig *pCfg) {
} }
} }
if (tsS3BucketName[0] != '<' && tsDiskCfgNum > 1) { if (tsS3BucketName[0] != '<' && tsDiskCfgNum > 1) {
#ifdef USE_COS #if defined(USE_COS) || defined(USE_S3)
tsS3Enabled = true; tsS3Enabled = true;
#endif #endif
} }

1
source/dnode/vnode/CMakeLists.txt
View File

@ -164,7 +164,6 @@ target_link_libraries(
if(${TD_LINUX}) if(${TD_LINUX})
if(${BUILD_WITH_S3}) if(${BUILD_WITH_S3})
MESSAGE("build with s3: ${BUILD_WITH_S3}")
target_include_directories( target_include_directories(
vnode vnode

2
source/dnode/vnode/src/vnd/vnodeCos.c
View File

@ -721,7 +721,7 @@ static S3Status getObjectDataCallback(int bufferSize, const char *buffer, void *
char *buf = taosMemoryCalloc(1, bufferSize); char *buf = taosMemoryCalloc(1, bufferSize);
if (buf) { if (buf) {
memcpy(buf, buffer, bufferSize); memcpy(buf, buffer, bufferSize);
cbd->buf = buf;
cbd->status = S3StatusOK; cbd->status = S3StatusOK;
return S3StatusOK; return S3StatusOK;
} else { } else {