quasardb 3.13.6__cp37-cp37m-win_amd64.whl → 3.13.7__cp37-cp37m-win_amd64.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of quasardb might be problematic. Click here for more details.
- quasardb/CMakeFiles/generate.stamp.depend +1 -1
- quasardb/CMakeLists.txt +43 -22
- quasardb/INSTALL.vcxproj +11 -11
- quasardb/INSTALL.vcxproj.filters +2 -2
- quasardb/__init__.py +1 -1
- quasardb/add_boost_test.cmake +43 -0
- quasardb/batch_column.hpp +1 -1
- quasardb/batch_inserter.hpp +1 -1
- quasardb/blob.hpp +1 -1
- quasardb/cluster.hpp +42 -17
- quasardb/cmake_install.cmake +4 -4
- quasardb/concepts.hpp +30 -16
- quasardb/continuous.hpp +1 -1
- quasardb/convert/array.hpp +61 -7
- quasardb/convert/point.hpp +16 -11
- quasardb/convert/range.hpp +19 -25
- quasardb/convert/unicode.hpp +457 -149
- quasardb/convert/value.hpp +87 -18
- quasardb/convert.hpp +1 -1
- quasardb/date/ALL_BUILD.vcxproj +21 -21
- quasardb/date/ALL_BUILD.vcxproj.filters +1 -1
- quasardb/date/CMakeFiles/generate.stamp.depend +1 -1
- quasardb/date/INSTALL.vcxproj +11 -11
- quasardb/date/INSTALL.vcxproj.filters +2 -2
- quasardb/date/cmake_install.cmake +6 -6
- quasardb/date/date.sln +31 -31
- quasardb/date/dateTargets.cmake +2 -2
- quasardb/detail/qdb_resource.hpp +6 -6
- quasardb/detail/ts_column.hpp +1 -1
- quasardb/direct_blob.hpp +1 -1
- quasardb/direct_handle.hpp +1 -1
- quasardb/direct_integer.hpp +1 -1
- quasardb/{version.cpp → double.hpp} +46 -28
- quasardb/entry.hpp +1 -1
- quasardb/error.hpp +14 -10
- quasardb/handle.hpp +1 -1
- quasardb/integer.hpp +1 -1
- quasardb/logger.hpp +1 -1
- quasardb/masked_array.hpp +1 -1
- quasardb/module.cpp +73 -0
- quasardb/module.hpp +24 -0
- quasardb/node.hpp +16 -11
- quasardb/numpy/__init__.py +76 -7
- quasardb/numpy.hpp +1 -1
- quasardb/options.hpp +31 -9
- quasardb/pandas/__init__.py +1 -1
- quasardb/perf.hpp +6 -6
- quasardb/pinned_writer.hpp +1 -5
- quasardb/pybind11/ALL_BUILD.vcxproj +25 -25
- quasardb/pybind11/ALL_BUILD.vcxproj.filters +1 -1
- quasardb/pybind11/CMakeFiles/generate.stamp.depend +4 -4
- quasardb/pybind11/INSTALL.vcxproj +11 -11
- quasardb/pybind11/INSTALL.vcxproj.filters +2 -2
- quasardb/pybind11/cmake_install.cmake +1 -1
- quasardb/pybind11/pybind11.sln +31 -31
- quasardb/pytypes.hpp +2 -2
- quasardb/qdb_api.dll +0 -0
- quasardb/quasardb.pyd +0 -0
- quasardb/query.cpp +3 -3
- quasardb/query.hpp +1 -1
- quasardb/range-v3/ALL_BUILD.vcxproj +25 -25
- quasardb/range-v3/ALL_BUILD.vcxproj.filters +1 -1
- quasardb/range-v3/CMakeFiles/generate.stamp.depend +6 -6
- quasardb/range-v3/INSTALL.vcxproj +11 -11
- quasardb/range-v3/INSTALL.vcxproj.filters +2 -2
- quasardb/range-v3/Range-v3.sln +39 -39
- quasardb/range-v3/cmake_install.cmake +6 -6
- quasardb/range-v3/range-v3-config.cmake +3 -3
- quasardb/range-v3/range.v3.headers.vcxproj +338 -338
- quasardb/range-v3/range.v3.headers.vcxproj.filters +315 -315
- quasardb/reader/ts_row.hpp +1 -1
- quasardb/reader/ts_value.hpp +1 -1
- quasardb/string.hpp +160 -0
- quasardb/table.hpp +1 -1
- quasardb/table_reader.hpp +1 -1
- quasardb/tag.hpp +1 -1
- quasardb/timestamp.hpp +97 -0
- quasardb/utils.hpp +1 -1
- {quasardb-3.13.6.dist-info → quasardb-3.13.7.dist-info}/LICENSE.md +1 -1
- {quasardb-3.13.6.dist-info → quasardb-3.13.7.dist-info}/METADATA +1 -1
- quasardb-3.13.7.dist-info/RECORD +114 -0
- {quasardb-3.13.6.dist-info → quasardb-3.13.7.dist-info}/WHEEL +1 -1
- quasardb/qdb_client.cpp +0 -67
- quasardb/version.hpp +0 -43
- quasardb-3.13.6.dist-info/RECORD +0 -111
- {quasardb-3.13.6.dist-info → quasardb-3.13.7.dist-info}/top_level.txt +0 -0
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
# CMake generation dependency list for this directory.
|
|
2
|
-
|
|
2
|
+
C:/TeamCity/work/283bde3fda0d76e7/thirdparty/CMakeLists.txt
|
quasardb/CMakeLists.txt
CHANGED
|
@@ -3,11 +3,12 @@ project(quasardb)
|
|
|
3
3
|
set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
|
|
4
4
|
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
|
|
5
5
|
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
|
|
6
|
-
set(CMAKE_VERBOSE_MAKEFILE
|
|
6
|
+
set(CMAKE_VERBOSE_MAKEFILE FALSE)
|
|
7
7
|
|
|
8
8
|
include(CheckIPOSupported)
|
|
9
9
|
|
|
10
10
|
option(QDB_LINK_STATIC_LIB "Link qdb_api_static instead of dynamic qdb_api." OFF)
|
|
11
|
+
option(QDB_TESTS_ENABLED "Build quasardb test suite?" OFF)
|
|
11
12
|
|
|
12
13
|
set(PACKAGE_NAME quasardb)
|
|
13
14
|
|
|
@@ -33,11 +34,7 @@ endif()
|
|
|
33
34
|
#
|
|
34
35
|
###
|
|
35
36
|
|
|
36
|
-
|
|
37
37
|
set(QDB_API_NAME qdb_api)
|
|
38
|
-
if (CMAKE_BUILD_TYPE STREQUAL Debug)
|
|
39
|
-
set(QDB_API_NAME qdb_apid)
|
|
40
|
-
endif()
|
|
41
38
|
|
|
42
39
|
message(STATUS "[qdb-api-python] Using qdb api name ${QDB_API_NAME}")
|
|
43
40
|
|
|
@@ -151,6 +148,7 @@ if(CLANG OR GNU)
|
|
|
151
148
|
add_compile_options(
|
|
152
149
|
-Wno-register
|
|
153
150
|
-Wall
|
|
151
|
+
-fconcepts-diagnostics-depth=3
|
|
154
152
|
|
|
155
153
|
$<$<CONFIG:Debug>:-Og>
|
|
156
154
|
$<$<CONFIG:Release>:-O3>
|
|
@@ -265,13 +263,15 @@ endif()
|
|
|
265
263
|
###
|
|
266
264
|
|
|
267
265
|
message(STATUS "[qdb-api-python] Including thirdparty libraries with binary directory ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
|
|
268
|
-
add_subdirectory(../thirdparty/ ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
|
|
269
|
-
|
|
270
266
|
include_directories(SYSTEM ../thirdparty/date/include)
|
|
271
267
|
include_directories(SYSTEM ../thirdparty/range-v3/include)
|
|
272
268
|
|
|
269
|
+
add_subdirectory(../thirdparty/ ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
|
|
270
|
+
|
|
273
271
|
include_directories(SYSTEM qdb/include)
|
|
274
272
|
include_directories(${CMAKE_SOURCE_DIR})
|
|
273
|
+
include_directories(../quasardb/)
|
|
274
|
+
|
|
275
275
|
|
|
276
276
|
#
|
|
277
277
|
# step 2: copy the libraries
|
|
@@ -321,43 +321,43 @@ if(NOT QDB_LINK_STATIC_LIB)
|
|
|
321
321
|
endif()
|
|
322
322
|
endif()
|
|
323
323
|
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
324
|
+
set(QDB_FILES
|
|
325
|
+
batch_inserter.hpp
|
|
326
|
+
blob.hpp
|
|
328
327
|
cluster.hpp
|
|
328
|
+
concepts.hpp
|
|
329
329
|
continuous.cpp
|
|
330
330
|
continuous.hpp
|
|
331
|
+
convert.hpp
|
|
332
|
+
double.hpp
|
|
331
333
|
error.hpp
|
|
332
334
|
entry.hpp
|
|
333
|
-
blob.hpp
|
|
334
335
|
handle.hpp
|
|
336
|
+
logger.hpp
|
|
337
|
+
logger.cpp
|
|
335
338
|
masked_array.hpp
|
|
339
|
+
module.hpp
|
|
340
|
+
module.cpp
|
|
341
|
+
node.hpp
|
|
336
342
|
numpy.hpp
|
|
337
343
|
numpy.cpp
|
|
338
344
|
object_tracker.hpp
|
|
339
345
|
options.hpp
|
|
340
346
|
pinned_writer.cpp
|
|
341
347
|
pinned_writer.hpp
|
|
342
|
-
qdb_client.cpp
|
|
343
348
|
query.hpp
|
|
344
349
|
query.cpp
|
|
350
|
+
string.hpp
|
|
345
351
|
table.cpp
|
|
346
352
|
table.hpp
|
|
347
353
|
table_reader.hpp
|
|
348
|
-
batch_inserter.hpp
|
|
349
|
-
convert.hpp
|
|
350
|
-
traits.hpp
|
|
351
|
-
concepts.hpp
|
|
352
354
|
tag.hpp
|
|
355
|
+
timestamp.hpp
|
|
356
|
+
traits.hpp
|
|
353
357
|
utils.cpp
|
|
354
358
|
utils.hpp
|
|
355
|
-
version.hpp
|
|
356
|
-
version.cpp
|
|
357
|
-
logger.hpp
|
|
358
|
-
logger.cpp
|
|
359
|
-
detail/ts_column.hpp
|
|
360
359
|
detail/qdb_resource.hpp
|
|
360
|
+
detail/ts_column.hpp
|
|
361
361
|
reader/ts_row.hpp
|
|
362
362
|
reader/ts_value.hpp
|
|
363
363
|
utils/blob_deque.hpp
|
|
@@ -366,6 +366,27 @@ pybind11_add_module(
|
|
|
366
366
|
utils/stable_sort.hpp
|
|
367
367
|
)
|
|
368
368
|
|
|
369
|
+
set(QDB_TEST_FILES "")
|
|
370
|
+
|
|
371
|
+
if(QDB_TESTS_ENABLED)
|
|
372
|
+
message(WARNING "\
|
|
373
|
+
------------------------------------------------------------------ \
|
|
374
|
+
[qdb-api-python] Tests enabled -- do not enable for release builds \
|
|
375
|
+
------------------------------------------------------------------ \ ")
|
|
376
|
+
set(QDB_TEST_FILES
|
|
377
|
+
|
|
378
|
+
../tests/conftest.cpp
|
|
379
|
+
../tests/conftest.hpp
|
|
380
|
+
../tests/test_convert.cpp)
|
|
381
|
+
endif()
|
|
382
|
+
|
|
383
|
+
# step 3: build
|
|
384
|
+
pybind11_add_module(
|
|
385
|
+
quasardb
|
|
386
|
+
|
|
387
|
+
${QDB_FILES}
|
|
388
|
+
${QDB_TEST_FILES})
|
|
389
|
+
|
|
369
390
|
target_compile_definitions(quasardb PUBLIC QDB_PY_VERSION="${QDB_PY_VERSION}")
|
|
370
391
|
if(QDB_LINK_STATIC_LIB)
|
|
371
392
|
add_definitions(-DQDB_API_STATIC_LINK=1)
|
quasardb/INSTALL.vcxproj
CHANGED
|
@@ -22,9 +22,9 @@
|
|
|
22
22
|
</ProjectConfiguration>
|
|
23
23
|
</ItemGroup>
|
|
24
24
|
<PropertyGroup Label="Globals">
|
|
25
|
-
<ProjectGuid>{
|
|
25
|
+
<ProjectGuid>{D249A536-8734-311A-9E17-5A2A2D2CA6EF}</ProjectGuid>
|
|
26
26
|
<Keyword>Win32Proj</Keyword>
|
|
27
|
-
<WindowsTargetPlatformVersion>10.0.
|
|
27
|
+
<WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
|
|
28
28
|
<Platform>x64</Platform>
|
|
29
29
|
<ProjectName>INSTALL</ProjectName>
|
|
30
30
|
<VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
|
|
@@ -125,7 +125,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
|
|
|
125
125
|
</PostBuildEvent>
|
|
126
126
|
</ItemDefinitionGroup>
|
|
127
127
|
<ItemGroup>
|
|
128
|
-
<CustomBuild Include="
|
|
128
|
+
<CustomBuild Include="C:\TeamCity\work\283bde3fda0d76e7\build\temp.win-amd64-cpython-37\Release\CMakeFiles\e57c85c78a02c4b9b213b1c7760dda7a\INSTALL_force.rule">
|
|
129
129
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> </Message>
|
|
130
130
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
|
|
131
131
|
cd .
|
|
@@ -137,7 +137,7 @@ exit /b %1
|
|
|
137
137
|
:cmDone
|
|
138
138
|
if %errorlevel% neq 0 goto :VCEnd</Command>
|
|
139
139
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalInputs)</AdditionalInputs>
|
|
140
|
-
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
140
|
+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\TeamCity\work\283bde3fda0d76e7\build\lib.win-amd64-cpython-37\quasardb\CMakeFiles\INSTALL_force</Outputs>
|
|
141
141
|
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
|
|
142
142
|
<VerifyInputsAndOutputsExist Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</VerifyInputsAndOutputsExist>
|
|
143
143
|
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> </Message>
|
|
@@ -151,7 +151,7 @@ exit /b %1
|
|
|
151
151
|
:cmDone
|
|
152
152
|
if %errorlevel% neq 0 goto :VCEnd</Command>
|
|
153
153
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalInputs)</AdditionalInputs>
|
|
154
|
-
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
154
|
+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\TeamCity\work\283bde3fda0d76e7\build\lib.win-amd64-cpython-37\quasardb\CMakeFiles\INSTALL_force</Outputs>
|
|
155
155
|
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
|
|
156
156
|
<VerifyInputsAndOutputsExist Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</VerifyInputsAndOutputsExist>
|
|
157
157
|
<Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'"> </Message>
|
|
@@ -165,7 +165,7 @@ exit /b %1
|
|
|
165
165
|
:cmDone
|
|
166
166
|
if %errorlevel% neq 0 goto :VCEnd</Command>
|
|
167
167
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">%(AdditionalInputs)</AdditionalInputs>
|
|
168
|
-
<Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">
|
|
168
|
+
<Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\TeamCity\work\283bde3fda0d76e7\build\lib.win-amd64-cpython-37\quasardb\CMakeFiles\INSTALL_force</Outputs>
|
|
169
169
|
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
|
|
170
170
|
<VerifyInputsAndOutputsExist Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</VerifyInputsAndOutputsExist>
|
|
171
171
|
<Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'"> </Message>
|
|
@@ -179,20 +179,20 @@ exit /b %1
|
|
|
179
179
|
:cmDone
|
|
180
180
|
if %errorlevel% neq 0 goto :VCEnd</Command>
|
|
181
181
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">%(AdditionalInputs)</AdditionalInputs>
|
|
182
|
-
<Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
|
|
182
|
+
<Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\TeamCity\work\283bde3fda0d76e7\build\lib.win-amd64-cpython-37\quasardb\CMakeFiles\INSTALL_force</Outputs>
|
|
183
183
|
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
|
|
184
184
|
<VerifyInputsAndOutputsExist Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</VerifyInputsAndOutputsExist>
|
|
185
185
|
</CustomBuild>
|
|
186
186
|
</ItemGroup>
|
|
187
187
|
<ItemGroup>
|
|
188
|
-
<ProjectReference Include="
|
|
189
|
-
<Project>{
|
|
188
|
+
<ProjectReference Include="C:\TeamCity\work\283bde3fda0d76e7\build\temp.win-amd64-cpython-37\Release\ZERO_CHECK.vcxproj">
|
|
189
|
+
<Project>{ADAAA102-6CF2-3C33-AF03-CAD8CCB167C4}</Project>
|
|
190
190
|
<Name>ZERO_CHECK</Name>
|
|
191
191
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
|
192
192
|
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
|
193
193
|
</ProjectReference>
|
|
194
|
-
<ProjectReference Include="
|
|
195
|
-
<Project>{
|
|
194
|
+
<ProjectReference Include="C:\TeamCity\work\283bde3fda0d76e7\build\temp.win-amd64-cpython-37\Release\ALL_BUILD.vcxproj">
|
|
195
|
+
<Project>{18BDB32C-076A-3F02-B51D-BC93E919A142}</Project>
|
|
196
196
|
<Name>ALL_BUILD</Name>
|
|
197
197
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
|
198
198
|
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
quasardb/INSTALL.vcxproj.filters
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="utf-8"?>
|
|
2
2
|
<Project ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
3
3
|
<ItemGroup>
|
|
4
|
-
<CustomBuild Include="
|
|
4
|
+
<CustomBuild Include="C:\TeamCity\work\283bde3fda0d76e7\build\temp.win-amd64-cpython-37\Release\CMakeFiles\e57c85c78a02c4b9b213b1c7760dda7a\INSTALL_force.rule">
|
|
5
5
|
<Filter>CMake Rules</Filter>
|
|
6
6
|
</CustomBuild>
|
|
7
7
|
</ItemGroup>
|
|
8
8
|
<ItemGroup>
|
|
9
9
|
<Filter Include="CMake Rules">
|
|
10
|
-
<UniqueIdentifier>{
|
|
10
|
+
<UniqueIdentifier>{A868334F-ED32-3651-8BC1-912EBCFE3DB0}</UniqueIdentifier>
|
|
11
11
|
</Filter>
|
|
12
12
|
</ItemGroup>
|
|
13
13
|
</Project>
|
quasardb/__init__.py
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# pylint: disable=C0103,C0111,C0302,R0903
|
|
2
2
|
|
|
3
|
-
# Copyright (c) 2009-
|
|
3
|
+
# Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
|
|
4
4
|
# All rights reserved.
|
|
5
5
|
#
|
|
6
6
|
# Redistribution and use in source and binary forms, with or without
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
function(add_boost_test_executable NAME COMPONENT)
|
|
2
|
+
add_executable(${NAME}
|
|
3
|
+
${ARGN}
|
|
4
|
+
)
|
|
5
|
+
|
|
6
|
+
# set_target_properties(${NAME} PROPERTIES
|
|
7
|
+
# DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
|
|
8
|
+
|
|
9
|
+
target_link_libraries(${NAME}
|
|
10
|
+
boost_unit_test_framework
|
|
11
|
+
)
|
|
12
|
+
|
|
13
|
+
if($<CONFIG:SanitizeValgrind>)
|
|
14
|
+
add_test(
|
|
15
|
+
NAME ${NAME}
|
|
16
|
+
COMMAND
|
|
17
|
+
valgrind>
|
|
18
|
+
$<$<PLATFORM_ID:Darwin>:--dsymutil=yes>
|
|
19
|
+
--gen-suppressions=all
|
|
20
|
+
./${NAME}
|
|
21
|
+
--log_level=test_suite
|
|
22
|
+
--report_level=detailed
|
|
23
|
+
--build_info=yes
|
|
24
|
+
--detect_memory_leaks=0
|
|
25
|
+
)
|
|
26
|
+
else()
|
|
27
|
+
add_test(
|
|
28
|
+
NAME ${NAME}
|
|
29
|
+
COMMAND
|
|
30
|
+
${NAME}
|
|
31
|
+
--log_level=test_suite
|
|
32
|
+
--report_level=detailed
|
|
33
|
+
--build_info=yes
|
|
34
|
+
--detect_memory_leaks=0
|
|
35
|
+
)
|
|
36
|
+
endif()
|
|
37
|
+
|
|
38
|
+
install(TARGETS ${NAME}
|
|
39
|
+
RUNTIME DESTINATION bin COMPONENT ${COMPONENT}
|
|
40
|
+
LIBRARY DESTINATION lib COMPONENT ${COMPONENT}
|
|
41
|
+
ARCHIVE DESTINATION lib COMPONENT ${COMPONENT}
|
|
42
|
+
)
|
|
43
|
+
endfunction()
|
quasardb/batch_column.hpp
CHANGED
quasardb/batch_inserter.hpp
CHANGED
quasardb/blob.hpp
CHANGED
quasardb/cluster.hpp
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
*
|
|
3
3
|
* Official Python API
|
|
4
4
|
*
|
|
5
|
-
* Copyright (c) 2009-
|
|
5
|
+
* Copyright (c) 2009-2023, quasardb SAS. All rights reserved.
|
|
6
6
|
* All rights reserved.
|
|
7
7
|
*
|
|
8
8
|
* Redistribution and use in source and binary forms, with or without
|
|
@@ -33,6 +33,7 @@
|
|
|
33
33
|
#include "batch_inserter.hpp"
|
|
34
34
|
#include "blob.hpp"
|
|
35
35
|
#include "continuous.hpp"
|
|
36
|
+
#include "double.hpp"
|
|
36
37
|
#include "error.hpp"
|
|
37
38
|
#include "handle.hpp"
|
|
38
39
|
#include "integer.hpp"
|
|
@@ -42,11 +43,12 @@
|
|
|
42
43
|
#include "perf.hpp"
|
|
43
44
|
#include "pinned_writer.hpp"
|
|
44
45
|
#include "query.hpp"
|
|
46
|
+
#include "string.hpp"
|
|
45
47
|
#include "table.hpp"
|
|
46
48
|
#include "table_reader.hpp"
|
|
47
49
|
#include "tag.hpp"
|
|
50
|
+
#include "timestamp.hpp"
|
|
48
51
|
#include "utils.hpp"
|
|
49
|
-
#include "version.hpp"
|
|
50
52
|
#include <qdb/node.h>
|
|
51
53
|
#include <qdb/prefix.h>
|
|
52
54
|
#include <qdb/suffix.h>
|
|
@@ -62,24 +64,27 @@ class cluster
|
|
|
62
64
|
{
|
|
63
65
|
public:
|
|
64
66
|
cluster(const std::string & uri,
|
|
65
|
-
const std::string & user_name
|
|
66
|
-
const std::string & user_private_key
|
|
67
|
-
const std::string & cluster_public_key
|
|
68
|
-
std::
|
|
69
|
-
|
|
67
|
+
const std::string & user_name = {},
|
|
68
|
+
const std::string & user_private_key = {},
|
|
69
|
+
const std::string & cluster_public_key = {},
|
|
70
|
+
const std::string & user_security_file = {},
|
|
71
|
+
const std::string & cluster_public_key_file = {},
|
|
72
|
+
std::chrono::milliseconds timeout = std::chrono::minutes{1},
|
|
73
|
+
bool do_version_check = false)
|
|
70
74
|
: _uri{uri}
|
|
71
75
|
, _handle{make_handle_ptr()}
|
|
72
76
|
, _json_loads{pybind11::module::import("json").attr("loads")}
|
|
73
77
|
, _logger("quasardb.cluster")
|
|
74
78
|
{
|
|
75
|
-
|
|
76
|
-
// the one used during the build
|
|
77
|
-
if (do_version_check)
|
|
79
|
+
if (do_version_check == true)
|
|
78
80
|
{
|
|
79
|
-
|
|
81
|
+
_logger.warn(
|
|
82
|
+
"do_version_check parameter has been deprecated and a no-op. It will be removed from a "
|
|
83
|
+
"future release");
|
|
80
84
|
}
|
|
81
85
|
|
|
82
|
-
options().apply_credentials(user_name, user_private_key, cluster_public_key
|
|
86
|
+
options().apply_credentials(user_name, user_private_key, cluster_public_key, //
|
|
87
|
+
user_security_file, cluster_public_key_file);
|
|
83
88
|
|
|
84
89
|
options().set_timeout(timeout);
|
|
85
90
|
|
|
@@ -175,11 +180,26 @@ public:
|
|
|
175
180
|
return qdb::blob_entry{_handle, alias};
|
|
176
181
|
}
|
|
177
182
|
|
|
183
|
+
qdb::string_entry string(const std::string & alias)
|
|
184
|
+
{
|
|
185
|
+
return qdb::string_entry{_handle, alias};
|
|
186
|
+
}
|
|
187
|
+
|
|
178
188
|
qdb::integer_entry integer(const std::string & alias)
|
|
179
189
|
{
|
|
180
190
|
return qdb::integer_entry{_handle, alias};
|
|
181
191
|
}
|
|
182
192
|
|
|
193
|
+
qdb::double_entry double_(const std::string & alias)
|
|
194
|
+
{
|
|
195
|
+
return qdb::double_entry{_handle, alias};
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
qdb::timestamp_entry timestamp(const std::string & alias)
|
|
199
|
+
{
|
|
200
|
+
return qdb::timestamp_entry{_handle, alias};
|
|
201
|
+
}
|
|
202
|
+
|
|
183
203
|
qdb::table table(const std::string & alias)
|
|
184
204
|
{
|
|
185
205
|
return qdb::table{_handle, alias};
|
|
@@ -360,17 +380,19 @@ static inline void register_cluster(Module & m)
|
|
|
360
380
|
|
|
361
381
|
py::class_<qdb::cluster>(m, "Cluster",
|
|
362
382
|
"Represents a connection to the QuasarDB cluster. ") //
|
|
363
|
-
.def(
|
|
364
|
-
|
|
383
|
+
.def(
|
|
384
|
+
py::init<const std::string &, const std::string &, const std::string &, const std::string &,
|
|
385
|
+
const std::string &, const std::string &, std::chrono::milliseconds, bool>(), //
|
|
365
386
|
py::arg("uri"), //
|
|
366
387
|
py::arg("user_name") = std::string{}, //
|
|
367
388
|
py::arg("user_private_key") = std::string{}, //
|
|
368
389
|
py::arg("cluster_public_key") = std::string{}, //
|
|
390
|
+
py::arg("user_security_file") = std::string{}, //
|
|
391
|
+
py::arg("cluster_public_key_file") = std::string{}, //
|
|
369
392
|
py::arg("timeout") = std::chrono::minutes{1}, //
|
|
370
|
-
py::arg("do_version_check") =
|
|
393
|
+
py::arg("do_version_check") = false) //
|
|
371
394
|
.def("__enter__", &qdb::cluster::enter) //
|
|
372
|
-
.def("__exit__",
|
|
373
|
-
&qdb::cluster::exit) // //
|
|
395
|
+
.def("__exit__", &qdb::cluster::exit) //
|
|
374
396
|
.def("is_open", &qdb::cluster::is_open) //
|
|
375
397
|
.def("uri", &qdb::cluster::uri) //
|
|
376
398
|
.def("node", &qdb::cluster::node) //
|
|
@@ -381,7 +403,10 @@ static inline void register_cluster(Module & m)
|
|
|
381
403
|
.def("node_topology", &qdb::cluster::node_topology) //
|
|
382
404
|
.def("tag", &qdb::cluster::tag) //
|
|
383
405
|
.def("blob", &qdb::cluster::blob) //
|
|
406
|
+
.def("string", &qdb::cluster::string) //
|
|
384
407
|
.def("integer", &qdb::cluster::integer) //
|
|
408
|
+
.def("double", &qdb::cluster::double_) //
|
|
409
|
+
.def("timestamp", &qdb::cluster::timestamp) //
|
|
385
410
|
.def("ts", &qdb::cluster::table) //
|
|
386
411
|
.def("table", &qdb::cluster::table) //
|
|
387
412
|
.def("ts_batch", &qdb::cluster::inserter) //
|
quasardb/cmake_install.cmake
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Install script for directory:
|
|
1
|
+
# Install script for directory: C:/TeamCity/work/283bde3fda0d76e7/thirdparty
|
|
2
2
|
|
|
3
3
|
# Set the install prefix
|
|
4
4
|
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
|
|
@@ -34,9 +34,9 @@ endif()
|
|
|
34
34
|
|
|
35
35
|
if(NOT CMAKE_INSTALL_LOCAL_ONLY)
|
|
36
36
|
# Include the install script for each subdirectory.
|
|
37
|
-
include("
|
|
38
|
-
include("
|
|
39
|
-
include("
|
|
37
|
+
include("C:/TeamCity/work/283bde3fda0d76e7/build/lib.win-amd64-cpython-37/quasardb/date/cmake_install.cmake")
|
|
38
|
+
include("C:/TeamCity/work/283bde3fda0d76e7/build/lib.win-amd64-cpython-37/quasardb/pybind11/cmake_install.cmake")
|
|
39
|
+
include("C:/TeamCity/work/283bde3fda0d76e7/build/lib.win-amd64-cpython-37/quasardb/range-v3/cmake_install.cmake")
|
|
40
40
|
|
|
41
41
|
endif()
|
|
42
42
|
|
quasardb/concepts.hpp
CHANGED
|
@@ -19,12 +19,28 @@ concept range_t =
|
|
|
19
19
|
|
|
20
20
|
template <typename R, typename T>
|
|
21
21
|
concept input_range_t =
|
|
22
|
-
// Ensure we are
|
|
22
|
+
// Ensure we are an input range
|
|
23
23
|
ranges::input_range<R>
|
|
24
24
|
|
|
25
25
|
// Ensure the range carries the correct type.
|
|
26
26
|
&& range_t<R, T>;
|
|
27
27
|
|
|
28
|
+
template <typename R, typename T>
|
|
29
|
+
concept forward_range_t =
|
|
30
|
+
// Ensure we are a forward range
|
|
31
|
+
ranges::forward_range<R>
|
|
32
|
+
|
|
33
|
+
// And delegate the rest of the checks
|
|
34
|
+
&& input_range_t<R, T>;
|
|
35
|
+
|
|
36
|
+
template <typename R, typename T>
|
|
37
|
+
concept sized_range_t =
|
|
38
|
+
// Ensure we are a sized range
|
|
39
|
+
ranges::sized_range<R>
|
|
40
|
+
|
|
41
|
+
// And delegate the rest of the checks
|
|
42
|
+
&& range_t<R, T>;
|
|
43
|
+
|
|
28
44
|
namespace py = pybind11;
|
|
29
45
|
|
|
30
46
|
////////////////////////////////////////////////////////////////////////////////
|
|
@@ -98,21 +114,19 @@ static_assert(not qdb_primitive<qdb_ts_string_point>);
|
|
|
98
114
|
template <typename Dtype>
|
|
99
115
|
concept dtype = std::is_base_of_v<traits::dtype<Dtype::kind>, Dtype>
|
|
100
116
|
|
|
101
|
-
|
|
117
|
+
&& std::is_enum_v<decltype(Dtype::kind)>
|
|
102
118
|
|
|
103
119
|
;
|
|
104
120
|
|
|
105
121
|
template <typename Dtype>
|
|
106
|
-
concept fixed_width_dtype =
|
|
107
|
-
dtype<Dtype>
|
|
122
|
+
concept fixed_width_dtype = dtype<Dtype>
|
|
108
123
|
|
|
109
124
|
// Check base class
|
|
110
125
|
&& std::is_base_of_v<traits::fixed_width_dtype<Dtype::kind, Dtype::size>, Dtype>;
|
|
111
126
|
|
|
112
127
|
// Test dtypes against their size
|
|
113
128
|
template <typename Dtype, py::ssize_t Size>
|
|
114
|
-
concept dtype_of_width = fixed_width_dtype<Dtype> && Dtype::size ==
|
|
115
|
-
Size;
|
|
129
|
+
concept dtype_of_width = fixed_width_dtype<Dtype> && Dtype::size == Size;
|
|
116
130
|
|
|
117
131
|
// 64bit dtype
|
|
118
132
|
template <typename Dtype>
|
|
@@ -133,14 +147,14 @@ concept dtype8 = dtype_of_width<Dtype, 1>;
|
|
|
133
147
|
template <typename Dtype>
|
|
134
148
|
concept datetime64_dtype = fixed_width_dtype<Dtype>
|
|
135
149
|
|
|
136
|
-
|
|
137
|
-
|
|
150
|
+
// Verify base class is datetime64_dtype
|
|
151
|
+
&& std::is_base_of_v<traits::datetime64_dtype<Dtype::precision>, Dtype>
|
|
138
152
|
|
|
139
|
-
|
|
140
|
-
|
|
153
|
+
// datetime64 is always a 64bit object
|
|
154
|
+
&& dtype64<Dtype>
|
|
141
155
|
|
|
142
|
-
|
|
143
|
-
|
|
156
|
+
// It needs to have a precision
|
|
157
|
+
&& std::is_enum_v<decltype(Dtype::precision)>;
|
|
144
158
|
|
|
145
159
|
template <typename Dtype>
|
|
146
160
|
concept variable_width_dtype =
|
|
@@ -159,11 +173,11 @@ concept variable_width_dtype =
|
|
|
159
173
|
template <typename Dtype>
|
|
160
174
|
concept object_dtype = dtype<Dtype>
|
|
161
175
|
|
|
162
|
-
|
|
163
|
-
|
|
176
|
+
// Objects are always fixed width (64-bit pointers, effectively)
|
|
177
|
+
&& fixed_width_dtype<Dtype>
|
|
164
178
|
|
|
165
|
-
|
|
166
|
-
|
|
179
|
+
// Verify base class
|
|
180
|
+
&& std::is_base_of_v<traits::object_dtype<typename Dtype::value_type>, Dtype>;
|
|
167
181
|
|
|
168
182
|
// Trivial dtypes are useful for deciding whether you can use fast memcpy-based
|
|
169
183
|
// conversions, e.g. when numpy's int64 has the exact same representation as
|
quasardb/continuous.hpp
CHANGED