mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

keys: Avoid unnecessary construction of temporary 'bytes' object

Browse Source 
We're now using managed_bytes as main storage, so conversion from
bytes_view to bytes is redundant, we need to convert to managed_bytes
eventualy.
This commit is contained in:
Tomasz Grabiec
2016-02-11 14:24:58 +01:00
parent 6d00e473ac
commit df5f8e4bfc
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
keys.hh
View File

@@ -571,7 +571,7 @@ public:
};
class partition_key : public compound_wrapper<partition_key, partition_key_view> {
explicit partition_key(bytes&& b)
explicit partition_key(managed_bytes&& b)
: compound_wrapper<partition_key, partition_key_view>(std::move(b))
{ }
public:
@@ -590,13 +590,13 @@ public:
partition_key& operator=(partition_key&&) = default;
partition_key(partition_key_view key)
: partition_key(bytes(key.representation().begin(), key.representation().end()))
: partition_key(managed_bytes(key.representation()))
{ }
using compound = lw_shared_ptr<c_type>;
static partition_key from_bytes(bytes b) {
return partition_key(std::move(b));
static partition_key from_bytes(bytes_view b) {
return partition_key(managed_bytes(b));
}
static const compound& get_compound_type(const schema& s) {
@@ -659,7 +659,7 @@ public:
};
class clustering_key_prefix : public prefix_compound_wrapper<clustering_key_prefix, clustering_key_prefix_view, clustering_key> {
explicit clustering_key_prefix(bytes&& b)
explicit clustering_key_prefix(managed_bytes&& b)
: prefix_compound_wrapper<clustering_key_prefix, clustering_key_prefix_view, clustering_key>(std::move(b))
{ }
public:
@@ -676,13 +676,13 @@ public:
clustering_key_prefix& operator=(clustering_key_prefix&&) = default;
clustering_key_prefix(clustering_key_prefix_view v)
: clustering_key_prefix(bytes(v.representation().begin(), v.representation().end()))
: clustering_key_prefix(managed_bytes(v.representation()))
{ }
using compound = lw_shared_ptr<compound_type<allow_prefixes::yes>>;
static clustering_key_prefix from_bytes(bytes b) {
return clustering_key_prefix(std::move(b));
static clustering_key_prefix from_bytes(bytes_view b) {
return clustering_key_prefix(managed_bytes(b));
}
static const compound& get_compound_type(const schema& s) {

4
query-result-reader.hh
View File

@@ -164,7 +164,7 @@ public:
while (in.has_next()) {
auto row_count = in.read<uint32_t>();
if (slice.options.contains<partition_slice::option::send_partition_key>()) {
auto key = partition_key::from_bytes(to_bytes(in.read_view_to_blob<uint32_t>()));
auto key = partition_key::from_bytes(in.read_view_to_blob<uint32_t>());
visitor.accept_new_partition(key, row_count);
} else {
visitor.accept_new_partition(row_count);
@@ -178,7 +178,7 @@ public:
while (row_count--) {
if (slice.options.contains<partition_slice::option::send_clustering_key>()) {
auto key = clustering_key::from_bytes(to_bytes(in.read_view_to_blob<uint32_t>()));
auto key = clustering_key::from_bytes(in.read_view_to_blob<uint32_t>());
result_row_view row(in.read_view_to_blob<uint32_t>(), slice);
visitor.accept_new_row(key, static_row, row);
} else {