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.
20 lines
774 B
XML
20 lines
774 B
XML
<datastore>
|
|
<profiles>
|
|
<default>
|
|
<s3_retry_attempts>5</s3_retry_attempts>
|
|
<backup_restore_s3_retry_attempts>5</backup_restore_s3_retry_attempts>
|
|
<use_statistics>0</use_statistics>
|
|
<!-- Several cases create s3 tables/functions that resolve server-managed credentials, which are
|
|
blocked for user queries by default. Allow it for this test. -->
|
|
<s3_allow_server_credentials_in_user_queries>1</s3_allow_server_credentials_in_user_queries>
|
|
</default>
|
|
</profiles>
|
|
<users>
|
|
<default>
|
|
<password></password>
|
|
<profile>default</profile>
|
|
<named_collection_control>1</named_collection_control>
|
|
</default>
|
|
</users>
|
|
</datastore>
|