release 3.0.4.0

Author: ShenaMao

.gitignore

@@ -8,3 +8,4 @@
 /.vscode/
 /.python-version
 **/__pycache__/*
+/.cache/

CMakeLists.txt

@@ -4,6 +4,7 @@ project(dolphindbcpp LANGUAGES CXX)
 set(MODULE_NAME _dolphindbcpp)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
@@ -138,7 +139,7 @@ if(WIN32)
         )
         get_filename_component(OPENSSL_ROOT_DIR ${OPENSSL_INCLUDE_DIR} DIRECTORY)
         target_link_directories(${MODULE_NAME}
-            PUBLIC 
+            PUBLIC
                 "${OPENSSL_ROOT_DIR}/lib64"
                 "${OPENSSL_ROOT_DIR}/lib"
         )

README.md

@@ -14,6 +14,7 @@ To use DolphinDB Python SDK, you'll need:
   - pandas: version 1.0.0 and newer, but not version 1.3.0
   - future
   - packaging
+  - pydantic: version 2.0 and newer
 - Extension Packages:
   - PyArrow: version 9.0.0 and newer
 

core/include/AsynWorker.h core/include/AsyncWorker.hcore/include/AsynWorker.h renamed to core/include/AsyncWorker.h

@@ -5,10 +5,10 @@
 
 namespace dolphindb {
 class DBConnection;
-class AsynWorker: public Runnable {
+class EXPORT_DECL AsyncWorker: public Runnable {
 public:
     using Task = DBConnectionPoolImpl::Task;
-    AsynWorker(DBConnectionPoolImpl& pool, CountDownLatchSP latch, const SmartPointer<DBConnection>& conn,
+    AsyncWorker(DBConnectionPoolImpl& pool, CountDownLatchSP latch, const SmartPointer<DBConnection>& conn,
                const SmartPointer<SynchronizedQueue<Task>>& queue, TaskStatusMgmt& status,
                const string& hostName, int port, const string& userId , const string& password)
             : pool_(pool), latch_(latch), conn_(conn), queue_(queue),taskStatus_(status),

core/include/BatchTableWriter.h

@@ -1,17 +1,20 @@
-#ifndef BATCHTABLEWRITER_H_
-#define BATCHTABLEWRITER_H_
+#pragma once
+
+/**
+    * BatchTableWriter.h
+    *
+    *  Deprecated
+*/
 
 #include "Exports.h"
 #include "Concurrent.h"
 #include "Types.h"
 #include "Exceptions.h"
 #include "Constant.h"
-#include "Dictionary.h"
 #include "Table.h"
 #include <unordered_map>
 #include <string>
 #include <vector>
-#include <memory>
 #include <functional>
 #include <tuple>
 #include <cassert>
@@ -178,5 +181,4 @@ class EXPORT_DECL BatchTableWriter {
 };
 
 
-};
-#endif /* BATCHTABLEWRITER_H_ */
+} // namespace dolphindb

core/include/Compress.h

@@ -1,6 +1,4 @@
 #pragma once
-#ifndef COMPRESSION_H_
-#define COMPRESSION_H_
 
 #include "Types.h"
 #include "SysIO.h"
@@ -63,5 +61,4 @@ class CompressDeltaofDelta : public CompressEncoderDecoder {
 	static const int maxCompressedSize_;
 };
 
-};//dolphindb
-#endif//COMPRESSION_H_
+} // namespace dolphindb

core/include/Concurrent.h

@@ -213,7 +213,7 @@ class EXPORT_DECL RWLockGuard{
 };
 
 template<class T>
