Skip to content

Commit 9a59e66

Browse files
asmyasnikovasmyasnikov
authored
Merge branch 'develop' into copilot/replace-table-service-with-query-service
2 parents 5e9a513 + a021ed5 commit 9a59e66

File tree

2,614 files changed

+44711
-21909
lines changed

Some content is hidden

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

2,614 files changed

+44711
-21909
lines changed

‎.clang-format‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,30 @@ BasedOnStyle: Google
22
DerivePointerAlignment: false
33
IncludeBlocks: Preserve
44
AttributeMacros: ["noexcept"]
5-
IndentRequires: false
5+
IndentRequiresClause: false
66
ColumnLimit: 120
77
IndentWidth: 4
88
TabWidth: 4
99
AccessModifierOffset: -4
1010
BinPackParameters: false
1111
BinPackArguments: false
12-
AllowAllParametersOfDeclarationOnNextLine: false
1312
AlignAfterOpenBracket: BlockIndent
1413
AlwaysBreakAfterDefinitionReturnType: None
15-
PenaltyReturnTypeOnItsOwnLine: 200
14+
AllowAllParametersOfDeclarationOnNextLine: false
15+
AllowAllArgumentsOnNextLine: false
16+
BreakBeforeBraces: Custom
17+
BraceWrapping:
18+
AfterControlStatement: MultiLine
19+
PenaltyBreakOpenParenthesis: 5000000
20+
PenaltyIndentedWhitespace: 100000
21+
PenaltyBreakFirstLessLess: 0
22+
PenaltyBreakScopeResolution: 20000000
23+
PenaltyBreakAssignment: 10000
24+
PenaltyExcessCharacter: 1000000000
25+
PenaltyBreakBeforeFirstCallParameter: 1
26+
PenaltyReturnTypeOnItsOwnLine: 10000000
27+
InsertBraces: true
28+
IndentWrappedFunctionNames: false
29+
30+
# Use unpatched ContinuationIndenter, remove this line if you use vanilla clang-format code
31+
VanillaContinuationIndenter: true

‎.clang-tidy‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ Checks:
7777
,-misc-no-recursion\
7878
,-misc-unconventional-assign-operator\
7979
,-misc-use-anonymous-namespace\
80+
,-misc-override-with-different-visibility\
8081
,-modernize-avoid-c-arrays\
8182
,-modernize-pass-by-value\
8283
,-modernize-return-braced-init-list\
@@ -172,6 +173,10 @@ CheckOptions:
172173
value: CamelCase
173174
- key: readability-identifier-naming.StaticConstantPrefix
174175
value: k
176+
- key: readability-identifier-naming.EnumConstantCase
177+
value: CamelCase
178+
- key: readability-identifier-naming.EnumConstantPrefix
179+
value: k
175180
- key: readability-identifier-naming.MacroDefinitionCase
176181
value: UPPER_CASE
177182
- key: readability-identifier-naming.NamespaceCase

