Skip to content

Commit 6b742bb

Browse files
Merge branch 'master' into system-stack-trace-fix
2 parents d0181a6 + c3fa74a commit 6b742bb

File tree

8,845 files changed

+527666
-102116
lines changed

Some content is hidden

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

8,845 files changed

+527666
-102116
lines changed

.clang-format

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: true
2121
ExperimentalAutoDetectBinPacking: true
2222
UseTab: Never
2323
TabWidth: 4
24-
IndentWidth: 4
2524
Standard: Cpp11
2625
PointerAlignment: Middle
2726
MaxEmptyLinesToKeep: 2

.clang-tidy

Lines changed: 32 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@ Checks: '*,
2323
-bugprone-implicit-widening-of-multiplication-result,
2424
-bugprone-narrowing-conversions,
2525
-bugprone-not-null-terminated-result,
26+
-bugprone-reserved-identifier,
2627
-bugprone-unchecked-optional-access,
2728
2829
-cert-dcl16-c,
30+
-cert-dcl37-c,
31+
-cert-dcl51-cpp,
2932
-cert-err58-cpp,
3033
-cert-msc32-c,
3134
-cert-msc51-cpp,
@@ -38,6 +41,8 @@ Checks: '*,
3841
-clang-analyzer-security.insecureAPI.strcpy,
3942
4043
-cppcoreguidelines-avoid-c-arrays,
44+
-cppcoreguidelines-avoid-const-or-ref-data-members,
45+
-cppcoreguidelines-avoid-do-while,
4146
-cppcoreguidelines-avoid-goto,
4247
-cppcoreguidelines-avoid-magic-numbers,
4348
-cppcoreguidelines-avoid-non-const-global-variables,
@@ -105,6 +110,7 @@ Checks: '*,
105110
-misc-const-correctness,
106111
-misc-no-recursion,
107112
-misc-non-private-member-variables-in-classes,
113+
-misc-confusable-identifiers, # useful but slooow
108114
109115
-modernize-avoid-c-arrays,
110116
-modernize-concat-nested-namespaces,
@@ -125,10 +131,12 @@ Checks: '*,
125131
-portability-simd-intrinsics,
126132
127133
-readability-braces-around-statements,
134+
-readability-convert-member-functions-to-static,
128135
-readability-else-after-return,
129136
-readability-function-cognitive-complexity,
130137
-readability-function-size,
131138
-readability-identifier-length,
139+
-readability-identifier-naming,
132140
-readability-implicit-bool-conversion,
133141
-readability-isolate-declaration,
134142
-readability-magic-numbers,
@@ -141,71 +149,32 @@ Checks: '*,
141149
-readability-use-anyofallof,
142150
143151
-zirkon-*,
144-
145-
-misc-*, # temporarily disabled due to being too slow
146-
# also disable checks in other categories which are aliases of checks in misc-*:
147-
# https://releases.llvm.org/15.0.0/tools/clang/tools/extra/docs/clang-tidy/checks/list.html
148-
-cert-dcl54-cpp, # alias of misc-new-delete-overloads
149-
-hicpp-new-delete-operators, # alias of misc-new-delete-overloads
150-
-cert-fio38-c, # alias of misc-non-copyable-objects
151-
-cert-dcl03-c, # alias of misc-static-assert
152-
-hicpp-static-assert, # alias of misc-static-assert
153-
-cert-err09-cpp, # alias of misc-throw-by-value-catch-by-reference
154-
-cert-err61-cpp, # alias of misc-throw-by-value-catch-by-reference
155-
-cppcoreguidelines-c-copy-assignment-signature, # alias of misc-unconventional-assign-operator
156-
-cppcoreguidelines-non-private-member-variables-in-classes, # alias of misc-non-private-member-variables-in-classes
157152
'
158153

159154
WarningsAsErrors: '*'
160155

