Skip to content

Commit e7dc0f2

Browse files
committed
Fixed format. Added depreciated comment. Passed StickRanges as reference. Implicit conversion from std::initializer_list to std::vector
1 parent d84afb7 commit e7dc0f2

6 files changed

Lines changed: 8 additions & 13 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ include/pulsar/Version.h
6969
*.ninja*
7070
.clangd/
7171
compile_commands.json
72+
.cmake-build-debug/
7273

7374
# doxygen files
7475
apidocs/

examples/SampleCustomLoggerCApi

33.5 KB
Binary file not shown.

include/pulsar/KeySharedPolicy.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@ class PULSAR_PUBLIC KeySharedPolicy {
9595

9696
/**
9797
* @param ranges used with sticky mode
98+
* @deprecated use the function that takes StickyRanges instead of std::initializer_list
9899
*/
99100
KeySharedPolicy& setStickyRanges(std::initializer_list<StickyRange> ranges);
100101

101102
/**
102103
* @param ranges used with sticky mode
103104
*/
104-
KeySharedPolicy& setStickyRanges(StickyRanges ranges);
105-
105+
KeySharedPolicy& setStickyRanges(const StickyRanges& ranges);
106106

107107
/**
108108
* @return ranges used with sticky mode

lib/KeySharedPolicy.cc

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,10 @@ KeySharedPolicy &KeySharedPolicy::setAllowOutOfOrderDelivery(bool allowOutOfOrde
5151
bool KeySharedPolicy::isAllowOutOfOrderDelivery() const { return impl_->allowOutOfOrderDelivery; }
5252

5353
KeySharedPolicy &KeySharedPolicy::setStickyRanges(std::initializer_list<StickyRange> ranges) {
54-
StickyRanges v;
55-
for(StickyRange i:ranges)
56-
{
57-
v.push_back(i);
58-
}
59-
return this->setStickyRanges(v);
54+
return this->setStickyRanges(StickyRanges v(ranges));
6055
}
6156

62-
KeySharedPolicy &KeySharedPolicy::setStickyRanges(StickyRanges ranges) {
57+
KeySharedPolicy &KeySharedPolicy::setStickyRanges(const StickyRanges &ranges) {
6358
if (ranges.empty()) {
6459
throw std::invalid_argument("Ranges for KeyShared policy must not be empty.");
6560
}

tests/ConnectionFailTest

1.19 MB
Binary file not shown.

tests/KeySharedPolicyTest.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ TEST_F(KeySharedPolicyTest, testStickyConsumerExpected) {
207207
KeySharedPolicy ksp;
208208
ksp.setStickyRanges({StickyRange(0, 300), StickyRange(400, 500)});
209209

210-
std::vector<std::pair<int, int>> expectedStickyRange {{0, 300}, {400, 500}};
211-
ASSERT_EQ(ksp.getStickyRanges(),expectedStickyRange);
210+
std::vector<std::pair<int, int>> expectedStickyRange{{0, 300}, {400, 500}};
211+
ASSERT_EQ(ksp.getStickyRanges(), expectedStickyRange);
212212
}
213213

214214
TEST_F(KeySharedPolicyTest, testStickyConsumerVectors) {
@@ -217,9 +217,8 @@ TEST_F(KeySharedPolicyTest, testStickyConsumerVectors) {
217217
ksp.setStickyRanges({StickyRange(0, 300), StickyRange(400, 500)});
218218

219219
KeySharedPolicy ksp2;
220-
std::vector<std::pair<int, int>> stickyRangeVec {{0, 300}, {400, 500}};
220+
std::vector<std::pair<int, int>> stickyRangeVec{{0, 300}, {400, 500}};
221221
ksp2.setStickyRanges(stickyRangeVec);
222222

223223
ASSERT_EQ(ksp.getStickyRanges(), ksp2.getStickyRanges());
224-
225224
}

0 commit comments

Comments
 (0)