release 3.00.2.2

Author: dolphindb-jffu

CMakeLists.txt

@@ -51,18 +51,29 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
     PRIVATE ${AERON_LIBRARY}
 )
 
-if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+if (WIN32)
     target_compile_definitions(${CMAKE_PROJECT_NAME}
         PRIVATE WINDOWS NOMINMAX _DDBAPIDLL
     )
+    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ws2_32)
+    if (MINGW)
+        target_compile_definitions(${CMAKE_PROJECT_NAME}
+            PRIVATE _WIN32_WINNT=0x0600
+        )
+    endif()
+else()
+    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE pthread rt uuid)
+endif()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     # C4251: Class member of an exported class is not marked dllexport.
     # This is triggered by std::string but we cannot modify STL.
     # C4100: Parameter is unused. We should fix this later.
     target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE /W3 /WX /MP /wd4251 /wd4100)
-    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ws2_32)
-else ()
-    target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -Wall -Werror)
-    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE pthread rt uuid)
+else()
+    # overloaded-virtual: Derived class hides base class virtual functions
+    # This is triggered by derived classes of Constant and we will fix this later
+    target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -Wall -Werror -Wno-overloaded-virtual)
 endif()
 
 if (USE_CXX11_ABI AND EXISTS "${PROJECT_SOURCE_DIR}/thirdparty/googletest/CMakeLists.txt")

include/Streaming.h

@@ -46,7 +46,7 @@ class EXPORT_DECL StreamingClient {
                                      int64_t offset, bool resubscribe, const VectorSP &filter,
                                      bool msgAsTable, bool allowExists, int batchSize,
 									 std::string userName, std::string password,
-									 const StreamDeserializerSP &blobDeserializer, const std::vector<std::string>& backupSites, bool isEvent, int resubTimeout, bool subOnce, bool convertMsgRowData);
+									 const StreamDeserializerSP &blobDeserializer, const std::vector<std::string>& backupSites, bool isEvent, int resubscribeInterval, bool subOnce, bool convertMsgRowData, int resubscribeTimeout);
     void unsubscribeInternal(std::string host, int port, std::string tableName, std::string actionName = DEFAULT_ACTION_NAME);
 
 protected:
@@ -58,7 +58,7 @@ class EXPORT_DECL EventClient : public StreamingClient{
 public:
     EventClient(const std::vector<EventSchema>& eventSchema, const std::vector<std::string>& eventTimeFields, const std::vector<std::string>& commonFields);
     ThreadSP subscribe(const std::string& host, int port, const EventMessageHandler &handler, const std::string& tableName, const std::string& actionName = DEFAULT_ACTION_NAME, int64_t offset = -1,
-        bool resub = true, const std::string& userName="", const std::string& password="");
+        bool resub = true, const std::string& userName="", const std::string& password="", int resubscribeTimeout=0);
     void unsubscribe(const std::string& host, int port, const std::string& tableName, const std::string& actionName = DEFAULT_ACTION_NAME);
 
 private:
@@ -76,13 +76,13 @@ class EXPORT_DECL ThreadedClient : public StreamingClient {
                        std::string actionName = DEFAULT_ACTION_NAME, int64_t offset = -1, bool resub = true,
                        const VectorSP &filter = nullptr, bool msgAsTable = false, bool allowExists = false,
 						std::string userName="", std::string password="",
-					   const StreamDeserializerSP &blobDeserializer = nullptr, const std::vector<std::string>& backupSites = std::vector<std::string>(),int resubTimeout = 100, bool subOnce = false);
+					   const StreamDeserializerSP &blobDeserializer = nullptr, const std::vector<std::string>& backupSites = std::vector<std::string>(),int resubscribeInterval = 100, bool subOnce = false, int resubscribeTimeout = 0);
     ThreadSP subscribe(std::string host, int port, const MessageBatchHandler &handler, std::string tableName,
                        std::string actionName = DEFAULT_ACTION_NAME, int64_t offset = -1, bool resub = true,
                        const VectorSP &filter = nullptr, bool allowExists = false, int batchSize = 1,
 						double throttle = 1,bool msgAsTable = false,
 						std::string userName = "", std::string password = "",
-						const StreamDeserializerSP &blobDeserializer = nullptr, const std::vector<std::string>& backupSites = std::vector<std::string>(),int resubTimeout = 100,bool subOnce = false);
+						const StreamDeserializerSP &blobDeserializer = nullptr, const std::vector<std::string>& backupSites = std::vector<std::string>(),int resubscribeInterval = 100,bool subOnce = false, int resubscribeTimeout = 0);
 	size_t getQueueDepth(const ThreadSP &thread);
     void unsubscribe(std::string host, int port, std::string tableName, std::string actionName = DEFAULT_ACTION_NAME);
 };
@@ -97,7 +97,7 @@ class EXPORT_DECL ThreadPooledClient : public StreamingClient {
                                std::string actionName, int64_t offset = -1, bool resub = true,
                                const VectorSP &filter = nullptr, bool msgAsTable = false, bool allowExists = false,
 								std::string userName = "", std::string password = "",
-							   const StreamDeserializerSP &blobDeserializer = nullptr, const std::vector<std::string>& backupSites = std::vector<std::string>(), int resubTimeout = 100, bool subOnce = false);
+							   const StreamDeserializerSP &blobDeserializer = nullptr, const std::vector<std::string>& backupSites = std::vector<std::string>(), int resubscribeInterval = 100, bool subOnce = false, int resubscribeTimeout = 0);
     void unsubscribe(std::string host, int port, std::string tableName, std::string actionName = DEFAULT_ACTION_NAME);
 	size_t getQueueDepth(const ThreadSP &thread);
 
@@ -115,7 +115,7 @@ class EXPORT_DECL PollingClient : public StreamingClient {
                              int64_t offset = -1, bool resub = true, const VectorSP &filter = nullptr,
                              bool msgAsTable = false, bool allowExists = false,
 							std::string userName="", std::string password="",
-							 const StreamDeserializerSP &blobDeserializer = nullptr, const std::vector<std::string>& backupSites = std::vector<std::string>(), int resubTimeout = 100, bool subOnce = false);
+							 const StreamDeserializerSP &blobDeserializer = nullptr, const std::vector<std::string>& backupSites = std::vector<std::string>(), int resubscribeInterval = 100, bool subOnce = false, int resubscribeTimeout = 0);
     void unsubscribe(std::string host, int port, std::string tableName, std::string actionName = DEFAULT_ACTION_NAME);
 };