Skip temporary editors' config files. [#CLICKHOUSE-3]

Resolves #1190

Skip temporary editors' config files. [#CLICKHOUSE-3]
Resolves #1190
72bccacb · Vitaliy Lyudvichenko · 9c889af8 · 72bccacb
显示空白变更内容
内联并排

Showing with 3 addition and 1 deletion

dbms/src/Common/ConfigProcessor/ConfigProcessor.cpp dbms/src/Common/ConfigProcessor/ConfigProcessor.cpp +3 -1

未找到文件。
--- a/dbms/src/Common/ConfigProcessor/ConfigProcessor.cpp
+++ b/dbms/src/Common/ConfigProcessor/ConfigProcessor.cpp
@@ -377,7 +377,9 @@ ConfigProcessor::Files ConfigProcessor::getConfigMergeFiles(const std::string &
        for (Poco::DirectoryIterator it(merge_dir_name); it != Poco::DirectoryIterator(); ++it)
        {
            Poco::File & file = *it;
-            if (file.isFile() && (endsWith(file.path(), ".xml") || endsWith(file.path(), ".conf")))
+            if (file.isFile()
+                && (endsWith(file.path(), ".xml") || endsWith(file.path(), ".conf"))
+                && !startsWith(file.path(), ".")) // skip temporary files
            {
                files.push_back(file.path());
            }