diff options
| author |   Ultrabug <ultrabug@gentoo.org> | 2019-10-21 09:28:06 +0200 |
|---|---|---|
| committer | Ultrabug <ultrabug@gentoo.org> | 2019-10-21 09:28:06 +0200 |
| commit | 2de9dcffce967d7a58e159172c827c337a770d9d (patch) | |
| tree | b4a5e7017f7a69a09a637b434cdb5fa0ff53f803 /dev-db/scylla/files/3.1-revert-64-bit-gc_clock.patch | |
| parent | dev-db/scylla: add patch for thrift support on 3.1 (diff) | |
| download | ultrabug-2de9dcffce967d7a58e159172c827c337a770d9d.tar.gz ultrabug-2de9dcffce967d7a58e159172c827c337a770d9d.tar.bz2 ultrabug-2de9dcffce967d7a58e159172c827c337a770d9d.zip | |
dev-db/scylla: add 3.1 patch
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
Diffstat (limited to 'dev-db/scylla/files/3.1-revert-64-bit-gc_clock.patch')
| -rw-r--r-- | dev-db/scylla/files/3.1-revert-64-bit-gc_clock.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/dev-db/scylla/files/3.1-revert-64-bit-gc_clock.patch b/dev-db/scylla/files/3.1-revert-64-bit-gc_clock.patch new file mode 100644 index 0000000..ca3c105 --- /dev/null +++ b/dev-db/scylla/files/3.1-revert-64-bit-gc_clock.patch @@ -0,0 +1,26 @@ +diff --git a/gc_clock.hh b/gc_clock.hh +index ac3cbeb95..0e2ef5548 100644 +--- a/gc_clock.hh ++++ b/gc_clock.hh +@@ -32,7 +32,7 @@ + class gc_clock final { + public: + using base = seastar::lowres_system_clock; +- using rep = int64_t; ++ using rep = int32_t; + using period = std::ratio<1, 1>; // seconds + using duration = std::chrono::duration<rep, period>; + using time_point = std::chrono::time_point<gc_clock, duration>; +diff --git a/sstables/mc/writer.cc b/sstables/mc/writer.cc +index d36789899..717766d8e 100644 +--- a/sstables/mc/writer.cc ++++ b/sstables/mc/writer.cc +@@ -335,7 +335,7 @@ void write_delta_ttl(W& out, gc_clock::duration ttl, const encoding_stats& enc_s + template <typename W> + GCC6_CONCEPT(requires Writer<W>()) + void write_delta_local_deletion_time(W& out, int64_t local_deletion_time, const encoding_stats& enc_stats) { +- write_unsigned_delta_vint(out, local_deletion_time, enc_stats.min_local_deletion_time.time_since_epoch().count()); ++ write_unsigned_delta_vint(out, local_deletion_time, (int64_t)enc_stats.min_local_deletion_time.time_since_epoch().count()); + } + + template <typename W> |