From 376f283b84f646daa6c89297110abd48248b2af9 Mon Sep 17 00:00:00 2001
From: Alexey Vasiliev <loudhorr@yandex-team.ru>
Date: Tue, 20 Feb 2018 11:50:11 +0300
Subject: [PATCH] Sort ConfigProcessor files before use [#CLICKHOUSE-3436,
 #METRIQA-1971]

---
 dbms/src/Common/ConfigProcessor/ConfigProcessor.cpp | 9 ++++++---
 dbms/src/Common/ConfigProcessor/ConfigProcessor.h   | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dbms/src/Common/ConfigProcessor/ConfigProcessor.cpp b/dbms/src/Common/ConfigProcessor/ConfigProcessor.cpp
index aa51203dd9a..0b4572c4997 100644
--- a/dbms/src/Common/ConfigProcessor/ConfigProcessor.cpp
+++ b/dbms/src/Common/ConfigProcessor/ConfigProcessor.cpp
@@ -3,6 +3,7 @@
 #include <sys/utsname.h>
 #include <cerrno>
 #include <cstring>
+#include <algorithm>
 #include <iostream>
 #include <functional>
 #include <Poco/DOM/Text.h>
@@ -356,7 +357,7 @@ void ConfigProcessor::doIncludesRecursive(
 
 ConfigProcessor::Files ConfigProcessor::getConfigMergeFiles(const std::string & config_path)
 {
-    Files res;
+    Files files;
 
     Poco::Path merge_dir_path(config_path);
     merge_dir_path.setExtension("d");
@@ -378,12 +379,14 @@ ConfigProcessor::Files ConfigProcessor::getConfigMergeFiles(const std::string &
             Poco::File & file = *it;
             if (file.isFile() && (endsWith(file.path(), ".xml") || endsWith(file.path(), ".conf")))
             {
-                res.push_back(file.path());
+                files.push_back(file.path());
             }
         }
     }
 
-    return res;
+    std::sort(files.begin(), files.end());
+
+    return files;
 }
 
 XMLDocumentPtr ConfigProcessor::processConfig(
diff --git a/dbms/src/Common/ConfigProcessor/ConfigProcessor.h b/dbms/src/Common/ConfigProcessor/ConfigProcessor.h
index a5e58b21b24..a10f0ffe967 100644
--- a/dbms/src/Common/ConfigProcessor/ConfigProcessor.h
+++ b/dbms/src/Common/ConfigProcessor/ConfigProcessor.h
@@ -2,6 +2,7 @@
 
 #include <string>
 #include <unordered_set>
+#include <vector>
 
 #include <Poco/DOM/Document.h>
 #include <Poco/DOM/DOMParser.h>
@@ -87,7 +88,7 @@ public:
     void savePreprocessedConfig(const LoadedConfig & loaded_config);
 
 public:
-    using Files = std::list<std::string>;
+    using Files = std::vector<std::string>;
 
     static Files getConfigMergeFiles(const std::string & config_path);