From c622e9cb1212c6fb94f1595932e107566cfbb25e Mon Sep 17 00:00:00 2001
From: Mahdi <mahdi.rahmani.hanzaki@huawei.com>
Date: Wed, 30 Dec 2020 14:07:04 -0500
Subject: [PATCH] Changin Sampler in Python to SamplerObj

---
 .../ccsrc/minddata/dataset/engine/consumers/tree_consumer.cc    | 2 ++
 .../dataset/engine/ir/datasetops/source/minddata_node.cc        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.cc b/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.cc
index db7fa79a47..fb1dd16fce 100644
--- a/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.cc
+++ b/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.cc
@@ -593,6 +593,8 @@ Status DatasetSizeGetter::GetRow(const std::shared_ptr<TreeAdapter> &tree_adapte
 }
 Status DatasetSizeGetter::Terminate() {
   for (const auto &tree : tree_adapters_) {
+    RETURN_UNEXPECTED_IF_NULL(tree);
+    RETURN_UNEXPECTED_IF_NULL(tree->AllTasks());
     RETURN_IF_NOT_OK(tree->AllTasks()->ServiceStop());
   }
   return Status::OK();
diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.cc b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.cc
index d7baf79dd3..592f06ff98 100644
--- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.cc
+++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.cc
@@ -187,7 +187,7 @@ Status MindDataNode::GetDatasetSize(const std::shared_ptr<DatasetSizeGetter> &si
     *dataset_size = dataset_size_;
     return Status::OK();
   }
-  int64_t num_rows;
+  int64_t num_rows = -1;
   std::vector<std::shared_ptr<ShardOperator>> operators;
   RETURN_IF_NOT_OK(BuildMindDatasetSamplerChain(sampler_, &operators, num_padded_));