‎.cmake-format.py‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,23 @@
33
# ----------------------------------
44
with section('parse'): # noqa: F821
55
# Specify structure for custom cmake functions
6+
# flags - single word flags
67
# pargs - positional arguments
78
# kwargs - keyword arguments
89
additional_commands = {
10+
'cpmaddpackage': {
11+
'flags': ['EXCLUDE_FROM_ALL', 'DOWNLOAD_ONLY', 'SYSTEM'],
12+
'kwargs': {
13+
'NAME': '*',
14+
'VERSION': '*',
15+
'GITHUB_REPOSITORY': '*',
16+
'URL': '*',
17+
'OPTIONS': '*',
18+
'PATCHES': '*',
19+
'SOURCE_SUBDIR': '*',
20+
'GIT_TAG': '*',
21+
},
22+
},
923
'userver_module': {
1024
'pargs': 1,
1125
'kwargs': {
@@ -28,6 +42,8 @@
2842
'UBENCH_LINK_LIBRARIES': '*',
2943
'UBENCH_ENV': '*',
3044
'POSTGRES_TEST_DSN': '*',
45+
'DEPENDS': '*',
46+
'EMBED_FILES': '*',
3147
},
3248
'flags': ['NO_INSTALL', 'NO_CORE_LINK', 'GENERATE_DYNAMIC_CONFIGS'],
3349
},
@@ -38,6 +54,7 @@
3854
'PROGRAMS': '*',
3955
'FILES': '*',
4056
'DESTINATION': '*',
57+
'RENAME': '*',
4158
},
4259
},
4360
'userver_target_generate_openapi_client': {
@@ -60,6 +77,61 @@
6077
},
6178
'flags': ['UNIQUE'],
6279
},
80+
'userver_testsuite_requirements': {
81+
'flags': ['TESTSUITE_ONLY'],
82+
'kwargs': {
83+
'REQUIREMENTS_FILES_VAR': '*',
84+
},
85+
},
86+
'userver_testsuite_add': {
87+
'kwargs': {
88+
'SERVICE_TARGET': '*',
89+
'TEST_SUFFIX': '*',
90+
'WORKING_DIRECTORY': '*',
91+
'PYTHON_BINARY': '*',
92+
'PRETTY_LOGS': '*',
93+
'SQL_LIBRARY': '*',
94+
'PYTEST_ARGS': '*',
95+
'REQUIREMENTS': '*',
96+
'PYTHONPATH': '*',
97+
'TEST_ENV': '*',
98+
},
99+
},
100+
'userver_testsuite_add_simple': {
101+
'kwargs': {
102+
'SERVICE_TARGET': '*',
103+
'TEST_SUFFIX': '*',
104+
'WORKING_DIRECTORY': '*',
105+
'PYTHON_BINARY': '*',
106+
'PRETTY_LOGS': '*',
107+
'CONFIG_PATH': '*',
108+
'CONFIG_VARS_PATH': '*',
109+
'DYNAMIC_CONFIG_FALLBACK_PATH': '*',
110+
'SECDIST_PATH': '*',
111+
'DUMP_CONFIG': '*',
112+
'SQL_LIBRARY': '*',
113+
'PYTEST_ARGS': '*',
114+
'REQUIREMENTS': '*',
115+
'PYTHONPATH': '*',
116+
'TEST_ENV': '*',
117+
},
118+
},
119+
'userver_add_utest': {
120+
'flags': ['DISABLE_GTEST_XML_OUTPUT'],
121+
'kwargs': {
122+
'NAME': '*',
123+
'DATABASES': '*',
124+
'TEST_ENV': '*',
125+
'TEST_ARGS': '*',
126+
},
127+
},
128+
'userver_add_ubench_test': {
129+
'kwargs': {
130+
'NAME': '*',
131+
'DATABASES': '*',
132+
'TEST_ENV': '*',
133+
},
134+
},
63135
'userver_venv_setup': {
64136
'kwargs': {
65137
'NAME': '*',
@@ -80,6 +152,48 @@
80152
'ENV': '*',
81153
},
82154
},
155+
'_userver_module_begin': {
156+
'flags': ['CPM_DOWNLOAD_ONLY'],
157+
'kwargs': {
158+
'NAME': '*',
159+
'DEBIAN_NAMES': '*',
160+
'FORMULA_NAMES': '*',
161+
'RPM_NAMES': '*',
162+
'PKG_NAMES': '*',
163+
'PACMAN_NAMES': '*',
164+
'PKG_CONFIG_NAMES': '*',
165+
'VERSION': '*',
166+
'CPM_NAME': '*',
167+
'CPM_GIT_TAG': '*',
168+
'CPM_URL': '*',
169+
'CPM_GITHUB_REPOSITORY': '*',
170+
'CPM_VERSION': '*',
171+
'CPM_OPTIONS': '*',
172+
},
173+
},
174+
'_userver_module_find_include': {
175+
'kwargs': {
176+
'NAME': '*',
177+
'PATHS': '*',
178+
'PATH_SUFFIXES': '*',
179+
},
180+
},
181+
'_userver_module_find_library': {
182+
'flags': ['OPTIONAL'],
183+
'kwargs': {
184+
'NAMES': '*',
185+
'PATHS': '*',
186+
},
187+
},
188+
'_userver_module_find_part': {
189+
'flags': ['OPTIONAL'],
190+
'kwargs': {
191+
'PART_TYPE': '*',
192+
'NAMES': '*',
193+
'PATH_SUFFIXES': '*',
194+
'PATHS': '*',
195+
},
196+
},
83197
}
84198