161-
# TODO: use dictionary syntax for CheckOptions when minimum clang-tidy level rose to 15
162-
# some-check.SomeOption: 'some value'
163-
# instead of
164-
# - key: some-check.SomeOption
165-
# value: 'some value'
166156
CheckOptions:
167-
- key: readability-identifier-naming.ClassCase
168-
value: CamelCase
169-
- key: readability-identifier-naming.EnumCase
170-
value: CamelCase
171-
- key: readability-identifier-naming.LocalVariableCase
172-
value: lower_case
173-
- key: readability-identifier-naming.StaticConstantCase
174-
value: aNy_CasE
175-
- key: readability-identifier-naming.MemberCase
176-
value: lower_case
177-
- key: readability-identifier-naming.PrivateMemberPrefix
178-
value: ''
179-
- key: readability-identifier-naming.ProtectedMemberPrefix
180-
value: ''
181-
- key: readability-identifier-naming.PublicMemberCase
182-
value: lower_case
183-
- key: readability-identifier-naming.MethodCase
184-
value: camelBack
185-
- key: readability-identifier-naming.PrivateMethodPrefix
186-
value: ''
187-
- key: readability-identifier-naming.ProtectedMethodPrefix
188-
value: ''
189-
- key: readability-identifier-naming.ParameterPackCase
190-
value: lower_case
191-
- key: readability-identifier-naming.StructCase
192-
value: CamelCase
193-
- key: readability-identifier-naming.TemplateTemplateParameterCase
194-
value: CamelCase
195-
- key: readability-identifier-naming.TemplateUsingCase
196-
value: lower_case
197-
- key: readability-identifier-naming.TypeTemplateParameterCase
198-
value: CamelCase
199-
- key: readability-identifier-naming.TypedefCase
200-
value: CamelCase
201-
- key: readability-identifier-naming.UnionCase
202-
value: CamelCase
203-
- key: readability-identifier-naming.UsingCase
204-
value: CamelCase
205-
- key: modernize-loop-convert.UseCxx20ReverseRanges
206-
value: false
207-
- key: performance-move-const-arg.CheckTriviallyCopyableMove
208-
value: false
209-
# Workaround clang-tidy bug: https://github.com/llvm/llvm-project/issues/46097
210-
- key: readability-identifier-naming.TypeTemplateParameterIgnoredRegexp
211-
value: expr-type
157+
readability-identifier-naming.ClassCase: CamelCase
158+
readability-identifier-naming.EnumCase: CamelCase
159+
readability-identifier-naming.LocalVariableCase: lower_case
160+
readability-identifier-naming.StaticConstantCase: aNy_CasE
161+
readability-identifier-naming.MemberCase: lower_case
162+
readability-identifier-naming.PrivateMemberPrefix: ''
163+
readability-identifier-naming.ProtectedMemberPrefix: ''
164+
readability-identifier-naming.PublicMemberCase: lower_case
165+
readability-identifier-naming.MethodCase: camelBack
166+
readability-identifier-naming.PrivateMethodPrefix: ''
167+
readability-identifier-naming.ProtectedMethodPrefix: ''
168+
readability-identifier-naming.ParameterPackCase: lower_case
169+
readability-identifier-naming.StructCase: CamelCase
170+
readability-identifier-naming.TemplateTemplateParameterCase: CamelCase
171+
readability-identifier-naming.TemplateUsingCase: lower_case
172+
readability-identifier-naming.TypeTemplateParameterCase: CamelCase
173+
readability-identifier-naming.TypedefCase: CamelCase
174+
readability-identifier-naming.UnionCase: CamelCase
175+
readability-identifier-naming.UsingCase: CamelCase
176+
modernize-loop-convert.UseCxx20ReverseRanges: false
177+
performance-move-const-arg.CheckTriviallyCopyableMove: false
178+
# Workaround clang-tidy bug: https://github.com/llvm/llvm-project/issues/46097
179+
readability-identifier-naming.TypeTemplateParameterIgnoredRegexp: expr-type
180+
cppcoreguidelines-avoid-do-while.IgnoreMacros: true

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,40 @@
22
A technical comment, you are free to remove or leave it as it is when PR is created
33
The following categories are used in the next scripts, update them accordingly
44
utils/changelog/changelog.py
5-
tests/ci/run_check.py
5+
tests/ci/cancel_and_rerun_workflow_lambda/app.py
66
-->
77
### Changelog category (leave one):
88
- New Feature
99
- Improvement
10-
- Bug Fix (user-visible misbehavior in official stable or prestable release)
1110
- Performance Improvement
1211
- Backward Incompatible Change
1312
- Build/Testing/Packaging Improvement
1413
- Documentation (changelog entry is not required)
14+
- Bug Fix (user-visible misbehavior in an official stable release)
1515
- Not for changelog (changelog entry is not required)
1616

1717

1818
### Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
1919
...
2020

21+
### Documentation entry for user-facing changes
22+
23+
- [ ] Documentation is written (mandatory for new features)
24+
25+
<!---
26+
Directly edit documentation source files in the "docs" folder with the same pull-request as code changes
27+
28+
or
29+
30+
Add a user-readable short description of the changes that should be added to docs.clickhouse.com below.
31+
32+
At a minimum, the following information should be added (but add more as needed).
33+
- Motivation: Why is this function, table engine, etc. useful to ClickHouse users?
34+
35+
- Parameters: If the feature being added takes arguments, options or is influenced by settings, please list them below with a brief explanation.
36+
37+
- Example use: A query or command.
38+
-->
39+
2140

2241
> Information about CI checks: https://clickhouse.com/docs/en/development/continuous-integration/

0 commit comments

Comments
 (0)