mirror of
https://github.com/hanzoai/datastore.git
synced 2026-09-26 13:55:07 +00:00
zeekay
9a90943b8f
13,838 upstream commits, forward from the 26.6.1.1 fork point. 129 conflicts: 37 resolved mechanically (take upstream's file, re-apply the brand sweep) and 92 by hand where our fork and upstream had both changed the same code. The rule throughout: upstream owns the engine, we own the naming and a small set of deliberate deviations. Never resolve by discarding an upstream change — a dropped rename or a missed new parameter becomes a compile error a thousand files away. Deviations verified intact after the merge: ENABLE_XRAY still defaults OFF (CMakeLists.txt:105) X-Datastore-User read by the server (authenticateUserByHTTP.cpp) X-ClickHouse-* in src/ 0 hanzo/research present system.*_log retention bound present ArrowFlight rip held against upstream re-adding it Two things worth naming, because neither shows up as a conflict: src/CMakeLists.txt gained an UNGUARDED `add_object_library(datastore_storages_arrowflight Storages/ArrowFlight)` from upstream, for a directory our gRPC rip deleted. It sat outside every conflict hunk, so a resolver reading only the markers would sail straight past it into a CMake configure error. Removed; the Server/ArrowFlight sibling at line 474 stays because it is inside `if (TARGET ch_contrib::arrow_flight)`. The brand sweep had rewritten github.com/ClickHouse/ClickHouse issue links to github.com/Datastore/Datastore — a dead host. Those point at upstream's own tracker and are restored, alongside the contributors list, sql.clickhouse.com and the ClickHouse Inc copyright: attribution is theirs, not ours to rename. base/glibc-compatibility/memcpy/memcpy.h is deleted, not kept: upstream dropped it for LLVM-libc's, and our only change to it was a comment rebrand.
65 lines
2.6 KiB
CMake
65 lines
2.6 KiB
CMake
option (ENABLE_AZURE_BLOB_STORAGE "Enable Azure blob storage" ${ENABLE_LIBRARIES})
|
|
|
|
if (NOT ENABLE_AZURE_BLOB_STORAGE OR OS_FREEBSD)
|
|
message(STATUS "Not using Azure blob storage")
|
|
return()
|
|
endif()
|
|
|
|
set(AZURE_DIR "${Datastore_SOURCE_DIR}/contrib/azure")
|
|
set(AZURE_SDK_LIBRARY_DIR "${AZURE_DIR}/sdk")
|
|
|
|
file(GLOB AZURE_SDK_SRC
|
|
"${AZURE_SDK_LIBRARY_DIR}/core/azure-core/src/*.cpp"
|
|
"${AZURE_SDK_LIBRARY_DIR}/core/azure-core/src/credentials/*.cpp"
|
|
"${AZURE_SDK_LIBRARY_DIR}/core/azure-core/src/cryptography/*.cpp"
|
|
"${AZURE_SDK_LIBRARY_DIR}/core/azure-core/src/http/*.cpp"
|
|
"${AZURE_SDK_LIBRARY_DIR}/core/azure-core/src/io/*.cpp"
|
|
"${AZURE_SDK_LIBRARY_DIR}/core/azure-core/src/tracing/*.cpp"
|
|
"${AZURE_SDK_LIBRARY_DIR}/identity/azure-identity/src/*.cpp"
|
|
"${AZURE_SDK_LIBRARY_DIR}/storage/azure-storage-blobs/src/*.cpp"
|
|
"${AZURE_SDK_LIBRARY_DIR}/storage/azure-storage-blobs/src/private/*.cpp"
|
|
"${AZURE_SDK_LIBRARY_DIR}/storage/azure-storage-common/src/*.cpp"
|
|
"${AZURE_SDK_LIBRARY_DIR}/storage/azure-storage-files-datalake/src/*.cpp"
|
|
"${AZURE_SDK_LIBRARY_DIR}/storage/azure-storage-files-datalake/src/private/*.cpp"
|
|
)
|
|
|
|
set(AZURE_SDK_INCLUDES
|
|
"${AZURE_SDK_LIBRARY_DIR}/core/azure-core/inc/"
|
|
"${AZURE_SDK_LIBRARY_DIR}/identity/azure-identity/inc/"
|
|
"${AZURE_SDK_LIBRARY_DIR}/storage/azure-storage-common/inc/"
|
|
"${AZURE_SDK_LIBRARY_DIR}/storage/azure-storage-blobs/inc/"
|
|
"${AZURE_SDK_LIBRARY_DIR}/storage/azure-storage-files-datalake/inc/"
|
|
)
|
|
|
|
if (DATASTORE_CLOUD)
|
|
list(APPEND AZURE_SDK_SRC
|
|
"${AZURE_SDK_LIBRARY_DIR}/keyvault/azure-security-keyvault-keys/src/*.cpp"
|
|
"${AZURE_SDK_LIBRARY_DIR}/keyvault/azure-security-keyvault-keys/src/cryptography/*.cpp"
|
|
)
|
|
list(APPEND AZURE_SDK_INCLUDES
|
|
"${AZURE_SDK_LIBRARY_DIR}/keyvault/azure-security-keyvault-keys/inc/"
|
|
"${AZURE_SDK_LIBRARY_DIR}/keyvault/azure-security-keyvault-shared/inc/"
|
|
)
|
|
endif()
|
|
|
|
file(GLOB AZURE_SDK_UNIFIED_SRC
|
|
${AZURE_SDK_SRC}
|
|
)
|
|
|
|
add_library(_azure_sdk ${AZURE_SDK_UNIFIED_SRC})
|
|
|
|
# The default HTTP transport is `AzureSdkGetCustomHttpTransport`, implemented in
|
|
# src/IO/AzureBlobStorage/PocoHTTPClient.cpp and resolved when linking the final binary.
|
|
target_compile_definitions(_azure_sdk PRIVATE BUILD_TRANSPORT_CUSTOM_ADAPTER)
|
|
|
|
# Originally, on Windows azure-core is built with bcrypt and crypt32 by default
|
|
if (TARGET OpenSSL::SSL)
|
|
target_link_libraries(_azure_sdk PRIVATE OpenSSL::Crypto OpenSSL::SSL)
|
|
endif()
|
|
|
|
target_link_libraries(_azure_sdk PRIVATE ch_contrib::libxml2)
|
|
|
|
target_include_directories(_azure_sdk SYSTEM BEFORE PUBLIC ${AZURE_SDK_INCLUDES})
|
|
|
|
add_library(ch_contrib::azure_sdk ALIAS _azure_sdk)
|