You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by ji...@apache.org on 2016/08/08 17:17:06 UTC
[03/39] incubator-quickstep git commit: Minor changes in Shiftboss.
Minor changes in Shiftboss.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/bf7646f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/bf7646f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/bf7646f7
Branch: refs/heads/LIP-for-tpch
Commit: bf7646f7ebf132e57c41cba93e611dea337dd8f0
Parents: 991f7a4
Author: Zuyu Zhang <zu...@twitter.com>
Authored: Fri Aug 5 11:15:09 2016 -0700
Committer: Zuyu Zhang <zu...@twitter.com>
Committed: Fri Aug 5 11:15:09 2016 -0700
----------------------------------------------------------------------
query_execution/CMakeLists.txt | 1 -
query_execution/QueryManagerDistributed.cpp | 6 +++---
query_execution/QueryManagerDistributed.hpp | 6 +++---
query_execution/Shiftboss.cpp | 11 +----------
storage/StorageManager.hpp | 1 -
5 files changed, 7 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/bf7646f7/query_execution/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/query_execution/CMakeLists.txt b/query_execution/CMakeLists.txt
index 8bf1ab1..edbe5d0 100644
--- a/query_execution/CMakeLists.txt
+++ b/query_execution/CMakeLists.txt
@@ -231,7 +231,6 @@ if (ENABLE_DISTRIBUTED)
quickstep_relationaloperators_WorkOrderFactory
quickstep_storage_InsertDestination
quickstep_storage_StorageBlock
- quickstep_storage_StorageBlockInfo
quickstep_storage_StorageManager
quickstep_threading_Thread
quickstep_threading_ThreadUtil
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/bf7646f7/query_execution/QueryManagerDistributed.cpp
----------------------------------------------------------------------
diff --git a/query_execution/QueryManagerDistributed.cpp b/query_execution/QueryManagerDistributed.cpp
index 5d589d5..9e192eb 100644
--- a/query_execution/QueryManagerDistributed.cpp
+++ b/query_execution/QueryManagerDistributed.cpp
@@ -42,11 +42,11 @@ using std::unique_ptr;
namespace quickstep {
QueryManagerDistributed::QueryManagerDistributed(QueryHandle *query_handle,
- ShiftbossDirectory *shiftbosses,
+ ShiftbossDirectory *shiftboss_directory,
const tmb::client_id foreman_client_id,
tmb::MessageBus *bus)
: QueryManagerBase(query_handle),
- shiftbosses_(shiftbosses),
+ shiftboss_directory_(shiftboss_directory),
foreman_client_id_(foreman_client_id),
bus_(bus),
normal_workorder_protos_container_(
@@ -168,7 +168,7 @@ bool QueryManagerDistributed::initiateRebuild(const dag_node_index index) {
// TODO(zuyu): Multiple workers support.
QueryExecutionUtil::SendTMBMessage(bus_,
foreman_client_id_,
- shiftbosses_->getClientId(0),
+ shiftboss_directory_->getClientId(0),
move(tagged_msg));
// The negative value indicates that the number of rebuild work orders is to be
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/bf7646f7/query_execution/QueryManagerDistributed.hpp
----------------------------------------------------------------------
diff --git a/query_execution/QueryManagerDistributed.hpp b/query_execution/QueryManagerDistributed.hpp
index 5d9be81..3eee95c 100644
--- a/query_execution/QueryManagerDistributed.hpp
+++ b/query_execution/QueryManagerDistributed.hpp
@@ -48,12 +48,12 @@ class QueryManagerDistributed final : public QueryManagerBase {
* @brief Constructor.
*
* @param query_handle The QueryHandle object for this query.
- * @param shiftbosses The ShiftbossDirectory to use.
+ * @param shiftboss_directory The ShiftbossDirectory to use.
* @param foreman_client_id The TMB client ID of the foreman thread.
* @param bus The TMB used for communication.
**/
QueryManagerDistributed(QueryHandle *query_handle,
- ShiftbossDirectory *shiftbosses,
+ ShiftbossDirectory *shiftboss_directory,
const tmb::client_id foreman_client_id,
tmb::MessageBus *bus);
@@ -100,7 +100,7 @@ class QueryManagerDistributed final : public QueryManagerBase {
(query_exec_state_->getNumRebuildWorkOrders(index) == 0);
}
- ShiftbossDirectory *shiftbosses_;
+ ShiftbossDirectory *shiftboss_directory_;
const tmb::client_id foreman_client_id_;
tmb::MessageBus *bus_;
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/bf7646f7/query_execution/Shiftboss.cpp
----------------------------------------------------------------------
diff --git a/query_execution/Shiftboss.cpp b/query_execution/Shiftboss.cpp
index 3f7129b..50381b2 100644
--- a/query_execution/Shiftboss.cpp
+++ b/query_execution/Shiftboss.cpp
@@ -32,7 +32,6 @@
#include "relational_operators/WorkOrderFactory.hpp"
#include "storage/InsertDestination.hpp"
#include "storage/StorageBlock.hpp"
-#include "storage/StorageBlockInfo.hpp"
#include "storage/StorageManager.hpp"
#include "threading/ThreadUtil.hpp"
@@ -156,15 +155,7 @@ void Shiftboss::run() {
CHECK(proto.ParseFromArray(tagged_message.message(), tagged_message.message_bytes()));
for (int i = 0; i < proto.blocks_size(); ++i) {
- const block_id block = proto.blocks(i);
- storage_manager_->saveBlockOrBlob(block);
- if (storage_manager_->blockOrBlobIsLoaded(block)) {
- // NOTE(zuyu): eviction is required to avoid accesses to the query
- // result relation schema in CatalogDatabaseCache, for all query
- // optimizer execution generator unit tests and the single-process
- // Quickstep CLI.
- storage_manager_->evictBlockOrBlob(block);
- }
+ storage_manager_->saveBlockOrBlob(proto.blocks(i));
}
serialization::SaveQueryResultResponseMessage proto_response;
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/bf7646f7/storage/StorageManager.hpp
----------------------------------------------------------------------
diff --git a/storage/StorageManager.hpp b/storage/StorageManager.hpp
index 348018f..50ddb0f 100644
--- a/storage/StorageManager.hpp
+++ b/storage/StorageManager.hpp
@@ -619,7 +619,6 @@ class StorageManager {
FRIEND_TEST(BlockLocatorTest, BlockTest);
FRIEND_TEST(BlockLocatorTest, BlobTest);
- friend class Shiftboss;
FRIEND_TEST(StorageManagerTest, DifferentNUMANodeBlobTestWithEviction);
FRIEND_TEST(StorageManagerTest, EvictFromSameShardTest);