release 3.0.2.2

Author: ShenaMao

.dockerfiles/linux_aarch64/Dockerfile

@@ -3,10 +3,11 @@ RUN yum update -y
 RUN yum install -y libuuid
 RUN yum install -y libuuid-devel
 RUN yum install -y devtoolset-8-gcc-c++
+RUN yum install -y wget
 ENV PATH=/opt/rh/devtoolset-8/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 WORKDIR /tmp
-RUN curl https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz > openssl-1.0.2u.tar.gz
+RUN wget https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz
 RUN tar -xzf openssl-1.0.2u.tar.gz
 WORKDIR /tmp/openssl-1.0.2u
 ENV CFLAGS=-fPIC
@@ -15,4 +16,5 @@ RUN make -j
 RUN make install
 ENV OPENSSL_ROOT_DIR=/usr/local/openssl
 
+WORKDIR /
 

.dockerfiles/linux_x86_64/Dockerfile

@@ -3,10 +3,11 @@ RUN yum update -y
 RUN yum install -y libuuid
 RUN yum install -y libuuid-devel
 RUN yum install -y devtoolset-8-gcc-c++.x86_64
+RUN yum install -y wget
 ENV PATH=/opt/rh/devtoolset-8/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 WORKDIR /tmp
-RUN curl https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz > openssl-1.0.2u.tar.gz
+RUN wget https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz
 RUN tar -xzf openssl-1.0.2u.tar.gz
 WORKDIR /tmp/openssl-1.0.2u
 ENV CFLAGS=-fPIC
@@ -15,4 +16,5 @@ RUN make -j
 RUN make install
 ENV OPENSSL_ROOT_DIR=/usr/local/openssl
 
+WORKDIR /
 

.gitlab-ci.yml

@@ -60,7 +60,7 @@ build-Windows-amd64-job:
     - echo $env:CIBW_ENVIRONMENT_WINDOWS
     - echo $env:path
     - echo "COMPILE:"
-    - python -m pip install cibuildwheel==2.15.0
+    - python -m pip install cibuildwheel==2.17.0
     - python -m cibuildwheel --platform windows --output-dir wheelhouse
   artifacts:
     name: "$CI_PROJECT_NAME-$CI_JOB_NAME"

CMakeLists.txt

@@ -96,6 +96,7 @@ target_compile_definitions(${MODULE_NAME}
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/core/include
     ${CMAKE_CURRENT_SOURCE_DIR}/core/thirdparty/abseil/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/core/thirdparty/spdlog/include
     ${OPENSSL_INCLUDE_DIR}
     ${Python_INCLUDE_DIRS}
 )
@@ -136,6 +137,7 @@ if(WIN32)
             PUBLIC NOMINMAX
             PUBLIC _WINDOWS
             PUBLIC _USRDLL
+            PUBLIC FMT_UNICODE=0
         )
 
         get_filename_component(OPENSSL_ROOT_DIR ${OPENSSL_INCLUDE_DIR} DIRECTORY)

core/include/BatchTableWriter.h

@@ -69,7 +69,7 @@ class EXPORT_DECL BatchTableWriter {
      * this function throws an exception. If the type of the parameter and the type of the corresponding column
      * cannot be matched or converted, this function throws an exception. If error is raised on the server,
      * this function throws an exception. If the specified table is being removed, this function throws an exception.
-     * If the background thread fails to write a row, it will print error message to std::cerr and return.
+     * If the background thread fails to write a row, it will print error message to LOG_ERR and return.
      */
     template<typename... Targs>
     void insert(const string& dbName, const string& tableName, Targs... Fargs){

core/include/ConstantImp.h

@@ -27,6 +27,7 @@
 #include "WideInteger.h"
 #include "SysIO.h"
 #include "Matrix.h"
+#include "Logger.h"
 
 
 namespace dolphindb {
@@ -3676,7 +3677,7 @@ class Decimal : public Constant {
             }
         }
         catch(const std::exception& e){
-            std::cerr << "assign decimal fail for " << e.what() << std::endl; 
+            LOG_ERR("assign decimal fail for ", e.what()); 
             return false;
         }
         return true;

core/include/DBConnectionPoolImpl.h

@@ -61,7 +61,7 @@ class DBConnectionPoolImpl{
 
     void shutDown(){
         shutDownFlag_.store(true);
-        ProtectGil pgil(true, "shutDown");
+        py::gil_scoped_release gil;
         latch_->wait();
     }
 

core/include/DdbPythonUtil.h

@@ -67,8 +67,6 @@ class HIDEVISIBILITY PytoDdbRowPool{
     int convertingCount_;
 	std::queue<vector<py::object>*> rows_;
     std::queue<vector<py::object>*> failedRows_;
-    //when main thread call exit, new pGilRelease_ to release GIL, then run can exit
-    SmartPointer<ProtectGil> pGil_;
 };
 
 }

core/include/DecimalHelper.h

@@ -13,6 +13,7 @@ namespace _decimal_util {
 using namespace dolphindb;
 using pybind_dolphindb::int128;
 using decimal_util::exp10_i128;
+using decimal_util::parseString;
 
 
 inline bool isDecimalType(DATA_TYPE type) {

core/include/DolphinDB.h

@@ -72,17 +72,6 @@ using converter::Type;
 using converter::TableChecker;
 using converter::CHILD_VECTOR_OPTION;
 
-class HIDEVISIBILITY ProtectGil{
-public:
-	ProtectGil(bool release = false, const string &name = "");
-	void acquire();
-	~ProtectGil();
-private:
-	string name_;
-	SmartPointer<py::gil_scoped_release> pgilRelease_;
-	bool acquired_;
-	PyGILState_STATE gstate_;
-};
 
 class EXPORT_DECL DBConnection {
 public:
@@ -161,6 +150,7 @@ class EXPORT_DECL DBConnection {
 	const string getSessionId() const;
 	void setProtocol(PROTOCOL protocol);
 	void setShowOutput(bool flag);
+	std::shared_ptr<Logger> getMsgLogger();
 
 private:
     DBConnection(DBConnection& oth); // = delete