release 3.0.1.0

Author: ShenaMao

.gitignore

@@ -7,4 +7,4 @@
 /.venv*/
 /.vscode/
 /.python-version
-*/__pycache__/*
+**/__pycache__/*

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016-2023 DolphinDB, Inc.
+Copyright 2016-2024 DolphinDB, Inc.
 
 
                                  Apache License

README.md

@@ -10,9 +10,10 @@ To use DolphinDB Python SDK, you'll need:
   - CPython: version 3.6 and newer
 - DolphinDB Server
 - Packages:
-  - NumPy: version 1.18 and newer
+  - NumPy: version 1.18 and newer, but earlier than 2.0
   - pandas: version 1.0.0 and newer, but not version 1.3.0
   - future
+  - packaging
 - Extension Packages:
   - PyArrow: version 9.0.0 and newer
 

core/include/AsynWorker.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#include "Concurrent.h"
+#include "DBConnectionPoolImpl.h"
+
+namespace dolphindb {
+class DBConnection;
+class AsynWorker: public Runnable {
+public:
+    using Task = DBConnectionPoolImpl::Task;
+    AsynWorker(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),
+              hostName_(hostName), port_(port), userId_(userId), password_(password){}
+protected:
+    virtual void run();
+
+private:
+    DBConnectionPoolImpl& pool_;
+    CountDownLatchSP latch_;
+    SmartPointer<DBConnection> conn_;
+	SmartPointer<SynchronizedQueue<Task>> queue_;
+    TaskStatusMgmt& taskStatus_;
+    const string hostName_;
+    int port_;
+    const string userId_;
+    const string password_;
+};
+
+}

core/include/BatchTableWriter.h

@@ -1,11 +1,13 @@
 #ifndef BATCHTABLEWRITER_H_
 #define BATCHTABLEWRITER_H_
 
+#include "Exports.h"
 #include "Concurrent.h"
-#include "DolphinDB.h"
-#include "Util.h"
 #include "Types.h"
 #include "Exceptions.h"
+#include "Constant.h"
+#include "Dictionary.h"
+#include "Table.h"
 #include <unordered_map>
 #include <string>
 #include <vector>
@@ -14,22 +16,17 @@
 #include <tuple>
 #include <cassert>
 
-#ifdef _MSC_VER
-	#define EXPORT_DECL _declspec(dllexport)
-#else
-	#define EXPORT_DECL 
-#endif
-
-
 namespace dolphindb{
-class EXPORT_DECL  BatchTableWriter {
+
+class DBConnection;
+class EXPORT_DECL BatchTableWriter {
 public:
     /**
      * If fail to connect to the specified DolphinDB server, this function throw an exception.
      */
     BatchTableWriter(const std::string& hostName, int port, const std::string& userId, const std::string& password, bool acquireLock=true);
 
-    ~BatchTableWriter();
+    virtual ~BatchTableWriter();
 
     BatchTableWriter(const BatchTableWriter&) = delete;
 
@@ -76,6 +73,7 @@ class EXPORT_DECL  BatchTableWriter {
      */
     template<typename... Targs>
     void insert(const string& dbName, const string& tableName, Targs... Fargs){
+        //RECORDTIME("BTW::insert");
         SmartPointer<DestTable> destTable;
         {
             RWLockGuard<RWLock> _(&rwLock, false, acquireLock_);

core/include/Compress.h

@@ -4,7 +4,8 @@
 
 #include "Types.h"
 #include "SysIO.h"
-#include "DolphinDB.h"
+#include "Vector.h"
+
 namespace dolphindb {
 
 class CompressEncoderDecoder;

core/include/Concurrent.h

@@ -25,17 +25,10 @@
     #include <sys/syscall.h>
 	#include <semaphore.h>
 #endif
+
+#include "Exports.h"
 #include "SmartPointer.h"
 
-#ifdef _MSC_VER
-	#ifdef _USRDLL	
-		#define EXPORT_DECL _declspec(dllexport)
-	#else
-		#define EXPORT_DECL __declspec(dllimport)
-	#endif
-#else
-	#define EXPORT_DECL 
-#endif
 namespace dolphindb {
 
 class Thread;
@@ -109,17 +102,17 @@ class EXPORT_DECL RWLock{
 #endif
 };
 
-class EXPORT_DECL RWSpinLock{
-public:
-	RWSpinLock(){};
-	~RWSpinLock(){};
-	void acquireRead(){}
-	void acquireWrite(){}
-	void releaseRead(){}
-	void releaseWrite(){}
-private:
+// class EXPORT_DECL RWSpinLock{
+// public:
+// 	RWSpinLock(){};
+// 	~RWSpinLock(){};
+// 	void acquireRead(){}
+// 	void acquireWrite(){}
+// 	void releaseRead(){}
+// 	void releaseWrite(){}
+// private:
 
-};
+// };
 
 class EXPORT_DECL ConditionalVariable{
 public:
@@ -140,7 +133,7 @@ class EXPORT_DECL ConditionalVariable{
 
 
 template<class T>
-class LockGuard{
+class EXPORT_DECL LockGuard{
 public:
 	LockGuard(T* res, bool acquireLock = true):res_(res){
 		if(acquireLock)
@@ -182,7 +175,7 @@ class TryLockGuard{
 };
 
 template<class T>
-class RWLockGuard{
+class EXPORT_DECL RWLockGuard{
 public:
 	RWLockGuard(T* res, bool exclusive, bool acquireLock = true):res_(res), exclusive_(exclusive), acquireLock_(acquireLock){
 		if(res != NULL && acquireLock_){
@@ -431,7 +424,7 @@ class SynchronizedQueue{
 		return true;
 	}
 
-	int size(){
+	std::size_t size(){
 		LockGuard<Mutex> guard(&mutex_);
 		return items_.size();
 	}
@@ -572,7 +565,7 @@ class BlockingQueue {
         : buf_(new T[maxItems]), capacity_(maxItems), batchSize_(1), size_(0), head_(0), tail_(0) {}
     explicit BlockingQueue(size_t maxItems, size_t batchSize)
         : buf_(new T[maxItems]), capacity_(maxItems), batchSize_(batchSize), size_(0), head_(0), tail_(0) {}
-	int size(){
+	std::size_t size(){
 		LockGuard<Mutex> guard(&lock_);
 		return size_;
 	}
@@ -631,9 +624,9 @@ class BlockingQueue {
         }
         if(size_ == 0)
             return false;
-        int n = std::min(batchSize_, size_);
+        std::size_t n = std::min(batchSize_, size_);
         items.resize(n);
-        for(int i = 0; i < n; i++){
+        for(std::size_t i = 0; i < n; i++){
             items[i] = std::move(buf_[head_]);
             buf_[head_] = T();
             head_ = (head_ + 1) % capacity_;