Skip to content

Commit 380d55b

Browse files
novikdnovikd
authored
Merge branch 'master' into remove-plan-streams
2 parents 08aff0b + df0376d commit 380d55b

File tree

1,364 files changed

+35358
-20022
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,364 files changed

+35358
-20022
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@
1616

1717
# Applied Black formatter for Python code
1818
e6f5a3f98b21ba99cf274a9833797889e020a2b3
19+
20+
# Enabling clang-tidy readability-else-no-return rule
21+
67c1e89d90ef576e62f8b1c68269742a3c6f9b1e

‎.github/actionlint.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ self-hosted-runner:
44
- func-tester
55
- func-tester-aarch64
66
- fuzzer-unit-tester
7-
- stress-tester
87
- style-checker
98
- style-checker-aarch64
109
- release-maker

‎.github/workflows/backport_branches.yml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,18 +229,26 @@ jobs:
229229
uses: ./.github/workflows/reusable_test.yml
230230
with:
231231
test_name: Stress test (tsan)
232-
runner_type: stress-tester
232+
runner_type: func-tester
233233
data: ${{ needs.RunConfig.outputs.data }}
234234
#############################################################################################
235235
############################# INTEGRATION TESTS #############################################
236236
#############################################################################################
237-
IntegrationTestsRelease:
238-
needs: [RunConfig, BuilderDebRelease]
237+
IntegrationTestsAsanOldAnalyzer:
238+
needs: [RunConfig, BuilderDebAsan]
239+
if: ${{ !failure() && !cancelled() }}
240+
uses: ./.github/workflows/reusable_test.yml
241+
with:
242+
test_name: Integration tests (asan, old analyzer)
243+
runner_type: func-tester
244+
data: ${{ needs.RunConfig.outputs.data }}
245+
IntegrationTestsTsan:
246+
needs: [RunConfig, BuilderDebTsan]
239247
if: ${{ !failure() && !cancelled() }}
240248
uses: ./.github/workflows/reusable_test.yml
241249
with:
242-
test_name: Integration tests (release)
243-
runner_type: stress-tester
250+
test_name: Integration tests (tsan)
251+
runner_type: func-tester
244252
data: ${{ needs.RunConfig.outputs.data }}
245253
FinishCheck:
246254
if: ${{ !cancelled() }}
@@ -250,7 +258,8 @@ jobs:
250258
- FunctionalStatelessTestAsan
251259
- FunctionalStatefulTestDebug
252260
- StressTestTsan
253-
- IntegrationTestsRelease
261+
- IntegrationTestsTsan
262+
- IntegrationTestsAsanOldAnalyzer
254263
- CompatibilityCheckX86
255264
- CompatibilityCheckAarch64
256265
runs-on: [self-hosted, style-checker]

‎.github/workflows/pull_request.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ jobs:
3333
filter: tree:0
3434
- name: Debug Info
3535
uses: ./.github/actions/debug
36-
- name: Cancel previous Sync PR workflow
37-
run: |
38-
python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --cancel-previous-run
3936
- name: Set pending Sync status
4037
run: |
4138
python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --set-pending-status

