From f26ec41b8e11804ba87524e5accc8cc5cd459af1 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Wed, 18 Oct 2023 15:30:02 +0800
Subject: [PATCH] vnode/cos: fix get callback buffer

---
 source/common/CMakeLists.txt          | 3 +++
 source/common/src/tglobal.c           | 2 +-
 source/dnode/vnode/CMakeLists.txt     | 1 -
 source/dnode/vnode/src/vnd/vnodeCos.c | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt
index b010467f20..6bdcdf7d1d 100644
--- a/source/common/CMakeLists.txt
+++ b/source/common/CMakeLists.txt
@@ -22,6 +22,9 @@ IF (TD_STORAGE)
       add_definitions(-DUSE_COS)
     ENDIF(${BUILD_WITH_COS})
 
+    IF(${BUILD_WITH_S3})
+      add_definitions(-DUSE_S3)
+    ENDIF(${BUILD_WITH_S3})
   ENDIF(${TD_LINUX})
 
 ENDIF ()
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index 8ea5528fbb..f3af6e0ab0 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -329,7 +329,7 @@ int32_t taosSetS3Cfg(SConfig *pCfg) {
     }
   }
   if (tsS3BucketName[0] != '<' && tsDiskCfgNum > 1) {
-#ifdef USE_COS
+#if defined(USE_COS) || defined(USE_S3)
     tsS3Enabled = true;
 #endif
   }
diff --git a/source/dnode/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt
index e554d94e4d..7e2693e8af 100644
--- a/source/dnode/vnode/CMakeLists.txt
+++ b/source/dnode/vnode/CMakeLists.txt
@@ -164,7 +164,6 @@ target_link_libraries(
 if(${TD_LINUX})
 
 if(${BUILD_WITH_S3})
-  MESSAGE("build with s3: ${BUILD_WITH_S3}")
   target_include_directories(
     vnode
 
diff --git a/source/dnode/vnode/src/vnd/vnodeCos.c b/source/dnode/vnode/src/vnd/vnodeCos.c
index b52d4809b2..c50f133987 100644
--- a/source/dnode/vnode/src/vnd/vnodeCos.c
+++ b/source/dnode/vnode/src/vnd/vnodeCos.c
@@ -721,7 +721,7 @@ static S3Status getObjectDataCallback(int bufferSize, const char *buffer, void *
   char *buf = taosMemoryCalloc(1, bufferSize);
   if (buf) {
     memcpy(buf, buffer, bufferSize);
-
+    cbd->buf = buf;
     cbd->status = S3StatusOK;
     return S3StatusOK;
   } else {