Merge pull request #7374 from millb/fixed_getMultipleValuesFromConfig

alesapin · web-flow · commit 71cbe878fc14 · 2019-10-18T11:55:41.000+03:00
Fixed function getMultipleValuesFromConfig
diff --git a/dbms/src/Common/getMultipleKeysFromConfig.cpp b/dbms/src/Common/getMultipleKeysFromConfig.cpp
@@ -24,7 +24,7 @@ std::vector<std::string> getMultipleValuesFromConfig(const Poco::Util::AbstractC
 {
     std::vector<std::string> values;
     for (const auto & key : DB::getMultipleKeysFromConfig(config, root, name))
-        values.emplace_back(config.getString(key));
+        values.emplace_back(config.getString(root.empty() ? key : root + "." + key));
     return values;
 }
 
diff --git a/dbms/src/Common/tests/gtest_getMultipleValuesFromConfig.cpp b/dbms/src/Common/tests/gtest_getMultipleValuesFromConfig.cpp
@@ -0,0 +1,26 @@
+#include <Common/getMultipleKeysFromConfig.h>
+#include <Poco/AutoPtr.h>
+#include <Poco/Util/XMLConfiguration.h>
+
+#include <gtest/gtest.h>
+
+
+using namespace DB;
+
+TEST(Common, getMultipleValuesFromConfig)
+{
+    std::istringstream xml_isteam(R"END(<?xml version="1.0"?>
+<yandex>
+    <first_level>
+        <second_level>0</second_level>
+        <second_level>1</second_level>
+        <second_level>2</second_level>
+        <second_level>3</second_level>
+    </first_level>
+</yandex>)END");
+
+    Poco::AutoPtr<Poco::Util::XMLConfiguration> config = new Poco::Util::XMLConfiguration(xml_isteam);
+    std::vector<std::string> answer = getMultipleValuesFromConfig(*config, "first_level", "second_level");
+    std::vector<std::string> right_answer = {"0", "1", "2", "3"};
+    EXPECT_EQ(answer, right_answer);
+}

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ std::vector<std::string> getMultipleValuesFromConfig(const Poco::Util::AbstractC`
`24`	`24`	`{`
`25`	`25`	`std::vector<std::string> values;`
`26`	`26`	`for (const auto & key : DB::getMultipleKeysFromConfig(config, root, name))`
`27`		`- values.emplace_back(config.getString(key));`
	`27`	`+ values.emplace_back(config.getString(root.empty() ? key : root + "." + key));`
`28`	`28`	`return values;`
`29`	`29`	`}`
`30`	`30`