Skip to content

Commit 66543f1

Browse files
committed
feat clickhouse: move schemas to separate files
Tests: протестировано CI commit_hash:ae58b7f8526a331ae9e54ea61915a863afb308ec
1 parent 024153c commit 66543f1

File tree

4 files changed

+35
-29
lines changed

4 files changed

+35
-29
lines changed

.mapping.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@
421421
"clickhouse/library.yaml":"taxi/uservices/userver/clickhouse/library.yaml",
422422
"clickhouse/src/storages/clickhouse/cluster.cpp":"taxi/uservices/userver/clickhouse/src/storages/clickhouse/cluster.cpp",
423423
"clickhouse/src/storages/clickhouse/component.cpp":"taxi/uservices/userver/clickhouse/src/storages/clickhouse/component.cpp",
424+
"clickhouse/src/storages/clickhouse/component.yaml":"taxi/uservices/userver/clickhouse/src/storages/clickhouse/component.yaml",
424425
"clickhouse/src/storages/clickhouse/execution_result.cpp":"taxi/uservices/userver/clickhouse/src/storages/clickhouse/execution_result.cpp",
425426
"clickhouse/src/storages/clickhouse/impl/block_wrapper.cpp":"taxi/uservices/userver/clickhouse/src/storages/clickhouse/impl/block_wrapper.cpp",
426427
"clickhouse/src/storages/clickhouse/impl/block_wrapper.hpp":"taxi/uservices/userver/clickhouse/src/storages/clickhouse/impl/block_wrapper.hpp",

clickhouse/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ userver_module(
1717
"${CMAKE_CURRENT_SOURCE_DIR}/src/storages/tests/utils_test.cpp"
1818
DBTEST_DATABASES clickhouse
1919
DEPENDS core
20+
EMBED_FILES
21+
src/storages/clickhouse/component.yaml
2022
)
2123

2224
target_compile_options(${PROJECT_NAME} PUBLIC "-Wno-error=pedantic")

clickhouse/src/storages/clickhouse/component.cpp

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212

1313
#include <storages/clickhouse/impl/settings.hpp>
1414

15+
#ifndef ARCADIA_ROOT
16+
#include "generated/src/storages/clickhouse/component.yaml.hpp" // Y_IGNORE
17+
#endif
18+
1519
USERVER_NAMESPACE_BEGIN
1620

1721
namespace components {
@@ -43,35 +47,7 @@ ClickHouse::~ClickHouse() { statistics_holder_.Unregister(); }
4347
storages::clickhouse::ClusterPtr ClickHouse::GetCluster() const { return cluster_; }
4448

4549
yaml_config::Schema ClickHouse::GetStaticConfigSchema() {
46-
return yaml_config::MergeSchemas<ComponentBase>(R"(
47-
type: object
48-
description: ClickHouse client component
49-
additionalProperties: false
50-
properties:
51-
secdist_alias:
52-
type: string
53-
description: name of the key in secdist config
54-
initial_pool_size:
55-
type: integer
56-
description: number of connections created initially
57-
defaultDescription: 5
58-
max_pool_size:
59-
type: integer
60-
description: maximum number of created connections
61-
defaultDescription: 10
62-
queue_timeout:
63-
type: string
64-
description: client waiting for a free connection time limit
65-
defaultDescription: 1s
66-
use_secure_connection:
67-
type: boolean
68-
description: whether to use TLS for connections
69-
defaultDescription: true
70-
compression:
71-
type: string
72-
description: compression method to use (none / lz4)
73-
defaultDescription: none
74-
)");
50+
return yaml_config::MergeSchemasFromResource<ComponentBase>("src/storages/clickhouse/component.yaml");
7551
}
7652

7753
} // namespace components
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
type: object
2+
description: ClickHouse client component
3+
additionalProperties: false
4+
properties:
5+
secdist_alias:
6+
type: string
7+
description: name of the key in secdist config
8+
initial_pool_size:
9+
type: integer
10+
description: number of connections created initially
11+
defaultDescription: 5
12+
max_pool_size:
13+
type: integer
14+
description: maximum number of created connections
15+
defaultDescription: 10
16+
queue_timeout:
17+
type: string
18+
description: client waiting for a free connection time limit
19+
defaultDescription: 1s
20+
use_secure_connection:
21+
type: boolean
22+
description: whether to use TLS for connections
23+
defaultDescription: true
24+
compression:
25+
type: string
26+
description: compression method to use (none / lz4)
27+
defaultDescription: none

0 commit comments

Comments
 (0)