cos: only for linux

cmake/cmake.options

@@ -125,12 +125,16 @@ option(
     ON
 )
 
+IF(${TD_LINUX})
+
 option(
     BUILD_WITH_COS
     "If build with cos"
     ON
 )
 
+ENDIF ()
+
 option(
     BUILD_WITH_SQLITE
     "If build with sqlite" 

contrib/CMakeLists.txt

@@ -6,6 +6,8 @@ function(cat IN_FILE OUT_FILE)
     file(APPEND ${OUT_FILE} "${CONTENTS}")
 endfunction(cat IN_FILE OUT_FILE)
 
+if(${TD_LINUX})
+
 set(CONTRIB_TMP_FILE3 "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in3")
 configure_file("${TD_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
 
@@ -35,6 +37,8 @@ execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
 execute_process(COMMAND "${CMAKE_COMMAND}" --build .
         WORKING_DIRECTORY "${TD_CONTRIB_DIR}/deps-download")
 
+endif(${TD_LINUX})
+
 set(CONTRIB_TMP_FILE "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in")
 configure_file("${TD_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 
@@ -388,7 +392,7 @@ endif()
 
 # cos
 if(${BUILD_WITH_COS})
-  if(NOT ${TD_WINDOWS})
+  if(${TD_LINUX})
     set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.1)
     #ADD_DEFINITIONS(-DMINIXML_LIBRARY=${CMAKE_BINARY_DIR}/build/lib/libxml.a)
     option(ENABLE_TEST "Enable the tests" OFF)
@@ -406,10 +410,9 @@ if(${BUILD_WITH_COS})
       )
 
     set(CMAKE_PROJECT_NAME ${ORIG_CMAKE_PROJECT_NAME})
-
   else()
 
-  endif(NOT ${TD_WINDOWS})
+  endif(${TD_LINUX})
 endif(${BUILD_WITH_COS})
 
 # lucene

source/common/src/tglobal.c

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

source/dnode/vnode/CMakeLists.txt

@@ -135,12 +135,6 @@ else()
     endif()
 endif()
 
-set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-find_library(APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/)
-find_library(APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/)
-find_library(MINIXML_LIBRARY mxml)
-find_library(CURL_LIBRARY curl)
-
 target_link_libraries(
     vnode
     PUBLIC os
@@ -160,28 +154,24 @@ target_link_libraries(
     PUBLIC transport
     PUBLIC stream
     PUBLIC index
-
-    # s3
-    cos_c_sdk_static
-    ${APR_UTIL_LIBRARY}
-    ${APR_LIBRARY}
-    ${MINIXML_LIBRARY}
-    ${CURL_LIBRARY}
 )
 
-IF (TD_GRANT)
+if(${TD_LINUX})
-  TARGET_LINK_LIBRARIES(vnode PUBLIC grant)
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-ENDIF ()
+find_library(APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/)
+find_library(APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/)
+find_library(MINIXML_LIBRARY mxml)
+find_library(CURL_LIBRARY curl)
+target_link_libraries(
+    vnode
 
-target_compile_definitions(vnode PUBLIC -DMETA_REFACT)
+    # s3
-
+    PUBLIC cos_c_sdk_static
-if(${BUILD_WITH_INVERTEDINDEX})
+    PUBLIC ${APR_UTIL_LIBRARY}
-    add_definitions(-DUSE_INVERTED_INDEX)
+    PUBLIC ${APR_LIBRARY}
-endif(${BUILD_WITH_INVERTEDINDEX})
+    PUBLIC ${MINIXML_LIBRARY}
-
+    PUBLIC ${CURL_LIBRARY}
-if(${BUILD_WITH_ROCKSDB})
+)
-    add_definitions(-DUSE_ROCKSDB)
-endif(${BUILD_WITH_ROCKSDB})
 
 # s3
 FIND_PROGRAM(APR_CONFIG_BIN NAMES apr-config apr-1-config PATHS /usr/bin /usr/local/bin /usr/local/apr/bin/)
@@ -199,6 +189,22 @@ target_include_directories(
   PUBLIC "$ENV{HOME}/.cos-local.1/include"
   )
 
+endif(${TD_LINUX})
+
+IF (TD_GRANT)
+  TARGET_LINK_LIBRARIES(vnode PUBLIC grant)
+ENDIF ()
+
+target_compile_definitions(vnode PUBLIC -DMETA_REFACT)
+
+if(${BUILD_WITH_INVERTEDINDEX})
+    add_definitions(-DUSE_INVERTED_INDEX)
+endif(${BUILD_WITH_INVERTEDINDEX})
+
+if(${BUILD_WITH_ROCKSDB})
+    add_definitions(-DUSE_ROCKSDB)
+endif(${BUILD_WITH_ROCKSDB})
+
 if(${BUILD_TEST})
     add_subdirectory(test)
 endif(${BUILD_TEST})

source/dnode/vnode/src/vnd/vnodeCos.c

@@ -12,6 +12,7 @@ extern char tsS3AccessKeySecret[];
 extern char tsS3BucketName[];
 extern char tsS3AppId[];
 
+#ifdef USE_COS
 int32_t s3Init() {
   if (cos_http_io_initialize(NULL, 0) != COSE_OK) {
     return -1;
@@ -294,3 +295,16 @@ long s3Size(const char *object_name) {
 
   return size;
 }
+
+#else
+
+int32_t s3Init() { return 0; }
+void    s3CleanUp() {}
+void    s3PutObjectFromFile(const char *file, const char *object) {}
+void    s3DeleteObjects(const char *object_name[], int nobject) {}
+bool    s3Exists(const char *object_name) { return false; }
+bool    s3Get(const char *object_name, const char *path) { return false; }
+void    s3EvictCache(const char *path, long object_size) {}
+long    s3Size(const char *object_name) { return 0; }
+
+#endif