Skip to content

Commit c15b88f

Browse files
Merge remote-tracking branch 'origin/main' into dev/tclinkenbeard/inline-buggify-function
# Conflicts: # fdbserver/core/ServerKnobs.cpp # fdbserver/tlog/TLogServer.cpp
2 parents b46c584 + c909b59 commit c15b88f

175 files changed

Lines changed: 2585 additions & 1616 deletions

File tree

Some content is hidden

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

.clang-tidy

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
---
22
Checks: >
33
-*,
4+
bugprone-shared-ptr-array-mismatch,
45
bugprone-sizeof-expression,
6+
bugprone-string-constructor,
7+
bugprone-suspicious-memory-comparison,
8+
bugprone-suspicious-memset-usage,
9+
bugprone-suspicious-semicolon,
510
bugprone-suspicious-string-compare,
11+
bugprone-unique-ptr-array-mismatch,
612
bugprone-use-after-move,
713
modernize-use-auto,
814
modernize-use-equals-default,
915
modernize-use-override,
1016
modernize-use-using,
1117
performance-for-range-copy,
18+
performance-move-const-arg,
1219
readability-container-contains,
1320
readability-const-return-type,
1421
readability-container-size-empty,
File renamed without changes.

.github/workflows/stale.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,5 @@ jobs:
1919
days-before-pr-stale: 150
2020
days-before-close: 14
2121
days-before-issue-stale: 5475 # 15 years, basically disabled for issues
22-
# throttled to 20 per day
23-
operations-per-run: 20
22+
operations-per-run: 80 # operating on one PR can use multiple "operations"
2423
ascending: true

.github/workflows/windows-boost-test.yml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,44 @@ name: Windows Boost CONFIG Test
22

33
on:
44
pull_request:
5+
branches:
6+
- main
57
push:
68
branches:
7-
- 'test-*'
9+
- main
810
- 'boost-*'
9-
workflow_dispatch:
1011

1112
permissions:
1213
contents: read
1314

1415
jobs:
1516
test-windows-boost:
1617
name: Test Boost CONFIG Mode on Windows
17-
runs-on: windows-latest
18-
18+
runs-on: windows-2025
19+
1920
steps:
2021
- name: Checkout code
2122
uses: actions/checkout@v4
22-
23-
- name: Setup CMake
24-
uses: lukka/get-cmake@latest
25-
23+
2624
- name: Install Boost via vcpkg
25+
shell: cmd
2726
run: |
28-
vcpkg install boost-filesystem:x64-windows boost-iostreams:x64-windows boost-serialization:x64-windows boost-system:x64-windows boost-program-options:x64-windows boost-url:x64-windows boost-context:x64-windows lz4:x64-windows
27+
vcpkg install boost-filesystem:x64-windows ^
28+
boost-iostreams:x64-windows ^
29+
boost-serialization:x64-windows ^
30+
boost-system:x64-windows ^
31+
boost-program-options:x64-windows ^
32+
boost-url:x64-windows ^
33+
boost-context:x64-windows ^
34+
lz4:x64-windows
35+
36+
- name: Configure and Build FoundationDB
2937
shell: cmd
30-
31-
- name: Configure and Build FoundationDB (without Swift)
3238
run: |
3339
mkdir build
3440
cd build
35-
cmake .. -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DWITH_SWIFT=OFF -DBUILD_TESTING=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_CSHARP=OFF
36-
shell: cmd
37-
38-
- name: Verify Build Success
39-
run: |
40-
echo "Build completed successfully - Boost CONFIG mode works on Windows!"
41-
shell: cmd
42-
41+
cmake .. -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake ^
42+
-DCMAKE_BUILD_TYPE=Release -DWITH_SWIFT=OFF -DBUILD_TESTING=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_CSHARP=OFF
43+
4344
- name: Report Success
4445
run: echo "✓ Boost CONFIG mode working on Windows!"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Building FoundationDB requires at least 8GB of memory. More memory is needed whe
140140

141141
### macOS
142142

143-
The build under macOS will work the same way as on Linux. [Homebrew](https://brew.sh/) can be used to install the `boost` library and the `ninja` build tool. Be carefull, curent main branch use boost 1.86, do install this version or just let cmake download one. Also, if swift binding is not interest, use -DBUILD_SWIFT_BINDING=OFF.
143+
The build under macOS will work the same way as on Linux. [Homebrew](https://brew.sh/) can be used to install the `boost` library and the `ninja` build tool. Be careful, current main branch uses boost 1.86, do install this version or just let cmake download one. Also, if the Swift binding is not of interest, use -DBUILD_SWIFT_BINDING=OFF.
144144

145145
```sh
146146
cmake -G Ninja <FDB_SOURCE_DIR> -B <BUILD_DIR>

bindings/c/test/apitester/TesterApiWorkload.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class ApiWorkload : public WorkloadBase, IWorkloadControlIfc {
105105
// In-memory store maintaining expected database state
106106
std::unordered_map<std::optional<int>, KeyValueStore> stores;
107107

108-
ApiWorkload(const WorkloadConfig& config);
108+
explicit ApiWorkload(const WorkloadConfig& config);
109109

110110
// Methods for generating random keys and values
111111
fdb::Key randomKeyName();

bindings/c/test/apitester/TesterAtomicOpsCorrectnessWorkload.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ using fdb::ValueRef;
3434

3535
class AtomicOpsCorrectnessWorkload : public ApiWorkload {
3636
public:
37-
AtomicOpsCorrectnessWorkload(const WorkloadConfig& config) : ApiWorkload(config) {}
37+
explicit AtomicOpsCorrectnessWorkload(const WorkloadConfig& config) : ApiWorkload(config) {}
3838

3939
private:
4040
using IntAtomicOpFunction = std::function<uint64_t(uint64_t, uint64_t)>;

bindings/c/test/apitester/TesterCancelTransactionWorkload.cpp

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

2626
class CancelTransactionWorkload : public ApiWorkload {
2727
public:
28-
CancelTransactionWorkload(const WorkloadConfig& config) : ApiWorkload(config) {}
28+
explicit CancelTransactionWorkload(const WorkloadConfig& config) : ApiWorkload(config) {}
2929

3030
private:
3131
enum OpType { OP_CANCEL_GET, OP_CANCEL_AFTER_FIRST_GET, OP_LAST = OP_CANCEL_AFTER_FIRST_GET };

bindings/c/test/apitester/TesterCorrectnessWorkload.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace FdbApiTester {
2727

2828
class ApiCorrectnessWorkload : public ApiWorkload {
2929
public:
30-
ApiCorrectnessWorkload(const WorkloadConfig& config) : ApiWorkload(config) {}
30+
explicit ApiCorrectnessWorkload(const WorkloadConfig& config) : ApiWorkload(config) {}
3131

3232
private:
3333
enum OpType {

bindings/c/test/apitester/TesterExampleWorkload.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class SetAndGetWorkload : public WorkloadBase {
2828
fdb::Key keyPrefix;
2929
Random random;
3030

31-
SetAndGetWorkload(const WorkloadConfig& config) : WorkloadBase(config) {
31+
explicit SetAndGetWorkload(const WorkloadConfig& config) : WorkloadBase(config) {
3232
keyPrefix = fdb::toBytesRef(fmt::format("{}/", workloadId));
3333
}
3434

0 commit comments

Comments
 (0)