Skip to content

Commit c9bde1a

Browse files
committed
feat docs: fix typos
Tests: протестировано CI commit_hash:896d54a214ab1e25af9c8ad67ddd30929cc85972
1 parent 0464dff commit c9bde1a

12 files changed

Lines changed: 37 additions & 31 deletions

File tree

core/functional_tests/metrics/tests/static/metrics_values.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ alerts.config_parse_error: GAUGE 0
44
alerts.dynamic_debug_invalid_location: GAUGE 0
55
alerts.log_reopening_error: GAUGE 0
66

7-
# Info on cahces
7+
# Info on caches
88
cache.any.documents.parse_failures.v2: cache_name=dynamic-config-client-updater RATE 0
99
cache.any.documents.parse_failures.v2: cache_name=sample-cache RATE 0
1010
cache.any.documents.parse_failures: cache_name=dynamic-config-client-updater GAUGE 0

core/include/userver/storages/query.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class Query {
5151

5252
enum class LogMode : unsigned char {
5353
kFull, ///< Output name and optionally statement
54-
kNameOnly, ///< Ouput only name
54+
kNameOnly, ///< Output only name
5555
};
5656

5757
Query() = default;

core/include/userver/utils/trx_tracker.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ USERVER_NAMESPACE_BEGIN
1818
/// database transaction, connection will be held for longer and
1919
/// connection pool will be exhausted. Transaction tracker prevents this
2020
/// by holding counter of active transactions in TaskLocalVariable
21-
/// and checking for active transactions in heavy operaions.
21+
/// and checking for active transactions in heavy operations.
2222
///
2323
/// ## Example usage:
2424
///
@@ -90,7 +90,7 @@ void CheckNoTransactions(std::string_view location);
9090

9191
/// @brief Disable check for active transactions.
9292
///
93-
/// To conciously call a heavy operation in active transaction,
93+
/// To consciously call a heavy operation in active transaction,
9494
/// check can be disabled by creating an instance of this class.
9595
/// Checks will be disabled until every instance either has
9696
/// Reenable() method called or is destroyed.

core/src/engine/coro/marked_allocator.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ static volatile const std::size_t page_size = MarkedAllocator::traits_type::page
88
static volatile std::size_t allocator_stack_size = MarkedAllocator::traits_type::default_size();
99

1010
MarkedAllocator::MarkedAllocator(std::size_t size) : boost::coroutines2::protected_fixedsize_stack(size) {
11-
auto aligment = page_size;
12-
allocator_stack_size = (size + aligment - 1) / aligment * aligment;
11+
auto alignment = page_size;
12+
allocator_stack_size = (size + alignment - 1) / alignment * alignment;
1313
}
1414

1515
} // namespace engine::coro::debug

