From fdc5d6c62574edfb3b7e53207e64b7d335c35ec5 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Thu, 10 Oct 2024 09:56:43 +0800
Subject: [PATCH] cos: prep cos from tcs integration

---
 include/common/cos.h    |  2 ++
 source/common/src/cos.c | 22 ++++++++--------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/include/common/cos.h b/include/common/cos.h
index b336a1e5ee..53dc161ee5 100644
--- a/include/common/cos.h
+++ b/include/common/cos.h
@@ -32,6 +32,8 @@ extern int32_t tsS3PageCacheSize;
 extern int32_t tsS3UploadDelaySec;
 
 int32_t s3Init();
+int32_t s3Begin();
+void    s3End();
 int32_t s3CheckCfg();
 int32_t s3PutObjectFromFile(const char *file, const char *object);
 int32_t s3PutObjectFromFile2(const char *file, const char *object, int8_t withcp);
diff --git a/source/common/src/cos.c b/source/common/src/cos.c
index c2b9fe34e1..47dc629c73 100644
--- a/source/common/src/cos.c
+++ b/source/common/src/cos.c
@@ -89,20 +89,8 @@ static void s3DumpCfgByEp(int8_t epIndex) {
 
 int32_t s3CheckCfg() {
   int32_t code = 0, lino = 0;
-  int8_t  i = 0;
 
-  if (!tsS3Enabled) {
-    (void)fprintf(stderr, "s3 not configured.\n");
-    TAOS_RETURN(code);
-  }
-
-  code = s3Begin();
-  if (code != 0) {
-    (void)fprintf(stderr, "failed to initialize s3.\n");
-    TAOS_RETURN(code);
-  }
-
-  for (; i < tsS3EpNum; i++) {
+  for (int8_t i = 0; i < tsS3EpNum; i++) {
     (void)fprintf(stdout, "test s3 ep (%d/%d):\n", i + 1, tsS3EpNum);
     s3DumpCfgByEp(i);
 
@@ -192,7 +180,7 @@ int32_t s3CheckCfg() {
     (void)fprintf(stdout, "=================================================================\n");
   }
 
-  s3End();
+  // s3End();
 
   TAOS_RETURN(code);
 }
@@ -1529,6 +1517,8 @@ void s3EvictCache(const char *path, long object_size) {}
 #include "cos_http_io.h"
 #include "cos_log.h"
 
+int32_t s3Begin() { TAOS_RETURN(TSDB_CODE_SUCCESS); }
+
 int32_t s3Init() {
   if (cos_http_io_initialize(NULL, 0) != COSE_OK) {
     return -1;
@@ -1967,6 +1957,10 @@ long s3Size(const char *object_name) {
 #else
 
 int32_t s3Init() { return 0; }
+int32_t s3Begin() { TAOS_RETURN(TSDB_CODE_SUCCESS); }
+
+void    s3End() {}
+int32_t s3CheckCfg() { return 0; }
 int32_t s3PutObjectFromFile(const char *file, const char *object) { return 0; }
 int32_t s3PutObjectFromFile2(const char *file, const char *object, int8_t withcp) { return 0; }
 int32_t s3PutObjectFromFileOffset(const char *file, const char *object_name, int64_t offset, int64_t size) { return 0; }