-class TryRWLockGuard{
+class EXPORT_DECL TryRWLockGuard{
 public:
 	TryRWLockGuard(T* res, bool exclusive, bool acquireLock = true):res_(res), exclusive_(exclusive), locked_(false){
 		if(acquireLock){
@@ -255,7 +255,7 @@ class EXPORT_DECL CountDownLatch{
 
 
 template<class T>
-class Future {
+class EXPORT_DECL Future {
 public:
 	Future(): latch_(1) {}
 	//Wait till the result is ready or the specified milliseconds timeout. Return whether the result is ready.
@@ -268,9 +268,9 @@ class Future {
 		latch_.countDown();
 	}
 	//Get the value as promised. Blocked if the result is not ready.
-	T get() { 
+	T get() {
 		latch_.wait();
-		return val_; 
+		return val_;
 	}
 private:
 	CountDownLatch latch_;
@@ -319,7 +319,7 @@ class EXPORT_DECL ConditionalNotifier {
 };
 
 template<class T>
-class BoundedBlockingQueue{
+class EXPORT_DECL BoundedBlockingQueue{
 public:
 	BoundedBlockingQueue(size_t maxItems) : capacity_(maxItems), size_(0), head_(0), tail_(0){
 		buf_ = new T[maxItems];
@@ -368,7 +368,7 @@ class BoundedBlockingQueue{
 };
 
 template<class T>
-class SynchronizedQueue{
+class EXPORT_DECL SynchronizedQueue{
 public:
 	SynchronizedQueue(){}
 	void push(const T& item){
@@ -646,7 +646,7 @@ class BlockingQueue {
     ConditionalVariable full_;
     ConditionalVariable empty_;
     ConditionalVariable batch_;
-    
+
 };
 
 };

core/include/DBConnectionPoolImpl.h

@@ -27,11 +27,13 @@ class DBConnectionPoolImpl{
         bool pickleTableToList = false;
         bool disableDecimal = false;
     };
-    
-    DBConnectionPoolImpl(const string& hostName, int port, int threadNum = 10, const string& userId = "", const string& password = "",
-        bool loadBalance = true, bool highAvailability = true, bool compress = false, bool reConnect = false,
-        PARSER_TYPE parser = PARSER_TYPE::PARSER_DOLPHINDB, PROTOCOL protocol = PROTOCOL_DDB, bool show_output = true, int sqlStd = 0, int tryReconnectNums = -1);
-    
+
+    DBConnectionPoolImpl(const string &hostName, int port, int threadNum = 10, const string &userId = "",
+                         const string &password = "", bool loadBalance = true, bool highAvailability = true,
+                         bool compress = false, bool reConnect = false,
+                         PARSER_TYPE parser = PARSER_TYPE::PARSER_DOLPHINDB, PROTOCOL protocol = PROTOCOL_DDB,
+                         bool show_output = true, int sqlStd = 0, int tryReconnectNums = -1, bool usePublicName = false);
+
     ~DBConnectionPoolImpl(){
         shutDown();
         Task emptyTask;
@@ -98,7 +100,7 @@ class DBConnectionPoolImpl{
         ));
         taskStatus_.setResult(identity, TaskStatusMgmt::Result());
     }
-    
+
     py::object getPyData(int identity){
         return taskStatus_.getPyData(identity);
     }
@@ -110,7 +112,7 @@ class DBConnectionPoolImpl{
         }
         return sessionIds_;
     }
-    
+
 private:
     std::atomic<bool> shutDownFlag_;
     CountDownLatchSP latch_;

core/include/DolphinDB.h

@@ -55,7 +55,7 @@ namespace dolphindb {
 
 class DBConnectionImpl;
 class BlockReader;
-class Domain; 
+class Domain;
 class DBConnectionPoolImpl;
 class PartitionedTableAppender;
 class DBConnection;
@@ -85,8 +85,11 @@ class EXPORT_DECL DBConnection {
 	 * will be performed along with connecting. If one would send userId and password in encrypted mode,
 	 * please use the login function for authentication separately.
 	 */
-	bool connect(const string& hostName, int port, const string& userId = "", const string& password = "", const string& initialScript = "",
-		bool highAvailability = false, const vector<string>& highAvailabilitySites = vector<string>(), int keepAliveTime=7200, bool reconnect = false, int tryReconnectNums = -1, int readTimeout = -1, int writeTimeout = -1);
+    bool connect(const string &hostName, int port, const string &userId = "", const string &password = "",
+                 const string &initialScript = "", bool highAvailability = false,
+                 const vector<string> &highAvailabilitySites = vector<string>(), int keepAliveTime = 7200,
+                 bool reconnect = false, int tryReconnectNums = -1, int readTimeout = -1, int writeTimeout = -1,
+                 bool usePublicName = false);
 
 	/**
 	 * Log onto the DolphinDB server using the given userId and password. If the parameter enableEncryption
@@ -148,6 +151,11 @@ class EXPORT_DECL DBConnection {
 	void setKeepAliveTime(int keepAliveTime);
 	void setTimeout(int readTimeout, int writeTimeout);
 	const string getSessionId() const;
+	const string getHostName() const;
+    const int getPort() const;
+    const string getUserId() const;
+    const string getPassword() const;
+    bool isClosed() const;
 	void setProtocol(PROTOCOL protocol);
 	void setShowOutput(bool flag);
 	std::shared_ptr<Logger> getMsgLogger();
@@ -227,17 +235,17 @@ class EXPORT_DECL DBConnectionPool{
 public:
     DBConnectionPool(const string& hostName, int port, int threadNum = 10, const string& userId = "", const string& password = "",
 		bool loadBalance = false, bool highAvailability = false, bool compress = false, bool reConnect = false, PARSER_TYPE parser = PARSER_TYPE::PARSER_DOLPHINDB,
-		PROTOCOL protocol = PROTOCOL_DDB, bool showOutput = true, int sqlStd = 0, int tryReconnectNums = -1);
+		PROTOCOL protocol = PROTOCOL_DDB, bool showOutput = true, int sqlStd = 0, int tryReconnectNums = -1, bool usePublicName = false);
 	virtual ~DBConnectionPool();
-	
+
 	void run(const string& script, int identity, int priority=4, int parallelism=64, int fetchSize=0, bool clearMemory = false);
-	
+
 	void run(const string& functionName, const vector<ConstantSP>& args, int identity, int priority=4, int parallelism=64, int fetchSize=0, bool clearMemory = false);
-    
+
 	bool isFinished(int identity);
 
     ConstantSP getData(int identity);
-	
+
     void shutDown();
 
     bool isShutDown();
@@ -259,7 +267,7 @@ class EXPORT_DECL DBConnectionPool{
 private:
 	// SmartPointer<DBConnectionPoolImpl> pool_;
 	std::shared_ptr<DBConnectionPoolImpl> pool_;
-	friend class PartitionedTableAppender; 
+	friend class PartitionedTableAppender;
 
 };
 

core/include/DolphinDBImp.h

@@ -3,13 +3,13 @@
 #include "ConstantImp.h"
 #include <string>
 #include "pybind11/pybind11.h"
-#include "DdbPythonUtil.h"
+#include "PytoDdbRowPool.h"
 
 namespace py = pybind11;
 
 namespace dolphindb {
 
-class DdbInit {
+class EXPORT_DECL DdbInit {
 public:
     DdbInit() {
     #ifdef WINDOWS
@@ -22,7 +22,7 @@ class DdbInit {
     }
 };
 
-class DBConnectionImpl {
+class EXPORT_DECL DBConnectionImpl {
 public:
     DBConnectionImpl(bool sslEnable = false, bool asynTask = false, int keepAliveTime = 7200, bool compress = false, PARSER_TYPE parser = PARSER_TYPE::PARSER_DOLPHINDB, bool isReverseStreaming = false, int sqlStd = 0);
     ~DBConnectionImpl();
@@ -34,8 +34,14 @@ class DBConnectionImpl {
     ConstantSP upload(vector<string>& names, vector<ConstantSP>& objs);
     void close();
     bool isConnected() { return isConnected_; }
-    void getHostPort(string &host, int &port) { host = hostName_; port = port_; }
-
+    void getHostPort(string &host, int &port) {
+        host = hostName_;
+        port = port_;
+    }
+    void getUserPwd(string &user, string &pwd) {
+        user = userId_;
+        pwd = pwd_;
+    }
     void setProtocol(PROTOCOL protocol) {
         protocol_ = protocol;
         if (protocol_ == PROTOCOL_ARROW) {