From commits-return-6760-archive-asf-public=cust-asf.ponee.io@kudu.apache.org Mon Nov 26 22:31:16 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 272BB18077A for ; Mon, 26 Nov 2018 22:31:15 +0100 (CET) Received: (qmail 18605 invoked by uid 500); 26 Nov 2018 21:31:15 -0000 Mailing-List: contact commits-help@kudu.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kudu.apache.org Delivered-To: mailing list commits@kudu.apache.org Received: (qmail 18493 invoked by uid 99); 26 Nov 2018 21:31:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Nov 2018 21:31:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 12F34E10CA; Mon, 26 Nov 2018 21:31:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mpercy@apache.org To: commits@kudu.apache.org Date: Mon, 26 Nov 2018 21:31:17 -0000 Message-Id: <7c1a910e5c0745dcb6760b23bcd42008@git.apache.org> In-Reply-To: <29607f87fa53412ca343dbea05aadcd2@git.apache.org> References: <29607f87fa53412ca343dbea05aadcd2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] kudu git commit: compaction: remove dead code compaction: remove dead code As far as I can tell, this has been dead since 2014 (commit 07db3407e) and 2013 (commit 95f6c9811). Change-Id: I046d1c402f65803b6feb64983b52b6cccafdf2ab Reviewed-on: http://gerrit.cloudera.org:8080/11978 Tested-by: Kudu Jenkins Reviewed-by: Mike Percy Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/74aa53f1 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/74aa53f1 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/74aa53f1 Branch: refs/heads/master Commit: 74aa53f1347eb3d4a2b37bc898cd516143ff76d3 Parents: b2097e4 Author: Adar Dembo Authored: Tue Nov 20 15:42:13 2018 -0800 Committer: Mike Percy Committed: Mon Nov 26 21:23:00 2018 +0000 ---------------------------------------------------------------------- src/kudu/tablet/compaction.cc | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/74aa53f1/src/kudu/tablet/compaction.cc ---------------------------------------------------------------------- diff --git a/src/kudu/tablet/compaction.cc b/src/kudu/tablet/compaction.cc index fc0ade5..c05a258 100644 --- a/src/kudu/tablet/compaction.cc +++ b/src/kudu/tablet/compaction.cc @@ -205,8 +205,7 @@ class DiskRowSetCompactionInput : public CompactionInput { arena_(32 * 1024), block_(base_iter_->schema(), kRowsPerBlock, &arena_), redo_mutation_block_(kRowsPerBlock, static_cast(nullptr)), - undo_mutation_block_(kRowsPerBlock, static_cast(nullptr)), - first_rowid_in_block_(0) {} + undo_mutation_block_(kRowsPerBlock, static_cast(nullptr)) {} Status Init() override { ScanSpec spec; @@ -246,7 +245,6 @@ class DiskRowSetCompactionInput : public CompactionInput { Mutation::ReverseMutationList(&input_row.undo_head); } - first_rowid_in_block_ += block_.nrows(); return Status::OK(); } @@ -273,8 +271,6 @@ class DiskRowSetCompactionInput : public CompactionInput { vector redo_mutation_block_; vector undo_mutation_block_; - rowid_t first_rowid_in_block_; - enum { kRowsPerBlock = 100 }; @@ -1222,12 +1218,6 @@ Status ReupdateMissedDeltas(const IOContext* io_context, const Schema* schema = &input->schema(); const Schema key_schema(input->schema().CreateKeyProjection()); - // Arena and projector to store/project row keys for missed delta updates - Arena arena(1024); - RowProjector key_projector(schema, &key_schema); - RETURN_NOT_OK(key_projector.Init()); - faststring buf; - rowid_t output_row_offset = 0; while (input->HasMoreBlocks()) { RETURN_NOT_OK(input->PrepareBlock(&rows));