Skip to content

Commit 2aa7be7

Browse files
author
reindexer-bot
committed
Merge branch 'test/glibc-debug-debs' into 'develop'
Reduce gblic-debug artifatcs size See merge request itv-backend/reindexer!2296
1 parent f814227 commit 2aa7be7

File tree

1,406 files changed

+202398
-58122
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,406 files changed

+202398
-58122
lines changed

.clang-format

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@ LambdaBodyIndentation: Signature
154154
LineEnding: DeriveLF
155155
MacroBlockBegin: ''
156156
MacroBlockEnd: ''
157+
Macros:
158+
- RX_GET_WITHOUT_MUTEX_ANALYSIS=[]()
159+
- RX_MUTEX_ACCESS=private
157160
MaxEmptyLinesToKeep: 1
158161
NamespaceIndentation: None
159162
ObjCBinPackProtocolList: Auto
@@ -234,6 +237,7 @@ StatementMacros:
234237
- Q_UNUSED
235238
- QT_REQUIRE_VERSION
236239
TabWidth: 4
240+
TypenameMacros: []
237241
UseTab: Always
238242
VerilogBreakBetweenInstancePorts: true
239243
WhitespaceSensitiveMacros:

.github/workflows/test.yml

Lines changed: 29 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,22 @@ jobs:
66
runs-on: windows-latest
77
strategy:
88
matrix:
9-
compiler: ["Visual Studio 17 2022"]
9+
compiler: ['Visual Studio 17 2022', 'MinGW Makefiles']
1010
fail-fast: false
11+
env:
12+
EXTRA_FLAGS:
13+
"${{ matrix.compiler == 'Visual Studio 17 2022' && '-Ax64' || '' }}"
1114
steps:
1215
- name: Checkout repository
1316
uses: actions/checkout@v4
14-
- name: Build Reindexer
15-
run: |
16-
mkdir build && cd build
17-
cmake -G "${{matrix.compiler}}" .. -Ax64
18-
cmake --build . --config Release
19-
cmake --build . --config Release --target face
20-
cmake --build . --config Release --target swagger
21-
cpack
22-
- name: Upload Artifacts
23-
uses: actions/upload-artifact@v4
17+
- name: Install NSIS
18+
uses: repolevedavaj/install-nsis@v1.0.3
2419
with:
25-
name: windows-latest
26-
path: build/*.exe
27-
if-no-files-found: error
28-
29-
build-windows-2019:
30-
runs-on: windows-2019
31-
strategy:
32-
matrix:
33-
compiler: ["Visual Studio 16 2019", "MinGW Makefiles"]
34-
fail-fast: false
35-
steps:
36-
- name: Checkout repository
37-
uses: actions/checkout@v4
20+
nsis-version: '3.11'
3821
- name: Build Reindexer
3922
run: |
4023
mkdir build && cd build
41-
cmake -G "${{matrix.compiler}}" ..
24+
cmake -G "${{matrix.compiler}}" -DBUILD_ANN_INDEXES=builtin .. $EXTRA_FLAGS
4225
cmake --build . --config Release
4326
cmake --build . --config Release --target face
4427
cmake --build . --config Release --target swagger
@@ -47,7 +30,7 @@ jobs:
4730
build:
4831
strategy:
4932
matrix:
50-
os: [ubuntu-22.04, ubuntu-24.04, macos-13]
33+
os: [ubuntu-22.04, ubuntu-24.04, macos-15]
5134
include:
5235
- os: ubuntu-latest
5336
sanitizer: ASAN
@@ -82,7 +65,7 @@ jobs:
8265
mkdir build && cd build
8366
if [[ $OS == ubuntu-latest ]]; then
8467
if [[ $SANITIZER == 'ASAN' ]]; then
85-
cmake -DENABLE_GRPC=ON -DWITH_${{matrix.sanitizer}}=On -DGTEST_SKIP_SHARDING=On ..
68+
cmake -DENABLE_GRPC=ON -DWITH_${{matrix.sanitizer}}=On -DGTEST_SKIP_ASAN_MEMORY_HEAVY=On ..
8669
else
8770
cmake -DENABLE_GRPC=ON -DWITH_${{matrix.sanitizer}}=On ..
8871
fi
@@ -114,7 +97,7 @@ jobs:
11497
test:
11598
strategy:
11699
matrix:
117-
os: [ubuntu-22.04, ubuntu-24.04, macos-13]
100+
os: [ubuntu-22.04, ubuntu-24.04, macos-15]
118101
test: ['C++', 'GO']
119102
include:
120103
- os: ubuntu-latest
@@ -123,14 +106,12 @@ jobs:
123106
- os: ubuntu-latest
124107
sanitizer: ASAN
125108
test: 'GO'
126-
# - os: ubuntu-latest
127-
# sanitizer: TSAN
128-
# cc: gcc-12
129-
# cxx: g++-12
130-
# test: 'C++'
109+
# os: ubuntu-latest
110+
# test: 'C++'
131111
- os: ubuntu-latest
132112
sanitizer: TSAN
133113
test: 'GO'
114+
134115
fail-fast: false
135116
runs-on: ${{matrix.os}}
136117
needs: build
@@ -142,24 +123,24 @@ jobs:
142123
SANITIZER: ${{matrix.sanitizer}}
143124
steps:
144125
- name: Checkout repository
145-
if: ${{ matrix.os != 'macos-13' || matrix.test == 'GO' }}
126+
if: ${{ matrix.os != 'macos-15' || matrix.test == 'GO' }}
146127
uses: actions/checkout@v4
147128
- name: Install Go
148129
uses: actions/setup-go@v5
149-
if: ${{ matrix.os == 'macos-13' && matrix.test == 'GO' }}
130+
if: ${{ matrix.os == 'macos-15' && matrix.test == 'GO' }}
150131
with:
151-
go-version: '1.22.x'
132+
go-version: '1.24.x'
152133
check-latest: true
153134
- name: Download ${{matrix.os}}${{matrix.sanitizer}} Artifacts
154-
if: ${{ matrix.os != 'macos-13' || matrix.test == 'GO' }}
135+
if: ${{ matrix.os != 'macos-15' || matrix.test == 'GO' }}
155136
uses: actions/download-artifact@v4
156137
with:
157138
name: ${{matrix.os}}${{matrix.sanitizer}}
158139
- name: 'Untar Artifacts'
159-
if: ${{ matrix.os != 'macos-13' || matrix.test == 'GO' }}
140+
if: ${{ matrix.os != 'macos-15' || matrix.test == 'GO' }}
160141
run: tar -xvf artifacts.tar
161142
- name: Prepare Environment
162-
if: ${{ matrix.os != 'macos-13' || matrix.test == 'GO' }}
143+
if: ${{ matrix.os != 'macos-15' || matrix.test == 'GO' }}
163144
env:
164145
OS: ${{matrix.os}}
165146
run: |
@@ -174,7 +155,7 @@ jobs:
174155
./.github/workflows/install_gtest_parallel.sh
175156
fi
176157
- name: Tests
177-
if: ${{ matrix.os != 'macos-13' || matrix.test == 'GO' }}
158+
if: ${{ matrix.os != 'macos-15' || matrix.test == 'GO' }}
178159
run: |
179160
if [[ $TEST == 'GO' ]]; then
180161
if [[ $SANITIZER == 'ASAN' ]]; then
@@ -183,7 +164,12 @@ jobs:
183164
if [[ -z "$SANITIZER" ]]; then
184165
go test -timeout 15m ./test/... -bench . -benchmem -benchtime 100ms -seedcount 50000
185166
else
186-
go test -timeout 35m ./test/... -bench . -benchmem -benchtime 100ms -seedcount 50000
167+
export TSAN_OPTIONS="halt_on_error=1 suppressions=$PWD/test/tsan/builtin.tsan.suppressions"
168+
mkdir gotests
169+
# Using preocompiled tests to get readable Thread sanitizer backtraces from builtin C++ library
170+
go test ./test/... -c -o gotests -tags tiny_vectors
171+
./gotests/test.test -test.timeout 35m -test.bench . -test.benchmem -test.benchtime 100ms -seedcount 50000
172+
./gotests/ft.test -test.bench . -test.benchmem -test.benchtime 100ms -seedcount 50000
187173
fi
188174
else
189175
cd build
@@ -219,9 +205,9 @@ jobs:
219205
run: |
220206
cd build
221207
if [[ $OS == ubuntu* ]]; then
222-
sudo dpkg -i reindexer-4-dev*.deb
208+
sudo dpkg -i reindexer-dev*.deb
223209
sudo apt-get install -f
224-
sudo dpkg -i reindexer-4-server*.deb
210+
sudo dpkg -i reindexer-server*.deb
225211
sudo apt-get install -f
226212
else
227213
for f in reindexer-*.tar.gz; do tar -xvzf "$f"; done
@@ -247,4 +233,3 @@ jobs:
247233
run: |
248234
cd pyreindexer
249235
../.github/workflows/test.sh
250-

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ __pycache__
1919
*.so
2020
.pytest_cache/
2121
qa_tests/logs/
22-
qa_tests/logs/
2322
qa_tests/venv/
23+
qa_tests/.venv/
2424

2525
#ignore directory with compile commands
2626
.cache

CMakeLists.txt

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
1-
cmake_minimum_required(VERSION 3.10..3.13)
1+
cmake_minimum_required(VERSION 3.18)
22

33
project(reindexer)
44

55
enable_testing()
66
set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
77
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
8+
set(CMAKE_PCH_WARN_INVALID OFF)
89
set(REINDEXER_SOURCE_PATH ${PROJECT_SOURCE_DIR}/cpp_src)
10+
# Do not scan for C++ modules to save some overhead
11+
set(CMAKE_CXX_SCAN_FOR_MODULES OFF)
912

1013
add_subdirectory(cpp_src)
14+
15+
# uninstall target
16+
if(NOT TARGET uninstall)
17+
configure_file(
18+
"${PROJECT_SOURCE_DIR}/cpp_src/cmake/cmake_uninstall.cmake.in"
19+
"${PROJECT_BINARY_DIR}/cmake_uninstall.cmake"
20+
IMMEDIATE @ONLY)
21+
22+
add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${PROJECT_BINARY_DIR}/cmake_uninstall.cmake)
23+
endif()

appveyor.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)