Skip to content

Commit 480a166

Browse files
pniedzielskipniedzielski
authored
Merge branch 'main' into test/fuzzConfirmMessageIterator
Signed-off-by: Patrick M. Niedzielski <pniedzielski@bloomberg.net>
2 parents 0a1825c + 3f23550 commit 480a166

159 files changed

Lines changed: 17960 additions & 8803 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 & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
Checks: bugprone-*,cert-*,clang-analyzer-*,clang-diagnostic-*,cppcoreguidelines-*,modernize-make-*,performance-*,modernize-use-emplace,-bugprone-easily-swappable-parameters,-cppcoreguidelines-avoid-const-or-ref-data-members,-cppcoreguidelines-owning-memory,-cppcoreguidelines-use-default-member-init,-,-performance-enum-size
1+
Checks: bugprone-*,cert-*,clang-analyzer-*,clang-diagnostic-*,cppcoreguidelines-*,modernize-make-*,performance-*,modernize-use-emplace,-bugprone-easily-swappable-parameters,-cppcoreguidelines-avoid-const-or-ref-data-members,-cppcoreguidelines-owning-memory,-cppcoreguidelines-use-default-member-init,-,-performance-enum-size,-performance-noexcept-move-constructor,-cppcoreguidelines-noexcept-move-operations
22
CheckOptions:
33
cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor: true
44
bugprone-string-constructor.StringNames: ::bsl::basic_string; ::std::basic_string; ::std::basic_string_view
55
bugprone-optional-value-conversion.OptionalTypes: ::bsl::optional; ::BloombergLP::bdlb::NullableValue; ::std::optional; ::absl::optional; ::boost::optional
6-
bugprone-capturing-this-in-member-variable.FunctionWrapperTypes: ::bsl::function; ::bsl::move_only_function; ::std::function; ::std::move_only_function;
6+
bugprone-capturing-this-in-member-variable.FunctionWrapperTypes:
7+
::bsl::function; ::bsl::move_only_function; ::std::function; ::std::move_only_function;
78
::boost::function
89
modernize-make-shared.MakeSmartPtrFunction: bsl::make_shared
910
modernize-make-shared.MakeSmartPtrFunctionHeader: bsl_memory.h
@@ -12,7 +13,8 @@ CheckOptions:
1213
modernize-use-emplace.ContainersWithPushBack: ::bsl::vector; ::bsl::list; ::bsl::deque; ::std::vector; ::std::list; ::std::deque
1314
modernize-use-emplace.ContainersWithPush: ::bsl::stack; ::bsl::queue; ::bsl::priority_queue; ::std::stack; ::std::queue; ::std::priority_queue
1415
modernize-use-emplace.ContainersWithPushFront: ::bsl::forward_list; ::bsl::list; ::bsl::deque; ::std::forward_list; ::std::list; ::std::deque
15-
modernize-use-emplace.SmartPointers: ::bsl::shared_ptr; ::bsl::unique_ptr; ::bsl::auto_ptr; ::bsl::weak_ptr; ::std::shared_ptr; ::std::unique_ptr; ::std::auto_ptr;
16+
modernize-use-emplace.SmartPointers:
17+
::bsl::shared_ptr; ::bsl::unique_ptr; ::bsl::auto_ptr; ::bsl::weak_ptr; ::std::shared_ptr; ::std::unique_ptr; ::std::auto_ptr;
1618
::std::weak_ptr
1719
modernize-use-emplace.TupleMakeFunctions: ::bsl::make_pair; ::bsl::make_tuple; ::std::make_pair; ::std::make_tuple
1820
modernize-use-emplace.TupleTypes: ::bsl::pair; ::bsl::tuple; ::std::pair; ::std::tuple
@@ -21,7 +23,7 @@ CheckOptions:
2123
performance-inefficient-vector-operation.VectorLikeClasses: ::bsl::vector; ::std::vector
2224
modernize-use-override.OverrideSpelling: BSLS_KEYWORD_OVERRIDE
2325
modernize-use-noexcept.ReplacementString: BSLS_KEYWORD_NOEXCEPT
24-
WarningsAsErrors: '*'
26+
WarningsAsErrors: "*"
2527
ExtraArgs:
26-
- -Wno-unknown-warning-option
28+
- -Wno-unknown-warning-option
2729
HeaderFilterRegex: .*,.*,.*