85199
# -----------------------------

‎.github/workflows/alpine.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-24.04
2727

2828
env:
29-
CMAKE_PROGRAM_PATH: /usr/lib/llvm17/bin
29+
CMAKE_PROGRAM_PATH: /usr/lib/llvm19/bin
3030
CMAKE_FLAGS: >-
3131
-DCMAKE_BUILD_TYPE=Debug
3232
-DCMAKE_CXX_STANDARD=17
@@ -46,13 +46,13 @@ jobs:
4646
-DUSERVER_FORCE_DOWNLOAD_GRPC=1
4747
4848
steps:
49-
- uses: actions/checkout@v5
49+
- uses: actions/checkout@v6
5050
with:
5151
fetch-depth: 0
5252

5353
- name: Restore cached directories
5454
id: restore-cache
55-
uses: actions/cache/restore@v4
55+
uses: actions/cache/restore@v5
5656
with:
5757
path: |
5858
${{env.CCACHE_DIR}}
@@ -122,7 +122,7 @@ jobs:
122122
cmake --build build_debug -j$(nproc)
123123
124124
- name: Save cached directories
125-
uses: actions/cache/save@v4
125+
uses: actions/cache/save@v5
126126
with:
127127
path: |
128128
${{env.CCACHE_DIR}}

‎.github/workflows/archlinux.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ jobs:
4646
-DUSERVER_FEATURE_PATCH_LIBPQ=0
4747
4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v6
5050
with:
5151
fetch-depth: 0
5252

5353
- name: Restore cached directories
5454
id: restore-cache
55-
uses: actions/cache/restore@v4
55+
uses: actions/cache/restore@v5
5656
with:
5757
path: |
5858
${{env.CCACHE_DIR}}
@@ -136,7 +136,7 @@ jobs:
136136
cmake --build build_debug -j$(nproc)
137137
138138
- name: Save cached directories
139-
uses: actions/cache/save@v4
139+
uses: actions/cache/save@v5
140140
with:
141141
path: |
142142
${{env.CCACHE_DIR}}

‎.github/workflows/ci-conan.yml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
conanflags: ''
2929
tests-env: 'JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64'
3030
- os: macos-14
31-
conanflags: '-o python_path=python3.11'
31+
conanflags: ''
3232
tests-env: ''
3333

3434
steps:
@@ -56,7 +56,7 @@ jobs:
5656
brew install python@3.11
5757
5858
- name: Checkout
59-
uses: actions/checkout@v5
59+
uses: actions/checkout@v6
6060

