From 1f796797262404ce5ef12d64ae97dcf8caa3f7b3 Mon Sep 17 00:00:00 2001 From: tatiana-yan Date: Wed, 29 Jan 2020 15:31:25 +0300 Subject: [PATCH] [search_quality] Release json_in in feature_collector_tool. --- .../features_collector_tool.cpp | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/search/search_quality/features_collector_tool/features_collector_tool.cpp b/search/search_quality/features_collector_tool/features_collector_tool.cpp index c7a51cd672..30570edccb 100644 --- a/search/search_quality/features_collector_tool/features_collector_tool.cpp +++ b/search/search_quality/features_collector_tool/features_collector_tool.cpp @@ -116,27 +116,29 @@ int main(int argc, char * argv[]) auto engine = InitSearchEngine(dataSource, affiliations, "en" /* locale */, FLAGS_num_threads); - string lines; - if (FLAGS_json_in.empty()) + vector samples; { - GetContents(cin, lines); - } - else - { - ifstream ifs(FLAGS_json_in); - if (!ifs.is_open()) + string lines; + if (FLAGS_json_in.empty()) { - cerr << "Can't open input json file." << endl; + GetContents(cin, lines); + } + else + { + ifstream ifs(FLAGS_json_in); + if (!ifs.is_open()) + { + cerr << "Can't open input json file." << endl; + return -1; + } + GetContents(ifs, lines); + } + + if (!Sample::DeserializeFromJSONLines(lines, samples)) + { + cerr << "Can't parse input json file." << endl; return -1; } - GetContents(ifs, lines); - } - - vector samples; - if (!Sample::DeserializeFromJSONLines(lines, samples)) - { - cerr << "Can't parse input json file." << endl; - return -1; } vector stats(samples.size());