Merge pull request #21472 from taosdata/enh/addCompileError

change parameter

cmake/cmake.define

@@ -123,8 +123,8 @@ ELSE ()
         SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -O3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-reserved-user-defined-literal -Wno-literal-suffix -Werror=return-type -fPIC -O3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
     ELSE ()
-        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reserved-user-defined-literal -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -g3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
+        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -g3 -gdwarf-2 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reserved-user-defined-literal -g3 -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
     ENDIF ()
 
     # disable all assert

cmake/cmake.options

@@ -77,6 +77,12 @@ ELSEIF (TD_DARWIN_64)
     ENDIF ()
 ENDIF ()
 
+option(
+        BUILD_GEOS
+        "If build geos on Windows"
+        OFF
+    )
+
 option(
     BUILD_SHARED_LIBS
     ""

contrib/CMakeLists.txt

@@ -231,6 +231,7 @@ if(${BUILD_WITH_ROCKSDB})
     if(${TD_LINUX})
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=unused-function -Wno-errno=unused-private-field -Wno-error=unused-result")
     endif(${TD_LINUX})
+    MESSAGE(STATUS "CXXXX STATUS CONFIG: " ${CMAKE_CXX_FLAGS})
 
     if(${TD_DARWIN})
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
@@ -252,7 +253,7 @@ if(${BUILD_WITH_ROCKSDB})
     endif(${TD_DARWIN})
 
     if(${TD_WINDOWS})
-        option(WITH_JNI "" ON)
+	    option(WITH_JNI "" OFF)
     endif(${TD_WINDOWS})
 
     if(${TD_WINDOWS})
@@ -264,7 +265,7 @@ if(${BUILD_WITH_ROCKSDB})
     option(WITH_FALLOCATE "" OFF)
     option(WITH_JEMALLOC "" OFF)
     option(WITH_GFLAGS "" OFF)
-    option(PORTABLE "" ON)
+    option(PORTABLE "" OFF)
     option(WITH_LIBURING "" OFF)
     option(FAIL_ON_WARNINGS OFF)
 
@@ -272,8 +273,11 @@ if(${BUILD_WITH_ROCKSDB})
     option(WITH_BENCHMARK_TOOLS "" OFF)
     option(WITH_TOOLS "" OFF)
     option(WITH_LIBURING "" OFF)
-
+    IF (TD_LINUX) 
+    option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" ON)
+    ELSE()
     option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" OFF)
+    ENDIF()
     add_subdirectory(rocksdb EXCLUDE_FROM_ALL)
     target_include_directories(
         rocksdb

include/libs/function/function.h

@@ -21,8 +21,8 @@ extern "C" {
 #endif
 
 #include "tcommon.h"
-#include "tvariant.h"
 #include "tsimplehash.h"
+#include "tvariant.h"
 
 struct SqlFunctionCtx;
 struct SResultRowEntryInfo;
@@ -77,7 +77,7 @@ enum {
 enum {
   MAIN_SCAN = 0x0u,
   REVERSE_SCAN = 0x1u,  // todo remove it
-  PRE_SCAN = 0x2u,   // pre-scan belongs to the main scan and occurs before main scan
+  PRE_SCAN = 0x2u,      // pre-scan belongs to the main scan and occurs before main scan
 };
 
 typedef struct SPoint1 {
@@ -130,43 +130,44 @@ typedef struct SSerializeDataHandle {
 
 // incremental state storage
 typedef struct STdbState {
-  void*               rocksdb;
-  void**              pHandle;
-  void*               writeOpts;
-  void*               readOpts;
-  void**              cfOpts;
-  void*               dbOpt;
-  struct SStreamTask* pOwner;
-  void*               param;
-  void*               env;
-  SListNode*          pComparNode;
-  void*               pBackendHandle;
+  void               *rocksdb;
+  void              **pHandle;
+  void               *writeOpts;
+  void               *readOpts;
+  void              **cfOpts;
+  void               *dbOpt;
+  struct SStreamTask *pOwner;
+  void               *param;
+  void               *env;
+  SListNode          *pComparNode;
+  void               *pBackend;
   char                idstr[64];
-  void*               compactFactory;
-
-  void* db;
-  void* pStateDb;
-  void* pFuncStateDb;
-  void* pFillStateDb;  // todo refactor
-  void* pSessionStateDb;
-  void* pParNameDb;
-  void* pParTagDb;
-  void* txn;
+  void               *compactFactory;
+  TdThreadRwlock      rwLock;
+
+  void *db;
+  void *pStateDb;
+  void *pFuncStateDb;
+  void *pFillStateDb;  // todo refactor
+  void *pSessionStateDb;
+  void *pParNameDb;
+  void *pParTagDb;
+  void *txn;
 } STdbState;
 
 typedef struct {
-  STdbState*        pTdbState;
-  struct SStreamFileState* pFileState;
-  int32_t           number;
-  SSHashObj*        parNameMap;
-  int64_t           checkPointId;
-  int32_t           taskId;
-  int64_t           streamId;
+  STdbState               *pTdbState;
+  struct SStreamFileState *pFileState;
+  int32_t                  number;
+  SSHashObj               *parNameMap;
+  int64_t                  checkPointId;
+  int32_t                  taskId;
+  int64_t                  streamId;
 } SStreamState;
 
 typedef struct SFunctionStateStore {
-  int32_t (*streamStateFuncPut)(SStreamState* pState, const SWinKey* key, const void* value, int32_t vLen);
-  int32_t (*streamStateFuncGet)(SStreamState* pState, const SWinKey* key, void** ppVal, int32_t* pVLen);
+  int32_t (*streamStateFuncPut)(SStreamState *pState, const SWinKey *key, const void *value, int32_t vLen);
+  int32_t (*streamStateFuncGet)(SStreamState *pState, const SWinKey *key, void **ppVal, int32_t *pVLen);
 } SFunctionStateStore;
 
 // sql function runtime context
@@ -180,7 +181,7 @@ typedef struct SqlFunctionCtx {
   int16_t              functionId;     // function id
   char                *pOutput;        // final result output buffer, point to sdata->data
   // input parameter, e.g., top(k, 20), the number of results of top query is kept in param
-  SFunctParam         *param;
+  SFunctParam *param;
   // corresponding output buffer for timestamp of each result, e.g., diff/csum
   SColumnInfoData     *pTsOutput;
   int32_t              numOfParams;

include/libs/stream/streamState.h

@@ -34,7 +34,24 @@ extern "C" {
 // SListNode* streamBackendAddCompare(void* backend, void* arg);
 // void       streamBackendDelCompare(void* backend, void* arg);
 
-//typedef struct STdbState {
+// <<<<<<< HEAD
+// typedef struct STdbState {
+//   rocksdb_t*                       rocksdb;
+//   rocksdb_column_family_handle_t** pHandle;
+//   rocksdb_writeoptions_t*          writeOpts;
+//   rocksdb_readoptions_t*           readOpts;
+//   rocksdb_options_t**              cfOpts;
+//   rocksdb_options_t*               dbOpt;
+//   struct SStreamTask*              pOwner;
+//   void*                            param;
+//   void*                            env;
+//   SListNode*                       pComparNode;
+//   void*                            pBackend;
+//   char                             idstr[64];
+//   void*                            compactFactory;
+//   TdThreadRwlock                   rwLock;
+// =======
+// typedef struct STdbState {
 //  rocksdb_t*                       rocksdb;
 //  rocksdb_column_family_handle_t** pHandle;
 //  rocksdb_writeoptions_t*          writeOpts;
@@ -58,6 +75,7 @@ extern "C" {
 //  TTB* pParTagDb;
 //  TXN* txn;
 //} STdbState;
+//>>>>>>> enh/dev3.0
 
 SStreamState* streamStateOpen(char* path, void* pTask, bool specPath, int32_t szPage, int32_t pages);
 void          streamStateClose(SStreamState* pState, bool remove);

source/dnode/vnode/CMakeLists.txt

@@ -87,6 +87,28 @@ target_include_directories(
     PUBLIC "${TD_SOURCE_DIR}/include/libs/scalar"
     PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"
 )
+IF (TD_LINUX)
+target_link_libraries(
+    vnode
+    PUBLIC os
+    PUBLIC util
+    PUBLIC common
+    PUBLIC tfs
+    PUBLIC wal
+    PUBLIC qworker
+    PUBLIC sync
+    PUBLIC executor
+    PUBLIC scheduler
+    PUBLIC tdb
+
+    # PUBLIC bdb
+    # PUBLIC scalar
+    PUBLIC rocksdb-shared
+    PUBLIC transport
+    PUBLIC stream
+    PUBLIC index
+)
+ELSE()
 target_link_libraries(
     vnode
     PUBLIC os
@@ -107,6 +129,7 @@ target_link_libraries(
     PUBLIC stream
     PUBLIC index
 )
+ENDIF()
 
 IF (TD_GRANT)
   TARGET_LINK_LIBRARIES(vnode PUBLIC grant)

source/libs/stream/CMakeLists.txt

@@ -6,13 +6,23 @@ target_include_directories(
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 
+
 if(${BUILD_WITH_ROCKSDB})
+  IF (TD_LINUX)
+  target_link_libraries(
+    stream
+    PUBLIC rocksdb-shared tdb
+    PRIVATE  os util transport qcom executor wal index
+  )
+  ELSE() 
   target_link_libraries(
     stream
     PUBLIC rocksdb tdb
     PRIVATE  os util transport qcom executor wal index
   )
 
+  ENDIF()
+
   target_include_directories(
     stream
     PUBLIC "${TD_SOURCE_DIR}/contrib/rocksdb/include"