You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by ka...@apache.org on 2018/06/18 13:07:11 UTC
[incubator-heron] branch master updated: Fix integer types to avoid
warnings (#2922)
This is an automated email from the ASF dual-hosted git repository.
karthikz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new 81bb28d Fix integer types to avoid warnings (#2922)
81bb28d is described below
commit 81bb28d26dd329eff81ce751063f92122cf12068
Author: Oliver Bristow <ev...@gmail.com>
AuthorDate: Mon Jun 18 14:07:09 2018 +0100
Fix integer types to avoid warnings (#2922)
---
heron/stmgr/tests/cpp/server/stmgr_unittest.cpp | 42 +++++++++++++------------
1 file changed, 22 insertions(+), 20 deletions(-)
diff --git a/heron/stmgr/tests/cpp/server/stmgr_unittest.cpp b/heron/stmgr/tests/cpp/server/stmgr_unittest.cpp
index ca623af..0bb0c1a 100644
--- a/heron/stmgr/tests/cpp/server/stmgr_unittest.cpp
+++ b/heron/stmgr/tests/cpp/server/stmgr_unittest.cpp
@@ -132,8 +132,8 @@ static heron::proto::api::Topology* GenerateDummyTopology(
return topology;
}
-static heron::proto::system::PackingPlan* GenerateDummyPackingPlan(int num_stmgrs_, int num_spouts,
- int num_spout_instances, int num_bolts, int num_bolt_instances) {
+static heron::proto::system::PackingPlan* GenerateDummyPackingPlan(size_t num_stmgrs_,
+ size_t num_spouts, size_t num_spout_instances, size_t num_bolts, size_t num_bolt_instances) {
size_t spouts_size = num_spouts * num_spout_instances;
size_t bolts_size = num_bolts * num_bolt_instances;
@@ -147,9 +147,9 @@ static heron::proto::system::PackingPlan* GenerateDummyPackingPlan(int num_stmgr
containerRequiredResource->set_cpu(10);
containerRequiredResource->set_disk(10);
- sp_int32 task_id = 0;
- sp_int32 component_index = 0;
- sp_int32 container_index = 0;
+ sp_uint32 task_id = 0;
+ sp_uint32 component_index = 0;
+ sp_uint32 container_index = 0;
heron::proto::system::PackingPlan* packingPlan = new heron::proto::system::PackingPlan();
packingPlan->set_id("dummy_packing_plan_id");
@@ -485,7 +485,7 @@ void StartTMaster(CommonResources& common) {
CreateLocalStateOnFS(common.topology_, common.packing_plan_, common.dpath_);
// Populate the list of stmgrs
- for (int i = 0; i < common.num_stmgrs_; ++i) {
+ for (size_t i = 0; i < common.num_stmgrs_; ++i) {
sp_string id = STMGR_NAME + "-";
id += std::to_string(i);
common.stmgrs_id_list_.push_back(id);
@@ -503,11 +503,12 @@ void StartTMaster(CommonResources& common) {
void DistributeWorkersAcrossStmgrs(CommonResources& common) {
// which stmgr is this component going to get assigned to
- sp_int32 stmgr_assignment_round = 0;
- sp_int32 global_index = 0;
+ sp_uint32 stmgr_assignment_round = 0;
+ sp_uint32 global_index = 0;
// Distribute the spouts
- for (int spout = 0; spout < common.num_spouts_; ++spout) {
- for (int spout_instance = 0; spout_instance < common.num_spout_instances_; ++spout_instance) {
+ for (size_t spout = 0; spout < common.num_spouts_; ++spout) {
+ for (size_t spout_instance = 0; spout_instance < common.num_spout_instances_;
+ ++spout_instance) {
heron::proto::system::Instance* imap =
CreateInstanceMap(spout, spout_instance, stmgr_assignment_round, global_index++, true);
common.stmgr_instance_id_list_[stmgr_assignment_round].push_back(imap->instance_id());
@@ -524,8 +525,8 @@ void DistributeWorkersAcrossStmgrs(CommonResources& common) {
stmgr_assignment_round = 0;
// Distribute the bolts
- for (int bolt = 0; bolt < common.num_bolts_; ++bolt) {
- for (int bolt_instance = 0; bolt_instance < common.num_bolt_instances_; ++bolt_instance) {
+ for (size_t bolt = 0; bolt < common.num_bolts_; ++bolt) {
+ for (size_t bolt_instance = 0; bolt_instance < common.num_bolt_instances_; ++bolt_instance) {
heron::proto::system::Instance* imap =
CreateInstanceMap(bolt, bolt_instance, stmgr_assignment_round, global_index++, false);
// Have we completed a round of distribution of components
@@ -567,8 +568,8 @@ void StartWorkerComponents(CommonResources& common, sp_int32 num_msgs_sent_by_sp
sp_int32 num_msgs_to_expect_in_bolt) {
// try to find the lowest bolt task id
sp_int32 min_bolt_task_id = std::numeric_limits<sp_int32>::max() - 1;
- for (int bolt = 0; bolt < common.num_bolts_; ++bolt) {
- for (int bolt_instance = 0; bolt_instance < common.num_bolt_instances_; ++bolt_instance) {
+ for (size_t bolt = 0; bolt < common.num_bolts_; ++bolt) {
+ for (size_t bolt_instance = 0; bolt_instance < common.num_bolt_instances_; ++bolt_instance) {
sp_string instanceid = CreateInstanceId(bolt, bolt_instance, false);
if (common.instanceid_instance_[instanceid]->info().task_id() < min_bolt_task_id) {
min_bolt_task_id = common.instanceid_instance_[instanceid]->info().task_id();
@@ -577,16 +578,17 @@ void StartWorkerComponents(CommonResources& common, sp_int32 num_msgs_sent_by_sp
}
// Start the spouts
- for (int spout = 0; spout < common.num_spouts_; ++spout) {
- for (int spout_instance = 0; spout_instance < common.num_spout_instances_; ++spout_instance) {
+ for (size_t spout = 0; spout < common.num_spouts_; ++spout) {
+ for (size_t spout_instance = 0; spout_instance < common.num_spout_instances_;
+ ++spout_instance) {
StartDummySpoutInstanceHelper(common, spout, spout_instance, num_msgs_sent_by_spout_instance);
}
}
// Start the bolts
std::vector<DummyBoltInstance*> bolt_workers_list;
std::vector<std::thread*> bolt_workers_threads_list;
- for (int bolt = 0; bolt < common.num_bolts_; ++bolt) {
- for (int bolt_instance = 0; bolt_instance < common.num_bolt_instances_; ++bolt_instance) {
+ for (size_t bolt = 0; bolt < common.num_bolts_; ++bolt) {
+ for (size_t bolt_instance = 0; bolt_instance < common.num_bolt_instances_; ++bolt_instance) {
EventLoopImpl* worker_ss = NULL;
DummyBoltInstance* worker = NULL;
std::thread* worker_thread = NULL;
@@ -617,7 +619,7 @@ void StartWorkerComponents(CommonResources& common, sp_int32 num_msgs_sent_by_sp
void StartStMgrs(CommonResources& common) {
// Spawn and start the stmgrs
- for (int i = 0; i < common.num_stmgrs_; ++i) {
+ for (size_t i = 0; i < common.num_stmgrs_; ++i) {
EventLoopImpl* stmgr_ss = NULL;
heron::stmgr::StMgr* mgr = NULL;
std::thread* stmgr_thread = NULL;
@@ -760,7 +762,7 @@ TEST(StMgr, test_pplan_decode) {
// Verify that the pplan was decoded properly
const heron::proto::system::PhysicalPlan* pplan0 = common.stmgrs_list_[0]->GetPhysicalPlan();
EXPECT_EQ(pplan0->stmgrs_size(), common.num_stmgrs_);
- for (int i=0; i < common.num_stmgrs_; i++) {
+ for (size_t i = 0; i < common.num_stmgrs_; i++) {
EXPECT_NE(common.stmgr_ports_.end(),
std::find(common.stmgr_ports_.begin(), common.stmgr_ports_.end(),
pplan0->stmgrs(i).data_port()));
--
To stop receiving notification emails like this one, please contact
karthikz@apache.org.