c++11'ize CompactionInput descedants with 'override' Change-Id: I9dd25733f0f33ff824b854cb4f31b4a5d973a685 Reviewed-on: http://gerrit.cloudera.org:8080/5227 Tested-by: Kudu Jenkins Reviewed-by: Alexey Serbin <aser...@cloudera.com> Reviewed-by: Todd Lipcon <t...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/8d29d107 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/8d29d107 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/8d29d107 Branch: refs/heads/master Commit: 8d29d107c411928307b0d559e8daa754119a0796 Parents: 4c4c215 Author: David Alves <dral...@apache.org> Authored: Fri Nov 25 13:55:15 2016 -0800 Committer: David Ribeiro Alves <dral...@apache.org> Committed: Mon Nov 28 19:41:30 2016 +0000 ---------------------------------------------------------------------- src/kudu/tablet/compaction.cc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/8d29d107/src/kudu/tablet/compaction.cc ---------------------------------------------------------------------- diff --git a/src/kudu/tablet/compaction.cc b/src/kudu/tablet/compaction.cc index 459cf9b..cfb5fb3 100644 --- a/src/kudu/tablet/compaction.cc +++ b/src/kudu/tablet/compaction.cc @@ -61,17 +61,17 @@ class MemRowSetCompactionInput : public CompactionInput { has_more_blocks_(false) { } - virtual Status Init() OVERRIDE { + Status Init() override { RETURN_NOT_OK(iter_->Init(nullptr)); has_more_blocks_ = iter_->HasNext(); return Status::OK(); } - virtual bool HasMoreBlocks() OVERRIDE { + bool HasMoreBlocks() override { return has_more_blocks_; } - virtual Status PrepareBlock(vector<CompactionInputRow> *block) OVERRIDE { + Status PrepareBlock(vector<CompactionInputRow> *block) override { int num_in_block = iter_->remaining_in_leaf(); block->resize(num_in_block); @@ -107,13 +107,13 @@ class MemRowSetCompactionInput : public CompactionInput { return Status::OK(); } - Arena* PreparedBlockArena() OVERRIDE { return &arena_; } + Arena* PreparedBlockArena() override { return &arena_; } - virtual Status FinishBlock() OVERRIDE { + Status FinishBlock() override { return Status::OK(); } - virtual const Schema &schema() const OVERRIDE { + const Schema &schema() const override { return iter_->schema(); } @@ -148,7 +148,7 @@ class DiskRowSetCompactionInput : public CompactionInput { undo_mutation_block_(kRowsPerBlock, static_cast<Mutation *>(nullptr)), first_rowid_in_block_(0) {} - virtual Status Init() OVERRIDE { + Status Init() override { ScanSpec spec; spec.set_cache_blocks(false); RETURN_NOT_OK(base_iter_->Init(&spec)); @@ -159,11 +159,11 @@ class DiskRowSetCompactionInput : public CompactionInput { return Status::OK(); } - virtual bool HasMoreBlocks() OVERRIDE { + bool HasMoreBlocks() override { return base_iter_->HasNext(); } - virtual Status PrepareBlock(vector<CompactionInputRow> *block) OVERRIDE { + Status PrepareBlock(vector<CompactionInputRow> *block) override { RETURN_NOT_OK(base_iter_->NextBlock(&block_)); std::fill(redo_mutation_block_.begin(), redo_mutation_block_.end(), static_cast<Mutation *>(nullptr)); @@ -190,13 +190,13 @@ class DiskRowSetCompactionInput : public CompactionInput { return Status::OK(); } - virtual Arena* PreparedBlockArena() OVERRIDE { return &arena_; } + Arena* PreparedBlockArena() override { return &arena_; } - virtual Status FinishBlock() OVERRIDE { + Status FinishBlock() override { return Status::OK(); } - virtual const Schema &schema() const OVERRIDE { + const Schema &schema() const override { return base_iter_->schema(); } @@ -283,7 +283,7 @@ class MergeCompactionInput : public CompactionInput { STLDeleteElements(&states_); } - virtual Status Init() OVERRIDE { + Status Init() override { for (MergeState *state : states_) { RETURN_NOT_OK(state->input->Init()); } @@ -293,7 +293,7 @@ class MergeCompactionInput : public CompactionInput { return Status::OK(); } - virtual bool HasMoreBlocks() OVERRIDE { + bool HasMoreBlocks() override { // Return true if any of the input blocks has more rows pending // or more blocks which have yet to be pulled. for (MergeState *state : states_) { @@ -306,7 +306,7 @@ class MergeCompactionInput : public CompactionInput { return false; } - virtual Status PrepareBlock(vector<CompactionInputRow> *block) OVERRIDE { + Status PrepareBlock(vector<CompactionInputRow> *block) override { CHECK(!states_.empty()); block->clear(); @@ -375,13 +375,13 @@ class MergeCompactionInput : public CompactionInput { return Status::OK(); } - virtual Arena* PreparedBlockArena() OVERRIDE { return prepared_block_arena_; } + Arena* PreparedBlockArena() override { return prepared_block_arena_; } - virtual Status FinishBlock() OVERRIDE { + Status FinishBlock() override { return ProcessEmptyInputs(); } - virtual const Schema &schema() const OVERRIDE { + const Schema &schema() const override { return *schema_; }
