mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-23 01:50:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

alternator: use stream_arn instead of std::string in list_streams

Browse Source 
Use `stream_arn` object for storage of last returned to the user stream
instead of raw `std::string`. `stream_arn` is used for parsing ARN
incoming from the user, for returning `std::string` was used because of
buggy copy / move operations of `stream_arn`. Those were fixed, so we're
fixing usage as well.

Fixes: SCYLLADB-1241

Closes scylladb/scylladb#29578
This commit is contained in:
Radosław Cybulski
2026-04-21 12:41:12 +02:00
committed by Marcin Maliszkiewicz
parent 183c6d120e
commit cc39b54173
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
alternator/streams.cc
View File

@@ -234,7 +234,7 @@ future<alternator::executor::request_return_type> alternator::executor::list_str
auto ret = rjson::empty_object();
auto streams = rjson::empty_array();
std::optional<std::string> last;
std::optional<stream_arn> last;
for (;limit > 0 && i != e; ++i) {
auto s = i->schema();
@@ -247,11 +247,11 @@ future<alternator::executor::request_return_type> alternator::executor::list_str
rjson::value new_entry = rjson::empty_object();
auto arn = stream_arn{ i->schema(), cdc::get_base_table(db.real_database(), *i->schema()) };
last = std::string(arn.unparsed());
rjson::add(new_entry, "StreamArn", arn);
rjson::add(new_entry, "StreamLabel", rjson::from_string(stream_label(*s)));
rjson::add(new_entry, "TableName", rjson::from_string(cdc::base_name(s->cf_name())));
rjson::push_back(streams, std::move(new_entry));
last = std::move(arn);
--limit;
}
}
@@ -263,7 +263,7 @@ future<alternator::executor::request_return_type> alternator::executor::list_str
// If we exhausted all tables naturally (limit > 0), there are no more
// streams, so we must not emit a cookie.
if (last && limit == 0) {
rjson::add(ret, "LastEvaluatedStreamArn", rjson::from_string(*last));
rjson::add(ret, "LastEvaluatedStreamArn", *last);
}
return make_ready_future<executor::request_return_type>(rjson::print(std::move(ret)));
}