‎.github/workflows/release_branches.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -374,39 +374,39 @@ jobs:
374374
uses: ./.github/workflows/reusable_test.yml
375375
with:
376376
test_name: Stress test (asan)
377-
runner_type: stress-tester
377+
runner_type: func-tester
378378
data: ${{ needs.RunConfig.outputs.data }}
379379
StressTestTsan:
380380
needs: [RunConfig, BuilderDebTsan]
381381
if: ${{ !failure() && !cancelled() }}
382382
uses: ./.github/workflows/reusable_test.yml
383383
with:
384384
test_name: Stress test (tsan)
385-
runner_type: stress-tester
385+
runner_type: func-tester
386386
data: ${{ needs.RunConfig.outputs.data }}
387387
StressTestMsan:
388388
needs: [RunConfig, BuilderDebMsan]
389389
if: ${{ !failure() && !cancelled() }}
390390
uses: ./.github/workflows/reusable_test.yml
391391
with:
392392
test_name: Stress test (msan)
393-
runner_type: stress-tester
393+
runner_type: func-tester
394394
data: ${{ needs.RunConfig.outputs.data }}
395395
StressTestUBsan:
396396
needs: [RunConfig, BuilderDebUBsan]
397397
if: ${{ !failure() && !cancelled() }}
398398
uses: ./.github/workflows/reusable_test.yml
399399
with:
400400
test_name: Stress test (ubsan)
401-
runner_type: stress-tester
401+
runner_type: func-tester
402402
data: ${{ needs.RunConfig.outputs.data }}
403403
StressTestDebug:
404404
needs: [RunConfig, BuilderDebDebug]
405405
if: ${{ !failure() && !cancelled() }}
406406
uses: ./.github/workflows/reusable_test.yml
407407
with:
408408
test_name: Stress test (debug)
409-
runner_type: stress-tester
409+
runner_type: func-tester
410410
data: ${{ needs.RunConfig.outputs.data }}
411411
#############################################################################################
412412
############################# INTEGRATION TESTS #############################################
@@ -417,31 +417,31 @@ jobs:
417417
uses: ./.github/workflows/reusable_test.yml
418418
with:
419419
test_name: Integration tests (asan)
420-
runner_type: stress-tester
420+
runner_type: func-tester
421421
data: ${{ needs.RunConfig.outputs.data }}
422422
IntegrationTestsAnalyzerAsan:
423423
needs: [RunConfig, BuilderDebAsan]
424424
if: ${{ !failure() && !cancelled() }}
425425
uses: ./.github/workflows/reusable_test.yml
426426
with:
427427
test_name: Integration tests (asan, old analyzer)
428-
runner_type: stress-tester
428+
runner_type: func-tester
429429
data: ${{ needs.RunConfig.outputs.data }}
430430
IntegrationTestsTsan:
431431
needs: [RunConfig, BuilderDebTsan]
432432
if: ${{ !failure() && !cancelled() }}
433433
uses: ./.github/workflows/reusable_test.yml
434434
with:
435435
test_name: Integration tests (tsan)
436-
runner_type: stress-tester
436+
runner_type: func-tester
437437
data: ${{ needs.RunConfig.outputs.data }}
438438
IntegrationTestsRelease:
439439
needs: [RunConfig, BuilderDebRelease]
440440
if: ${{ !failure() && !cancelled() }}
441441
uses: ./.github/workflows/reusable_test.yml
442442
with:
443443
test_name: Integration tests (release)
444-
runner_type: stress-tester
444+
runner_type: func-tester
445445
data: ${{ needs.RunConfig.outputs.data }}
446446
FinishCheck:
447447
if: ${{ !cancelled() }}

‎CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ set (CMAKE_ASM_FLAGS_RELWITHDEBINFO "${CMAKE_ASM_FLAGS_RELWITHDEBINFO} -O3
339339
set (CMAKE_ASM_FLAGS_DEBUG "${CMAKE_ASM_FLAGS_DEBUG} -O${DEBUG_O_LEVEL} ${DEBUG_INFO_FLAGS} ${CMAKE_ASM_FLAGS_ADD}")
340340

341341
if (OS_DARWIN)
342-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
343342
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-U,_inside_main")
344343
endif()
345344

‎base/base/DecomposedFloat.h‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ struct DecomposedFloat
110110
{
111111
if (!isNegative())
112112
return rhs > 0 ? -1 : 1;
113-
else
114-
return rhs >= 0 ? -1 : 1;
113+
return rhs >= 0 ? -1 : 1;
115114
}
116115

117116
/// The case of the most negative integer
@@ -128,8 +127,7 @@ struct DecomposedFloat
128127

129128
if (mantissa() == 0)
130129
return 0;
131-
else
132-
return -1;
130+
return -1;
133131
}
134132
}
135133

@@ -169,9 +167,8 @@ struct DecomposedFloat
169167
/// Float has no fractional part means that the numbers are equal.
170168
if (large_and_always_integer || (mantissa() & ((1ULL << (Traits::mantissa_bits - normalizedExponent())) - 1)) == 0)
171169
return 0;
172-
else
173-
/// Float has fractional part means its abs value is larger.
174-
return isNegative() ? -1 : 1;
170+
/// Float has fractional part means its abs value is larger.
171+
return isNegative() ? -1 : 1;
175172
}
176173

177174

‎base/base/JSON.cpp‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@ JSON::ElementType JSON::getType() const
205205
Pos after_string = skipString();
206206
if (after_string < ptr_end && *after_string == ':')
207207
return TYPE_NAME_VALUE_PAIR;
208-
else
209-
return TYPE_STRING;
208+
return TYPE_STRING;
210209
}
211210
default:
212211
throw JSONException(std::string("JSON: unexpected char ") + *ptr_begin + ", expected one of '{[tfn-0123456789\"'");
@@ -474,8 +473,7 @@ JSON::Pos JSON::searchField(const char * data, size_t size) const
474473

