mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thrift/handler: Use map for column_visitor aggregation

Browse Source 
Most common operations, like multiget_count and multiget_slice, return
maps. So, instead of keeping a vector internally in column_visitor
that we later transform into a map, keep a map that we transform into
a vector for the uncommon operations.

Signed-off-by: Duarte Nunes <duarte@scylladb.com>
Message-Id: <20171019161104.22797-1-duarte@scylladb.com>
This commit is contained in:
Duarte Nunes
2017-10-19 18:11:03 +02:00
committed by Avi Kivity
parent a56dd79d69
commit f44131226a
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
thrift/handler.cc
View File

@@ -1535,23 +1535,22 @@ private:
const query::partition_slice& _slice;
const uint32_t _cell_limit;
uint32_t _current_cell_limit;
std::vector<std::pair<std::string, typename Aggregator::type>> _aggregation;
std::map<std::string, typename Aggregator::type> _aggregation;
typename Aggregator::type* _current_aggregation;
public:
column_visitor(const schema& s, const query::partition_slice& slice, uint32_t cell_limit)
: _s(s), _slice(slice), _cell_limit(cell_limit), _current_cell_limit(0)
{ }
std::vector<std::pair<std::string, typename Aggregator::type>>&& release() {
return std::move(_aggregation);
}
std::map<std::string, typename Aggregator::type> release_as_map() {
return std::map<std::string, typename Aggregator::type>(
std::vector<std::pair<std::string, typename Aggregator::type>> release() {
return std::vector<std::pair<std::string, typename Aggregator::type>>(
boost::make_move_iterator(_aggregation.begin()),
boost::make_move_iterator(_aggregation.end()));
}
std::map<std::string, typename Aggregator::type>&& release_as_map() {
return std::move(_aggregation);
}
void accept_new_partition(const partition_key& key, uint32_t row_count) {
_aggregation.emplace_back(partition_key_to_string(_s, key), typename Aggregator::type());
_current_aggregation = &_aggregation.back().second;
_current_aggregation = &_aggregation[partition_key_to_string(_s, key)];
_current_cell_limit = _cell_limit;
}
void accept_new_partition(uint32_t row_count) {