From a0816f0bd60caef0caa9f0a2dbd082663cea981b Mon Sep 17 00:00:00 2001
From: Jesse Lee <jesse.lee@huawei.com>
Date: Thu, 7 May 2020 14:21:44 -0400
Subject: [PATCH] Fix rc

---
 mindspore/ccsrc/dataset/util/arena.cc         | 2 +-
 mindspore/ccsrc/dataset/util/intrp_service.cc | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mindspore/ccsrc/dataset/util/arena.cc b/mindspore/ccsrc/dataset/util/arena.cc
index 68673529f..51de281d5 100644
--- a/mindspore/ccsrc/dataset/util/arena.cc
+++ b/mindspore/ccsrc/dataset/util/arena.cc
@@ -52,7 +52,7 @@ Status Arena::Allocate(size_t n, void **p) {
   // Round up n to 1K block
   uint64_t req_size = static_cast<uint64_t>(n) + ARENA_WALL_OVERHEAD_SZ;
   if (req_size > this->get_max_size()) {
-    RETURN_STATUS_UNEXPECTED("Request size too big : " + std::to_string(n));
+    return Status(StatusCode::kOutOfMemory);
   }
   uint64_t reqBlk = SizeToBlk(req_size);
   // Do a first fit search
diff --git a/mindspore/ccsrc/dataset/util/intrp_service.cc b/mindspore/ccsrc/dataset/util/intrp_service.cc
index 85b56ec00..4ccb5bd0a 100644
--- a/mindspore/ccsrc/dataset/util/intrp_service.cc
+++ b/mindspore/ccsrc/dataset/util/intrp_service.cc
@@ -46,7 +46,10 @@ Status IntrpService::Register(const std::string &name, IntrpResource *res) {
       std::ostringstream ss;
       ss << this_thread::get_id();
       MS_LOG(DEBUG) << "Register resource with name " << name << ". Thread ID " << ss.str() << ".";
-      (void)all_intrp_resources_.emplace(name, res);
+      auto it = all_intrp_resources_.emplace(name, res);
+      if (it.second == false) {
+        return Status(StatusCode::kDuplicateKey, __LINE__, __FILE__, name);
+      }
       high_water_mark_++;
     } catch (std::exception &e) {
       RETURN_STATUS_UNEXPECTED(e.what());
-- 
GitLab