Skip to content

Commit

Permalink
Use shared pointers to avoid mass vector copying
Browse files Browse the repository at this point in the history
  • Loading branch information
@kylehickinson @NejcZdovc
kylehickinson authored and NejcZdovc committed Apr 22, 2020
1 parent cf2ca36 commit bb32032
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 44 deletions.
85 changes: 47 additions & 38 deletions vendor/bat-native-ledger/src/bat/ledger/internal/publisher/publisher_server_list.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,19 @@ ledger::PublisherStatus PublisherServerList::ParsePublisherStatus(
void PublisherServerList::ParsePublisherList(
const std::string& data,
ParsePublisherListCallback callback) {
std::vector<ledger::ServerPublisherPartial> list_publisher;
std::vector<ledger::PublisherBanner> list_banner;
auto list_publisher =
std::make_shared<std::vector<ledger::ServerPublisherPartial>>();
auto list_banner = std::make_shared<std::vector<ledger::PublisherBanner>>();

base::Optional<base::Value> value = base::JSONReader::Read(data);
if (!value || !value->is_list()) {
BLOG(ledger_, ledger::LogLevel::LOG_ERROR) << "Data is not correct";
callback(ledger::Result::LEDGER_ERROR);
return;
}

list_publisher.reserve(value->GetList().size());
list_banner.reserve(value->GetList().size());
list_publisher->reserve(value->GetList().size());
list_banner->reserve(value->GetList().size());

for (auto& item : value->GetList()) {
if (!item.is_list()) {
Expand All @@ -214,7 +216,7 @@ void PublisherServerList::ParsePublisherList(
continue;
}

list_publisher.emplace_back(
list_publisher->emplace_back(
list[0].GetString(),
ParsePublisherStatus(list[1].GetString()),
list[2].GetBool(),
Expand All @@ -225,25 +227,22 @@ void PublisherServerList::ParsePublisherList(
continue;
}

list_banner.push_back(ledger::PublisherBanner());
auto& banner = list_banner[list_banner.size()-1];
list_banner->push_back(ledger::PublisherBanner());
auto& banner = list_banner->back();
ParsePublisherBanner(&banner, &list[4]);
banner.publisher_key = list[0].GetString();
}

if (list_publisher.empty()) {
if (list_publisher->empty()) {
callback(ledger::Result::LEDGER_ERROR);
return;
}

list_banner.shrink_to_fit();
list_publisher.shrink_to_fit();

auto clear_callback = std::bind(&PublisherServerList::SaveParsedData,
this,
_1,
std::move(list_publisher),
std::move(list_banner),
list_publisher,
list_banner,
callback);

ledger_->ClearServerPublisherList(clear_callback);
Expand Down Expand Up @@ -298,80 +297,90 @@ void PublisherServerList::ParsePublisherBanner(

void PublisherServerList::SaveParsedData(
const ledger::Result result,
const std::vector<ledger::ServerPublisherPartial>& list_publisher,
const std::vector<ledger::PublisherBanner>& list_banner,
const SharedServerPublisherPartial& list_publisher,
const SharedPublisherBanner& list_banner,
ParsePublisherListCallback callback) {
if (result != ledger::Result::LEDGER_OK) {
callback(result);
return;
}

if (!list_publisher.empty()) {
if (list_publisher && !list_publisher->empty()) {
SavePublishers(list_publisher, list_banner, callback);
return;
}

if (!list_banner.empty()) {
SaveBanners({}, list_banner, callback);
if (list_banner && !list_banner->empty()) {
SaveBanners(list_banner, callback);
return;
}

callback(ledger::Result::LEDGER_OK);
}

void PublisherServerList::SavePublishers(
const std::vector<ledger::ServerPublisherPartial>& list_publisher,
const std::vector<ledger::PublisherBanner>& list_banner,
const SharedServerPublisherPartial& list_publisher,
const SharedPublisherBanner& list_banner,
ParsePublisherListCallback callback) {
if (!list_publisher) {
callback(ledger::Result::LEDGER_OK);
return;
}

const int max_insert_records_ = 100000;

int32_t interval = max_insert_records_;
const auto list_size = list_publisher.size();
const auto list_size = list_publisher->size();
if (list_size < max_insert_records_) {
interval = list_size;
}

std::vector<ledger::ServerPublisherPartial> save_list(
list_publisher.begin(),
list_publisher.begin() + interval);
std::vector<ledger::ServerPublisherPartial> new_list_publisher(
list_publisher.begin() + interval,
list_publisher.end());
list_publisher->begin(),
list_publisher->begin() + interval);
auto new_list_publisher =
std::make_shared<std::vector<ledger::ServerPublisherPartial>>(
list_publisher->begin() + interval,
list_publisher->end());

auto save_callback = std::bind(&PublisherServerList::SaveParsedData,
this,
_1,
std::move(new_list_publisher),
std::move(list_banner),
new_list_publisher,
list_banner,
callback);

ledger_->InsertServerPublisherList(save_list, save_callback);
}

void PublisherServerList::SaveBanners(
const std::vector<ledger::ServerPublisherPartial>& list_publisher,
const std::vector<ledger::PublisherBanner>& list_banner,
const SharedPublisherBanner& list_banner,
ParsePublisherListCallback callback) {
if (!list_banner) {
callback(ledger::Result::LEDGER_OK);
return;
}

const int max_insert_records_ = 80000;

int32_t interval = max_insert_records_;
const auto list_size = list_banner.size();
const auto list_size = list_banner->size();
if (list_size < max_insert_records_) {
interval = list_size;
}

std::vector<ledger::PublisherBanner> save_list(
list_banner.begin(),
list_banner.begin() + interval);
std::vector<ledger::PublisherBanner> new_list_banner(
list_banner.begin() + interval,
list_banner.end());
list_banner->begin(),
list_banner->begin() + interval);
auto new_list_banner = std::make_shared<std::vector<ledger::PublisherBanner>>(
list_banner->begin() + interval,
list_banner->end());

auto save_callback = std::bind(&PublisherServerList::SaveParsedData,
this,
_1,
std::move(list_publisher),
std::move(new_list_banner),
nullptr,
new_list_banner,
callback);

ledger_->InsertPublisherBannerList(save_list, save_callback);
Expand Down
16 changes: 10 additions & 6 deletions vendor/bat-native-ledger/src/bat/ledger/internal/publisher/publisher_server_list.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ class LedgerImpl;

namespace braveledger_publisher {

using SharedServerPublisherPartial =
std::shared_ptr<std::vector<ledger::ServerPublisherPartial>>;
using SharedPublisherBanner =
std::shared_ptr<std::vector<ledger::PublisherBanner>>;

class PublisherServerList {
public:
explicit PublisherServerList(bat_ledger::LedgerImpl* ledger);
Expand Down Expand Up @@ -62,18 +67,17 @@ class PublisherServerList {

void SaveParsedData(
const ledger::Result result,
const std::vector<ledger::ServerPublisherPartial>& list_publisher,
const std::vector<ledger::PublisherBanner>& list_banner,
const SharedServerPublisherPartial& list_publisher,
const SharedPublisherBanner& list_banner,
ParsePublisherListCallback callback);

void SavePublishers(
const std::vector<ledger::ServerPublisherPartial>& list_publisher,
const std::vector<ledger::PublisherBanner>& list_banner,
const SharedServerPublisherPartial& list_publisher,
const SharedPublisherBanner& list_banner,
ParsePublisherListCallback callback);

void SaveBanners(
const std::vector<ledger::ServerPublisherPartial>& list_publisher,
const std::vector<ledger::PublisherBanner>& list_banner,
const SharedPublisherBanner& list_banner,
ParsePublisherListCallback callback);

bat_ledger::LedgerImpl* ledger_; // NOT OWNED
Expand Down

0 comments on commit bb32032

Please sign in to comment.