release130.21

Author: release

README.md

@@ -83,7 +83,7 @@ Windows Desktop->Dynamic Link Library (DLL)
 
 #### 添加下面的宏定义
 
-C/C++ -> 预处理器 -> 预处理器定义 ->WIN32_LEAN_AND_MEAN; _WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WINDOWS;NOMINMAX;NDEBUG;CPPAPI_EXPORTS;_WINDOWS;_USRDLL;
+C/C++ -> 预处理器 -> 预处理器定义 ->WIN32_LEAN_AND_MEAN; _WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WINDOWS;NOMINMAX;NDEBUG;CPPAPI_EXPORTS;_WINDOWS;_DDBAPIDLL;
 
 
 

README_CN.md

@@ -15,7 +15,7 @@
 #include <cassert>
 
 #ifdef _MSC_VER
-	#ifdef _USRDLL	
+	#ifdef _DDBAPIDLL	
 		#define EXPORT_DECL _declspec(dllexport)
 	#else
 		#define EXPORT_DECL __declspec(dllimport)

bin/linux_x64/ABI0/libDolphinDBAPI.so

@@ -37,23 +37,24 @@ class CompressEncoderDecoder {
 public:
 	virtual IO_ERR decode(DataInputStreamSP compressSrc, DataOutputStreamSP &uncompressResult, const CompressionFactory::Header &header) = 0;
 	virtual IO_ERR encodeContent(const VectorSP &vec, const DataOutputStreamSP &compressResult, CompressionFactory::Header &header, bool checkSum) = 0;
+	virtual ~CompressEncoderDecoder(){}
 };
 
 class CompressLZ4 : public CompressEncoderDecoder {
 public:
-	virtual IO_ERR decode(DataInputStreamSP compressSrc, DataOutputStreamSP &uncompressResult, const CompressionFactory::Header &header);
-	virtual IO_ERR encodeContent(const VectorSP &vec, const DataOutputStreamSP &compressResult, CompressionFactory::Header &header, bool checkSum);
-	~CompressLZ4();
+	virtual IO_ERR decode(DataInputStreamSP compressSrc, DataOutputStreamSP &uncompressResult, const CompressionFactory::Header &header) override;
+	virtual IO_ERR encodeContent(const VectorSP &vec, const DataOutputStreamSP &compressResult, CompressionFactory::Header &header, bool checkSum) override;
+	virtual ~CompressLZ4() override;
 private:
 	char * newBuffer(int size);
 	std::vector<char*> tempBufList_;
 };
 
 class CompressDeltaofDelta : public CompressEncoderDecoder {
 public:
-	virtual IO_ERR decode(DataInputStreamSP compressSrc, DataOutputStreamSP &uncompressResult, const CompressionFactory::Header &header);
-	virtual IO_ERR encodeContent(const VectorSP &vec, const DataOutputStreamSP &compressResult, CompressionFactory::Header &header, bool checkSum);
-	~CompressDeltaofDelta();
+	virtual IO_ERR decode(DataInputStreamSP compressSrc, DataOutputStreamSP &uncompressResult, const CompressionFactory::Header &header) override;
+	virtual IO_ERR encodeContent(const VectorSP &vec, const DataOutputStreamSP &compressResult, CompressionFactory::Header &header, bool checkSum) override;
+	virtual ~CompressDeltaofDelta() override;
 private:
 	char * newBuffer(int size);
 	std::vector<char*> tempBufList_;

bin/linux_x64/ABI0/ssl102/libDolphinDBAPI.so

@@ -13,6 +13,7 @@
 #include <cassert>
 #include <algorithm>
 #include <memory>
+#include <functional>
 
 #ifdef WINDOWS
 	#include <winsock2.h>
@@ -26,7 +27,7 @@
 #include "SmartPointer.h"
 
 #ifdef _MSC_VER
-	#ifdef _USRDLL	
+	#ifdef _DDBAPIDLL	
 		#define EXPORT_DECL _declspec(dllexport)
 	#else
 		#define EXPORT_DECL __declspec(dllimport)
@@ -59,6 +60,17 @@ class EXPORT_DECL Runnable{
 	std::atomic<char> status_;
 };
 
+class EXPORT_DECL Executor : public Runnable {
+	using Func = std::function<void()>;
+
+public:
+	explicit Executor(Func f) : func_(std::move(f)) {};
+	void run() override { func_(); };
+
+private:
+	Func func_;
+};
+
 class EXPORT_DECL Mutex{
 public:
 	Mutex();
@@ -87,7 +99,7 @@ class EXPORT_DECL RWLock{
 	void releaseRead();
 	void releaseWrite();
 	bool tryAcquireRead();
-	bool tryAcqurieWrite();
+	bool tryAcquireWrite();
 private:
 #ifdef WINDOWS
 	SRWLOCK lock_;
@@ -171,8 +183,8 @@ class TryLockGuard{
 template<class T>
 class RWLockGuard{
 public:
-	RWLockGuard(T* res, bool exclusive, bool acquireLock = true):res_(res), exclusive_(exclusive){
-		if(res != NULL && acquireLock){
+	RWLockGuard(T* res, bool exclusive, bool acquireLock = true):res_(res), exclusive_(exclusive), acquireLock_(acquireLock){
+		if(res != NULL && acquireLock_){
 			if(exclusive_)
 				res_->acquireWrite();
 			else
@@ -181,7 +193,7 @@ class RWLockGuard{
 	}
 
 	void upgrade(){
-		if(res_ != NULL){
+		if(res_ != NULL && acquireLock_){
 			if(exclusive_)
 				return;
 			else{
@@ -193,7 +205,7 @@ class RWLockGuard{
 	}
 
 	~RWLockGuard(){
-		if(res_ != NULL){
+		if(res_ != NULL && acquireLock_){
 			if(exclusive_)
 				res_->releaseWrite();
 			else
@@ -203,6 +215,7 @@ class RWLockGuard{
 private:
 	T* res_;
 	bool exclusive_;
+	bool acquireLock_;
 };
 
 template<class T>