6161
- name: Change permissions
6262
if: matrix.container == 'ubuntu:22.04'
@@ -66,15 +66,15 @@ jobs:
6666
6767
- name: Install common packages
6868
run: |
69-
pip install "conan==2.8.0"
69+
pip install conan
7070
pip install numpy
7171
${{ matrix.container && 'sudo -u test-user' }} conan profile detect
7272
${{ matrix.container && 'sudo -u test-user' }} conan profile show
7373
7474
- name: Run conan
7575
run: |
7676
${{ matrix.container && 'sudo -u test-user' }} git config --global --add safe.directory `pwd`
77-
${{ matrix.container && 'sudo -u test-user' }} conan create . --build=missing -s:a compiler.cppstd=17 -pr:b=default ${{matrix.conanflags}}
77+
${{ matrix.container && 'sudo -u test-user' }} conan create . --update --build=missing --version=`cat version.txt` -s:a compiler.cppstd=17 -pr:b=default ${{matrix.conanflags}}
7878
7979
- name: Install test dependencies
8080
if: matrix.os == 'ubuntu-22.04'
@@ -86,21 +86,25 @@ jobs:
8686
| sudo tee -a /etc/apt/sources.list.d/mongodb-org-7.0.list
8787
8888
sudo DEBIAN_FRONTEND=noninteractive apt update
89-
sudo DEBIAN_FRONTEND=noninteractive apt install -y postgresql redis mongodb-org mongodb-mongosh locales
89+
sudo DEBIAN_FRONTEND=noninteractive apt install -y postgresql libpq-dev redis mongodb-org mongodb-mongosh locales
9090
${{ matrix.container && 'sudo locale-gen en_US.UTF-8' }}
9191
${{ matrix.container && 'update-locale LC_ALL="en_US.UTF-8" LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8"' }}
9292
sudo ./scripts/kafka/ubuntu_install_kafka.sh
9393
sudo ./scripts/rabbitmq/ubuntu_install_rabbitmq_server.sh
9494
9595
- name: Test userver conan package
9696
run: |-
97+
mv libraries/easy/samples/0_hello_world samples/
98+
mv libraries/easy/samples/1_hi samples/
9799
mv libraries/easy/samples/3_json samples/
98100
mv scripts/tests/conanfile.py samples/
99101
rm -rf userver/cmake/
100102
cd samples/
101103
102104
USERVER_VERSION=$(${{ matrix.container && 'sudo -u test-user' }} conan list -c -v quiet userver/* | tail -n 1)
103105
for SAMPLE in \
106+
0_hello_world \
107+
1_hi \
104108
3_json \
105109
chaotic_service \
106110
embedded_files \
@@ -116,7 +120,7 @@ jobs:
116120
s3api \
117121
; do
118122
mv conanfile.py $SAMPLE/
119-
echo "Run: ${{ matrix.container && 'sudo -u test-user' }} ${{matrix.tests-env}} conan test $SAMPLE/ --build=never -s:a compiler.cppstd=17 -pr:b=default ${{matrix.conanflags}} ${USERVER_VERSION}"
120-
${{ matrix.container && 'sudo -u test-user' }} ${{matrix.tests-env}} conan test $SAMPLE/ --build=never -s:a compiler.cppstd=17 -pr:b=default ${{matrix.conanflags}} ${USERVER_VERSION}
123+
echo "Run: ${{ matrix.container && 'sudo -u test-user' }} ${{matrix.tests-env}} conan test --build=never -s:a compiler.cppstd=17 -pr:b=default ${{matrix.conanflags}} $SAMPLE/ ${USERVER_VERSION}"
124+
${{ matrix.container && 'sudo -u test-user' }} ${{matrix.tests-env}} conan test --build=never -s:a compiler.cppstd=17 -pr:b=default ${{matrix.conanflags}} $SAMPLE/ ${USERVER_VERSION}
121125
mv $SAMPLE/conanfile.py ./
122126
done

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ jobs:
104104
runs-on: ${{matrix.os}}
105105

106106
steps:
107-
- uses: actions/checkout@v5
107+
- uses: actions/checkout@v6
108108

109109
- name: Restore cached directories
110110
id: restore-cache
111-
uses: actions/cache/restore@v4
111+
uses: actions/cache/restore@v5
112112
with:
113113
path: |
114114
${{env.CCACHE_DIR}}
@@ -220,7 +220,7 @@ jobs:
220220
cmake --build . -j $(nproc)
221221
222222
- name: Save cached directories
223-
uses: actions/cache/save@v4
223+
uses: actions/cache/save@v5
224224
with:
225225
path: |
226226
${{env.CCACHE_DIR}}

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v5
28+
uses: actions/checkout@v6
2929

3030
- name: Initialize CodeQL
3131
uses: github/codeql-action/init@v4

‎.github/workflows/debian.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ jobs:
7777
-DUSERVER_CHAOTIC_GOLDEN_TESTS=OFF
7878
7979
steps:
80-
- uses: actions/checkout@v4
80+
- uses: actions/checkout@v6
8181
with:
8282
fetch-depth: 0
8383

8484
- name: Restore cached directories
8585
id: restore-cache
86-
uses: actions/cache/restore@v4
86+
uses: actions/cache/restore@v5
8787
with:
8888
path: |
8989
${{env.CCACHE_DIR}}
@@ -141,7 +141,7 @@ jobs:
141141
cmake --build build_debug --parallel $(nproc)
142142
143143
- name: Save cached directories
144-
uses: actions/cache/save@v4
144+
uses: actions/cache/save@v5
145145
with:
146146
path: |
147147
${{env.CCACHE_DIR}}

0 commit comments

Comments
 (0)