475474
if (it == end())
476475
return nullptr;
477-
else
478-
return it->data();
476+
return it->data();
479477
}
480478

481479

@@ -487,7 +485,7 @@ bool JSON::hasEscapes() const
487485

488486
if (*pos == '"')
489487
return false;
490-
else if (*pos == '\\')
488+
if (*pos == '\\')
491489
return true;
492490
throw JSONException("JSON: unexpected end of data.");
493491
}
@@ -503,7 +501,7 @@ bool JSON::hasSpecialChars() const
503501

504502
if (*pos == '"')
505503
return false;
506-
else if (pos < ptr_end)
504+
if (pos < ptr_end)
507505
return true;
508506
throw JSONException("JSON: unexpected end of data.");
509507
}
@@ -682,10 +680,9 @@ double JSON::toDouble() const
682680

683681
if (type == TYPE_NUMBER)
684682
return getDouble();
685-
else if (type == TYPE_STRING)
683+
if (type == TYPE_STRING)
686684
return JSON(ptr_begin + 1, ptr_end, level + 1).getDouble();
687-
else
688-
throw JSONException("JSON: cannot convert value to double.");
685+
throw JSONException("JSON: cannot convert value to double.");
689686
}
690687

691688
Int64 JSON::toInt() const
@@ -694,10 +691,9 @@ Int64 JSON::toInt() const
694691

695692
if (type == TYPE_NUMBER)
696693
return getInt();
697-
else if (type == TYPE_STRING)
694+
if (type == TYPE_STRING)
698695
return JSON(ptr_begin + 1, ptr_end, level + 1).getInt();
699-
else
700-
throw JSONException("JSON: cannot convert value to signed integer.");
696+
throw JSONException("JSON: cannot convert value to signed integer.");
701697
}
702698

703699
UInt64 JSON::toUInt() const
@@ -706,10 +702,9 @@ UInt64 JSON::toUInt() const
706702

707703
if (type == TYPE_NUMBER)
708704
return getUInt();
709-
else if (type == TYPE_STRING)
705+
if (type == TYPE_STRING)
710706
return JSON(ptr_begin + 1, ptr_end, level + 1).getUInt();
711-
else
712-
throw JSONException("JSON: cannot convert value to unsigned integer.");
707+
throw JSONException("JSON: cannot convert value to unsigned integer.");
713708
}
714709

715710
std::string JSON::toString() const
@@ -718,11 +713,9 @@ std::string JSON::toString() const
718713

719714
if (type == TYPE_STRING)
720715
return getString();
721-
else
722-
{
723-
Pos pos = skipElement();
724-
return std::string(ptr_begin, pos - ptr_begin);
725-
}
716+
717+
Pos pos = skipElement();
718+
return std::string(ptr_begin, pos - ptr_begin);
726719
}
727720

728721

‎base/base/JSON.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,7 @@ T JSON::getWithDefault(const std::string & key, const T & default_) const
203203

204204
if (key_json.isType<T>())
205205
return key_json.get<T>();
206-
else
207-
return default_;
208-
}
209-
else
210206
return default_;
207+
}
208+
return default_;
211209
}

‎base/base/StringRef.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,19 +151,19 @@ inline bool memequalWide(const char * p1, const char * p2, size_t size)
151151
return unalignedLoad<uint64_t>(p1) == unalignedLoad<uint64_t>(p2)
152152
&& unalignedLoad<uint64_t>(p1 + size - 8) == unalignedLoad<uint64_t>(p2 + size - 8);
153153
}
154-
else if (size >= 4)
154+
if (size >= 4)
155155
{
156156
/// Chunks of 4..7 bytes.
157157
return unalignedLoad<uint32_t>(p1) == unalignedLoad<uint32_t>(p2)
158158
&& unalignedLoad<uint32_t>(p1 + size - 4) == unalignedLoad<uint32_t>(p2 + size - 4);
159159
}
160-
else if (size >= 2)
160+
if (size >= 2)
161161
{
162162
/// Chunks of 2..3 bytes.
163163
return unalignedLoad<uint16_t>(p1) == unalignedLoad<uint16_t>(p2)
164164
&& unalignedLoad<uint16_t>(p1 + size - 2) == unalignedLoad<uint16_t>(p2 + size - 2);
165165
}
166-
else if (size >= 1)
166+
if (size >= 1)
167167
{
168168
/// A single byte.
169169
return *p1 == *p2;

0 commit comments

Comments
 (0)