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

disk_array_vint_size: Remove unused Size template parameter

Browse Source 
Signed-off-by: Piotr Jastrzebski <piotr@scylladb.com>
This commit is contained in:
Piotr Jastrzebski
2018-05-23 16:15:44 +02:00
parent 20271b3890
commit 5ca4bfd69a
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sstables/disk_types.hh
View File

@@ -71,9 +71,8 @@ struct vint {
};
// Same as disk_array but with its size serialized as variable-length integer
template <typename Size, typename Members>
template <typename Members>
struct disk_array_vint_size {
static_assert(std::is_integral<Size>::value, "Length type must be convertible to integer");
utils::chunked_vector<Members> elements;
};

12
sstables/sstables.cc
View File

@@ -339,9 +339,9 @@ future<> parse(sstable_version_types v, random_access_reader& in, disk_string<Si
});
}
template <typename Size, typename Members>
future<> parse(sstable_version_types v, random_access_reader& in, disk_array_vint_size<Size, Members>& arr) {
auto len = std::make_unique<Size>();
template <typename Members>
future<> parse(sstable_version_types v, random_access_reader& in, disk_array_vint_size<Members>& arr) {
auto len = std::make_unique<uint32_t>();
auto f = read_vint(in, *len);
return f.then([v, &in, &arr, len = std::move(len)] {
return parse(v, in, *len, arr.elements);
@@ -453,9 +453,9 @@ inline void write(sstable_version_types v, file_writer& out, const disk_array<Si
write(v, out, arr.elements);
}
template <typename Size, typename Members>
inline void write(sstable_version_types v, file_writer& out, const disk_array_vint_size<Size, Members>& arr) {
Size len = 0;
template <typename Members>
inline void write(sstable_version_types v, file_writer& out, const disk_array_vint_size<Members>& arr) {
uint64_t len = 0;
check_truncate_and_assign(len, arr.elements.size());
write_vint(out, len);
write(v, out, arr.elements);

8
sstables/types.hh
View File

@@ -372,14 +372,14 @@ struct stats_metadata : public metadata_base<stats_metadata> {
}
};
using bytes_array_vint_size = disk_array_vint_size<uint32_t, bytes::value_type>;
using bytes_array_vint_size = disk_array_vint_size<bytes::value_type>;
struct serialization_header : public metadata_base<serialization_header> {
vint<uint64_t> min_timestamp;
vint<uint32_t> min_local_deletion_time;
vint<uint32_t> min_ttl;
bytes_array_vint_size pk_type_name;
disk_array_vint_size<uint32_t, bytes_array_vint_size> clustering_key_types_names;
disk_array_vint_size<bytes_array_vint_size> clustering_key_types_names;
struct column_desc {
bytes_array_vint_size name;
bytes_array_vint_size type_name;
@@ -391,8 +391,8 @@ struct serialization_header : public metadata_base<serialization_header> {
);
}
};
disk_array_vint_size<uint32_t, column_desc> static_columns;
disk_array_vint_size<uint32_t, column_desc> regular_columns;
disk_array_vint_size<column_desc> static_columns;
disk_array_vint_size<column_desc> regular_columns;
template <typename Describer>
auto describe_type(sstable_version_types v, Describer f) {
switch (v) {