Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 66FB1200BFE for ; Mon, 16 Jan 2017 18:23:27 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 658EC160B28; Mon, 16 Jan 2017 17:23:27 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 62B42160B41 for ; Mon, 16 Jan 2017 18:23:26 +0100 (CET) Received: (qmail 36824 invoked by uid 500); 16 Jan 2017 17:23:25 -0000 Mailing-List: contact commits-help@quickstep.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@quickstep.incubator.apache.org Delivered-To: mailing list commits@quickstep.incubator.apache.org Received: (qmail 36814 invoked by uid 99); 16 Jan 2017 17:23:25 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jan 2017 17:23:25 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 22427C00B6 for ; Mon, 16 Jan 2017 17:23:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.209 X-Spam-Level: X-Spam-Status: No, score=-6.209 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, T_FILL_THIS_FORM_SHORT=0.01] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id i4tLm83r0sHD for ; Mon, 16 Jan 2017 17:23:20 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 5941A5F5D3 for ; Mon, 16 Jan 2017 17:23:19 +0000 (UTC) Received: (qmail 35557 invoked by uid 99); 16 Jan 2017 17:23:18 -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, 16 Jan 2017 17:23:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 88532DFBFF; Mon, 16 Jan 2017 17:23:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zuyuz@apache.org To: commits@quickstep.incubator.apache.org Message-Id: <95c6d4f9ea8f4085a86f8ce058273611@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-quickstep git commit: Removed the unused feedInputBlocks. [Forced Update!] Date: Mon, 16 Jan 2017 17:23:18 +0000 (UTC) archived-at: Mon, 16 Jan 2017 17:23:27 -0000 Repository: incubator-quickstep Updated Branches: refs/heads/remove-feedInputBlocks 3fe592cf7 -> b0e596815 (forced update) Removed the unused feedInputBlocks. Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/b0e59681 Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/b0e59681 Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/b0e59681 Branch: refs/heads/remove-feedInputBlocks Commit: b0e5968158602f76ef037b748ed841aa153f23d5 Parents: 2229423 Author: Zuyu Zhang Authored: Sun Jan 15 18:09:03 2017 -0800 Committer: Zuyu Zhang Committed: Mon Jan 16 09:23:21 2017 -0800 ---------------------------------------------------------------------- .../tests/QueryManagerSingleNode_unittest.cpp | 22 +------------------- relational_operators/AggregationOperator.hpp | 6 ------ relational_operators/BuildHashOperator.hpp | 7 ------- relational_operators/DeleteOperator.hpp | 7 ------- relational_operators/HashJoinOperator.hpp | 8 ------- .../NestedLoopsJoinOperator.cpp | 20 ------------------ .../NestedLoopsJoinOperator.hpp | 13 +++++++++--- relational_operators/RelationalOperator.hpp | 14 ------------- relational_operators/SampleOperator.hpp | 6 ------ relational_operators/SaveBlocksOperator.cpp | 4 ---- relational_operators/SaveBlocksOperator.hpp | 10 ++------- relational_operators/SelectOperator.hpp | 20 ------------------ relational_operators/SortMergeRunOperator.hpp | 11 ---------- .../SortRunGenerationOperator.hpp | 7 ------- relational_operators/TableGeneratorOperator.hpp | 6 ------ .../tests/SortMergeRunOperator_unittest.cpp | 4 +++- 16 files changed, 16 insertions(+), 149 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/query_execution/tests/QueryManagerSingleNode_unittest.cpp ---------------------------------------------------------------------- diff --git a/query_execution/tests/QueryManagerSingleNode_unittest.cpp b/query_execution/tests/QueryManagerSingleNode_unittest.cpp index 6ec6521..87b8934 100644 --- a/query_execution/tests/QueryManagerSingleNode_unittest.cpp +++ b/query_execution/tests/QueryManagerSingleNode_unittest.cpp @@ -86,7 +86,6 @@ class MockOperator: public RelationalOperator { public: enum function_name { kFeedInputBlock = 0, - kFeedInputBlocks, kDoneFeedingInputBlocks, kGetAllWorkOrders }; @@ -103,7 +102,6 @@ class MockOperator: public RelationalOperator { num_calls_get_workorders_(0), num_workorders_generated_(0), num_calls_feedblock_(0), - num_calls_feedblocks_(0), num_calls_donefeedingblocks_(0) { } @@ -123,8 +121,6 @@ class MockOperator: public RelationalOperator { switch (fname) { case kFeedInputBlock: return num_calls_feedblock_; - case kFeedInputBlocks: - return num_calls_feedblocks_; case kDoneFeedingInputBlocks: return num_calls_donefeedingblocks_; case kGetAllWorkOrders: @@ -159,7 +155,7 @@ class MockOperator: public RelationalOperator { ++num_calls_get_workorders_; if (produce_workorders_) { if (has_streaming_input_) { - if ((num_calls_feedblock_ > 0 || num_calls_feedblocks_ > 0) && (num_workorders_generated_ < max_workorders_)) { + if (num_calls_feedblock_ > 0 && (num_workorders_generated_ < max_workorders_)) { MOCK_OP_LOG(3) << "[stream] generate WorkOrder"; container->addNormalWorkOrder(new MockWorkOrder(op_index_), op_index_); ++num_workorders_generated_; @@ -187,12 +183,6 @@ class MockOperator: public RelationalOperator { MOCK_OP_LOG(3) << "count(" << num_calls_feedblock_ << ")"; } - void feedInputBlocks(const relation_id rel_id, - std::vector *partially_filled_blocks) override { - ++num_calls_feedblocks_; - MOCK_OP_LOG(3) << "count(" << num_calls_feedblocks_ << ")"; - } - void doneFeedingInputBlocks(const relation_id rel_id) override { ++num_calls_donefeedingblocks_; MOCK_OP_LOG(3) << "count(" << num_calls_donefeedingblocks_ << ")"; @@ -215,7 +205,6 @@ class MockOperator: public RelationalOperator { int num_calls_get_workorders_; int num_workorders_generated_; int num_calls_feedblock_; - int num_calls_feedblocks_; int num_calls_donefeedingblocks_; QueryContext::insert_destination_id insert_destination_index_ = QueryContext::kInvalidInsertDestinationId; @@ -317,7 +306,6 @@ TEST_F(QueryManagerTest, SingleNodeDAGNoWorkOrdersTest) { // We expect one call for op's getAllWorkOrders(). EXPECT_EQ(1, op.getNumCalls(MockOperator::kGetAllWorkOrders)); EXPECT_EQ(0, op.getNumCalls(MockOperator::kFeedInputBlock)); - EXPECT_EQ(0, op.getNumCalls(MockOperator::kFeedInputBlocks)); } TEST_F(QueryManagerTest, SingleNodeDAGStaticWorkOrdersTest) { @@ -336,7 +324,6 @@ TEST_F(QueryManagerTest, SingleNodeDAGStaticWorkOrdersTest) { // We expect one call for op's getAllWorkOrders(). EXPECT_EQ(1, op.getNumCalls(MockOperator::kGetAllWorkOrders)); EXPECT_EQ(0, op.getNumCalls(MockOperator::kFeedInputBlock)); - EXPECT_EQ(0, op.getNumCalls(MockOperator::kFeedInputBlocks)); // One workorder is generated. EXPECT_EQ(1, op.getNumWorkOrders()); @@ -422,7 +409,6 @@ TEST_F(QueryManagerTest, SingleNodeDAGDynamicWorkOrdersTest) { // We place this check in the end, since it's true throughout the test. EXPECT_EQ(0, op.getNumCalls(MockOperator::kFeedInputBlock)); - EXPECT_EQ(0, op.getNumCalls(MockOperator::kFeedInputBlocks)); } TEST_F(QueryManagerTest, TwoNodesDAGBlockingLinkTest) { @@ -453,11 +439,9 @@ TEST_F(QueryManagerTest, TwoNodesDAGBlockingLinkTest) { // Only op1 should receive a call to getAllWorkOrders initially. EXPECT_EQ(1, op1.getNumCalls(MockOperator::kGetAllWorkOrders)); EXPECT_EQ(0, op1.getNumCalls(MockOperator::kFeedInputBlock)); - EXPECT_EQ(0, op1.getNumCalls(MockOperator::kFeedInputBlocks)); EXPECT_EQ(0, op2.getNumCalls(MockOperator::kGetAllWorkOrders)); EXPECT_EQ(0, op2.getNumCalls(MockOperator::kFeedInputBlock)); - EXPECT_EQ(0, op2.getNumCalls(MockOperator::kFeedInputBlocks)); // Only op1 should produce a workorder. EXPECT_EQ(1, op1.getNumWorkOrders()); @@ -561,13 +545,11 @@ TEST_F(QueryManagerTest, TwoNodesDAGPipeLinkTest) { EXPECT_EQ(1, op1.getNumCalls(MockOperator::kGetAllWorkOrders)); EXPECT_EQ(1, op1.getNumWorkOrders()); EXPECT_EQ(0, op1.getNumCalls(MockOperator::kFeedInputBlock)); - EXPECT_EQ(0, op1.getNumCalls(MockOperator::kFeedInputBlocks)); EXPECT_EQ(1, op2.getNumCalls(MockOperator::kGetAllWorkOrders)); // op2 will generate workorder only after receiving a streaming input. EXPECT_EQ(0, op2.getNumWorkOrders()); EXPECT_EQ(0, op2.getNumCalls(MockOperator::kFeedInputBlock)); - EXPECT_EQ(0, op2.getNumCalls(MockOperator::kFeedInputBlocks)); unique_ptr worker_message; worker_message.reset(query_manager_->getNextWorkerMessage(id1, -1)); @@ -590,11 +572,9 @@ TEST_F(QueryManagerTest, TwoNodesDAGPipeLinkTest) { // No additional call to op1's getAllWorkOrders. EXPECT_EQ(1, op1.getNumCalls(MockOperator::kGetAllWorkOrders)); EXPECT_EQ(0, op1.getNumCalls(MockOperator::kFeedInputBlock)); - EXPECT_EQ(0, op1.getNumCalls(MockOperator::kFeedInputBlocks)); // Output from op1 should be fed to op2. EXPECT_EQ(1, op2.getNumCalls(MockOperator::kFeedInputBlock)); - EXPECT_EQ(0, op2.getNumCalls(MockOperator::kFeedInputBlocks)); // A call to op2's getAllWorkOrders because of the streamed input. EXPECT_EQ(2, op2.getNumCalls(MockOperator::kGetAllWorkOrders)); http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/relational_operators/AggregationOperator.hpp ---------------------------------------------------------------------- diff --git a/relational_operators/AggregationOperator.hpp b/relational_operators/AggregationOperator.hpp index b5ed977..ce6015d 100644 --- a/relational_operators/AggregationOperator.hpp +++ b/relational_operators/AggregationOperator.hpp @@ -102,12 +102,6 @@ class AggregationOperator : public RelationalOperator { input_relation_block_ids_.push_back(input_block_id); } - void feedInputBlocks(const relation_id rel_id, std::vector *partially_filled_blocks) override { - input_relation_block_ids_.insert(input_relation_block_ids_.end(), - partially_filled_blocks->begin(), - partially_filled_blocks->end()); - } - private: /** * @brief Create Work Order proto. http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/relational_operators/BuildHashOperator.hpp ---------------------------------------------------------------------- diff --git a/relational_operators/BuildHashOperator.hpp b/relational_operators/BuildHashOperator.hpp index 0f96ef2..f0f42e3 100644 --- a/relational_operators/BuildHashOperator.hpp +++ b/relational_operators/BuildHashOperator.hpp @@ -119,13 +119,6 @@ class BuildHashOperator : public RelationalOperator { input_relation_block_ids_.push_back(input_block_id); } - void feedInputBlocks(const relation_id rel_id, - std::vector *partially_filled_blocks) override { - input_relation_block_ids_.insert(input_relation_block_ids_.end(), - partially_filled_blocks->begin(), - partially_filled_blocks->end()); - } - private: /** * @brief Create Work Order proto. http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/relational_operators/DeleteOperator.hpp ---------------------------------------------------------------------- diff --git a/relational_operators/DeleteOperator.hpp b/relational_operators/DeleteOperator.hpp index 835434a..9c3f357 100644 --- a/relational_operators/DeleteOperator.hpp +++ b/relational_operators/DeleteOperator.hpp @@ -105,13 +105,6 @@ class DeleteOperator : public RelationalOperator { relation_block_ids_.push_back(input_block_id); } - void feedInputBlocks(const relation_id rel_id, std::vector *partially_filled_blocks) override { - DCHECK(!relation_is_stored_); - relation_block_ids_.insert(relation_block_ids_.end(), - partially_filled_blocks->begin(), - partially_filled_blocks->end()); - } - private: /** * @brief Create Work Order proto. http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/relational_operators/HashJoinOperator.hpp ---------------------------------------------------------------------- diff --git a/relational_operators/HashJoinOperator.hpp b/relational_operators/HashJoinOperator.hpp index 0ed1eeb..8829d1f 100644 --- a/relational_operators/HashJoinOperator.hpp +++ b/relational_operators/HashJoinOperator.hpp @@ -196,14 +196,6 @@ class HashJoinOperator : public RelationalOperator { probe_relation_block_ids_.push_back(input_block_id); } - void feedInputBlocks(const relation_id rel_id, - std::vector *partially_filled_blocks) override { - DCHECK(rel_id == probe_relation_.getID()); - probe_relation_block_ids_.insert(probe_relation_block_ids_.end(), - partially_filled_blocks->begin(), - partially_filled_blocks->end()); - } - QueryContext::insert_destination_id getInsertDestinationID() const override { return output_destination_index_; } http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/relational_operators/NestedLoopsJoinOperator.cpp ---------------------------------------------------------------------- diff --git a/relational_operators/NestedLoopsJoinOperator.cpp b/relational_operators/NestedLoopsJoinOperator.cpp index 9780c91..f17402f 100644 --- a/relational_operators/NestedLoopsJoinOperator.cpp +++ b/relational_operators/NestedLoopsJoinOperator.cpp @@ -48,26 +48,6 @@ using std::vector; namespace quickstep { -void NestedLoopsJoinOperator::feedInputBlocks(const relation_id rel_id, - std::vector *partially_filled_blocks) { - for (std::vector::const_iterator it = partially_filled_blocks->begin(); - it != partially_filled_blocks->end(); - ++it) { - feedInputBlock(*it, rel_id); - } -} - -void NestedLoopsJoinOperator::feedInputBlock(const block_id input_block_id, const relation_id input_relation_id) { - if (input_relation_id == left_input_relation_.getID()) { - left_relation_block_ids_.push_back(input_block_id); - } else if (input_relation_id == right_input_relation_.getID()) { - right_relation_block_ids_.push_back(input_block_id); - } else { - FATAL_ERROR("The input block sent to the NestedLoopsJoinOperator belongs " - "to a different relation than the left and right relations"); - } -} - bool NestedLoopsJoinOperator::getAllWorkOrders( WorkOrdersContainer *container, QueryContext *query_context, http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/relational_operators/NestedLoopsJoinOperator.hpp ---------------------------------------------------------------------- diff --git a/relational_operators/NestedLoopsJoinOperator.hpp b/relational_operators/NestedLoopsJoinOperator.hpp index 3e3b049..951851d 100644 --- a/relational_operators/NestedLoopsJoinOperator.hpp +++ b/relational_operators/NestedLoopsJoinOperator.hpp @@ -141,9 +141,16 @@ class NestedLoopsJoinOperator : public RelationalOperator { } } - void feedInputBlock(const block_id input_block_id, const relation_id input_relation_id) override; - - void feedInputBlocks(const relation_id rel_id, std::vector *partially_filled_blocks) override; + void feedInputBlock(const block_id input_block_id, const relation_id input_relation_id) override { + if (input_relation_id == left_input_relation_.getID()) { + left_relation_block_ids_.push_back(input_block_id); + } else if (input_relation_id == right_input_relation_.getID()) { + right_relation_block_ids_.push_back(input_block_id); + } else { + LOG(FATAL) << "The input block sent to the NestedLoopsJoinOperator belongs " + << "to a different relation than the left and right relations"; + } + } QueryContext::insert_destination_id getInsertDestinationID() const override { return output_destination_index_; http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/relational_operators/RelationalOperator.hpp ---------------------------------------------------------------------- diff --git a/relational_operators/RelationalOperator.hpp b/relational_operators/RelationalOperator.hpp index 3eea189..a7f4177 100644 --- a/relational_operators/RelationalOperator.hpp +++ b/relational_operators/RelationalOperator.hpp @@ -145,20 +145,6 @@ class RelationalOperator { const relation_id input_relation_id) {} /** - * @brief Receive partially filled input blocks for this RelationalOperator. - * - * @note The blocks in partially_filled_blocks may not be fully filled. - * - * @param rel_id ID of the relation to which all the partially filled blocks - * belong to. - * @param partially_filled_blocks A pointer to the vector of block IDs of the - * partially filled input blocks. - **/ - virtual void feedInputBlocks( - const relation_id rel_id, - std::vector *partially_filled_blocks) {} - - /** * @brief Signal the end of feeding of input blocks for this * RelationalOperator. * http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/relational_operators/SampleOperator.hpp ---------------------------------------------------------------------- diff --git a/relational_operators/SampleOperator.hpp b/relational_operators/SampleOperator.hpp index d18b9a8..ccf6595 100644 --- a/relational_operators/SampleOperator.hpp +++ b/relational_operators/SampleOperator.hpp @@ -112,12 +112,6 @@ class SampleOperator : public RelationalOperator { input_relation_block_ids_.push_back(input_block_id); } - void feedInputBlocks(const relation_id rel_id, std::vector *partially_filled_blocks) override { - input_relation_block_ids_.insert(input_relation_block_ids_.end(), - partially_filled_blocks->begin(), - partially_filled_blocks->end()); - } - QueryContext::insert_destination_id getInsertDestinationID() const override { return output_destination_index_; } http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/relational_operators/SaveBlocksOperator.cpp ---------------------------------------------------------------------- diff --git a/relational_operators/SaveBlocksOperator.cpp b/relational_operators/SaveBlocksOperator.cpp index a5a96c4..9d6c3f6 100644 --- a/relational_operators/SaveBlocksOperator.cpp +++ b/relational_operators/SaveBlocksOperator.cpp @@ -67,10 +67,6 @@ bool SaveBlocksOperator::getAllWorkOrderProtos(WorkOrderProtosContainer *contain return done_feeding_input_relation_; } -void SaveBlocksOperator::feedInputBlock(const block_id input_block_id, const relation_id input_relation_id) { - destination_block_ids_.push_back(input_block_id); -} - void SaveBlocksOperator::updateCatalogOnCompletion() { // Note(jianqiao): We need to reset the exactness flag whenever a stored // relation gets changed. Given the pre-condition that all the data manipulation http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/relational_operators/SaveBlocksOperator.hpp ---------------------------------------------------------------------- diff --git a/relational_operators/SaveBlocksOperator.hpp b/relational_operators/SaveBlocksOperator.hpp index 573d81e..27fd911 100644 --- a/relational_operators/SaveBlocksOperator.hpp +++ b/relational_operators/SaveBlocksOperator.hpp @@ -83,14 +83,8 @@ class SaveBlocksOperator : public RelationalOperator { bool getAllWorkOrderProtos(WorkOrderProtosContainer *container) override; - void feedInputBlock(const block_id input_block_id, const relation_id input_relation_id) override; - - void feedInputBlocks(const relation_id rel_id, std::vector *partially_filled_blocks) override { - for (std::vector::const_iterator it = partially_filled_blocks->begin(); - it != partially_filled_blocks->end(); - ++it) { - feedInputBlock(*it, rel_id); - } + void feedInputBlock(const block_id input_block_id, const relation_id input_relation_id) override { + destination_block_ids_.push_back(input_block_id); } void updateCatalogOnCompletion() override; http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/relational_operators/SelectOperator.hpp ---------------------------------------------------------------------- diff --git a/relational_operators/SelectOperator.hpp b/relational_operators/SelectOperator.hpp index 6741f45..5846eda 100644 --- a/relational_operators/SelectOperator.hpp +++ b/relational_operators/SelectOperator.hpp @@ -220,26 +220,6 @@ class SelectOperator : public RelationalOperator { } } - // TODO(gerald): Each call to getPartitionForBlock() involves grabbing shared - // locks on each partition's mutex, checking if the block belongs to the - // partition. Instead, we can provide a method getPartitionsForBlocks() which - // accepts a list of blocks and returns corresponding list of their partition IDs. - // Therefore, once we grab a lock for a partition, we search for all the blocks - // and then release the lock. - void feedInputBlocks(const relation_id rel_id, std::vector *partially_filled_blocks) override { - if (input_relation_.hasPartitionScheme()) { - for (auto it = partially_filled_blocks->begin(); it != partially_filled_blocks->end(); ++it) { - const partition_id part_id = input_relation_.getPartitionScheme().getPartitionForBlock((*it)); - input_relation_block_ids_in_partition_[part_id].insert(input_relation_block_ids_in_partition_[part_id].end(), - *it); - } - } else { - input_relation_block_ids_.insert(input_relation_block_ids_.end(), - partially_filled_blocks->begin(), - partially_filled_blocks->end()); - } - } - QueryContext::insert_destination_id getInsertDestinationID() const override { return output_destination_index_; } http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/relational_operators/SortMergeRunOperator.hpp ---------------------------------------------------------------------- diff --git a/relational_operators/SortMergeRunOperator.hpp b/relational_operators/SortMergeRunOperator.hpp index 0839320..aff7d8d 100644 --- a/relational_operators/SortMergeRunOperator.hpp +++ b/relational_operators/SortMergeRunOperator.hpp @@ -152,17 +152,6 @@ class SortMergeRunOperator : public RelationalOperator { } } - void feedInputBlocks( - const relation_id rel_id, - std::vector *partially_filled_blocks) override { - input_relation_block_ids_.insert(input_relation_block_ids_.end(), - partially_filled_blocks->begin(), - partially_filled_blocks->end()); - if (started_) { - initializeInputRuns(); - } - } - void doneFeedingInputBlocks(const relation_id input_relation_id) override; void receiveFeedbackMessage(const WorkOrder::FeedbackMessage &msg) override; http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/relational_operators/SortRunGenerationOperator.hpp ---------------------------------------------------------------------- diff --git a/relational_operators/SortRunGenerationOperator.hpp b/relational_operators/SortRunGenerationOperator.hpp index 125878c..a2ffb2b 100644 --- a/relational_operators/SortRunGenerationOperator.hpp +++ b/relational_operators/SortRunGenerationOperator.hpp @@ -129,13 +129,6 @@ class SortRunGenerationOperator : public RelationalOperator { input_relation_block_ids_.push_back(input_block_id); } - void feedInputBlocks(const relation_id rel_id, std::vector *partially_filled_blocks) override { - DCHECK(rel_id == input_relation_.getID()); - input_relation_block_ids_.insert(input_relation_block_ids_.end(), - partially_filled_blocks->begin(), - partially_filled_blocks->end()); - } - QueryContext::insert_destination_id getInsertDestinationID() const override { return output_destination_index_; } http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/relational_operators/TableGeneratorOperator.hpp ---------------------------------------------------------------------- diff --git a/relational_operators/TableGeneratorOperator.hpp b/relational_operators/TableGeneratorOperator.hpp index 7639966..c0930a4 100644 --- a/relational_operators/TableGeneratorOperator.hpp +++ b/relational_operators/TableGeneratorOperator.hpp @@ -90,12 +90,6 @@ class TableGeneratorOperator : public RelationalOperator { bool getAllWorkOrderProtos(WorkOrderProtosContainer *container) override; - void feedInputBlock(const block_id input_block_id, const relation_id input_relation_id) override { - } - - void feedInputBlocks(const relation_id rel_id, std::vector *partially_filled_blocks) override { - } - QueryContext::insert_destination_id getInsertDestinationID() const override { return output_destination_index_; } http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b0e59681/relational_operators/tests/SortMergeRunOperator_unittest.cpp ---------------------------------------------------------------------- diff --git a/relational_operators/tests/SortMergeRunOperator_unittest.cpp b/relational_operators/tests/SortMergeRunOperator_unittest.cpp index a9128b1..74fecec 100644 --- a/relational_operators/tests/SortMergeRunOperator_unittest.cpp +++ b/relational_operators/tests/SortMergeRunOperator_unittest.cpp @@ -1601,7 +1601,9 @@ class SortMergeRunOperatorTest : public ::testing::Test { // Feed blocks. DVLOG(1) << "Feeding " << to_feed.size() << " blocks."; - merge_op_->feedInputBlocks(input_table_->getID(), &to_feed); + for (const block_id block : to_feed) { + merge_op_->feedInputBlock(block, input_table_->getID()); + } // Remove fed blocks. blocks->erase(blocks->begin() + blocks->size() - count, blocks->end());