Skip to content

Commit 5979a10

Browse files
release 300.2.4
1 parent 3e20070 commit 5979a10

File tree

119 files changed

+11649
-6681
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+11649
-6681
lines changed

CMakeLists.txt

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ if (USE_AERON)
8787
endif()
8888

8989
if (WIN32)
90-
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE NOMINMAX _DDBAPIDLL)
90+
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE _DDBAPIDLL)
9191
target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ws2_32 crypt32)
9292
if (MINGW)
93-
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE WINDOWS _WIN32_WINNT=0x0600)
93+
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE _WIN32_WINNT=0x0600)
9494
endif()
9595
else()
9696
check_include_file_cxx("uuid/uuid.h" HAS_UUID)
@@ -101,22 +101,13 @@ else()
101101
endif()
102102

103103
if (MSVC)
104-
# C4251: Class member of an exported class is not marked dllexport. This is triggered by std::string but we cannot modify STL.
105-
# C4100: Parameter is unused. We should fix this later.
106-
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE /W4 /MP /wd4251 /wd4100)
107-
# Unicode support of fmt (used in spdlog) requires /utf-8 of MSVC.
108-
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE FMT_UNICODE=0)
104+
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE /W4 /MP /Zc:__cplusplus /utf-8)
109105
if (${CMAKE_BUILD_TYPE} MATCHES "Dev")
110106
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE /WX)
111107
endif()
112108
else()
113-
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -Wall)
114-
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:
115-
-Wno-overloaded-virtual # ConstantImp.h
116-
-Wno-inconsistent-missing-override # ConstantImp.h
117-
>)
118-
# Enable Wextra and Wconversion when possible
119-
set(CMAKE_CXX_FLAGS_DEV "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address -Werror -Wpedantic")
109+
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -Wall -Wextra -Wpedantic)
110+
set(CMAKE_CXX_FLAGS_DEV "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address -Werror")
120111
endif()
121112

122113
if (WITH_UNITTEST)
@@ -156,24 +147,19 @@ if (API_TEST)
156147

157148
if(USE_OPENSSL AND OPENSSL_FOUND)
158149
target_compile_definitions(${TEST_BINARY_NAME} PRIVATE TEST_OPENSSL)
159-
target_include_directories(${TEST_BINARY_NAME} PRIVATE ${OPENSSL_INCLUDE_DIR})
160-
target_link_libraries(${TEST_BINARY_NAME} PRIVATE ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
161150
endif()
162151
if(USE_AERON AND HAS_AERON)
163152
target_compile_definitions(${TEST_BINARY_NAME} PRIVATE TEST_AERON)
164-
target_include_directories(${TEST_BINARY_NAME} PRIVATE ${AERON_INCLUDE_DIR})
165-
target_link_directories(${TEST_BINARY_NAME} PRIVATE ${AERON_LIBRARY_DIR})
166-
target_link_libraries(${TEST_BINARY_NAME} PRIVATE ${AERON_LIBRARY})
167153
endif()
168154

169155
if (MSVC)
170156
target_compile_options(${TEST_BINARY_NAME} PRIVATE /W0 /utf-8 /MP /bigobj)
171-
target_compile_definitions(${TEST_BINARY_NAME} PRIVATE WINDOWS NOMINMAX)
157+
target_compile_definitions(${TEST_BINARY_NAME} PRIVATE WINDOWS NOMINMAX WIN32_LEAN_AND_MEAN)
172158
elseif (MINGW)
173-
target_compile_options(${TEST_BINARY_NAME} PRIVATE -w -Wa,-mbig-obj -pthread -std=c++11 -g)
159+
target_compile_options(${TEST_BINARY_NAME} PRIVATE -w -Wa,-mbig-obj -pthread -std=c++11 -g -O0)
174160
target_compile_definitions(${TEST_BINARY_NAME} PRIVATE WINDOWS _WIN32_WINNT=0x0600)
175161
else()
176-
target_compile_options(${TEST_BINARY_NAME} PRIVATE -w -pthread -std=c++11 -g)
162+
target_compile_options(${TEST_BINARY_NAME} PRIVATE -w -pthread -std=c++11 -g -O0)
177163
endif()
178164

179165
if(CMAKE_VERSION VERSION_GREATER "3.27.0")

LICENSE

Lines changed: 0 additions & 201 deletions
This file was deleted.

demo/CMakeLists.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.13)
1+
cmake_minimum_required(VERSION 3.15)
22