‎.github/workflows/lint.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: Lint
22

33
permissions:
44
contents: read
5+
pull-requests: write
56

67
on:
78
pull_request:
@@ -217,6 +218,4 @@ jobs:
217218
version: '21'
218219
database: build/blazingmq
219220
ignore: '.github|src/standalones/s_bmqfuzz'
220-
- name: Fail fast?!
221-
if: steps.linter.outputs.checks-failed > 0
222-
run: exit 1
221+
continue-on-error: true

‎.github/workflows/nightly-fuzz-cron.yaml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,25 @@ jobs:
1919
cxx_standard: cpp23
2020

2121
fuzz_tests:
22-
name: "Fuzz [${{ matrix.request }}]"
22+
name: "Fuzz [${{ matrix.fuzztest }}]"
2323
runs-on: ubuntu-latest
2424
needs: build
2525
timeout-minutes: 90
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
request:
30-
- authentication
31-
- negotiation
32-
- open_queue
33-
- configure_stream
34-
- configure_queue_stream
35-
- put
36-
- confirm
37-
- close_queue
38-
- disconnect
39-
- negotiation_bypass_authentication
29+
fuzztest:
30+
- "test_fuzz_request[authentication]"
31+
- "test_fuzz_request[negotiation]"
32+
- "test_fuzz_request[open_queue]"
33+
- "test_fuzz_request[configure_stream]"
34+
- "test_fuzz_request[configure_queue_stream]"
35+
- "test_fuzz_request[put]"
36+
- "test_fuzz_request[confirm]"
37+
- "test_fuzz_request[close_queue]"
38+
- "test_fuzz_request[disconnect]"
39+
- "test_fuzz_request[negotiation_bypass_authentication]"
40+
- "test_fuzz_properties"
4041
steps:
4142
- uses: actions/checkout@v6
4243

@@ -62,16 +63,16 @@ jobs:
6263
PYTHONPATH: ${{ github.workspace }}/src/python
6364
BLAZINGMQ_BUILD_DIR: ${{ github.workspace }}/build/blazingmq
6465
run: |
65-
pytest src/fuzz-tests/test_fuzz.py \
66+
pytest "src/fuzz-tests/test_fuzz.py::${{ matrix.fuzztest }}" \
6667
-m fuzztest \
67-
-k "test_fuzz_request[${{ matrix.request }}]" \
6868
-v \
6969
--timeout=3600
7070
7171
- name: Upload fuzz logs
7272
if: failure()
7373
uses: actions/upload-artifact@v5
7474
with:
75-
name: fuzz-logs-${{ matrix.request }}
75+
name: fuzz-logs-${{ matrix.fuzztest }}
7676
path: |
7777
src/fuzz-tests/boofuzz-results/
78+
build/blazingmq/src/applications/bmqbrkr/localBMQ/logs/

‎bin/codegen.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ script with the CODEGEN enviornment variable set to the internal codegen tool."
9090
mqbconf)
9191
codegen ./src/groups/mqb/mqbconfm mqbconf.xsd mqbconfm messages
9292
;;
93+
mqbact)
94+
codegen ./src/groups/mqb/mqbact mqbact.xsd mqbact actions
95+
;;
9396
*)
9497
usage
9598
exit 1

‎src/applications/bmqstoragetool/integration-tests/data/queueop_result.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Timestamp : 29OCT2024_14:01:06.000000
99
Epoch : 1730210466
1010
QueueKey : 26DACDC974
11-
AppKey : ** NULL **
11+
AppKey : 0000000000
1212
QueueOpType : CREATION
1313
QLIST OffsetWords: 9
1414

‎src/applications/bmqstoragetool/integration-tests/test_journalfile.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,9 @@ def test_short_json(storagetool, journal_file):
7777
assert res.returncode == EX_OK
7878
json_res = json.loads(res.stdout)
7979
assert json_res["MessageRecords"] == "2"
80-
assert TEST_GUID_1.decode() in json_res["Records"]
81-
assert TEST_GUID_2.decode() in json_res["Records"]
80+
guids = [r["GUID"] for r in json_res["Records"] if "GUID" in r]
81+
assert TEST_GUID_1.decode() in guids
82+
assert TEST_GUID_2.decode() in guids
8283