mongo/src/storages/mongo/collection_mongotest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ UTEST_F(Collection, Read) {
9696
}
9797
{
9898
auto cursor = coll.Find({});
99-
EXPECT_EQ(cursor.GetBatchSize(), 0) << "Deafault value should be 0 (use server side size)";
99+
EXPECT_EQ(cursor.GetBatchSize(), 0) << "Default value should be 0 (use server side size)";
100100
EXPECT_NO_THROW(cursor.SetBatchSize(0)) << "Setting to 0 should be fine";
101101
EXPECT_TRUE(cursor);
102102
EXPECT_TRUE(cursor.HasMore());

postgresql/src/storages/postgres/tests/connlimit_watchdog_pgtest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ UTEST_F(Watchdog, AllPermutations) {
144144
static_assert(
145145
(&pg::ConnlimitWatchdog::StepV1) && (&pg::ConnlimitWatchdog::StepV2),
146146
"Do not remove old versions of StepV*, because there may be users that still use it and they may update "
147-
"userver one day. So we need to make sure that the update (and a rollback) will be successfull."
147+
"userver one day. So we need to make sure that the update (and a rollback) will be successful."
148148
);
149149
// Fill the table by two rows.
150150
EXPECT_EQ(kTestsuiteConnlimit, DoStepV1());

redis/src/storages/redis/impl/redis.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ void Redis::RedisImpl::OnRedisReply(redisAsyncContext* c, void* r, void* privdat
10481048
// Translate to something sensible.
10491049
impl->OnRedisReplyImpl(nullptr, privdata, REDIS_ERR_EOF, "Disconnecting");
10501050
} else if (redis_reply && redis_reply->type == REDIS_REPLY_ERROR && c->err == REDIS_OK) {
1051-
// redis_reply contains error that missmatch Reply status OK.
1051+
// redis_reply contains error that mismatch Reply status OK.
10521052
// Fix the status here to pass the Reply UASSERT checks.
10531053
UASSERT_MSG(
10541054
!c->errstr || c->errstr[0] == '\0', fmt::format("For OK status there's an error string: {}", c->errstr)

redis/src/storages/redis/impl/reply.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ Reply::Reply(std::string command, ReplyData&& reply_data, ReplyStatus reply_stat
250250
UASSERT_MSG(
251251
!IsOk() || !data.IsError(),
252252
fmt::format(
253-
"For command '{}' the ReplyData contains error='{}' that missmatch Reply status kOk", cmd, data.GetError()
253+
"For command '{}' the ReplyData contains error='{}' that mismatch Reply status kOk", cmd, data.GetError()
254254
)
255255
);
256256
}

redis/src/storages/redis/impl/sentinel_query.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -266,52 +266,52 @@ ClusterSlotsResponseStatus ParseClusterSlotsResponse(const ReplyPtr& reply, Clus
266266
std::size_t array_index = 0;
267267
for (const auto& reply_interval : reply->data.GetArray()) {
268268
if (!reply_interval.IsArray()) {
269-
LOG_ERROR() << "Redis CLUSTER SLOTS reply elemet[" << array_index
269+
LOG_ERROR() << "Redis CLUSTER SLOTS reply element[" << array_index
270270
<< "] is not an array: " << reply_interval.ToDebugString();
271271
return ClusterSlotsResponseStatus::kFail;
272272
}
273273

274274
const auto& array = reply_interval.GetArray();
275275
if (array.size() < 3) {
276-
LOG_ERROR() << "Redis CLUSTER SLOTS reply elemet[" << array_index
276+
LOG_ERROR() << "Redis CLUSTER SLOTS reply element[" << array_index
277277
<< "] is an array of size less than 3: " << reply_interval.ToDebugString();
278278
return ClusterSlotsResponseStatus::kFail;
279279
}
280280

281281
if (!array[0].IsInt()) {
282-
LOG_ERROR() << "Redis CLUSTER SLOTS reply elemet[" << array_index
282+
LOG_ERROR() << "Redis CLUSTER SLOTS reply element[" << array_index
283283
<< "][0] is not an int: " << array[0].ToDebugString();
284284
return ClusterSlotsResponseStatus::kFail;
285285
}
286286

287287
if (!array[1].IsInt()) {
288-
LOG_ERROR() << "Redis CLUSTER SLOTS reply elemet[" << array_index
288+
LOG_ERROR() << "Redis CLUSTER SLOTS reply element[" << array_index
289289
<< "][1] is not an int: " << array[1].ToDebugString();
290290
return ClusterSlotsResponseStatus::kFail;
291291
}
292292

293293
for (std::size_t i = 2; i < array.size(); i++) {
294294
if (!array[i].IsArray()) {
295-
LOG_ERROR() << "Redis CLUSTER SLOTS reply elemet[" << array_index << "][" << i
295+
LOG_ERROR() << "Redis CLUSTER SLOTS reply element[" << array_index << "][" << i
296296
<< "] is not an array: " << array[i].ToDebugString();
297297
return ClusterSlotsResponseStatus::kFail;
298298
}
299299

300300
const auto& host_info_array = array[i].GetArray();
301301
if (host_info_array.size() < 2) {
302-
LOG_ERROR() << "Redis CLUSTER SLOTS reply elemet[" << array_index << "][" << i
302+
LOG_ERROR() << "Redis CLUSTER SLOTS reply element[" << array_index << "][" << i
303303
<< "] is an array of size less than 2: " << array[i].ToDebugString();
304304
return ClusterSlotsResponseStatus::kFail;
305305
}
306306

307307
if (!host_info_array[0].IsString()) {
308-
LOG_ERROR() << "Redis CLUSTER SLOTS reply elemet[" << array_index << "][" << i
308+
LOG_ERROR() << "Redis CLUSTER SLOTS reply element[" << array_index << "][" << i
309309
<< "][0] is not a string: " << host_info_array[0].ToDebugString();
310310
return ClusterSlotsResponseStatus::kFail;
311311
}
312312

313313
if (!host_info_array[1].IsInt()) {
314-
LOG_ERROR() << "Redis CLUSTER SLOTS reply elemet[" << array_index << "][" << i
314+
LOG_ERROR() << "Redis CLUSTER SLOTS reply element[" << array_index << "][" << i
315315
<< "][1] is not an int: " << host_info_array[1].ToDebugString();
316316
return ClusterSlotsResponseStatus::kFail;
317317
}
@@ -326,7 +326,7 @@ ClusterSlotsResponseStatus ParseClusterSlotsResponse(const ReplyPtr& reply, Clus
326326
res[slot_interval].master.HostPort() != conn_info.HostPort());
327327
if (is_master_overwritten) {
328328
const auto message = fmt::format(
329-
"Redis CLUSTER SLOTS reply elemet[{}][{}] overwrites master '{}' with '{}'",
329+
"Redis CLUSTER SLOTS reply element[{}][{}] overwrites master '{}' with '{}'",
330330
array_index,
331331
i,
332332
res[slot_interval].master.HostPort().first,

scripts/docs/en/userver/distro_maintainers.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,22 @@
22

33
## Maintainer's role
44

5-
We develop userver framework and take care of our users. We want userver to be available on as much platforms, OSes and distros as possible. It is quite difficult to maintain such complex product as userver working in any environment. It is a difficult engineer problem, but also it is often difficult or impossible to test userver on the target platform because of absent software/hardware.
5+
We develop userver framework and take care of our users. We want userver to be available on as much platforms, OSes and
6+
distros as possible. It is quite difficult to maintain such complex product as userver working in any environment. It
7+
is a difficult engineer problem, but also it is often difficult or impossible to test userver on the target platform
8+
because of absent software/hardware.
69

7-
That's why there are userver distro package maintainers! That's the community role which is responsible for maintaining userver buildable and working in a specific environment.
10+
That's why there are userver distro package maintainers! That's the community role which is responsible for maintaining
11+
userver buildable and working in a specific environment.
812

913
A maintainer should (where possible):
1014
1) keep build dependencies list in @ref scripts/docs/en/deps/ for the distro up-to-date
1115
2) watch for new distro version releases and create new dependency files in @ref scripts/docs/en/deps soon after release
1216
3) cleanup EOL (end of life) distro versions dependency files
1317
4) maintain CI setup in @ref .github/workflows in "green" state
1418

15-
The maintainer is a community role which is not paid, but is a honorable one. You will get a "distro maintainer" label in official userver telegram channels.
19+
The maintainer is a community role which is not paid, but is a honorable one. You will get a "distro maintainer" label
20+
in official userver telegram channels.
1621

1722

1823
## Call for maintainers
@@ -27,7 +32,7 @@ Currently we're looking for maintainers for the following OSes/distros:
2732
6) FreeBSD
2833
7) Conan package
2934

30-
The list is not complete, you may sugest your own distro to maintain.
35+
The list is not complete, you may suggest your own distro to maintain.
3136

3237

3338
## Current maintainer list
@@ -42,7 +47,8 @@ If you feel you're ready to be a maintainer, please contact us by any of the fol
4247
- telegram https://t.me/userver_ru (in Russian)
4348
- telegram https://t.me/userver_en (in English)
4449

45-
Then please make a pull request to [github](https://github.com/userver-framework/userver/) which changes this page and adds you to the "Current maintainer list" section.
50+
Then please make a pull request to [github](https://github.com/userver-framework/userver/) which changes this page and
51+
adds you to the "Current maintainer list" section.
4652

4753

4854
----------

0 commit comments

Comments
 (0)