Replace CHECK() with CHECK_*() so that when a check is failing, more …

heron/common/src/cpp/basics/basics.cpp

@@ -154,7 +154,7 @@ static void InitLogging() {
  *      Instance id of the program calling initialize
  */
 static void InitHelper(const char* argv0, const char* instance, bool istest) {
-  CHECK(signal(SIGPIPE, SIG_IGN) != SIG_ERR);
+  CHECK_NE(signal(SIGPIPE, SIG_IGN), SIG_ERR);
 
   // create execution meta data object
   SetMetadata(argv0, instance, istest);

heron/stmgr/src/cpp/grouping/fields-grouping.cpp

@@ -50,7 +50,7 @@ void FieldsGrouping::GetListToSend(const proto::system::HeronDataTuple& _tuple,
   size_t prime_num = 633910111UL;
   for (auto iter = fields_grouping_indices_.begin();
        iter != fields_grouping_indices_.end(); ++iter) {
-    CHECK(_tuple.values_size() > *iter);
+    CHECK_GT(_tuple.values_size(), *iter);
     size_t h = str_hash_fn(_tuple.values(*iter));
     task_index += (h % prime_num);
   }

heron/tmaster/src/cpp/manager/stateful-restorer.cpp

@@ -61,8 +61,8 @@ void StatefulRestorer::HandleStMgrRestored(const std::string& _stmgr_id,
                                            int64_t _restore_txid,
                                            const StMgrMap& _stmgrs) {
   CHECK(in_progress_);
-  CHECK(_checkpoint_id == checkpoint_id_in_progress_);
-  CHECK(_restore_txid == restore_txid_);
+  CHECK_EQ(_checkpoint_id, checkpoint_id_in_progress_);
+  CHECK_EQ(_restore_txid, restore_txid_);
   unreplied_stmgrs_.erase(_stmgr_id);
   if (unreplied_stmgrs_.empty()) {
     Finish2PhaseCommit(_stmgrs);

heron/tmaster/src/cpp/manager/stats-interface.cpp

@@ -58,7 +58,7 @@ StatsInterface::StatsInterface(EventLoop* eventLoop, const NetworkOptions& _opti
   http_server_->InstallCallBack("/stmgrsregistrationsummary",
       std::move(cbHandleStmgrsRegistrationSummary));
   http_server_->InstallGenericCallBack(std::move(cbHandleUnknown));
-  CHECK(http_server_->Start() == SP_OK);
+  CHECK_EQ(http_server_->Start(), SP_OK);
 }
 
 StatsInterface::~StatsInterface() { delete http_server_; }

heron/tmaster/src/cpp/manager/stmgrstate.cpp

@@ -123,7 +123,7 @@ StMgrState::AddAssignment(const std::vector<pair<string, sp_int32> >& _assignmen
                                 proto::system::Assignment* _assignment)
 {
   // A vector of <component_id, partition_id is given to us.
-  CHECK(_assignments.size() == workers_.size());
+  CHECK_EQ(_assignments.size(), workers_.size());
 
   proto::system::NodeManagerAssignment* val = _assignment->add_assignments();
   val->set_nodemgr_id(info_->nodemgr_id());