Revert "A workaround to remove query result relation in the distributed version."
This reverts commit aef1c3586580cfa72eb031fafe08700f6d5d9a86. Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/dd8747fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/dd8747fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/dd8747fd Branch: refs/heads/tmb_poll_interval Commit: dd8747fd7aba95ce2f0f325297e108bbac5d958d Parents: 3b65b0f Author: Zuyu Zhang <zu...@apache.org> Authored: Wed Feb 8 00:02:27 2017 -0800 Committer: Zuyu Zhang <zu...@apache.org> Committed: Wed Feb 8 00:35:53 2017 -0800 ---------------------------------------------------------------------- query_execution/ForemanDistributed.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/dd8747fd/query_execution/ForemanDistributed.cpp ---------------------------------------------------------------------- diff --git a/query_execution/ForemanDistributed.cpp b/query_execution/ForemanDistributed.cpp index e6f22ec..4d95f16 100644 --- a/query_execution/ForemanDistributed.cpp +++ b/query_execution/ForemanDistributed.cpp @@ -201,12 +201,8 @@ void ForemanDistributed::run() { // TODO(quickstep-team): Dynamically scale-up/down Shiftbosses. if (query_result_saved_shiftbosses_[query_id].size() == shiftboss_directory_.size()) { - const relation_id result_relation_id = proto.relation_id(); - processSaveQueryResultResponseMessage(proto.cli_id(), result_relation_id); + processSaveQueryResultResponseMessage(proto.cli_id(), proto.relation_id()); query_result_saved_shiftbosses_.erase(query_id); - - // TODO(zuyu): Refactor to clean-up blocks in Shiftbosses. - catalog_database_->dropRelationById(result_relation_id); } break; }
