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.
55 lines
1.8 KiB
XML
55 lines
1.8 KiB
XML
<datastore>
|
|
<access_control_improvements>
|
|
<enable_read_write_grants>1</enable_read_write_grants>
|
|
</access_control_improvements>
|
|
<http_forbid_headers>
|
|
<header>X-Forbidden-Url-Wildcard</header>
|
|
</http_forbid_headers>
|
|
<remote_servers>
|
|
<test_cluster_one_shard_three_replicas_localhost>
|
|
<shard>
|
|
<internal_replication>false</internal_replication>
|
|
<replica>
|
|
<host>127.0.0.1</host>
|
|
<port>9000</port>
|
|
</replica>
|
|
<replica>
|
|
<host>127.0.0.2</host>
|
|
<port>9000</port>
|
|
</replica>
|
|
<replica>
|
|
<host>127.0.0.3</host>
|
|
<port>9000</port>
|
|
</replica>
|
|
</shard>
|
|
</test_cluster_one_shard_three_replicas_localhost>
|
|
<test_cluster_two_shards>
|
|
<shard>
|
|
<replica>
|
|
<host>127.0.0.1</host>
|
|
<port>9000</port>
|
|
</replica>
|
|
</shard>
|
|
<shard>
|
|
<replica>
|
|
<host>127.0.0.2</host>
|
|
<port>9000</port>
|
|
</replica>
|
|
</shard>
|
|
</test_cluster_two_shards>
|
|
</remote_servers>
|
|
|
|
<named_collections>
|
|
<url1>
|
|
<url>http://nginx:80/test_{_partition_id}</url>
|
|
<method>PUT</method>
|
|
<format>TSV</format>
|
|
<structure>column1 UInt32, column2 UInt32, column3 UInt32</structure>
|
|
</url1>
|
|
<url_file>
|
|
<method>PUT</method>
|
|
<structure>column1 UInt32, column2 UInt32, column3 UInt32</structure>
|
|
</url_file>
|
|
</named_collections>
|
|
</datastore>
|