Skip to content

[Pick][0.7 to 0.8] | Fix split iteration meets empty parts | FIX: estring split in non-consecutive merge mode (#1071) #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Coldwings wants to merge 3 commits into
base: release/0.8
Choose a base branch
from
Open

[Pick][0.7 to 0.8] | Fix split iteration meets empty parts | FIX: estring split in non-consecutive merge mode (#1071) #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88428ec
Since macos-13 test image are retired, move on to macos-15 by github …
Coldwings Dec 11, 2025
c43b4c0
FIX: estring split in non-consecutive merge mode (#1071)
Coldwings Dec 12, 2025
357d531
Fix split iteration meets empty parts
Coldwings Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.macos.arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
macOS14-arm:
runs-on: macos-14
runs-on: macos-15

steps:
- uses: szenius/set-timezone@v2.0
Expand All @@ -31,7 +31,7 @@ jobs:
-D CMAKE_BUILD_TYPE=MinSizeRel \
-D PHOTON_ENABLE_SASL=ON \
-D PHOTON_ENABLE_LIBCURL=ON \
-D OPENSSL_ROOT_DIR=/opt/homebrew/Cellar/openssl@1.1/1.1.1w
-D OPENSSL_ROOT_DIR=/opt/homebrew/Cellar/openssl@3/3.6.0
cmake --build ${{github.workspace}}/build -j $(sysctl -n hw.logicalcpu)

- name: Test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.macos.x86_64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
macOS13-x86:
runs-on: macos-13
runs-on: macos-15

steps:
- uses: szenius/set-timezone@v2.0
Expand All @@ -31,7 +31,7 @@ jobs:
-D CMAKE_BUILD_TYPE=MinSizeRel \
-D PHOTON_ENABLE_SASL=ON \
-D PHOTON_ENABLE_LIBCURL=ON \
-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3
-D OPENSSL_ROOT_DIR=/opt/homebrew/Cellar/openssl@3/3.6.0
cmake --build ${{github.workspace}}/build -j $(sysctl -n hw.logicalcpu)

- name: Test
Expand Down
5 changes: 3 additions & 2 deletions common/estring.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ class estring_view : public std::string_view
}
iterator& operator++()
{
_part = _host->find_part(_part.end());
_part = _host->find_part(_part.end() + 1);
return *this;
}
iterator& operator++(int)
Expand All @@ -208,7 +208,8 @@ class estring_view : public std::string_view
}
bool operator == (const iterator& rhs) const
{
return _part == rhs._part;
return _part.data() == rhs._part.data() &&
_part.length() == rhs._part.length();
}
bool operator != (const iterator& rhs) const
{
Expand Down
45 changes: 45 additions & 0 deletions common/test/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,51 @@ TEST(estring, test)
EXPECT_EQ(a[1], "q3r1234");
EXPECT_EQ(a[2], "poiu");

sp = s.split(cs, false);
it = sp.begin();
front = *it;
remainder = it.remainder();
LOG_DEBUG(VALUE(front), VALUE(remainder));
EXPECT_EQ(front, "alskdjf");
EXPECT_EQ(remainder, ";;,q3r1234;poiu");
it ++;
front = *it;
remainder = it.remainder();
LOG_DEBUG(VALUE(front), VALUE(remainder));
EXPECT_EQ(front, "");
EXPECT_EQ(remainder, ";,q3r1234;poiu");
it ++;
front = *it;
remainder = it.remainder();
LOG_DEBUG(VALUE(front), VALUE(remainder));
EXPECT_EQ(front, "");
EXPECT_EQ(remainder, ",q3r1234;poiu");
it ++;
front = *it;
remainder = it.remainder();
LOG_DEBUG(VALUE(front), VALUE(remainder));
EXPECT_EQ(front, "");
EXPECT_EQ(remainder, "q3r1234;poiu");
it ++;
front = *it;
remainder = it.remainder();
LOG_DEBUG(VALUE(front), VALUE(remainder));
EXPECT_EQ(front, "q3r1234");
EXPECT_EQ(remainder, "poiu");

a.clear();
for (auto x: sp)
{
a.push_back(x);
LOG_DEBUG(x);
}

EXPECT_EQ(a.size(), 6);
EXPECT_EQ(a[0], "alskdjf");
EXPECT_EQ(a[4], "q3r1234");
EXPECT_EQ(a[5], "poiu");


auto sv = s;//.view();
EXPECT_TRUE(sv.starts_with("alskdjf"));
EXPECT_FALSE(sv.starts_with("alsk32"));
Expand Down