33
project(DolphinDBDemo)
44

@@ -11,12 +11,10 @@ target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_
1111
target_link_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib/)
1212
target_link_libraries(${CMAKE_PROJECT_NAME} DolphinDBAPI)
1313

14-
if(UNIX)
15-
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE LINUX)
16-
elseif(WIN32)
17-
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE WINDOWS NOMINMAX FMT_UNICODE=0)
14+
if(WIN32)
15+
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE NOMINMAX WIN32_LEAN_AND_MEAN)
1816
endif()
1917

2018
if (MSVC)
21-
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE /wd4251)
19+
target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE /Zc:__cplusplus /utf-8 /wd4251)
2220
endif()

demo/src/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
using namespace dolphindb;
66
using namespace std;
77

8-
int main(int argc, char* argv[]) {
9-
8+
int main()
9+
{
1010
DBConnection conn;
11-
bool ret = conn.connect("192.168.0.104", 8848);
11+
bool ret = conn.connect("127.0.0.1", 8848);
1212
if (!ret) {
1313
cout << "Failed to connect to the server" << endl;
1414
return 0;

include/AsynWorker.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// SPDX-License-Identifier: Apache-2.0
2+
// Copyright © 2018-2025 DolphinDB, Inc.
13
#pragma once
24

35
#include "Concurrent.h"

include/BatchTableWriter.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
#ifndef BATCHTABLEWRITER_H_
2-
#define BATCHTABLEWRITER_H_
1+
// SPDX-License-Identifier: Apache-2.0
2+
// Copyright © 2018-2025 DolphinDB, Inc.
3+
#pragma once
34

45
#include "Exports.h"
56
#include "Concurrent.h"
@@ -16,6 +17,11 @@
1617
#include <tuple>
1718
#include <cassert>
1819

20+
#ifdef _MSC_VER
21+
#pragma warning( push )
22+
#pragma warning( disable : 4251 )
23+
#endif
24+
1925
namespace dolphindb{
2026

2127
class DBConnection;
@@ -85,7 +91,7 @@ class EXPORT_DECL BatchTableWriter {
8591
if(destTable->destroy)
8692
throw RuntimeException("Failed to insert into table, the table is being removed.");
8793
auto argSize = sizeof...(Fargs);
88-
if(argSize != destTable->columnNum)
94+
if(argSize != static_cast<size_t>(destTable->columnNum))
8995
throw RuntimeException("Failed to insert into table, number of arguments must match the number of columns of table.");
9096
if(argSize == 0)
9197
return;
@@ -123,6 +129,7 @@ class EXPORT_DECL BatchTableWriter {
123129
bool writeTableAllData(SmartPointer<DestTable> destTable,bool partitioned);
124130
void insertRecursive(std::vector<ConstantSP>* row, DestTable* destTable, int colIndex){
125131
assert(colIndex == destTable->columnNum);
132+
std::ignore = colIndex;
126133
RWLockGuard<RWLock> _(&rwLock, false, acquireLock_);
127134
if(destTable->finished){
128135
throw RuntimeException(std::string("Failed to insert data. Error writing data in backgroud thread. Please use getUnwrittenData to get data not written to server and remove talbe (") + destTable->dbName + " " + destTable->tableName + ").");
@@ -149,6 +156,8 @@ class EXPORT_DECL BatchTableWriter {
149156

150157
template<typename T>
151158
ConstantSP createObject(int dataType, T val){
159+
std::ignore = dataType;
160+
std::ignore = val;
152161
throw RuntimeException("Failed to insert data, unsupported data type.");
153162
}
154163
ConstantSP createObject(int dataType, Constant* val);
@@ -184,4 +193,7 @@ class EXPORT_DECL BatchTableWriter {
184193

185194

186195
}
187-
#endif /* BATCHTABLEWRITER_H_ */
196+
197+
#ifdef _MSC_VER
198+
#pragma warning( pop )
199+
#endif

include/Compress.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
// SPDX-License-Identifier: Apache-2.0
2+
// Copyright © 2018-2025 DolphinDB, Inc.
13
#pragma once
2-
#ifndef COMPRESSION_H_
3-
#define COMPRESSION_H_
44

55
#include "Types.h"
66
#include "SysIO.h"
@@ -64,4 +64,3 @@ class CompressDeltaofDelta : public CompressEncoderDecoder {
6464
};
6565

6666
}//dolphindb
67-
#endif//COMPRESSION_H_

0 commit comments

Comments
 (0)