Merge branch 'master' of github.com:yandex/ClickHouse

This commit is contained in:
Alexey Milovidov 2017-01-17 23:48:14 +03:00
commit c74d585b0b
6 changed files with 14 additions and 5 deletions

View File

@ -1,6 +1,7 @@
#pragma once
#include <string>
#include <ctime>
#include <fcntl.h>
#include <DB/IO/ReadBuffer.h>

View File

@ -1,6 +1,6 @@
#pragma once
#include <openssl/md5.h>
#include <array>
#include <DB/Common/SipHash.h>
#include <DB/Common/Arena.h>

View File

@ -2,6 +2,7 @@
#include <set>
#include <memory>
#include <ostream>
#include <DB/Core/Types.h>
#include <DB/Common/Exception.h>

View File

@ -1,6 +1,7 @@
#pragma once
#include <cstddef>
#include <ctime>
#include <vector>
#include <functional>

View File

@ -1,3 +1,7 @@
#include <vector>
#include <string>
#include <sstream>
#include <Poco/MongoDB/Connection.h>
#include <Poco/MongoDB/Cursor.h>
#include <Poco/MongoDB/Element.h>
@ -10,8 +14,6 @@
#include <DB/DataTypes/DataTypeDateTime.h>
#include <DB/Columns/ColumnString.h>
#include <ext/range.hpp>
#include <vector>
#include <string>
#include <DB/Core/FieldVisitors.h>
@ -34,8 +36,9 @@ MongoDBBlockInputStream::~MongoDBBlockInputStream() = default;
String MongoDBBlockInputStream::getID() const
{
using stream = std::ostringstream;
return "MongoDB(@" + static_cast<stream &>(stream{} << cursor.get()).str() + ")";
std::ostringstream stream;
stream << cursor.get();
return "MongoDB(@" + stream.str() + ")";
}

View File

@ -1,6 +1,9 @@
#include <DB/Functions/FunctionFactory.h>
#include <DB/Functions/FunctionsArray.h>
#include <tuple>
#include <array>
namespace DB
{