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.
61 lines
1.9 KiB
CMake
61 lines
1.9 KiB
CMake
if(NOT OS_LINUX)
|
|
message(STATUS "Not building silk because it requires io_uring (Linux-only)")
|
|
return()
|
|
endif()
|
|
|
|
if(NOT (ARCH_AMD64 OR ARCH_AARCH64))
|
|
message(STATUS "Not building silk because it supports only x86_64 and aarch64")
|
|
return()
|
|
endif()
|
|
|
|
if(USE_MUSL)
|
|
message(STATUS "Not building silk because it requires glibc")
|
|
return()
|
|
endif()
|
|
|
|
# Silk needs support for 128-bit atomics.
|
|
if(ARCH_AMD64 AND X86_ARCH_LEVEL VERSION_LESS 2)
|
|
message(STATUS "Not building silk because it requires x86-64-v2 or higher")
|
|
return()
|
|
endif()
|
|
|
|
if(NOT TARGET ch_contrib::liburing)
|
|
message(STATUS "Not building silk because liburing is disabled")
|
|
return()
|
|
endif()
|
|
|
|
if(NOT TARGET ch_contrib::librseq)
|
|
message(STATUS "Not building silk because librseq is disabled")
|
|
return()
|
|
endif()
|
|
|
|
set(SILK_SOURCE_DIR "${Datastore_SOURCE_DIR}/contrib/silk")
|
|
|
|
# silk-util
|
|
# CONFIGURE_DEPENDS makes Ninja re-run the glob on each build, so a submodule bump
|
|
# that adds or removes sources reconfigures already-existing build directories.
|
|
file(GLOB SILK_UTIL_SOURCES CONFIGURE_DEPENDS "${SILK_SOURCE_DIR}/src/util/*.cpp")
|
|
add_library(_silk_util STATIC ${SILK_UTIL_SOURCES})
|
|
target_include_directories(_silk_util SYSTEM
|
|
PUBLIC "${SILK_SOURCE_DIR}/include"
|
|
PRIVATE "${SILK_SOURCE_DIR}/src"
|
|
)
|
|
target_link_libraries(_silk_util
|
|
PUBLIC boost::headers_only
|
|
PRIVATE ch_contrib::librseq
|
|
)
|
|
add_library(ch_contrib::silk_util ALIAS _silk_util)
|
|
|
|
# silk-fibers
|
|
file(GLOB SILK_FIBERS_SOURCES CONFIGURE_DEPENDS "${SILK_SOURCE_DIR}/src/fibers/*.cpp")
|
|
add_library(_silk_fibers STATIC ${SILK_FIBERS_SOURCES})
|
|
target_include_directories(_silk_fibers SYSTEM
|
|
PUBLIC "${SILK_SOURCE_DIR}/include"
|
|
PRIVATE "${SILK_SOURCE_DIR}/src"
|
|
)
|
|
target_link_libraries(_silk_fibers
|
|
PUBLIC _silk_util
|
|
PRIVATE boost::context ch_contrib::liburing
|
|
)
|
|
add_library(ch_contrib::silk_fibers ALIAS _silk_fibers)
|