8384

8485
def test_detail_result(storagetool, journal_file, csl_file, expected_detail_result):

‎src/applications/bmqstoragetool/m_bmqstoragetool_cslfileprocessor.t.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ static void test1_breathingTest()
523523
// standardCslIt.header() has no `operator==` defined, so skip it by
524524
// using `_`
525525
EXPECT_CALL(*printer,
526-
printShortResult(_, standardCslIt.currRecordId()))
526+
printShortResult(_, _, standardCslIt.currRecordId()))
527527
.InSequence(s);
528528

529529
if (standardCslIt.header().recordType() ==
@@ -697,7 +697,7 @@ static void test2_searchRecordsByTypeTest()
697697
// standardCslIt.header() has no `operator==` defined, so skip it
698698
// by using `_`
699699
EXPECT_CALL(*printer,
700-
printShortResult(_, standardCslIt.currRecordId()))
700+
printShortResult(_, _, standardCslIt.currRecordId()))
701701
.InSequence(s);
702702
recordCount.d_snapshotCount++;
703703
}
@@ -706,7 +706,7 @@ static void test2_searchRecordsByTypeTest()
706706
// standardCslIt.header() has no `operator==` defined, so skip it
707707
// by using `_`
708708
EXPECT_CALL(*printer,
709-
printShortResult(_, standardCslIt.currRecordId()))
709+
printShortResult(_, _, standardCslIt.currRecordId()))
710710
.InSequence(s);
711711
recordCount.d_commitCount++;
712712
}
@@ -870,7 +870,7 @@ static void test3_searchRecordsByQueueKeyTest()
870870
// standardCslIt.header() has no `operator==` defined, so skip it
871871
// by using `_`
872872
EXPECT_CALL(*printer,
873-
printShortResult(_, standardCslIt.currRecordId()))
873+
printShortResult(_, _, standardCslIt.currRecordId()))
874874
.InSequence(s);
875875
}
876876
}
@@ -1019,7 +1019,7 @@ static void test4_searchRecordsByTimestampRangeTest()
10191019
// standardCslIt.header() has no `operator==` defined, so skip it
10201020
// by using `_`
10211021
EXPECT_CALL(*printer,
1022-
printShortResult(_, standardCslIt.currRecordId()))
1022+
printShortResult(_, _, standardCslIt.currRecordId()))
10231023
.InSequence(s);
10241024
}
10251025
}
@@ -1166,7 +1166,7 @@ static void test5_searchRecordsByOffsetRangeTest()
11661166
// standardCslIt.header() has no `operator==` defined, so skip it
11671167
// by using `_`
11681168
EXPECT_CALL(*printer,
1169-
printShortResult(_, standardCslIt.currRecordId()))
1169+
printShortResult(_, _, standardCslIt.currRecordId()))
11701170
.InSequence(s);
11711171
}
11721172
}
@@ -1316,7 +1316,7 @@ static void test6_searchRecordsBySeqNumberRangeTest()
13161316
// standardCslIt.header() has no `operator==` defined, so skip it
13171317
// by using `_`
13181318
EXPECT_CALL(*printer,
1319-
printShortResult(_, standardCslIt.currRecordId()))
1319+
printShortResult(_, _, standardCslIt.currRecordId()))
13201320
.InSequence(s);
13211321
}
13221322
}
@@ -1462,7 +1462,7 @@ static void test7_searchRecordsByOffsetTest()
14621462
// standardCslIt.header() has no `operator==` defined, so skip it
14631463
// by using `_`
14641464
EXPECT_CALL(*printer,
1465-
printShortResult(_, standardCslIt.currRecordId()))
1465+
printShortResult(_, _, standardCslIt.currRecordId()))
14661466
.InSequence(s);
14671467
}
14681468
}
@@ -1610,7 +1610,7 @@ static void test8_searchRecordsBySeqNumberTest()
16101610
// standardCslIt.header() has no `operator==` defined, so skip it
16111611
// by using `_`
16121612
EXPECT_CALL(*printer,
1613-
printShortResult(_, standardCslIt.currRecordId()))
1613+
printShortResult(_, _, standardCslIt.currRecordId()))
16141614
.InSequence(s);
16151615
}
16161616
}

0 commit comments

Comments
 (0)