123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244 |
- From 6444f8022d02a946a654b5456170ab1343e20e1d Mon Sep 17 00:00:00 2001
- From: Stephan Hartmann <stha09@googlemail.com>
- Date: Fri, 29 Jul 2022 05:08:08 +0000
- Subject: [PATCH 14/68] sql: make VirtualCursor standard layout type
- sql::recover::VirtualCursor needs to be a standard layout type, but
- has members of type std::unique_ptr. However, std::unique_ptr is not
- guaranteed to be standard layout. Compiling with clang combined with
- gcc-11 libstdc++ fails because of this. Replace std::unique_ptr with
- raw pointers.
- Bug: 1189788
- Change-Id: Ia6dc388cc5ef1c0f2afc75f8ca45b9f12687ca9c
- Signed-off-by: Stephan Hartmann <stha09@googlemail.com>
- Signed-off-by: Rebecca Chang Swee Fun <rebecca.chang@starfivetech.com>
- ---
- sql/recover_module/btree.cc | 21 +++++++++++++++------
- sql/recover_module/btree.h | 17 +++++++++++++----
- sql/recover_module/cursor.cc | 24 ++++++++++++------------
- sql/recover_module/cursor.h | 2 +-
- sql/recover_module/pager.cc | 7 +++----
- sql/recover_module/pager.h | 5 +++--
- 6 files changed, 47 insertions(+), 29 deletions(-)
- diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc
- index cc9420e5c05c..62fcaaf79edc 100644
- --- a/sql/recover_module/btree.cc
- +++ b/sql/recover_module/btree.cc
- @@ -136,16 +136,25 @@ static_assert(std::is_trivially_destructible<LeafPageDecoder>::value,
- "Move the destructor to the .cc file if it's non-trival");
- #endif // !DCHECK_IS_ON()
-
- -LeafPageDecoder::LeafPageDecoder(DatabasePageReader* db_reader) noexcept
- - : page_id_(db_reader->page_id()),
- - db_reader_(db_reader),
- - cell_count_(ComputeCellCount(db_reader)),
- - next_read_index_(0),
- - last_record_size_(0) {
- +void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) {
- + DCHECK(db_reader);
- DCHECK(IsOnValidPage(db_reader));
- + page_id_ = db_reader->page_id();
- + db_reader_ = db_reader;
- + cell_count_ = ComputeCellCount(db_reader);
- + next_read_index_ = 0;
- + last_record_size_ = 0;
- DCHECK(DatabasePageReader::IsValidPageId(page_id_));
- }
-
- +void LeafPageDecoder::Reset() {
- + db_reader_ = nullptr;
- + page_id_ = 0;
- + cell_count_ = 0;
- + next_read_index_ = 0;
- + last_record_size_ = 0;
- +}
- +
- bool LeafPageDecoder::TryAdvance() {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK(CanAdvance());
- diff --git a/sql/recover_module/btree.h b/sql/recover_module/btree.h
- index eaa087a5c52b..78ce00e057c4 100644
- --- a/sql/recover_module/btree.h
- +++ b/sql/recover_module/btree.h
- @@ -103,7 +103,7 @@ class LeafPageDecoder {
- //
- // |db_reader| must have been used to read an inner page of a table B-tree.
- // |db_reader| must outlive this instance.
- - explicit LeafPageDecoder(DatabasePageReader* db_reader) noexcept;
- + explicit LeafPageDecoder() noexcept = default;
- ~LeafPageDecoder() noexcept = default;
-
- LeafPageDecoder(const LeafPageDecoder&) = delete;
- @@ -151,6 +151,15 @@ class LeafPageDecoder {
- // read as long as CanAdvance() returns true.
- bool TryAdvance();
-
- + // Initialize with DatabasePageReader
- + void Initialize(DatabasePageReader* db_reader);
- +
- + // Reset internal DatabasePageReader
- + void Reset();
- +
- + // True if DatabasePageReader is valid
- + bool IsValid() { return (db_reader_ != nullptr); }
- +
- // True if the given reader may point to an inner page in a table B-tree.
- //
- // The last ReadPage() call on |db_reader| must have succeeded.
- @@ -164,14 +173,14 @@ class LeafPageDecoder {
- static int ComputeCellCount(DatabasePageReader* db_reader);
-
- // The number of the B-tree page this reader is reading.
- - const int64_t page_id_;
- + int64_t page_id_;
- // Used to read the tree page.
- //
- // Raw pointer usage is acceptable because this instance's owner is expected
- // to ensure that the DatabasePageReader outlives this.
- - DatabasePageReader* const db_reader_;
- + DatabasePageReader* db_reader_;
- // Caches the ComputeCellCount() value for this reader's page.
- - const int cell_count_ = ComputeCellCount(db_reader_);
- + int cell_count_;
-
- // The reader's cursor state.
- //
- diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc
- index 4f827edf1b44..240de4999fe5 100644
- --- a/sql/recover_module/cursor.cc
- +++ b/sql/recover_module/cursor.cc
- @@ -28,7 +28,7 @@ VirtualCursor::~VirtualCursor() {
- int VirtualCursor::First() {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- inner_decoders_.clear();
- - leaf_decoder_ = nullptr;
- + leaf_decoder_.Reset();
-
- AppendPageDecoder(table_->root_page_id());
- return Next();
- @@ -38,18 +38,18 @@ int VirtualCursor::Next() {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- record_reader_.Reset();
-
- - while (!inner_decoders_.empty() || leaf_decoder_.get()) {
- - if (leaf_decoder_.get()) {
- - if (!leaf_decoder_->CanAdvance()) {
- + while (!inner_decoders_.empty() || leaf_decoder_.IsValid()) {
- + if (leaf_decoder_.IsValid()) {
- + if (!leaf_decoder_.CanAdvance()) {
- // The leaf has been exhausted. Remove it from the DFS stack.
- - leaf_decoder_ = nullptr;
- + leaf_decoder_.Reset();
- continue;
- }
- - if (!leaf_decoder_->TryAdvance())
- + if (!leaf_decoder_.TryAdvance())
- continue;
-
- - if (!payload_reader_.Initialize(leaf_decoder_->last_record_size(),
- - leaf_decoder_->last_record_offset())) {
- + if (!payload_reader_.Initialize(leaf_decoder_.last_record_size(),
- + leaf_decoder_.last_record_offset())) {
- continue;
- }
- if (!record_reader_.Initialize())
- @@ -101,13 +101,13 @@ int VirtualCursor::ReadColumn(int column_index,
- int64_t VirtualCursor::RowId() {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK(record_reader_.IsInitialized());
- - DCHECK(leaf_decoder_.get());
- - return leaf_decoder_->last_record_rowid();
- + DCHECK(leaf_decoder_.IsValid());
- + return leaf_decoder_.last_record_rowid();
- }
-
- void VirtualCursor::AppendPageDecoder(int page_id) {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- - DCHECK(leaf_decoder_.get() == nullptr)
- + DCHECK(!leaf_decoder_.IsValid())
- << __func__
- << " must only be called when the current path has no leaf decoder";
-
- @@ -115,7 +115,7 @@ void VirtualCursor::AppendPageDecoder(int page_id) {
- return;
-
- if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {
- - leaf_decoder_ = std::make_unique<LeafPageDecoder>(&db_reader_);
- + leaf_decoder_.Initialize(&db_reader_);
- return;
- }
-
- diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
- index 845b7852648d..cc4e85f83f95 100644
- --- a/sql/recover_module/cursor.h
- +++ b/sql/recover_module/cursor.h
- @@ -130,7 +130,7 @@ class VirtualCursor {
- std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;
-
- // Decodes the leaf page containing records.
- - std::unique_ptr<LeafPageDecoder> leaf_decoder_;
- + LeafPageDecoder leaf_decoder_;
-
- SEQUENCE_CHECKER(sequence_checker_);
- };
- diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc
- index 58e75de27042..5fe96204e56b 100644
- --- a/sql/recover_module/pager.cc
- +++ b/sql/recover_module/pager.cc
- @@ -23,8 +23,7 @@ static_assert(DatabasePageReader::kMaxPageId <= std::numeric_limits<int>::max(),
- "ints are not appropriate for representing page IDs");
-
- DatabasePageReader::DatabasePageReader(VirtualTable* table)
- - : page_data_(std::make_unique<uint8_t[]>(table->page_size())),
- - table_(table) {
- + : page_data_(), table_(table) {
- DCHECK(table != nullptr);
- DCHECK(IsValidPageSize(table->page_size()));
- }
- @@ -57,8 +56,8 @@ int DatabasePageReader::ReadPage(int page_id) {
- std::numeric_limits<int64_t>::max(),
- "The |read_offset| computation above may overflow");
-
- - int sqlite_status =
- - RawRead(sqlite_file, read_size, read_offset, page_data_.get());
- + int sqlite_status = RawRead(sqlite_file, read_size, read_offset,
- + const_cast<uint8_t*>(page_data_.data()));
-
- // |page_id_| needs to be set to kInvalidPageId if the read failed.
- // Otherwise, future ReadPage() calls with the previous |page_id_| value
- diff --git a/sql/recover_module/pager.h b/sql/recover_module/pager.h
- index 07cac3cb9891..646e0223fd78 100644
- --- a/sql/recover_module/pager.h
- +++ b/sql/recover_module/pager.h
- @@ -5,6 +5,7 @@
- #ifndef SQL_RECOVER_MODULE_PAGER_H_
- #define SQL_RECOVER_MODULE_PAGER_H_
-
- +#include <array>
- #include <cstdint>
- #include <memory>
- #include <ostream>
- @@ -72,7 +73,7 @@ class DatabasePageReader {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK_NE(page_id_, kInvalidPageId)
- << "Successful ReadPage() required before accessing pager state";
- - return page_data_.get();
- + return page_data_.data();
- }
-
- // The number of bytes in the page read by the last ReadPage() call.
- @@ -139,7 +140,7 @@ class DatabasePageReader {
- int page_id_ = kInvalidPageId;
- // Stores the bytes of the last page successfully read by ReadPage().
- // The content is undefined if the last call to ReadPage() did not succeed.
- - const std::unique_ptr<uint8_t[]> page_data_;
- + const std::array<uint8_t, kMaxPageSize> page_data_;
- // Raw pointer usage is acceptable because this instance's owner is expected
- // to ensure that the VirtualTable outlives this.
- const raw_ptr<VirtualTable> table_;
- --
- 2.30.2
|