diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionArray.h b/dbms/include/DB/AggregateFunctions/AggregateFunctionArray.h
index 6e230f888d3..4bc52a30751 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionArray.h
+++ b/dbms/include/DB/AggregateFunctions/AggregateFunctionArray.h
@@ -38,6 +38,9 @@ public:
 	{
 		num_agruments = arguments.size();
 
+		if (0 == num_agruments)
+			throw Exception("Array aggregate functions requires at least one argument", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
 		DataTypes nested_arguments;
 		for (int i = 0; i < num_agruments; ++i)
 		{
@@ -46,6 +49,7 @@ public:
 			else
 				throw Exception("Illegal type " + arguments[i]->getName() + " of argument #" + toString(i + 1) + " for aggregate function " + getName() + ". Must be array.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 		}
+
 		nested_func->setArguments(nested_arguments);
 	}
 
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionGroupArray.h b/dbms/include/DB/AggregateFunctions/AggregateFunctionGroupArray.h
index 68aca9f1939..31e581c8724 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionGroupArray.h
+++ b/dbms/include/DB/AggregateFunctions/AggregateFunctionGroupArray.h
@@ -17,6 +17,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TOO_LARGE_ARRAY_SIZE;
+}
+
 
 /// Частный случай - реализация для числовых типов.
 template <typename T>
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTDigest.h b/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTDigest.h
index ab1906fa247..ee30a9e39dd 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTDigest.h
+++ b/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTDigest.h
@@ -17,6 +17,14 @@
 #include <DB/DataTypes/DataTypeArray.h>
 
 
+namespace DB
+{
+namespace ErrorCodes
+{
+	extern const int TOO_LARGE_ARRAY_SIZE;
+}
+}
+
 /** Алгоритм реализовал Алексей Борзенков https://███████████.yandex-team.ru/snaury
   * Ему принадлежит авторство кода и половины комментариев в данном namespace,
   *  за исключением слияния, сериализации и сортировки, а также выбора типов и других изменений.
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionSequenceMatch.h b/dbms/include/DB/AggregateFunctions/AggregateFunctionSequenceMatch.h
index 15acd585c61..bd51ec6006b 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionSequenceMatch.h
+++ b/dbms/include/DB/AggregateFunctions/AggregateFunctionSequenceMatch.h
@@ -15,6 +15,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TOO_SLOW;
+	extern const int TOO_LESS_ARGUMENTS_FOR_FUNCTION;
+	extern const int TOO_MUCH_ARGUMENTS_FOR_FUNCTION;
+	extern const int SYNTAX_ERROR;
+}
+
 /// helper type for comparing `std::pair`s using solely the .first member
 template <template <typename> class Comparator>
 struct ComparePairFirst final
diff --git a/dbms/include/DB/AggregateFunctions/IAggregateFunction.h b/dbms/include/DB/AggregateFunctions/IAggregateFunction.h
index 6326c8359e1..31b026aafe8 100644
--- a/dbms/include/DB/AggregateFunctions/IAggregateFunction.h
+++ b/dbms/include/DB/AggregateFunctions/IAggregateFunction.h
@@ -12,9 +12,15 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int AGGREGATE_FUNCTION_DOESNT_ALLOW_PARAMETERS;
+	extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+	extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
 
-typedef char * AggregateDataPtr;
-typedef const char * ConstAggregateDataPtr;
+using AggregateDataPtr = char *;
+using ConstAggregateDataPtr = const char *;
 
 
 /** Интерфейс для агрегатных функций.
diff --git a/dbms/include/DB/AggregateFunctions/ReservoirSamplerDeterministic.h b/dbms/include/DB/AggregateFunctions/ReservoirSamplerDeterministic.h
index a3e05e7c04a..025d40d177b 100644
--- a/dbms/include/DB/AggregateFunctions/ReservoirSamplerDeterministic.h
+++ b/dbms/include/DB/AggregateFunctions/ReservoirSamplerDeterministic.h
@@ -20,6 +20,16 @@
 /// Вызов quantile занимает O(sample_count log sample_count), если после предыдущего вызова quantile был хотя бы один вызов insert. Иначе, O(1).
 /// То есть, имеет смысл сначала добавлять, потом получать квантили, не добавляя.
 
+
+namespace DB
+{
+namespace ErrorCodes
+{
+	extern const int MEMORY_LIMIT_EXCEEDED;
+}
+}
+
+
 namespace detail
 {
 const size_t DEFAULT_SAMPLE_COUNT = 8192;
diff --git a/dbms/include/DB/Client/ConnectionPoolWithFailover.h b/dbms/include/DB/Client/ConnectionPoolWithFailover.h
index 9b6fac6af85..4b611ff0601 100644
--- a/dbms/include/DB/Client/ConnectionPoolWithFailover.h
+++ b/dbms/include/DB/Client/ConnectionPoolWithFailover.h
@@ -12,6 +12,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NETWORK_ERROR;
+	extern const int SOCKET_TIMEOUT;
+	extern const int LOGICAL_ERROR;
+}
+
+
 /** Пул соединений с отказоустойчивостью.
   * Инициализируется несколькими другими IConnectionPool-ами.
   * При получении соединения, пытается создать или выбрать живое соединение из какого-нибудь пула,
diff --git a/dbms/include/DB/Columns/ColumnAggregateFunction.h b/dbms/include/DB/Columns/ColumnAggregateFunction.h
index cce96eb80d8..03027fbdaed 100644
--- a/dbms/include/DB/Columns/ColumnAggregateFunction.h
+++ b/dbms/include/DB/Columns/ColumnAggregateFunction.h
@@ -16,6 +16,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int PARAMETER_OUT_OF_BOUND;
+	extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
+}
+
 
 /** Столбец состояний агрегатных функций.
   * Представлен в виде массива указателей на состояния агрегатных функций (data).
diff --git a/dbms/include/DB/Columns/ColumnArray.h b/dbms/include/DB/Columns/ColumnArray.h
index 14e683006b5..e6cf6ee7c4b 100644
--- a/dbms/include/DB/Columns/ColumnArray.h
+++ b/dbms/include/DB/Columns/ColumnArray.h
@@ -5,7 +5,6 @@
 #include <Poco/SharedPtr.h>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Common/Arena.h>
 
 #include <DB/Columns/IColumn.h>
@@ -16,6 +15,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ILLEGAL_COLUMN;
+	extern const int NOT_IMPLEMENTED;
+	extern const int BAD_ARGUMENTS;
+}
+
 using Poco::SharedPtr;
 
 /** Cтолбeц значений типа массив.
diff --git a/dbms/include/DB/Columns/ColumnConst.h b/dbms/include/DB/Columns/ColumnConst.h
index cd05f1d72f6..7fcbaf8f32e 100644
--- a/dbms/include/DB/Columns/ColumnConst.h
+++ b/dbms/include/DB/Columns/ColumnConst.h
@@ -4,7 +4,6 @@
 
 #include <DB/Core/Field.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Columns/ColumnVector.h>
 #include <DB/Columns/IColumn.h>
 #include <DB/Columns/ColumnsCommon.h>
@@ -14,6 +13,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_INSERT_ELEMENT_INTO_CONSTANT_COLUMN;
+	extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
+	extern const int NOT_IMPLEMENTED;
+	extern const int LOGICAL_ERROR;
+}
+
 using Poco::SharedPtr;
 
 
diff --git a/dbms/include/DB/Columns/ColumnExpression.h b/dbms/include/DB/Columns/ColumnExpression.h
index 712229b094a..2bd4b7ab228 100644
--- a/dbms/include/DB/Columns/ColumnExpression.h
+++ b/dbms/include/DB/Columns/ColumnExpression.h
@@ -1,40 +1,34 @@
 #pragma once
 
+#include <DB/Core/NamesAndTypes.h>
 #include <DB/Columns/IColumnDummy.h>
-#include <DB/Interpreters/ExpressionActions.h>
 
 
 namespace DB
 {
 
+class ExpressionActions;
+
 /** Столбец, содержащий лямбда-выражение.
   * Ведёт себя как столбец-константа. Содержит выражение, но не входные или выходные данные.
   */
 class ColumnExpression final : public IColumnDummy
 {
+private:
+	using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
+
 public:
-	ColumnExpression(size_t s_, ExpressionActionsPtr expression_, const NamesAndTypes & arguments_, DataTypePtr return_type_, std::string return_name_)
-		: IColumnDummy(s_), expression(expression_), arguments(arguments_), return_type(return_type_), return_name(return_name_) {}
+	ColumnExpression(size_t s_, ExpressionActionsPtr expression_, const NamesAndTypes & arguments_, DataTypePtr return_type_, String return_name_);
+	ColumnExpression(size_t s_, ExpressionActionsPtr expression_, const NamesAndTypesList & arguments_, DataTypePtr return_type_, String return_name_);
 
-	ColumnExpression(size_t s_, ExpressionActionsPtr expression_, const NamesAndTypesList & arguments_, DataTypePtr return_type_, std::string return_name_)
-		: IColumnDummy(s_), expression(expression_), arguments(arguments_.begin(), arguments_.end()), return_type(return_type_), return_name(return_name_) {}
+	std::string getName() const override;
+	ColumnPtr cloneDummy(size_t s_) const override;
 
-	std::string getName() const override { return "ColumnExpression"; }
-	ColumnPtr cloneDummy(size_t s_) const override { return new ColumnExpression(s_, expression, arguments, return_type, return_name); }
-
-	const ExpressionActionsPtr & getExpression() const { return expression; }
-	const DataTypePtr & getReturnType() const { return return_type; }
-	const std::string & getReturnName() const { return return_name; }
-
-	const NamesAndTypes & getArguments() const { return arguments; }
-
-	Names getArgumentNames() const
-	{
-		Names res(arguments.size());
-		for (size_t i = 0; i < arguments.size(); ++i)
-			res[i] = arguments[i].name;
-		return res;
-	}
+	const ExpressionActionsPtr & getExpression() const;
+	const DataTypePtr & getReturnType() const;
+	const std::string & getReturnName() const;
+	const NamesAndTypes & getArguments() const;
+	Names getArgumentNames() const;
 
 private:
 	ExpressionActionsPtr expression;
diff --git a/dbms/include/DB/Columns/ColumnFixedString.h b/dbms/include/DB/Columns/ColumnFixedString.h
index 693cbed9668..7453e4bfbdd 100644
--- a/dbms/include/DB/Columns/ColumnFixedString.h
+++ b/dbms/include/DB/Columns/ColumnFixedString.h
@@ -6,11 +6,20 @@
 #include <DB/Common/Arena.h>
 #include <DB/Columns/IColumn.h>
 #include <DB/IO/ReadHelpers.h>
+#include <DB/IO/WriteHelpers.h>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TOO_LARGE_STRING_SIZE;
+	extern const int SIZE_OF_ARRAY_DOESNT_MATCH_SIZE_OF_FIXEDARRAY_COLUMN;
+	extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
+	extern const int PARAMETER_OUT_OF_BOUND;
+}
+
 /** Cтолбeц значений типа "строка фиксированной длины".
   * Если вставить строку меньшей длины, то она будет дополнена нулевыми байтами.
   */
diff --git a/dbms/include/DB/Columns/ColumnString.h b/dbms/include/DB/Columns/ColumnString.h
index 9c706d2bd40..3bd47a32da0 100644
--- a/dbms/include/DB/Columns/ColumnString.h
+++ b/dbms/include/DB/Columns/ColumnString.h
@@ -14,6 +14,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int PARAMETER_OUT_OF_BOUND;
+	extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
+}
+
+
 /** Cтолбeц значений типа "строка".
   */
 class ColumnString final : public IColumn
diff --git a/dbms/include/DB/Columns/ColumnTuple.h b/dbms/include/DB/Columns/ColumnTuple.h
index c35a9c61cb5..5ecad4c342a 100644
--- a/dbms/include/DB/Columns/ColumnTuple.h
+++ b/dbms/include/DB/Columns/ColumnTuple.h
@@ -8,6 +8,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NOT_IMPLEMENTED;
+	extern const int CANNOT_INSERT_VALUE_OF_DIFFERENT_SIZE_INTO_TUPLE;
+}
+
 
 /** Столбец, который всего лишь группирует вместе несколько других столбцов.
   */
diff --git a/dbms/include/DB/Columns/ColumnVector.h b/dbms/include/DB/Columns/ColumnVector.h
index 97983f5517a..20c86cb4599 100644
--- a/dbms/include/DB/Columns/ColumnVector.h
+++ b/dbms/include/DB/Columns/ColumnVector.h
@@ -3,7 +3,6 @@
 #include <string.h>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Common/Arena.h>
 
 #include <DB/IO/WriteBuffer.h>
@@ -11,10 +10,20 @@
 
 #include <DB/Columns/IColumn.h>
 
+#if defined(__x86_64__)
+	#include <emmintrin.h>
+#endif
+
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int PARAMETER_OUT_OF_BOUND;
+	extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
+}
+
 
 /** Штука для сравнения чисел.
   * Целые числа сравниваются как обычно.
@@ -283,17 +292,20 @@ public:
 		if (result_size_hint)
 			res_data.reserve(result_size_hint > 0 ? result_size_hint : size);
 
-		/** Чуть более оптимизированная версия.
-		  * Исходит из допущения, что часто куски последовательно идущих значений
-		  *  полностью проходят или полностью не проходят фильтр.
-		  * Поэтому, будем оптимистично проверять куски по 16 значений.
-		  */
 		const UInt8 * filt_pos = &filt[0];
 		const UInt8 * filt_end = filt_pos + size;
-		const UInt8 * filt_end_sse = filt_pos + size / 16 * 16;
 		const T * data_pos = &data[0];
 
+#if defined(__x86_64__)
+		/** Чуть более оптимизированная версия.
+		 * Исходит из допущения, что часто куски последовательно идущих значений
+		 *  полностью проходят или полностью не проходят фильтр.
+		 * Поэтому, будем оптимистично проверять куски по SIMD_BYTES значений.
+		 */
+
+		static constexpr size_t SIMD_BYTES = 16;
 		const __m128i zero16 = _mm_setzero_si128();
+		const UInt8 * filt_end_sse = filt_pos + size / SIMD_BYTES * SIMD_BYTES;
 
 		while (filt_pos < filt_end_sse)
 		{
@@ -305,18 +317,19 @@ public:
 			}
 			else if (0xFFFF == mask)
 			{
-				res_data.insert(data_pos, data_pos + 16);
+				res_data.insert(data_pos, data_pos + SIMD_BYTES);
 			}
 			else
 			{
-				for (size_t i = 0; i < 16; ++i)
+				for (size_t i = 0; i < SIMD_BYTES; ++i)
 					if (filt_pos[i])
 						res_data.push_back(data_pos[i]);
 			}
 
-			filt_pos += 16;
-			data_pos += 16;
+			filt_pos += SIMD_BYTES;
+			data_pos += SIMD_BYTES;
 		}
+#endif
 
 		while (filt_pos < filt_end)
 		{
diff --git a/dbms/include/DB/Columns/IColumn.h b/dbms/include/DB/Columns/IColumn.h
index b64caf4d8f1..ce6a7379cc3 100644
--- a/dbms/include/DB/Columns/IColumn.h
+++ b/dbms/include/DB/Columns/IColumn.h
@@ -7,13 +7,18 @@
 
 #include <DB/Core/Field.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Core/StringRef.h>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_GET_SIZE_OF_FIELD;
+	extern const int NOT_IMPLEMENTED;
+}
+
 using Poco::SharedPtr;
 
 class IColumn;
diff --git a/dbms/include/DB/Columns/IColumnDummy.h b/dbms/include/DB/Columns/IColumnDummy.h
index 95eb2f22b10..9452bc64074 100644
--- a/dbms/include/DB/Columns/IColumnDummy.h
+++ b/dbms/include/DB/Columns/IColumnDummy.h
@@ -7,6 +7,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
+	extern const int NOT_IMPLEMENTED;
+}
+
+
 /** Базовый класс для столбцов-констант, содержащих значение, не входящее в Field.
   * Не является полноценым столбцом и используется особым образом.
   */
diff --git a/dbms/include/DB/Common/AIO.h b/dbms/include/DB/Common/AIO.h
index 5512ac053cf..77344179763 100644
--- a/dbms/include/DB/Common/AIO.h
+++ b/dbms/include/DB/Common/AIO.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Common/Exception.h>
 #include <common/logger_useful.h>
 #include <common/singleton.h>
@@ -59,9 +58,16 @@ struct AIOContext : private boost::noncopyable
 	}
 };
 
+
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int AIO_COMPLETION_ERROR;
+	extern const int AIO_SUBMIT_ERROR;
+}
+
 
 class AIOContextPool : public Singleton<AIOContextPool>
 {
diff --git a/dbms/include/DB/Common/ARMHelpers.h b/dbms/include/DB/Common/ARMHelpers.h
new file mode 100644
index 00000000000..268855f7885
--- /dev/null
+++ b/dbms/include/DB/Common/ARMHelpers.h
@@ -0,0 +1,11 @@
+#pragma once
+
+
+#if !defined(__x86_64__)
+
+inline unsigned int _bit_scan_reverse(unsigned int x)
+{
+	return sizeof(unsigned int) * 8 - 1 - __builtin_clz(x);
+}
+
+#endif
diff --git a/dbms/include/DB/Common/Allocator.h b/dbms/include/DB/Common/Allocator.h
index 3185e5ecd6e..4f977c0816b 100644
--- a/dbms/include/DB/Common/Allocator.h
+++ b/dbms/include/DB/Common/Allocator.h
@@ -6,7 +6,18 @@
 
 #include <DB/Common/MemoryTracker.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+	extern const int BAD_ARGUMENTS;
+	extern const int CANNOT_ALLOCATE_MEMORY;
+	extern const int CANNOT_MUNMAP;
+	extern const int CANNOT_MREMAP;
+}
+}
 
 
 /** При использовании AllocatorWithStackMemory, размещённом на стеке,
diff --git a/dbms/include/DB/Common/ArenaWithFreeLists.h b/dbms/include/DB/Common/ArenaWithFreeLists.h
index aa8c2bddb20..b4c30899e6d 100644
--- a/dbms/include/DB/Common/ArenaWithFreeLists.h
+++ b/dbms/include/DB/Common/ArenaWithFreeLists.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <DB/Common/Arena.h>
+#include <DB/Common/ARMHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/Collator.h b/dbms/include/DB/Common/Collator.h
index c4fd0b3f788..6d5d405b5fc 100644
--- a/dbms/include/DB/Common/Collator.h
+++ b/dbms/include/DB/Common/Collator.h
@@ -2,7 +2,6 @@
 
 #include <unicode/ucol.h>
 
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Common/Exception.h>
 #include <DB/IO/WriteHelpers.h>
 
@@ -12,6 +11,17 @@
 
 #include <boost/noncopyable.hpp>
 
+
+namespace DB
+{
+	namespace ErrorCodes
+	{
+		extern const int UNSUPPORTED_COLLATION_LOCALE;
+		extern const int COLLATION_COMPARISON_FAILED;
+	}
+}
+
+
 class Collator : private boost::noncopyable
 {
 public:
@@ -61,4 +71,4 @@ public:
 private:
 	std::string locale;
 	UCollator * collator;
-};
\ No newline at end of file
+};
diff --git a/dbms/include/DB/Common/CompactArray.h b/dbms/include/DB/Common/CompactArray.h
index fb7ecb5bf28..d5fb1bf9de4 100644
--- a/dbms/include/DB/Common/CompactArray.h
+++ b/dbms/include/DB/Common/CompactArray.h
@@ -5,11 +5,16 @@
 #include <DB/IO/ReadHelpers.h>
 #include <DB/IO/WriteHelpers.h>
 #include <DB/Core/Defines.h>
-#include <DB/Core/ErrorCodes.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NO_AVAILABLE_DATA;
+}
+
+
 /** Компактный массив для хранения данных, размер content_width, в битах, которых составляет
   * меньше одного байта. Вместо того, чтобы хранить каждое значение в отдельный
   * байт, что приводит к растрате 37.5% пространства для content_width=5, CompactArray хранит
diff --git a/dbms/include/DB/Common/HashTable/Hash.h b/dbms/include/DB/Common/HashTable/Hash.h
index 6214e005055..71f495ba313 100644
--- a/dbms/include/DB/Common/HashTable/Hash.h
+++ b/dbms/include/DB/Common/HashTable/Hash.h
@@ -30,9 +30,14 @@ inline DB::UInt64 intHash64(DB::UInt64 x)
   */
 inline DB::UInt64 intHashCRC32(DB::UInt64 x)
 {
+#if defined(__x86_64__)
 	DB::UInt64 crc = -1ULL;
 	asm("crc32q %[x], %[crc]\n" : [crc] "+r" (crc) : [x] "rm" (x));
 	return crc;
+#else
+	/// На других платформах используем не обязательно CRC32. NOTE Это может сбить с толку.
+	return intHash64(x);
+#endif
 }
 
 
diff --git a/dbms/include/DB/Common/HashTable/HashTable.h b/dbms/include/DB/Common/HashTable/HashTable.h
index da591b9ce2b..8b3128b4ae0 100644
--- a/dbms/include/DB/Common/HashTable/HashTable.h
+++ b/dbms/include/DB/Common/HashTable/HashTable.h
@@ -14,7 +14,6 @@
 #include <DB/Core/Defines.h>
 #include <DB/Core/Types.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/IO/WriteBuffer.h>
 #include <DB/IO/WriteHelpers.h>
@@ -31,6 +30,16 @@
 #endif
 
 
+namespace DB
+{
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+	extern const int NO_AVAILABLE_DATA;
+}
+}
+
+
 /** Состояние хэш-таблицы, которое влияет на свойства её ячеек.
   * Используется в качестве параметра шаблона.
   * Например, существует реализация мгновенно-очищаемой хэш-таблицы - ClearableHashMap.
diff --git a/dbms/include/DB/Common/HyperLogLogBiasEstimator.h b/dbms/include/DB/Common/HyperLogLogBiasEstimator.h
index c19a1a8c350..23b03a1bd5d 100644
--- a/dbms/include/DB/Common/HyperLogLogBiasEstimator.h
+++ b/dbms/include/DB/Common/HyperLogLogBiasEstimator.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <algorithm>
 #include <limits>
diff --git a/dbms/include/DB/Common/HyperLogLogCounter.h b/dbms/include/DB/Common/HyperLogLogCounter.h
index a837cbcad4f..7935527335e 100644
--- a/dbms/include/DB/Common/HyperLogLogCounter.h
+++ b/dbms/include/DB/Common/HyperLogLogCounter.h
@@ -10,11 +10,20 @@
 #include <DB/IO/ReadHelpers.h>
 #include <DB/IO/WriteHelpers.h>
 #include <DB/Core/Defines.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <cmath>
 #include <cstring>
 
+
+namespace DB
+{
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+}
+}
+
+
 namespace details
 {
 
diff --git a/dbms/include/DB/Common/LRUCache.h b/dbms/include/DB/Common/LRUCache.h
index de00ea816a4..6b3e02cdaa5 100644
--- a/dbms/include/DB/Common/LRUCache.h
+++ b/dbms/include/DB/Common/LRUCache.h
@@ -6,7 +6,6 @@
 #include <chrono>
 #include <Poco/ScopedLock.h>
 #include <Poco/Mutex.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Common/Exception.h>
 #include <common/logger_useful.h>
 
diff --git a/dbms/include/DB/Common/MemoryTracker.h b/dbms/include/DB/Common/MemoryTracker.h
index bce58353c27..8d0cb6b2c12 100644
--- a/dbms/include/DB/Common/MemoryTracker.h
+++ b/dbms/include/DB/Common/MemoryTracker.h
@@ -16,7 +16,14 @@ class MemoryTracker
 	/// В целях тестирования exception safety - кидать исключение при каждом выделении памяти с указанной вероятностью.
 	double fault_probability = 0;
 
+	/// Односвязный список. Вся информация будет передаваться в следующие MemoryTracker-ы тоже. Они должны жить во время жизни данного MemoryTracker.
+	MemoryTracker * next = nullptr;
+
+	/// Если задано (например, "for user") - в сообщениях в логе будет указываться это описание.
+	const char * description = nullptr;
+
 public:
+	MemoryTracker() {}
 	MemoryTracker(Int64 limit_) : limit(limit_) {}
 
 	~MemoryTracker();
@@ -32,10 +39,7 @@ public:
 
 	/** А эту функцию имеет смысл вызывать после освобождения памяти.
 	  */
-	void free(Int64 size)
-	{
-		__sync_sub_and_fetch(&amount, size);
-	}
+	void free(Int64 size);
 
 	Int64 get() const
 	{
@@ -47,10 +51,31 @@ public:
 		return peak;
 	}
 
+	void setLimit(Int64 limit_)
+	{
+		limit = limit_;
+	}
+
 	void setFaultProbability(double value)
 	{
 		fault_probability = value;
 	}
+
+	void setNext(MemoryTracker * elem)
+	{
+		next = elem;
+	}
+
+	void setDescription(const char * description_)
+	{
+		description = description_;
+	}
+
+	/// Обнулить накопленные данные.
+	void reset();
+
+	/// Вывести в лог информацию о пиковом потреблении памяти.
+	void logPeakMemoryUsage() const;
 };
 
 
diff --git a/dbms/include/DB/Common/PODArray.h b/dbms/include/DB/Common/PODArray.h
index 21c9fa7c38a..655db8e07a2 100644
--- a/dbms/include/DB/Common/PODArray.h
+++ b/dbms/include/DB/Common/PODArray.h
@@ -13,7 +13,6 @@
 
 #include <DB/Common/Allocator.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/PoolWithFailoverBase.h b/dbms/include/DB/Common/PoolWithFailoverBase.h
index c856f2853fc..02104cd1050 100644
--- a/dbms/include/DB/Common/PoolWithFailoverBase.h
+++ b/dbms/include/DB/Common/PoolWithFailoverBase.h
@@ -5,10 +5,19 @@
 #include <DB/Common/ProfileEvents.h>
 #include <DB/Common/NetException.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Interpreters/Settings.h>
 
 
+namespace DB
+{
+namespace ErrorCodes
+{
+	extern const int ALL_CONNECTION_TRIES_FAILED;
+	extern const int CANNOT_CLOCK_GETTIME;
+}
+}
+
+
 namespace
 {
 	/** Класс, который употребляется для того, чтобы оптимизировать выделение
diff --git a/dbms/include/DB/Common/RadixSort.h b/dbms/include/DB/Common/RadixSort.h
index fc151e17b81..12401b10194 100644
--- a/dbms/include/DB/Common/RadixSort.h
+++ b/dbms/include/DB/Common/RadixSort.h
@@ -40,6 +40,7 @@ struct RadixSortMallocAllocator
   *  что отношение порядка над ключами будет соответствовать отношению порядка над полученными беззнаковыми числами.
   * Для float-ов это преобразование делает следующее:
   *  если выставлен знаковый бит, то переворачивает все остальные биты.
+  * При этом, NaN-ы оказываются больше всех нормальных чисел.
   */
 template <typename KeyBits>
 struct RadixSortFloatTransform
diff --git a/dbms/include/DB/Common/SmallObjectPool.h b/dbms/include/DB/Common/SmallObjectPool.h
index 7948ae42626..5b0fe4b055f 100644
--- a/dbms/include/DB/Common/SmallObjectPool.h
+++ b/dbms/include/DB/Common/SmallObjectPool.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Common/Arena.h>
 #include <common/likely.h>
 #include <ext/range.hpp>
diff --git a/dbms/include/DB/Common/StringSearcher.h b/dbms/include/DB/Common/StringSearcher.h
index 82b7e9b4acb..8930a7bd650 100644
--- a/dbms/include/DB/Common/StringSearcher.h
+++ b/dbms/include/DB/Common/StringSearcher.h
@@ -7,23 +7,45 @@
 #include <stdint.h>
 #include <string.h>
 
+#if defined(__x86_64__)
+	#include <smmintrin.h>
+#endif
+
 
 namespace DB
 {
 
 
+namespace ErrorCodes
+{
+	extern const int UNSUPPORTED_PARAMETER;
+}
+
+
+struct StringSearcherBase
+{
+#if defined(__x86_64__)
+	static constexpr auto n = sizeof(__m128i);
+	const int page_size = getpagesize();
+
+	bool page_safe(const void * const ptr) const
+	{
+		return ((page_size - 1) & reinterpret_cast<std::uintptr_t>(ptr)) <= page_size - n;
+	}
+#endif
+};
+
+
 /// Performs case-sensitive and case-insensitive search of UTF-8 strings
 template <bool CaseSensitive, bool ASCII> class StringSearcher;
 
 /// Case-insensitive UTF-8 searcher
-template <> class StringSearcher<false, false>
+template <>
+class StringSearcher<false, false> : private StringSearcherBase
 {
+private:
 	using UTF8SequenceBuffer = UInt8[6];
 
-	static constexpr auto n = sizeof(__m128i);
-
-	const int page_size = getpagesize();
-
 	/// string to be searched for
 	const UInt8 * const needle;
 	const std::size_t needle_size;
@@ -32,6 +54,8 @@ template <> class StringSearcher<false, false>
 	bool first_needle_symbol_is_ascii{};
 	UInt8 l{};
 	UInt8 u{};
+
+#if defined(__x86_64__)
 	/// vectors filled with `l` and `u`, for determining leftmost position of the first symbol
 	__m128i patl, patu;
 	/// lower and uppercase vectors of first 16 characters of `needle`
@@ -39,11 +63,7 @@ template <> class StringSearcher<false, false>
 	int cachemask{};
 	std::size_t cache_valid_len{};
 	std::size_t cache_actual_len{};
-
-	bool page_safe(const void * const ptr) const
-	{
-		return ((page_size - 1) & reinterpret_cast<std::uintptr_t>(ptr)) <= page_size - n;
-	}
+#endif
 
 public:
 	StringSearcher(const char * const needle_, const std::size_t needle_size)
@@ -74,6 +94,7 @@ public:
 			u = u_seq[0];
 		}
 
+#if defined(__x86_64__)
 		/// for detecting leftmost position of the first symbol
 		patl = _mm_set1_epi8(l);
 		patu = _mm_set1_epi8(u);
@@ -127,12 +148,14 @@ public:
 				}
 			}
 		}
+#endif
 	}
 
 	bool compare(const UInt8 * pos) const
 	{
 		static const Poco::UTF8Encoding utf8;
 
+#if defined(__x86_64__)
 		if (page_safe(pos))
 		{
 			const auto v_haystack = _mm_loadu_si128(reinterpret_cast<const __m128i *>(pos));
@@ -166,6 +189,7 @@ public:
 
 			return false;
 		}
+#endif
 
 		if (*pos == l || *pos == u)
 		{
@@ -196,6 +220,7 @@ public:
 
 		while (haystack < haystack_end)
 		{
+#if defined(__x86_64__)
 			if (haystack + n <= haystack_end && page_safe(haystack))
 			{
 				const auto v_haystack = _mm_loadu_si128(reinterpret_cast<const __m128i *>(haystack));
@@ -251,6 +276,7 @@ public:
 					continue;
 				}
 			}
+#endif
 
 			if (haystack == haystack_end)
 				return haystack_end;
@@ -280,13 +306,12 @@ public:
 	}
 };
 
+
 /// Case-insensitive ASCII searcher
-template <> class StringSearcher<false, true>
+template <>
+class StringSearcher<false, true> : private StringSearcherBase
 {
-	static constexpr auto n = sizeof(__m128i);
-
-	const int page_size = getpagesize();
-
+private:
 	/// string to be searched for
 	const UInt8 * const needle;
 	const std::size_t needle_size;
@@ -294,16 +319,14 @@ template <> class StringSearcher<false, true>
 	/// lower and uppercase variants of the first character in `needle`
 	UInt8 l{};
 	UInt8 u{};
+
+#if defined(__x86_64__)
 	/// vectors filled with `l` and `u`, for determining leftmost position of the first symbol
 	__m128i patl, patu;
 	/// lower and uppercase vectors of first 16 characters of `needle`
 	__m128i cachel = _mm_setzero_si128(), cacheu = _mm_setzero_si128();
 	int cachemask{};
-
-	bool page_safe(const void * const ptr) const
-	{
-		return ((page_size - 1) & reinterpret_cast<std::uintptr_t>(ptr)) <= page_size - n;
-	}
+#endif
 
 public:
 	StringSearcher(const char * const needle_, const std::size_t needle_size)
@@ -315,6 +338,7 @@ public:
 		l = static_cast<UInt8>(std::tolower(*needle));
 		u = static_cast<UInt8>(std::toupper(*needle));
 
+#if defined(__x86_64__)
 		patl = _mm_set1_epi8(l);
 		patu = _mm_set1_epi8(u);
 
@@ -333,10 +357,12 @@ public:
 				++needle_pos;
 			}
 		}
+#endif
 	}
 
 	bool compare(const UInt8 * pos) const
 	{
+#if defined(__x86_64__)
 		if (page_safe(pos))
 		{
 			const auto v_haystack = _mm_loadu_si128(reinterpret_cast<const __m128i *>(pos));
@@ -364,6 +390,7 @@ public:
 
 			return false;
 		}
+#endif
 
 		if (*pos == l || *pos == u)
 		{
@@ -387,6 +414,7 @@ public:
 
 		while (haystack < haystack_end)
 		{
+#if defined(__x86_64__)
 			if (haystack + n <= haystack_end && page_safe(haystack))
 			{
 				const auto v_haystack = _mm_loadu_si128(reinterpret_cast<const __m128i *>(haystack));
@@ -435,6 +463,7 @@ public:
 					continue;
 				}
 			}
+#endif
 
 			if (haystack == haystack_end)
 				return haystack_end;
@@ -459,29 +488,26 @@ public:
 	}
 };
 
+
 /// Case-sensitive searcher (both ASCII and UTF-8)
-template <bool ASCII> class StringSearcher<true, ASCII>
+template <bool ASCII>
+class StringSearcher<true, ASCII> : private StringSearcherBase
 {
-	static constexpr auto n = sizeof(__m128i);
-
-	const int page_size = getpagesize();
-
+private:
 	/// string to be searched for
 	const UInt8 * const needle;
 	const std::size_t needle_size;
 	const UInt8 * const needle_end = needle + needle_size;
 	/// first character in `needle`
 	UInt8 first{};
+
+#if defined(__x86_64__)
 	/// vector filled `first` for determining leftmost position of the first symbol
 	__m128i pattern;
 	/// vector of first 16 characters of `needle`
 	__m128i cache = _mm_setzero_si128();
 	int cachemask{};
-
-	bool page_safe(const void * const ptr) const
-	{
-		return ((page_size - 1) & reinterpret_cast<std::uintptr_t>(ptr)) <= page_size - n;
-	}
+#endif
 
 public:
 	StringSearcher(const char * const needle_, const std::size_t needle_size)
@@ -491,6 +517,8 @@ public:
 			return;
 
 		first = *needle;
+
+#if defined(__x86_64__)
 		pattern = _mm_set1_epi8(first);
 
 		auto needle_pos = needle;
@@ -506,10 +534,12 @@ public:
 				++needle_pos;
 			}
 		}
+#endif
 	}
 
 	bool compare(const UInt8 * pos) const
 	{
+#if defined(__x86_64__)
 		if (page_safe(pos))
 		{
 			const auto v_haystack = _mm_loadu_si128(reinterpret_cast<const __m128i *>(pos));
@@ -535,6 +565,7 @@ public:
 
 			return false;
 		}
+#endif
 
 		if (*pos == first)
 		{
@@ -558,6 +589,7 @@ public:
 
 		while (haystack < haystack_end)
 		{
+#if defined(__x86_64__)
 			if (haystack + n <= haystack_end && page_safe(haystack))
 			{
 				/// find first character
@@ -605,6 +637,7 @@ public:
 					continue;
 				}
 			}
+#endif
 
 			if (haystack == haystack_end)
 				return haystack_end;
diff --git a/dbms/include/DB/Common/Throttler.h b/dbms/include/DB/Common/Throttler.h
index 63bb51280a3..fec62e41889 100644
--- a/dbms/include/DB/Common/Throttler.h
+++ b/dbms/include/DB/Common/Throttler.h
@@ -10,6 +10,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int LIMIT_EXCEEDED;
+}
+
+
 /** Позволяет ограничить скорость чего либо (в штуках в секунду) с помощью sleep.
   * Особенности работы:
   * - считается только средняя скорость, от момента первого вызова функции add;
diff --git a/dbms/include/DB/Common/UInt128.h b/dbms/include/DB/Common/UInt128.h
index f780a627b76..73d1569422e 100644
--- a/dbms/include/DB/Common/UInt128.h
+++ b/dbms/include/DB/Common/UInt128.h
@@ -29,6 +29,8 @@ struct UInt128Hash
 	size_t operator()(UInt128 x) const { return hash64(hash64(x.first) ^ x.second); }
 };
 
+#if defined(__x86_64__)
+
 struct UInt128HashCRC32
 {
 	size_t operator()(UInt128 x) const
@@ -40,6 +42,13 @@ struct UInt128HashCRC32
 	}
 };
 
+#else
+
+/// На других платформах используем не обязательно CRC32. NOTE Это может сбить с толку.
+struct UInt128HashCRC32 : public UInt128Hash {};
+
+#endif
+
 struct UInt128TrivialHash
 {
 	size_t operator()(UInt128 x) const { return x.first; }
@@ -80,6 +89,8 @@ struct UInt256
 	UInt256 & operator= (const UInt64 rhs) { a = rhs; b = 0; c = 0; d = 0; return *this; }
 };
 
+#if defined(__x86_64__)
+
 struct UInt256HashCRC32
 {
 	size_t operator()(UInt256 x) const
@@ -93,6 +104,21 @@ struct UInt256HashCRC32
 	}
 };
 
+#else
+
+/// На других платформах используем не обязательно CRC32. NOTE Это может сбить с толку.
+struct UInt256HashCRC32
+{
+	DefaultHash<UInt64> hash64;
+	size_t operator()(UInt256 x) const
+	{
+		/// TODO Это не оптимально.
+		return hash64(hash64(hash64(hash64(x.a) ^ x.b) ^ x.c) ^ x.d);
+	}
+};
+
+#endif
+
 inline void readBinary(UInt256 & x, ReadBuffer & buf) { readPODBinary(x, buf); }
 inline void writeBinary(const UInt256 & x, WriteBuffer & buf) { writePODBinary(x, buf); }
 
diff --git a/dbms/include/DB/Common/UTF8Helpers.h b/dbms/include/DB/Common/UTF8Helpers.h
index 40b201a9ba4..d75de2d8157 100644
--- a/dbms/include/DB/Common/UTF8Helpers.h
+++ b/dbms/include/DB/Common/UTF8Helpers.h
@@ -1,7 +1,12 @@
 #pragma once
 
 #include <DB/Core/Types.h>
-#include <x86intrin.h>
+
+#if defined(__x86_64__)
+	#include <x86intrin.h>
+#else
+	#include <DB/Common/ARMHelpers.h>
+#endif
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/Volnitsky.h b/dbms/include/DB/Common/Volnitsky.h
index 7e40469df13..8b35d1956c3 100644
--- a/dbms/include/DB/Common/Volnitsky.h
+++ b/dbms/include/DB/Common/Volnitsky.h
@@ -4,7 +4,6 @@
 #include <Poco/UTF8Encoding.h>
 #include <Poco/Unicode.h>
 #include <ext/range.hpp>
-#include <x86intrin.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/dbms/include/DB/Common/getNumberOfPhysicalCPUCores.h b/dbms/include/DB/Common/getNumberOfPhysicalCPUCores.h
new file mode 100644
index 00000000000..52fc74bf01e
--- /dev/null
+++ b/dbms/include/DB/Common/getNumberOfPhysicalCPUCores.h
@@ -0,0 +1,4 @@
+#pragma once
+
+/// Получить количество ядер CPU без учёта hyper-threading.
+unsigned getNumberOfPhysicalCPUCores();
diff --git a/dbms/include/DB/Core/Block.h b/dbms/include/DB/Core/Block.h
index 54e4e3a9de1..239b19bd8c4 100644
--- a/dbms/include/DB/Core/Block.h
+++ b/dbms/include/DB/Core/Block.h
@@ -9,7 +9,6 @@
 #include <DB/Core/ColumnWithTypeAndName.h>
 #include <DB/Core/NamesAndTypes.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include "ColumnsWithTypeAndName.h"
 
 
diff --git a/dbms/include/DB/Core/BlockInfo.h b/dbms/include/DB/Core/BlockInfo.h
index 49d7be5c579..026861d3a4c 100644
--- a/dbms/include/DB/Core/BlockInfo.h
+++ b/dbms/include/DB/Core/BlockInfo.h
@@ -2,7 +2,6 @@
 
 #include <DB/Core/Types.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/IO/ReadBuffer.h>
 #include <DB/IO/WriteBuffer.h>
 #include <DB/IO/VarInt.h>
@@ -13,6 +12,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNKNOWN_BLOCK_INFO_FIELD;
+}
+
 /** Дополнительная информация о блоке.
   */
 struct BlockInfo
diff --git a/dbms/include/DB/Core/Defines.h b/dbms/include/DB/Core/Defines.h
index dd559f80bbc..7e820848493 100644
--- a/dbms/include/DB/Core/Defines.h
+++ b/dbms/include/DB/Core/Defines.h
@@ -82,3 +82,9 @@
 
 #define ALWAYS_INLINE 	__attribute__((__always_inline__))
 #define NO_INLINE 		__attribute__((__noinline__))
+
+#define PLATFORM_NOT_SUPPORTED	"The only supported platforms are x86_64 and AArch64 (work in progress)"
+
+#if !defined(__x86_64__) && !defined(__aarch64__)
+	#error PLATFORM_NOT_SUPPORTED
+#endif
diff --git a/dbms/include/DB/Core/ErrorCodes.h b/dbms/include/DB/Core/ErrorCodes.h
deleted file mode 100644
index 34e25e7968c..00000000000
--- a/dbms/include/DB/Core/ErrorCodes.h
+++ /dev/null
@@ -1,318 +0,0 @@
-#pragma once
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-	enum ErrorCodes
-	{
-		UNSUPPORTED_METHOD = 1,
-		UNSUPPORTED_PARAMETER = 2,
-		UNEXPECTED_END_OF_FILE = 3,
-		EXPECTED_END_OF_FILE = 4,
-		CANNOT_PARSE_TEXT = 6,
-		INCORRECT_NUMBER_OF_COLUMNS = 7,
-		THERE_IS_NO_COLUMN = 8,
-		SIZES_OF_COLUMNS_DOESNT_MATCH = 9,
-		NOT_FOUND_COLUMN_IN_BLOCK = 10,
-		POSITION_OUT_OF_BOUND = 11,
-		PARAMETER_OUT_OF_BOUND = 12,
-		SIZES_OF_COLUMNS_IN_TUPLE_DOESNT_MATCH = 13,
-		DUPLICATE_COLUMN = 15,
-		NO_SUCH_COLUMN_IN_TABLE = 16,
-		DELIMITER_IN_STRING_LITERAL_DOESNT_MATCH = 17,
-		CANNOT_INSERT_ELEMENT_INTO_CONSTANT_COLUMN = 18,
-		SIZE_OF_ARRAY_DOESNT_MATCH_SIZE_OF_FIXEDARRAY_COLUMN = 19,
-		NUMBER_OF_COLUMNS_DOESNT_MATCH = 20,
-		CANNOT_READ_ALL_DATA_FROM_TAB_SEPARATED_INPUT = 21,
-		CANNOT_PARSE_ALL_VALUE_FROM_TAB_SEPARATED_INPUT = 22,
-		CANNOT_READ_FROM_ISTREAM = 23,
-		CANNOT_WRITE_TO_OSTREAM = 24,
-		CANNOT_PARSE_ESCAPE_SEQUENCE = 25,
-		CANNOT_PARSE_QUOTED_STRING = 26,
-		CANNOT_PARSE_INPUT_ASSERTION_FAILED = 27,
-		CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER = 28,
-		CANNOT_PRINT_INTEGER = 29,
-		CANNOT_READ_SIZE_OF_COMPRESSED_CHUNK = 30,
-		CANNOT_READ_COMPRESSED_CHUNK = 31,
-		ATTEMPT_TO_READ_AFTER_EOF = 32,
-		CANNOT_READ_ALL_DATA = 33,
-		TOO_MUCH_ARGUMENTS_FOR_FUNCTION = 34,
-		TOO_LESS_ARGUMENTS_FOR_FUNCTION = 35,
-		BAD_ARGUMENTS = 36,
-		UNKNOWN_ELEMENT_IN_AST = 37,
-		CANNOT_PARSE_DATE = 38,
-		TOO_LARGE_SIZE_COMPRESSED = 39,
-		CHECKSUM_DOESNT_MATCH = 40,
-		CANNOT_PARSE_DATETIME = 41,
-		NUMBER_OF_ARGUMENTS_DOESNT_MATCH = 42,
-		ILLEGAL_TYPE_OF_ARGUMENT = 43,
-		ILLEGAL_COLUMN = 44,
-		ILLEGAL_NUMBER_OF_RESULT_COLUMNS = 45,
-		UNKNOWN_FUNCTION = 46,
-		UNKNOWN_IDENTIFIER = 47,
-		NOT_IMPLEMENTED = 48,
-		LOGICAL_ERROR = 49,
-		UNKNOWN_TYPE = 50,
-		EMPTY_LIST_OF_COLUMNS_QUERIED = 51,
-		COLUMN_QUERIED_MORE_THAN_ONCE = 52,
-		TYPE_MISMATCH = 53,
-		STORAGE_DOESNT_ALLOW_PARAMETERS = 54,
-		STORAGE_REQUIRES_PARAMETER = 55,
-		UNKNOWN_STORAGE = 56,
-		TABLE_ALREADY_EXISTS = 57,
-		TABLE_METADATA_ALREADY_EXISTS = 58,
-		ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER = 59,
-		UNKNOWN_TABLE = 60,
-		ONLY_FILTER_COLUMN_IN_BLOCK = 61,
-		SYNTAX_ERROR = 62,
-		UNKNOWN_AGGREGATE_FUNCTION = 63,
-		CANNOT_READ_AGGREGATE_FUNCTION_FROM_TEXT = 64,
-		CANNOT_WRITE_AGGREGATE_FUNCTION_AS_TEXT = 65,
-		NOT_A_COLUMN = 66,
-		ILLEGAL_KEY_OF_AGGREGATION = 67,
-		CANNOT_GET_SIZE_OF_FIELD = 68,
-		ARGUMENT_OUT_OF_BOUND = 69,
-		CANNOT_CONVERT_TYPE = 70,
-		CANNOT_WRITE_AFTER_END_OF_BUFFER = 71,
-		CANNOT_PARSE_NUMBER = 72,
-		UNKNOWN_FORMAT = 73,
-		CANNOT_READ_FROM_FILE_DESCRIPTOR = 74,
-		CANNOT_WRITE_TO_FILE_DESCRIPTOR = 75,
-		CANNOT_OPEN_FILE = 76,
-		CANNOT_CLOSE_FILE = 77,
-		UNKNOWN_TYPE_OF_QUERY = 78,
-		INCORRECT_FILE_NAME = 79,
-		INCORRECT_QUERY = 80,
-		UNKNOWN_DATABASE = 81,
-		DATABASE_ALREADY_EXISTS = 82,
-		DIRECTORY_DOESNT_EXIST = 83,
-		DIRECTORY_ALREADY_EXISTS = 84,
-		FORMAT_IS_NOT_SUITABLE_FOR_INPUT = 85,
-		RECEIVED_ERROR_FROM_REMOTE_IO_SERVER = 86,
-		CANNOT_SEEK_THROUGH_FILE = 87,
-		CANNOT_TRUNCATE_FILE = 88,
-		UNKNOWN_COMPRESSION_METHOD = 89,
-		EMPTY_LIST_OF_COLUMNS_PASSED = 90,
-		SIZES_OF_MARKS_FILES_ARE_INCONSISTENT = 91,
-		EMPTY_DATA_PASSED = 92,
-		UNKNOWN_AGGREGATED_DATA_VARIANT = 93,
-		CANNOT_MERGE_DIFFERENT_AGGREGATED_DATA_VARIANTS = 94,
-		CANNOT_READ_FROM_SOCKET = 95,
-		CANNOT_WRITE_TO_SOCKET = 96,
-		CANNOT_READ_ALL_DATA_FROM_CHUNKED_INPUT = 97,
-		CANNOT_WRITE_TO_EMPTY_BLOCK_OUTPUT_STREAM = 98,
-		UNKNOWN_PACKET_FROM_CLIENT = 99,
-		UNKNOWN_PACKET_FROM_SERVER = 100,
-		UNEXPECTED_PACKET_FROM_CLIENT = 101,
-		UNEXPECTED_PACKET_FROM_SERVER = 102,
-		RECEIVED_DATA_FOR_WRONG_QUERY_ID = 103,
-		TOO_SMALL_BUFFER_SIZE = 104,
-		CANNOT_READ_HISTORY = 105,
-		CANNOT_APPEND_HISTORY = 106,
-		FILE_DOESNT_EXIST = 107,
-		NO_DATA_TO_INSERT = 108,
-		CANNOT_BLOCK_SIGNAL = 109,
-		CANNOT_UNBLOCK_SIGNAL = 110,
-		CANNOT_MANIPULATE_SIGSET = 111,
-		CANNOT_WAIT_FOR_SIGNAL = 112,
-		THERE_IS_NO_SESSION = 113,
-		CANNOT_CLOCK_GETTIME = 114,
-		UNKNOWN_SETTING = 115,
-		THERE_IS_NO_DEFAULT_VALUE = 116,
-		INCORRECT_DATA = 117,
-		TABLE_METADATA_DOESNT_EXIST = 118,
-		ENGINE_REQUIRED = 119,
-		CANNOT_INSERT_VALUE_OF_DIFFERENT_SIZE_INTO_TUPLE = 120,
-		UNKNOWN_SET_DATA_VARIANT = 121,
-		INCOMPATIBLE_COLUMNS = 122,
-		UNKNOWN_TYPE_OF_AST_NODE = 123,
-		INCORRECT_ELEMENT_OF_SET = 124,
-		INCORRECT_RESULT_OF_SCALAR_SUBQUERY = 125,
-		CANNOT_GET_RETURN_TYPE = 126,
-		ILLEGAL_INDEX = 127,
-		TOO_LARGE_ARRAY_SIZE = 128,
-		FUNCTION_IS_SPECIAL = 129,
-		CANNOT_READ_ARRAY_FROM_TEXT = 130,
-		TOO_LARGE_STRING_SIZE = 131,
-		CANNOT_CREATE_TABLE_FROM_METADATA = 132,
-		AGGREGATE_FUNCTION_DOESNT_ALLOW_PARAMETERS = 133,
-		PARAMETERS_TO_AGGREGATE_FUNCTIONS_MUST_BE_LITERALS = 134,
-		ZERO_ARRAY_OR_TUPLE_INDEX = 135,
-		UNKNOWN_ELEMENT_IN_CONFIG = 137,
-		EXCESSIVE_ELEMENT_IN_CONFIG = 138,
-		NO_ELEMENTS_IN_CONFIG = 139,
-		ALL_REQUESTED_COLUMNS_ARE_MISSING = 140,
-		SAMPLING_NOT_SUPPORTED = 141,
-		NOT_FOUND_NODE = 142,
-		FOUND_MORE_THAN_ONE_NODE = 143,
-		FIRST_DATE_IS_BIGGER_THAN_LAST_DATE = 144,
-		UNKNOWN_OVERFLOW_MODE = 145,
-		QUERY_SECTION_DOESNT_MAKE_SENSE = 146,
-		NOT_FOUND_FUNCTION_ELEMENT_FOR_AGGREGATE = 147,
-		NOT_FOUND_RELATION_ELEMENT_FOR_CONDITION = 148,
-		NOT_FOUND_RHS_ELEMENT_FOR_CONDITION = 149,
-		NO_ATTRIBUTES_LISTED = 150,
-		INDEX_OF_COLUMN_IN_SORT_CLAUSE_IS_OUT_OF_RANGE = 151,
-		UNKNOWN_DIRECTION_OF_SORTING = 152,
-		ILLEGAL_DIVISION = 153,
-		AGGREGATE_FUNCTION_NOT_APPLICABLE = 154,
-		UNKNOWN_RELATION = 155,
-		DICTIONARIES_WAS_NOT_LOADED = 156,
-		ILLEGAL_OVERFLOW_MODE = 157,
-		TOO_MUCH_ROWS = 158,
-		TIMEOUT_EXCEEDED = 159,
-		TOO_SLOW = 160,
-		TOO_MUCH_COLUMNS = 161,
-		TOO_DEEP_SUBQUERIES = 162,
-		TOO_DEEP_PIPELINE = 163,
-		READONLY = 164,
-		TOO_MUCH_TEMPORARY_COLUMNS = 165,
-		TOO_MUCH_TEMPORARY_NON_CONST_COLUMNS = 166,
-		TOO_DEEP_AST = 167,
-		TOO_BIG_AST = 168,
-		BAD_TYPE_OF_FIELD = 169,
-		BAD_GET = 170,
-		BLOCKS_HAS_DIFFERENT_STRUCTURE = 171,
-		CANNOT_CREATE_DIRECTORY = 172,
-		CANNOT_ALLOCATE_MEMORY = 173,
-		CYCLIC_ALIASES = 174,
-		CHUNK_NOT_FOUND = 176,
-		DUPLICATE_CHUNK_NAME = 177,
-		MULTIPLE_ALIASES_FOR_EXPRESSION = 178,
-		MULTIPLE_EXPRESSIONS_FOR_ALIAS = 179,
-		THERE_IS_NO_PROFILE = 180,
-		ILLEGAL_FINAL = 181,
-		ILLEGAL_PREWHERE = 182,
-		UNEXPECTED_EXPRESSION = 183,
-		ILLEGAL_AGGREGATION = 184,
-		UNSUPPORTED_MYISAM_BLOCK_TYPE = 185,
-		UNSUPPORTED_COLLATION_LOCALE = 186,
-		COLLATION_COMPARISON_FAILED = 187,
-		UNKNOWN_ACTION = 188,
-		TABLE_MUST_NOT_BE_CREATED_MANUALLY = 189,
-		SIZES_OF_ARRAYS_DOESNT_MATCH = 190,
-		SET_SIZE_LIMIT_EXCEEDED = 191,
-		UNKNOWN_USER = 192,
-		WRONG_PASSWORD = 193,
-		REQUIRED_PASSWORD = 194,
-		IP_ADDRESS_NOT_ALLOWED = 195,
-		UNKNOWN_ADDRESS_PATTERN_TYPE = 196,
-		SERVER_REVISION_IS_TOO_OLD = 197,
-		DNS_ERROR = 198,
-		UNKNOWN_QUOTA = 199,
-		QUOTA_DOESNT_ALLOW_KEYS = 200,
-		QUOTA_EXPIRED = 201,
-		TOO_MUCH_SIMULTANEOUS_QUERIES = 202,
-		NO_FREE_CONNECTION = 203,
-		CANNOT_FSYNC = 204,
-		NESTED_TYPE_TOO_DEEP = 205,
-		ALIAS_REQUIRED = 206,
-		AMBIGUOUS_IDENTIFIER = 207,
-		EMPTY_NESTED_TABLE = 208,
-		SOCKET_TIMEOUT = 209,
-		NETWORK_ERROR = 210,
-		EMPTY_QUERY = 211,
-		UNKNOWN_LOAD_BALANCING = 212,
-		UNKNOWN_TOTALS_MODE = 213,
-		CANNOT_STATVFS = 214,
-		NOT_AN_AGGREGATE = 215,
-		QUERY_WITH_SAME_ID_IS_ALREADY_RUNNING = 216,
-		CLIENT_HAS_CONNECTED_TO_WRONG_PORT = 217,
-		TABLE_IS_DROPPED = 218,
-		DATABASE_NOT_EMPTY = 219,
-		DUPLICATE_INTERSERVER_IO_ENDPOINT = 220,
-		NO_SUCH_INTERSERVER_IO_ENDPOINT = 221,
-		ADDING_REPLICA_TO_NON_EMPTY_TABLE = 222,
-		UNEXPECTED_AST_STRUCTURE = 223,
-		REPLICA_IS_ALREADY_ACTIVE = 224,
-		NO_ZOOKEEPER = 225,
-		NO_FILE_IN_DATA_PART = 226,
-		UNEXPECTED_FILE_IN_DATA_PART = 227,
-		BAD_SIZE_OF_FILE_IN_DATA_PART = 228,
-		QUERY_IS_TOO_LARGE = 229,
-		NOT_FOUND_EXPECTED_DATA_PART = 230,
-		TOO_MANY_UNEXPECTED_DATA_PARTS = 231,
-		NO_SUCH_DATA_PART = 232,
-		BAD_DATA_PART_NAME = 233,
-		NO_REPLICA_HAS_PART = 234,
-		DUPLICATE_DATA_PART = 235,
-		ABORTED = 236,
-		NO_REPLICA_NAME_GIVEN = 237,
-		FORMAT_VERSION_TOO_OLD = 238,
-		CANNOT_MUNMAP = 239,
-		CANNOT_MREMAP = 240,
-		MEMORY_LIMIT_EXCEEDED = 241,
-		TABLE_IS_READ_ONLY = 242,
-		NOT_ENOUGH_SPACE = 243,
-		UNEXPECTED_ZOOKEEPER_ERROR = 244,
-		INVALID_NESTED_NAME = 245,
-		CORRUPTED_DATA = 246,
-		INCORRECT_MARK = 247,
-		INVALID_PARTITION_NAME = 248,
-		NOT_ENOUGH_BLOCK_NUMBERS = 250,
-		NO_SUCH_REPLICA = 251,
-		TOO_MUCH_PARTS = 252,
-		REPLICA_IS_ALREADY_EXIST = 253,
-		NO_ACTIVE_REPLICAS = 254,
-		TOO_MUCH_RETRIES_TO_FETCH_PARTS = 255,
-		PARTITION_ALREADY_EXISTS = 256,
-		PARTITION_DOESNT_EXIST = 257,
-		UNION_ALL_RESULT_STRUCTURES_MISMATCH = 258,
-		UNION_ALL_COLUMN_ALIAS_MISMATCH = 259,
-		CLIENT_OUTPUT_FORMAT_SPECIFIED = 260,
-		UNKNOWN_BLOCK_INFO_FIELD = 261,
-		BAD_COLLATION = 262,
-		CANNOT_COMPILE_CODE = 263,
-		INCOMPATIBLE_TYPE_OF_JOIN = 264,
-		NO_AVAILABLE_REPLICA = 265,
-		MISMATCH_REPLICAS_DATA_SOURCES = 266,
-		STORAGE_DOESNT_SUPPORT_PARALLEL_REPLICAS = 267,
-		CPUID_ERROR = 268,
-		INFINITE_LOOP = 269,
-		CANNOT_COMPRESS = 270,
-		CANNOT_DECOMPRESS = 271,
-		AIO_SUBMIT_ERROR = 272,
-		AIO_COMPLETION_ERROR = 273,
-		AIO_READ_ERROR = 274,
-		AIO_WRITE_ERROR = 275,
-		INDEX_NOT_USED = 277,
-		LEADERSHIP_LOST = 278,
-		ALL_CONNECTION_TRIES_FAILED = 279,
-		NO_AVAILABLE_DATA = 280,
-		DICTIONARY_IS_EMPTY = 281,
-		INCORRECT_INDEX = 282,
-		UNKNOWN_DISTRIBUTED_PRODUCT_MODE = 283,
-		UNKNOWN_GLOBAL_SUBQUERIES_METHOD = 284,
-		TOO_LESS_LIVE_REPLICAS = 285,
-		UNSATISFIED_QUORUM_FOR_PREVIOUS_WRITE = 286,
-		UNKNOWN_FORMAT_VERSION = 287,
-		DISTRIBUTED_IN_JOIN_SUBQUERY_DENIED = 288,
-		REPLICA_IS_NOT_IN_QUORUM = 289,
-		LIMIT_EXCEEDED = 290,
-		DATABASE_ACCESS_DENIED = 291,
-		LEADERSHIP_CHANGED = 292,
-		MONGODB_INIT_FAILED = 293,
-		INVALID_BLOCK_EXTRA_INFO = 294,
-		RECEIVED_EMPTY_DATA = 295,
-		NO_REMOTE_SHARD_FOUND = 296,
-		SHARD_HAS_NO_CONNECTIONS = 297,
-		CANNOT_PIPE = 298,
-		CANNOT_FORK = 299,
-		CANNOT_DLSYM = 300,
-		CANNOT_CREATE_CHILD_PROCESS = 301,
-		CHILD_WAS_NOT_EXITED_NORMALLY = 302,
-		CANNOT_SELECT = 303,
-		CANNOT_WAITPID = 304,
-		TABLE_WAS_NOT_DROPPED = 305,
-
-		KEEPER_EXCEPTION = 999,
-		POCO_EXCEPTION = 1000,
-		STD_EXCEPTION = 1001,
-		UNKNOWN_EXCEPTION = 1002,
-	};
-}
-
-}
diff --git a/dbms/include/DB/Core/Field.h b/dbms/include/DB/Core/Field.h
index cd76d03bf9a..f2da1da427f 100644
--- a/dbms/include/DB/Core/Field.h
+++ b/dbms/include/DB/Core/Field.h
@@ -7,7 +7,6 @@
 #include <boost/static_assert.hpp>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Core/Types.h>
 #include <common/strong_typedef.h>
 
@@ -15,6 +14,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int BAD_TYPE_OF_FIELD;
+	extern const int BAD_GET;
+	extern const int NOT_IMPLEMENTED;
+}
+
 class Field;
 using Array = std::vector<Field>; /// Значение типа "массив"
 using TupleBackend = std::vector<Field>;
@@ -26,7 +32,7 @@ using Poco::SharedPtr;
 /** 32 хватает с запасом (достаточно 28), но выбрано круглое число,
   * чтобы арифметика при использовании массивов из Field была проще (не содержала умножения).
   */
-#define DBMS_TOTAL_FIELD_SIZE 32
+#define DBMS_MIN_FIELD_SIZE 32
 
 
 /** Discriminated union из нескольких типов.
@@ -37,7 +43,7 @@ using Poco::SharedPtr;
   * Используется для представления единичного значения одного из нескольких типов в оперативке.
   * Внимание! Предпочтительно вместо единичных значений хранить кусочки столбцов. См. Column.h
   */
-class __attribute__((aligned(DBMS_TOTAL_FIELD_SIZE))) Field
+class Field
 {
 public:
 	struct Types
@@ -262,16 +268,9 @@ public:
 	}
 
 private:
-	/// Хватает с запасом
-	static const size_t storage_size = DBMS_TOTAL_FIELD_SIZE - sizeof(Types::Which);
-
-	BOOST_STATIC_ASSERT(storage_size >= sizeof(Null));
-	BOOST_STATIC_ASSERT(storage_size >= sizeof(UInt64));
-	BOOST_STATIC_ASSERT(storage_size >= sizeof(Int64));
-	BOOST_STATIC_ASSERT(storage_size >= sizeof(Float64));
-	BOOST_STATIC_ASSERT(storage_size >= sizeof(String));
-	BOOST_STATIC_ASSERT(storage_size >= sizeof(Array));
-	BOOST_STATIC_ASSERT(storage_size >= sizeof(Tuple));
+	static const size_t storage_size = std::max({
+		DBMS_MIN_FIELD_SIZE - sizeof(Types::Which),
+		sizeof(Null), sizeof(UInt64), sizeof(Int64), sizeof(Float64), sizeof(String), sizeof(Array), sizeof(Tuple)});
 
 	char storage[storage_size] __attribute__((aligned(8)));
 	Types::Which which;
@@ -346,7 +345,7 @@ private:
 	}
 };
 
-#undef DBMS_TOTAL_FIELD_SIZE
+#undef DBMS_MIN_FIELD_SIZE
 
 
 template <> struct Field::TypeToEnum<Null> 								{ static const Types::Which value = Types::Null; };
diff --git a/dbms/include/DB/Core/FieldVisitors.h b/dbms/include/DB/Core/FieldVisitors.h
index 2711264cfd7..6fd57fcb4ba 100644
--- a/dbms/include/DB/Core/FieldVisitors.h
+++ b/dbms/include/DB/Core/FieldVisitors.h
@@ -13,6 +13,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_CONVERT_TYPE;
+}
+
 
 /** StaticVisitor (его наследники) - класс с перегруженными для разных типов операторами ().
   * Вызвать visitor для field можно с помощью функции apply_visitor.
diff --git a/dbms/include/DB/Core/StringRef.h b/dbms/include/DB/Core/StringRef.h
index 9ef6c3f0e6b..976ef4d4877 100644
--- a/dbms/include/DB/Core/StringRef.h
+++ b/dbms/include/DB/Core/StringRef.h
@@ -9,7 +9,9 @@
 #include <functional>
 #include <ostream>
 
-#include <emmintrin.h>
+#if defined(__x86_64__)
+	#include <emmintrin.h>
+#endif
 
 
 /// Штука, чтобы не создавать строки для поиска подстроки в хэш таблице.
@@ -31,6 +33,8 @@ struct StringRef
 typedef std::vector<StringRef> StringRefs;
 
 
+#if defined(__x86_64__)
+
 /** Сравнение строк на равенство.
   * Подход является спорным и выигрывает не во всех случаях.
   * Подробнее смотрите hash_map_string_2.cpp
@@ -111,6 +115,8 @@ inline bool memequalSSE2Wide(const char * p1, const char * p2, size_t size)
 	return true;
 }
 
+#endif
+
 
 inline bool operator== (StringRef lhs, StringRef rhs)
 {
@@ -120,7 +126,11 @@ inline bool operator== (StringRef lhs, StringRef rhs)
 	if (lhs.size == 0)
 		return true;
 
+#if defined(__x86_64__)
 	return memequalSSE2Wide(lhs.data, rhs.data, lhs.size);
+#else
+	return 0 == memcmp(lhs.data, rhs.data, lhs.size);
+#endif
 }
 
 inline bool operator!= (StringRef lhs, StringRef rhs)
@@ -149,6 +159,8 @@ inline bool operator> (StringRef lhs, StringRef rhs)
   * Подробнее см. hash_map_string_3.cpp
   */
 
+#if defined(__x86_64__)
+
 #ifdef __SSE4_1__
 #include <smmintrin.h>
 #else
@@ -247,9 +259,6 @@ struct CRC32Hash
 	}
 };
 
-
-#if 1
-
 struct StringRefHash : CRC32Hash {};
 
 #else
diff --git a/dbms/include/DB/DataStreams/ExpressionBlockInputStream.h b/dbms/include/DB/DataStreams/ExpressionBlockInputStream.h
index a5b028f0663..36656f69bf5 100644
--- a/dbms/include/DB/DataStreams/ExpressionBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/ExpressionBlockInputStream.h
@@ -1,16 +1,12 @@
 #pragma once
 
-#include <Poco/SharedPtr.h>
-
-#include <DB/Interpreters/ExpressionActions.h>
 #include <DB/DataStreams/IProfilingBlockInputStream.h>
 
 
 namespace DB
 {
 
-using Poco::SharedPtr;
-
+class ExpressionActions;
 
 /** Выполняет над блоком вычисление некоторого выражения.
   * Выражение состоит из идентификаторов столбцов из блока, констант, обычных функций.
@@ -19,44 +15,18 @@ using Poco::SharedPtr;
   */
 class ExpressionBlockInputStream : public IProfilingBlockInputStream
 {
+private:
+	using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
+
 public:
-	ExpressionBlockInputStream(BlockInputStreamPtr input_, ExpressionActionsPtr expression_)
-		: expression(expression_)
-	{
-		children.push_back(input_);
-	}
+	ExpressionBlockInputStream(BlockInputStreamPtr input_, ExpressionActionsPtr expression_);
 
-	String getName() const override { return "Expression"; }
-
-	String getID() const override
-	{
-		std::stringstream res;
-		res << "Expression(" << children.back()->getID() << ", " << expression->getID() << ")";
-		return res.str();
-	}
-
-	const Block & getTotals() override
-	{
-		if (IProfilingBlockInputStream * child = dynamic_cast<IProfilingBlockInputStream *>(&*children.back()))
-		{
-			totals = child->getTotals();
-			expression->executeOnTotals(totals);
-		}
-
-		return totals;
-	}
+	String getName() const override;
+	String getID() const override;
+	const Block & getTotals() override;
 
 protected:
-	Block readImpl() override
-	{
-		Block res = children.back()->read();
-		if (!res)
-			return res;
-
-		expression->execute(res);
-
-		return res;
-	}
+	Block readImpl() override;
 
 private:
 	ExpressionActionsPtr expression;
diff --git a/dbms/include/DB/DataStreams/MergingSortedBlockInputStream.h b/dbms/include/DB/DataStreams/MergingSortedBlockInputStream.h
index 2cfda8c2a06..51fa2bd4aa8 100644
--- a/dbms/include/DB/DataStreams/MergingSortedBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/MergingSortedBlockInputStream.h
@@ -13,6 +13,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CORRUPTED_DATA;
+}
+
+
 /** Соединяет несколько сортированных потоков в один.
   */
 class MergingSortedBlockInputStream : public IProfilingBlockInputStream
diff --git a/dbms/include/DB/DataStreams/ODBCBlockOutputStream.h b/dbms/include/DB/DataStreams/ODBCDriverBlockOutputStream.h
similarity index 90%
rename from dbms/include/DB/DataStreams/ODBCBlockOutputStream.h
rename to dbms/include/DB/DataStreams/ODBCDriverBlockOutputStream.h
index 53b2f2c8bdd..bf9549dd9d0 100644
--- a/dbms/include/DB/DataStreams/ODBCBlockOutputStream.h
+++ b/dbms/include/DB/DataStreams/ODBCDriverBlockOutputStream.h
@@ -12,10 +12,10 @@ namespace DB
   * Выводится заголовок с нужной информацией.
   * Затем данные выводятся в порядке строк. Каждое значение выводится так: длина в формате VarUInt, затем данные в текстовом виде.
   */
-class ODBCBlockOutputStream : public IBlockOutputStream
+class ODBCDriverBlockOutputStream : public IBlockOutputStream
 {
 public:
-	ODBCBlockOutputStream(WriteBuffer & out_);
+	ODBCDriverBlockOutputStream(WriteBuffer & out_);
 
 	void write(const Block & block) override;
 
diff --git a/dbms/include/DB/DataStreams/ProhibitColumnsBlockOutputStream.h b/dbms/include/DB/DataStreams/ProhibitColumnsBlockOutputStream.h
index 71a6a495e8e..ebd2040e7bd 100644
--- a/dbms/include/DB/DataStreams/ProhibitColumnsBlockOutputStream.h
+++ b/dbms/include/DB/DataStreams/ProhibitColumnsBlockOutputStream.h
@@ -6,6 +6,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ILLEGAL_COLUMN;
+}
+
 
 /// Throws exception on encountering prohibited column in block
 class ProhibitColumnsBlockOutputStream : public IBlockOutputStream
diff --git a/dbms/include/DB/DataStreams/RemoteBlockOutputStream.h b/dbms/include/DB/DataStreams/RemoteBlockOutputStream.h
index 0dd5fbd3777..896c7ab1922 100644
--- a/dbms/include/DB/DataStreams/RemoteBlockOutputStream.h
+++ b/dbms/include/DB/DataStreams/RemoteBlockOutputStream.h
@@ -10,6 +10,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNEXPECTED_PACKET_FROM_SERVER;
+	extern const int LOGICAL_ERROR;
+}
+
+
 /** Позволяет выполнить запрос INSERT на удалённом сервере и отправить данные.
   */
 class RemoteBlockOutputStream : public IBlockOutputStream
diff --git a/dbms/include/DB/DataStreams/SummingSortedBlockInputStream.h b/dbms/include/DB/DataStreams/SummingSortedBlockInputStream.h
index 8b8c90f8f53..9f7d84b18e8 100644
--- a/dbms/include/DB/DataStreams/SummingSortedBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/SummingSortedBlockInputStream.h
@@ -14,6 +14,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+}
+
+
 /** Соединяет несколько сортированных потоков в один.
   * При этом, для каждой группы идущих подряд одинаковых значений первичного ключа (столбцов, по которым сортируются данные),
   *  схлопывает их в одну строку, суммируя все числовые столбцы кроме первичного ключа.
@@ -33,22 +39,7 @@ public:
 
 	String getName() const override { return "SummingSorted"; }
 
-	String getID() const override
-	{
-		std::stringstream res;
-		res << "SummingSorted(inputs";
-
-		for (size_t i = 0; i < children.size(); ++i)
-			res << ", " << children[i]->getID();
-
-		res << ", description";
-
-		for (size_t i = 0; i < description.size(); ++i)
-			res << ", " << description[i].getID();
-
-		res << ")";
-		return res.str();
-	}
+	String getID() const override;
 
 protected:
 	/// Может возвращаться на 1 больше записей, чем max_block_size.
@@ -105,26 +96,6 @@ private:
 	/// Вставить в результат просуммированную строку для текущей группы.
 	void insertCurrentRow(ColumnPlainPtrs & merged_columns);
 
-
-	/** Реализует операцию +=.
-	  * Возвращает false, если результат получился нулевым.
-	  */
-	class FieldVisitorSum : public StaticVisitor<bool>
-	{
-	private:
-		const Field & rhs;
-	public:
-		FieldVisitorSum(const Field & rhs_) : rhs(rhs_) {}
-
-		bool operator() (UInt64 	& x) const { x += get<UInt64>(rhs); return x != 0; }
-		bool operator() (Int64 		& x) const { x += get<Int64>(rhs); return x != 0; }
-		bool operator() (Float64 	& x) const { x += get<Float64>(rhs); return x != 0; }
-
-		bool operator() (Null 		& x) const { throw Exception("Cannot sum Nulls", ErrorCodes::LOGICAL_ERROR); }
-		bool operator() (String 	& x) const { throw Exception("Cannot sum Strings", ErrorCodes::LOGICAL_ERROR); }
-		bool operator() (Array 		& x) const { throw Exception("Cannot sum Arrays", ErrorCodes::LOGICAL_ERROR); }
-	};
-
 	/** Для вложенных Map выполняется слияние по ключу с выбрасыванием строк вложенных массивов, в которых
 	  * все элементы - нулевые.
 	  */
diff --git a/dbms/include/DB/DataStreams/TotalsHavingBlockInputStream.h b/dbms/include/DB/DataStreams/TotalsHavingBlockInputStream.h
index 8ccceeda392..f4a00c64d03 100644
--- a/dbms/include/DB/DataStreams/TotalsHavingBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/TotalsHavingBlockInputStream.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#include <DB/Interpreters/Aggregator.h>
 #include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Interpreters/ExpressionActions.h>
 
 
 namespace DB
 {
 
-using Poco::SharedPtr;
+class ExpressionActions;
 
 
 /** Принимает блоки после группировки, с нефиализированными агрегатными функциями.
@@ -17,26 +15,18 @@ using Poco::SharedPtr;
   */
 class TotalsHavingBlockInputStream : public IProfilingBlockInputStream
 {
+private:
+	using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
+
 public:
-	TotalsHavingBlockInputStream(BlockInputStreamPtr input_, const Names & keys_names_,
-		const AggregateDescriptions & aggregates_, bool overflow_row_, ExpressionActionsPtr expression_,
-		const std::string & filter_column_, TotalsMode totals_mode_, double auto_include_threshold_)
-		: overflow_row(overflow_row_),
-		expression(expression_), filter_column_name(filter_column_), totals_mode(totals_mode_),
-		auto_include_threshold(auto_include_threshold_)
-	{
-		children.push_back(input_);
-	}
+	TotalsHavingBlockInputStream(
+		BlockInputStreamPtr input_,
+		bool overflow_row_, ExpressionActionsPtr expression_,
+		const std::string & filter_column_, TotalsMode totals_mode_, double auto_include_threshold_);
 
 	String getName() const override { return "TotalsHaving"; }
 
-	String getID() const override
-	{
-		std::stringstream res;
-		res << "TotalsHavingBlockInputStream(" << children.back()->getID()
-			<< "," << filter_column_name << ")";
-		return res.str();
-	}
+	String getID() const override;
 
 	const Block & getTotals() override;
 
diff --git a/dbms/include/DB/DataStreams/UnionBlockInputStream.h b/dbms/include/DB/DataStreams/UnionBlockInputStream.h
index f539d0d413d..e0161be9e65 100644
--- a/dbms/include/DB/DataStreams/UnionBlockInputStream.h
+++ b/dbms/include/DB/DataStreams/UnionBlockInputStream.h
@@ -12,6 +12,12 @@ namespace DB
 
 using Poco::SharedPtr;
 
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+}
+
+
 namespace
 {
 
diff --git a/dbms/include/DB/DataTypes/DataTypeAggregateFunction.h b/dbms/include/DB/DataTypes/DataTypeAggregateFunction.h
index 2a0cf70d57d..b5db5242949 100644
--- a/dbms/include/DB/DataTypes/DataTypeAggregateFunction.h
+++ b/dbms/include/DB/DataTypes/DataTypeAggregateFunction.h
@@ -10,6 +10,13 @@ namespace DB
 
 using Poco::SharedPtr;
 
+namespace ErrorCodes
+{
+	extern const int THERE_IS_NO_DEFAULT_VALUE;
+	extern const int NOT_IMPLEMENTED;
+}
+
+
 /** Тип - состояние агрегатной функции.
   * Параметры типа - это агрегатная функция, типы её аргументов и её параметры (для параметрических агрегатных функций).
   */
diff --git a/dbms/include/DB/DataTypes/DataTypeEnum.h b/dbms/include/DB/DataTypes/DataTypeEnum.h
index 0474809881a..75d562d8541 100644
--- a/dbms/include/DB/DataTypes/DataTypeEnum.h
+++ b/dbms/include/DB/DataTypes/DataTypeEnum.h
@@ -9,6 +9,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int SYNTAX_ERROR;
+	extern const int LOGICAL_ERROR;
+	extern const int EMPTY_DATA_PASSED;
+}
+
 
 template <typename FieldType> struct EnumName;
 template <> struct EnumName<Int8> { static constexpr auto value = "Enum8"; };
diff --git a/dbms/include/DB/DataTypes/DataTypeFixedString.h b/dbms/include/DB/DataTypes/DataTypeFixedString.h
index a5affe409aa..03e25d02adf 100644
--- a/dbms/include/DB/DataTypes/DataTypeFixedString.h
+++ b/dbms/include/DB/DataTypes/DataTypeFixedString.h
@@ -12,6 +12,11 @@ namespace DB
 
 using Poco::SharedPtr;
 
+namespace ErrorCodes
+{
+	extern const int ARGUMENT_OUT_OF_BOUND;
+}
+
 
 class DataTypeFixedString final : public IDataType
 {
diff --git a/dbms/include/DB/DataTypes/FieldToDataType.h b/dbms/include/DB/DataTypes/FieldToDataType.h
index 6ba0743888b..ac1eadec8a4 100644
--- a/dbms/include/DB/DataTypes/FieldToDataType.h
+++ b/dbms/include/DB/DataTypes/FieldToDataType.h
@@ -7,12 +7,17 @@
 #include <DB/DataTypes/DataTypeArray.h>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NOT_IMPLEMENTED;
+}
+
+
 /** Для заданного значения Field возвращает минимальный тип данных, позволяющий хранить значение этого типа.
   * В случае, если Field - массив, конвертирует все элементы к общему типу.
   */
diff --git a/dbms/include/DB/Dictionaries/CacheDictionary.h b/dbms/include/DB/Dictionaries/CacheDictionary.h
index 05bb2c7176e..5f87aca3436 100644
--- a/dbms/include/DB/Dictionaries/CacheDictionary.h
+++ b/dbms/include/DB/Dictionaries/CacheDictionary.h
@@ -23,6 +23,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TYPE_MISMATCH;
+	extern const int BAD_ARGUMENTS;
+	extern const int UNSUPPORTED_METHOD;
+}
+
+
 class CacheDictionary final : public IDictionary
 {
 public:
diff --git a/dbms/include/DB/Dictionaries/ClickHouseDictionarySource.h b/dbms/include/DB/Dictionaries/ClickHouseDictionarySource.h
index 3da4b0a0252..7876e9904fc 100644
--- a/dbms/include/DB/Dictionaries/ClickHouseDictionarySource.h
+++ b/dbms/include/DB/Dictionaries/ClickHouseDictionarySource.h
@@ -14,6 +14,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNSUPPORTED_METHOD;
+}
+
+
 const auto max_connections = 16;
 
 /** Allows loading dictionaries from local or remote ClickHouse instance
diff --git a/dbms/include/DB/Dictionaries/ComplexKeyCacheDictionary.h b/dbms/include/DB/Dictionaries/ComplexKeyCacheDictionary.h
index 6e3fab3d839..81cd229b86a 100644
--- a/dbms/include/DB/Dictionaries/ComplexKeyCacheDictionary.h
+++ b/dbms/include/DB/Dictionaries/ComplexKeyCacheDictionary.h
@@ -26,6 +26,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TYPE_MISMATCH;
+	extern const int BAD_ARGUMENTS;
+	extern const int UNSUPPORTED_METHOD;
+}
+
+
 class ComplexKeyCacheDictionary final : public IDictionaryBase
 {
 public:
diff --git a/dbms/include/DB/Dictionaries/ComplexKeyHashedDictionary.h b/dbms/include/DB/Dictionaries/ComplexKeyHashedDictionary.h
index 43e1d93eea9..b8e0660780a 100644
--- a/dbms/include/DB/Dictionaries/ComplexKeyHashedDictionary.h
+++ b/dbms/include/DB/Dictionaries/ComplexKeyHashedDictionary.h
@@ -16,6 +16,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TYPE_MISMATCH;
+	extern const int ARGUMENT_OUT_OF_BOUND;
+	extern const int BAD_ARGUMENTS;
+	extern const int DICTIONARY_IS_EMPTY;
+}
+
 class ComplexKeyHashedDictionary final : public IDictionaryBase
 {
 public:
diff --git a/dbms/include/DB/Dictionaries/DictionarySourceFactory.h b/dbms/include/DB/Dictionaries/DictionarySourceFactory.h
index fa139c98b14..c2a04735b3d 100644
--- a/dbms/include/DB/Dictionaries/DictionarySourceFactory.h
+++ b/dbms/include/DB/Dictionaries/DictionarySourceFactory.h
@@ -15,6 +15,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNKNOWN_ELEMENT_IN_CONFIG;
+	extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
+	extern const int LOGICAL_ERROR;
+}
+
 namespace
 {
 
diff --git a/dbms/include/DB/Dictionaries/DictionaryStructure.h b/dbms/include/DB/Dictionaries/DictionaryStructure.h
index 9df9383e723..36ab69756d3 100644
--- a/dbms/include/DB/Dictionaries/DictionaryStructure.h
+++ b/dbms/include/DB/Dictionaries/DictionaryStructure.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <DB/Core/ErrorCodes.h>
 #include <DB/DataTypes/DataTypeFactory.h>
 #include <DB/IO/ReadBufferFromString.h>
 #include <DB/IO/WriteBuffer.h>
@@ -16,6 +15,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNKNOWN_TYPE;
+	extern const int ARGUMENT_OUT_OF_BOUND;
+	extern const int TYPE_MISMATCH;
+}
+
+
 enum class AttributeUnderlyingType
 {
 	UInt8,
diff --git a/dbms/include/DB/Dictionaries/Embedded/RegionsHierarchies.h b/dbms/include/DB/Dictionaries/Embedded/RegionsHierarchies.h
new file mode 100644
index 00000000000..42721c07cb7
--- /dev/null
+++ b/dbms/include/DB/Dictionaries/Embedded/RegionsHierarchies.h
@@ -0,0 +1,80 @@
+#pragma once
+
+#include <DB/Dictionaries/Embedded/RegionsHierarchy.h>
+#include <Poco/DirectoryIterator.h>
+
+
+/** Содержит несколько иерархий регионов, загружаемых из нескольких разных файлов.
+  * Используется, чтобы поддержать несколько разных точек зрения о принадлежности регионов странам.
+  * В первую очередь, для Крыма (Российская и Украинская точки зрения).
+  */
+class RegionsHierarchies
+{
+private:
+	typedef std::unordered_map<std::string, RegionsHierarchy> Container;
+	Container data;
+	Logger * log = &Logger::get("RegionsHierarchies");
+
+public:
+	static constexpr auto required_key = "path_to_regions_hierarchy_file";
+
+	/** path должен указывать на файл с иерархией регионов "по-умолчанию". Она будет доступна по пустому ключу.
+	  * Кроме того, рядом ищутся файлы, к имени которых (до расширения, если есть) добавлен произвольный _suffix.
+	  * Такие файлы загружаются, и иерархия регионов кладётся по ключу suffix.
+	  *
+	  * Например, если указано /opt/geo/regions_hierarchy.txt,
+	  *  то будет также загружен файл /opt/geo/regions_hierarchy_ua.txt, если такой есть - он будет доступен по ключу ua.
+	  */
+	RegionsHierarchies(const std::string & default_path = Poco::Util::Application::instance().config().getString(required_key))
+	{
+		LOG_DEBUG(log, "Adding default regions hierarchy from " << default_path);
+
+		data.emplace(std::piecewise_construct,
+			std::forward_as_tuple(""),
+			std::forward_as_tuple(default_path));
+
+		std::string basename = Poco::Path(default_path).getBaseName();
+
+		Poco::Path dir_path = Poco::Path(default_path).absolute().parent();
+
+		Poco::DirectoryIterator dir_end;
+		for (Poco::DirectoryIterator dir_it(dir_path); dir_it != dir_end; ++dir_it)
+		{
+			std::string other_basename = dir_it.path().getBaseName();
+
+			if (0 == other_basename.compare(0, basename.size(), basename) && other_basename.size() > basename.size() + 1)
+			{
+				if (other_basename[basename.size()] != '_')
+					continue;
+
+				std::string suffix = other_basename.substr(basename.size() + 1);
+
+				LOG_DEBUG(log, "Adding regions hierarchy from " << dir_it->path() << ", key: " << suffix);
+
+				data.emplace(std::piecewise_construct,
+					std::forward_as_tuple(suffix),
+					std::forward_as_tuple(dir_it->path()));
+			}
+		}
+	}
+
+
+	/** Перезагружает, при необходимости, все иерархии регионов.
+	  */
+	void reload()
+	{
+		for (auto & elem : data)
+			elem.second.reload();
+	}
+
+
+	const RegionsHierarchy & get(const std::string & key) const
+	{
+		auto it = data.find(key);
+
+		if (data.end() == it)
+			throw Poco::Exception("There is no regions hierarchy for key " + key);
+
+		return it->second;
+	}
+};
diff --git a/dbms/include/DB/Dictionaries/Embedded/RegionsHierarchy.h b/dbms/include/DB/Dictionaries/Embedded/RegionsHierarchy.h
new file mode 100644
index 00000000000..72aa66ac6e5
--- /dev/null
+++ b/dbms/include/DB/Dictionaries/Embedded/RegionsHierarchy.h
@@ -0,0 +1,301 @@
+#pragma once
+
+#include <Poco/Util/Application.h>
+#include <Poco/Exception.h>
+#include <Poco/File.h>
+
+#include <common/logger_useful.h>
+#include <common/singleton.h>
+
+#include <DB/IO/ReadBufferFromFile.h>
+#include <DB/IO/ReadHelpers.h>
+
+#include <boost/noncopyable.hpp>
+
+#define REGION_TYPE_CITY 	  6
+#define REGION_TYPE_AREA 	  5
+#define REGION_TYPE_DISTRICT  4
+#define REGION_TYPE_COUNTRY   3
+#define REGION_TYPE_CONTINENT 1
+
+
+/** Класс, позволяющий узнавать, принадлежит ли регион с одним RegionID региону с другим RegionID.
+  * Информацию об иерархии регионов загружает из текстового файла.
+  * Умеет, по запросу, обновлять данные.
+  */
+class RegionsHierarchy : private boost::noncopyable
+{
+private:
+	std::string path;
+	time_t file_modification_time;
+	Logger * log;
+
+	typedef Int32 RegionID;
+	typedef Int8 RegionType;
+	typedef Int8 RegionDepth;
+	typedef UInt32 RegionPopulation;
+
+	/// отношение parent; 0, если родителей нет - обычная lookup таблица.
+	typedef std::vector<RegionID> RegionParents;
+	/// тип региона
+	typedef std::vector<RegionType> RegionTypes;
+	/// глубина в дереве, начиная от страны (страна: 1, корень: 0)
+	typedef std::vector<RegionDepth> RegionDepths;
+	/// население региона. Если больше 2^32 - 1, то приравнивается к этому максимуму.
+	typedef std::vector<RegionPopulation> RegionPopulations;
+
+	/// регион -> родительский регион
+	RegionParents parents;
+	/// регион -> город, включающий его или 0, если такого нет
+	RegionParents city;
+	/// регион -> страна, включающая его или 0, если такого нет
+	RegionParents country;
+	/// регион -> область, включающая его или 0, если такой нет
+	RegionParents area;
+	/// регион -> округ, включающий его или 0, если такого нет
+	RegionParents district;
+	/// регион -> континет, включающий его или 0, если такого нет
+	RegionParents continent;
+
+	/// регион -> население или 0, если неизвестно.
+	RegionPopulations populations;
+
+	/// регион - глубина в дереве
+	RegionDepths depths;
+
+public:
+	RegionsHierarchy(const std::string & path_ = Poco::Util::Application::instance().config().getString("path_to_regions_hierarchy_file"))
+		: path(path_), file_modification_time(0), log(&Logger::get("RegionsHierarchy"))
+	{
+	}
+
+
+	/// Перезагружает, при необходимости, иерархию регионов. Непотокобезопасно.
+	void reload()
+	{
+		time_t new_modification_time = Poco::File(path).getLastModified().epochTime();
+		if (new_modification_time <= file_modification_time)
+			return;
+		file_modification_time = new_modification_time;
+
+		LOG_DEBUG(log, "Reloading regions hierarchy");
+
+		const size_t initial_size = 10000;
+
+		RegionParents new_parents(initial_size);
+		RegionParents new_city(initial_size);
+		RegionParents new_country(initial_size);
+		RegionParents new_area(initial_size);
+		RegionParents new_district(initial_size);
+		RegionParents new_continent(initial_size);
+		RegionPopulations new_populations(initial_size);
+		RegionDepths  new_depths(initial_size);
+		RegionTypes types(initial_size);
+
+		DB::ReadBufferFromFile in(path);
+
+		RegionID max_region_id = 0;
+		while (!in.eof())
+		{
+			RegionID region_id = 0;
+			RegionID parent_id = 0;
+			RegionType type = 0;
+			RegionPopulation population = 0;
+
+			DB::readIntText(region_id, in);
+			DB::assertString("\t", in);
+			DB::readIntText(parent_id, in);
+			DB::assertString("\t", in);
+			DB::readIntText(type, in);
+
+			/** Далее может быть перевод строки (старый вариант)
+			  *  или таб, население региона, перевод строки (новый вариант).
+			  */
+			if (!in.eof() && *in.position() == '\t')
+			{
+				++in.position();
+				UInt64 population_big = 0;
+				DB::readIntText(population_big, in);
+				population = population_big > std::numeric_limits<RegionPopulation>::max()
+					? std::numeric_limits<RegionPopulation>::max()
+					: population_big;
+			}
+			DB::assertString("\n", in);
+
+			if (region_id <= 0)
+				continue;
+
+			if (parent_id < 0)
+				parent_id = 0;
+
+			if (region_id > max_region_id)
+			{
+				max_region_id = region_id;
+
+				while (region_id >= static_cast<int>(new_parents.size()))
+				{
+					new_parents.resize(new_parents.size() * 2);
+					new_populations.resize(new_parents.size());
+					types.resize(new_parents.size());
+				}
+			}
+
+			new_parents[region_id] = parent_id;
+			new_populations[region_id] = population;
+			types[region_id] = type;
+		}
+
+		new_parents		.resize(max_region_id + 1);
+		new_city		.resize(max_region_id + 1);
+		new_country		.resize(max_region_id + 1);
+		new_area		.resize(max_region_id + 1);
+		new_district	.resize(max_region_id + 1);
+		new_continent	.resize(max_region_id + 1);
+		new_populations .resize(max_region_id + 1);
+		new_depths		.resize(max_region_id + 1);
+		types			.resize(max_region_id + 1);
+
+		/// пропишем города и страны для регионов
+		for (RegionID i = 0; i <= max_region_id; ++i)
+		{
+			if (types[i] == REGION_TYPE_CITY)
+				new_city[i] = i;
+
+			if (types[i] == REGION_TYPE_AREA)
+				new_area[i] = i;
+
+			if (types[i] == REGION_TYPE_DISTRICT)
+				new_district[i] = i;
+
+			if (types[i] == REGION_TYPE_COUNTRY)
+				new_country[i] = i;
+
+			if (types[i] == REGION_TYPE_CONTINENT)
+			{
+				new_continent[i] = i;
+				continue;
+			}
+
+			RegionDepth depth = 0;
+			RegionID current = i;
+			while (true)
+			{
+				++depth;
+
+				current = new_parents[current];
+				if (current == 0)
+					break;
+
+				if (current > max_region_id)
+					throw Poco::Exception("Logical error in regions hierarchy: region " + DB::toString(current) + " (specified as parent) doesn't exist");
+
+				if (types[current] == REGION_TYPE_CITY)
+					new_city[i] = current;
+
+				if (types[current] == REGION_TYPE_AREA)
+					new_area[i] = current;
+
+				if (types[current] == REGION_TYPE_DISTRICT)
+					new_district[i] = current;
+
+				if (types[current] == REGION_TYPE_COUNTRY)
+					new_country[i] = current;
+
+				if (types[current] == REGION_TYPE_CONTINENT)
+				{
+					new_continent[i] = current;
+					break;
+				}
+			}
+
+			new_depths[i] = depth;
+		}
+
+		parents.swap(new_parents);
+		country.swap(new_country);
+		city.swap(new_city);
+		area.swap(new_area);
+		district.swap(new_district);
+		continent.swap(new_continent);
+		populations.swap(new_populations);
+		depths.swap(new_depths);
+	}
+
+
+	bool in(RegionID lhs, RegionID rhs) const
+	{
+		if (static_cast<size_t>(lhs) >= parents.size())
+			return false;
+
+		while (lhs != 0 && lhs != rhs)
+			lhs = parents[lhs];
+
+		return lhs != 0;
+	}
+
+	RegionID toCity(RegionID region) const
+	{
+		if (static_cast<size_t>(region) >= city.size())
+			return 0;
+		return city[region];
+	}
+
+	RegionID toCountry(RegionID region) const
+	{
+		if (static_cast<size_t>(region) >= country.size())
+			return 0;
+		return country[region];
+	}
+
+	RegionID toArea(RegionID region) const
+	{
+		if (static_cast<size_t>(region) >= area.size())
+			return 0;
+		return area[region];
+	}
+
+	RegionID toDistrict(RegionID region) const
+	{
+		if (static_cast<size_t>(region) >= district.size())
+			return 0;
+		return district[region];
+	}
+
+	RegionID toContinent(RegionID region) const
+	{
+		if (static_cast<size_t>(region) >= continent.size())
+			return 0;
+		return continent[region];
+	}
+
+	RegionID toParent(RegionID region) const
+	{
+		if (static_cast<size_t>(region) >= parents.size())
+			return 0;
+		return parents[region];
+	}
+
+	RegionDepth getDepth(RegionID region) const
+	{
+		if (static_cast<size_t>(region) >= depths.size())
+			return 0;
+		return depths[region];
+	}
+
+	RegionPopulation getPopulation(RegionID region) const
+	{
+		if (static_cast<size_t>(region) >= populations.size())
+			return 0;
+		return populations[region];
+	}
+};
+
+
+class RegionsHierarchySingleton : public Singleton<RegionsHierarchySingleton>, public RegionsHierarchy
+{
+friend class Singleton<RegionsHierarchySingleton>;
+protected:
+	RegionsHierarchySingleton()
+	{
+	}
+};
diff --git a/dbms/include/DB/Dictionaries/Embedded/RegionsNames.h b/dbms/include/DB/Dictionaries/Embedded/RegionsNames.h
new file mode 100644
index 00000000000..27187e2db79
--- /dev/null
+++ b/dbms/include/DB/Dictionaries/Embedded/RegionsNames.h
@@ -0,0 +1,208 @@
+#pragma once
+
+#include <google/dense_hash_map>
+
+#include <Poco/File.h>
+#include <Poco/NumberParser.h>
+#include <Poco/Util/Application.h>
+#include <Poco/Exception.h>
+
+#include <common/Common.h>
+#include <common/logger_useful.h>
+
+#include <DB/Core/StringRef.h>
+#include <DB/IO/ReadHelpers.h>
+#include <DB/IO/ReadBufferFromFile.h>
+
+/** @brief Класс, позволяющий узнавать по id региона его текстовое название на одном из поддерживаемых языков: ru, en, ua, by, kz, tr.
+  * 
+  * Информацию об именах регионов загружает из текстовых файлов с названиями следующего формата:
+  * 	regions_names_xx.txt,
+  * где xx - одно из двух буквенных обозначений следующих поддерживаемых языков:
+  * 	ru, en, ua, by, kz, tr.
+  * 
+  * Умеет, по запросу, обновлять данные.
+  */
+class RegionsNames
+{
+public:
+	enum class Language
+	{
+		RU = 0,
+		EN,
+		UA,
+		BY,
+		KZ,
+		TR,
+	};
+
+private:
+	static const size_t ROOT_LANGUAGE = 0;
+	static const size_t SUPPORTED_LANGUAGES_COUNT = 6;
+	static const size_t LANGUAGE_ALIASES_COUNT = 7;
+
+	static const char ** getSupportedLanguages()
+	{
+		static const char * res[] { "ru", "en", "ua", "by", "kz", "tr" };
+		return res;
+	}
+
+	struct language_alias { const char * const name; const Language lang; };
+	static const language_alias * getLanguageAliases()
+	{
+		static constexpr const language_alias language_aliases[] {
+			{ "ru", Language::RU },
+			{ "en", Language::EN },
+			{ "ua", Language::UA },
+			{ "uk", Language::UA },
+			{ "by", Language::BY },
+			{ "kz", Language::KZ },
+			{ "tr", Language::TR }
+		};
+
+		return language_aliases;
+	}
+
+	typedef int RegionID_t;
+	
+	typedef std::vector<char> Chars_t;
+	typedef std::vector<Chars_t> CharsForLanguageID_t;
+	typedef std::vector<time_t> ModificationTimes_t;
+	typedef std::vector<StringRef> StringRefs_t; /// Lookup table RegionID -> StringRef
+	typedef std::vector<StringRefs_t> StringRefsForLanguageID_t;
+	
+public:
+	static constexpr auto required_key = "path_to_regions_names_files";
+
+	RegionsNames(const std::string & directory_ = Poco::Util::Application::instance().config().getString(required_key))
+		: directory(directory_)
+	{
+	}
+
+
+	/** @brief Перезагружает, при необходимости, имена регионов.
+	  */
+	void reload()
+	{
+		LOG_DEBUG(log, "Reloading regions names");
+
+		RegionID_t max_region_id = 0;
+		for (size_t language_id = 0; language_id < SUPPORTED_LANGUAGES_COUNT; ++language_id)
+		{
+			const std::string & language = getSupportedLanguages()[language_id];
+			std::string path = directory + "/regions_names_" + language + ".txt";
+			
+			Poco::File file(path);
+			time_t new_modification_time = file.getLastModified().epochTime();
+			if (new_modification_time <= file_modification_times[language_id])
+				continue;
+			file_modification_times[language_id] = new_modification_time;
+
+			LOG_DEBUG(log, "Reloading regions names for language: " << language);
+		
+			DB::ReadBufferFromFile in(path);
+
+			const size_t initial_size = 10000;
+
+			Chars_t new_chars;
+			StringRefs_t new_names_refs(initial_size, StringRef("", 0));
+
+			/// Выделим непрерывный кусок памяти, которого хватит для хранения всех имён.
+			new_chars.reserve(Poco::File(path).getSize());
+
+			while (!in.eof())
+			{
+				RegionID_t region_id;
+				std::string region_name;
+				
+				DB::readIntText(region_id, in);
+				DB::assertString("\t", in);
+				DB::readString(region_name, in);
+				DB::assertString("\n", in);
+
+				if (region_id <= 0)
+					continue;
+
+				size_t old_size = new_chars.size();
+
+				if (new_chars.capacity() < old_size + region_name.length() + 1)
+					throw Poco::Exception("Logical error. Maybe size of file " + path + " is wrong.");
+
+				new_chars.resize(old_size + region_name.length() + 1);
+				memcpy(&new_chars[old_size], region_name.c_str(), region_name.length() + 1);
+
+				if (region_id > max_region_id)
+					max_region_id = region_id;
+
+				while (region_id >= static_cast<int>(new_names_refs.size()))
+					new_names_refs.resize(new_names_refs.size() * 2, StringRef("", 0));
+
+				new_names_refs[region_id] = StringRef(&new_chars[old_size], region_name.length());
+			}
+
+			chars[language_id].swap(new_chars);
+			names_refs[language_id].swap(new_names_refs);
+		}
+
+		for (size_t language_id = 0; language_id < SUPPORTED_LANGUAGES_COUNT; ++language_id)
+			names_refs[language_id].resize(max_region_id + 1, StringRef("", 0));
+	}
+	
+	StringRef getRegionName(RegionID_t region_id, Language language = Language::RU) const
+	{
+		size_t language_id = static_cast<size_t>(language);
+		
+		if (static_cast<size_t>(region_id) > names_refs[language_id].size())
+			return StringRef("", 0);
+
+		StringRef ref = names_refs[language_id][region_id];
+		
+		while (ref.size == 0 && language_id != ROOT_LANGUAGE)
+		{
+			static const size_t FALLBACK[] = { 0, 0, 0, 0, 0, 1 };
+			language_id = FALLBACK[language_id];
+			ref = names_refs[language_id][region_id];
+		}
+
+		return ref;
+	}
+
+	static Language getLanguageEnum(const std::string & language)
+	{
+		if (language.size() == 2)
+		{
+			for (size_t i = 0; i < LANGUAGE_ALIASES_COUNT; ++i)
+			{
+				const auto & alias = getLanguageAliases()[i];
+				if (language[0] == alias.name[0] && language[1] == alias.name[1])
+					return alias.lang;
+			}
+		}
+		throw Poco::Exception("Unsupported language for region name. Supported languages are: " + dumpSupportedLanguagesNames() + ".");
+	}
+	
+	static std::string dumpSupportedLanguagesNames()
+	{
+		std::string res = "";
+		for (size_t i = 0; i < LANGUAGE_ALIASES_COUNT; ++i)
+		{
+			if (i > 0)
+				res += ", ";
+			res += '\'';
+			res += getLanguageAliases()[i].name;
+			res += '\'';
+		}
+		return res;
+	}
+
+private:
+	const std::string directory;
+	ModificationTimes_t file_modification_times = ModificationTimes_t(SUPPORTED_LANGUAGES_COUNT);
+	Logger * log = &Logger::get("RegionsNames");
+	
+	/// Байты имен для каждого языка, уложенные подряд, разделенные нулями
+	CharsForLanguageID_t chars = CharsForLanguageID_t(SUPPORTED_LANGUAGES_COUNT);
+	
+	/// Отображение для каждого языка из id региона в указатель на диапазон байт имени
+	StringRefsForLanguageID_t names_refs = StringRefsForLanguageID_t(SUPPORTED_LANGUAGES_COUNT);
+};
diff --git a/dbms/include/DB/Dictionaries/Embedded/TechDataHierarchy.h b/dbms/include/DB/Dictionaries/Embedded/TechDataHierarchy.h
new file mode 100644
index 00000000000..a44749c7090
--- /dev/null
+++ b/dbms/include/DB/Dictionaries/Embedded/TechDataHierarchy.h
@@ -0,0 +1,117 @@
+#pragma once
+
+#include <string.h>
+
+#include <common/logger_useful.h>
+#include <common/singleton.h>
+
+#include <mysqlxx/PoolWithFailover.h>
+
+
+/** @brief Класс, позволяющий узнавать, принадлежит ли поисковая система или операционная система
+  * другой поисковой или операционной системе, соответственно.
+  * Информацию об иерархии регионов загружает из БД.
+  */
+class TechDataHierarchy
+{
+private:
+	Logger * log;
+
+	UInt8 os_parent[256];
+	UInt8 se_parent[256];
+	
+public:
+	static constexpr auto required_key = "mysql_metrica";
+
+	TechDataHierarchy()
+		: log(&Logger::get("TechDataHierarchy"))
+	{
+		LOG_DEBUG(log, "Loading tech data hierarchy.");
+		
+		memset(os_parent, 0, sizeof(os_parent));
+		memset(se_parent, 0, sizeof(se_parent));
+
+		mysqlxx::PoolWithFailover pool(required_key);
+		mysqlxx::Pool::Entry conn = pool.Get();
+
+		{
+			mysqlxx::Query q = conn->query("SELECT Id, COALESCE(Parent_Id, 0) FROM OS2");
+			LOG_TRACE(log, q.str());
+			mysqlxx::UseQueryResult res = q.use();
+			while (mysqlxx::Row row = res.fetch())
+			{
+				UInt64 child = row[0].getUInt();
+				UInt64 parent = row[1].getUInt();
+
+				if (child > 255 || parent > 255)
+					throw Poco::Exception("Too large OS id (> 255).");
+
+				os_parent[child] = parent;
+			}
+		}
+
+		{
+			mysqlxx::Query q = conn->query("SELECT Id, COALESCE(ParentId, 0) FROM SearchEngines");
+			LOG_TRACE(log, q.str());
+			mysqlxx::UseQueryResult res = q.use();
+			while (mysqlxx::Row row = res.fetch())
+			{
+				UInt64 child = row[0].getUInt();
+				UInt64 parent = row[1].getUInt();
+
+				if (child > 255 || parent > 255)
+					throw Poco::Exception("Too large search engine id (> 255).");
+
+				se_parent[child] = parent;
+			}
+		}
+	}
+
+
+	/// Отношение "принадлежит".
+	bool isOSIn(UInt8 lhs, UInt8 rhs) const
+	{
+		while (lhs != rhs && os_parent[lhs])
+			lhs = os_parent[lhs];
+		
+		return lhs == rhs;
+	}
+
+	bool isSEIn(UInt8 lhs, UInt8 rhs) const
+	{
+		while (lhs != rhs && se_parent[lhs])
+			lhs = se_parent[lhs];
+
+		return lhs == rhs;
+	}
+	
+	
+	UInt8 OSToParent(UInt8 x) const
+	{
+		return os_parent[x];
+	}
+
+	UInt8 SEToParent(UInt8 x) const
+	{
+		return se_parent[x];
+	}
+	
+
+	/// К самому верхнему предку.
+	UInt8 OSToMostAncestor(UInt8 x) const
+	{
+		while (os_parent[x])
+			x = os_parent[x];
+		return x;
+	}
+
+	UInt8 SEToMostAncestor(UInt8 x) const
+	{
+		while (se_parent[x])
+			x = se_parent[x];
+		return x;
+	}
+};
+
+
+class TechDataHierarchySingleton : public Singleton<TechDataHierarchySingleton>, public TechDataHierarchy {};
diff --git a/dbms/include/DB/Dictionaries/FlatDictionary.h b/dbms/include/DB/Dictionaries/FlatDictionary.h
index 50510989b36..4f78644c631 100644
--- a/dbms/include/DB/Dictionaries/FlatDictionary.h
+++ b/dbms/include/DB/Dictionaries/FlatDictionary.h
@@ -15,6 +15,15 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TYPE_MISMATCH;
+	extern const int ARGUMENT_OUT_OF_BOUND;
+	extern const int BAD_ARGUMENTS;
+	extern const int DICTIONARY_IS_EMPTY;
+}
+
+
 const auto initial_array_size = 1024;
 const auto max_array_size = 500000;
 
diff --git a/dbms/include/DB/Dictionaries/HashedDictionary.h b/dbms/include/DB/Dictionaries/HashedDictionary.h
index 46c143335e0..96598606bcc 100644
--- a/dbms/include/DB/Dictionaries/HashedDictionary.h
+++ b/dbms/include/DB/Dictionaries/HashedDictionary.h
@@ -14,6 +14,15 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TYPE_MISMATCH;
+	extern const int ARGUMENT_OUT_OF_BOUND;
+	extern const int BAD_ARGUMENTS;
+	extern const int DICTIONARY_IS_EMPTY;
+}
+
+
 class HashedDictionary final : public IDictionary
 {
 public:
diff --git a/dbms/include/DB/Dictionaries/MongoDBDictionarySource.h b/dbms/include/DB/Dictionaries/MongoDBDictionarySource.h
index 3c2a6a580fc..ded7ec77b48 100644
--- a/dbms/include/DB/Dictionaries/MongoDBDictionarySource.h
+++ b/dbms/include/DB/Dictionaries/MongoDBDictionarySource.h
@@ -12,6 +12,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNSUPPORTED_METHOD;
+	extern const int WRONG_PASSWORD;
+	extern const int MONGODB_INIT_FAILED;
+}
+
+
 /// Allows loading dictionaries from a MongoDB collection
 class MongoDBDictionarySource final : public IDictionarySource
 {
diff --git a/dbms/include/DB/Dictionaries/MySQLBlockInputStream.h b/dbms/include/DB/Dictionaries/MySQLBlockInputStream.h
index 5021345ff55..763819cb6b4 100644
--- a/dbms/include/DB/Dictionaries/MySQLBlockInputStream.h
+++ b/dbms/include/DB/Dictionaries/MySQLBlockInputStream.h
@@ -16,6 +16,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
+}
+
 /// Allows processing results of a MySQL query as a sequence of Blocks, simplifies chaining
 class MySQLBlockInputStream final : public IProfilingBlockInputStream
 {
diff --git a/dbms/include/DB/Dictionaries/MySQLDictionarySource.h b/dbms/include/DB/Dictionaries/MySQLDictionarySource.h
index 10559e14c11..8cffc3de323 100644
--- a/dbms/include/DB/Dictionaries/MySQLDictionarySource.h
+++ b/dbms/include/DB/Dictionaries/MySQLDictionarySource.h
@@ -11,6 +11,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNSUPPORTED_METHOD;
+}
+
 /// Allows loading dictionaries from a MySQL database
 class MySQLDictionarySource final : public IDictionarySource
 {
diff --git a/dbms/include/DB/Functions/FunctionsArithmetic.h b/dbms/include/DB/Functions/FunctionsArithmetic.h
index 8f955a21fb0..6cff344c5a6 100644
--- a/dbms/include/DB/Functions/FunctionsArithmetic.h
+++ b/dbms/include/DB/Functions/FunctionsArithmetic.h
@@ -11,6 +11,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ILLEGAL_DIVISION;
+}
+
+
 /** Арифметические функции: +, -, *, /, %,
   * intDiv (целочисленное деление), унарный минус.
   * Битовые функции: |, &, ^, ~.
@@ -907,7 +913,10 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameBitNot>
 
 /// Оптимизации для целочисленного деления на константу.
 
-#define LIBDIVIDE_USE_SSE2 1
+#if defined(__x86_64__)
+	#define LIBDIVIDE_USE_SSE2 1
+#endif
+
 #include <libdivide.h>
 
 
@@ -941,6 +950,8 @@ struct DivideIntegralByConstantImpl
 		const A * a_pos = &a[0];
 		const A * a_end = a_pos + size;
 		ResultType * c_pos = &c[0];
+
+#if defined(__x86_64__)
 		static constexpr size_t values_per_sse_register = 16 / sizeof(A);
 		const A * a_end_sse = a_pos + size / values_per_sse_register * values_per_sse_register;
 
@@ -952,6 +963,7 @@ struct DivideIntegralByConstantImpl
 			a_pos += values_per_sse_register;
 			c_pos += values_per_sse_register;
 		}
+#endif
 
 		while (a_pos < a_end)
 		{
diff --git a/dbms/include/DB/Functions/FunctionsArray.h b/dbms/include/DB/Functions/FunctionsArray.h
index 9f6a5b00fa9..1c524ba8612 100644
--- a/dbms/include/DB/Functions/FunctionsArray.h
+++ b/dbms/include/DB/Functions/FunctionsArray.h
@@ -33,6 +33,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ZERO_ARRAY_OR_TUPLE_INDEX;
+	extern const int SIZES_OF_ARRAYS_DOESNT_MATCH;
+	extern const int PARAMETERS_TO_AGGREGATE_FUNCTIONS_MUST_BE_LITERALS;
+}
+
+
 /** Функции по работе с массивами:
   *
   * array(с1, с2, ...) - создать массив из констант.
diff --git a/dbms/include/DB/Functions/FunctionsConversion.h b/dbms/include/DB/Functions/FunctionsConversion.h
index 9bd129639c8..1dbaaff5507 100644
--- a/dbms/include/DB/Functions/FunctionsConversion.h
+++ b/dbms/include/DB/Functions/FunctionsConversion.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <ext/enumerate.hpp>
+#include <ext/collection_cast.hpp>
+#include <ext/range.hpp>
+#include <type_traits>
+
 #include <DB/IO/WriteBufferFromVector.h>
 #include <DB/IO/ReadBufferFromString.h>
 #include <DB/DataTypes/DataTypeFactory.h>
@@ -9,25 +14,26 @@
 #include <DB/DataTypes/DataTypeDate.h>
 #include <DB/DataTypes/DataTypeDateTime.h>
 #include <DB/DataTypes/DataTypeEnum.h>
+#include <DB/DataTypes/DataTypeArray.h>
+#include <DB/DataTypes/DataTypeTuple.h>
 #include <DB/Columns/ColumnString.h>
 #include <DB/Columns/ColumnFixedString.h>
 #include <DB/Columns/ColumnConst.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/Core/FieldVisitors.h>
-#include <ext/range.hpp>
-#include <type_traits>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/DataTypes/DataTypeArray.h>
 #include <DB/Columns/ColumnArray.h>
-#include <DB/DataTypes/DataTypeTuple.h>
-#include <ext/enumerate.hpp>
-#include <ext/collection_cast.hpp>
+#include <DB/Core/FieldVisitors.h>
+#include <DB/Interpreters/ExpressionActions.h>
+#include <DB/Functions/IFunction.h>
 #include <DB/Functions/FunctionsMiscellaneous.h>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_PARSE_NUMBER;
+}
+
 /** Функции преобразования типов.
   * toType - преобразование "естественным образом";
   */
@@ -44,7 +50,8 @@ struct ConvertImpl
 
 	static void execute(Block & block, const ColumnNumbers & arguments, size_t result)
 	{
-		if (const ColumnVector<FromFieldType> * col_from = typeid_cast<const ColumnVector<FromFieldType> *>(&*block.getByPosition(arguments[0]).column))
+		if (const ColumnVector<FromFieldType> * col_from
+			= typeid_cast<const ColumnVector<FromFieldType> *>(&*block.getByPosition(arguments[0]).column))
 		{
 			ColumnVector<ToFieldType> * col_to = new ColumnVector<ToFieldType>;
 			block.getByPosition(result).column = col_to;
diff --git a/dbms/include/DB/Functions/FunctionsDictionaries.h b/dbms/include/DB/Functions/FunctionsDictionaries.h
index c70cc0eb786..b76be5d8459 100644
--- a/dbms/include/DB/Functions/FunctionsDictionaries.h
+++ b/dbms/include/DB/Functions/FunctionsDictionaries.h
@@ -29,6 +29,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int DICTIONARIES_WAS_NOT_LOADED;
+}
+
 /** Функции, использующие словари Яндекс.Метрики
   * - словари регионов, операционных систем, поисковых систем.
   *
diff --git a/dbms/include/DB/Functions/FunctionsHigherOrder.h b/dbms/include/DB/Functions/FunctionsHigherOrder.h
index 31ce67f0940..3cec548e715 100644
--- a/dbms/include/DB/Functions/FunctionsHigherOrder.h
+++ b/dbms/include/DB/Functions/FunctionsHigherOrder.h
@@ -14,6 +14,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int SIZES_OF_ARRAYS_DOESNT_MATCH;
+}
+
 /** Функции высшего порядка для массивов:
   *
   * arrayMap(x1,...,xn -> expression, array1,...,arrayn) - применить выражение к каждому элементу массива (или набора параллельных массивов).
diff --git a/dbms/include/DB/Functions/FunctionsMath.h b/dbms/include/DB/Functions/FunctionsMath.h
index 2e1518079a9..29d8654eea2 100644
--- a/dbms/include/DB/Functions/FunctionsMath.h
+++ b/dbms/include/DB/Functions/FunctionsMath.h
@@ -2,9 +2,12 @@
 
 #include <DB/DataTypes/DataTypesNumberFixed.h>
 #include <DB/Functions/IFunction.h>
-#include <vectorf128.h>
-#include <vectormath_exp.h>
-#include <vectormath_trig.h>
+
+#if defined(__x86_64__)
+	#include <vectorf128.h>
+	#include <vectormath_exp.h>
+	#include <vectormath_trig.h>
+#endif
 
 
 namespace DB
@@ -156,6 +159,22 @@ private:
 	}
 };
 
+
+template <typename Name, Float64(&Function)(Float64)>
+struct UnaryFunctionPlain
+{
+	static constexpr auto name = Name::name;
+	static constexpr auto rows_per_iteration = 1;
+
+	template <typename T>
+	static void execute(const T * const src, Float64 * const dst)
+	{
+		dst[0] = static_cast<Float64>(Function(static_cast<Float64>(src[0])));
+	}
+};
+
+#if defined(__x86_64__)
+
 template <typename Name, Vec2d(&Function)(const Vec2d &)>
 struct UnaryFunctionVectorized
 {
@@ -170,18 +189,11 @@ struct UnaryFunctionVectorized
 	}
 };
 
-template <typename Name, Float64(&Function)(Float64)>
-struct UnaryFunctionPlain
-{
-	static constexpr auto name = Name::name;
-	static constexpr auto rows_per_iteration = 1;
+#else
 
-	template <typename T>
-	static void execute(const T * const src, Float64 * const dst)
-	{
-		dst[0] = static_cast<Float64>(Function(static_cast<Float64>(src[0])));
-	}
-};
+#define UnaryFunctionVectorized UnaryFunctionPlain
+
+#endif
 
 
 template <typename Impl> class FunctionMathBinaryFloat64 : public IFunction
@@ -422,6 +434,22 @@ private:
 	}
 };
 
+
+template <typename Name, Float64(&Function)(Float64, Float64)>
+struct BinaryFunctionPlain
+{
+	static constexpr auto name = Name::name;
+	static constexpr auto rows_per_iteration = 1;
+
+	template <typename T1, typename T2>
+	static void execute(const T1 * const src_left, const T2 * const src_right, Float64 * const dst)
+	{
+		dst[0] = static_cast<Float64>(Function(static_cast<Float64>(src_left[0]), static_cast<Float64>(src_right[0])));
+	}
+};
+
+#if defined(__x86_64__)
+
 template <typename Name, Vec2d(&Function)(const Vec2d &, const Vec2d &)>
 struct BinaryFunctionVectorized
 {
@@ -436,6 +464,12 @@ struct BinaryFunctionVectorized
 	}
 };
 
+#else
+
+#define BinaryFunctionVectorized BinaryFunctionPlain
+
+#endif
+
 
 struct EImpl
 {
@@ -478,7 +512,15 @@ using FunctionLog2 = FunctionMathUnaryFloat64<UnaryFunctionVectorized<Log2Name,
 using FunctionExp10 = FunctionMathUnaryFloat64<UnaryFunctionVectorized<Exp10Name, exp10>>;
 using FunctionLog10 = FunctionMathUnaryFloat64<UnaryFunctionVectorized<Log10Name, log10>>;
 using FunctionSqrt = FunctionMathUnaryFloat64<UnaryFunctionVectorized<SqrtName, sqrt>>;
-using FunctionCbrt = FunctionMathUnaryFloat64<UnaryFunctionVectorized<CbrtName, Power_rational<1, 3>::pow>>;
+
+using FunctionCbrt = FunctionMathUnaryFloat64<UnaryFunctionVectorized<CbrtName,
+#if defined(__x86_64__)
+	Power_rational<1, 3>::pow
+#else
+	cbrt
+#endif
+>>;
+
 using FunctionSin = FunctionMathUnaryFloat64<UnaryFunctionVectorized<SinName, sin>>;
 using FunctionCos = FunctionMathUnaryFloat64<UnaryFunctionVectorized<CosName, cos>>;
 using FunctionTan = FunctionMathUnaryFloat64<UnaryFunctionVectorized<TanName, tan>>;
diff --git a/dbms/include/DB/Functions/FunctionsMiscellaneous.h b/dbms/include/DB/Functions/FunctionsMiscellaneous.h
index 0f067f8c75b..07555951654 100644
--- a/dbms/include/DB/Functions/FunctionsMiscellaneous.h
+++ b/dbms/include/DB/Functions/FunctionsMiscellaneous.h
@@ -32,6 +32,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+	extern const int ILLEGAL_INDEX;
+	extern const int FUNCTION_IS_SPECIAL;
+}
+
 /** Вспомогательные функции:
   *
   * visibleWidth(x)	- вычисляет приблизительную ширину при выводе значения в текстовом (tab-separated) виде на консоль.
diff --git a/dbms/include/DB/Functions/FunctionsRandom.h b/dbms/include/DB/Functions/FunctionsRandom.h
index 962ec3dbbe0..cc672c119f8 100644
--- a/dbms/include/DB/Functions/FunctionsRandom.h
+++ b/dbms/include/DB/Functions/FunctionsRandom.h
@@ -10,6 +10,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_CLOCK_GETTIME;
+}
+
 /** Функции генерации псевдослучайных чисел.
   * Функция может быть вызвана без аргументов или с одним аргументом.
   * Аргумент игнорируется и служит лишь для того, чтобы несколько вызовов одной функции считались разными и не склеивались.
diff --git a/dbms/include/DB/Functions/FunctionsRound.h b/dbms/include/DB/Functions/FunctionsRound.h
index 72c413d6900..a709d0d6415 100644
--- a/dbms/include/DB/Functions/FunctionsRound.h
+++ b/dbms/include/DB/Functions/FunctionsRound.h
@@ -5,6 +5,10 @@
 #include <type_traits>
 #include <array>
 
+#if defined(__x86_64__)
+	#include <smmintrin.h>
+#endif
+
 
 namespace DB
 {
@@ -13,6 +17,7 @@ namespace DB
 	 * roundToExp2 - вниз до ближайшей степени двойки;
 	 * roundDuration - вниз до ближайшего из: 0, 1, 10, 30, 60, 120, 180, 240, 300, 600, 1200, 1800, 3600, 7200, 18000, 36000;
 	 * roundAge - вниз до ближайшего из: 0, 18, 25, 35, 45.
+	 *
 	 * round(x, N) - арифметическое округление (N = 0 по умолчанию).
 	 * ceil(x, N) - наименьшее число, которое не меньше x (N = 0 по умолчанию).
 	 * floor(x, N) - наибольшее число, которое не больше x (N = 0 по умолчанию).
@@ -163,6 +168,12 @@ namespace DB
 		NullScale 		// возвращать нулевое значение
 	};
 
+#if !defined(_MM_FROUND_NINT)
+	#define _MM_FROUND_NINT		0
+	#define _MM_FROUND_FLOOR 	1
+	#define _MM_FROUND_CEIL		2
+#endif
+
 	/** Реализация низкоуровневых функций округления для целочисленных значений.
 	  */
 	template<typename T, int rounding_mode, ScaleMode scale_mode, typename Enable = void>
@@ -257,10 +268,11 @@ namespace DB
 		}
 	};
 
-	template<typename T>
+#if defined(__x86_64__)
+	template <typename T>
 	class BaseFloatRoundingComputation;
 
-	template<>
+	template <>
 	class BaseFloatRoundingComputation<Float32>
 	{
 	public:
@@ -298,7 +310,7 @@ namespace DB
 		}
 	};
 
-	template<>
+	template <>
 	class BaseFloatRoundingComputation<Float64>
 	{
 	public:
@@ -522,6 +534,81 @@ namespace DB
 			_mm_storeu_pd(out, val);
 		}
 	};
+#else
+	/// Реализация для ARM. Не векторизована. Не исправляет отрицательные нули.
+
+	template <int mode>
+	float roundWithMode(float x)
+	{
+		if (mode == _MM_FROUND_NINT) 	return roundf(x);
+		if (mode == _MM_FROUND_FLOOR) 	return floorf(x);
+		if (mode == _MM_FROUND_CEIL) 	return ceilf(x);
+		__builtin_unreachable();
+	}
+
+	template <int mode>
+	double roundWithMode(double x)
+	{
+		if (mode == _MM_FROUND_NINT) 	return round(x);
+		if (mode == _MM_FROUND_FLOOR) 	return floor(x);
+		if (mode == _MM_FROUND_CEIL) 	return ceil(x);
+		__builtin_unreachable();
+	}
+
+	template <typename T>
+	class BaseFloatRoundingComputation
+	{
+	public:
+		using Scale = T;
+		static const size_t data_count = 1;
+
+		static inline void prepare(size_t scale, Scale & mm_scale)
+		{
+			mm_scale = static_cast<T>(scale);
+		}
+	};
+
+	template <typename T, int rounding_mode, ScaleMode scale_mode>
+	class FloatRoundingComputation;
+
+	template <typename T, int rounding_mode>
+	class FloatRoundingComputation<T, rounding_mode, PositiveScale>
+		: public BaseFloatRoundingComputation<T>
+	{
+	public:
+		static inline void compute(const T * __restrict in, const T & scale, T * __restrict out)
+		{
+			out[0] = roundWithMode<rounding_mode>(in[0] * scale) / scale;
+		}
+	};
+
+	template <typename T, int rounding_mode>
+	class FloatRoundingComputation<T, rounding_mode, NegativeScale>
+		: public BaseFloatRoundingComputation<T>
+	{
+	public:
+		static inline void compute(const T * __restrict in, const T & scale, T * __restrict out)
+		{
+			out[0] = roundWithMode<rounding_mode>(in[0] / scale) * scale;
+		}
+	};
+
+	template <typename T, int rounding_mode>
+	class FloatRoundingComputation<T, rounding_mode, ZeroScale>
+		: public BaseFloatRoundingComputation<T>
+	{
+	public:
+		static inline void prepare(size_t scale, T & mm_scale)
+		{
+		}
+
+		static inline void compute(const T * __restrict in, const T & scale, T * __restrict out)
+		{
+			out[0] = roundWithMode<rounding_mode>(in[0]);
+		}
+	};
+#endif
+
 
 	/** Реализация высокоуровневых функций округления.
 	  */
@@ -906,7 +993,7 @@ namespace
 
 	/** Выбрать подходящий алгоритм обработки в зависимости от масштаба.
 	  */
-	template<typename T, template<typename> class U, int rounding_mode>
+	template<typename T, template <typename> class U, int rounding_mode>
 	struct Dispatcher
 	{
 		static inline void apply(Block & block, U<T> * col, const ColumnNumbers & arguments, size_t result)
@@ -1053,9 +1140,10 @@ namespace
 	typedef FunctionUnaryArithmetic<RoundToExp2Impl,	NameRoundToExp2> 	FunctionRoundToExp2;
 	typedef FunctionUnaryArithmetic<RoundDurationImpl,	NameRoundDuration>	FunctionRoundDuration;
 	typedef FunctionUnaryArithmetic<RoundAgeImpl,		NameRoundAge>		FunctionRoundAge;
+
 	typedef FunctionRounding<NameRound,	_MM_FROUND_NINT>	FunctionRound;
-	typedef FunctionRounding<NameCeil,	_MM_FROUND_CEIL>	FunctionCeil;
 	typedef FunctionRounding<NameFloor,	_MM_FROUND_FLOOR>	FunctionFloor;
+	typedef FunctionRounding<NameCeil,	_MM_FROUND_CEIL>	FunctionCeil;
 
 
 	struct PositiveMonotonicity
diff --git a/dbms/include/DB/Functions/FunctionsString.h b/dbms/include/DB/Functions/FunctionsString.h
index 5af223c9430..7052dfdc083 100644
--- a/dbms/include/DB/Functions/FunctionsString.h
+++ b/dbms/include/DB/Functions/FunctionsString.h
@@ -17,8 +17,10 @@
 #include <DB/Functions/IFunction.h>
 #include <ext/range.hpp>
 
-#include <emmintrin.h>
-#include <nmmintrin.h>
+#if defined(__x86_64__)
+	#include <emmintrin.h>
+	#include <nmmintrin.h>
+#endif
 
 
 namespace DB
@@ -233,11 +235,12 @@ struct LowerUpperImpl
 private:
 	static void array(const UInt8 * src, const UInt8 * src_end, UInt8 * dst)
 	{
+		const auto flip_case_mask = 'A' ^ 'a';
+
+#if defined(__x86_64__)
 		const auto bytes_sse = sizeof(__m128i);
 		const auto src_end_sse = src_end - (src_end - src) % bytes_sse;
 
-		const auto flip_case_mask = 'A' ^ 'a';
-
 		const auto v_not_case_lower_bound = _mm_set1_epi8(not_case_lower_bound - 1);
 		const auto v_not_case_upper_bound = _mm_set1_epi8(not_case_upper_bound + 1);
 		const auto v_flip_case_mask = _mm_set1_epi8(flip_case_mask);
@@ -260,6 +263,7 @@ private:
 			/// store result back to destination
 			_mm_storeu_si128(reinterpret_cast<__m128i *>(dst), cased_chars);
 		}
+#endif
 
 		for (; src < src_end; ++src, ++dst)
 			if (*src >= not_case_lower_bound && *src <= not_case_upper_bound)
@@ -394,6 +398,7 @@ private:
 
 	static void array(const UInt8 * src, const UInt8 * src_end, UInt8 * dst)
 	{
+#if defined(__x86_64__)
 		const auto bytes_sse = sizeof(__m128i);
 		auto src_end_sse = src + (src_end - src) / bytes_sse * bytes_sse;
 
@@ -455,7 +460,7 @@ private:
 				}
 			}
 		}
-
+#endif
 		/// handle remaining symbols
 		while (src < src_end)
 			toCase(src, src_end, dst);
@@ -1006,7 +1011,7 @@ public:
 	{
 		if (arguments.size() < 2)
 			throw Exception("Number of arguments for function " + getName() + " doesn't match: passed "
-				+ toString(arguments.size()) + ", should be at least 1.",
+				+ toString(arguments.size()) + ", should be at least 2.",
 				ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
 		for (const auto arg_idx : ext::range(0, arguments.size()))
diff --git a/dbms/include/DB/Functions/IFunction.h b/dbms/include/DB/Functions/IFunction.h
index 8e7b1362dbc..168c366ceeb 100644
--- a/dbms/include/DB/Functions/IFunction.h
+++ b/dbms/include/DB/Functions/IFunction.h
@@ -12,6 +12,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+	extern const int ILLEGAL_COLUMN;
+	extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+	extern const int TOO_LESS_ARGUMENTS_FOR_FUNCTION;
+}
+
 class ExpressionAction;
 
 
diff --git a/dbms/include/DB/IO/BufferWithOwnMemory.h b/dbms/include/DB/IO/BufferWithOwnMemory.h
index aecae974795..edb5a89a0ac 100644
--- a/dbms/include/DB/IO/BufferWithOwnMemory.h
+++ b/dbms/include/DB/IO/BufferWithOwnMemory.h
@@ -6,7 +6,6 @@
 #include <DB/Common/Allocator.h>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Core/Defines.h>
 
 
diff --git a/dbms/include/DB/IO/CachedCompressedReadBuffer.h b/dbms/include/DB/IO/CachedCompressedReadBuffer.h
index 169f3c0e5bb..445e0b145d6 100644
--- a/dbms/include/DB/IO/CachedCompressedReadBuffer.h
+++ b/dbms/include/DB/IO/CachedCompressedReadBuffer.h
@@ -9,6 +9,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ARGUMENT_OUT_OF_BOUND;
+}
+
+
 /** Буфер для чтения из сжатого файла с использованием кэша разжатых блоков.
   * Кэш внешний - передаётся в качестве аргумента в конструктор.
   * Позволяет увеличить производительность в случае, когда часто читаются одни и те же блоки.
diff --git a/dbms/include/DB/IO/CompressedReadBufferBase.h b/dbms/include/DB/IO/CompressedReadBufferBase.h
index 41b2315a681..bc801e52316 100644
--- a/dbms/include/DB/IO/CompressedReadBufferBase.h
+++ b/dbms/include/DB/IO/CompressedReadBufferBase.h
@@ -10,7 +10,6 @@
 #include <DB/Common/PODArray.h>
 #include <DB/Common/ProfileEvents.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/IO/ReadBuffer.h>
 #include <DB/IO/BufferWithOwnMemory.h>
 #include <DB/IO/CompressedStream.h>
@@ -20,6 +19,15 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNKNOWN_COMPRESSION_METHOD;
+	extern const int TOO_LARGE_SIZE_COMPRESSED;
+	extern const int CHECKSUM_DOESNT_MATCH;
+	extern const int CANNOT_DECOMPRESS;
+}
+
+
 class CompressedReadBufferBase
 {
 protected:
diff --git a/dbms/include/DB/IO/CompressedReadBufferFromFile.h b/dbms/include/DB/IO/CompressedReadBufferFromFile.h
index 6bfd6fb6a37..05bf95803d4 100644
--- a/dbms/include/DB/IO/CompressedReadBufferFromFile.h
+++ b/dbms/include/DB/IO/CompressedReadBufferFromFile.h
@@ -10,6 +10,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ARGUMENT_OUT_OF_BOUND;
+}
+
+
 /// В отличие от CompressedReadBuffer, умеет делать seek.
 class CompressedReadBufferFromFile : public CompressedReadBufferBase, public BufferWithOwnMemory<ReadBuffer>
 {
diff --git a/dbms/include/DB/IO/CompressedWriteBuffer.h b/dbms/include/DB/IO/CompressedWriteBuffer.h
index 3065defd1aa..7ec34fad10f 100644
--- a/dbms/include/DB/IO/CompressedWriteBuffer.h
+++ b/dbms/include/DB/IO/CompressedWriteBuffer.h
@@ -21,6 +21,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_COMPRESS;
+	extern const int UNKNOWN_COMPRESSION_METHOD;
+}
+
+
 class CompressedWriteBuffer : public BufferWithOwnMemory<WriteBuffer>
 {
 private:
diff --git a/dbms/include/DB/IO/ReadBuffer.h b/dbms/include/DB/IO/ReadBuffer.h
index c753d1c1b44..7a91f08abbe 100644
--- a/dbms/include/DB/IO/ReadBuffer.h
+++ b/dbms/include/DB/IO/ReadBuffer.h
@@ -4,13 +4,18 @@
 #include <algorithm>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/IO/BufferBase.h>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ATTEMPT_TO_READ_AFTER_EOF;
+	extern const int CANNOT_READ_ALL_DATA;
+}
+
 /** Простой абстрактный класс для буферизованного чтения данных (последовательности char) откуда-нибудь.
   * В отличие от std::istream, предоставляет доступ к внутреннему буферу,
   *  а также позволяет вручную управлять позицией внутри буфера.
diff --git a/dbms/include/DB/IO/ReadBufferFromFile.h b/dbms/include/DB/IO/ReadBufferFromFile.h
index 6fcedd4334d..e3337df6af0 100644
--- a/dbms/include/DB/IO/ReadBufferFromFile.h
+++ b/dbms/include/DB/IO/ReadBufferFromFile.h
@@ -8,6 +8,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int FILE_DOESNT_EXIST;
+	extern const int CANNOT_OPEN_FILE;
+	extern const int CANNOT_CLOSE_FILE;
+}
+
+
 /** Принимает имя файла. Самостоятельно открывает и закрывает файл.
   */
 class ReadBufferFromFile : public ReadBufferFromFileDescriptor
diff --git a/dbms/include/DB/IO/ReadBufferFromFileDescriptor.h b/dbms/include/DB/IO/ReadBufferFromFileDescriptor.h
index c907ab7c21a..2ec8e97ab8b 100644
--- a/dbms/include/DB/IO/ReadBufferFromFileDescriptor.h
+++ b/dbms/include/DB/IO/ReadBufferFromFileDescriptor.h
@@ -10,7 +10,6 @@
 #include <DB/Common/Stopwatch.h>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/IO/ReadBufferFromFileBase.h>
 #include <DB/IO/ReadBuffer.h>
@@ -21,6 +20,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_READ_FROM_FILE_DESCRIPTOR;
+	extern const int ARGUMENT_OUT_OF_BOUND;
+	extern const int CANNOT_SEEK_THROUGH_FILE;
+	extern const int CANNOT_SELECT;
+}
+
 /** Работает с готовым файловым дескриптором. Не открывает и не закрывает файл.
   */
 class ReadBufferFromFileDescriptor : public ReadBufferFromFileBase
diff --git a/dbms/include/DB/IO/ReadBufferFromHTTP.h b/dbms/include/DB/IO/ReadBufferFromHTTP.h
index 5c9178d12b9..3ab9abbf1b7 100644
--- a/dbms/include/DB/IO/ReadBufferFromHTTP.h
+++ b/dbms/include/DB/IO/ReadBufferFromHTTP.h
@@ -18,6 +18,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int RECEIVED_ERROR_FROM_REMOTE_IO_SERVER;
+}
+
+
 /** Делает указанный HTTP-запрос и отдает ответ.
   */
 class ReadBufferFromHTTP : public ReadBuffer
diff --git a/dbms/include/DB/IO/ReadBufferFromIStream.h b/dbms/include/DB/IO/ReadBufferFromIStream.h
index 310c1137abe..f4eb478a8eb 100644
--- a/dbms/include/DB/IO/ReadBufferFromIStream.h
+++ b/dbms/include/DB/IO/ReadBufferFromIStream.h
@@ -3,7 +3,6 @@
 #include <iostream>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/IO/ReadBuffer.h>
 #include <DB/IO/BufferWithOwnMemory.h>
@@ -12,6 +11,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_READ_FROM_ISTREAM;
+}
+
+
 class ReadBufferFromIStream : public BufferWithOwnMemory<ReadBuffer>
 {
 private:
diff --git a/dbms/include/DB/IO/ReadHelpers.h b/dbms/include/DB/IO/ReadHelpers.h
index 118fe7b9861..80ba9ad9167 100644
--- a/dbms/include/DB/IO/ReadHelpers.h
+++ b/dbms/include/DB/IO/ReadHelpers.h
@@ -14,7 +14,6 @@
 
 #include <DB/Core/Types.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/IO/ReadBuffer.h>
 #include <DB/IO/VarInt.h>
@@ -26,6 +25,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_PARSE_DATE;
+	extern const int CANNOT_PARSE_DATETIME;
+	extern const int CANNOT_READ_ARRAY_FROM_TEXT;
+}
+
 /// Функции-помошники для форматированного чтения
 
 inline char parseEscapeSequence(char c)
diff --git a/dbms/include/DB/IO/RemoteWriteBuffer.h b/dbms/include/DB/IO/RemoteWriteBuffer.h
index 8123633dd38..2db16942239 100644
--- a/dbms/include/DB/IO/RemoteWriteBuffer.h
+++ b/dbms/include/DB/IO/RemoteWriteBuffer.h
@@ -21,6 +21,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_WRITE_TO_OSTREAM;
+	extern const int RECEIVED_ERROR_FROM_REMOTE_IO_SERVER;
+}
+
 /** Позволяет писать файл на удалённый сервер.
   */
 class RemoteWriteBuffer : public WriteBuffer
@@ -63,7 +69,7 @@ public:
 	{
 		Poco::URI::encode(path, "&#", encoded_path);
 		Poco::URI::encode(tmp_path, "&#", encoded_tmp_path);
-		
+
 		std::stringstream uri;
 		uri << "http://" << host << ":" << port
 			<< "/?action=write"
@@ -76,14 +82,14 @@ public:
 		session.setHost(host);
 		session.setPort(port);
 		session.setKeepAlive(true);
-		
+
 		/// устанавливаем таймаут
 		session.setTimeout(connection_timeout, send_timeout, receive_timeout);
-		
+
 		Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, uri_str, Poco::Net::HTTPRequest::HTTP_1_1);
-		
+
 		request.setChunkedTransferEncoding(true);
-		
+
 		for (unsigned i = 0; i < connection_retries; ++i)
 		{
 			LOG_TRACE((&Logger::get("RemoteWriteBuffer")), "Sending write request to " << host << ":" << port << uri_str);
@@ -126,7 +132,7 @@ public:
 
 		/// Для корректной работы с AsynchronousWriteBuffer, который подменяет буферы.
 		impl->set(buffer().begin(), buffer().size());
-		
+
 		impl->position() = pos;
 
 		try
@@ -145,7 +151,7 @@ public:
 	{
 		if (finalized)
 			return;
-		
+
 		next();
 		checkStatus();
 
@@ -193,7 +199,7 @@ private:
 			throw Exception(error_message.str(), ErrorCodes::RECEIVED_ERROR_FROM_REMOTE_IO_SERVER);
 		}
 	}
-	
+
 	void rename()
 	{
 		std::stringstream uri;
@@ -203,9 +209,9 @@ private:
 			<< "&to=" << encoded_path;
 
 		uri_str = Poco::URI(uri.str()).getPathAndQuery();
-		
+
 		Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, uri_str, Poco::Net::HTTPRequest::HTTP_1_1);
-		
+
 		for (unsigned i = 0; i < connection_retries; ++i)
 		{
 			LOG_TRACE((&Logger::get("RemoteWriteBuffer")), "Sending rename request to " << host << ":" << port << uri_str);
@@ -219,7 +225,7 @@ private:
 			{
 				if (i + 1 == connection_retries)
 					throw;
-				
+
 				LOG_WARNING((&Logger::get("RemoteWriteBuffer")), e.what() << ", message: " << e.displayText()
 					<< ", URL: " << host << ":" << port << uri_str << ", try No " << i + 1 << ".");
 				session.reset();
@@ -229,7 +235,7 @@ private:
 			{
 				if (i + 1 == connection_retries)
 					throw;
-				
+
 				LOG_WARNING((&Logger::get("RemoteWriteBuffer")), "Connection timeout from " << host << ":" << port << uri_str << ", try No " << i + 1 << ".");
 				session.reset();
 				continue;
diff --git a/dbms/include/DB/IO/WriteBuffer.h b/dbms/include/DB/IO/WriteBuffer.h
index 706874b4720..1016dc047f2 100644
--- a/dbms/include/DB/IO/WriteBuffer.h
+++ b/dbms/include/DB/IO/WriteBuffer.h
@@ -4,13 +4,18 @@
 #include <cstring>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/IO/BufferBase.h>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_WRITE_AFTER_END_OF_BUFFER;
+}
+
+
 /** Простой абстрактный класс для буферизованной записи данных (последовательности char) куда-нибудь.
   * В отличие от std::ostream, предоставляет доступ к внутреннему буферу,
   *  а также позволяет вручную управлять позицией внутри буфера.
diff --git a/dbms/include/DB/IO/WriteBufferFromFile.h b/dbms/include/DB/IO/WriteBufferFromFile.h
index 9c542bbdf51..b75fbcd7104 100644
--- a/dbms/include/DB/IO/WriteBufferFromFile.h
+++ b/dbms/include/DB/IO/WriteBufferFromFile.h
@@ -12,6 +12,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int FILE_DOESNT_EXIST;
+	extern const int CANNOT_OPEN_FILE;
+	extern const int CANNOT_CLOSE_FILE;
+}
+
+
 /** Принимает имя файла. Самостоятельно открывает и закрывает файл.
   */
 class WriteBufferFromFile : public WriteBufferFromFileDescriptor
diff --git a/dbms/include/DB/IO/WriteBufferFromFileDescriptor.h b/dbms/include/DB/IO/WriteBufferFromFileDescriptor.h
index b6c48fb547c..f0999d8e39b 100644
--- a/dbms/include/DB/IO/WriteBufferFromFileDescriptor.h
+++ b/dbms/include/DB/IO/WriteBufferFromFileDescriptor.h
@@ -4,7 +4,6 @@
 #include <errno.h>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Common/ProfileEvents.h>
 
 #include <DB/IO/WriteBufferFromFileBase.h>
@@ -16,6 +15,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_WRITE_TO_FILE_DESCRIPTOR;
+	extern const int CANNOT_FSYNC;
+	extern const int CANNOT_SEEK_THROUGH_FILE;
+	extern const int CANNOT_TRUNCATE_FILE;
+}
+
 /** Работает с готовым файловым дескриптором. Не открывает и не закрывает файл.
   */
 class WriteBufferFromFileDescriptor : public WriteBufferFromFileBase
diff --git a/dbms/include/DB/IO/WriteBufferFromHTTPServerResponse.h b/dbms/include/DB/IO/WriteBufferFromHTTPServerResponse.h
index 419a20ae100..7f2ab25da5a 100644
--- a/dbms/include/DB/IO/WriteBufferFromHTTPServerResponse.h
+++ b/dbms/include/DB/IO/WriteBufferFromHTTPServerResponse.h
@@ -3,7 +3,6 @@
 #include <Poco/Net/HTTPServerResponse.h>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/IO/WriteBuffer.h>
 #include <DB/IO/BufferWithOwnMemory.h>
@@ -13,6 +12,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_WRITE_TO_OSTREAM;
+}
+
 
 /** Отличается от WriteBufferFromOStream тем, что инициализируется не std::ostream, а Poco::Net::HTTPServerResponse.
   * При первом сбросе данных, получает из него std::ostream (с помощью метода send).
diff --git a/dbms/include/DB/IO/WriteBufferFromOStream.h b/dbms/include/DB/IO/WriteBufferFromOStream.h
index 4a87aa0a908..b3dcad4eb4b 100644
--- a/dbms/include/DB/IO/WriteBufferFromOStream.h
+++ b/dbms/include/DB/IO/WriteBufferFromOStream.h
@@ -3,7 +3,6 @@
 #include <iostream>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/IO/WriteBuffer.h>
 #include <DB/IO/BufferWithOwnMemory.h>
@@ -12,6 +11,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_WRITE_TO_OSTREAM;
+}
+
 class WriteBufferFromOStream : public BufferWithOwnMemory<WriteBuffer>
 {
 private:
diff --git a/dbms/include/DB/IO/WriteHelpers.h b/dbms/include/DB/IO/WriteHelpers.h
index 0266350af6a..c9e3dc89c58 100644
--- a/dbms/include/DB/IO/WriteHelpers.h
+++ b/dbms/include/DB/IO/WriteHelpers.h
@@ -13,7 +13,6 @@
 
 #include <DB/Core/Types.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Core/StringRef.h>
 
 #include <DB/IO/WriteBuffer.h>
@@ -27,6 +26,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER;
+}
+
 /// Функции-помошники для форматированной записи
 
 inline void writeChar(char x, WriteBuffer & buf)
diff --git a/dbms/include/DB/Interpreters/Aggregator.h b/dbms/include/DB/Interpreters/Aggregator.h
index 55dea518da0..899eec170c9 100644
--- a/dbms/include/DB/Interpreters/Aggregator.h
+++ b/dbms/include/DB/Interpreters/Aggregator.h
@@ -31,6 +31,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNKNOWN_AGGREGATED_DATA_VARIANT;
+}
+
 
 /** Разные структуры данных, которые могут использоваться для агрегации
   * Для эффективности, сами данные для агрегации кладутся в пул.
diff --git a/dbms/include/DB/Interpreters/Dictionaries.h b/dbms/include/DB/Interpreters/Dictionaries.h
index c37f6a6dd70..2045f6f9b00 100644
--- a/dbms/include/DB/Interpreters/Dictionaries.h
+++ b/dbms/include/DB/Interpreters/Dictionaries.h
@@ -3,9 +3,9 @@
 #include <thread>
 #include <common/MultiVersion.h>
 #include <common/logger_useful.h>
-#include <statdaemons/RegionsHierarchies.h>
-#include <statdaemons/TechDataHierarchy.h>
-#include <statdaemons/RegionsNames.h>
+#include <DB/Dictionaries/Embedded/RegionsHierarchies.h>
+#include <DB/Dictionaries/Embedded/TechDataHierarchy.h>
+#include <DB/Dictionaries/Embedded/RegionsNames.h>
 #include <DB/Common/setThreadName.h>
 
 
diff --git a/dbms/include/DB/Interpreters/ExpressionActions.h b/dbms/include/DB/Interpreters/ExpressionActions.h
index e89b835d464..0ead0f7144a 100644
--- a/dbms/include/DB/Interpreters/ExpressionActions.h
+++ b/dbms/include/DB/Interpreters/ExpressionActions.h
@@ -15,8 +15,13 @@
 namespace DB
 {
 
-typedef std::pair<std::string, std::string> NameWithAlias;
-typedef std::vector<NameWithAlias> NamesWithAliases;
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+}
+
+using NameWithAlias = std::pair<std::string, std::string>;
+using NamesWithAliases = std::vector<NameWithAlias>;
 
 class Join;
 
@@ -262,7 +267,7 @@ private:
 	void optimizeArrayJoin();
 };
 
-typedef SharedPtr<ExpressionActions> ExpressionActionsPtr;
+using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 
 
 /** Последовательность преобразований над блоком.
diff --git a/dbms/include/DB/Interpreters/ExpressionAnalyzer.h b/dbms/include/DB/Interpreters/ExpressionAnalyzer.h
index 3d3eba9acb6..804c43fdedf 100644
--- a/dbms/include/DB/Interpreters/ExpressionAnalyzer.h
+++ b/dbms/include/DB/Interpreters/ExpressionAnalyzer.h
@@ -7,7 +7,6 @@
 
 #include <DB/Interpreters/Context.h>
 #include <DB/Interpreters/AggregateDescription.h>
-#include <DB/Interpreters/ExpressionActions.h>
 #include <DB/Interpreters/Set.h>
 #include <DB/Interpreters/Join.h>
 
@@ -16,6 +15,10 @@ namespace DB
 {
 
 
+class ExpressionActions;
+struct ExpressionActionsChain;
+
+
 /** Информация о том, что делать при выполнении подзапроса в секции [GLOBAL] IN/JOIN.
   */
 struct SubqueryForSet
@@ -36,7 +39,7 @@ struct SubqueryForSet
 };
 
 /// ID подзапроса -> что с ним делать.
-typedef std::unordered_map<String, SubqueryForSet> SubqueriesForSets;
+using SubqueriesForSets = std::unordered_map<String, SubqueryForSet>;
 
 
 /** Превращает выражение из синтаксического дерева в последовательность действий для его выполнения.
@@ -45,6 +48,9 @@ typedef std::unordered_map<String, SubqueryForSet> SubqueriesForSets;
   */
 class ExpressionAnalyzer : private boost::noncopyable
 {
+private:
+	using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
+
 public:
 	ExpressionAnalyzer(
 		const ASTPtr & ast_,
diff --git a/dbms/include/DB/Interpreters/ExternalDictionaries.h b/dbms/include/DB/Interpreters/ExternalDictionaries.h
index 917e9beaa8e..51e09a854e1 100644
--- a/dbms/include/DB/Interpreters/ExternalDictionaries.h
+++ b/dbms/include/DB/Interpreters/ExternalDictionaries.h
@@ -2,7 +2,6 @@
 
 #include <DB/Dictionaries/IDictionary.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Common/setThreadName.h>
 #include <common/MultiVersion.h>
 #include <common/logger_useful.h>
diff --git a/dbms/include/DB/Interpreters/InJoinSubqueriesPreprocessor.h b/dbms/include/DB/Interpreters/InJoinSubqueriesPreprocessor.h
index 27585b61165..3ad52dbba73 100644
--- a/dbms/include/DB/Interpreters/InJoinSubqueriesPreprocessor.h
+++ b/dbms/include/DB/Interpreters/InJoinSubqueriesPreprocessor.h
@@ -15,6 +15,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int DISTRIBUTED_IN_JOIN_SUBQUERY_DENIED;
+}
+
 namespace
 {
 
diff --git a/dbms/include/DB/Interpreters/InterpreterSetQuery.h b/dbms/include/DB/Interpreters/InterpreterSetQuery.h
index 0899452863a..7a4a9cc2b63 100644
--- a/dbms/include/DB/Interpreters/InterpreterSetQuery.h
+++ b/dbms/include/DB/Interpreters/InterpreterSetQuery.h
@@ -8,6 +8,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int READONLY;
+}
+
 
 /** Установить один или несколько параметров, для сессии или глобально... или для текущего запроса.
   */
diff --git a/dbms/include/DB/Interpreters/InterserverIOHandler.h b/dbms/include/DB/Interpreters/InterserverIOHandler.h
index a8406e69092..b3a409ce840 100644
--- a/dbms/include/DB/Interpreters/InterserverIOHandler.h
+++ b/dbms/include/DB/Interpreters/InterserverIOHandler.h
@@ -10,6 +10,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int DUPLICATE_INTERSERVER_IO_ENDPOINT;
+	extern const int NO_SUCH_INTERSERVER_IO_ENDPOINT;
+}
+
+
 /** Обработчик запросов от других серверов.
   */
 class InterserverIOEndpoint
diff --git a/dbms/include/DB/Interpreters/Limits.h b/dbms/include/DB/Interpreters/Limits.h
index 107b94e41d8..06dfbb4e345 100644
--- a/dbms/include/DB/Interpreters/Limits.h
+++ b/dbms/include/DB/Interpreters/Limits.h
@@ -88,7 +88,11 @@ struct Limits
 	M(SettingOverflowMode<false>, distinct_overflow_mode, OverflowMode::THROW) \
 	\
 	/** Максимальное использование памяти при обработке запроса. 0 - не ограничено. */ \
-	M(SettingUInt64, max_memory_usage, 0) \
+	M(SettingUInt64, max_memory_usage, 0) /* На один запрос */ \
+	/* Суммарно на одновременно выполняющиеся запросы одного пользователя */ \
+	M(SettingUInt64, max_memory_usage_for_user, 0) \
+	/* Суммарно на все одновременно выполняющиеся запросы */ \
+	M(SettingUInt64, max_memory_usage_for_all_queries, 0) \
 	\
 	/** Максимальная скорость обмена данными по сети в байтах в секунду. 0 - не ограничена. */ \
 	M(SettingUInt64, max_network_bandwidth, 0) \
diff --git a/dbms/include/DB/Interpreters/ProcessList.h b/dbms/include/DB/Interpreters/ProcessList.h
index 0cb48c91318..5994cdcc1a3 100644
--- a/dbms/include/DB/Interpreters/ProcessList.h
+++ b/dbms/include/DB/Interpreters/ProcessList.h
@@ -10,7 +10,6 @@
 #include <DB/Core/Defines.h>
 #include <DB/Core/Progress.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Common/MemoryTracker.h>
 #include <DB/IO/WriteHelpers.h>
 #include <DB/Interpreters/QueryPriorities.h>
@@ -48,10 +47,12 @@ struct ProcessListElement
 
 	ProcessListElement(const String & query_, const String & user_,
 		const String & query_id_, const Poco::Net::IPAddress & ip_address_,
-		size_t max_memory_usage, double memory_tracker_fault_probability, QueryPriorities::Handle && priority_handle_)
+		size_t max_memory_usage, double memory_tracker_fault_probability,
+		QueryPriorities::Handle && priority_handle_)
 		: query(query_), user(user_), query_id(query_id_), ip_address(ip_address_), memory_tracker(max_memory_usage),
 		priority_handle(std::move(priority_handle_))
 	{
+		memory_tracker.setDescription("(for query)");
 		current_memory_tracker = &memory_tracker;
 
 		if (memory_tracker_fault_probability)
@@ -75,6 +76,18 @@ struct ProcessListElement
 };
 
 
+/// Данные о запросах одного пользователя.
+struct ProcessListForUser
+{
+	/// Query_id -> ProcessListElement *
+	using QueryToElement = std::unordered_map<String, ProcessListElement *>;
+	QueryToElement queries;
+
+	/// Ограничение и счётчик памяти на все одновременно выполняющиеся запросы одного пользователя.
+	MemoryTracker user_memory_tracker;
+};
+
+
 class ProcessList;
 
 
@@ -109,10 +122,8 @@ public:
 
 	/// list, чтобы итераторы не инвалидировались. NOTE: можно заменить на cyclic buffer, но почти незачем.
 	using Container = std::list<Element>;
-	/// Query_id -> Element *
-	using QueryToElement = std::unordered_map<String, Element *>;
-	/// User -> Query_id -> Element *
-	using UserToQueries = std::unordered_map<String, QueryToElement>;
+	/// User -> queries
+	using UserToQueries = std::unordered_map<String, ProcessListForUser>;
 
 private:
 	mutable Poco::FastMutex mutex;
@@ -124,10 +135,13 @@ private:
 	UserToQueries user_to_queries;
 	QueryPriorities priorities;
 
+	/// Ограничение и счётчик памяти на все одновременно выполняющиеся запросы.
+	MemoryTracker total_memory_tracker;
+
 public:
 	ProcessList(size_t max_size_ = 0) : cur_size(0), max_size(max_size_) {}
 
-	typedef std::shared_ptr<ProcessListEntry> EntryPtr;
+	using EntryPtr = std::shared_ptr<ProcessListEntry>;
 
 	/** Зарегистрировать выполняющийся запрос. Возвращает refcounted объект, который удаляет запрос из списка при уничтожении.
 	  * Если выполняющихся запросов сейчас слишком много - ждать не более указанного времени.
diff --git a/dbms/include/DB/Interpreters/Quota.h b/dbms/include/DB/Interpreters/Quota.h
index 84a38b10585..34ae6840442 100644
--- a/dbms/include/DB/Interpreters/Quota.h
+++ b/dbms/include/DB/Interpreters/Quota.h
@@ -15,7 +15,6 @@
 
 #include <DB/Core/Types.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/IO/WriteHelpers.h>
 
 
diff --git a/dbms/include/DB/Interpreters/SettingsCommon.h b/dbms/include/DB/Interpreters/SettingsCommon.h
index 67066741543..a182a7d5175 100644
--- a/dbms/include/DB/Interpreters/SettingsCommon.h
+++ b/dbms/include/DB/Interpreters/SettingsCommon.h
@@ -3,7 +3,9 @@
 #include <DB/Core/Field.h>
 #include <DB/IO/WriteHelpers.h>
 #include <Poco/Timespan.h>
-#include <cpuid/libcpuid.h>
+
+#include <DB/Common/getNumberOfPhysicalCPUCores.h>
+
 #include <DB/IO/CompressedStream.h>
 #include <DB/IO/ReadHelpers.h>
 
@@ -11,6 +13,18 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TYPE_MISMATCH;
+	extern const int UNKNOWN_LOAD_BALANCING;
+	extern const int UNKNOWN_OVERFLOW_MODE;
+	extern const int ILLEGAL_OVERFLOW_MODE;
+	extern const int UNKNOWN_TOTALS_MODE;
+	extern const int UNKNOWN_COMPRESSION_METHOD;
+	extern const int UNKNOWN_DISTRIBUTED_PRODUCT_MODE;
+	extern const int UNKNOWN_GLOBAL_SUBQUERIES_METHOD;
+}
+
 
 /** Одна настройка какого-либо типа.
   * Хранит внутри себя значение, а также флаг - было ли значение изменено.
@@ -138,15 +152,7 @@ struct SettingMaxThreads
 	/// Выполняется один раз за всё время. Выполняется из одного потока.
 	UInt64 getAutoValueImpl() const
 	{
-		cpu_raw_data_t raw_data;
-		if (0 != cpuid_get_raw_data(&raw_data))
-			throw Exception("Cannot cpuid_get_raw_data: " + String(cpuid_error()), ErrorCodes::CPUID_ERROR);
-
-		cpu_id_t data;
-		if (0 != cpu_identify(&raw_data, &data))
-			throw Exception("Cannot cpu_identify: " + String(cpuid_error()), ErrorCodes::CPUID_ERROR);
-
-		return data.num_cores * data.total_logical_cpus / data.num_logical_cpus;
+		return getNumberOfPhysicalCPUCores();
 	}
 };
 
@@ -348,7 +354,7 @@ struct SettingLoadBalancing
 	{
 		const char * strings[] = {"random", "nearest_hostname", "in_order"};
 		if (value < LoadBalancing::RANDOM || value > LoadBalancing::IN_ORDER)
-			throw Exception("Unknown load balancing mode", ErrorCodes::UNKNOWN_OVERFLOW_MODE);
+			throw Exception("Unknown load balancing mode", ErrorCodes::UNKNOWN_LOAD_BALANCING);
 		return strings[static_cast<size_t>(value)];
 	}
 
@@ -424,7 +430,7 @@ struct SettingTotalsMode
 			case TotalsMode::AFTER_HAVING_AUTO:			return "after_having_auto";
 
 			default:
-				throw Exception("Unknown TotalsMode enum value", ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+				throw Exception("Unknown TotalsMode enum value", ErrorCodes::UNKNOWN_TOTALS_MODE);
 		}
 	}
 
@@ -633,7 +639,7 @@ struct SettingDistributedProductMode
 	{
 		const char * strings[] = {"deny", "local", "global", "allow"};
 		if (value < DistributedProductMode::DENY || value > DistributedProductMode::ALLOW)
-			throw Exception("Unknown distributed product mode", ErrorCodes::UNKNOWN_OVERFLOW_MODE);
+			throw Exception("Unknown distributed product mode", ErrorCodes::UNKNOWN_DISTRIBUTED_PRODUCT_MODE);
 		return strings[static_cast<size_t>(value)];
 	}
 
diff --git a/dbms/include/DB/Interpreters/Users.h b/dbms/include/DB/Interpreters/Users.h
index 3d7b6b1ca5f..5ef476ff595 100644
--- a/dbms/include/DB/Interpreters/Users.h
+++ b/dbms/include/DB/Interpreters/Users.h
@@ -12,7 +12,6 @@
 
 #include <DB/Core/Types.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/IO/ReadHelpers.h>
 #include <DB/IO/HexWriteBuffer.h>
 #include <DB/IO/WriteBufferFromString.h>
@@ -28,6 +27,16 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int DNS_ERROR;
+	extern const int UNKNOWN_ADDRESS_PATTERN_TYPE;
+	extern const int UNKNOWN_USER;
+	extern const int REQUIRED_PASSWORD;
+	extern const int WRONG_PASSWORD;
+	extern const int IP_ADDRESS_NOT_ALLOWED;
+}
+
 
 /// Позволяет проверить соответствие адреса шаблону.
 class IAddressPattern
diff --git a/dbms/include/DB/Interpreters/evaluateMissingDefaults.h b/dbms/include/DB/Interpreters/evaluateMissingDefaults.h
index ecbd49e44fb..e037d3b7405 100644
--- a/dbms/include/DB/Interpreters/evaluateMissingDefaults.h
+++ b/dbms/include/DB/Interpreters/evaluateMissingDefaults.h
@@ -1,54 +1,19 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/Storages/ColumnDefault.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <utility>
+#include <unordered_map>
+
 
 namespace DB
 {
 
-inline void evaluateMissingDefaults(Block & block,
+class Block;
+class Context;
+class NamesAndTypesList;
+struct ColumnDefault;
+
+void evaluateMissingDefaults(Block & block,
     const NamesAndTypesList & required_columns,
-	const ColumnDefaults & column_defaults,
-	const Context & context)
-{
-	if (column_defaults.empty())
-		return;
-
-	ASTPtr default_expr_list{std::make_unique<ASTExpressionList>().release()};
-
-	for (const auto & column : required_columns)
-	{
-		if (block.has(column.name))
-			continue;
-
-		const auto it = column_defaults.find(column.name);
-
-		/// expressions must be cloned to prevent modification by the ExpressionAnalyzer
-		if (it != column_defaults.end())
-			default_expr_list->children.emplace_back(
-				setAlias(it->second.expression->clone(), it->first));
-	}
-
-	/// nothing to evaluate
-	if (default_expr_list->children.empty())
-		return;
-
-	/** ExpressionAnalyzer eliminates "unused" columns, in order to ensure their safety
-	  * we are going to operate on a copy instead of the original block */
-	Block copy_block{block};
-	/// evaluate default values for defaulted columns
-	ExpressionAnalyzer{default_expr_list, context, {}, required_columns}.getActions(true)->execute(copy_block);
-
-	/// move evaluated columns to the original block, materializing them at the same time
-	for (auto & column_name_type : copy_block.getColumns())
-	{
-		if (auto converted = column_name_type.column->convertToFullColumnIfConst())
-			column_name_type.column = converted;
-
-		block.insert(std::move(column_name_type));
-	}
-}
+	const std::unordered_map<String, ColumnDefault> & column_defaults,
+	const Context & context);
 
 }
diff --git a/dbms/include/DB/Interpreters/reinterpretAsIdentifier.h b/dbms/include/DB/Interpreters/reinterpretAsIdentifier.h
index 77030d617ec..0f6190666b1 100644
--- a/dbms/include/DB/Interpreters/reinterpretAsIdentifier.h
+++ b/dbms/include/DB/Interpreters/reinterpretAsIdentifier.h
@@ -1,50 +1,18 @@
 #pragma once
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
+#include <Poco/SharedPtr.h>
 
 
 namespace DB
 {
-	namespace
-	{
-		ASTPtr reinterpretAsIdentifierImpl(const ASTPtr & expr, const Context & context)
-		{
-			/// for string literal return its value
-			if (const auto literal = typeid_cast<const ASTLiteral *>(expr.get()))
-				return new ASTIdentifier{{}, safeGet<const String &>(literal->value)};
 
-			/// otherwise evaluate the expression
-			Block block{};
-			/** pass a dummy column name because ExpressionAnalyzer
-		     *  does not work with no columns so far. */
-			ExpressionAnalyzer{
-				expr, context, {},
-				{ { "", new DataTypeString } }
-			}.getActions(false)->execute(block);
+class IAST;
+class ASTIdentifier;
+class Context;
 
-			const auto & column_name_type = block.getByName(expr->getColumnName());
+/** \brief if `expr` is not already ASTIdentifier evaluates it
+  *  and replaces by a new ASTIdentifier with the result of evaluation as its name.
+  *  `expr` must evaluate to a String type */
+ASTIdentifier & reinterpretAsIdentifier(Poco::SharedPtr<IAST> & expr, const Context & context);
 
-			/// ensure the result of evaluation has String type
-			if (!typeid_cast<const DataTypeString *>(column_name_type.type.get()))
-				throw Exception{"Expression must evaluate to a String"};
-
-			return new ASTIdentifier{{}, column_name_type.column->getDataAt(0).toString()};
-		}
-	}
-
-	/** \brief if `expr` is not already ASTIdentifier evaluates it
-	 *  and replaces by a new ASTIdentifier with the result of evaluation as its name.
-	 *  `expr` must evaluate to a String type */
-	inline ASTIdentifier & reinterpretAsIdentifier(ASTPtr & expr, const Context & context)
-	{
-		/// for identifier just return its name
-		if (!typeid_cast<const ASTIdentifier *>(expr.get()))
-			expr = reinterpretAsIdentifierImpl(expr, context);
-
-		return static_cast<ASTIdentifier &>(*expr);
-	}
 }
diff --git a/dbms/include/DB/Parsers/ASTAlterQuery.h b/dbms/include/DB/Parsers/ASTAlterQuery.h
index d89e4c32bac..55214d86e22 100644
--- a/dbms/include/DB/Parsers/ASTAlterQuery.h
+++ b/dbms/include/DB/Parsers/ASTAlterQuery.h
@@ -7,6 +7,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNEXPECTED_AST_STRUCTURE;
+}
+
 /** ALTER запрос
  *  ALTER TABLE [db.]name_type
  *  	ADD COLUMN col_name type [AFTER col_after],
diff --git a/dbms/include/DB/Parsers/IAST.h b/dbms/include/DB/Parsers/IAST.h
index 9e52c527b39..1955cae5051 100644
--- a/dbms/include/DB/Parsers/IAST.h
+++ b/dbms/include/DB/Parsers/IAST.h
@@ -12,7 +12,6 @@
 
 #include <DB/Core/Types.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/IO/WriteHelpers.h>
 #include <DB/Parsers/StringRange.h>
 
@@ -20,8 +19,17 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NOT_A_COLUMN;
+	extern const int TOO_BIG_AST;
+	extern const int TOO_DEEP_AST;
+	extern const int UNKNOWN_TYPE_OF_AST_NODE;
+	extern const int UNKNOWN_ELEMENT_IN_AST;
+}
+
 using Poco::SharedPtr;
-typedef std::set<String> IdentifierNameSet;
+using IdentifierNameSet = std::set<String>;
 
 
 /** Элемент синтаксического дерева (в дальнейшем - направленного ациклического графа с элементами семантики)
@@ -29,7 +37,7 @@ typedef std::set<String> IdentifierNameSet;
 class IAST
 {
 public:
-	typedef std::vector<SharedPtr<IAST> > ASTs;
+	using ASTs = std::vector<SharedPtr<IAST>>;
 	ASTs children;
 	StringRange range;
 
@@ -240,8 +248,8 @@ private:
 };
 
 
-typedef SharedPtr<IAST> ASTPtr;
-typedef std::vector<ASTPtr> ASTs;
+using ASTPtr = SharedPtr<IAST>;
+using ASTs = std::vector<ASTPtr>;
 
 
 /// Квотировать идентификатор обратными кавычками, если это требуется.
diff --git a/dbms/include/DB/Storages/CompressionMethodSelector.h b/dbms/include/DB/Storages/CompressionMethodSelector.h
index bc7d85097fb..45883a11de3 100644
--- a/dbms/include/DB/Storages/CompressionMethodSelector.h
+++ b/dbms/include/DB/Storages/CompressionMethodSelector.h
@@ -1,6 +1,5 @@
 #include <DB/IO/CompressedStream.h>
 #include <DB/IO/ReadHelpers.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Common/Exception.h>
 #include <Poco/Util/AbstractConfiguration.h>
 
@@ -8,6 +7,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNKNOWN_COMPRESSION_METHOD;
+	extern const int UNKNOWN_ELEMENT_IN_CONFIG;
+}
+
+
 /** Позволяет выбрать метод сжатия по указанным в конфигурационном файле условиям.
   * Конфиг выглядит примерно так:
 
diff --git a/dbms/include/DB/Storages/Distributed/DirectoryMonitor.h b/dbms/include/DB/Storages/Distributed/DirectoryMonitor.h
index dd97cb09f32..95594ef0ea3 100644
--- a/dbms/include/DB/Storages/Distributed/DirectoryMonitor.h
+++ b/dbms/include/DB/Storages/Distributed/DirectoryMonitor.h
@@ -19,6 +19,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int INCORRECT_FILE_NAME;
+	extern const int CHECKSUM_DOESNT_MATCH;
+	extern const int TOO_LARGE_SIZE_COMPRESSED;
+}
+
+
 namespace
 {
 	static constexpr const std::chrono::seconds max_sleep_time{30};
diff --git a/dbms/include/DB/Storages/Distributed/DistributedBlockOutputStream.h b/dbms/include/DB/Storages/Distributed/DistributedBlockOutputStream.h
index a8ab5f96546..2d6f20678f1 100644
--- a/dbms/include/DB/Storages/Distributed/DistributedBlockOutputStream.h
+++ b/dbms/include/DB/Storages/Distributed/DistributedBlockOutputStream.h
@@ -17,7 +17,10 @@
 #include <iostream>
 #include <type_traits>
 
-#define LIBDIVIDE_USE_SSE2 1
+#if defined(__x86_64__)
+	#define LIBDIVIDE_USE_SSE2 1
+#endif
+
 #include <libdivide.h>
 
 
diff --git a/dbms/include/DB/Storages/IStorage.h b/dbms/include/DB/Storages/IStorage.h
index 2a75c147567..7d9f6619dde 100644
--- a/dbms/include/DB/Storages/IStorage.h
+++ b/dbms/include/DB/Storages/IStorage.h
@@ -20,6 +20,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TABLE_IS_DROPPED;
+}
+
 class Context;
 class IBlockInputStream;
 class IBlockOutputStream;
diff --git a/dbms/include/DB/Storages/MergeTree/DiskSpaceMonitor.h b/dbms/include/DB/Storages/MergeTree/DiskSpaceMonitor.h
index eb8df48faf4..bd1e538338d 100644
--- a/dbms/include/DB/Storages/MergeTree/DiskSpaceMonitor.h
+++ b/dbms/include/DB/Storages/MergeTree/DiskSpaceMonitor.h
@@ -4,13 +4,19 @@
 #include <boost/noncopyable.hpp>
 #include <common/logger_useful.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/IO/WriteHelpers.h>
 #include <DB/Common/formatReadable.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_STATVFS;
+	extern const int NOT_ENOUGH_SPACE;
+}
+
+
 /** Узнает количество свободного места в файловой системе.
   * Можно "резервировать" место, чтобы разные операции могли согласованно планировать использование диска.
   * Резервирования не разделяются по файловым системам.
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h b/dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
index d0a4117a2fa..91d58cbe6bd 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
+++ b/dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
@@ -9,6 +9,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER;
+}
+
+
 /// Для чтения из одного куска. Для чтения сразу из многих, Storage использует сразу много таких объектов.
 class MergeTreeBlockInputStream : public IProfilingBlockInputStream
 {
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeData.h b/dbms/include/DB/Storages/MergeTree/MergeTreeData.h
index 34991cef917..d464b883bce 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeData.h
+++ b/dbms/include/DB/Storages/MergeTree/MergeTreeData.h
@@ -25,6 +25,24 @@ struct SimpleIncrement;
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+	extern const int NO_FILE_IN_DATA_PART;
+	extern const int EXPECTED_END_OF_FILE;
+	extern const int BAD_SIZE_OF_FILE_IN_DATA_PART;
+	extern const int FORMAT_VERSION_TOO_OLD;
+	extern const int INVALID_PARTITION_NAME;
+	extern const int UNKNOWN_FORMAT;
+	extern const int UNEXPECTED_FILE_IN_DATA_PART;
+	extern const int TOO_MUCH_PARTS;
+	extern const int NO_SUCH_DATA_PART;
+	extern const int DUPLICATE_DATA_PART;
+	extern const int DIRECTORY_ALREADY_EXISTS;
+	extern const int TOO_MANY_UNEXPECTED_DATA_PARTS;
+	extern const int NO_SUCH_COLUMN_IN_TABLE;
+}
+
 /** Структура данных для *MergeTree движков.
   * Используется merge tree для инкрементальной сортировки данных.
   * Таблица представлена набором сортированных кусков.
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeReader.h b/dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
index 496fad7d34d..d7e785e1bdb 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
+++ b/dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
@@ -18,6 +18,13 @@ namespace DB
 {
 
 
+namespace ErrorCodes
+{
+	extern const int NOT_FOUND_EXPECTED_DATA_PART;
+	extern const int MEMORY_LIMIT_EXCEEDED;
+}
+
+
 /** Умеет читать данные между парой засечек из одного куска. При чтении последовательных отрезков не делает лишних seek-ов.
   * При чтении почти последовательных отрезков делает seek-и быстро, не выбрасывая содержимое буфера.
   */
diff --git a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h b/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
index 6b2c5993e8d..f90df18e555 100644
--- a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
+++ b/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
@@ -1,259 +1,21 @@
 #pragma once
 
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/Storages/MergeTree/AbandonableLockInZooKeeper.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
 #include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/IO/Operators.h>
 
 
 namespace DB
 {
 
+class StorageReplicatedMergeTree;
+
+
 class ReplicatedMergeTreeBlockOutputStream : public IBlockOutputStream
 {
 public:
-	ReplicatedMergeTreeBlockOutputStream(StorageReplicatedMergeTree & storage_, const String & insert_id_, size_t quorum_)
-		: storage(storage_), insert_id(insert_id_), quorum(quorum_),
-		log(&Logger::get(storage.data.getLogName() + " (Replicated OutputStream)"))
-	{
-		/// Значение кворума 1 имеет такой же смысл, как если он отключён.
-		if (quorum == 1)
-			quorum = 0;
-	}
+	ReplicatedMergeTreeBlockOutputStream(StorageReplicatedMergeTree & storage_, const String & insert_id_, size_t quorum_);
 
-	void writePrefix() override
-	{
-		/// TODO Можно ли здесь не блокировать структуру таблицы?
-		storage.data.delayInsertIfNeeded(&storage.restarting_thread->getWakeupEvent());
-	}
-
-	void write(const Block & block) override
-	{
-		auto zookeeper = storage.getZooKeeper();
-
-		assertSessionIsNotExpired(zookeeper);
-
-		/** Если запись с кворумом, то проверим, что требуемое количество реплик сейчас живо,
-		  *  а также что для всех предыдущих кусков, для которых требуется кворум, этот кворум достигнут.
-		  */
-		String quorum_status_path = storage.zookeeper_path + "/quorum/status";
-		if (quorum)
-		{
-			/// Список живых реплик. Все они регистрируют эфемерную ноду для leader_election.
-			auto live_replicas = zookeeper->getChildren(storage.zookeeper_path + "/leader_election");
-
-			if (live_replicas.size() < quorum)
-				throw Exception("Number of alive replicas ("
-					+ toString(live_replicas.size()) + ") is less than requested quorum (" + toString(quorum) + ").",
-					ErrorCodes::TOO_LESS_LIVE_REPLICAS);
-
-			/** Достигнут ли кворум для последнего куска, для которого нужен кворум?
-			  * Запись всех кусков с включенным кворумом линейно упорядочена.
-			  * Это значит, что в любой момент времени может быть только один кусок,
-			  *  для которого нужен, но ещё не достигнут кворум.
-			  * Информация о таком куске будет расположена в ноде /quorum/status.
-			  * Если кворум достигнут, то нода удаляется.
-			  */
-
-			String quorum_status;
-			bool quorum_unsatisfied = zookeeper->tryGet(quorum_status_path, quorum_status);
-
-			if (quorum_unsatisfied)
-				throw Exception("Quorum for previous write has not been satisfied yet. Status: " + quorum_status, ErrorCodes::UNSATISFIED_QUORUM_FOR_PREVIOUS_WRITE);
-
-			/// Обе проверки неявно делаются и позже (иначе был бы race condition).
-		}
-
-		auto part_blocks = storage.writer.splitBlockIntoParts(block);
-
-		for (auto & current_block : part_blocks)
-		{
-			assertSessionIsNotExpired(zookeeper);
-
-			++block_index;
-			String block_id = insert_id.empty() ? "" : insert_id + "__" + toString(block_index);
-			String month_name = toString(DateLUT::instance().toNumYYYYMMDD(DayNum_t(current_block.min_date)) / 100);
-
-			AbandonableLockInZooKeeper block_number_lock = storage.allocateBlockNumber(month_name);
-
-			Int64 part_number = block_number_lock.getNumber();
-
-			MergeTreeData::MutableDataPartPtr part = storage.writer.writeTempPart(current_block, part_number);
-			String part_name = ActiveDataPartSet::getPartName(part->left_date, part->right_date, part->left, part->right, part->level);
-
-			/// Хэш от данных.
-			SipHash hash;
-			part->checksums.summaryDataChecksum(hash);
-			union
-			{
-				char bytes[16];
-				UInt64 lo, hi;
-			} hash_value;
-			hash.get128(hash_value.bytes);
-
-			String checksum(hash_value.bytes, 16);
-
-			/// Если в запросе не указан ID, возьмем в качестве ID хеш от данных. То есть, не вставляем одинаковые данные дважды.
-			/// NOTE: Если такая дедупликация не нужна, можно вместо этого оставлять block_id пустым.
-			///       Можно для этого сделать настройку или синтаксис в запросе (например, ID=null).
-			if (block_id.empty())
-			{
-				block_id = toString(hash_value.lo) + "_" + toString(hash_value.hi);
-
-				if (block_id.empty())
-					throw Exception("Logical error: block_id is empty.", ErrorCodes::LOGICAL_ERROR);
-			}
-
-			LOG_DEBUG(log, "Wrote block " << part_number << " with ID " << block_id << ", " << current_block.block.rows() << " rows");
-
-			StorageReplicatedMergeTree::LogEntry log_entry;
-			log_entry.type = StorageReplicatedMergeTree::LogEntry::GET_PART;
-			log_entry.create_time = time(0);
-			log_entry.source_replica = storage.replica_name;
-			log_entry.new_part_name = part_name;
-			log_entry.quorum = quorum;
-			log_entry.block_id = block_id;
-
-			/// Одновременно добавим информацию о куске во все нужные места в ZooKeeper и снимем block_number_lock.
-
-			/// Информация о блоке.
-			zkutil::Ops ops;
-			auto acl = zookeeper->getDefaultACL();
-
-			ops.push_back(
-				new zkutil::Op::Create(
-					storage.zookeeper_path + "/blocks/" + block_id,
-					"",
-					acl,
-					zkutil::CreateMode::Persistent));
-			ops.push_back(
-				new zkutil::Op::Create(
-					storage.zookeeper_path + "/blocks/" + block_id + "/checksum",
-					checksum,
-					acl,
-					zkutil::CreateMode::Persistent));
-			ops.push_back(
-				new zkutil::Op::Create(
-					storage.zookeeper_path + "/blocks/" + block_id + "/number",
-					toString(part_number),
-					acl,
-					zkutil::CreateMode::Persistent));
-
-			/// Информация о куске, в данных реплики.
-			storage.checkPartAndAddToZooKeeper(part, ops, part_name);
-
-			/// Лог репликации.
-			ops.push_back(new zkutil::Op::Create(
-				storage.zookeeper_path + "/log/log-",
-				log_entry.toString(),
-				acl,
-				zkutil::CreateMode::PersistentSequential));
-
-			/// Удаление информации о том, что номер блока используется для записи.
-			block_number_lock.getUnlockOps(ops);
-
-			/** Если нужен кворум - создание узла, в котором отслеживается кворум.
-			  * (Если такой узел уже существует - значит кто-то успел одновременно сделать другую кворумную запись, но для неё кворум ещё не достигнут.
-			  *  Делать в это время следующую кворумную запись нельзя.)
-			  */
-			if (quorum)
-			{
-				ReplicatedMergeTreeQuorumEntry quorum_entry;
-				quorum_entry.part_name = part_name;
-				quorum_entry.required_number_of_replicas = quorum;
-				quorum_entry.replicas.insert(storage.replica_name);
-
-				/** В данный момент, этот узел будет содержать информацию о том, что текущая реплика получила кусок.
-				  * Когда другие реплики будут получать этот кусок (обычным способом, обрабатывая лог репликации),
-				  *  они будут добавлять себя в содержимое этого узла.
-				  * Когда в нём будет информация о quorum количестве реплик, этот узел удаляется,
-				  *  что говорит о том, что кворум достигнут.
-				  */
-
-				ops.push_back(
-					new zkutil::Op::Create(
-						quorum_status_path,
-						quorum_entry.toString(),
-						acl,
-						zkutil::CreateMode::Persistent));
-			}
-
-			MergeTreeData::Transaction transaction; /// Если не получится добавить кусок в ZK, снова уберем его из рабочего набора.
-			storage.data.renameTempPartAndAdd(part, nullptr, &transaction);
-
-			try
-			{
-				auto code = zookeeper->tryMulti(ops);
-				if (code == ZOK)
-				{
-					transaction.commit();
-					storage.merge_selecting_event.set();
-				}
-				else if (code == ZNODEEXISTS)
-				{
-					/// Если блок с таким ID уже есть в таблице, откатим его вставку.
-					String expected_checksum;
-					if (!block_id.empty() && zookeeper->tryGet(
-						storage.zookeeper_path + "/blocks/" + block_id + "/checksum", expected_checksum))
-					{
-						LOG_INFO(log, "Block with ID " << block_id << " already exists; ignoring it (removing part " << part->name << ")");
-
-						/// Если данные отличались от тех, что были вставлены ранее с тем же ID, бросим исключение.
-						if (expected_checksum != checksum)
-						{
-							if (!insert_id.empty())
-								throw Exception("Attempt to insert block with same ID but different checksum", ErrorCodes::CHECKSUM_DOESNT_MATCH);
-							else
-								throw Exception("Logical error: got ZNODEEXISTS while inserting data, block ID is derived from checksum but checksum doesn't match", ErrorCodes::LOGICAL_ERROR);
-						}
-
-						transaction.rollback();
-					}
-					else if (zookeeper->exists(quorum_status_path))
-					{
-						transaction.rollback();
-
-						throw Exception("Another quorum insert has been already started", ErrorCodes::UNSATISFIED_QUORUM_FOR_PREVIOUS_WRITE);
-					}
-					else
-					{
-						/// Сюда можем попасть также, если узел с кворумом существовал, но потом быстро был удалён.
-
-						throw Exception("Unexpected ZNODEEXISTS while adding block " + toString(part_number) + " with ID " + block_id + ": "
-							+ zkutil::ZooKeeper::error2string(code), ErrorCodes::UNEXPECTED_ZOOKEEPER_ERROR);
-					}
-				}
-				else
-				{
-					throw Exception("Unexpected error while adding block " + toString(part_number) + " with ID " + block_id + ": "
-						+ zkutil::ZooKeeper::error2string(code), ErrorCodes::UNEXPECTED_ZOOKEEPER_ERROR);
-				}
-			}
-			catch (const zkutil::KeeperException & e)
-			{
-				/** Если потерялось соединение, и мы не знаем, применились ли изменения, нельзя удалять локальный кусок:
-				  *  если изменения применились, в /blocks/ появился вставленный блок, и его нельзя будет вставить снова.
-				  */
-				if (e.code == ZOPERATIONTIMEOUT ||
-					e.code == ZCONNECTIONLOSS)
-				{
-					transaction.commit();
-					storage.enqueuePartForCheck(part->name);
-				}
-
-				throw;
-			}
-
-			if (quorum)
-			{
-				/// Дожидаемся достижения кворума. TODO Настраиваемый таймаут.
-				LOG_TRACE(log, "Waiting for quorum");
-				zookeeper->waitForDisappear(quorum_status_path);
-				LOG_TRACE(log, "Quorum satisfied");
-			}
-		}
-	}
+	void writePrefix() override;
+	void write(const Block & block) override;
 
 private:
 	StorageReplicatedMergeTree & storage;
@@ -262,14 +24,6 @@ private:
 	size_t block_index = 0;
 
 	Logger * log;
-
-
-	/// Позволяет проверить, что сессия в ZooKeeper ещё жива.
-	void assertSessionIsNotExpired(zkutil::ZooKeeperPtr & zookeeper)
-	{
-		if (zookeeper->expired())
-			throw Exception("ZooKeeper session has been expired.", ErrorCodes::NO_ZOOKEEPER);
-	}
 };
 
 }
diff --git a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h b/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
index e8fc1041b08..1c632a7317f 100644
--- a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
+++ b/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Core/Types.h>
 #include <DB/IO/WriteHelpers.h>
 
@@ -19,6 +18,13 @@ class ReadBuffer;
 class WriteBuffer;
 class ReplicatedMergeTreeQueue;
 
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+	extern const int UNKNOWN_FORMAT_VERSION;
+	extern const int CANNOT_PARSE_TEXT;
+}
+
 
 /// Запись о том, что нужно сделать. Только данные (их можно копировать).
 struct ReplicatedMergeTreeLogEntryData
diff --git a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeQueue.h b/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeQueue.h
index f396021c2ff..206601331cc 100644
--- a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeQueue.h
+++ b/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeQueue.h
@@ -24,6 +24,19 @@ private:
 
 	using Queue = std::list<LogEntryPtr>;
 
+	struct ByTime
+	{
+		bool operator()(const LogEntryPtr & lhs, const LogEntryPtr & rhs) const
+		{
+			return std::forward_as_tuple(lhs.get()->create_time, lhs.get())
+				 < std::forward_as_tuple(rhs.get()->create_time, rhs.get());
+		}
+	};
+
+	/// Для вычисления min_unprocessed_insert_time, max_processed_insert_time, по которым вычисляется отставание реплик.
+	using InsertsByTime = std::set<LogEntryPtr, ByTime>;
+
+
 	String zookeeper_path;
 	String replica_path;
 	String logger_name;
@@ -33,14 +46,22 @@ private:
 	  */
 	Queue queue;
 
+	InsertsByTime inserts_by_time;
+	time_t min_unprocessed_insert_time = 0;
+	time_t max_processed_insert_time = 0;
+
 	time_t last_queue_update = 0;
 
 	/// Куски, которые появятся в результате действий, выполняемых прямо сейчас фоновыми потоками (этих действий нет в очереди).
 	/// Используется, чтобы не выполнять в тот же момент другие действия с этими кусками.
 	StringSet future_parts;
 
+	/// На доступ к queue, future_parts, ...
 	std::mutex mutex;
 
+	/// Обеспечивает только один одновременный вызов pullLogsToQueue.
+	std::mutex pull_logs_to_queue_mutex;
+
 	/** Каким будет множество активных кусков после выполнения всей текущей очереди - добавления новых кусков и выполнения слияний.
 	  * Используется, чтобы определять, какие мерджи уже были назначены:
 	  *  - если в этом множестве есть кусок, то мерджи более мелких кусков внутри его диапазона не делаются.
@@ -67,16 +88,28 @@ private:
 	  */
 	bool shouldExecuteLogEntry(const LogEntry & entry, String & out_postpone_reason, MergeTreeDataMerger & merger);
 
+	/// После удаления элемента очереди, обновить времена insert-ов в оперативке. Выполняется под queue_mutex.
+	/// Возвращает информацию, какие времена изменились - эту информацию можно передать в updateTimesInZooKeeper.
+	void updateTimesOnRemoval(const LogEntryPtr & entry, bool & min_unprocessed_insert_time_changed, bool & max_processed_insert_time_changed);
+
+	/// Обновить времена insert-ов в ZooKeeper.
+	void updateTimesInZooKeeper(zkutil::ZooKeeperPtr zookeeper, bool min_unprocessed_insert_time_changed, bool max_processed_insert_time_changed);
+
 public:
 	ReplicatedMergeTreeQueue() {}
 
 	void initialize(const String & zookeeper_path_, const String & replica_path_, const String & logger_name_,
 		const MergeTreeData::DataParts & parts, zkutil::ZooKeeperPtr zookeeper);
 
-	/** Вставить действие в конец очереди. */
-	void insert(LogEntryPtr & entry);
+	/** Вставить действие в конец очереди.
+	  * Для восстановления битых кусков во время работы.
+	  * Не вставляет само действие в ZK (сделайте это самостоятельно).
+	  */
+	void insert(zkutil::ZooKeeperPtr zookeeper, LogEntryPtr & entry);
 
-	/** Удалить действие с указанным куском (в качестве new_part_name) из очереди. */
+	/** Удалить действие с указанным куском (в качестве new_part_name) из очереди.
+	  * Вызывается для невыполнимых действий в очереди - старых потерянных кусков.
+	  */
 	bool remove(zkutil::ZooKeeperPtr zookeeper, const String & part_name);
 
 	/** Скопировать новые записи из общего лога в очередь этой реплики. Установить log_pointer в соответствующее значение.
@@ -138,6 +171,9 @@ public:
 	/// Получить данные элементов очереди.
 	using LogEntriesData = std::vector<ReplicatedMergeTreeLogEntryData>;
 	void getEntries(LogEntriesData & res);
+
+	/// Получить информацию о временах insert-ов.
+	void getInsertTimes(time_t & out_min_unprocessed_insert_time, time_t & out_max_processed_insert_time) const;
 };
 
 
diff --git a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h b/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
index b9a454b3238..de50cb3648e 100644
--- a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
+++ b/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
@@ -45,12 +45,6 @@ public:
 		wakeup();
 	}
 
-	void getReplicaDelays(time_t & out_absolute_delay, time_t & out_relative_delay) const
-	{
-		out_absolute_delay = absolute_delay.load(std::memory_order_relaxed);
-		out_relative_delay = relative_delay.load(std::memory_order_relaxed);
-	}
-
 private:
 	StorageReplicatedMergeTree & storage;
 	Logger * log;
@@ -62,11 +56,6 @@ private:
 
 	std::thread thread;
 
-	/// Отставание реплики.
-	std::atomic<time_t> absolute_delay {};
-	std::atomic<time_t> relative_delay {};
-
-
 	void run();
 
 	/// Запустить или остановить фоновые потоки. Используется для частичной переинициализации при пересоздании сессии в ZooKeeper.
@@ -85,9 +74,6 @@ private:
 
 	/// Запретить запись в таблицу и завершить все фоновые потоки.
 	void goReadOnlyPermanently();
-
-	/// Получить информацию об отставании реплик.
-	void checkReplicationDelays(time_t & out_absolute_delay, time_t & out_relative_delay);
 };
 
 
diff --git a/dbms/include/DB/Storages/StorageLog.h b/dbms/include/DB/Storages/StorageLog.h
index c0ff2161457..4b1c19db24f 100644
--- a/dbms/include/DB/Storages/StorageLog.h
+++ b/dbms/include/DB/Storages/StorageLog.h
@@ -12,6 +12,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NO_SUCH_COLUMN_IN_TABLE;
+}
+
+
 /** Смещение до каждой некоторой пачки значений.
   * Эти пачки имеют одинаковый размер в разных столбцах.
   * Они нужны, чтобы можно было читать данные в несколько потоков.
diff --git a/dbms/include/DB/Storages/StorageReplicatedMergeTree.h b/dbms/include/DB/Storages/StorageReplicatedMergeTree.h
index e73ad1e999f..f2824f880ba 100644
--- a/dbms/include/DB/Storages/StorageReplicatedMergeTree.h
+++ b/dbms/include/DB/Storages/StorageReplicatedMergeTree.h
@@ -172,7 +172,7 @@ public:
 	using LogEntriesData = std::vector<ReplicatedMergeTreeLogEntryData>;
 	void getQueue(LogEntriesData & res, String & replica_name);
 
-	void getReplicaDelays(time_t & out_absolute_delay, time_t & out_relative_delay) const;
+	void getReplicaDelays(time_t & out_absolute_delay, time_t & out_relative_delay);
 
 private:
 	void dropUnreplicatedPartition(const Field & partition, bool detach, const Settings & settings);
@@ -193,17 +193,9 @@ private:
 	zkutil::ZooKeeperPtr current_zookeeper;		/// Используйте только с помощью методов ниже.
 	std::mutex current_zookeeper_mutex;			/// Для пересоздания сессии в фоновом потоке.
 
-	zkutil::ZooKeeperPtr getZooKeeper()
-	{
-		std::lock_guard<std::mutex> lock(current_zookeeper_mutex);
-		return current_zookeeper;
-	}
-
-	void setZooKeeper(zkutil::ZooKeeperPtr zookeeper)
-	{
-		std::lock_guard<std::mutex> lock(current_zookeeper_mutex);
-		current_zookeeper = zookeeper;
-	}
+	zkutil::ZooKeeperPtr tryGetZooKeeper();
+	zkutil::ZooKeeperPtr getZooKeeper();
+	void setZooKeeper(zkutil::ZooKeeperPtr zookeeper);
 
 	/// Если true, таблица в офлайновом режиме, и в нее нельзя писать.
 	bool is_readonly = false;
@@ -421,6 +413,9 @@ private:
 	/** Дождаться, пока указанная реплика выполнит указанное действие из лога.
 	  */
 	void waitForReplicaToProcessLogEntry(const String & replica_name, const LogEntry & entry);
+
+	/// Кинуть исключение, если таблица readonly.
+	void assertNotReadonly() const;
 };
 
 }
diff --git a/dbms/include/DB/TableFunctions/TableFunctionMerge.h b/dbms/include/DB/TableFunctions/TableFunctionMerge.h
index 9dc6525e561..eba61fff0dd 100644
--- a/dbms/include/DB/TableFunctions/TableFunctionMerge.h
+++ b/dbms/include/DB/TableFunctions/TableFunctionMerge.h
@@ -14,6 +14,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+	extern const int UNKNOWN_TABLE;
+}
+
+
 /*
  * merge(db_name, tables_regexp)- создаёт временный StorageMerge.
  * Cтруктура таблицы берётся из первой попавшейся таблицы, подходящей под регексп.
diff --git a/dbms/include/DB/TableFunctions/TableFunctionRemote.h b/dbms/include/DB/TableFunctions/TableFunctionRemote.h
index e454ad6df6f..92cb903c200 100644
--- a/dbms/include/DB/TableFunctions/TableFunctionRemote.h
+++ b/dbms/include/DB/TableFunctions/TableFunctionRemote.h
@@ -9,10 +9,16 @@
 #include <DB/Interpreters/Cluster.h>
 
 
-struct data;
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+	extern const int BAD_ARGUMENTS;
+	extern const int NO_REMOTE_SHARD_FOUND;
+}
+
 /*
  * remote('address', db, table) - создаёт временный StorageDistributed.
  * Чтобы получить структуру таблицы, делается запрос DESC TABLE на удалённый сервер.
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionFactory.cpp b/dbms/src/AggregateFunctions/AggregateFunctionFactory.cpp
index a24a380ebd0..08add809fb2 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -7,6 +7,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNKNOWN_AGGREGATE_FUNCTION;
+	extern const int LOGICAL_ERROR;
+	extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+
 namespace
 {
 
diff --git a/dbms/src/Client/Benchmark.cpp b/dbms/src/Client/Benchmark.cpp
index ac08da2b637..6b453744a12 100644
--- a/dbms/src/Client/Benchmark.cpp
+++ b/dbms/src/Client/Benchmark.cpp
@@ -2,10 +2,12 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <time.h>
 
 #include <iostream>
 #include <fstream>
 #include <iomanip>
+#include <random>
 
 #include <Poco/File.h>
 #include <Poco/SharedPtr.h>
@@ -45,15 +47,24 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int POCO_EXCEPTION;
+	extern const int STD_EXCEPTION;
+	extern const int UNKNOWN_EXCEPTION;
+}
+
 class Benchmark
 {
 public:
 	Benchmark(unsigned concurrency_, double delay_,
 			const String & host_, UInt16 port_, const String & default_database_,
 			const String & user_, const String & password_, const String & stage,
+			bool randomize_,
 			const Settings & settings_)
 		: concurrency(concurrency_), delay(delay_), queue(concurrency),
 		connections(concurrency, host_, port_, default_database_, user_, password_),
+		randomize(randomize_),
 		settings(settings_), pool(concurrency)
 	{
 		std::cerr << std::fixed << std::setprecision(3);
@@ -84,6 +95,7 @@ private:
 	Queue queue;
 
 	ConnectionPool connections;
+	bool randomize;
 	Settings settings;
 	QueryProcessingStage::Enum query_processing_stage;
 
@@ -161,6 +173,11 @@ private:
 
 	void run()
 	{
+		timespec current_clock;
+		clock_gettime(CLOCK_MONOTONIC, &current_clock);
+		std::mt19937 generator(current_clock.tv_nsec);
+		std::uniform_int_distribution<size_t> distribution(0, queries.size() - 1);
+
 		for (size_t i = 0; i < concurrency; ++i)
 			pool.schedule(std::bind(&Benchmark::thread, this, connections.IConnectionPool::get()));
 
@@ -175,7 +192,11 @@ private:
 			if (i >= queries.size())
 				i = 0;
 
-			queue.push(queries[i]);
+			size_t query_index = randomize
+				? distribution(generator)
+				: i;
+
+			queue.push(queries[query_index]);
 
 			if (watch.elapsedSeconds() > delay)
 			{
@@ -336,6 +357,7 @@ int main(int argc, char ** argv)
 			("password", boost::program_options::value<std::string>()->default_value(""), "")
 			("database", boost::program_options::value<std::string>()->default_value("default"), "")
 			("stage", boost::program_options::value<std::string>()->default_value("complete"), "request query processing up to specified stage")
+			("randomize,r", boost::program_options::value<bool>()->default_value(false), "randomize order of execution")
 		#define DECLARE_SETTING(TYPE, NAME, DEFAULT) (#NAME, boost::program_options::value<std::string> (), "Settings.h")
 		#define DECLARE_LIMIT(TYPE, NAME, DEFAULT) (#NAME, boost::program_options::value<std::string> (), "Limits.h")
 			APPLY_FOR_SETTINGS(DECLARE_SETTING)
@@ -373,6 +395,7 @@ int main(int argc, char ** argv)
 			options["user"].as<std::string>(),
 			options["password"].as<std::string>(),
 			options["stage"].as<std::string>(),
+			options["randomize"].as<bool>(),
 			settings);
 	}
 	catch (const Exception & e)
diff --git a/dbms/src/Client/Client.cpp b/dbms/src/Client/Client.cpp
index beb8d252026..d03e9ac57f7 100644
--- a/dbms/src/Client/Client.cpp
+++ b/dbms/src/Client/Client.cpp
@@ -78,8 +78,24 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int POCO_EXCEPTION;
+	extern const int STD_EXCEPTION;
+	extern const int UNKNOWN_EXCEPTION;
+	extern const int NETWORK_ERROR;
+	extern const int NO_DATA_TO_INSERT;
+	extern const int BAD_ARGUMENTS;
+	extern const int CANNOT_READ_HISTORY;
+	extern const int CANNOT_APPEND_HISTORY;
+	extern const int UNKNOWN_PACKET_FROM_SERVER;
+	extern const int UNEXPECTED_PACKET_FROM_SERVER;
+	extern const int CLIENT_OUTPUT_FORMAT_SPECIFIED;
+}
+
 using Poco::SharedPtr;
 
+
 class Client : public Poco::Util::Application
 {
 public:
diff --git a/dbms/src/Client/Connection.cpp b/dbms/src/Client/Connection.cpp
index 7cbbbb48c57..f5ccef544d6 100644
--- a/dbms/src/Client/Connection.cpp
+++ b/dbms/src/Client/Connection.cpp
@@ -6,7 +6,6 @@
 
 #include <DB/Core/Defines.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/IO/CompressedReadBuffer.h>
 #include <DB/IO/CompressedWriteBuffer.h>
@@ -27,6 +26,16 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NETWORK_ERROR;
+	extern const int SOCKET_TIMEOUT;
+	extern const int SERVER_REVISION_IS_TOO_OLD;
+	extern const int UNEXPECTED_PACKET_FROM_SERVER;
+	extern const int UNKNOWN_PACKET_FROM_SERVER;
+}
+
+
 void Connection::connect()
 {
 	try
diff --git a/dbms/src/Client/InterruptListener.h b/dbms/src/Client/InterruptListener.h
index a8e95eec669..979f60e02b9 100644
--- a/dbms/src/Client/InterruptListener.h
+++ b/dbms/src/Client/InterruptListener.h
@@ -2,12 +2,20 @@
 
 #include <signal.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_MANIPULATE_SIGSET;
+	extern const int CANNOT_WAIT_FOR_SIGNAL;
+	extern const int CANNOT_BLOCK_SIGNAL;
+	extern const int CANNOT_UNBLOCK_SIGNAL;
+}
+
+
 /** Пока существует объект этого класса - блокирует сигнал INT, при этом позволяет узнать, не пришёл ли он.
   * Это нужно, чтобы можно было прервать выполнение запроса с помощью Ctrl+C.
   * В один момент времени используйте только один экземпляр этого класса.
diff --git a/dbms/src/Client/MultiplexedConnections.cpp b/dbms/src/Client/MultiplexedConnections.cpp
index 10048cc8701..e8a58b752f3 100644
--- a/dbms/src/Client/MultiplexedConnections.cpp
+++ b/dbms/src/Client/MultiplexedConnections.cpp
@@ -3,6 +3,15 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+	extern const int MISMATCH_REPLICAS_DATA_SOURCES;
+	extern const int NO_AVAILABLE_REPLICA;
+	extern const int TIMEOUT_EXCEEDED;
+}
+
+
 MultiplexedConnections::MultiplexedConnections(Connection * connection_, const Settings * settings_, ThrottlerPtr throttler_)
 	: settings(settings_), throttler(throttler_), supports_parallel_execution(false)
 {
diff --git a/dbms/src/Columns/ColumnExpression.cpp b/dbms/src/Columns/ColumnExpression.cpp
new file mode 100644
index 00000000000..3ee86c4ea8b
--- /dev/null
+++ b/dbms/src/Columns/ColumnExpression.cpp
@@ -0,0 +1,43 @@
+#include <DB/Interpreters/ExpressionActions.h>
+#include <DB/Columns/ColumnExpression.h>
+
+
+namespace DB
+{
+
+ColumnExpression::ColumnExpression(
+	size_t s_, ExpressionActionsPtr expression_, const NamesAndTypes & arguments_, DataTypePtr return_type_, std::string return_name_)
+	: IColumnDummy(s_), expression(expression_), arguments(arguments_), return_type(return_type_), return_name(return_name_)
+{
+}
+
+ColumnExpression::ColumnExpression(
+	size_t s_, ExpressionActionsPtr expression_, const NamesAndTypesList & arguments_, DataTypePtr return_type_, std::string return_name_)
+	: IColumnDummy(s_), expression(expression_), arguments(arguments_.begin(), arguments_.end()), return_type(return_type_), return_name(return_name_)
+{
+}
+
+std::string ColumnExpression::getName() const
+{
+	return "ColumnExpression";
+}
+
+ColumnPtr ColumnExpression::cloneDummy(size_t s_) const
+{
+	return new ColumnExpression(s_, expression, arguments, return_type, return_name);
+}
+
+const ExpressionActionsPtr & ColumnExpression::getExpression() const { return expression; }
+const DataTypePtr & ColumnExpression::getReturnType() const { return return_type; }
+const std::string & ColumnExpression::getReturnName() const { return return_name; }
+const NamesAndTypes & ColumnExpression::getArguments() const { return arguments; }
+
+Names ColumnExpression::getArgumentNames() const
+{
+	Names res(arguments.size());
+	for (size_t i = 0; i < arguments.size(); ++i)
+		res[i] = arguments[i].name;
+	return res;
+}
+
+}
diff --git a/dbms/src/Columns/ColumnsCommon.cpp b/dbms/src/Columns/ColumnsCommon.cpp
index 3b3d6afa527..2beb2a9455f 100644
--- a/dbms/src/Columns/ColumnsCommon.cpp
+++ b/dbms/src/Columns/ColumnsCommon.cpp
@@ -1,4 +1,6 @@
-#include <emmintrin.h>
+#if defined(__x86_64__)
+	#include <emmintrin.h>
+#endif
 
 #include <DB/Columns/IColumn.h>
 
@@ -15,10 +17,11 @@ size_t countBytesInFilter(const IColumn::Filter & filt)
 	  * Лучше было бы использовать != 0, то это не позволяет SSE2.
 	  */
 
-	const __m128i zero16 = _mm_setzero_si128();
-
 	const Int8 * pos = reinterpret_cast<const Int8 *>(&filt[0]);
 	const Int8 * end = pos + filt.size();
+
+#if defined(__x86_64__)
+	const __m128i zero16 = _mm_setzero_si128();
 	const Int8 * end64 = pos + filt.size() / 64 * 64;
 
 	for (; pos < end64; pos += 64)
@@ -35,6 +38,7 @@ size_t countBytesInFilter(const IColumn::Filter & filt)
 			| (static_cast<UInt64>(_mm_movemask_epi8(_mm_cmpgt_epi8(
 				_mm_loadu_si128(reinterpret_cast<const __m128i *>(pos + 48)),
 				zero16))) << 48));
+#endif
 
 	for (; pos < end; ++pos)
 		count += *pos > 0;
@@ -43,6 +47,12 @@ size_t countBytesInFilter(const IColumn::Filter & filt)
 }
 
 
+namespace ErrorCodes
+{
+	extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
+}
+
+
 template <typename T>
 void filterArraysImpl(
 	const PODArray<T> & src_elems, const IColumn::Offsets_t & src_offsets,
@@ -65,17 +75,12 @@ void filterArraysImpl(
 
 	IColumn::Offset_t current_src_offset = 0;
 
-	static constexpr size_t SIMD_BYTES = 16;
-
 	const UInt8 * filt_pos = &filt[0];
 	const auto filt_end = filt_pos + size;
-	const auto filt_end_aligned = filt_pos + size / SIMD_BYTES * SIMD_BYTES;
 
 	auto offsets_pos = &src_offsets[0];
 	const auto offsets_begin = offsets_pos;
 
-	const __m128i zero_vec = _mm_setzero_si128();
-
 	/// copy array ending at *end_offset_ptr
 	const auto copy_array = [&] (const IColumn::Offset_t * offset_ptr)
 	{
@@ -90,6 +95,11 @@ void filterArraysImpl(
 		memcpy(&res_elems[elems_size_old], &src_elems[offset], size * sizeof(T));
 	};
 
+#if defined(__x86_64__)
+	const __m128i zero_vec = _mm_setzero_si128();
+	static constexpr size_t SIMD_BYTES = 16;
+	const auto filt_end_aligned = filt_pos + size / SIMD_BYTES * SIMD_BYTES;
+
 	while (filt_pos < filt_end_aligned)
 	{
 		const auto mask = _mm_movemask_epi8(_mm_cmpgt_epi8(
@@ -143,6 +153,7 @@ void filterArraysImpl(
 		filt_pos += SIMD_BYTES;
 		offsets_pos += SIMD_BYTES;
 	}
+#endif
 
 	while (filt_pos < filt_end)
 	{
diff --git a/dbms/src/Common/Exception.cpp b/dbms/src/Common/Exception.cpp
index ae8a58a67f5..ae08aadafac 100644
--- a/dbms/src/Common/Exception.cpp
+++ b/dbms/src/Common/Exception.cpp
@@ -12,6 +12,15 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int POCO_EXCEPTION;
+	extern const int STD_EXCEPTION;
+	extern const int UNKNOWN_EXCEPTION;
+	extern const int CANNOT_TRUNCATE_FILE;
+}
+
+
 void throwFromErrno(const std::string & s, int code, int e)
 {
 	char buf[128];
diff --git a/dbms/src/Common/Macros.cpp b/dbms/src/Common/Macros.cpp
index 9e09a60accf..4208578a089 100644
--- a/dbms/src/Common/Macros.cpp
+++ b/dbms/src/Common/Macros.cpp
@@ -1,10 +1,14 @@
 #include <DB/Common/Macros.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int SYNTAX_ERROR;
+}
+
 Macros::Macros() {}
 
 Macros::Macros(const Poco::Util::AbstractConfiguration & config, const String & root_key)
diff --git a/dbms/src/Common/MemoryTracker.cpp b/dbms/src/Common/MemoryTracker.cpp
index 8b50006b43a..36abff79813 100644
--- a/dbms/src/Common/MemoryTracker.cpp
+++ b/dbms/src/Common/MemoryTracker.cpp
@@ -8,11 +8,30 @@
 #include <DB/Common/MemoryTracker.h>
 
 
+namespace DB
+{
+namespace ErrorCodes
+{
+	extern const int MEMORY_LIMIT_EXCEEDED;
+}
+}
+
+
 MemoryTracker::~MemoryTracker()
 {
-	LOG_DEBUG(&Logger::get("MemoryTracker"), "Peak memory usage for query: " << formatReadableSizeWithBinarySuffix(peak) << ".");
+	if (peak)
+		logPeakMemoryUsage();
 }
 
+
+void MemoryTracker::logPeakMemoryUsage() const
+{
+	LOG_DEBUG(&Logger::get("MemoryTracker"),
+		"Peak memory usage" << (description ? " " + std::string(description) : "")
+		<< ": " << formatReadableSizeWithBinarySuffix(peak) << ".");
+}
+
+
 void MemoryTracker::alloc(Int64 size)
 {
 	Int64 will_be = __sync_add_and_fetch(&amount, size);
@@ -22,21 +41,55 @@ void MemoryTracker::alloc(Int64 size)
 	if (unlikely(fault_probability && drand48() < fault_probability))
 	{
 		free(size);
-		throw DB::Exception("Memory tracker: fault injected. Would use " + formatReadableSizeWithBinarySuffix(will_be) + ""
-			" (attempt to allocate chunk of " + DB::toString(size) + " bytes)"
-			", maximum: " + formatReadableSizeWithBinarySuffix(limit), DB::ErrorCodes::MEMORY_LIMIT_EXCEEDED);
+
+		std::stringstream message;
+		message << "Memory tracker";
+		if (description)
+			message << " " << description;
+		message << ": fault injected. Would use " << formatReadableSizeWithBinarySuffix(will_be)
+			<< " (attempt to allocate chunk of " << size << " bytes)"
+			<< ", maximum: " << formatReadableSizeWithBinarySuffix(limit);
+
+		throw DB::Exception(message.str(), DB::ErrorCodes::MEMORY_LIMIT_EXCEEDED);
 	}
 
 	if (unlikely(limit && will_be > limit))
 	{
 		free(size);
-		throw DB::Exception("Memory limit exceeded: would use " + formatReadableSizeWithBinarySuffix(will_be) + ""
-			" (attempt to allocate chunk of " + DB::toString(size) + " bytes)"
-			", maximum: " + formatReadableSizeWithBinarySuffix(limit), DB::ErrorCodes::MEMORY_LIMIT_EXCEEDED);
+
+		std::stringstream message;
+		message << "Memory limit";
+		if (description)
+			message << " " << description;
+		message << " exceeded: would use " << formatReadableSizeWithBinarySuffix(will_be)
+			<< " (attempt to allocate chunk of " << size << " bytes)"
+			<< ", maximum: " << formatReadableSizeWithBinarySuffix(limit);
+
+		throw DB::Exception(message.str(), DB::ErrorCodes::MEMORY_LIMIT_EXCEEDED);
 	}
 
 	if (will_be > peak)
 		peak = will_be;
+
+	if (next)
+		next->alloc(size);
+}
+
+
+void MemoryTracker::free(Int64 size)
+{
+	__sync_sub_and_fetch(&amount, size);
+
+	if (next)
+		next->free(size);
+}
+
+
+void MemoryTracker::reset()
+{
+	amount = 0;
+	peak = 0;
+	limit = 0;
 }
 
 
diff --git a/dbms/src/Common/ShellCommand.cpp b/dbms/src/Common/ShellCommand.cpp
index 70d62cea7c1..55318f39618 100644
--- a/dbms/src/Common/ShellCommand.cpp
+++ b/dbms/src/Common/ShellCommand.cpp
@@ -4,12 +4,25 @@
 #include <fcntl.h>
 #include <dlfcn.h>
 
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Common/Exception.h>
 #include <DB/Common/ShellCommand.h>
 #include <DB/IO/WriteBufferFromVector.h>
 
 
+namespace DB
+{
+	namespace ErrorCodes
+	{
+		extern const int CANNOT_PIPE;
+		extern const int CANNOT_DLSYM;
+		extern const int CANNOT_FORK;
+		extern const int CANNOT_WAITPID;
+		extern const int CHILD_WAS_NOT_EXITED_NORMALLY;
+		extern const int CANNOT_CREATE_CHILD_PROCESS;
+	}
+}
+
+
 namespace
 {
 	struct Pipe
diff --git a/dbms/src/Common/VirtualColumnUtils.cpp b/dbms/src/Common/VirtualColumnUtils.cpp
index de94e18a56b..a55c9c12acf 100644
--- a/dbms/src/Common/VirtualColumnUtils.cpp
+++ b/dbms/src/Common/VirtualColumnUtils.cpp
@@ -1,5 +1,6 @@
 #include <DB/Interpreters/Context.h>
 #include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <DB/Interpreters/ExpressionActions.h>
 #include <DB/Parsers/ASTIdentifier.h>
 #include <DB/Parsers/ASTExpressionList.h>
 #include <DB/Parsers/ASTLiteral.h>
diff --git a/dbms/src/Common/getNumberOfPhysicalCPUCores.cpp b/dbms/src/Common/getNumberOfPhysicalCPUCores.cpp
new file mode 100644
index 00000000000..78b7985c7d0
--- /dev/null
+++ b/dbms/src/Common/getNumberOfPhysicalCPUCores.cpp
@@ -0,0 +1,35 @@
+#include <DB/Common/getNumberOfPhysicalCPUCores.h>
+
+#if defined(__x86_64__)
+
+	#include <cpuid/libcpuid.h>
+	#include <DB/Common/Exception.h>
+
+	namespace DB { namespace ErrorCodes { extern const int CPUID_ERROR; }}
+
+#elif defined(__aarch64__)
+
+	#include <thread>
+
+#endif
+
+
+unsigned getNumberOfPhysicalCPUCores()
+{
+#if defined(__x86_64__)
+
+	cpu_raw_data_t raw_data;
+	if (0 != cpuid_get_raw_data(&raw_data))
+		throw DB::Exception("Cannot cpuid_get_raw_data: " + std::string(cpuid_error()), DB::ErrorCodes::CPUID_ERROR);
+
+	cpu_id_t data;
+	if (0 != cpu_identify(&raw_data, &data))
+		throw DB::Exception("Cannot cpu_identify: " + std::string(cpuid_error()), DB::ErrorCodes::CPUID_ERROR);
+
+	return data.num_cores * data.total_logical_cpus / data.num_logical_cpus;
+
+#elif defined(__aarch64__)
+	/// Считаем, что на этой системе нет hyper-threading.
+	return std::thread::hardware_concurrency();
+#endif
+}
diff --git a/dbms/src/Common/localBackup.cpp b/dbms/src/Common/localBackup.cpp
index 594ca18ec03..a71a4cd6151 100644
--- a/dbms/src/Common/localBackup.cpp
+++ b/dbms/src/Common/localBackup.cpp
@@ -8,13 +8,21 @@
 #include <Poco/File.h>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+	extern const int TOO_DEEP_RECURSION;
+}
+}
 
 
 static void localBackupImpl(Poco::Path source_path, Poco::Path destination_path, size_t level)
 {
 	if (level >= 1000)
-		throw DB::Exception("Too deep recursion");
+		throw DB::Exception("Too deep recursion", DB::ErrorCodes::TOO_DEEP_RECURSION);
 
 	Poco::File(destination_path).createDirectories();
 
diff --git a/dbms/src/Core/Block.cpp b/dbms/src/Core/Block.cpp
index 1943e8a855a..534bbfbf606 100644
--- a/dbms/src/Core/Block.cpp
+++ b/dbms/src/Core/Block.cpp
@@ -1,7 +1,6 @@
 #include <iterator>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/Core/Block.h>
 
@@ -20,6 +19,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int POSITION_OUT_OF_BOUND;
+	extern const int NOT_FOUND_COLUMN_IN_BLOCK;
+	extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
+	extern const int SIZES_OF_ARRAYS_DOESNT_MATCH;
+}
+
 
 Block::Block(const Block & other)
 {
diff --git a/dbms/src/Core/ErrorCodes.cpp b/dbms/src/Core/ErrorCodes.cpp
new file mode 100644
index 00000000000..b48cab45219
--- /dev/null
+++ b/dbms/src/Core/ErrorCodes.cpp
@@ -0,0 +1,323 @@
+namespace DB
+{
+
+namespace ErrorCodes
+{
+	/** Раньше эти константы были расположены в одном enum-е.
+	  * Но в этом случае возникает проблема: при добавлении новой константы необходимо перекомпилировать
+	  *  все translation unit-ы, которые используют хотя бы одну константу (почти весь проект).
+	  * Поэтому сделано так, что определения констант расположены здесь, в одном файле,
+	  *  а их объявления - в разных файлах, по месту использования.
+	  */
+
+	extern const int UNSUPPORTED_METHOD = 1;
+	extern const int UNSUPPORTED_PARAMETER = 2;
+	extern const int UNEXPECTED_END_OF_FILE = 3;
+	extern const int EXPECTED_END_OF_FILE = 4;
+	extern const int CANNOT_PARSE_TEXT = 6;
+	extern const int INCORRECT_NUMBER_OF_COLUMNS = 7;
+	extern const int THERE_IS_NO_COLUMN = 8;
+	extern const int SIZES_OF_COLUMNS_DOESNT_MATCH = 9;
+	extern const int NOT_FOUND_COLUMN_IN_BLOCK = 10;
+	extern const int POSITION_OUT_OF_BOUND = 11;
+	extern const int PARAMETER_OUT_OF_BOUND = 12;
+	extern const int SIZES_OF_COLUMNS_IN_TUPLE_DOESNT_MATCH = 13;
+	extern const int DUPLICATE_COLUMN = 15;
+	extern const int NO_SUCH_COLUMN_IN_TABLE = 16;
+	extern const int DELIMITER_IN_STRING_LITERAL_DOESNT_MATCH = 17;
+	extern const int CANNOT_INSERT_ELEMENT_INTO_CONSTANT_COLUMN = 18;
+	extern const int SIZE_OF_ARRAY_DOESNT_MATCH_SIZE_OF_FIXEDARRAY_COLUMN = 19;
+	extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH = 20;
+	extern const int CANNOT_READ_ALL_DATA_FROM_TAB_SEPARATED_INPUT = 21;
+	extern const int CANNOT_PARSE_ALL_VALUE_FROM_TAB_SEPARATED_INPUT = 22;
+	extern const int CANNOT_READ_FROM_ISTREAM = 23;
+	extern const int CANNOT_WRITE_TO_OSTREAM = 24;
+	extern const int CANNOT_PARSE_ESCAPE_SEQUENCE = 25;
+	extern const int CANNOT_PARSE_QUOTED_STRING = 26;
+	extern const int CANNOT_PARSE_INPUT_ASSERTION_FAILED = 27;
+	extern const int CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER = 28;
+	extern const int CANNOT_PRINT_INTEGER = 29;
+	extern const int CANNOT_READ_SIZE_OF_COMPRESSED_CHUNK = 30;
+	extern const int CANNOT_READ_COMPRESSED_CHUNK = 31;
+	extern const int ATTEMPT_TO_READ_AFTER_EOF = 32;
+	extern const int CANNOT_READ_ALL_DATA = 33;
+	extern const int TOO_MUCH_ARGUMENTS_FOR_FUNCTION = 34;
+	extern const int TOO_LESS_ARGUMENTS_FOR_FUNCTION = 35;
+	extern const int BAD_ARGUMENTS = 36;
+	extern const int UNKNOWN_ELEMENT_IN_AST = 37;
+	extern const int CANNOT_PARSE_DATE = 38;
+	extern const int TOO_LARGE_SIZE_COMPRESSED = 39;
+	extern const int CHECKSUM_DOESNT_MATCH = 40;
+	extern const int CANNOT_PARSE_DATETIME = 41;
+	extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH = 42;
+	extern const int ILLEGAL_TYPE_OF_ARGUMENT = 43;
+	extern const int ILLEGAL_COLUMN = 44;
+	extern const int ILLEGAL_NUMBER_OF_RESULT_COLUMNS = 45;
+	extern const int UNKNOWN_FUNCTION = 46;
+	extern const int UNKNOWN_IDENTIFIER = 47;
+	extern const int NOT_IMPLEMENTED = 48;
+	extern const int LOGICAL_ERROR = 49;
+	extern const int UNKNOWN_TYPE = 50;
+	extern const int EMPTY_LIST_OF_COLUMNS_QUERIED = 51;
+	extern const int COLUMN_QUERIED_MORE_THAN_ONCE = 52;
+	extern const int TYPE_MISMATCH = 53;
+	extern const int STORAGE_DOESNT_ALLOW_PARAMETERS = 54;
+	extern const int STORAGE_REQUIRES_PARAMETER = 55;
+	extern const int UNKNOWN_STORAGE = 56;
+	extern const int TABLE_ALREADY_EXISTS = 57;
+	extern const int TABLE_METADATA_ALREADY_EXISTS = 58;
+	extern const int ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER = 59;
+	extern const int UNKNOWN_TABLE = 60;
+	extern const int ONLY_FILTER_COLUMN_IN_BLOCK = 61;
+	extern const int SYNTAX_ERROR = 62;
+	extern const int UNKNOWN_AGGREGATE_FUNCTION = 63;
+	extern const int CANNOT_READ_AGGREGATE_FUNCTION_FROM_TEXT = 64;
+	extern const int CANNOT_WRITE_AGGREGATE_FUNCTION_AS_TEXT = 65;
+	extern const int NOT_A_COLUMN = 66;
+	extern const int ILLEGAL_KEY_OF_AGGREGATION = 67;
+	extern const int CANNOT_GET_SIZE_OF_FIELD = 68;
+	extern const int ARGUMENT_OUT_OF_BOUND = 69;
+	extern const int CANNOT_CONVERT_TYPE = 70;
+	extern const int CANNOT_WRITE_AFTER_END_OF_BUFFER = 71;
+	extern const int CANNOT_PARSE_NUMBER = 72;
+	extern const int UNKNOWN_FORMAT = 73;
+	extern const int CANNOT_READ_FROM_FILE_DESCRIPTOR = 74;
+	extern const int CANNOT_WRITE_TO_FILE_DESCRIPTOR = 75;
+	extern const int CANNOT_OPEN_FILE = 76;
+	extern const int CANNOT_CLOSE_FILE = 77;
+	extern const int UNKNOWN_TYPE_OF_QUERY = 78;
+	extern const int INCORRECT_FILE_NAME = 79;
+	extern const int INCORRECT_QUERY = 80;
+	extern const int UNKNOWN_DATABASE = 81;
+	extern const int DATABASE_ALREADY_EXISTS = 82;
+	extern const int DIRECTORY_DOESNT_EXIST = 83;
+	extern const int DIRECTORY_ALREADY_EXISTS = 84;
+	extern const int FORMAT_IS_NOT_SUITABLE_FOR_INPUT = 85;
+	extern const int RECEIVED_ERROR_FROM_REMOTE_IO_SERVER = 86;
+	extern const int CANNOT_SEEK_THROUGH_FILE = 87;
+	extern const int CANNOT_TRUNCATE_FILE = 88;
+	extern const int UNKNOWN_COMPRESSION_METHOD = 89;
+	extern const int EMPTY_LIST_OF_COLUMNS_PASSED = 90;
+	extern const int SIZES_OF_MARKS_FILES_ARE_INCONSISTENT = 91;
+	extern const int EMPTY_DATA_PASSED = 92;
+	extern const int UNKNOWN_AGGREGATED_DATA_VARIANT = 93;
+	extern const int CANNOT_MERGE_DIFFERENT_AGGREGATED_DATA_VARIANTS = 94;
+	extern const int CANNOT_READ_FROM_SOCKET = 95;
+	extern const int CANNOT_WRITE_TO_SOCKET = 96;
+	extern const int CANNOT_READ_ALL_DATA_FROM_CHUNKED_INPUT = 97;
+	extern const int CANNOT_WRITE_TO_EMPTY_BLOCK_OUTPUT_STREAM = 98;
+	extern const int UNKNOWN_PACKET_FROM_CLIENT = 99;
+	extern const int UNKNOWN_PACKET_FROM_SERVER = 100;
+	extern const int UNEXPECTED_PACKET_FROM_CLIENT = 101;
+	extern const int UNEXPECTED_PACKET_FROM_SERVER = 102;
+	extern const int RECEIVED_DATA_FOR_WRONG_QUERY_ID = 103;
+	extern const int TOO_SMALL_BUFFER_SIZE = 104;
+	extern const int CANNOT_READ_HISTORY = 105;
+	extern const int CANNOT_APPEND_HISTORY = 106;
+	extern const int FILE_DOESNT_EXIST = 107;
+	extern const int NO_DATA_TO_INSERT = 108;
+	extern const int CANNOT_BLOCK_SIGNAL = 109;
+	extern const int CANNOT_UNBLOCK_SIGNAL = 110;
+	extern const int CANNOT_MANIPULATE_SIGSET = 111;
+	extern const int CANNOT_WAIT_FOR_SIGNAL = 112;
+	extern const int THERE_IS_NO_SESSION = 113;
+	extern const int CANNOT_CLOCK_GETTIME = 114;
+	extern const int UNKNOWN_SETTING = 115;
+	extern const int THERE_IS_NO_DEFAULT_VALUE = 116;
+	extern const int INCORRECT_DATA = 117;
+	extern const int TABLE_METADATA_DOESNT_EXIST = 118;
+	extern const int ENGINE_REQUIRED = 119;
+	extern const int CANNOT_INSERT_VALUE_OF_DIFFERENT_SIZE_INTO_TUPLE = 120;
+	extern const int UNKNOWN_SET_DATA_VARIANT = 121;
+	extern const int INCOMPATIBLE_COLUMNS = 122;
+	extern const int UNKNOWN_TYPE_OF_AST_NODE = 123;
+	extern const int INCORRECT_ELEMENT_OF_SET = 124;
+	extern const int INCORRECT_RESULT_OF_SCALAR_SUBQUERY = 125;
+	extern const int CANNOT_GET_RETURN_TYPE = 126;
+	extern const int ILLEGAL_INDEX = 127;
+	extern const int TOO_LARGE_ARRAY_SIZE = 128;
+	extern const int FUNCTION_IS_SPECIAL = 129;
+	extern const int CANNOT_READ_ARRAY_FROM_TEXT = 130;
+	extern const int TOO_LARGE_STRING_SIZE = 131;
+	extern const int CANNOT_CREATE_TABLE_FROM_METADATA = 132;
+	extern const int AGGREGATE_FUNCTION_DOESNT_ALLOW_PARAMETERS = 133;
+	extern const int PARAMETERS_TO_AGGREGATE_FUNCTIONS_MUST_BE_LITERALS = 134;
+	extern const int ZERO_ARRAY_OR_TUPLE_INDEX = 135;
+	extern const int UNKNOWN_ELEMENT_IN_CONFIG = 137;
+	extern const int EXCESSIVE_ELEMENT_IN_CONFIG = 138;
+	extern const int NO_ELEMENTS_IN_CONFIG = 139;
+	extern const int ALL_REQUESTED_COLUMNS_ARE_MISSING = 140;
+	extern const int SAMPLING_NOT_SUPPORTED = 141;
+	extern const int NOT_FOUND_NODE = 142;
+	extern const int FOUND_MORE_THAN_ONE_NODE = 143;
+	extern const int FIRST_DATE_IS_BIGGER_THAN_LAST_DATE = 144;
+	extern const int UNKNOWN_OVERFLOW_MODE = 145;
+	extern const int QUERY_SECTION_DOESNT_MAKE_SENSE = 146;
+	extern const int NOT_FOUND_FUNCTION_ELEMENT_FOR_AGGREGATE = 147;
+	extern const int NOT_FOUND_RELATION_ELEMENT_FOR_CONDITION = 148;
+	extern const int NOT_FOUND_RHS_ELEMENT_FOR_CONDITION = 149;
+	extern const int NO_ATTRIBUTES_LISTED = 150;
+	extern const int INDEX_OF_COLUMN_IN_SORT_CLAUSE_IS_OUT_OF_RANGE = 151;
+	extern const int UNKNOWN_DIRECTION_OF_SORTING = 152;
+	extern const int ILLEGAL_DIVISION = 153;
+	extern const int AGGREGATE_FUNCTION_NOT_APPLICABLE = 154;
+	extern const int UNKNOWN_RELATION = 155;
+	extern const int DICTIONARIES_WAS_NOT_LOADED = 156;
+	extern const int ILLEGAL_OVERFLOW_MODE = 157;
+	extern const int TOO_MUCH_ROWS = 158;
+	extern const int TIMEOUT_EXCEEDED = 159;
+	extern const int TOO_SLOW = 160;
+	extern const int TOO_MUCH_COLUMNS = 161;
+	extern const int TOO_DEEP_SUBQUERIES = 162;
+	extern const int TOO_DEEP_PIPELINE = 163;
+	extern const int READONLY = 164;
+	extern const int TOO_MUCH_TEMPORARY_COLUMNS = 165;
+	extern const int TOO_MUCH_TEMPORARY_NON_CONST_COLUMNS = 166;
+	extern const int TOO_DEEP_AST = 167;
+	extern const int TOO_BIG_AST = 168;
+	extern const int BAD_TYPE_OF_FIELD = 169;
+	extern const int BAD_GET = 170;
+	extern const int BLOCKS_HAS_DIFFERENT_STRUCTURE = 171;
+	extern const int CANNOT_CREATE_DIRECTORY = 172;
+	extern const int CANNOT_ALLOCATE_MEMORY = 173;
+	extern const int CYCLIC_ALIASES = 174;
+	extern const int CHUNK_NOT_FOUND = 176;
+	extern const int DUPLICATE_CHUNK_NAME = 177;
+	extern const int MULTIPLE_ALIASES_FOR_EXPRESSION = 178;
+	extern const int MULTIPLE_EXPRESSIONS_FOR_ALIAS = 179;
+	extern const int THERE_IS_NO_PROFILE = 180;
+	extern const int ILLEGAL_FINAL = 181;
+	extern const int ILLEGAL_PREWHERE = 182;
+	extern const int UNEXPECTED_EXPRESSION = 183;
+	extern const int ILLEGAL_AGGREGATION = 184;
+	extern const int UNSUPPORTED_MYISAM_BLOCK_TYPE = 185;
+	extern const int UNSUPPORTED_COLLATION_LOCALE = 186;
+	extern const int COLLATION_COMPARISON_FAILED = 187;
+	extern const int UNKNOWN_ACTION = 188;
+	extern const int TABLE_MUST_NOT_BE_CREATED_MANUALLY = 189;
+	extern const int SIZES_OF_ARRAYS_DOESNT_MATCH = 190;
+	extern const int SET_SIZE_LIMIT_EXCEEDED = 191;
+	extern const int UNKNOWN_USER = 192;
+	extern const int WRONG_PASSWORD = 193;
+	extern const int REQUIRED_PASSWORD = 194;
+	extern const int IP_ADDRESS_NOT_ALLOWED = 195;
+	extern const int UNKNOWN_ADDRESS_PATTERN_TYPE = 196;
+	extern const int SERVER_REVISION_IS_TOO_OLD = 197;
+	extern const int DNS_ERROR = 198;
+	extern const int UNKNOWN_QUOTA = 199;
+	extern const int QUOTA_DOESNT_ALLOW_KEYS = 200;
+	extern const int QUOTA_EXPIRED = 201;
+	extern const int TOO_MUCH_SIMULTANEOUS_QUERIES = 202;
+	extern const int NO_FREE_CONNECTION = 203;
+	extern const int CANNOT_FSYNC = 204;
+	extern const int NESTED_TYPE_TOO_DEEP = 205;
+	extern const int ALIAS_REQUIRED = 206;
+	extern const int AMBIGUOUS_IDENTIFIER = 207;
+	extern const int EMPTY_NESTED_TABLE = 208;
+	extern const int SOCKET_TIMEOUT = 209;
+	extern const int NETWORK_ERROR = 210;
+	extern const int EMPTY_QUERY = 211;
+	extern const int UNKNOWN_LOAD_BALANCING = 212;
+	extern const int UNKNOWN_TOTALS_MODE = 213;
+	extern const int CANNOT_STATVFS = 214;
+	extern const int NOT_AN_AGGREGATE = 215;
+	extern const int QUERY_WITH_SAME_ID_IS_ALREADY_RUNNING = 216;
+	extern const int CLIENT_HAS_CONNECTED_TO_WRONG_PORT = 217;
+	extern const int TABLE_IS_DROPPED = 218;
+	extern const int DATABASE_NOT_EMPTY = 219;
+	extern const int DUPLICATE_INTERSERVER_IO_ENDPOINT = 220;
+	extern const int NO_SUCH_INTERSERVER_IO_ENDPOINT = 221;
+	extern const int ADDING_REPLICA_TO_NON_EMPTY_TABLE = 222;
+	extern const int UNEXPECTED_AST_STRUCTURE = 223;
+	extern const int REPLICA_IS_ALREADY_ACTIVE = 224;
+	extern const int NO_ZOOKEEPER = 225;
+	extern const int NO_FILE_IN_DATA_PART = 226;
+	extern const int UNEXPECTED_FILE_IN_DATA_PART = 227;
+	extern const int BAD_SIZE_OF_FILE_IN_DATA_PART = 228;
+	extern const int QUERY_IS_TOO_LARGE = 229;
+	extern const int NOT_FOUND_EXPECTED_DATA_PART = 230;
+	extern const int TOO_MANY_UNEXPECTED_DATA_PARTS = 231;
+	extern const int NO_SUCH_DATA_PART = 232;
+	extern const int BAD_DATA_PART_NAME = 233;
+	extern const int NO_REPLICA_HAS_PART = 234;
+	extern const int DUPLICATE_DATA_PART = 235;
+	extern const int ABORTED = 236;
+	extern const int NO_REPLICA_NAME_GIVEN = 237;
+	extern const int FORMAT_VERSION_TOO_OLD = 238;
+	extern const int CANNOT_MUNMAP = 239;
+	extern const int CANNOT_MREMAP = 240;
+	extern const int MEMORY_LIMIT_EXCEEDED = 241;
+	extern const int TABLE_IS_READ_ONLY = 242;
+	extern const int NOT_ENOUGH_SPACE = 243;
+	extern const int UNEXPECTED_ZOOKEEPER_ERROR = 244;
+	extern const int INVALID_NESTED_NAME = 245;
+	extern const int CORRUPTED_DATA = 246;
+	extern const int INCORRECT_MARK = 247;
+	extern const int INVALID_PARTITION_NAME = 248;
+	extern const int NOT_ENOUGH_BLOCK_NUMBERS = 250;
+	extern const int NO_SUCH_REPLICA = 251;
+	extern const int TOO_MUCH_PARTS = 252;
+	extern const int REPLICA_IS_ALREADY_EXIST = 253;
+	extern const int NO_ACTIVE_REPLICAS = 254;
+	extern const int TOO_MUCH_RETRIES_TO_FETCH_PARTS = 255;
+	extern const int PARTITION_ALREADY_EXISTS = 256;
+	extern const int PARTITION_DOESNT_EXIST = 257;
+	extern const int UNION_ALL_RESULT_STRUCTURES_MISMATCH = 258;
+	extern const int UNION_ALL_COLUMN_ALIAS_MISMATCH = 259;
+	extern const int CLIENT_OUTPUT_FORMAT_SPECIFIED = 260;
+	extern const int UNKNOWN_BLOCK_INFO_FIELD = 261;
+	extern const int BAD_COLLATION = 262;
+	extern const int CANNOT_COMPILE_CODE = 263;
+	extern const int INCOMPATIBLE_TYPE_OF_JOIN = 264;
+	extern const int NO_AVAILABLE_REPLICA = 265;
+	extern const int MISMATCH_REPLICAS_DATA_SOURCES = 266;
+	extern const int STORAGE_DOESNT_SUPPORT_PARALLEL_REPLICAS = 267;
+	extern const int CPUID_ERROR = 268;
+	extern const int INFINITE_LOOP = 269;
+	extern const int CANNOT_COMPRESS = 270;
+	extern const int CANNOT_DECOMPRESS = 271;
+	extern const int AIO_SUBMIT_ERROR = 272;
+	extern const int AIO_COMPLETION_ERROR = 273;
+	extern const int AIO_READ_ERROR = 274;
+	extern const int AIO_WRITE_ERROR = 275;
+	extern const int INDEX_NOT_USED = 277;
+	extern const int LEADERSHIP_LOST = 278;
+	extern const int ALL_CONNECTION_TRIES_FAILED = 279;
+	extern const int NO_AVAILABLE_DATA = 280;
+	extern const int DICTIONARY_IS_EMPTY = 281;
+	extern const int INCORRECT_INDEX = 282;
+	extern const int UNKNOWN_DISTRIBUTED_PRODUCT_MODE = 283;
+	extern const int UNKNOWN_GLOBAL_SUBQUERIES_METHOD = 284;
+	extern const int TOO_LESS_LIVE_REPLICAS = 285;
+	extern const int UNSATISFIED_QUORUM_FOR_PREVIOUS_WRITE = 286;
+	extern const int UNKNOWN_FORMAT_VERSION = 287;
+	extern const int DISTRIBUTED_IN_JOIN_SUBQUERY_DENIED = 288;
+	extern const int REPLICA_IS_NOT_IN_QUORUM = 289;
+	extern const int LIMIT_EXCEEDED = 290;
+	extern const int DATABASE_ACCESS_DENIED = 291;
+	extern const int LEADERSHIP_CHANGED = 292;
+	extern const int MONGODB_INIT_FAILED = 293;
+	extern const int INVALID_BLOCK_EXTRA_INFO = 294;
+	extern const int RECEIVED_EMPTY_DATA = 295;
+	extern const int NO_REMOTE_SHARD_FOUND = 296;
+	extern const int SHARD_HAS_NO_CONNECTIONS = 297;
+	extern const int CANNOT_PIPE = 298;
+	extern const int CANNOT_FORK = 299;
+	extern const int CANNOT_DLSYM = 300;
+	extern const int CANNOT_CREATE_CHILD_PROCESS = 301;
+	extern const int CHILD_WAS_NOT_EXITED_NORMALLY = 302;
+	extern const int CANNOT_SELECT = 303;
+	extern const int CANNOT_WAITPID = 304;
+	extern const int TABLE_WAS_NOT_DROPPED = 305;
+	extern const int TOO_DEEP_RECURSION = 306;
+	extern const int TOO_MUCH_BYTES = 307;
+	extern const int UNEXPECTED_NODE_IN_ZOOKEEPER = 308;
+	extern const int FUNCTION_CANNOT_HAVE_PARAMETERS = 309;
+
+	extern const int KEEPER_EXCEPTION = 999;
+	extern const int POCO_EXCEPTION = 1000;
+	extern const int STD_EXCEPTION = 1001;
+	extern const int UNKNOWN_EXCEPTION = 1002;
+}
+
+}
diff --git a/dbms/src/Core/NamesAndTypes.cpp b/dbms/src/Core/NamesAndTypes.cpp
index b093325410c..69041fd242a 100644
--- a/dbms/src/Core/NamesAndTypes.cpp
+++ b/dbms/src/Core/NamesAndTypes.cpp
@@ -9,6 +9,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int THERE_IS_NO_COLUMN;
+}
+
+
 void NamesAndTypesList::readText(ReadBuffer & buf)
 {
 	const DataTypeFactory & data_type_factory = DataTypeFactory::instance();
diff --git a/dbms/src/DataStreams/BlockInputStreamFromRowInputStream.cpp b/dbms/src/DataStreams/BlockInputStreamFromRowInputStream.cpp
index 9e9d28eb387..18262f121bc 100644
--- a/dbms/src/DataStreams/BlockInputStreamFromRowInputStream.cpp
+++ b/dbms/src/DataStreams/BlockInputStreamFromRowInputStream.cpp
@@ -1,5 +1,4 @@
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/DataStreams/BlockInputStreamFromRowInputStream.h>
 #include <DB/Columns/ColumnArray.h>
@@ -10,6 +9,11 @@ namespace DB
 
 using Poco::SharedPtr;
 
+namespace ErrorCodes
+{
+	extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
+}
+
 
 BlockInputStreamFromRowInputStream::BlockInputStreamFromRowInputStream(
 	RowInputStreamPtr row_input_,
diff --git a/dbms/src/DataStreams/CollapsingSortedBlockInputStream.cpp b/dbms/src/DataStreams/CollapsingSortedBlockInputStream.cpp
index 368996fb65d..fb1f3bb4bb9 100644
--- a/dbms/src/DataStreams/CollapsingSortedBlockInputStream.cpp
+++ b/dbms/src/DataStreams/CollapsingSortedBlockInputStream.cpp
@@ -8,6 +8,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int INCORRECT_DATA;
+}
+
 
 void CollapsingSortedBlockInputStream::reportIncorrectData()
 {
diff --git a/dbms/src/DataStreams/CreatingSetsBlockInputStream.cpp b/dbms/src/DataStreams/CreatingSetsBlockInputStream.cpp
index 1b4acd4dee3..e4e9bee06ac 100644
--- a/dbms/src/DataStreams/CreatingSetsBlockInputStream.cpp
+++ b/dbms/src/DataStreams/CreatingSetsBlockInputStream.cpp
@@ -4,9 +4,16 @@
 #include <DB/DataStreams/CreatingSetsBlockInputStream.h>
 #include <iomanip>
 
+
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int SET_SIZE_LIMIT_EXCEEDED;
+}
+
+
 Block CreatingSetsBlockInputStream::readImpl()
 {
 	Block res;
diff --git a/dbms/src/DataStreams/DistinctBlockInputStream.cpp b/dbms/src/DataStreams/DistinctBlockInputStream.cpp
index 7647f831462..3422fbabf87 100644
--- a/dbms/src/DataStreams/DistinctBlockInputStream.cpp
+++ b/dbms/src/DataStreams/DistinctBlockInputStream.cpp
@@ -4,6 +4,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int SET_SIZE_LIMIT_EXCEEDED;
+}
+
+
 DistinctBlockInputStream::DistinctBlockInputStream(BlockInputStreamPtr input_, const Limits & limits, size_t limit_, Names columns_)
 	: columns_names(columns_),
 	limit(limit_),
diff --git a/dbms/src/DataStreams/ExpressionBlockInputStream.cpp b/dbms/src/DataStreams/ExpressionBlockInputStream.cpp
new file mode 100644
index 00000000000..323e37ae52b
--- /dev/null
+++ b/dbms/src/DataStreams/ExpressionBlockInputStream.cpp
@@ -0,0 +1,45 @@
+#include <DB/Interpreters/ExpressionActions.h>
+#include <DB/DataStreams/ExpressionBlockInputStream.h>
+
+
+namespace DB
+{
+
+ExpressionBlockInputStream::ExpressionBlockInputStream(BlockInputStreamPtr input_, ExpressionActionsPtr expression_)
+	: expression(expression_)
+{
+	children.push_back(input_);
+}
+
+String ExpressionBlockInputStream::getName() const { return "Expression"; }
+
+String ExpressionBlockInputStream::getID() const
+{
+	std::stringstream res;
+	res << "Expression(" << children.back()->getID() << ", " << expression->getID() << ")";
+	return res.str();
+}
+
+const Block & ExpressionBlockInputStream::getTotals()
+{
+	if (IProfilingBlockInputStream * child = dynamic_cast<IProfilingBlockInputStream *>(&*children.back()))
+	{
+		totals = child->getTotals();
+		expression->executeOnTotals(totals);
+	}
+
+	return totals;
+}
+
+Block ExpressionBlockInputStream::readImpl()
+{
+	Block res = children.back()->read();
+	if (!res)
+		return res;
+
+	expression->execute(res);
+
+	return res;
+}
+
+}
diff --git a/dbms/src/DataStreams/FilterBlockInputStream.cpp b/dbms/src/DataStreams/FilterBlockInputStream.cpp
index 2a0283a49b9..524204d8754 100644
--- a/dbms/src/DataStreams/FilterBlockInputStream.cpp
+++ b/dbms/src/DataStreams/FilterBlockInputStream.cpp
@@ -7,6 +7,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER;
+}
+
 
 FilterBlockInputStream::FilterBlockInputStream(BlockInputStreamPtr input_, ssize_t filter_column_)
 	: filter_column(filter_column_)
diff --git a/dbms/src/DataStreams/FormatFactory.cpp b/dbms/src/DataStreams/FormatFactory.cpp
index 76d42cdec75..e2744e2bc6a 100644
--- a/dbms/src/DataStreams/FormatFactory.cpp
+++ b/dbms/src/DataStreams/FormatFactory.cpp
@@ -19,13 +19,20 @@
 #include <DB/DataStreams/JSONCompactRowOutputStream.h>
 #include <DB/DataStreams/TSKVRowOutputStream.h>
 #include <DB/DataStreams/PrettyCompactMonoBlockOutputStream.h>
-#include <DB/DataStreams/ODBCBlockOutputStream.h>
+#include <DB/DataStreams/ODBCDriverBlockOutputStream.h>
 #include <DB/DataStreams/FormatFactory.h>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int FORMAT_IS_NOT_SUITABLE_FOR_INPUT;
+	extern const int UNKNOWN_FORMAT;
+}
+
+
 BlockInputStreamPtr FormatFactory::getInput(const String & name, ReadBuffer & buf,
 	const Block & sample, size_t max_block_size) const
 {
@@ -56,7 +63,7 @@ BlockInputStreamPtr FormatFactory::getInput(const String & name, ReadBuffer & bu
 		|| name == "JSON"
 		|| name == "JSONCompact"
 		|| name == "TSKV"
-		|| name == "ODBC")
+		|| name == "ODBCDriver")
 		throw Exception("Format " + name + " is not suitable for input", ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_INPUT);
 	else
 		throw Exception("Unknown format " + name, ErrorCodes::UNKNOWN_FORMAT);
@@ -106,8 +113,8 @@ BlockOutputStreamPtr FormatFactory::getOutput(const String & name, WriteBuffer &
 		return new BlockOutputStreamFromRowOutputStream(new JSONCompactRowOutputStream(buf, sample));
 	else if (name == "TSKV")
 		return new BlockOutputStreamFromRowOutputStream(new TSKVRowOutputStream(buf, sample));
-	else if (name == "ODBC")
-		return new ODBCBlockOutputStream(buf);
+	else if (name == "ODBCDriver")
+		return new ODBCDriverBlockOutputStream(buf);
 	else if (name == "Null")
 		return new NullBlockOutputStream;
 	else
diff --git a/dbms/src/DataStreams/IBlockInputStream.cpp b/dbms/src/DataStreams/IBlockInputStream.cpp
index 0bdbcb69f04..8592590ace5 100644
--- a/dbms/src/DataStreams/IBlockInputStream.cpp
+++ b/dbms/src/DataStreams/IBlockInputStream.cpp
@@ -7,6 +7,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TOO_DEEP_PIPELINE;
+}
+
 
 String IBlockInputStream::getTreeID() const
 {
diff --git a/dbms/src/DataStreams/IProfilingBlockInputStream.cpp b/dbms/src/DataStreams/IProfilingBlockInputStream.cpp
index 40a3bb74af9..89d5d780734 100644
--- a/dbms/src/DataStreams/IProfilingBlockInputStream.cpp
+++ b/dbms/src/DataStreams/IProfilingBlockInputStream.cpp
@@ -12,6 +12,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TOO_MUCH_ROWS;
+	extern const int TOO_MUCH_BYTES;
+	extern const int TIMEOUT_EXCEEDED;
+	extern const int TOO_SLOW;
+}
+
 
 Block IProfilingBlockInputStream::read()
 {
@@ -173,7 +181,7 @@ bool IProfilingBlockInputStream::checkLimits()
 				+ (limits.mode == LIMITS_CURRENT ? "result bytes (uncompressed)" : "(uncompressed) bytes to read")
 				+ " exceeded: read " + toString(info.bytes)
 				+ " bytes, maximum: " + toString(limits.max_bytes_to_read),
-				ErrorCodes::TOO_MUCH_ROWS);
+				ErrorCodes::TOO_MUCH_BYTES);
 
 		if (limits.read_overflow_mode == OverflowMode::BREAK)
 			return false;
@@ -259,7 +267,7 @@ void IProfilingBlockInputStream::progressImpl(const Progress & value)
 				else
 					throw Exception("Limit for (uncompressed) bytes to read exceeded: " + toString(bytes_processed)
 						+ " bytes read, maximum: " + toString(limits.max_bytes_to_read),
-						ErrorCodes::TOO_MUCH_ROWS);
+						ErrorCodes::TOO_MUCH_BYTES);
 			}
 			else if (limits.read_overflow_mode == OverflowMode::BREAK)
 			{
diff --git a/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp b/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp
index 28c7144324a..a56c7ee3f0b 100644
--- a/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp
+++ b/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp
@@ -7,6 +7,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+	extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
+	extern const int BLOCKS_HAS_DIFFERENT_STRUCTURE;
+}
+
 
 void MergingSortedBlockInputStream::init(Block & merged_block, ColumnPlainPtrs & merged_columns)
 {
diff --git a/dbms/src/DataStreams/NativeBlockInputStream.cpp b/dbms/src/DataStreams/NativeBlockInputStream.cpp
index 0b21d86a541..07e56c24d96 100644
--- a/dbms/src/DataStreams/NativeBlockInputStream.cpp
+++ b/dbms/src/DataStreams/NativeBlockInputStream.cpp
@@ -14,6 +14,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int INCORRECT_INDEX;
+	extern const int LOGICAL_ERROR;
+	extern const int CANNOT_READ_ALL_DATA;
+}
+
 
 NativeBlockInputStream::NativeBlockInputStream(
 	ReadBuffer & istr_, UInt64 server_revision_,
diff --git a/dbms/src/DataStreams/ODBCBlockOutputStream.cpp b/dbms/src/DataStreams/ODBCDriverBlockOutputStream.cpp
similarity index 81%
rename from dbms/src/DataStreams/ODBCBlockOutputStream.cpp
rename to dbms/src/DataStreams/ODBCDriverBlockOutputStream.cpp
index ebbcd28dde2..2075024d19b 100644
--- a/dbms/src/DataStreams/ODBCBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/ODBCDriverBlockOutputStream.cpp
@@ -1,13 +1,13 @@
-#include <DB/DataStreams/ODBCBlockOutputStream.h>
+#include <DB/DataStreams/ODBCDriverBlockOutputStream.h>
 
 namespace DB
 {
 
-ODBCBlockOutputStream::ODBCBlockOutputStream(WriteBuffer & out_)
+ODBCDriverBlockOutputStream::ODBCDriverBlockOutputStream(WriteBuffer & out_)
 	: out(out_) {}
 
 
-void ODBCBlockOutputStream::write(const Block & block)
+void ODBCDriverBlockOutputStream::write(const Block & block)
 {
 	size_t rows = block.rows();
 	size_t columns = block.columns();
diff --git a/dbms/src/DataStreams/PrettyCompactBlockOutputStream.cpp b/dbms/src/DataStreams/PrettyCompactBlockOutputStream.cpp
index 7eae58e2328..ea952c79088 100644
--- a/dbms/src/DataStreams/PrettyCompactBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/PrettyCompactBlockOutputStream.cpp
@@ -1,8 +1,6 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include <DB/Functions/FunctionsMiscellaneous.h>
-
 #include <DB/DataStreams/PrettyCompactBlockOutputStream.h>
 
 
diff --git a/dbms/src/DataStreams/PrettyCompactMonoBlockOutputStream.cpp b/dbms/src/DataStreams/PrettyCompactMonoBlockOutputStream.cpp
index d238dd2633d..c4b660ef4ab 100644
--- a/dbms/src/DataStreams/PrettyCompactMonoBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/PrettyCompactMonoBlockOutputStream.cpp
@@ -1,8 +1,6 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include <DB/Functions/FunctionsMiscellaneous.h>
-
 #include <DB/DataStreams/PrettyCompactMonoBlockOutputStream.h>
 
 
@@ -13,7 +11,7 @@ void PrettyCompactMonoBlockOutputStream::write(const Block & block)
 {
 	if (total_rows < max_rows)
 		blocks.push_back(block);
-	
+
 	total_rows += block.rows();
 }
 
@@ -21,22 +19,22 @@ void PrettyCompactMonoBlockOutputStream::writeSuffix()
 {
 	if (blocks.empty())
 		return;
-	
+
 	Widths_t max_widths;
 	Widths_t name_widths;
-	
+
 	for (size_t i = 0; i < blocks.size(); ++i)
 		calculateWidths(blocks[i], max_widths, name_widths);
 
 	writeHeader(blocks.front(), max_widths, name_widths);
 
 	size_t row_count = 0;
-	
+
 	for (size_t block_id = 0; block_id < blocks.size() && row_count < max_rows; ++block_id)
 	{
 		const Block & block = blocks[block_id];
 		size_t rows = block.rows();
-		
+
 		for (size_t i = 0; i < rows && row_count < max_rows; ++i)
 		{
 			writeRow(i, block, max_widths, name_widths);
diff --git a/dbms/src/DataStreams/PrettySpaceBlockOutputStream.cpp b/dbms/src/DataStreams/PrettySpaceBlockOutputStream.cpp
index 86900d3ff2f..6dca1a8a4e9 100644
--- a/dbms/src/DataStreams/PrettySpaceBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/PrettySpaceBlockOutputStream.cpp
@@ -1,8 +1,6 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include <DB/Functions/FunctionsMiscellaneous.h>
-
 #include <DB/DataStreams/PrettySpaceBlockOutputStream.h>
 
 
diff --git a/dbms/src/DataStreams/RemoteBlockInputStream.cpp b/dbms/src/DataStreams/RemoteBlockInputStream.cpp
index 0ae282c5cca..617ae05aa59 100644
--- a/dbms/src/DataStreams/RemoteBlockInputStream.cpp
+++ b/dbms/src/DataStreams/RemoteBlockInputStream.cpp
@@ -5,6 +5,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNKNOWN_PACKET_FROM_SERVER;
+	extern const int LOGICAL_ERROR;
+}
+
+
 RemoteBlockInputStream::RemoteBlockInputStream(Connection & connection_, const String & query_,
 	const Settings * settings_, ThrottlerPtr throttler_, const Tables & external_tables_,
 	QueryProcessingStage::Enum stage_, const Context & context_)
diff --git a/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp b/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp
index 56e88cf6504..523055999b1 100644
--- a/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp
+++ b/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp
@@ -8,6 +8,24 @@ namespace DB
 {
 
 
+String SummingSortedBlockInputStream::getID() const
+{
+	std::stringstream res;
+	res << "SummingSorted(inputs";
+
+	for (size_t i = 0; i < children.size(); ++i)
+		res << ", " << children[i]->getID();
+
+	res << ", description";
+
+	for (size_t i = 0; i < description.size(); ++i)
+		res << ", " << description[i].getID();
+
+	res << ")";
+	return res.str();
+}
+
+
 void SummingSortedBlockInputStream::insertCurrentRow(ColumnPlainPtrs & merged_columns)
 {
 	for (size_t i = 0; i < num_columns; ++i)
@@ -215,6 +233,26 @@ void SummingSortedBlockInputStream::merge(ColumnPlainPtrs & merged_columns, std:
 }
 
 
+/** Реализует операцию +=.
+ * Возвращает false, если результат получился нулевым.
+ */
+class FieldVisitorSum : public StaticVisitor<bool>
+{
+private:
+	const Field & rhs;
+public:
+	FieldVisitorSum(const Field & rhs_) : rhs(rhs_) {}
+
+	bool operator() (UInt64 	& x) const { x += get<UInt64>(rhs); return x != 0; }
+	bool operator() (Int64 		& x) const { x += get<Int64>(rhs); return x != 0; }
+	bool operator() (Float64 	& x) const { x += get<Float64>(rhs); return x != 0; }
+
+	bool operator() (Null 		& x) const { throw Exception("Cannot sum Nulls", ErrorCodes::LOGICAL_ERROR); }
+	bool operator() (String 	& x) const { throw Exception("Cannot sum Strings", ErrorCodes::LOGICAL_ERROR); }
+	bool operator() (Array 		& x) const { throw Exception("Cannot sum Arrays", ErrorCodes::LOGICAL_ERROR); }
+};
+
+
 template <class TSortCursor>
 bool SummingSortedBlockInputStream::mergeMaps(Row & row, TSortCursor & cursor)
 {
diff --git a/dbms/src/DataStreams/TabSeparatedRowInputStream.cpp b/dbms/src/DataStreams/TabSeparatedRowInputStream.cpp
index e54b72f7d8f..210dd621c86 100644
--- a/dbms/src/DataStreams/TabSeparatedRowInputStream.cpp
+++ b/dbms/src/DataStreams/TabSeparatedRowInputStream.cpp
@@ -8,6 +8,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int INCORRECT_DATA;
+}
+
+
 using Poco::SharedPtr;
 
 TabSeparatedRowInputStream::TabSeparatedRowInputStream(ReadBuffer & istr_, const Block & sample_, bool with_names_, bool with_types_)
diff --git a/dbms/src/DataStreams/TotalsHavingBlockInputStream.cpp b/dbms/src/DataStreams/TotalsHavingBlockInputStream.cpp
index fd52c3aced4..bcb5a1214c6 100644
--- a/dbms/src/DataStreams/TotalsHavingBlockInputStream.cpp
+++ b/dbms/src/DataStreams/TotalsHavingBlockInputStream.cpp
@@ -1,10 +1,40 @@
 #include <DB/DataStreams/TotalsHavingBlockInputStream.h>
+#include <DB/Interpreters/ExpressionActions.h>
+#include <DB/Interpreters/AggregateDescription.h>
 #include <DB/Columns/ColumnAggregateFunction.h>
 #include <DB/Columns/ColumnsNumber.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ILLEGAL_COLUMN;
+	extern const int ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER;
+}
+
+
+TotalsHavingBlockInputStream::TotalsHavingBlockInputStream(
+	BlockInputStreamPtr input_,
+	bool overflow_row_, ExpressionActionsPtr expression_,
+	const std::string & filter_column_, TotalsMode totals_mode_, double auto_include_threshold_)
+	: overflow_row(overflow_row_),
+	expression(expression_), filter_column_name(filter_column_), totals_mode(totals_mode_),
+	auto_include_threshold(auto_include_threshold_)
+{
+	children.push_back(input_);
+}
+
+
+String TotalsHavingBlockInputStream::getID() const
+{
+	std::stringstream res;
+	res << "TotalsHavingBlockInputStream(" << children.back()->getID()
+		<< "," << filter_column_name << ")";
+	return res.str();
+}
+
+
 static void finalize(Block & block)
 {
 	for (size_t i = 0; i < block.columns(); ++i)
diff --git a/dbms/src/DataStreams/tests/expression_stream.cpp b/dbms/src/DataStreams/tests/expression_stream.cpp
index 8fff68303fe..f1d8f774b83 100644
--- a/dbms/src/DataStreams/tests/expression_stream.cpp
+++ b/dbms/src/DataStreams/tests/expression_stream.cpp
@@ -18,7 +18,9 @@
 
 #include <DB/Parsers/ParserSelectQuery.h>
 #include <DB/Parsers/parseQuery.h>
+
 #include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <DB/Interpreters/ExpressionActions.h>
 
 
 using Poco::SharedPtr;
diff --git a/dbms/src/DataStreams/tests/filter_stream.cpp b/dbms/src/DataStreams/tests/filter_stream.cpp
index 4bb2536bad8..3594efd2906 100644
--- a/dbms/src/DataStreams/tests/filter_stream.cpp
+++ b/dbms/src/DataStreams/tests/filter_stream.cpp
@@ -20,7 +20,9 @@
 #include <DB/Parsers/ParserSelectQuery.h>
 #include <DB/Parsers/formatAST.h>
 #include <DB/Parsers/parseQuery.h>
+
 #include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <DB/Interpreters/ExpressionActions.h>
 
 
 using Poco::SharedPtr;
diff --git a/dbms/src/DataStreams/tests/filter_stream_hitlog.cpp b/dbms/src/DataStreams/tests/filter_stream_hitlog.cpp
index 1cf67c3cc03..82f057d290e 100644
--- a/dbms/src/DataStreams/tests/filter_stream_hitlog.cpp
+++ b/dbms/src/DataStreams/tests/filter_stream_hitlog.cpp
@@ -24,7 +24,9 @@
 #include <DB/Parsers/ParserSelectQuery.h>
 #include <DB/Parsers/formatAST.h>
 #include <DB/Parsers/parseQuery.h>
+
 #include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <DB/Interpreters/ExpressionActions.h>
 
 
 using Poco::SharedPtr;
diff --git a/dbms/src/DataStreams/tests/fork_streams.cpp b/dbms/src/DataStreams/tests/fork_streams.cpp
index fe7ce5d23de..40becf2a214 100644
--- a/dbms/src/DataStreams/tests/fork_streams.cpp
+++ b/dbms/src/DataStreams/tests/fork_streams.cpp
@@ -22,7 +22,9 @@
 #include <DB/Parsers/ParserSelectQuery.h>
 #include <DB/Parsers/parseQuery.h>
 #include <DB/Parsers/formatAST.h>
+
 #include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <DB/Interpreters/ExpressionActions.h>
 
 
 using Poco::SharedPtr;
diff --git a/dbms/src/DataTypes/DataTypeArray.cpp b/dbms/src/DataTypes/DataTypeArray.cpp
index fc7fee20fe4..2fe2d2e289b 100644
--- a/dbms/src/DataTypes/DataTypeArray.cpp
+++ b/dbms/src/DataTypes/DataTypeArray.cpp
@@ -11,6 +11,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_READ_ARRAY_FROM_TEXT;
+}
+
 
 DataTypeArray::DataTypeArray(DataTypePtr nested_) : nested(nested_)
 {
diff --git a/dbms/src/DataTypes/DataTypeFactory.cpp b/dbms/src/DataTypes/DataTypeFactory.cpp
index 7cdf357e323..64bd4123819 100644
--- a/dbms/src/DataTypes/DataTypeFactory.cpp
+++ b/dbms/src/DataTypes/DataTypeFactory.cpp
@@ -26,6 +26,15 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ARGUMENT_OUT_OF_BOUND;
+	extern const int UNKNOWN_TYPE;
+	extern const int NESTED_TYPE_TOO_DEEP;
+	extern const int PARAMETERS_TO_AGGREGATE_FUNCTIONS_MUST_BE_LITERALS;
+}
+
+
 DataTypeFactory::DataTypeFactory()
 	: non_parametric_data_types
 	{
diff --git a/dbms/src/DataTypes/DataTypeFixedString.cpp b/dbms/src/DataTypes/DataTypeFixedString.cpp
index ff24ba020b2..63ec292c10d 100644
--- a/dbms/src/DataTypes/DataTypeFixedString.cpp
+++ b/dbms/src/DataTypes/DataTypeFixedString.cpp
@@ -19,6 +19,11 @@ namespace DB
 
 using Poco::SharedPtr;
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_READ_ALL_DATA;
+}
+
 
 std::string DataTypeFixedString::getName() const
 {
diff --git a/dbms/src/DataTypes/DataTypeNested.cpp b/dbms/src/DataTypes/DataTypeNested.cpp
index cf2f70e1064..c973af83447 100644
--- a/dbms/src/DataTypes/DataTypeNested.cpp
+++ b/dbms/src/DataTypes/DataTypeNested.cpp
@@ -9,6 +9,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int INVALID_NESTED_NAME;
+}
+
 
 DataTypeNested::DataTypeNested(NamesAndTypesListPtr nested_)
 	: nested(nested_)
diff --git a/dbms/src/DataTypes/DataTypeString.cpp b/dbms/src/DataTypes/DataTypeString.cpp
index 57b718b3ed8..0f4b4c95a35 100644
--- a/dbms/src/DataTypes/DataTypeString.cpp
+++ b/dbms/src/DataTypes/DataTypeString.cpp
@@ -12,7 +12,9 @@
 #include <DB/IO/WriteHelpers.h>
 #include <DB/IO/VarInt.h>
 
-#include <emmintrin.h>
+#if defined(__x86_64__)
+	#include <emmintrin.h>
+#endif
 
 
 namespace DB
@@ -91,6 +93,7 @@ static NO_INLINE void deserializeBinarySSE2(ColumnString::Chars_t & data, Column
 
 		if (size)
 		{
+#if defined(__x86_64__)
 			/// Оптимистичная ветка, в которой возможно более эффективное копирование.
 			if (offset + 16 * UNROLL_TIMES <= data.capacity() && istr.position() + size + 16 * UNROLL_TIMES <= istr.buffer().end())
 			{
@@ -121,6 +124,7 @@ static NO_INLINE void deserializeBinarySSE2(ColumnString::Chars_t & data, Column
 				istr.position() += size;
 			}
 			else
+#endif
 			{
 				istr.readStrict(reinterpret_cast<char*>(&data[offset - size - 1]), size);
 			}
diff --git a/dbms/src/DataTypes/FieldToDataType.cpp b/dbms/src/DataTypes/FieldToDataType.cpp
index 03934c22a76..441052517c1 100644
--- a/dbms/src/DataTypes/FieldToDataType.cpp
+++ b/dbms/src/DataTypes/FieldToDataType.cpp
@@ -6,6 +6,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int EMPTY_DATA_PASSED;
+	extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+	extern const int NOT_IMPLEMENTED;
+}
+
 
 template <typename T>
 static void convertArrayToCommonType(Array & arr)
diff --git a/dbms/src/Functions/FunctionFactory.cpp b/dbms/src/Functions/FunctionFactory.cpp
index 3adfb4605d2..ca98d5d7d1b 100644
--- a/dbms/src/Functions/FunctionFactory.cpp
+++ b/dbms/src/Functions/FunctionFactory.cpp
@@ -4,6 +4,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNKNOWN_FUNCTION;
+}
+
+
 /** Эти функции определены в отдельных translation unit-ах.
   * Это сделано для того, чтобы уменьшить потребление оперативки при сборке, и ускорить параллельную сборку.
   */
diff --git a/dbms/src/IO/ReadBufferAIO.cpp b/dbms/src/IO/ReadBufferAIO.cpp
index 10de3a7117f..eb3279578a4 100644
--- a/dbms/src/IO/ReadBufferAIO.cpp
+++ b/dbms/src/IO/ReadBufferAIO.cpp
@@ -1,7 +1,6 @@
 #include <DB/IO/ReadBufferAIO.h>
 #include <DB/Common/ProfileEvents.h>
 #include <DB/Common/Stopwatch.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Core/Defines.h>
 
 #include <sys/types.h>
@@ -13,6 +12,16 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int FILE_DOESNT_EXIST;
+	extern const int CANNOT_OPEN_FILE;
+	extern const int LOGICAL_ERROR;
+	extern const int ARGUMENT_OUT_OF_BOUND;
+	extern const int AIO_READ_ERROR;
+}
+
+
 /// Примечание: выделяется дополнительная страница, которая содежрит те данные, которые
 /// не влезают в основной буфер.
 ReadBufferAIO::ReadBufferAIO(const std::string & filename_, size_t buffer_size_, int flags_, char * existing_memory_)
diff --git a/dbms/src/IO/ReadBufferFromPocoSocket.cpp b/dbms/src/IO/ReadBufferFromPocoSocket.cpp
index 580747ff4a8..d35bf3c9462 100644
--- a/dbms/src/IO/ReadBufferFromPocoSocket.cpp
+++ b/dbms/src/IO/ReadBufferFromPocoSocket.cpp
@@ -1,7 +1,6 @@
 #include <Poco/Net/NetException.h>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/IO/ReadBufferFromPocoSocket.h>
 #include <DB/Common/NetException.h>
@@ -10,6 +9,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NETWORK_ERROR;
+	extern const int SOCKET_TIMEOUT;
+	extern const int CANNOT_READ_FROM_SOCKET;
+}
+
+
 bool ReadBufferFromPocoSocket::nextImpl()
 {
 	ssize_t bytes_read = 0;
diff --git a/dbms/src/IO/ReadHelpers.cpp b/dbms/src/IO/ReadHelpers.cpp
index 8215a8b35b5..2164f2be3de 100644
--- a/dbms/src/IO/ReadHelpers.cpp
+++ b/dbms/src/IO/ReadHelpers.cpp
@@ -1,4 +1,6 @@
-#include <emmintrin.h>
+#if defined(__x86_64__)
+	#include <emmintrin.h>
+#endif
 
 #include <sstream>
 
@@ -11,6 +13,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_PARSE_INPUT_ASSERTION_FAILED;
+	extern const int CANNOT_PARSE_ESCAPE_SEQUENCE;
+	extern const int CANNOT_PARSE_QUOTED_STRING;
+}
+
 
 static void __attribute__((__noinline__)) throwAtAssertionFailed(const char * s, ReadBuffer & buf)
 {
@@ -105,6 +114,7 @@ void readStringUntilEOF(String & s, ReadBuffer & buf)
   */
 static inline const char * find_first_tab_lf_or_backslash(const char * begin, const char * end)
 {
+#if defined(__x86_64__)
 	static const char tab_chars[16] = {'\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t'};
 	static const char lf_chars[16]	= {'\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n'};
 	static const char bs_chars[16] 	= {'\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\'};
@@ -133,6 +143,7 @@ static inline const char * find_first_tab_lf_or_backslash(const char * begin, co
 		if (bit_mask)
 			return begin + __builtin_ctz(bit_mask);
 	}
+#endif
 
 	for (; begin < end; ++begin)
 		if (*begin == '\t' || *begin == '\n' || *begin == '\\')
@@ -195,6 +206,7 @@ void readEscapedString(DB::String & s, DB::ReadBuffer & buf)
 template <char quote>
 static inline const char * find_first_quote_or_backslash(const char * begin, const char * end)
 {
+#if defined(__x86_64__)
 	static const char quote_chars[16] 	= {quote, quote, quote, quote, quote, quote, quote, quote, quote, quote, quote, quote, quote, quote, quote, quote};
 	static const char bs_chars[16] 		= {'\\',  '\\',  '\\',  '\\',  '\\',  '\\',  '\\',  '\\',  '\\',  '\\',  '\\',  '\\',  '\\',  '\\',  '\\',  '\\' };
 
@@ -219,6 +231,7 @@ static inline const char * find_first_quote_or_backslash(const char * begin, con
 		if (bit_mask)
 			return begin + __builtin_ctz(bit_mask);
 	}
+#endif
 
 	for (; begin < end; ++begin)
 		if (*begin == quote || *begin == '\\')
diff --git a/dbms/src/IO/WriteBufferAIO.cpp b/dbms/src/IO/WriteBufferAIO.cpp
index 392eec2ada0..b641b986da4 100644
--- a/dbms/src/IO/WriteBufferAIO.cpp
+++ b/dbms/src/IO/WriteBufferAIO.cpp
@@ -1,6 +1,5 @@
 #include <DB/IO/WriteBufferAIO.h>
 #include <DB/Common/ProfileEvents.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <limits>
 #include <sys/types.h>
@@ -9,6 +8,21 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int FILE_DOESNT_EXIST;
+	extern const int CANNOT_OPEN_FILE;
+	extern const int LOGICAL_ERROR;
+	extern const int ARGUMENT_OUT_OF_BOUND;
+	extern const int AIO_READ_ERROR;
+	extern const int AIO_SUBMIT_ERROR;
+	extern const int AIO_WRITE_ERROR;
+	extern const int AIO_COMPLETION_ERROR;
+	extern const int CANNOT_TRUNCATE_FILE;
+	extern const int CANNOT_FSYNC;
+}
+
+
 /// Примечание: выделяется дополнительная страница, которая содежрит те данные, которые
 /// не влезают в основной буфер.
 WriteBufferAIO::WriteBufferAIO(const std::string & filename_, size_t buffer_size_, int flags_, mode_t mode_,
diff --git a/dbms/src/IO/WriteBufferFromPocoSocket.cpp b/dbms/src/IO/WriteBufferFromPocoSocket.cpp
index 4725d0661a1..bdcf954c70e 100644
--- a/dbms/src/IO/WriteBufferFromPocoSocket.cpp
+++ b/dbms/src/IO/WriteBufferFromPocoSocket.cpp
@@ -1,7 +1,6 @@
 #include <Poco/Net/NetException.h>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/IO/WriteBufferFromPocoSocket.h>
 #include <DB/Common/NetException.h>
@@ -10,6 +9,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NETWORK_ERROR;
+	extern const int SOCKET_TIMEOUT;
+	extern const int CANNOT_WRITE_TO_SOCKET;
+}
+
+
 void WriteBufferFromPocoSocket::nextImpl()
 {
 	if (!offset())
diff --git a/dbms/src/IO/tests/mempbrk.cpp b/dbms/src/IO/tests/mempbrk.cpp
index eacca96ed4e..f9c356e2d02 100644
--- a/dbms/src/IO/tests/mempbrk.cpp
+++ b/dbms/src/IO/tests/mempbrk.cpp
@@ -1,4 +1,6 @@
-#include <emmintrin.h>
+#if defined(__x86_64__)
+	#include <emmintrin.h>
+#endif
 
 #include <string>
 #include <iostream>
@@ -12,6 +14,14 @@
 #include <DB/IO/ReadBufferFromFileDescriptor.h>
 #include <DB/IO/WriteBufferFromFileDescriptor.h>
 
+namespace DB
+{
+namespace ErrorCodes
+{
+	extern const int CANNOT_PARSE_ESCAPE_SEQUENCE;
+}
+}
+
 
 namespace test
 {
@@ -27,6 +37,7 @@ namespace test
 	  */
 	static inline const char * find_first_tab_lf_or_backslash(const char * begin, const char * end)
 	{
+#if defined(__x86_64__)
 		static const char tab_chars[16] = {'\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t', '\t'};
 		static const char lf_chars[16]	= {'\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n'};
 		static const char bs_chars[16] 	= {'\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\'};
@@ -55,7 +66,7 @@ namespace test
 			if (bit_mask)
 				return begin + __builtin_ctz(bit_mask);
 		}
-
+#endif
 		for (; begin < end; ++begin)
 			if (*begin == '\t' || *begin == '\n' || *begin == '\\')
 				return begin;
@@ -108,7 +119,7 @@ int main(int argc, char ** argv)
 		{
 			test::readEscapedString(s, in);
 			in.ignore();
-			
+
 			++rows;
 
 /*			DB::writeEscapedString(s, out);
diff --git a/dbms/src/IO/tests/parse_int_perf2.cpp b/dbms/src/IO/tests/parse_int_perf2.cpp
index 3b17b400e34..4b7db4e7fee 100644
--- a/dbms/src/IO/tests/parse_int_perf2.cpp
+++ b/dbms/src/IO/tests/parse_int_perf2.cpp
@@ -1,4 +1,6 @@
-#include <emmintrin.h>
+#if defined(__x86_64__)
+	#include <emmintrin.h>
+#endif
 
 #include <iostream>
 #include <iomanip>
@@ -9,6 +11,7 @@
 #include <DB/Common/Stopwatch.h>
 
 
+#if defined(__x86_64__)
 std::ostream & operator<< (std::ostream & ostr, const __m128i vec)
 {
 	char digits[16];
@@ -21,6 +24,7 @@ std::ostream & operator<< (std::ostream & ostr, const __m128i vec)
 	
 	return ostr;
 }
+#endif
 
 
 namespace test
diff --git a/dbms/src/Interpreters/Aggregator.cpp b/dbms/src/Interpreters/Aggregator.cpp
index 6c15eb0f6db..6c8af429a9b 100644
--- a/dbms/src/Interpreters/Aggregator.cpp
+++ b/dbms/src/Interpreters/Aggregator.cpp
@@ -24,6 +24,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_COMPILE_CODE;
+	extern const int TOO_MUCH_ROWS;
+	extern const int EMPTY_DATA_PASSED;
+	extern const int CANNOT_MERGE_DIFFERENT_AGGREGATED_DATA_VARIANTS;
+}
+
 
 AggregatedDataVariants::~AggregatedDataVariants()
 {
diff --git a/dbms/src/Interpreters/Cluster.cpp b/dbms/src/Interpreters/Cluster.cpp
index a4704059a28..f265c9a5642 100644
--- a/dbms/src/Interpreters/Cluster.cpp
+++ b/dbms/src/Interpreters/Cluster.cpp
@@ -8,6 +8,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNKNOWN_ELEMENT_IN_CONFIG;
+	extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
+	extern const int LOGICAL_ERROR;
+	extern const int SHARD_HAS_NO_CONNECTIONS;
+}
+
 namespace
 {
 
diff --git a/dbms/src/Interpreters/Compiler.cpp b/dbms/src/Interpreters/Compiler.cpp
index a6f0c69fb77..8f9ce629c8c 100644
--- a/dbms/src/Interpreters/Compiler.cpp
+++ b/dbms/src/Interpreters/Compiler.cpp
@@ -192,8 +192,6 @@ void Compiler::compile(
 		" -I /usr/share/clickhouse/headers/contrib/libcpuid/include/"
 		" -I /usr/share/clickhouse/headers/libs/libcommon/include/"
 		" -I /usr/share/clickhouse/headers/libs/libmysqlxx/include/"
-		" -I /usr/share/clickhouse/headers/libs/libstatdaemons/include/"
-		" -I /usr/share/clickhouse/headers/libs/libstats/include/"
 		" " << additional_compiler_flags <<
 		" -o " << so_file_path << " " << cpp_file_path
 		<< " 2>&1 || echo Exit code: $?";
diff --git a/dbms/src/Interpreters/Context.cpp b/dbms/src/Interpreters/Context.cpp
index d2b6aaed7cf..38132a74a3f 100644
--- a/dbms/src/Interpreters/Context.cpp
+++ b/dbms/src/Interpreters/Context.cpp
@@ -48,6 +48,17 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int DATABASE_ACCESS_DENIED;
+	extern const int UNKNOWN_DATABASE;
+	extern const int UNKNOWN_TABLE;
+	extern const int TABLE_ALREADY_EXISTS;
+	extern const int DATABASE_ALREADY_EXISTS;
+	extern const int TABLE_METADATA_DOESNT_EXIST;
+	extern const int THERE_IS_NO_SESSION;
+	extern const int NO_ELEMENTS_IN_CONFIG;
+}
 
 class TableFunctionFactory;
 
@@ -61,8 +72,12 @@ struct ContextShared
 {
 	Logger * log = &Logger::get("Context");					/// Логгер.
 
-	mutable Poco::Mutex mutex;								/// Для доступа и модификации разделяемых объектов.
-	mutable Poco::Mutex external_dictionaries_mutex;		/// Для доступа к внешним словарям. Отдельный мьютекс, чтобы избежать локов при обращении сервера к самому себе.
+	/// Для доступа и модификации разделяемых объектов. Рекурсивный mutex.
+	mutable Poco::Mutex mutex;
+	/// Для доступа к внешним словарям. Отдельный мьютекс, чтобы избежать локов при обращении сервера к самому себе.
+	mutable std::mutex external_dictionaries_mutex;
+	/// Отдельный mutex для переинициализации zookeeper-а. Эта операция может заблокироваться на существенное время и не должна мешать остальным.
+	mutable std::mutex zookeeper_mutex;
 
 	mutable zkutil::ZooKeeperPtr zookeeper;					/// Клиент для ZooKeeper.
 
@@ -715,7 +730,7 @@ const Dictionaries & Context::getDictionariesImpl(const bool throw_on_error) con
 
 const ExternalDictionaries & Context::getExternalDictionariesImpl(const bool throw_on_error) const
 {
-	Poco::ScopedLock<Poco::Mutex> lock(shared->external_dictionaries_mutex);
+	std::lock_guard<std::mutex> lock(shared->external_dictionaries_mutex);
 
 	if (!shared->external_dictionaries)
 	{
@@ -818,7 +833,7 @@ void Context::resetCaches() const
 
 void Context::setZooKeeper(zkutil::ZooKeeperPtr zookeeper)
 {
-	Poco::ScopedLock<Poco::Mutex> lock(shared->mutex);
+	std::lock_guard<std::mutex> lock(shared->zookeeper_mutex);
 
 	if (shared->zookeeper)
 		throw Exception("ZooKeeper client has already been set.", ErrorCodes::LOGICAL_ERROR);
@@ -828,7 +843,7 @@ void Context::setZooKeeper(zkutil::ZooKeeperPtr zookeeper)
 
 zkutil::ZooKeeperPtr Context::getZooKeeper() const
 {
-	Poco::ScopedLock<Poco::Mutex> lock(shared->mutex);
+	std::lock_guard<std::mutex> lock(shared->zookeeper_mutex);
 
 	if (shared->zookeeper && shared->zookeeper->expired())
 		shared->zookeeper = shared->zookeeper->startNewSession();
diff --git a/dbms/src/Interpreters/DictionaryFactory.cpp b/dbms/src/Interpreters/DictionaryFactory.cpp
index 697878d2407..9e527ea42a1 100644
--- a/dbms/src/Interpreters/DictionaryFactory.cpp
+++ b/dbms/src/Interpreters/DictionaryFactory.cpp
@@ -13,6 +13,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
+	extern const int UNKNOWN_ELEMENT_IN_CONFIG;
+	extern const int UNSUPPORTED_METHOD;
+	extern const int TOO_SMALL_BUFFER_SIZE;
+}
+
 
 DictionaryPtr DictionaryFactory::create(const std::string & name, Poco::Util::AbstractConfiguration & config,
 	const std::string & config_prefix, Context & context) const
diff --git a/dbms/src/Interpreters/ExpressionActions.cpp b/dbms/src/Interpreters/ExpressionActions.cpp
index df4d8e94380..22d77c5fff7 100644
--- a/dbms/src/Interpreters/ExpressionActions.cpp
+++ b/dbms/src/Interpreters/ExpressionActions.cpp
@@ -11,6 +11,17 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int DUPLICATE_COLUMN;
+	extern const int UNKNOWN_IDENTIFIER;
+	extern const int UNKNOWN_ACTION;
+	extern const int NOT_FOUND_COLUMN_IN_BLOCK;
+	extern const int SIZES_OF_ARRAYS_DOESNT_MATCH;
+	extern const int TOO_MUCH_TEMPORARY_COLUMNS;
+	extern const int TOO_MUCH_TEMPORARY_NON_CONST_COLUMNS;
+}
+
 
 Names ExpressionAction::getNeededColumns() const
 {
@@ -1002,7 +1013,7 @@ void ExpressionActionsChain::addStep()
 		throw Exception("Cannot add action to empty ExpressionActionsChain", ErrorCodes::LOGICAL_ERROR);
 
 	ColumnsWithTypeAndName columns = steps.back().actions->getSampleBlock().getColumns();
-	steps.push_back(Step(new ExpressionActions(columns, settings)));
+	steps.push_back(Step(std::make_shared<ExpressionActions>(columns, settings)));
 }
 
 void ExpressionActionsChain::finalize()
diff --git a/dbms/src/Interpreters/ExpressionAnalyzer.cpp b/dbms/src/Interpreters/ExpressionAnalyzer.cpp
index 7e961cb99cb..8ef56d6c354 100644
--- a/dbms/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/dbms/src/Interpreters/ExpressionAnalyzer.cpp
@@ -22,6 +22,7 @@
 
 #include <DB/Interpreters/InterpreterSelectQuery.h>
 #include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <DB/Interpreters/ExpressionActions.h>
 #include <DB/Interpreters/InJoinSubqueriesPreprocessor.h>
 #include <DB/Interpreters/LogicalExpressionsOptimizer.h>
 #include <DB/Interpreters/ExternalDictionaries.h>
@@ -51,6 +52,24 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int MULTIPLE_EXPRESSIONS_FOR_ALIAS;
+	extern const int UNKNOWN_IDENTIFIER;
+	extern const int CYCLIC_ALIASES;
+	extern const int INCORRECT_RESULT_OF_SCALAR_SUBQUERY;
+	extern const int TOO_MUCH_ROWS;
+	extern const int NOT_FOUND_COLUMN_IN_BLOCK;
+	extern const int INCORRECT_ELEMENT_OF_SET;
+	extern const int ALIAS_REQUIRED;
+	extern const int EMPTY_NESTED_TABLE;
+	extern const int NOT_AN_AGGREGATE;
+	extern const int UNEXPECTED_EXPRESSION;
+	extern const int PARAMETERS_TO_AGGREGATE_FUNCTIONS_MUST_BE_LITERALS;
+	extern const int DUPLICATE_COLUMN;
+	extern const int FUNCTION_CANNOT_HAVE_PARAMETERS;
+}
+
 
 /** Calls to these functions in the GROUP BY statement would be
   * replaced by their immediate argument.
@@ -169,7 +188,7 @@ void ExpressionAnalyzer::analyzeAggregation()
 	if (select_query && (select_query->group_expression_list || select_query->having_expression))
 		has_aggregation = true;
 
-	ExpressionActionsPtr temp_actions = new ExpressionActions(columns, settings);
+	ExpressionActionsPtr temp_actions = std::make_shared<ExpressionActions>(columns, settings);
 
 	if (select_query && select_query->array_join_expression_list)
 	{
@@ -658,6 +677,10 @@ void ExpressionAnalyzer::normalizeTreeImpl(
 		{
 			node->kind = ASTFunction::FUNCTION;
 		}
+
+		if (node->parameters && node->kind != ASTFunction::AGGREGATE_FUNCTION)
+			throw Exception("The only parametric functions (functions with two separate parenthesis pairs) are aggregate functions"
+				", and '" + node->name + "' is not an aggregate function.", ErrorCodes::FUNCTION_CANNOT_HAVE_PARAMETERS);
 	}
 
 	current_asts.erase(initial_ast);
@@ -1347,7 +1370,7 @@ struct ExpressionAnalyzer::ScopeStack
 				all_columns.push_back(col);
 		}
 
-		stack.back().actions = new ExpressionActions(all_columns, settings);
+		stack.back().actions = std::make_shared<ExpressionActions>(all_columns, settings);
 	}
 
 	size_t getColumnLevel(const std::string & name)
@@ -1838,7 +1861,7 @@ void ExpressionAnalyzer::initChain(ExpressionActionsChain & chain, const NamesAn
 	if (chain.steps.empty())
 	{
 		chain.settings = settings;
-		chain.steps.emplace_back(new ExpressionActions(columns, settings));
+		chain.steps.emplace_back(std::make_shared<ExpressionActions>(columns, settings));
 	}
 }
 
@@ -2098,7 +2121,7 @@ Block ExpressionAnalyzer::getSelectSampleBlock()
 {
 	assertSelect();
 
-	ExpressionActionsPtr temp_actions = new ExpressionActions(aggregated_columns, settings);
+	ExpressionActionsPtr temp_actions = std::make_shared<ExpressionActions>(aggregated_columns, settings);
 	NamesWithAliases result_columns;
 
 	ASTs asts = select_query->select_expression_list->children;
@@ -2128,7 +2151,7 @@ void ExpressionAnalyzer::getActionsBeforeAggregation(ASTPtr ast, ExpressionActio
 
 ExpressionActionsPtr ExpressionAnalyzer::getActions(bool project_result)
 {
-	ExpressionActionsPtr actions = new ExpressionActions(columns, settings);
+	ExpressionActionsPtr actions = std::make_shared<ExpressionActions>(columns, settings);
 	NamesWithAliases result_columns;
 	Names result_names;
 
@@ -2171,7 +2194,7 @@ ExpressionActionsPtr ExpressionAnalyzer::getActions(bool project_result)
 
 ExpressionActionsPtr ExpressionAnalyzer::getConstActions()
 {
-	ExpressionActionsPtr actions = new ExpressionActions(NamesAndTypesList(), settings);
+	ExpressionActionsPtr actions = std::make_shared<ExpressionActions>(NamesAndTypesList(), settings);
 
 	getRootActions(ast, true, true, actions);
 
diff --git a/dbms/src/Interpreters/ExternalDictionaries.cpp b/dbms/src/Interpreters/ExternalDictionaries.cpp
index 79813706f65..cff3122c215 100644
--- a/dbms/src/Interpreters/ExternalDictionaries.cpp
+++ b/dbms/src/Interpreters/ExternalDictionaries.cpp
@@ -18,6 +18,13 @@ namespace
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+	extern const int BAD_ARGUMENTS;
+}
+
+
 namespace
 {
 	std::set<std::string> getDictionariesConfigPaths(const Poco::Util::AbstractConfiguration & config)
diff --git a/dbms/src/Interpreters/InterpreterAlterQuery.cpp b/dbms/src/Interpreters/InterpreterAlterQuery.cpp
index 1f8cbcfcc36..24a612ddc62 100644
--- a/dbms/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterAlterQuery.cpp
@@ -20,7 +20,14 @@
 #include <algorithm>
 
 
-using namespace DB;
+namespace DB
+{
+
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+}
+
 
 InterpreterAlterQuery::InterpreterAlterQuery(ASTPtr query_ptr_, Context & context_)
 	: query_ptr(query_ptr_), context(context_)
@@ -204,3 +211,5 @@ void InterpreterAlterQuery::updateMetadata(
 
 	Poco::File(metadata_temp_path).renameTo(metadata_path);
 }
+
+}
diff --git a/dbms/src/Interpreters/InterpreterCheckQuery.cpp b/dbms/src/Interpreters/InterpreterCheckQuery.cpp
index 3fc39a76dbb..dd07d2cec43 100644
--- a/dbms/src/Interpreters/InterpreterCheckQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterCheckQuery.cpp
@@ -15,6 +15,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int INVALID_BLOCK_EXTRA_INFO;
+	extern const int RECEIVED_EMPTY_DATA;
+}
+
+
 namespace
 {
 
diff --git a/dbms/src/Interpreters/InterpreterCreateQuery.cpp b/dbms/src/Interpreters/InterpreterCreateQuery.cpp
index f1574ac5fee..5c95cc2d6c8 100644
--- a/dbms/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterCreateQuery.cpp
@@ -37,6 +37,17 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int DIRECTORY_DOESNT_EXIST;
+	extern const int DIRECTORY_ALREADY_EXISTS;
+	extern const int TABLE_ALREADY_EXISTS;
+	extern const int EMPTY_LIST_OF_COLUMNS_PASSED;
+	extern const int INCORRECT_QUERY;
+	extern const int ENGINE_REQUIRED;
+	extern const int TABLE_METADATA_ALREADY_EXISTS;
+}
+
 
 InterpreterCreateQuery::InterpreterCreateQuery(ASTPtr query_ptr_, Context & context_)
 	: query_ptr(query_ptr_), context(context_)
diff --git a/dbms/src/Interpreters/InterpreterDropQuery.cpp b/dbms/src/Interpreters/InterpreterDropQuery.cpp
index 39ddf16a3c3..bdf34229cda 100644
--- a/dbms/src/Interpreters/InterpreterDropQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterDropQuery.cpp
@@ -9,6 +9,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TABLE_WAS_NOT_DROPPED;
+	extern const int DATABASE_NOT_EMPTY;
+}
+
 
 InterpreterDropQuery::InterpreterDropQuery(ASTPtr query_ptr_, Context & context_)
 	: query_ptr(query_ptr_), context(context_)
diff --git a/dbms/src/Interpreters/InterpreterFactory.cpp b/dbms/src/Interpreters/InterpreterFactory.cpp
index 2674e09d743..1dce83fb217 100644
--- a/dbms/src/Interpreters/InterpreterFactory.cpp
+++ b/dbms/src/Interpreters/InterpreterFactory.cpp
@@ -32,6 +32,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int READONLY;
+	extern const int UNKNOWN_TYPE_OF_QUERY;
+}
+
 
 static void throwIfReadOnly(Context & context)
 {
diff --git a/dbms/src/Interpreters/InterpreterInsertQuery.cpp b/dbms/src/Interpreters/InterpreterInsertQuery.cpp
index 06bc5709614..b5ad2a72a55 100644
--- a/dbms/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterInsertQuery.cpp
@@ -18,6 +18,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NO_SUCH_COLUMN_IN_TABLE;
+}
+
 
 InterpreterInsertQuery::InterpreterInsertQuery(ASTPtr query_ptr_, Context & context_)
 	: query_ptr(query_ptr_), context(context_)
diff --git a/dbms/src/Interpreters/InterpreterSelectQuery.cpp b/dbms/src/Interpreters/InterpreterSelectQuery.cpp
index 5335dd4706d..c2e1d9bfa0d 100644
--- a/dbms/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterSelectQuery.cpp
@@ -37,6 +37,18 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TOO_DEEP_SUBQUERIES;
+	extern const int THERE_IS_NO_COLUMN;
+	extern const int UNION_ALL_RESULT_STRUCTURES_MISMATCH;
+	extern const int SAMPLING_NOT_SUPPORTED;
+	extern const int ILLEGAL_FINAL;
+	extern const int ILLEGAL_PREWHERE;
+	extern const int TOO_MUCH_COLUMNS;
+}
+
+
 InterpreterSelectQuery::~InterpreterSelectQuery() = default;
 
 
@@ -960,11 +972,8 @@ void InterpreterSelectQuery::executeTotalsAndHaving(bool has_having, ExpressionA
 {
 	executeUnion();
 
-	Names key_names;
-	AggregateDescriptions aggregates;
-	query_analyzer->getAggregateInfo(key_names, aggregates);
 	streams[0] = new TotalsHavingBlockInputStream(
-		streams[0], key_names, aggregates, overflow_row, expression,
+		streams[0], overflow_row, expression,
 		has_having ? query.having_expression->getColumnName() : "", settings.totals_mode, settings.totals_auto_threshold);
 }
 
diff --git a/dbms/src/Interpreters/Join.cpp b/dbms/src/Interpreters/Join.cpp
index ced3adac399..dd914bc4e87 100644
--- a/dbms/src/Interpreters/Join.cpp
+++ b/dbms/src/Interpreters/Join.cpp
@@ -6,13 +6,19 @@
 #include <DB/DataStreams/IProfilingBlockInputStream.h>
 #include <DB/Core/ColumnNumbers.h>
 
-/*#include <DB/DataStreams/TabSeparatedBlockOutputStream.h>
- *#include <DB/IO/WriteBufferFromFileDescriptor.h>*/
-
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNKNOWN_SET_DATA_VARIANT;
+	extern const int LOGICAL_ERROR;
+	extern const int SET_SIZE_LIMIT_EXCEEDED;
+	extern const int TYPE_MISMATCH;
+	extern const int ILLEGAL_COLUMN;
+}
+
 
 Join::Type Join::chooseMethod(const ConstColumnPlainPtrs & key_columns, bool & keys_fit_128_bits, Sizes & key_sizes)
 {
@@ -67,7 +73,7 @@ static void initImpl(Maps & maps, Join::Type type)
 		case Join::Type::CROSS:																	break;
 
 		default:
-			throw Exception("Unknown JOIN keys variant.", ErrorCodes::UNKNOWN_AGGREGATED_DATA_VARIANT);
+			throw Exception("Unknown JOIN keys variant.", ErrorCodes::UNKNOWN_SET_DATA_VARIANT);
 	}
 }
 
diff --git a/dbms/src/Interpreters/LogicalExpressionsOptimizer.cpp b/dbms/src/Interpreters/LogicalExpressionsOptimizer.cpp
index e67c70638ef..a4e475d1e0d 100644
--- a/dbms/src/Interpreters/LogicalExpressionsOptimizer.cpp
+++ b/dbms/src/Interpreters/LogicalExpressionsOptimizer.cpp
@@ -5,13 +5,18 @@
 #include <DB/Parsers/ASTSelectQuery.h>
 #include <DB/Parsers/ASTLiteral.h>
 
-#include <DB/Core/ErrorCodes.h>
-
 #include <deque>
 
+
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+}
+
+
 LogicalExpressionsOptimizer::OrWithExpression::OrWithExpression(ASTFunction * or_function_, const std::string & expression_)
 	: or_function(or_function_), expression(expression_)
 {
diff --git a/dbms/src/Interpreters/ProcessList.cpp b/dbms/src/Interpreters/ProcessList.cpp
index 505aaf35934..e9fcbbf4816 100644
--- a/dbms/src/Interpreters/ProcessList.cpp
+++ b/dbms/src/Interpreters/ProcessList.cpp
@@ -3,6 +3,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TOO_MUCH_SIMULTANEOUS_QUERIES;
+	extern const int QUERY_WITH_SAME_ID_IS_ALREADY_RUNNING;
+}
+
 
 ProcessList::EntryPtr ProcessList::insert(
 	const String & query_, const String & user_, const String & query_id_, const Poco::Net::IPAddress & ip_address_,
@@ -17,27 +23,30 @@ ProcessList::EntryPtr ProcessList::insert(
 			&& (!settings.queue_max_wait_ms.totalMilliseconds() || !have_space.tryWait(mutex, settings.queue_max_wait_ms.totalMilliseconds())))
 			throw Exception("Too much simultaneous queries. Maximum: " + toString(max_size), ErrorCodes::TOO_MUCH_SIMULTANEOUS_QUERIES);
 
-		UserToQueries::iterator queries = user_to_queries.find(user_);
-
-		if (queries != user_to_queries.end())
 		{
-			if (settings.max_concurrent_queries_for_user && queries->second.size() >= settings.max_concurrent_queries_for_user)
-				throw Exception("Too much simultaneous queries for user " + user_
-					+ ". Current: " + toString(queries->second.size())
-					+ ", maximum: " + toString(settings.max_concurrent_queries_for_user),
-					ErrorCodes::TOO_MUCH_SIMULTANEOUS_QUERIES);
+			UserToQueries::iterator user_process_list = user_to_queries.find(user_);
 
-			if (!query_id_.empty())
+			if (user_process_list != user_to_queries.end())
 			{
-				QueryToElement::iterator element = queries->second.find(query_id_);
-				if (element != queries->second.end())
+				if (settings.max_concurrent_queries_for_user && user_process_list->second.queries.size() >= settings.max_concurrent_queries_for_user)
+					throw Exception("Too much simultaneous queries for user " + user_
+						+ ". Current: " + toString(user_process_list->second.queries.size())
+						+ ", maximum: " + toString(settings.max_concurrent_queries_for_user),
+						ErrorCodes::TOO_MUCH_SIMULTANEOUS_QUERIES);
+
+				if (!query_id_.empty())
 				{
-					if (!settings.replace_running_query)
-						throw Exception("Query with id = " + query_id_ + " is already running.",
-							ErrorCodes::QUERY_WITH_SAME_ID_IS_ALREADY_RUNNING);
-					element->second->is_cancelled = true;
-					/// В случае если запрос отменяется, данные о нем удаляются из мапа в момент отмены.
-					queries->second.erase(element);
+					ProcessListForUser::QueryToElement::iterator element = user_process_list->second.queries.find(query_id_);
+					if (element != user_process_list->second.queries.end())
+					{
+						if (!settings.replace_running_query)
+							throw Exception("Query with id = " + query_id_ + " is already running.",
+								ErrorCodes::QUERY_WITH_SAME_ID_IS_ALREADY_RUNNING);
+
+						element->second->is_cancelled = true;
+						/// В случае если запрос отменяется, данные о нем удаляются из мапа в момент отмены.
+						user_process_list->second.queries.erase(element);
+					}
 				}
 			}
 		}
@@ -50,7 +59,23 @@ ProcessList::EntryPtr ProcessList::insert(
 			priorities.insert(settings.priority))));
 
 		if (!query_id_.empty())
-			user_to_queries[user_][query_id_] = &res->get();
+		{
+			ProcessListForUser & user_process_list = user_to_queries[user_];
+			user_process_list.queries[query_id_] = &res->get();
+
+			if (current_memory_tracker)
+			{
+				/// Отслеживаем суммарное потребление оперативки на одновременно выполняющиеся запросы одного пользователя.
+				user_process_list.user_memory_tracker.setLimit(settings.limits.max_memory_usage_for_user);
+				user_process_list.user_memory_tracker.setDescription("(for user)");
+				current_memory_tracker->setNext(&user_process_list.user_memory_tracker);
+
+				/// Отслеживаем суммарное потребление оперативки на все одновременно выполняющиеся запросы.
+				total_memory_tracker.setLimit(settings.limits.max_memory_usage_for_all_queries);
+				total_memory_tracker.setDescription("(total)");
+				user_process_list.user_memory_tracker.setNext(&total_memory_tracker);
+			}
+		}
 	}
 
 	return res;
@@ -61,21 +86,42 @@ ProcessListEntry::~ProcessListEntry()
 {
 	Poco::ScopedLock<Poco::FastMutex> lock(parent.mutex);
 
-	/// В случае, если запрос отменяется, данные о нем удаляются из мапа в момент отмены.
-	if (!it->is_cancelled && !it->query_id.empty())
+	/// Важен порядок удаления memory_tracker-ов.
+
+	/// Здесь удаляется memory_tracker одного запроса.
+	parent.cont.erase(it);
+
+	ProcessList::UserToQueries::iterator user_process_list = parent.user_to_queries.find(it->user);
+	if (user_process_list != parent.user_to_queries.end())
 	{
-		ProcessList::UserToQueries::iterator queries = parent.user_to_queries.find(it->user);
-		if (queries != parent.user_to_queries.end())
+		/// В случае, если запрос отменяется, данные о нем удаляются из мапа в момент отмены, а не здесь.
+		if (!it->is_cancelled && !it->query_id.empty())
 		{
-			ProcessList::QueryToElement::iterator element = queries->second.find(it->query_id);
-			if (element != queries->second.end())
-				queries->second.erase(element);
+			ProcessListForUser::QueryToElement::iterator element = user_process_list->second.queries.find(it->query_id);
+			if (element != user_process_list->second.queries.end())
+				user_process_list->second.queries.erase(element);
 		}
+
+		/// Здесь удаляется memory_tracker на пользователя. В это время, ссылающийся на него memory_tracker одного запроса не живёт.
+
+		/// Если запросов для пользователя больше нет, то удаляем запись.
+		/// При этом также очищается MemoryTracker на пользователя, и сообщение о потреблении памяти выводится в лог.
+		/// Важно иногда сбрасывать MemoryTracker, так как в нём может накапливаться смещённость
+		///  в следствие того, что есть случаи, когда память может быть выделена при обработке запроса, а освобождена - позже.
+		if (user_process_list->second.queries.empty())
+			parent.user_to_queries.erase(user_process_list);
 	}
 
-	parent.cont.erase(it);
 	--parent.cur_size;
 	parent.have_space.signal();
+
+	/// Здесь удаляется memory_tracker на все запросы. В это время никакие другие memory_tracker-ы не живут.
+	if (parent.cur_size == 0)
+	{
+		/// Сбрасываем MemoryTracker, аналогично (см. выше).
+		parent.total_memory_tracker.logPeakMemoryUsage();
+		parent.total_memory_tracker.reset();
+	}
 }
 
 
@@ -94,8 +140,8 @@ StoragePtr ProcessList::tryGetTemporaryTable(const String & query_id, const Stri
 	/// NOTE Ищем по всем user-ам. То есть, нет изоляции, и сложность O(users).
 	for (const auto & user_queries : user_to_queries)
 	{
-		auto it = user_queries.second.find(query_id);
-		if (user_queries.second.end() == it)
+		auto it = user_queries.second.queries.find(query_id);
+		if (user_queries.second.queries.end() == it)
 			continue;
 
 		auto jt = (*it->second).temporary_tables.find(table_name);
diff --git a/dbms/src/Interpreters/Quota.cpp b/dbms/src/Interpreters/Quota.cpp
index fe4dde914e0..464a1c8a290 100644
--- a/dbms/src/Interpreters/Quota.cpp
+++ b/dbms/src/Interpreters/Quota.cpp
@@ -12,6 +12,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int QUOTA_EXPIRED;
+	extern const int QUOTA_DOESNT_ALLOW_KEYS;
+	extern const int UNKNOWN_QUOTA;
+}
+
+
 void QuotaValues::initFromConfig(const String & config_elem, Poco::Util::AbstractConfiguration & config)
 {
 	queries 		= parse<UInt64>(config.getString(config_elem + ".queries", 		"0"));
diff --git a/dbms/src/Interpreters/Set.cpp b/dbms/src/Interpreters/Set.cpp
index 9cc70084e3e..1621b75daa4 100644
--- a/dbms/src/Interpreters/Set.cpp
+++ b/dbms/src/Interpreters/Set.cpp
@@ -28,6 +28,18 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNKNOWN_SET_DATA_VARIANT;
+	extern const int LOGICAL_ERROR;
+	extern const int SET_SIZE_LIMIT_EXCEEDED;
+	extern const int TYPE_MISMATCH;
+	extern const int BAD_ARGUMENTS;
+	extern const int INCORRECT_ELEMENT_OF_SET;
+	extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
+}
+
+
 void SetVariants::init(Type type_)
 {
 	type = type_;
@@ -42,7 +54,7 @@ void SetVariants::init(Type type_)
 	#undef M
 
 		default:
-			throw Exception("Unknown Set variant.", ErrorCodes::UNKNOWN_AGGREGATED_DATA_VARIANT);
+			throw Exception("Unknown Set variant.", ErrorCodes::UNKNOWN_SET_DATA_VARIANT);
 	}
 }
 
@@ -59,7 +71,7 @@ size_t SetVariants::getTotalRowCount() const
 	#undef M
 
 		default:
-			throw Exception("Unknown Set variant.", ErrorCodes::UNKNOWN_AGGREGATED_DATA_VARIANT);
+			throw Exception("Unknown Set variant.", ErrorCodes::UNKNOWN_SET_DATA_VARIANT);
 	}
 }
 
@@ -76,7 +88,7 @@ size_t SetVariants::getTotalByteCount() const
 	#undef M
 
 		default:
-			throw Exception("Unknown Set variant.", ErrorCodes::UNKNOWN_AGGREGATED_DATA_VARIANT);
+			throw Exception("Unknown Set variant.", ErrorCodes::UNKNOWN_SET_DATA_VARIANT);
 	}
 }
 
diff --git a/dbms/src/Interpreters/Settings.cpp b/dbms/src/Interpreters/Settings.cpp
index f081a21bcf4..293aff0e35c 100644
--- a/dbms/src/Interpreters/Settings.cpp
+++ b/dbms/src/Interpreters/Settings.cpp
@@ -4,6 +4,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNKNOWN_SETTING;
+	extern const int THERE_IS_NO_PROFILE;
+	extern const int NO_ELEMENTS_IN_CONFIG;
+}
+
+
 /// Установить настройку по имени.
 void Settings::set(const String & name, const Field & value)
 {
diff --git a/dbms/src/Interpreters/evaluateMissingDefaults.cpp b/dbms/src/Interpreters/evaluateMissingDefaults.cpp
new file mode 100644
index 00000000000..ee8607d86a1
--- /dev/null
+++ b/dbms/src/Interpreters/evaluateMissingDefaults.cpp
@@ -0,0 +1,55 @@
+#include <DB/Core/Block.h>
+#include <DB/Storages/ColumnDefault.h>
+#include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <DB/Interpreters/ExpressionActions.h>
+#include <DB/Interpreters/evaluateMissingDefaults.h>
+#include <utility>
+
+
+namespace DB
+{
+
+void evaluateMissingDefaults(Block & block,
+    const NamesAndTypesList & required_columns,
+	const ColumnDefaults & column_defaults,
+	const Context & context)
+{
+	if (column_defaults.empty())
+		return;
+
+	ASTPtr default_expr_list{std::make_unique<ASTExpressionList>().release()};
+
+	for (const auto & column : required_columns)
+	{
+		if (block.has(column.name))
+			continue;
+
+		const auto it = column_defaults.find(column.name);
+
+		/// expressions must be cloned to prevent modification by the ExpressionAnalyzer
+		if (it != column_defaults.end())
+			default_expr_list->children.emplace_back(
+				setAlias(it->second.expression->clone(), it->first));
+	}
+
+	/// nothing to evaluate
+	if (default_expr_list->children.empty())
+		return;
+
+	/** ExpressionAnalyzer eliminates "unused" columns, in order to ensure their safety
+	  * we are going to operate on a copy instead of the original block */
+	Block copy_block{block};
+	/// evaluate default values for defaulted columns
+	ExpressionAnalyzer{default_expr_list, context, {}, required_columns}.getActions(true)->execute(copy_block);
+
+	/// move evaluated columns to the original block, materializing them at the same time
+	for (auto & column_name_type : copy_block.getColumns())
+	{
+		if (auto converted = column_name_type.column->convertToFullColumnIfConst())
+			column_name_type.column = converted;
+
+		block.insert(std::move(column_name_type));
+	}
+}
+
+}
diff --git a/dbms/src/Interpreters/executeQuery.cpp b/dbms/src/Interpreters/executeQuery.cpp
index de9ffe9d1d7..95cf77f413a 100644
--- a/dbms/src/Interpreters/executeQuery.cpp
+++ b/dbms/src/Interpreters/executeQuery.cpp
@@ -24,6 +24,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+	extern const int QUERY_IS_TOO_LARGE;
+}
+
 
 static void checkLimits(const IAST & ast, const Limits & limits)
 {
diff --git a/dbms/src/Interpreters/loadMetadata.cpp b/dbms/src/Interpreters/loadMetadata.cpp
index 7ea0a0fe978..ef651b79fef 100644
--- a/dbms/src/Interpreters/loadMetadata.cpp
+++ b/dbms/src/Interpreters/loadMetadata.cpp
@@ -25,6 +25,13 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TABLE_ALREADY_EXISTS;
+	extern const int CANNOT_CREATE_TABLE_FROM_METADATA;
+	extern const int INCORRECT_FILE_NAME;
+}
+
 
 static void executeCreateQuery(const String & query, Context & context, const String & database, const String & file_name)
 {
diff --git a/dbms/src/Interpreters/reinterpretAsIdentifier.cpp b/dbms/src/Interpreters/reinterpretAsIdentifier.cpp
new file mode 100644
index 00000000000..ec871745826
--- /dev/null
+++ b/dbms/src/Interpreters/reinterpretAsIdentifier.cpp
@@ -0,0 +1,49 @@
+#include <DB/Interpreters/Context.h>
+#include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <DB/Interpreters/ExpressionActions.h>
+#include <DB/Interpreters/reinterpretAsIdentifier.h>
+#include <DB/DataTypes/DataTypeString.h>
+#include <DB/Parsers/ASTIdentifier.h>
+#include <DB/Parsers/ASTLiteral.h>
+
+
+namespace DB
+{
+
+namespace
+{
+	ASTPtr reinterpretAsIdentifierImpl(const ASTPtr & expr, const Context & context)
+	{
+		/// for string literal return its value
+		if (const auto literal = typeid_cast<const ASTLiteral *>(expr.get()))
+			return new ASTIdentifier{{}, safeGet<const String &>(literal->value)};
+
+		/// otherwise evaluate the expression
+		Block block{};
+		/** pass a dummy column name because ExpressionAnalyzer
+			*  does not work with no columns so far. */
+		ExpressionAnalyzer{
+			expr, context, {},
+			{ { "", new DataTypeString } }
+		}.getActions(false)->execute(block);
+
+		const auto & column_name_type = block.getByName(expr->getColumnName());
+
+		/// ensure the result of evaluation has String type
+		if (!typeid_cast<const DataTypeString *>(column_name_type.type.get()))
+			throw Exception{"Expression must evaluate to a String"};
+
+		return new ASTIdentifier{{}, column_name_type.column->getDataAt(0).toString()};
+	}
+}
+
+ASTIdentifier & reinterpretAsIdentifier(ASTPtr & expr, const Context & context)
+{
+	/// for identifier just return its name
+	if (!typeid_cast<const ASTIdentifier *>(expr.get()))
+		expr = reinterpretAsIdentifierImpl(expr, context);
+
+	return static_cast<ASTIdentifier &>(*expr);
+}
+
+}
diff --git a/dbms/src/Interpreters/sortBlock.cpp b/dbms/src/Interpreters/sortBlock.cpp
index f0c090d61ef..f71976a66e2 100644
--- a/dbms/src/Interpreters/sortBlock.cpp
+++ b/dbms/src/Interpreters/sortBlock.cpp
@@ -4,7 +4,13 @@
 namespace DB
 {
 
-typedef std::vector<std::pair<const IColumn *, SortColumnDescription> > ColumnsWithSortDescriptions;
+namespace ErrorCodes
+{
+	extern const int BAD_COLLATION;
+}
+
+
+using ColumnsWithSortDescriptions = std::vector<std::pair<const IColumn *, SortColumnDescription>>;
 
 
 static inline bool needCollation(const IColumn * column, const SortColumnDescription & description)
diff --git a/dbms/src/Interpreters/tests/expression.cpp b/dbms/src/Interpreters/tests/expression.cpp
index 2d31181d3af..cfb008d5b7a 100644
--- a/dbms/src/Interpreters/tests/expression.cpp
+++ b/dbms/src/Interpreters/tests/expression.cpp
@@ -22,6 +22,7 @@
 #include <DB/DataStreams/copyData.h>
 
 #include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <DB/Interpreters/ExpressionActions.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Interpreters/tests/expression_analyzer.cpp b/dbms/src/Interpreters/tests/expression_analyzer.cpp
index b9520cb5b57..82d4dc4a6b0 100644
--- a/dbms/src/Interpreters/tests/expression_analyzer.cpp
+++ b/dbms/src/Interpreters/tests/expression_analyzer.cpp
@@ -1,4 +1,5 @@
 #include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <DB/Interpreters/ExpressionActions.h>
 #include <DB/Parsers/ParserSelectQuery.h>
 #include <DB/Parsers/formatAST.h>
 #include <DB/Parsers/parseQuery.h>
diff --git a/dbms/src/Interpreters/tests/hash_map.cpp b/dbms/src/Interpreters/tests/hash_map.cpp
index c5227762db7..99343c13d28 100644
--- a/dbms/src/Interpreters/tests/hash_map.cpp
+++ b/dbms/src/Interpreters/tests/hash_map.cpp
@@ -63,6 +63,9 @@ struct AlternativeHash
 	}
 };
 
+
+#if defined(__x86_64__)
+
 struct CRC32Hash_
 {
 	size_t operator() (UInt64 x) const
@@ -73,6 +76,8 @@ struct CRC32Hash_
 	}
 };
 
+#endif
+
 
 int main(int argc, char ** argv)
 {
@@ -200,6 +205,7 @@ int main(int argc, char ** argv)
 			<< std::endl;
 	}
 
+#if defined(__x86_64__)
 	if (argc < 3 || atoi(argv[2]) == 3)
 	{
 		Stopwatch watch;
@@ -229,6 +235,7 @@ int main(int argc, char ** argv)
 #endif
 			<< std::endl;
 	}
+#endif
 
 	if (argc < 3 || atoi(argv[2]) == 4)
 	{
diff --git a/dbms/src/Interpreters/tests/hash_map3.cpp b/dbms/src/Interpreters/tests/hash_map3.cpp
index 202f2bc1174..ef7ecb85398 100644
--- a/dbms/src/Interpreters/tests/hash_map3.cpp
+++ b/dbms/src/Interpreters/tests/hash_map3.cpp
@@ -12,7 +12,6 @@
 
 #include <DB/Core/Types.h>
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/IO/ReadHelpers.h>
 
diff --git a/dbms/src/Interpreters/tests/hash_map_string_2.cpp b/dbms/src/Interpreters/tests/hash_map_string_2.cpp
index ce195bc7259..4fa8e50be51 100644
--- a/dbms/src/Interpreters/tests/hash_map_string_2.cpp
+++ b/dbms/src/Interpreters/tests/hash_map_string_2.cpp
@@ -15,7 +15,9 @@
 #include <DB/Common/HashTable/HashMap.h>
 #include <DB/Interpreters/AggregationCommon.h>
 
-#include <smmintrin.h>
+#if defined(__x86_64__)
+	#include <smmintrin.h>
+#endif
 
 
 /** Выполнять так:
@@ -74,11 +76,15 @@ DefineStringRef(StringRef_Compare8_1_byUInt64)
 DefineStringRef(StringRef_Compare16_1_byMemcmp)
 DefineStringRef(StringRef_Compare16_1_byUInt64_logicAnd)
 DefineStringRef(StringRef_Compare16_1_byUInt64_bitAnd)
+
+#if defined(__x86_64__)
 DefineStringRef(StringRef_Compare16_1_byIntSSE)
 DefineStringRef(StringRef_Compare16_1_byFloatSSE)
 DefineStringRef(StringRef_Compare16_1_bySSE4)
 DefineStringRef(StringRef_Compare16_1_bySSE4_wide)
 DefineStringRef(StringRef_Compare16_1_bySSE_wide)
+#endif
+
 DefineStringRef(StringRef_CompareAlwaysTrue)
 DefineStringRef(StringRef_CompareAlmostAlwaysTrue)
 
@@ -190,6 +196,8 @@ inline bool compare_byUInt64_bitAnd(const char * p1, const char * p2)
 		 & (reinterpret_cast<const uint64_t *>(p1)[1] == reinterpret_cast<const uint64_t *>(p2)[1]);
 }
 
+#if defined(__x86_64__)
+
 inline bool compare_byIntSSE(const char * p1, const char * p2)
 {
 	return 0xFFFF == _mm_movemask_epi8(_mm_cmpeq_epi8(
@@ -204,6 +212,8 @@ inline bool compare_byFloatSSE(const char * p1, const char * p2)
 		_mm_loadu_ps(reinterpret_cast<const float *>(p2))));
 }
 
+#endif
+
 
 template <bool compare(const char *, const char *)>
 inline bool memequal(const char * p1, const char * p2, size_t size)
@@ -253,6 +263,8 @@ inline bool memequal(const char * p1, const char * p2, size_t size)
 }
 
 
+#if defined(__x86_64__)
+
 inline bool memequal_sse41(const char * p1, const char * p2, size_t size)
 {
 //	const char * p1_end = p1 + size;
@@ -483,6 +495,8 @@ inline bool memequal_sse_wide(const char * p1, const char * p2, size_t size)
 	return true;
 }
 
+#endif
+
 
 #define Op(METHOD) \
 inline bool operator==(StringRef_Compare16_1_ ## METHOD lhs, StringRef_Compare16_1_ ## METHOD rhs) \
@@ -499,6 +513,9 @@ inline bool operator==(StringRef_Compare16_1_ ## METHOD lhs, StringRef_Compare16
 Op(byMemcmp)
 Op(byUInt64_logicAnd)
 Op(byUInt64_bitAnd)
+
+#if defined(__x86_64__)
+
 Op(byIntSSE)
 Op(byFloatSSE)
 
@@ -536,6 +553,8 @@ inline bool operator==(StringRef_Compare16_1_bySSE_wide lhs, StringRef_Compare16
 	return memequal_sse_wide(lhs.data, rhs.data, lhs.size);
 }
 
+#endif
+
 
 inline bool operator==(StringRef_CompareAlwaysTrue lhs, StringRef_CompareAlwaysTrue rhs)
 {
@@ -623,11 +642,13 @@ int main(int argc, char ** argv)
 	if (!m || m == 5) bench<StringRef_Compare16_1_byMemcmp>			(data, "StringRef_Compare16_1_byMemcmp");
 	if (!m || m == 6) bench<StringRef_Compare16_1_byUInt64_logicAnd>(data, "StringRef_Compare16_1_byUInt64_logicAnd");
 	if (!m || m == 7) bench<StringRef_Compare16_1_byUInt64_bitAnd>	(data, "StringRef_Compare16_1_byUInt64_bitAnd");
+#if defined(__x86_64__)
 	if (!m || m == 8) bench<StringRef_Compare16_1_byIntSSE>			(data, "StringRef_Compare16_1_byIntSSE");
 	if (!m || m == 9) bench<StringRef_Compare16_1_byFloatSSE>		(data, "StringRef_Compare16_1_byFloatSSE");
 	if (!m || m == 10) bench<StringRef_Compare16_1_bySSE4>			(data, "StringRef_Compare16_1_bySSE4");
 	if (!m || m == 11) bench<StringRef_Compare16_1_bySSE4_wide>		(data, "StringRef_Compare16_1_bySSE4_wide");
 	if (!m || m == 12) bench<StringRef_Compare16_1_bySSE_wide>		(data, "StringRef_Compare16_1_bySSE_wide");
+#endif
 	if (!m || m == 100) bench<StringRef_CompareAlwaysTrue>			(data, "StringRef_CompareAlwaysTrue");
 	if (!m || m == 101) bench<StringRef_CompareAlmostAlwaysTrue>	(data, "StringRef_CompareAlmostAlwaysTrue");
 
diff --git a/dbms/src/Interpreters/tests/hash_map_string_3.cpp b/dbms/src/Interpreters/tests/hash_map_string_3.cpp
index ccc7b9f9b33..c6fb9b6ea6a 100644
--- a/dbms/src/Interpreters/tests/hash_map_string_3.cpp
+++ b/dbms/src/Interpreters/tests/hash_map_string_3.cpp
@@ -18,7 +18,9 @@
 #include <DB/Common/HashTable/HashMap.h>
 #include <DB/Interpreters/AggregationCommon.h>
 
-#include <smmintrin.h>
+#if defined(__x86_64__)
+	#include <smmintrin.h>
+#endif
 
 
 /** Выполнять так:
@@ -137,6 +139,8 @@ struct FastHash64
 };
 
 
+#if defined(__x86_64__)
+
 struct CrapWow
 {
 	size_t operator() (StringRef x) const
@@ -206,6 +210,8 @@ struct CrapWow
 	}
 };
 
+#endif
+
 
 struct SimpleHash
 {
@@ -306,6 +312,8 @@ struct MetroHash64
 };
 
 
+#if defined(__x86_64__)
+
 /*struct CRC32Hash
 {
 	size_t operator() (StringRef x) const
@@ -383,6 +391,8 @@ struct CRC32ILPHash
 	}
 };
 
+#endif
+
 
 typedef UInt64 Value;
 
@@ -451,9 +461,13 @@ int main(int argc, char ** argv)
 	if (!m || m == 1) bench<StringRef_CompareMemcmp, DefaultHash<StringRef>>(data, "StringRef_CityHash64");
 	if (!m || m == 2) bench<StringRef_CompareMemcmp, FastHash64>	(data, "StringRef_FastHash64");
 	if (!m || m == 3) bench<StringRef_CompareMemcmp, SimpleHash>	(data, "StringRef_SimpleHash");
+
+#if defined(__x86_64__)
 	if (!m || m == 4) bench<StringRef_CompareMemcmp, CrapWow>		(data, "StringRef_CrapWow");
 	if (!m || m == 5) bench<StringRef_CompareMemcmp, CRC32Hash>		(data, "StringRef_CRC32Hash");
 	if (!m || m == 6) bench<StringRef_CompareMemcmp, CRC32ILPHash>	(data, "StringRef_CRC32ILPHash");
+#endif
+
 	if (!m || m == 7) bench<StringRef_CompareMemcmp, VerySimpleHash>(data, "StringRef_VerySimpleHash");
 	if (!m || m == 8) bench<StringRef_CompareMemcmp, FarmHash64>(data, "StringRef_FarmHash64");
 	if (!m || m == 9) bench<StringRef_CompareMemcmp, MetroHash64<metrohash64_1>>(data, "StringRef_MetroHash64_1");
diff --git a/dbms/src/ODBC/Statement.h b/dbms/src/ODBC/Statement.h
index aa463f7b238..060eae6ce58 100644
--- a/dbms/src/ODBC/Statement.h
+++ b/dbms/src/ODBC/Statement.h
@@ -43,7 +43,7 @@ public:
 		request.setKeepAlive(true);
 		request.setChunkedTransferEncoding(true);
 		request.setCredentials("Basic", user_password_base64.str());
-		request.setURI("/?database=" + connection.database + "&default_format=ODBC");	/// TODO Возможность передать настройки. TODO эскейпинг
+		request.setURI("/?database=" + connection.database + "&default_format=ODBCDriver");	/// TODO Возможность передать настройки. TODO эскейпинг
 
 //		if (in && in->peek() != EOF)
 			connection.session.reset();
diff --git a/dbms/src/Parsers/ASTSelectQuery.cpp b/dbms/src/Parsers/ASTSelectQuery.cpp
index 3420fcead40..dd384659c5b 100644
--- a/dbms/src/Parsers/ASTSelectQuery.cpp
+++ b/dbms/src/Parsers/ASTSelectQuery.cpp
@@ -6,6 +6,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNION_ALL_COLUMN_ALIAS_MISMATCH;
+	extern const int UNION_ALL_RESULT_STRUCTURES_MISMATCH;
+	extern const int UNKNOWN_IDENTIFIER;
+}
+
+
 ASTSelectQuery::ASTSelectQuery(const StringRange range_) : ASTQueryWithOutput(range_)
 {
 }
diff --git a/dbms/src/Parsers/ExpressionElementParsers.cpp b/dbms/src/Parsers/ExpressionElementParsers.cpp
index 1f973dc054c..307f20e02a0 100644
--- a/dbms/src/Parsers/ExpressionElementParsers.cpp
+++ b/dbms/src/Parsers/ExpressionElementParsers.cpp
@@ -24,6 +24,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int SYNTAX_ERROR;
+}
+
 
 bool ParserArray::parseImpl(Pos & pos, Pos end, ASTPtr & node, Pos & max_parsed_pos, Expected & expected)
 {
diff --git a/dbms/src/Parsers/IParserBase.cpp b/dbms/src/Parsers/IParserBase.cpp
index 3dc3a795e14..a0a7182713e 100644
--- a/dbms/src/Parsers/IParserBase.cpp
+++ b/dbms/src/Parsers/IParserBase.cpp
@@ -4,6 +4,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+}
+
+
 bool IParserBase::parse(Pos & pos, Pos end, ASTPtr & node, Pos & max_parsed_pos, Expected & expected)
 {
 	Pos begin = pos;
diff --git a/dbms/src/Parsers/ParserInsertQuery.cpp b/dbms/src/Parsers/ParserInsertQuery.cpp
index ff494585863..70f48922a20 100644
--- a/dbms/src/Parsers/ParserInsertQuery.cpp
+++ b/dbms/src/Parsers/ParserInsertQuery.cpp
@@ -13,6 +13,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int SYNTAX_ERROR;
+}
+
 
 bool ParserInsertQuery::parseImpl(Pos & pos, Pos end, ASTPtr & node, Pos & max_parsed_pos, Expected & expected)
 {
diff --git a/dbms/src/Parsers/ParserJoin.cpp b/dbms/src/Parsers/ParserJoin.cpp
index ecf2df3a8ee..b4dc76317a4 100644
--- a/dbms/src/Parsers/ParserJoin.cpp
+++ b/dbms/src/Parsers/ParserJoin.cpp
@@ -8,6 +8,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int SYNTAX_ERROR;
+}
+
 
 bool ParserJoin::parseImpl(Pos & pos, Pos end, ASTPtr & node, Pos & max_parsed_pos, Expected & expected)
 {
diff --git a/dbms/src/Parsers/parseQuery.cpp b/dbms/src/Parsers/parseQuery.cpp
index 7ebba6e014d..ff7871847ff 100644
--- a/dbms/src/Parsers/parseQuery.cpp
+++ b/dbms/src/Parsers/parseQuery.cpp
@@ -4,10 +4,16 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int SYNTAX_ERROR;
+}
+
+
 /** Из позиции в (возможно многострочном) запросе получить номер строки и номер столбца в строке.
   * Используется в сообщении об ошибках.
   */
-static inline std::pair<size_t, size_t> getLineAndCol(IParser::Pos begin, IParser::Pos pos)
+static std::pair<size_t, size_t> getLineAndCol(IParser::Pos begin, IParser::Pos pos)
 {
 	size_t line = 0;
 
diff --git a/dbms/src/Server/HTTPHandler.cpp b/dbms/src/Server/HTTPHandler.cpp
index 0fd8a245882..83f423c7752 100644
--- a/dbms/src/Server/HTTPHandler.cpp
+++ b/dbms/src/Server/HTTPHandler.cpp
@@ -4,8 +4,6 @@
 
 #include <DB/Common/Stopwatch.h>
 
-#include <DB/Core/ErrorCodes.h>
-
 #include <DB/IO/ReadBufferFromIStream.h>
 #include <DB/IO/ReadBufferFromString.h>
 #include <DB/IO/ConcatReadBuffer.h>
@@ -28,6 +26,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int READONLY;
+}
+
+
 void HTTPHandler::processQuery(Poco::Net::HTTPServerRequest & request, Poco::Net::HTTPServerResponse & response, Output & used_output)
 {
 	LOG_TRACE(log, "Request URI: " << request.getURI());
diff --git a/dbms/src/Server/InterserverIOHTTPHandler.cpp b/dbms/src/Server/InterserverIOHTTPHandler.cpp
index 563d53c79a4..c2ee662e22b 100644
--- a/dbms/src/Server/InterserverIOHTTPHandler.cpp
+++ b/dbms/src/Server/InterserverIOHTTPHandler.cpp
@@ -7,6 +7,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ABORTED;
+	extern const int POCO_EXCEPTION;
+	extern const int STD_EXCEPTION;
+	extern const int UNKNOWN_EXCEPTION;
+}
+
 
 void InterserverIOHTTPHandler::processQuery(Poco::Net::HTTPServerRequest & request, Poco::Net::HTTPServerResponse & response)
 {
diff --git a/dbms/src/Server/MetricsTransmitter.cpp b/dbms/src/Server/MetricsTransmitter.cpp
new file mode 100644
index 00000000000..8139e218ca3
--- /dev/null
+++ b/dbms/src/Server/MetricsTransmitter.cpp
@@ -0,0 +1,70 @@
+#include "MetricsTransmitter.h"
+
+#include <daemon/Daemon.h>
+#include <DB/Common/setThreadName.h>
+
+
+namespace DB
+{
+
+MetricsTransmitter::~MetricsTransmitter()
+{
+	try
+	{
+		{
+			std::lock_guard<std::mutex> lock{mutex};
+			quit = true;
+		}
+
+		cond.notify_one();
+
+		thread.join();
+	}
+	catch (...)
+	{
+		DB::tryLogCurrentException(__FUNCTION__);
+	}
+}
+
+
+void MetricsTransmitter::run()
+{
+	setThreadName("ProfileEventsTx");
+
+	const auto get_next_minute = [] {
+		return std::chrono::time_point_cast<std::chrono::minutes, std::chrono::system_clock>(
+			std::chrono::system_clock::now() + std::chrono::minutes(1)
+		);
+	};
+
+	std::unique_lock<std::mutex> lock{mutex};
+
+	while (true)
+	{
+		if (cond.wait_until(lock, get_next_minute(), [this] { return quit; }))
+			break;
+
+		transmitCounters();
+	}
+}
+
+
+void MetricsTransmitter::transmitCounters()
+{
+	GraphiteWriter::KeyValueVector<size_t> key_vals{};
+	key_vals.reserve(ProfileEvents::END);
+
+	for (size_t i = 0; i < ProfileEvents::END; ++i)
+	{
+		const auto counter = ProfileEvents::counters[i];
+		const auto counter_increment = counter - prev_counters[i];
+		prev_counters[i] = counter;
+
+		std::string key{ProfileEvents::getDescription(static_cast<ProfileEvents::Event>(i))};
+		key_vals.emplace_back(event_path_prefix + key, counter_increment);
+	}
+
+	Daemon::instance().writeToGraphite(key_vals);
+}
+
+}
diff --git a/dbms/src/Server/MetricsTransmitter.h b/dbms/src/Server/MetricsTransmitter.h
new file mode 100644
index 00000000000..abbadaaa350
--- /dev/null
+++ b/dbms/src/Server/MetricsTransmitter.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <thread>
+#include <mutex>
+#include <condition_variable>
+
+#include <DB/Common/ProfileEvents.h>
+
+
+namespace DB
+{
+
+/**	Automatically sends difference of ProfileEvents to Graphite at beginning of every minute
+  */
+class MetricsTransmitter
+{
+public:
+	~MetricsTransmitter();
+
+private:
+	void run();
+	void transmitCounters();
+
+	/// Значения счётчиков при предыдущей отправке (или нули, если ни разу не отправляли).
+	decltype(ProfileEvents::counters) prev_counters{};
+
+	bool quit = false;
+	std::mutex mutex;
+	std::condition_variable cond;
+	std::thread thread {&MetricsTransmitter::run, this};
+
+	static constexpr auto event_path_prefix = "ClickHouse.ProfileEvents.";
+};
+
+}
diff --git a/dbms/src/Server/OLAPAttributesMetadata.h b/dbms/src/Server/OLAPAttributesMetadata.h
index d5ac92a7a15..dd67bfc559e 100644
--- a/dbms/src/Server/OLAPAttributesMetadata.h
+++ b/dbms/src/Server/OLAPAttributesMetadata.h
@@ -12,9 +12,9 @@
 #include <DB/IO/WriteHelpers.h>
 
 #include <common/DateLUT.h>
-#include <statdaemons/RegionsHierarchy.h>
-#include <statdaemons/TechDataHierarchy.h>
-#include <statdaemons/Interests.h>
+
+#include <DB/Dictionaries/Embedded/RegionsHierarchy.h>
+#include <DB/Dictionaries/Embedded/TechDataHierarchy.h>
 
 
 /// Код в основном взят из из OLAP-server. Здесь нужен только для парсинга значений атрибутов.
diff --git a/dbms/src/Server/OLAPHTTPHandler.cpp b/dbms/src/Server/OLAPHTTPHandler.cpp
index 2f41442d938..a1610530c30 100644
--- a/dbms/src/Server/OLAPHTTPHandler.cpp
+++ b/dbms/src/Server/OLAPHTTPHandler.cpp
@@ -19,6 +19,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int POCO_EXCEPTION;
+	extern const int STD_EXCEPTION;
+	extern const int UNKNOWN_EXCEPTION;
+}
+
+
 void OLAPHTTPHandler::processQuery(Poco::Net::HTTPServerRequest & request, Poco::Net::HTTPServerResponse & response)
 {
 	HTMLForm params(request);
diff --git a/dbms/src/Server/OLAPQueryConverter.cpp b/dbms/src/Server/OLAPQueryConverter.cpp
index 6d51912e6b7..ac3095abd9f 100644
--- a/dbms/src/Server/OLAPQueryConverter.cpp
+++ b/dbms/src/Server/OLAPQueryConverter.cpp
@@ -5,6 +5,15 @@
 
 namespace DB
 {
+
+namespace ErrorCodes
+{
+	extern const int UNSUPPORTED_PARAMETER;
+	extern const int UNKNOWN_IDENTIFIER;
+	extern const int UNKNOWN_RELATION;
+}
+
+
 namespace OLAP
 {
 
@@ -12,7 +21,7 @@ QueryConverter::QueryConverter(Poco::Util::AbstractConfiguration & config)
 {
 	table_for_single_counter = config.getString("olap_compatibility.table_for_single_counter");
 	table_for_all_counters = config.getString("olap_compatibility.table_for_all_counters");
-	
+
 	fillFormattedAttributeMap();
 	fillNumericAttributeMap();
 	fillFormattingAggregatedAttributeMap();
@@ -47,20 +56,20 @@ void QueryConverter::OLAPServerQueryToClickHouse(const QueryParseResult & query,
 	/// Проверим, умеем ли мы выполнять такой запрос.
 	if (query.format != FORMAT_TAB)
 		throw Exception("Only tab-separated output format is supported", ErrorCodes::UNSUPPORTED_PARAMETER);
-	
+
 	/// Учтем некоторые настройки (далеко не все).
-	
+
 	Settings new_settings = inout_context.getSettings();
-	
+
 	if (query.concurrency != 0)
 		new_settings.max_threads = query.concurrency;
-	
+
 	if (query.max_execution_time != 0)
 		new_settings.limits.max_execution_time = Poco::Timespan(query.max_execution_time, 0);
-	
+
 	if (query.max_result_size != 0)
 		new_settings.limits.max_rows_to_group_by = query.max_result_size;
-	
+
 	if (query.has_overflow_mode)
 	{
 		switch (query.overflow_mode)
@@ -76,54 +85,54 @@ void QueryConverter::OLAPServerQueryToClickHouse(const QueryParseResult & query,
 				break;
 		}
 	}
-	
+
 	inout_context.setSettings(new_settings);
-	
+
 	/// Составим запрос.
 	out_query = "SELECT ";
-	
+
 	std::vector<std::string> selected_expressions;
-	
+
 	/// Что выбирать: ключи агрегации и агрегированные значения.
 	for (size_t i = 0; i < query.key_attributes.size(); ++i)
 	{
 		const QueryParseResult::KeyAttribute & key = query.key_attributes[i];
 		std::string s = convertAttributeFormatted(key.attribute, key.parameter, regions_point_of_view_formatted);
-		
+
 		if (i > 0)
 			out_query += ", ";
 		out_query += s + " AS _" + firstWord(key.attribute) + (key.parameter ? "_" + toString(key.parameter) : "");
 		selected_expressions.push_back(s);
 	}
-	
+
 	for (size_t i = 0; i < query.aggregates.size(); ++i)
 	{
 		const QueryParseResult::Aggregate & aggregate = query.aggregates[i];
 		std::string s = convertAggregateFunction(aggregate.attribute, aggregate.parameter, aggregate.function, query, regions_point_of_view_formatted);
-		
+
 		if (query.key_attributes.size() + i > 0)
 			out_query += ", ";
 		out_query += s + " AS _" + firstWord(aggregate.function) + "_" + firstWord(aggregate.attribute) + (aggregate.parameter ? "_" + toString(aggregate.parameter) : "");
 		selected_expressions.push_back(s);
 	}
-	
+
 	/// Из какой таблицы.
 	out_query += " FROM " + getTableName(query.CounterID, query.local);
 
 	/// Добавляем сэмплирование.
 	if (query.sample != 1)
 		out_query += " SAMPLE " + toString(query.sample);
-	
+
 	/// Условия.
 	out_query += " WHERE ";
-	
+
 	/// Диапазон дат.
 	out_query += convertDateRange(query.date_first, query.date_last);
-	
+
 	/// Счетчик.
 	if (query.CounterID != 0)
 		out_query += " AND " + convertCounterID(query.CounterID);
-	
+
 	/// Произвольные условия.
 	for (size_t i = 0; i < query.where_conditions.size(); ++i)
 	{
@@ -131,7 +140,7 @@ void QueryConverter::OLAPServerQueryToClickHouse(const QueryParseResult & query,
 		out_query += " AND " + convertCondition(
 			condition.attribute, condition.parameter, condition.relation, condition.rhs, regions_point_of_view_formatted);
 	}
-	
+
 	/// Группировка.
 	if (!query.key_attributes.empty())
 	{
@@ -143,10 +152,10 @@ void QueryConverter::OLAPServerQueryToClickHouse(const QueryParseResult & query,
 			out_query += selected_expressions[i];
 		}
 	}
-	
+
 	/// Условие для групп.
 	out_query += " " + getHavingSection();
-	
+
 	/// Сортировка.
 	if (!query.sort_columns.empty())
 	{
@@ -154,14 +163,14 @@ void QueryConverter::OLAPServerQueryToClickHouse(const QueryParseResult & query,
 		for (size_t i = 0; i < query.sort_columns.size(); ++i)
 		{
 			const QueryParseResult::SortColumn & column = query.sort_columns[i];
-			
+
 			if (i > 0)
 				out_query += ", ";
 			out_query += selected_expressions[column.index - 1];
 			out_query += " " + convertSortDirection(column.direction);
 		}
 	}
-	
+
 	/// Ограничение на количество выводимых строк.
 	if (query.limit != 0)
 		out_query += " LIMIT " + toString(query.limit);
@@ -172,7 +181,7 @@ std::string QueryConverter::convertAttributeFormatted(const std::string & attrib
 {
 	if (formatted_attribute_map.count(attribute))
 		return Poco::format(formatted_attribute_map.at(attribute), parameter);
-	
+
 	/** Для атрибутов по регионам, выражение содержит подстановку %s,
 	  *  куда должна быть подставлена regions_point_of_view_formatted.
 	  */
@@ -182,13 +191,13 @@ std::string QueryConverter::convertAttributeFormatted(const std::string & attrib
 	if (numeric_attribute_map.count(attribute))
 	{
 		std::string numeric = Poco::format(numeric_attribute_map.at(attribute), parameter);
-		
+
 		if (formatting_aggregated_attribute_map.count(attribute))
 			return Poco::format(formatting_aggregated_attribute_map.at(attribute), std::string("(") + numeric + ")");
 		else
 			return numeric;
 	}
-	
+
 	throw Exception("Unknown attribute: " + attribute, ErrorCodes::UNKNOWN_IDENTIFIER);
 }
 
@@ -203,7 +212,7 @@ std::string QueryConverter::convertAttributeNumeric(const std::string & attribut
 
 	if (numeric_attribute_map.count(attribute))
 		return Poco::format(numeric_attribute_map.at(attribute), parameter);
-	
+
 	throw Exception("Unknown attribute: " + attribute, ErrorCodes::UNKNOWN_IDENTIFIER);
 }
 
@@ -228,9 +237,9 @@ std::string QueryConverter::convertAggregateFunction(const std::string & attribu
 		else
 			return "sum(Sign)";
 	}
-	
+
 	std::string numeric = convertAttributeNumeric(attribute, parameter, regions_point_of_view_formatted);
-	
+
 	if (name == "uniq" ||
 		name == "uniq_sort" ||
 		name == "uniq_hash" ||
@@ -241,13 +250,13 @@ std::string QueryConverter::convertAggregateFunction(const std::string & attribu
 
 	if (name == "uniq_state")
 		return "uniqState(" + numeric + ")";
-	
+
 	if (name == "uniq_hll12")
 		return "uniqHLL12(" + numeric + ")";
-	
+
 	if (name == "uniq_hll12_state")
 		return "uniqHLL12State(" + numeric + ")";
-	
+
 	if (name == "count_non_zero")
 	{
 		if (query.sample != 1)
@@ -271,7 +280,7 @@ std::string QueryConverter::convertAggregateFunction(const std::string & attribu
 	}
 
 	bool trivial_format;
-	
+
 	std::string format;
 	if (formatting_aggregated_attribute_map.count(attribute))
 	{
@@ -285,7 +294,7 @@ std::string QueryConverter::convertAggregateFunction(const std::string & attribu
 	}
 
 	std::string s;
-	
+
 	if (name == "sum")
 	{
 		if (query.sample != 1)
@@ -326,10 +335,10 @@ std::string QueryConverter::convertAggregateFunction(const std::string & attribu
 		s = "min(" + numeric + ")";
 	if (name == "max")
 		s = "max(" + numeric + ")";
-	
+
 	/// Если агрегатная функция возвращает дробное число, и атрибут имеет нетривиальное форматирование, после агрегации приведем дробное число к целому.
 	bool need_cast = !trivial_format && float_value;
-	
+
 	return Poco::format(format, std::string() + (need_cast ? "toInt64" : "") + "(" + s + ")");
 }
 
@@ -349,7 +358,7 @@ std::string QueryConverter::convertCondition(
 {
 	std::string value = convertAttributeNumeric(attribute, parameter, regions_point_of_view_formatted);
 	std::string constant = convertConstant(attribute, rhs);
-	
+
 	if (name == "equals")
 		return "(" + value + ")" + " == " + constant;
 	if (name == "not_equals")
@@ -436,7 +445,7 @@ void QueryConverter::fillNumericAttributeMap()
 	M("VisitStartWeek",       				"toInt32(toDateTime(toMonday(StartDate)))")
 	M("VisitStartTime",       				"toInt32(toTime(StartTime))")
 	M("VisitStartTimeRoundedToMinute",		"toInt32(toStartOfMinute(toTime(StartTime)))")
-	
+
 	M("VisitStartYear",       "toYear(StartDate)")
 	M("VisitStartMonth",      "toMonth(StartDate)")
 	M("VisitStartDayOfWeek",  "toDayOfWeek(StartDate)")
@@ -449,7 +458,7 @@ void QueryConverter::fillNumericAttributeMap()
 	M("FirstVisitDate",       "toInt32(toDateTime(toDate(FirstVisit)))")
 	M("FirstVisitWeek",       "toInt32(toDateTime(toMonday(FirstVisit)))")
 	M("FirstVisitTime",       "toInt32(toTime(FirstVisit))")
-	
+
 	M("FirstVisitYear",       "toYear(FirstVisit)")
 	M("FirstVisitMonth",      "toMonth(FirstVisit)")
 	M("FirstVisitDayOfWeek",  "toDayOfWeek(FirstVisit)")
@@ -470,7 +479,7 @@ void QueryConverter::fillNumericAttributeMap()
 	M("ClientTimeHour",       "toHour(ClientEventTime)")
 	M("ClientTimeMinute",     "toMinute(ClientEventTime)")
 	M("ClientTimeSecond",     "toSecond(ClientEventTime)")
-	
+
 	M("SearchPhraseHash",     "SearchPhraseHash")
 	M("RefererDomainHash",    "RefererDomainHash")
 	M("StartURLHash",         "NormalizedStartURLHash")
@@ -495,10 +504,10 @@ void QueryConverter::fillNumericAttributeMap()
 	M("BouncePrecise",        "IsBounce")
 	M("IsYandex",             "IsYandex")
 	M("UserID",               "UserID")
-	
+
 	M("UserIDCreateDateTime", "(UserID > 10000000000000000000 OR UserID %% 10000000000 > 2000000000 OR UserID %% 10000000000 < 1000000000 ? toUInt64(0) : UserID %% 10000000000)")
 	M("UserIDCreateDate",     "(UserID > 10000000000000000000 OR UserID %% 10000000000 > 2000000000 OR UserID %% 10000000000 < 1000000000 ? toUInt64(0) : UserID %% 10000000000)")
-	
+
 	M("UserIDAge",            "(UserID > 10000000000000000000 OR UserID %% 10000000000 < 1000000000 OR UserID %% 10000000000 > toUInt64(StartTime) ? toInt64(-1) : intDiv(toInt64(StartTime) - UserID %% 10000000000, 86400))")
 	M("UserIDAgeInterval",    "(UserID > 10000000000000000000 OR UserID %% 10000000000 < 1000000000 OR UserID %% 10000000000 > toUInt64(StartTime) ? toInt64(-1) : toInt64(roundToExp2(intDiv(toUInt64(StartTime) - UserID %% 10000000000, 86400))))")
 	M("TotalVisits",          "TotalVisits")
@@ -508,18 +517,18 @@ void QueryConverter::fillNumericAttributeMap()
 	M("Sex",                  "Sex")
 	M("Income",               "Income")
 	M("AdvEngineID",          "AdvEngineID")
-	
+
 	M("DotNet",               "NetMajor * 256 + NetMinor")
-	
+
 	M("DotNetMajor",          "NetMajor")
-	
+
 	M("Flash",                "FlashMajor * 256 + FlashMinor")
-	
+
 	M("FlashExists",          "FlashMajor > 0")
 	M("FlashMajor",           "FlashMajor")
-	
+
 	M("Silverlight",          "SilverlightVersion1 * 72057594037927936 + SilverlightVersion2 * 281474976710656 + SilverlightVersion3 * 65536 + SilverlightVersion4")
-	
+
 	M("SilverlightMajor",     "SilverlightVersion1")
 	M("Hits",                 "Hits")
 	M("HitsInterval",         "roundToExp2(Hits)")
@@ -529,30 +538,30 @@ void QueryConverter::fillNumericAttributeMap()
 	M("IsMobile",             "IsMobile")
 	M("MobilePhoneID",        "MobilePhone")
 	M("MobilePhoneModelHash", "halfMD5(MobilePhoneModel)")
-	
+
 	M("MobilePhoneModel",     "reinterpretAsUInt64(MobilePhoneModel)")
 	M("BrowserLanguage",      "BrowserLanguage")
 	M("BrowserCountry",       "BrowserCountry")
 	M("TopLevelDomain",       "TopLevelDomain")
 	M("URLScheme",            "URLScheme")
-	
+
 	M("IPNetworkID",          "IPNetworkID")
 	M("ClientTimeZone",       "ClientTimeZone")
 	M("OSID",                 "OS")
 	M("OSMostAncestor",       "OSToRoot(OS)")
-	
+
 	M("ClientIP",             "ClientIP")
 	M("Resolution",           "ResolutionWidth * 16777216 + ResolutionHeight * 256 + ResolutionDepth")
 	M("ResolutionWidthHeight","ResolutionWidth * 65536 + ResolutionHeight")
-	
+
 	M("ResolutionWidth",      "ResolutionWidth")
 	M("ResolutionHeight",     "ResolutionHeight")
 	M("ResolutionWidthInterval","intDiv(ResolutionWidth, 100) * 100")
 	M("ResolutionHeightInterval","intDiv(ResolutionHeight, 100) * 100")
 	M("ResolutionColor",      "ResolutionDepth")
-	
+
 	M("WindowClientArea",     "WindowClientWidth * 65536 + WindowClientHeight")
-	
+
 	M("WindowClientAreaInterval","intDiv(WindowClientWidth, 100) * 6553600 + intDiv(WindowClientHeight, 100) * 100")
 	M("WindowClientWidth",    "WindowClientWidth")
 	M("WindowClientWidthInterval","intDiv(WindowClientWidth, 100) * 100")
@@ -561,11 +570,11 @@ void QueryConverter::fillNumericAttributeMap()
 	M("SearchEngineID",       "SearchEngineID")
 	M("SearchEngineMostAncestor", "SEToRoot(toUInt8(SearchEngineID))")
 	M("CodeVersion",          "CodeVersion")
-	
+
 	M("UserAgent",            "UserAgent * 16777216 + UserAgentMajor * 65536 + UserAgentMinor")
 	M("UserAgentVersion",     "UserAgentMajor * 65536 + UserAgentMinor")
 	M("UserAgentMajor",       "UserAgent * 256 + UserAgentMajor")
-	
+
 	M("UserAgentID",          "UserAgent")
 	M("ClickGoodEvent",       "ClickGoodEvent")
 	M("ClickPriorityID",      "ClickPriorityID")
@@ -588,9 +597,9 @@ void QueryConverter::fillNumericAttributeMap()
 	M("Converted",            "has(Goals.ID, toUInt32(%u))")
 	M("CounterID",            "CounterID")
 	M("VisitID",              "VisitID")
-	
+
 	M("Interests",            "Interests")
-	
+
 	M("HasInterestPhoto",     "modulo(intDiv(Interests, 128), 2)")
 	M("HasInterestMoviePremieres","modulo(intDiv(Interests, 64), 2)")
 	M("HasInterestTourism",   "modulo(intDiv(Interests, 32), 2)")
@@ -612,12 +621,12 @@ void QueryConverter::fillNumericAttributeMap()
 	M("UTMTermHash",          "UTMTermHash")
 	M("FromHash",             "FromHash")
 	M("CLID",                 "CLID")
-	
+
 	M("SocialSourceNetworkID","SocialSourceNetworkID")
 	/// где 26 это Яндекс (db_dumps/SearchEngines).
 	M("CorrectedTraficSourceID", "(IsYandex AND SEIn(toUInt8(SearchEngineID), 26)) ? -1 : TraficSourceID")
 	M("CorrectedSearchEngineID", "(IsYandex AND SEIn(toUInt8(SearchEngineID), 26)) ? 0 : toUInt8(SearchEngineID)")
-	
+
 #undef M
 }
 
@@ -633,33 +642,33 @@ void QueryConverter::fillFormattedAttributeMap()
 	M("VisitStartDateTimeRoundedToHour",   	"toStartOfHour(StartTime)")
 	M("VisitStartDateRoundedToMonth",      	"toDateTime(toStartOfMonth(StartDate))")
 	M("VisitStartTimeRoundedToMinute",		"substring(toString(toStartOfMinute(toTime(StartTime))), 12, 8)")
-	
+
 	M("FirstVisitDateTime",   "FirstVisit")
 	M("FirstVisitDate",       "toDate(FirstVisit)")
 	M("FirstVisitWeek",       "toMonday(FirstVisit)")
 	M("FirstVisitTime",       "substring(toString(FirstVisit), 12, 8)")
-	
+
 	M("PredLastVisitDate",    "PredLastVisit")
 	M("PredLastVisitWeek",    "toMonday(PredLastVisit)")
-	
+
 	M("ClientDateTime",       "ClientEventTime")
 	M("ClientTime",           "substring(toString(ClientEventTime), 12, 8)")
-	
+
 	M("DotNet",               "concat(concat(toString(NetMajor), '.'), toString(NetMinor))")
 	M("Flash",                "concat(concat(toString(FlashMajor),'.'),toString(FlashMinor))")
 	M("Silverlight",          "concat(concat(concat(concat(concat(concat(toString(SilverlightVersion1), '.'), toString(SilverlightVersion2)), '.'), toString(SilverlightVersion3)), '.'), toString(SilverlightVersion4))")
 	M("MobilePhoneModel",     "MobilePhoneModel")
-	
+
 	M("ClientIP",             "IPv4NumToString(ClientIP)")
 	M("Resolution",           "concat(concat(concat(concat(toString(ResolutionWidth),'x'),toString(ResolutionHeight)),'x'),toString(ResolutionDepth))")
 	M("ResolutionWidthHeight","concat(concat(toString(ResolutionWidth),'x'),toString(ResolutionHeight))")
-	
+
 	M("WindowClientArea",     "concat(concat(toString(WindowClientWidth),'x'),toString(WindowClientHeight))")
-	
+
 	M("UserAgent",            "concat(concat(concat(toString(UserAgent), ' '), toString(UserAgentMajor)), UserAgentMinor == 0 ? '' : concat('.', reinterpretAsString(UserAgentMinor)))")
 	M("UserAgentVersion",     "concat(toString(UserAgentMajor), UserAgentMinor == 0 ? '' : concat('.', reinterpretAsString(UserAgentMinor)))")
 	M("UserAgentMajor",       "concat(concat(toString(UserAgent), ' '), toString(UserAgentMajor))")
-#undef M	
+#undef M
 }
 
 void QueryConverter::fillFormattingAggregatedAttributeMap()
diff --git a/dbms/src/Server/OLAPQueryParser.cpp b/dbms/src/Server/OLAPQueryParser.cpp
index 7891b5c5613..bc3e1e0c6a4 100644
--- a/dbms/src/Server/OLAPQueryParser.cpp
+++ b/dbms/src/Server/OLAPQueryParser.cpp
@@ -3,7 +3,6 @@
 #include <Poco/AutoPtr.h>
 
 #include "OLAPQueryParser.h"
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Common/Exception.h>
 #include <DB/IO/ReadHelpers.h>
 #include <DB/IO/WriteHelpers.h>
@@ -11,6 +10,23 @@
 
 namespace DB
 {
+
+	namespace ErrorCodes
+{
+	extern const int NOT_FOUND_NODE;
+	extern const int FOUND_MORE_THAN_ONE_NODE;
+	extern const int SYNTAX_ERROR;
+	extern const int UNKNOWN_FORMAT;
+	extern const int FIRST_DATE_IS_BIGGER_THAN_LAST_DATE;
+	extern const int UNKNOWN_OVERFLOW_MODE;
+	extern const int NOT_FOUND_FUNCTION_ELEMENT_FOR_AGGREGATE;
+	extern const int NOT_FOUND_RELATION_ELEMENT_FOR_CONDITION;
+	extern const int NOT_FOUND_RHS_ELEMENT_FOR_CONDITION;
+	extern const int NO_ATTRIBUTES_LISTED;
+	extern const int UNKNOWN_DIRECTION_OF_SORTING;
+	extern const int INDEX_OF_COLUMN_IN_SORT_CLAUSE_IS_OUT_OF_RANGE;
+}
+
 namespace OLAP
 {
 
diff --git a/dbms/src/Server/ReplicasStatusHandler.cpp b/dbms/src/Server/ReplicasStatusHandler.cpp
new file mode 100644
index 00000000000..fe351a143f5
--- /dev/null
+++ b/dbms/src/Server/ReplicasStatusHandler.cpp
@@ -0,0 +1,96 @@
+#include "ReplicasStatusHandler.h"
+
+#include <DB/Interpreters/Context.h>
+#include <DB/Storages/StorageReplicatedMergeTree.h>
+#include <DB/Common/HTMLForm.h>
+
+#include <Poco/Net/HTTPServerRequest.h>
+#include <Poco/Net/HTTPServerResponse.h>
+
+
+namespace DB
+{
+
+
+ReplicasStatusHandler::ReplicasStatusHandler(Context & context_)
+	: context(context_)
+{
+}
+
+
+void ReplicasStatusHandler::handleRequest(Poco::Net::HTTPServerRequest & request, Poco::Net::HTTPServerResponse & response)
+{
+	try
+	{
+		HTMLForm params(request);
+
+		/// Даже в случае, когда отставание небольшое, выводить подробную информацию об отставании.
+		bool verbose = params.get("verbose", "") == "1";
+
+		/// Собираем набор реплицируемых таблиц.
+		Databases replicated_tables;
+		{
+			Poco::ScopedLock<Poco::Mutex> lock(context.getMutex());
+
+			for (const auto & db : context.getDatabases())
+				for (const auto & table : db.second)
+					if (typeid_cast<const StorageReplicatedMergeTree *>(table.second.get()))
+						replicated_tables[db.first][table.first] = table.second;
+		}
+
+		const MergeTreeSettings & settings = context.getMergeTreeSettings();
+
+		bool ok = true;
+		std::stringstream message;
+
+		for (const auto & db : replicated_tables)
+		{
+			for (auto & table : db.second)
+			{
+				time_t absolute_delay = 0;
+				time_t relative_delay = 0;
+
+				static_cast<StorageReplicatedMergeTree &>(*table.second).getReplicaDelays(absolute_delay, relative_delay);
+
+				if ((settings.min_absolute_delay_to_close && absolute_delay >= static_cast<time_t>(settings.min_absolute_delay_to_close))
+					|| (settings.min_relative_delay_to_close && relative_delay >= static_cast<time_t>(settings.min_relative_delay_to_close)))
+					ok = false;
+
+				message << backQuoteIfNeed(db.first) << "." << backQuoteIfNeed(table.first)
+					<< ":\tAbsolute delay: " << absolute_delay << ". Relative delay: " << relative_delay << ".\n";
+			}
+		}
+
+		if (ok && !verbose)
+		{
+			const char * data = "Ok.\n";
+			response.sendBuffer(data, strlen(data));
+		}
+		else
+		{
+			response.send() << message.rdbuf();
+		}
+	}
+	catch (...)
+	{
+		tryLogCurrentException("ReplicasStatusHandler");
+
+		try
+		{
+			response.setStatusAndReason(Poco::Net::HTTPResponse::HTTP_INTERNAL_SERVER_ERROR);
+
+			if (!response.sent())
+			{
+				/// Ещё ничего не отправляли, и даже не знаем, нужно ли сжимать ответ.
+				response.send() << getCurrentExceptionMessage(false) << std::endl;
+			}
+		}
+		catch (...)
+		{
+			LOG_ERROR((&Logger::get("ReplicasStatusHandler")), "Cannot send exception to client");
+		}
+	}
+}
+
+
+}
diff --git a/dbms/src/Server/ReplicasStatusHandler.h b/dbms/src/Server/ReplicasStatusHandler.h
new file mode 100644
index 00000000000..ac2fc4c66ba
--- /dev/null
+++ b/dbms/src/Server/ReplicasStatusHandler.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <Poco/Net/HTTPRequestHandler.h>
+
+
+namespace DB
+{
+
+class Context;
+
+/// Отвечает "Ok.\n", если все реплики на этом сервере не слишком сильно отстают. Иначе выводит информацию об отставании. TODO Вынести в отдельный файл.
+class ReplicasStatusHandler : public Poco::Net::HTTPRequestHandler
+{
+private:
+	Context & context;
+
+public:
+	ReplicasStatusHandler(Context & context_);
+
+	void handleRequest(Poco::Net::HTTPServerRequest & request, Poco::Net::HTTPServerResponse & response);
+};
+
+
+}
diff --git a/dbms/src/Server/Server.cpp b/dbms/src/Server/Server.cpp
index 5c623b4fe05..df6de3732d1 100644
--- a/dbms/src/Server/Server.cpp
+++ b/dbms/src/Server/Server.cpp
@@ -1,27 +1,23 @@
 #include <sys/resource.h>
-#include <sys/file.h>
 
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/DNS.h>
 #include <Poco/Util/XMLConfiguration.h>
+#include <Poco/DirectoryIterator.h>
 
 #include <common/ApplicationServerExt.h>
 #include <common/ErrorHandlers.h>
-#include <common/Revision.h>
 
-#include <DB/Common/ConfigProcessor.h>
 #include <ext/scope_guard.hpp>
 
 #include <memory>
-#include <thread>
-#include <atomic>
-#include <condition_variable>
 
 #include <DB/Common/Macros.h>
 #include <DB/Common/getFQDNOrHostName.h>
-#include <DB/Common/setThreadName.h>
+
 #include <DB/Interpreters/loadMetadata.h>
 #include <DB/Interpreters/ProcessList.h>
+
 #include <DB/Storages/System/StorageSystemNumbers.h>
 #include <DB/Storages/System/StorageSystemTables.h>
 #include <DB/Storages/System/StorageSystemParts.h>
@@ -38,129 +34,23 @@
 #include <DB/Storages/System/StorageSystemColumns.h>
 #include <DB/Storages/System/StorageSystemFunctions.h>
 #include <DB/Storages/System/StorageSystemClusters.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-
-#include <DB/IO/copyData.h>
-#include <DB/IO/LimitReadBuffer.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/Operators.h>
 
 #include <zkutil/ZooKeeper.h>
 
 #include "Server.h"
 #include "HTTPHandler.h"
+#include "ReplicasStatusHandler.h"
 #include "InterserverIOHTTPHandler.h"
 #include "OLAPHTTPHandler.h"
 #include "TCPHandler.h"
+#include "MetricsTransmitter.h"
+#include "UsersConfigReloader.h"
+#include "StatusFile.h"
 
 
-namespace
-{
-
-/**	Automatically sends difference of ProfileEvents to Graphite at beginning of every minute
-*/
-class ProfileEventsTransmitter
-{
-public:
-	~ProfileEventsTransmitter()
-	{
-		try
-		{
-			{
-				std::lock_guard<std::mutex> lock{mutex};
-				quit = true;
-			}
-
-			cond.notify_one();
-
-			thread.join();
-		}
-		catch (...)
-		{
-			DB::tryLogCurrentException(__FUNCTION__);
-		}
-	}
-
-private:
-	void run()
-	{
-		setThreadName("ProfileEventsTx");
-
-		const auto get_next_minute = [] {
-			return std::chrono::time_point_cast<std::chrono::minutes, std::chrono::system_clock>(
-				std::chrono::system_clock::now() + std::chrono::minutes(1)
-			);
-		};
-
-		std::unique_lock<std::mutex> lock{mutex};
-
-		while (true)
-		{
-			if (cond.wait_until(lock, get_next_minute(), [this] { return quit; }))
-				break;
-
-			transmitCounters();
-		}
-	}
-
-	void transmitCounters()
-	{
-		GraphiteWriter::KeyValueVector<size_t> key_vals{};
-		key_vals.reserve(ProfileEvents::END);
-
-		for (size_t i = 0; i < ProfileEvents::END; ++i)
-		{
-			const auto counter = ProfileEvents::counters[i];
-			const auto counter_increment = counter - prev_counters[i];
-			prev_counters[i] = counter;
-
-			std::string key{ProfileEvents::getDescription(static_cast<ProfileEvents::Event>(i))};
-			key_vals.emplace_back(event_path_prefix + key, counter_increment);
-		}
-
-		Daemon::instance().writeToGraphite(key_vals);
-	}
-
-	/// Значения счётчиков при предыдущей отправке (или нули, если ни разу не отправляли).
-	decltype(ProfileEvents::counters) prev_counters{};
-
-	bool quit = false;
-	std::mutex mutex;
-	std::condition_variable cond;
-	std::thread thread{&ProfileEventsTransmitter::run, this};
-
-	static constexpr auto event_path_prefix = "ClickHouse.ProfileEvents.";
-};
-
-}
-
 namespace DB
 {
 
-/** Каждые две секунды проверяет, не изменился ли конфиг.
-  *  Когда изменился, запускает на нем ConfigProcessor и вызывает setUsersConfig у контекста.
-  * NOTE: Не перезагружает конфиг, если изменились другие файлы, влияющие на обработку конфига: metrika.xml
-  *  и содержимое conf.d и users.d. Это можно исправить, переместив проверку времени изменения файлов в ConfigProcessor.
-  */
-class UsersConfigReloader
-{
-public:
-	UsersConfigReloader(const std::string & path, Context * context);
-	~UsersConfigReloader();
-private:
-	std::string path;
-	Context * context;
-
-	time_t file_modification_time;
-	std::atomic<bool> quit;
-	std::thread thread;
-
-	Logger * log;
-
-	void reloadIfNewer(bool force);
-	void run();
-};
-
 
 /// Отвечает "Ok.\n". Используется для проверки живости.
 class PingRequestHandler : public Poco::Net::HTTPRequestHandler
@@ -181,75 +71,6 @@ public:
 };
 
 
-/// Отвечает "Ok.\n", если все реплики на этом сервере не слишком сильно отстают. Иначе выводит информацию об отставании. TODO Вынести в отдельный файл.
-class ReplicasStatusHandler : public Poco::Net::HTTPRequestHandler
-{
-private:
-	Context & context;
-
-public:
-	ReplicasStatusHandler(Context & context_)
-		: context(context_)
-	{
-	}
-
-	void handleRequest(Poco::Net::HTTPServerRequest & request, Poco::Net::HTTPServerResponse & response)
-	{
-		try
-		{
-			/// Собираем набор реплицируемых таблиц.
-			Databases replicated_tables;
-			{
-				Poco::ScopedLock<Poco::Mutex> lock(context.getMutex());
-
-				for (const auto & db : context.getDatabases())
-					for (const auto & table : db.second)
-						if (typeid_cast<const StorageReplicatedMergeTree *>(table.second.get()))
-							replicated_tables[db.first][table.first] = table.second;
-			}
-
-			const MergeTreeSettings & settings = context.getMergeTreeSettings();
-
-			bool ok = /*true*/false;
-			std::stringstream message;
-
-			for (const auto & db : replicated_tables)
-			{
-				for (const auto & table : db.second)
-				{
-					time_t absolute_delay = 0;
-					time_t relative_delay = 0;
-
-					static_cast<const StorageReplicatedMergeTree &>(*table.second).getReplicaDelays(absolute_delay, relative_delay);
-
-					if ((settings.min_absolute_delay_to_close && absolute_delay >= static_cast<time_t>(settings.min_absolute_delay_to_close))
-						|| (settings.min_relative_delay_to_close && relative_delay >= static_cast<time_t>(settings.min_relative_delay_to_close)))
-						ok = false;
-
-					message << backQuoteIfNeed(db.first) << "." << backQuoteIfNeed(table.first)
-						<< "\tAbsolute delay: " << absolute_delay << ". Relative delay: " << relative_delay << ".\n";
-				}
-			}
-
-			if (ok)
-			{
-				const char * data = "Ok.\n";
-				response.sendBuffer(data, strlen(data));
-			}
-			else
-			{
-				response.send() << message.rdbuf();
-			}
-		}
-		catch (...)
-		{
-			/// TODO Отправлять клиенту.
-			tryLogCurrentException("ReplicasStatusHandler");
-		}
-	}
-};
-
-
 /// Отвечает 404 с подробным объяснением.
 class NotFoundHandler : public Poco::Net::HTTPRequestHandler
 {
@@ -299,23 +120,29 @@ public:
 
 		const auto & uri = request.getURI();
 
+		if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET
+			|| request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD)
+		{
+			if (uri == "/" || uri == "/ping")
+				return new PingRequestHandler;
+			else if (0 == uri.compare(0, strlen("/replicas_status"), "/replicas_status"))
+				return new ReplicasStatusHandler(*server.global_context);
+		}
+
 		if (uri.find('?') != std::string::npos
 			|| request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST)
 		{
 			return new HandlerType(server);
 		}
-		else if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET
-			|| request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD)
+
+		if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET
+			|| request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD
+			|| request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST)
 		{
-			if (uri == "/" || uri == "/ping")
-				return new PingRequestHandler;
-			else if (uri == "/replicas_status")
-				return new ReplicasStatusHandler(*server.global_context);
-			else
-				return new NotFoundHandler;
+			return new NotFoundHandler;
 		}
-		else
-			return nullptr;
+
+		return nullptr;
 	}
 };
 
@@ -338,201 +165,6 @@ public:
 };
 
 
-UsersConfigReloader::UsersConfigReloader(const std::string & path_, Context * context_)
-	: path(path_), context(context_), file_modification_time(0), quit(false), log(&Logger::get("UsersConfigReloader"))
-{
-	/// Если путь к конфигу не абсолютный, угадаем, относительно чего он задан.
-	/// Сначала поищем его рядом с основным конфигом, потом - в текущей директории.
-	if (path.empty() || path[0] != '/')
-	{
-		std::string main_config_path = Application::instance().config().getString("config-file", "config.xml");
-		std::string config_dir = Poco::Path(main_config_path).parent().toString();
-		if (Poco::File(config_dir + path).exists())
-			path = config_dir + path;
-	}
-
-	reloadIfNewer(true);
-	thread = std::thread(&UsersConfigReloader::run, this);
-}
-
-UsersConfigReloader::~UsersConfigReloader()
-{
-	try
-	{
-		quit = true;
-		thread.join();
-	}
-	catch (...)
-	{
-		tryLogCurrentException("~UsersConfigReloader");
-	}
-}
-
-void UsersConfigReloader::run()
-{
-	setThreadName("UserConfReload");
-
-	while (!quit)
-	{
-		std::this_thread::sleep_for(std::chrono::seconds(2));
-		reloadIfNewer(false);
-	}
-}
-
-void UsersConfigReloader::reloadIfNewer(bool force)
-{
-	Poco::File f(path);
-	if (!f.exists())
-	{
-		if (force)
-			throw Exception("Users config not found at: " + path, ErrorCodes::FILE_DOESNT_EXIST);
-		if (file_modification_time)
-		{
-			LOG_ERROR(log, "Users config not found at: " << path);
-			file_modification_time = 0;
-		}
-		return;
-	}
-	time_t new_modification_time = f.getLastModified().epochTime();
-	if (!force && new_modification_time == file_modification_time)
-		return;
-	file_modification_time = new_modification_time;
-
-	LOG_DEBUG(log, "Loading users config");
-
-	ConfigurationPtr config;
-
-	try
-	{
-		config = ConfigProcessor(!force).loadConfig(path);
-	}
-	catch (Poco::Exception & e)
-	{
-		if (force)
-			throw;
-
-		LOG_ERROR(log, "Error loading users config: " << e.what() << ": " << e.displayText());
-		return;
-	}
-	catch (...)
-	{
-		if (force)
-			throw;
-
-		LOG_ERROR(log, "Error loading users config.");
-		return;
-	}
-
-	try
-	{
-		context->setUsersConfig(config);
-	}
-	catch (Exception & e)
-	{
-		if (force)
-			throw;
-
-		LOG_ERROR(log, "Error updating users config: " << e.what() << ": " << e.displayText() << "\n" << e.getStackTrace().toString());
-	}
-	catch (Poco::Exception & e)
-	{
-		if (force)
-			throw;
-
-		LOG_ERROR(log, "Error updating users config: " << e.what() << ": " << e.displayText());
-	}
-	catch (...)
-	{
-		if (force)
-			throw;
-
-		LOG_ERROR(log, "Error updating users config.");
-	}
-}
-
-
-/** Обеспечивает, что с одной директорией с данными может одновременно работать не более одного сервера.
-  */
-class StatusFile : private boost::noncopyable
-{
-public:
-	StatusFile(const std::string & path_)
-		: path(path_)
-	{
-		/// Если файл уже существует. NOTE Незначительный race condition.
-		if (Poco::File(path).exists())
-		{
-			std::string contents;
-			{
-				ReadBufferFromFile in(path, 1024);
-				LimitReadBuffer limit_in(in, 1024);
-				WriteBufferFromString out(contents);
-				copyData(limit_in, out);
-			}
-
-			if (!contents.empty())
-				LOG_INFO(&Logger::get("StatusFile"), "Status file " << path << " already exists - unclean restart. Contents:\n" << contents);
-			else
-				LOG_INFO(&Logger::get("StatusFile"), "Status file " << path << " already exists and is empty - probably unclean hardware restart.");
-		}
-
-		fd = open(path.c_str(), O_WRONLY | O_CREAT, 0666);
-
-		if (-1 == fd)
-			throwFromErrno("Cannot open file " + path);
-
-		try
-		{
-			int flock_ret = flock(fd, LOCK_EX | LOCK_NB);
-			if (-1 == flock_ret)
-			{
-				if (errno == EWOULDBLOCK)
-					throw Exception("Cannot lock file " + path + ". Another server instance in same directory is already running.");
-				else
-					throwFromErrno("Cannot lock file " + path);
-			}
-
-			if (0 != ftruncate(fd, 0))
-				throwFromErrno("Cannot ftruncate " + path);
-
-			if (0 != lseek(fd, 0, SEEK_SET))
-				throwFromErrno("Cannot lseek " + path);
-
-			/// Записываем в файл информацию о текущем экземпляре сервера.
-			{
-				WriteBufferFromFileDescriptor out(fd, 1024);
-				out
-					<< "PID: " << getpid() << "\n"
-					<< "Started at: " << mysqlxx::DateTime(time(0)) << "\n"
-					<< "Revision: " << Revision::get() << "\n";
-			}
-		}
-		catch (...)
-		{
-			close(fd);
-			throw;
-		}
-	}
-
-	~StatusFile()
-	{
-		char buf[128];
-
-		if (0 != close(fd))
-			LOG_ERROR(&Logger::get("StatusFile"), "Cannot close file " << path << ", errno: "
-				<< errno << ", strerror: " << strerror_r(errno, buf, sizeof(buf)));
-
-		if (0 != unlink(path.c_str()))
-			LOG_ERROR(&Logger::get("StatusFile"), "Cannot unlink file " << path << ", errno: "
-				<< errno << ", strerror: " << strerror_r(errno, buf, sizeof(buf)));
-	}
-
-private:
-	const std::string path;
-	int fd = -1;
-};
-
-
 int Server::main(const std::vector<std::string> & args)
 {
 	Logger * log = &logger();
@@ -704,8 +336,8 @@ int Server::main(const std::vector<std::string> & args)
 	);
 
 	{
-		const auto profile_events_transmitter = config().getBool("use_graphite", true)
-			? std::make_unique<ProfileEventsTransmitter>()
+		const auto metrics_transmitter = config().getBool("use_graphite", true)
+			? std::make_unique<MetricsTransmitter>()
 			: nullptr;
 
 		const std::string listen_host = config().getString("listen_host", "::");
diff --git a/dbms/src/Server/Server.h b/dbms/src/Server/Server.h
index 45e8b99a88e..b5e124a3174 100644
--- a/dbms/src/Server/Server.h
+++ b/dbms/src/Server/Server.h
@@ -18,7 +18,7 @@
 #include <Poco/Net/TCPServerConnection.h>
 
 #include <common/logger_useful.h>
-#include <statdaemons/daemon.h>
+#include <daemon/Daemon.h>
 #include <DB/Common/HTMLForm.h>
 
 #include <DB/Interpreters/Context.h>
diff --git a/dbms/src/Server/StatusFile.cpp b/dbms/src/Server/StatusFile.cpp
new file mode 100644
index 00000000000..7be5064e7ed
--- /dev/null
+++ b/dbms/src/Server/StatusFile.cpp
@@ -0,0 +1,97 @@
+#include "StatusFile.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/file.h>
+#include <fcntl.h>
+
+#include <Poco/File.h>
+#include <common/logger_useful.h>
+#include <common/Revision.h>
+#include <mysqlxx/DateTime.h>
+
+#include <DB/IO/copyData.h>
+#include <DB/IO/ReadBufferFromFile.h>
+#include <DB/IO/LimitReadBuffer.h>
+#include <DB/IO/WriteBufferFromString.h>
+#include <DB/IO/WriteBufferFromFileDescriptor.h>
+#include <DB/IO/Operators.h>
+
+
+namespace DB
+{
+
+
+StatusFile::StatusFile(const std::string & path_)
+	: path(path_)
+{
+	/// Если файл уже существует. NOTE Незначительный race condition.
+	if (Poco::File(path).exists())
+	{
+		std::string contents;
+		{
+			ReadBufferFromFile in(path, 1024);
+			LimitReadBuffer limit_in(in, 1024);
+			WriteBufferFromString out(contents);
+			copyData(limit_in, out);
+		}
+
+		if (!contents.empty())
+			LOG_INFO(&Logger::get("StatusFile"), "Status file " << path << " already exists - unclean restart. Contents:\n" << contents);
+		else
+			LOG_INFO(&Logger::get("StatusFile"), "Status file " << path << " already exists and is empty - probably unclean hardware restart.");
+	}
+
+	fd = open(path.c_str(), O_WRONLY | O_CREAT, 0666);
+
+	if (-1 == fd)
+		throwFromErrno("Cannot open file " + path);
+
+	try
+	{
+		int flock_ret = flock(fd, LOCK_EX | LOCK_NB);
+		if (-1 == flock_ret)
+		{
+			if (errno == EWOULDBLOCK)
+				throw Exception("Cannot lock file " + path + ". Another server instance in same directory is already running.");
+			else
+				throwFromErrno("Cannot lock file " + path);
+		}
+
+		if (0 != ftruncate(fd, 0))
+			throwFromErrno("Cannot ftruncate " + path);
+
+		if (0 != lseek(fd, 0, SEEK_SET))
+			throwFromErrno("Cannot lseek " + path);
+
+		/// Записываем в файл информацию о текущем экземпляре сервера.
+		{
+			WriteBufferFromFileDescriptor out(fd, 1024);
+			out
+				<< "PID: " << getpid() << "\n"
+				<< "Started at: " << mysqlxx::DateTime(time(0)) << "\n"
+				<< "Revision: " << Revision::get() << "\n";
+		}
+	}
+	catch (...)
+	{
+		close(fd);
+		throw;
+	}
+}
+
+
+StatusFile::~StatusFile()
+{
+	char buf[128];
+
+	if (0 != close(fd))
+		LOG_ERROR(&Logger::get("StatusFile"), "Cannot close file " << path << ", errno: "
+			<< errno << ", strerror: " << strerror_r(errno, buf, sizeof(buf)));
+
+	if (0 != unlink(path.c_str()))
+		LOG_ERROR(&Logger::get("StatusFile"), "Cannot unlink file " << path << ", errno: "
+			<< errno << ", strerror: " << strerror_r(errno, buf, sizeof(buf)));
+}
+
+}
diff --git a/dbms/src/Server/StatusFile.h b/dbms/src/Server/StatusFile.h
new file mode 100644
index 00000000000..a94db21e0cb
--- /dev/null
+++ b/dbms/src/Server/StatusFile.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <string>
+#include <boost/noncopyable.hpp>
+
+
+namespace DB
+{
+
+
+/** Обеспечивает, что с одной директорией с данными может одновременно работать не более одного сервера.
+  */
+class StatusFile : private boost::noncopyable
+{
+public:
+	StatusFile(const std::string & path_);
+	~StatusFile();
+
+private:
+	const std::string path;
+	int fd = -1;
+};
+
+
+}
diff --git a/dbms/src/Server/TCPHandler.cpp b/dbms/src/Server/TCPHandler.cpp
index 8c7c57be4c9..ef0c888b108 100644
--- a/dbms/src/Server/TCPHandler.cpp
+++ b/dbms/src/Server/TCPHandler.cpp
@@ -6,7 +6,6 @@
 
 #include <DB/Common/Stopwatch.h>
 
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Core/Progress.h>
 
 #include <DB/IO/CompressedReadBuffer.h>
@@ -33,6 +32,18 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CLIENT_HAS_CONNECTED_TO_WRONG_PORT;
+	extern const int UNKNOWN_DATABASE;
+	extern const int UNKNOWN_EXCEPTION;
+	extern const int UNKNOWN_PACKET_FROM_CLIENT;
+	extern const int POCO_EXCEPTION;
+	extern const int STD_EXCEPTION;
+	extern const int SOCKET_TIMEOUT;
+	extern const int UNEXPECTED_PACKET_FROM_CLIENT;
+}
+
 
 void TCPHandler::runImpl()
 {
@@ -712,34 +723,16 @@ void TCPHandler::run()
 
 		LOG_INFO(log, "Done processing connection.");
 	}
-	catch (Exception & e)
-	{
-		LOG_ERROR(log, "Code: " << e.code() << ", e.displayText() = " << e.displayText() << ", e.what() = " << e.what()
-			<< ", Stack trace:\n\n" << e.getStackTrace().toString());
-	}
 	catch (Poco::Exception & e)
 	{
-		std::stringstream message;
-		message << "Poco::Exception. Code: " << ErrorCodes::POCO_EXCEPTION << ", e.code() = " << e.code()
-			<< ", e.displayText() = " << e.displayText() << ", e.what() = " << e.what();
-
 		/// Таймаут - не ошибка.
 		if (!strcmp(e.what(), "Timeout"))
 		{
-			LOG_DEBUG(log, message.rdbuf());
+			LOG_DEBUG(log, "Poco::Exception. Code: " << ErrorCodes::POCO_EXCEPTION << ", e.code() = " << e.code()
+				<< ", e.displayText() = " << e.displayText() << ", e.what() = " << e.what());
 		}
 		else
-		{
-			LOG_ERROR(log, message.rdbuf());
-		}
-	}
-	catch (std::exception & e)
-	{
-		LOG_ERROR(log, "std::exception. Code: " << ErrorCodes::STD_EXCEPTION << ". " << e.what());
-	}
-	catch (...)
-	{
-		LOG_ERROR(log, "Unknown exception. Code: " << ErrorCodes::UNKNOWN_EXCEPTION << ".");
+			throw;
 	}
 }
 
diff --git a/dbms/src/Server/UsersConfigReloader.cpp b/dbms/src/Server/UsersConfigReloader.cpp
new file mode 100644
index 00000000000..88fdb709530
--- /dev/null
+++ b/dbms/src/Server/UsersConfigReloader.cpp
@@ -0,0 +1,135 @@
+#include "UsersConfigReloader.h"
+
+#include <Poco/Util/Application.h>
+#include <Poco/File.h>
+
+#include <common/logger_useful.h>
+
+#include <DB/Interpreters/Context.h>
+#include <DB/Common/setThreadName.h>
+#include <DB/Common/ConfigProcessor.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes { extern const int FILE_DOESNT_EXIST; }
+
+
+UsersConfigReloader::UsersConfigReloader(const std::string & path_, Context * context_)
+	: path(path_), context(context_), file_modification_time(0), quit(false), log(&Logger::get("UsersConfigReloader"))
+{
+	/// Если путь к конфигу не абсолютный, угадаем, относительно чего он задан.
+	/// Сначала поищем его рядом с основным конфигом, потом - в текущей директории.
+	if (path.empty() || path[0] != '/')
+	{
+		std::string main_config_path = Poco::Util::Application::instance().config().getString("config-file", "config.xml");
+		std::string config_dir = Poco::Path(main_config_path).parent().toString();
+		if (Poco::File(config_dir + path).exists())
+			path = config_dir + path;
+	}
+
+	reloadIfNewer(true);
+	thread = std::thread(&UsersConfigReloader::run, this);
+}
+
+
+UsersConfigReloader::~UsersConfigReloader()
+{
+	try
+	{
+		quit = true;
+		thread.join();
+	}
+	catch (...)
+	{
+		tryLogCurrentException("~UsersConfigReloader");
+	}
+}
+
+
+void UsersConfigReloader::run()
+{
+	setThreadName("UserConfReload");
+
+	while (!quit)
+	{
+		std::this_thread::sleep_for(std::chrono::seconds(2));
+		reloadIfNewer(false);
+	}
+}
+
+
+void UsersConfigReloader::reloadIfNewer(bool force)
+{
+	Poco::File f(path);
+	if (!f.exists())
+	{
+		if (force)
+			throw Exception("Users config not found at: " + path, ErrorCodes::FILE_DOESNT_EXIST);
+		if (file_modification_time)
+		{
+			LOG_ERROR(log, "Users config not found at: " << path);
+			file_modification_time = 0;
+		}
+		return;
+	}
+	time_t new_modification_time = f.getLastModified().epochTime();
+	if (!force && new_modification_time == file_modification_time)
+		return;
+	file_modification_time = new_modification_time;
+
+	LOG_DEBUG(log, "Loading users config");
+
+	ConfigurationPtr config;
+
+	try
+	{
+		config = ConfigProcessor(!force).loadConfig(path);
+	}
+	catch (Poco::Exception & e)
+	{
+		if (force)
+			throw;
+
+		LOG_ERROR(log, "Error loading users config: " << e.what() << ": " << e.displayText());
+		return;
+	}
+	catch (...)
+	{
+		if (force)
+			throw;
+
+		LOG_ERROR(log, "Error loading users config.");
+		return;
+	}
+
+	try
+	{
+		context->setUsersConfig(config);
+	}
+	catch (Exception & e)
+	{
+		if (force)
+			throw;
+
+		LOG_ERROR(log, "Error updating users config: " << e.what() << ": " << e.displayText() << "\n" << e.getStackTrace().toString());
+	}
+	catch (Poco::Exception & e)
+	{
+		if (force)
+			throw;
+
+		LOG_ERROR(log, "Error updating users config: " << e.what() << ": " << e.displayText());
+	}
+	catch (...)
+	{
+		if (force)
+			throw;
+
+		LOG_ERROR(log, "Error updating users config.");
+	}
+}
+
+
+}
diff --git a/dbms/src/Server/UsersConfigReloader.h b/dbms/src/Server/UsersConfigReloader.h
new file mode 100644
index 00000000000..d26299ed87d
--- /dev/null
+++ b/dbms/src/Server/UsersConfigReloader.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <time.h>
+#include <string>
+#include <thread>
+#include <atomic>
+
+
+namespace Poco { class Logger; }
+
+namespace DB
+{
+
+class Context;
+
+/** Каждые две секунды проверяет, не изменился ли конфиг.
+  *  Когда изменился, запускает на нем ConfigProcessor и вызывает setUsersConfig у контекста.
+  * NOTE: Не перезагружает конфиг, если изменились другие файлы, влияющие на обработку конфига: metrika.xml
+  *  и содержимое conf.d и users.d. Это можно исправить, переместив проверку времени изменения файлов в ConfigProcessor.
+  */
+class UsersConfigReloader
+{
+public:
+	UsersConfigReloader(const std::string & path, Context * context);
+	~UsersConfigReloader();
+
+private:
+	std::string path;
+	Context * context;
+
+	time_t file_modification_time;
+	std::atomic<bool> quit;
+	std::thread thread;
+
+	Poco::Logger * log;
+
+	void reloadIfNewer(bool force);
+	void run();
+};
+
+}
diff --git a/dbms/src/Storages/AlterCommands.cpp b/dbms/src/Storages/AlterCommands.cpp
index ad80a902173..fd9c0250bdb 100644
--- a/dbms/src/Storages/AlterCommands.cpp
+++ b/dbms/src/Storages/AlterCommands.cpp
@@ -4,334 +4,344 @@
 #include <DB/DataTypes/DataTypeNested.h>
 #include <DB/Interpreters/Context.h>
 #include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <DB/Interpreters/ExpressionActions.h>
 #include <DB/Parsers/ASTIdentifier.h>
 
 
 namespace DB
 {
-	void AlterCommand::apply(
-		NamesAndTypesList & columns, NamesAndTypesList & materialized_columns, NamesAndTypesList & alias_columns,
-		ColumnDefaults & column_defaults) const
+
+namespace ErrorCodes
+{
+	extern const int ILLEGAL_COLUMN;
+	extern const int LOGICAL_ERROR;
+}
+
+
+void AlterCommand::apply(
+	NamesAndTypesList & columns, NamesAndTypesList & materialized_columns, NamesAndTypesList & alias_columns,
+	ColumnDefaults & column_defaults) const
+{
+	if (type == ADD)
 	{
-		if (type == ADD)
-		{
-			const auto exists_in = [this] (const NamesAndTypesList & columns) {
-				return columns.end() != std::find_if(columns.begin(), columns.end(),
-					std::bind(namesEqual, std::cref(column_name), std::placeholders::_1));
-			};
+		const auto exists_in = [this] (const NamesAndTypesList & columns) {
+			return columns.end() != std::find_if(columns.begin(), columns.end(),
+				std::bind(namesEqual, std::cref(column_name), std::placeholders::_1));
+		};
 
-			if (exists_in(columns) ||
-				exists_in(materialized_columns) ||
-				exists_in(alias_columns))
+		if (exists_in(columns) ||
+			exists_in(materialized_columns) ||
+			exists_in(alias_columns))
+		{
+			throw Exception{
+				"Cannot add column " + column_name + ": column with this name already exists",
+				DB::ErrorCodes::ILLEGAL_COLUMN
+			};
+		}
+
+		const auto add_column = [this] (NamesAndTypesList & columns)
+		{
+			auto insert_it = columns.end();
+
+			if (!after_column.empty())
 			{
-				throw Exception{
-					"Cannot add column " + column_name + ": column with this name already exists",
-					DB::ErrorCodes::ILLEGAL_COLUMN
-				};
+				/// Пытаемся найти первую с конца колонку с именем column_name или с именем, начинающимся с column_name и ".".
+				/// Например "fruits.bananas"
+				/// одинаковыми считаются имена, если они совпадают целиком или name_without_dot совпадает с частью имени до точки
+				const auto reverse_insert_it = std::find_if(columns.rbegin(), columns.rend(),
+					std::bind(namesEqual, std::cref(after_column), std::placeholders::_1));
+
+				if (reverse_insert_it == columns.rend())
+					throw Exception("Wrong column name. Cannot find column " + after_column + " to insert after",
+									DB::ErrorCodes::ILLEGAL_COLUMN);
+				else
+				{
+					/// base возвращает итератор, уже смещенный на один элемент вправо
+					insert_it = reverse_insert_it.base();
+				}
 			}
 
-			const auto add_column = [this] (NamesAndTypesList & columns)
+			columns.emplace(insert_it, column_name, data_type);
+		};
+
+		if (default_type == ColumnDefaultType::Default)
+			add_column(columns);
+		else if (default_type == ColumnDefaultType::Materialized)
+			add_column(materialized_columns);
+		else if (default_type == ColumnDefaultType::Alias)
+			add_column(alias_columns);
+		else
+			throw Exception{"Unknown ColumnDefaultType value", ErrorCodes::LOGICAL_ERROR};
+
+		if (default_expression)
+			column_defaults.emplace(column_name, ColumnDefault{default_type, default_expression});
+
+		/// Медленно, так как каждый раз копируется список
+		columns = *DataTypeNested::expandNestedColumns(columns);
+	}
+	else if (type == DROP)
+	{
+		/// look for a column in list and remove it if present, also removing corresponding entry from column_defaults
+		const auto remove_column = [&column_defaults, this] (NamesAndTypesList & columns) {
+			auto removed = false;
+			NamesAndTypesList::iterator column_it;
+
+			while (columns.end() != (column_it = std::find_if(columns.begin(), columns.end(),
+				std::bind(namesEqual, std::cref(column_name), std::placeholders::_1))))
 			{
-				auto insert_it = columns.end();
+				removed = true;
+				column_it = columns.erase(column_it);
+				column_defaults.erase(column_name);
+			}
 
-				if (!after_column.empty())
-				{
-					/// Пытаемся найти первую с конца колонку с именем column_name или с именем, начинающимся с column_name и ".".
-					/// Например "fruits.bananas"
-					/// одинаковыми считаются имена, если они совпадают целиком или name_without_dot совпадает с частью имени до точки
-					const auto reverse_insert_it = std::find_if(columns.rbegin(), columns.rend(),
-						std::bind(namesEqual, std::cref(after_column), std::placeholders::_1));
+			return removed;
+		};
 
-					if (reverse_insert_it == columns.rend())
-						throw Exception("Wrong column name. Cannot find column " + after_column + " to insert after",
-										DB::ErrorCodes::ILLEGAL_COLUMN);
-					else
-					{
-						/// base возвращает итератор, уже смещенный на один элемент вправо
-						insert_it = reverse_insert_it.base();
-					}
-				}
-
-				columns.emplace(insert_it, column_name, data_type);
-			};
-
-			if (default_type == ColumnDefaultType::Default)
-				add_column(columns);
-			else if (default_type == ColumnDefaultType::Materialized)
-				add_column(materialized_columns);
-			else if (default_type == ColumnDefaultType::Alias)
-				add_column(alias_columns);
-			else
-				throw Exception{"Unknown ColumnDefaultType value", ErrorCodes::LOGICAL_ERROR};
-
-			if (default_expression)
-				column_defaults.emplace(column_name, ColumnDefault{default_type, default_expression});
-
-			/// Медленно, так как каждый раз копируется список
-			columns = *DataTypeNested::expandNestedColumns(columns);
-		}
-		else if (type == DROP)
+		if (!remove_column(columns) &&
+			!remove_column(materialized_columns) &&
+			!remove_column(alias_columns))
 		{
-			/// look for a column in list and remove it if present, also removing corresponding entry from column_defaults
-			const auto remove_column = [&column_defaults, this] (NamesAndTypesList & columns) {
-				auto removed = false;
-				NamesAndTypesList::iterator column_it;
+			throw Exception("Wrong column name. Cannot find column " + column_name + " to drop",
+							DB::ErrorCodes::ILLEGAL_COLUMN);
+		}
+	}
+	else if (type == MODIFY)
+	{
+		const auto default_it = column_defaults.find(column_name);
+		const auto had_default_expr = default_it != std::end(column_defaults);
+		const auto old_default_type = had_default_expr ? default_it->second.type : ColumnDefaultType{};
 
-				while (columns.end() != (column_it = std::find_if(columns.begin(), columns.end(),
-					std::bind(namesEqual, std::cref(column_name), std::placeholders::_1))))
-				{
-					removed = true;
-					column_it = columns.erase(column_it);
-					column_defaults.erase(column_name);
-				}
+		/// target column list
+		auto & new_columns = default_type == ColumnDefaultType::Default ?
+			columns : default_type == ColumnDefaultType::Materialized ?
+			materialized_columns : alias_columns;
 
-				return removed;
-			};
-
-			if (!remove_column(columns) &&
-				!remove_column(materialized_columns) &&
-				!remove_column(alias_columns))
-			{
-				throw Exception("Wrong column name. Cannot find column " + column_name + " to drop",
+		/// find column or throw exception
+		const auto find_column = [this] (NamesAndTypesList & columns) {
+			const auto it = std::find_if(columns.begin(), columns.end(),
+				std::bind(namesEqual, std::cref(column_name), std::placeholders::_1) );
+			if (it == columns.end())
+				throw Exception("Wrong column name. Cannot find column " + column_name + " to modify",
 								DB::ErrorCodes::ILLEGAL_COLUMN);
-			}
-		}
-		else if (type == MODIFY)
-		{
-			const auto default_it = column_defaults.find(column_name);
-			const auto had_default_expr = default_it != std::end(column_defaults);
-			const auto old_default_type = had_default_expr ? default_it->second.type : ColumnDefaultType{};
 
-			/// target column list
-			auto & new_columns = default_type == ColumnDefaultType::Default ?
-				columns : default_type == ColumnDefaultType::Materialized ?
+			return it;
+		};
+
+		/// if default types differ, remove column from the old list, then add to the new list
+		if (default_type != old_default_type)
+		{
+			/// source column list
+			auto & old_columns = old_default_type == ColumnDefaultType::Default ?
+				columns : old_default_type == ColumnDefaultType::Materialized ?
 				materialized_columns : alias_columns;
 
-			/// find column or throw exception
-			const auto find_column = [this] (NamesAndTypesList & columns) {
-				const auto it = std::find_if(columns.begin(), columns.end(),
-					std::bind(namesEqual, std::cref(column_name), std::placeholders::_1) );
-				if (it == columns.end())
-					throw Exception("Wrong column name. Cannot find column " + column_name + " to modify",
-									DB::ErrorCodes::ILLEGAL_COLUMN);
+			const auto old_column_it = find_column(old_columns);
+			new_columns.emplace_back(*old_column_it);
+			old_columns.erase(old_column_it);
 
-				return it;
-			};
+			/// do not forget to change the default type of old column
+			if (had_default_expr)
+				column_defaults[column_name].type = default_type;
+		}
 
-			/// if default types differ, remove column from the old list, then add to the new list
-			if (default_type != old_default_type)
+		/// find column in one of three column lists
+		const auto column_it = find_column(new_columns);
+		column_it->type = data_type;
+
+		if (!default_expression && had_default_expr)
+			/// new column has no default expression, remove it from column_defaults along with it's type
+			column_defaults.erase(column_name);
+		else if (default_expression && !had_default_expr)
+			/// new column has a default expression while the old one had not, add it it column_defaults
+			column_defaults.emplace(column_name, ColumnDefault{default_type, default_expression});
+		else if (had_default_expr)
+			/// both old and new columns have default expression, update it
+			column_defaults[column_name].expression = default_expression;
+	}
+	else
+		throw Exception("Wrong parameter type in ALTER query", ErrorCodes::LOGICAL_ERROR);
+}
+
+void AlterCommands::apply(NamesAndTypesList & columns,
+			NamesAndTypesList & materialized_columns,
+			NamesAndTypesList & alias_columns,
+			ColumnDefaults & column_defaults) const
+{
+	auto new_columns = columns;
+	auto new_materialized_columns = materialized_columns;
+	auto new_alias_columns = alias_columns;
+	auto new_column_defaults = column_defaults;
+
+	for (const AlterCommand & command : *this)
+		command.apply(new_columns, new_materialized_columns, new_alias_columns, new_column_defaults);
+
+	columns = std::move(new_columns);
+	materialized_columns = std::move(new_materialized_columns);
+	alias_columns = std::move(new_alias_columns);
+	column_defaults = std::move(new_column_defaults);
+}
+
+void AlterCommands::validate(IStorage * table, const Context & context)
+{
+	auto columns = table->getColumnsList();
+	columns.insert(std::end(columns), std::begin(table->alias_columns), std::end(table->alias_columns));
+	auto defaults = table->column_defaults;
+
+	std::vector<std::pair<NameAndTypePair, AlterCommand *>> defaulted_columns{};
+
+	ASTPtr default_expr_list{new ASTExpressionList};
+	default_expr_list->children.reserve(defaults.size());
+
+	for (AlterCommand & command : *this)
+	{
+		if (command.type == AlterCommand::ADD || command.type == AlterCommand::MODIFY)
+		{
+			const auto & column_name = command.column_name;
+			const auto column_it = std::find_if(std::begin(columns), std::end(columns),
+				std::bind(AlterCommand::namesEqual, std::cref(command.column_name), std::placeholders::_1));
+
+			if (command.type == AlterCommand::ADD)
+			{
+				if (std::end(columns) != column_it)
+					throw Exception{
+						"Cannot add column " + column_name + ": column with this name already exisits",
+						DB::ErrorCodes::ILLEGAL_COLUMN
+					};
+			}
+			else if (command.type == AlterCommand::MODIFY)
 			{
-				/// source column list
-				auto & old_columns = old_default_type == ColumnDefaultType::Default ?
-					columns : old_default_type == ColumnDefaultType::Materialized ?
-					materialized_columns : alias_columns;
 
-				const auto old_column_it = find_column(old_columns);
-				new_columns.emplace_back(*old_column_it);
-				old_columns.erase(old_column_it);
+				if (std::end(columns) == column_it)
+					throw Exception{
+						"Wrong column name. Cannot find column " + column_name + " to modify",
+						DB::ErrorCodes::ILLEGAL_COLUMN
+					};
 
-				/// do not forget to change the default type of old column
-				if (had_default_expr)
-					column_defaults[column_name].type = default_type;
+				columns.erase(column_it);
+				defaults.erase(column_name);
 			}
 
-			/// find column in one of three column lists
-			const auto column_it = find_column(new_columns);
-			column_it->type = data_type;
+			/// we're creating dummy DataTypeUInt8 in order to prevent the NullPointerException in ExpressionActions
+			columns.emplace_back(column_name, command.data_type ? command.data_type : new DataTypeUInt8);
 
-			if (!default_expression && had_default_expr)
-				/// new column has no default expression, remove it from column_defaults along with it's type
-				column_defaults.erase(column_name);
-			else if (default_expression && !had_default_expr)
-				/// new column has a default expression while the old one had not, add it it column_defaults
-				column_defaults.emplace(column_name, ColumnDefault{default_type, default_expression});
-			else if (had_default_expr)
-				/// both old and new columns have default expression, update it
-				column_defaults[column_name].expression = default_expression;
+			if (command.default_expression)
+			{
+				if (command.data_type)
+				{
+					const auto & final_column_name = column_name;
+					const auto tmp_column_name = final_column_name + "_tmp";
+					const auto column_type_raw_ptr = command.data_type.get();
+
+					default_expr_list->children.emplace_back(setAlias(
+						makeASTFunction("CAST", ASTPtr{new ASTIdentifier{{}, tmp_column_name}},
+							ASTPtr{new ASTLiteral{{}, column_type_raw_ptr->getName()}}),
+						final_column_name));
+
+					default_expr_list->children.emplace_back(setAlias(command.default_expression->clone(), tmp_column_name));
+
+					defaulted_columns.emplace_back(NameAndTypePair{column_name, command.data_type}, &command);
+				}
+				else
+				{
+					/// no type explicitly specified, will deduce later
+					default_expr_list->children.emplace_back(
+						setAlias(command.default_expression->clone(), column_name));
+
+					defaulted_columns.emplace_back(NameAndTypePair{column_name, nullptr}, &command);
+				}
+			}
+		}
+		else if (command.type == AlterCommand::DROP)
+		{
+			auto found = false;
+			for (auto it = std::begin(columns); it != std::end(columns);)
+				if (AlterCommand::namesEqual(command.column_name, *it))
+				{
+					found = true;
+					it = columns.erase(it);
+				}
+				else
+					++it;
+
+			for (auto it = std::begin(defaults); it != std::end(defaults);)
+				if (AlterCommand::namesEqual(command.column_name, { it->first, nullptr }))
+					it = defaults.erase(it);
+				else
+					++it;
+
+			if (!found)
+				throw Exception("Wrong column name. Cannot find column " + command.column_name + " to drop",
+					DB::ErrorCodes::ILLEGAL_COLUMN);
+		}
+	}
+
+	/** Existing defaulted columns may require default expression extensions with a type conversion,
+		*  therefore we add them to defaulted_columns to allow further processing */
+	for (const auto & col_def : defaults)
+	{
+		const auto & column_name = col_def.first;
+		const auto column_it = std::find_if(columns.begin(), columns.end(), [&] (const NameAndTypePair & name_type) {
+			return AlterCommand::namesEqual(column_name, name_type);
+		});
+		const auto tmp_column_name = column_name + "_tmp";
+		const auto & column_type_ptr = column_it->type;
+
+			default_expr_list->children.emplace_back(setAlias(
+				makeASTFunction("CAST", ASTPtr{new ASTIdentifier{{}, tmp_column_name}},
+					ASTPtr{new ASTLiteral{{}, column_type_ptr->getName()}}),
+				column_name));
+
+		default_expr_list->children.emplace_back(setAlias(col_def.second.expression->clone(), tmp_column_name));
+
+		defaulted_columns.emplace_back(NameAndTypePair{column_name, column_type_ptr}, nullptr);
+	}
+
+	const auto actions = ExpressionAnalyzer{default_expr_list, context, {}, columns}.getActions(true);
+	const auto block = actions->getSampleBlock();
+
+	/// set deduced types, modify default expression if necessary
+	for (auto & defaulted_column : defaulted_columns)
+	{
+		const auto & name_and_type = defaulted_column.first;
+		AlterCommand * & command_ptr = defaulted_column.second;
+
+		const auto & column_name = name_and_type.name;
+		const auto has_explicit_type = nullptr != name_and_type.type;
+
+		/// default expression on old column
+		if (has_explicit_type)
+		{
+			const auto & explicit_type = name_and_type.type;
+			const auto & tmp_column = block.getByName(column_name + "_tmp");
+			const auto & deduced_type = tmp_column.type;
+
+			// column not specified explicitly in the ALTER query may require default_expression modification
+			if (explicit_type->getName() != deduced_type->getName())
+			{
+				const auto default_it = defaults.find(column_name);
+
+				/// column has no associated alter command, let's create it
+				if (!command_ptr)
+				{
+					/// add a new alter command to modify existing column
+					this->emplace_back(AlterCommand{
+						AlterCommand::MODIFY, column_name, explicit_type,
+						default_it->second.type, default_it->second.expression
+					});
+
+					command_ptr = &this->back();
+				}
+
+				command_ptr->default_expression = makeASTFunction("CAST", command_ptr->default_expression->clone(),
+					ASTPtr{new ASTLiteral{{}, explicit_type->getName()}});
+			}
 		}
 		else
-			throw Exception("Wrong parameter type in ALTER query", ErrorCodes::LOGICAL_ERROR);
-	}
-
-	void AlterCommands::apply(NamesAndTypesList & columns,
-			   NamesAndTypesList & materialized_columns,
-			   NamesAndTypesList & alias_columns,
-			   ColumnDefaults & column_defaults) const
-	{
-		auto new_columns = columns;
-		auto new_materialized_columns = materialized_columns;
-		auto new_alias_columns = alias_columns;
-		auto new_column_defaults = column_defaults;
-
-		for (const AlterCommand & command : *this)
-			command.apply(new_columns, new_materialized_columns, new_alias_columns, new_column_defaults);
-
-		columns = std::move(new_columns);
-		materialized_columns = std::move(new_materialized_columns);
-		alias_columns = std::move(new_alias_columns);
-		column_defaults = std::move(new_column_defaults);
-	}
-
-	void AlterCommands::validate(IStorage * table, const Context & context)
-	{
-		auto columns = table->getColumnsList();
-		columns.insert(std::end(columns), std::begin(table->alias_columns), std::end(table->alias_columns));
-		auto defaults = table->column_defaults;
-
-		std::vector<std::pair<NameAndTypePair, AlterCommand *>> defaulted_columns{};
-
-		ASTPtr default_expr_list{new ASTExpressionList};
-		default_expr_list->children.reserve(defaults.size());
-
-		for (AlterCommand & command : *this)
 		{
-			if (command.type == AlterCommand::ADD || command.type == AlterCommand::MODIFY)
-			{
-				const auto & column_name = command.column_name;
-				const auto column_it = std::find_if(std::begin(columns), std::end(columns),
-					std::bind(AlterCommand::namesEqual, std::cref(command.column_name), std::placeholders::_1));
-
-				if (command.type == AlterCommand::ADD)
-				{
-					if (std::end(columns) != column_it)
-						throw Exception{
-							"Cannot add column " + column_name + ": column with this name already exisits",
-							DB::ErrorCodes::ILLEGAL_COLUMN
-						};
-				}
-				else if (command.type == AlterCommand::MODIFY)
-				{
-
-					if (std::end(columns) == column_it)
-						throw Exception{
-							"Wrong column name. Cannot find column " + column_name + " to modify",
-							DB::ErrorCodes::ILLEGAL_COLUMN
-						};
-
-					columns.erase(column_it);
-					defaults.erase(column_name);
-				}
-
-				/// we're creating dummy DataTypeUInt8 in order to prevent the NullPointerException in ExpressionActions
-				columns.emplace_back(column_name, command.data_type ? command.data_type : new DataTypeUInt8);
-
-				if (command.default_expression)
-				{
-					if (command.data_type)
-					{
-						const auto & final_column_name = column_name;
-						const auto tmp_column_name = final_column_name + "_tmp";
-						const auto column_type_raw_ptr = command.data_type.get();
-
-						default_expr_list->children.emplace_back(setAlias(
-							makeASTFunction("CAST", ASTPtr{new ASTIdentifier{{}, tmp_column_name}},
-								ASTPtr{new ASTLiteral{{}, column_type_raw_ptr->getName()}}),
-							final_column_name));
-
-						default_expr_list->children.emplace_back(setAlias(command.default_expression->clone(), tmp_column_name));
-
-						defaulted_columns.emplace_back(NameAndTypePair{column_name, command.data_type}, &command);
-					}
-					else
-					{
-						/// no type explicitly specified, will deduce later
-						default_expr_list->children.emplace_back(
-							setAlias(command.default_expression->clone(), column_name));
-
-						defaulted_columns.emplace_back(NameAndTypePair{column_name, nullptr}, &command);
-					}
-				}
-			}
-			else if (command.type == AlterCommand::DROP)
-			{
-				auto found = false;
-				for (auto it = std::begin(columns); it != std::end(columns);)
-					if (AlterCommand::namesEqual(command.column_name, *it))
-					{
-						found = true;
-						it = columns.erase(it);
-					}
-					else
-						++it;
-
-				for (auto it = std::begin(defaults); it != std::end(defaults);)
-					if (AlterCommand::namesEqual(command.column_name, { it->first, nullptr }))
-						it = defaults.erase(it);
-					else
-						++it;
-
-				if (!found)
-					throw Exception("Wrong column name. Cannot find column " + command.column_name + " to drop",
-						DB::ErrorCodes::ILLEGAL_COLUMN);
-			}
-		}
-
-		/** Existing defaulted columns may require default expression extensions with a type conversion,
-		 *  therefore we add them to defaulted_columns to allow further processing */
-		for (const auto & col_def : defaults)
-		{
-			const auto & column_name = col_def.first;
-			const auto column_it = std::find_if(columns.begin(), columns.end(), [&] (const NameAndTypePair & name_type) {
-				return AlterCommand::namesEqual(column_name, name_type);
-			});
-			const auto tmp_column_name = column_name + "_tmp";
-			const auto & column_type_ptr = column_it->type;
-
-				default_expr_list->children.emplace_back(setAlias(
-					makeASTFunction("CAST", ASTPtr{new ASTIdentifier{{}, tmp_column_name}},
-					    ASTPtr{new ASTLiteral{{}, column_type_ptr->getName()}}),
-					column_name));
-
-			default_expr_list->children.emplace_back(setAlias(col_def.second.expression->clone(), tmp_column_name));
-
-			defaulted_columns.emplace_back(NameAndTypePair{column_name, column_type_ptr}, nullptr);
-		}
-
-		const auto actions = ExpressionAnalyzer{default_expr_list, context, {}, columns}.getActions(true);
-		const auto block = actions->getSampleBlock();
-
-		/// set deduced types, modify default expression if necessary
-		for (auto & defaulted_column : defaulted_columns)
-		{
-			const auto & name_and_type = defaulted_column.first;
-			AlterCommand * & command_ptr = defaulted_column.second;
-
-			const auto & column_name = name_and_type.name;
-			const auto has_explicit_type = nullptr != name_and_type.type;
-
-			/// default expression on old column
-			if (has_explicit_type)
-			{
-				const auto & explicit_type = name_and_type.type;
-				const auto & tmp_column = block.getByName(column_name + "_tmp");
-				const auto & deduced_type = tmp_column.type;
-
-				// column not specified explicitly in the ALTER query may require default_expression modification
-				if (explicit_type->getName() != deduced_type->getName())
-				{
-					const auto default_it = defaults.find(column_name);
-
-					/// column has no associated alter command, let's create it
-					if (!command_ptr)
-					{
-						/// add a new alter command to modify existing column
-						this->emplace_back(AlterCommand{
-							AlterCommand::MODIFY, column_name, explicit_type,
-							default_it->second.type, default_it->second.expression
-						});
-
-						command_ptr = &this->back();
-					}
-
-					command_ptr->default_expression = makeASTFunction("CAST", command_ptr->default_expression->clone(),
-						ASTPtr{new ASTLiteral{{}, explicit_type->getName()}});
-				}
-			}
-			else
-			{
-				/// just set deduced type
-				command_ptr->data_type = block.getByName(column_name).type;
-			}
+			/// just set deduced type
+			command_ptr->data_type = block.getByName(column_name).type;
 		}
 	}
 }
+
+}
diff --git a/dbms/src/Storages/ColumnsDescription.cpp b/dbms/src/Storages/ColumnsDescription.cpp
index 989c629a4b8..4cd19c9e09a 100644
--- a/dbms/src/Storages/ColumnsDescription.cpp
+++ b/dbms/src/Storages/ColumnsDescription.cpp
@@ -11,6 +11,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_PARSE_TEXT;
+}
+
 
 template <bool store>
 String ColumnsDescription<store>::toString() const
diff --git a/dbms/src/Storages/ITableDeclaration.cpp b/dbms/src/Storages/ITableDeclaration.cpp
index 033e8aab4df..255d0142c6b 100644
--- a/dbms/src/Storages/ITableDeclaration.cpp
+++ b/dbms/src/Storages/ITableDeclaration.cpp
@@ -13,6 +13,17 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NO_SUCH_COLUMN_IN_TABLE;
+	extern const int EMPTY_LIST_OF_COLUMNS_QUERIED;
+	extern const int COLUMN_QUERIED_MORE_THAN_ONCE;
+	extern const int TYPE_MISMATCH;
+	extern const int DUPLICATE_COLUMN;
+	extern const int NOT_FOUND_COLUMN_IN_BLOCK;
+}
+
+
 NamesAndTypesList ITableDeclaration::getColumnsList() const
 {
 	return ext::collection_cast<NamesAndTypesList>(getColumnsListRange());
diff --git a/dbms/src/Storages/MergeTree/ActiveDataPartSet.cpp b/dbms/src/Storages/MergeTree/ActiveDataPartSet.cpp
index cb2a091d6d5..d9b6e945011 100644
--- a/dbms/src/Storages/MergeTree/ActiveDataPartSet.cpp
+++ b/dbms/src/Storages/MergeTree/ActiveDataPartSet.cpp
@@ -6,6 +6,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int BAD_DATA_PART_NAME;
+}
+
+
 ActiveDataPartSet::ActiveDataPartSet(const Strings & names)
 {
 	for (const auto & name : names)
diff --git a/dbms/src/Storages/MergeTree/BackgroundProcessingPool.cpp b/dbms/src/Storages/MergeTree/BackgroundProcessingPool.cpp
index 33f481ef328..111dd9a9c1b 100644
--- a/dbms/src/Storages/MergeTree/BackgroundProcessingPool.cpp
+++ b/dbms/src/Storages/MergeTree/BackgroundProcessingPool.cpp
@@ -1,5 +1,4 @@
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Common/setThreadName.h>
 #include <DB/IO/WriteHelpers.h>
 #include <common/logger_useful.h>
diff --git a/dbms/src/Storages/MergeTree/MergeTreeData.cpp b/dbms/src/Storages/MergeTree/MergeTreeData.cpp
index a25fec747ab..775caa1aa8e 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreeData.cpp
@@ -508,7 +508,7 @@ void MergeTreeData::createConvertExpression(const DataPartPtr & part, const Name
 
 				/// Нужно изменить тип столбца.
 				if (!out_expression)
-					out_expression = new ExpressionActions(NamesAndTypesList(), context.getSettingsRef());
+					out_expression = std::make_shared<ExpressionActions>(NamesAndTypesList(), context.getSettingsRef());
 
 				out_expression->addInput(ColumnWithTypeAndName(nullptr, column.type, column.name));
 
diff --git a/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp b/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp
index 3a71396aec1..5c5f1ca881d 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp
@@ -15,6 +15,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ABORTED;
+}
+
 /// Не будем соглашаться мерджить куски, если места на диске менее чем во столько раз больше суммарного размера кусков.
 static const double DISK_USAGE_COEFFICIENT_TO_SELECT = 1.6;
 
diff --git a/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index c74d6bbac42..fd9ea66e10d 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -23,6 +23,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int INDEX_NOT_USED;
+}
+
+
 MergeTreeDataSelectExecutor::MergeTreeDataSelectExecutor(MergeTreeData & data_)
 	: data(data_), log(&Logger::get(data.getLogName() + " (SelectExecutor)"))
 {
diff --git a/dbms/src/Storages/MergeTree/MergeTreePartChecker.cpp b/dbms/src/Storages/MergeTree/MergeTreePartChecker.cpp
index 5ed7f94b7b3..5b9bc1b8a5b 100644
--- a/dbms/src/Storages/MergeTree/MergeTreePartChecker.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreePartChecker.cpp
@@ -16,6 +16,15 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CORRUPTED_DATA;
+	extern const int INCORRECT_MARK;
+	extern const int EMPTY_LIST_OF_COLUMNS_PASSED;
+	extern const int UNKNOWN_TYPE;
+}
+
+
 struct Stream
 {
 	static const size_t UNKNOWN = std::numeric_limits<size_t>::max();
diff --git a/dbms/src/Storages/MergeTree/PKCondition.cpp b/dbms/src/Storages/MergeTree/PKCondition.cpp
index aae687a90d1..cd58ae4a18b 100644
--- a/dbms/src/Storages/MergeTree/PKCondition.cpp
+++ b/dbms/src/Storages/MergeTree/PKCondition.cpp
@@ -1,6 +1,7 @@
 #include <DB/Storages/MergeTree/PKCondition.h>
 #include <DB/DataTypes/DataTypesNumberFixed.h>
 #include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <DB/Interpreters/ExpressionActions.h>
 #include <DB/Columns/ColumnSet.h>
 #include <DB/Columns/ColumnTuple.h>
 #include <DB/Parsers/ASTSet.h>
diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp
new file mode 100644
index 00000000000..f47c0e061da
--- /dev/null
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp
@@ -0,0 +1,279 @@
+#include <DB/Storages/StorageReplicatedMergeTree.h>
+#include <DB/Storages/MergeTree/AbandonableLockInZooKeeper.h>
+#include <DB/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
+#include <DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h>
+#include <DB/DataStreams/IBlockOutputStream.h>
+#include <DB/IO/Operators.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+	extern const int TOO_LESS_LIVE_REPLICAS;
+	extern const int UNSATISFIED_QUORUM_FOR_PREVIOUS_WRITE;
+	extern const int CHECKSUM_DOESNT_MATCH;
+	extern const int UNEXPECTED_ZOOKEEPER_ERROR;
+	extern const int NO_ZOOKEEPER;
+}
+
+
+ReplicatedMergeTreeBlockOutputStream::ReplicatedMergeTreeBlockOutputStream(
+	StorageReplicatedMergeTree & storage_, const String & insert_id_, size_t quorum_)
+	: storage(storage_), insert_id(insert_id_), quorum(quorum_),
+	log(&Logger::get(storage.data.getLogName() + " (Replicated OutputStream)"))
+{
+	/// Значение кворума 1 имеет такой же смысл, как если он отключён.
+	if (quorum == 1)
+		quorum = 0;
+}
+
+
+void ReplicatedMergeTreeBlockOutputStream::writePrefix()
+{
+	/// TODO Можно ли здесь не блокировать структуру таблицы?
+	storage.data.delayInsertIfNeeded(&storage.restarting_thread->getWakeupEvent());
+}
+
+
+/// Позволяет проверить, что сессия в ZooKeeper ещё жива.
+static void assertSessionIsNotExpired(zkutil::ZooKeeperPtr & zookeeper)
+{
+	if (!zookeeper)
+		throw Exception("No ZooKeeper session.", ErrorCodes::NO_ZOOKEEPER);
+
+	if (zookeeper->expired())
+		throw Exception("ZooKeeper session has been expired.", ErrorCodes::NO_ZOOKEEPER);
+}
+
+
+void ReplicatedMergeTreeBlockOutputStream::write(const Block & block)
+{
+	auto zookeeper = storage.getZooKeeper();
+
+	assertSessionIsNotExpired(zookeeper);
+
+	/** Если запись с кворумом, то проверим, что требуемое количество реплик сейчас живо,
+		*  а также что для всех предыдущих кусков, для которых требуется кворум, этот кворум достигнут.
+		*/
+	String quorum_status_path = storage.zookeeper_path + "/quorum/status";
+	if (quorum)
+	{
+		/// Список живых реплик. Все они регистрируют эфемерную ноду для leader_election.
+		auto live_replicas = zookeeper->getChildren(storage.zookeeper_path + "/leader_election");
+
+		if (live_replicas.size() < quorum)
+			throw Exception("Number of alive replicas ("
+				+ toString(live_replicas.size()) + ") is less than requested quorum (" + toString(quorum) + ").",
+				ErrorCodes::TOO_LESS_LIVE_REPLICAS);
+
+		/** Достигнут ли кворум для последнего куска, для которого нужен кворум?
+			* Запись всех кусков с включенным кворумом линейно упорядочена.
+			* Это значит, что в любой момент времени может быть только один кусок,
+			*  для которого нужен, но ещё не достигнут кворум.
+			* Информация о таком куске будет расположена в ноде /quorum/status.
+			* Если кворум достигнут, то нода удаляется.
+			*/
+
+		String quorum_status;
+		bool quorum_unsatisfied = zookeeper->tryGet(quorum_status_path, quorum_status);
+
+		if (quorum_unsatisfied)
+			throw Exception("Quorum for previous write has not been satisfied yet. Status: " + quorum_status, ErrorCodes::UNSATISFIED_QUORUM_FOR_PREVIOUS_WRITE);
+
+		/// Обе проверки неявно делаются и позже (иначе был бы race condition).
+	}
+
+	auto part_blocks = storage.writer.splitBlockIntoParts(block);
+
+	for (auto & current_block : part_blocks)
+	{
+		assertSessionIsNotExpired(zookeeper);
+
+		++block_index;
+		String block_id = insert_id.empty() ? "" : insert_id + "__" + toString(block_index);
+		String month_name = toString(DateLUT::instance().toNumYYYYMMDD(DayNum_t(current_block.min_date)) / 100);
+
+		AbandonableLockInZooKeeper block_number_lock = storage.allocateBlockNumber(month_name);
+
+		Int64 part_number = block_number_lock.getNumber();
+
+		MergeTreeData::MutableDataPartPtr part = storage.writer.writeTempPart(current_block, part_number);
+		String part_name = ActiveDataPartSet::getPartName(part->left_date, part->right_date, part->left, part->right, part->level);
+
+		/// Хэш от данных.
+		SipHash hash;
+		part->checksums.summaryDataChecksum(hash);
+		union
+		{
+			char bytes[16];
+			UInt64 lo, hi;
+		} hash_value;
+		hash.get128(hash_value.bytes);
+
+		String checksum(hash_value.bytes, 16);
+
+		/// Если в запросе не указан ID, возьмем в качестве ID хеш от данных. То есть, не вставляем одинаковые данные дважды.
+		/// NOTE: Если такая дедупликация не нужна, можно вместо этого оставлять block_id пустым.
+		///       Можно для этого сделать настройку или синтаксис в запросе (например, ID=null).
+		if (block_id.empty())
+		{
+			block_id = toString(hash_value.lo) + "_" + toString(hash_value.hi);
+
+			if (block_id.empty())
+				throw Exception("Logical error: block_id is empty.", ErrorCodes::LOGICAL_ERROR);
+		}
+
+		LOG_DEBUG(log, "Wrote block " << part_number << " with ID " << block_id << ", " << current_block.block.rows() << " rows");
+
+		StorageReplicatedMergeTree::LogEntry log_entry;
+		log_entry.type = StorageReplicatedMergeTree::LogEntry::GET_PART;
+		log_entry.create_time = time(0);
+		log_entry.source_replica = storage.replica_name;
+		log_entry.new_part_name = part_name;
+		log_entry.quorum = quorum;
+		log_entry.block_id = block_id;
+
+		/// Одновременно добавим информацию о куске во все нужные места в ZooKeeper и снимем block_number_lock.
+
+		/// Информация о блоке.
+		zkutil::Ops ops;
+		auto acl = zookeeper->getDefaultACL();
+
+		ops.push_back(
+			new zkutil::Op::Create(
+				storage.zookeeper_path + "/blocks/" + block_id,
+				"",
+				acl,
+				zkutil::CreateMode::Persistent));
+		ops.push_back(
+			new zkutil::Op::Create(
+				storage.zookeeper_path + "/blocks/" + block_id + "/checksum",
+				checksum,
+				acl,
+				zkutil::CreateMode::Persistent));
+		ops.push_back(
+			new zkutil::Op::Create(
+				storage.zookeeper_path + "/blocks/" + block_id + "/number",
+				toString(part_number),
+				acl,
+				zkutil::CreateMode::Persistent));
+
+		/// Информация о куске, в данных реплики.
+		storage.checkPartAndAddToZooKeeper(part, ops, part_name);
+
+		/// Лог репликации.
+		ops.push_back(new zkutil::Op::Create(
+			storage.zookeeper_path + "/log/log-",
+			log_entry.toString(),
+			acl,
+			zkutil::CreateMode::PersistentSequential));
+
+		/// Удаление информации о том, что номер блока используется для записи.
+		block_number_lock.getUnlockOps(ops);
+
+		/** Если нужен кворум - создание узла, в котором отслеживается кворум.
+			* (Если такой узел уже существует - значит кто-то успел одновременно сделать другую кворумную запись, но для неё кворум ещё не достигнут.
+			*  Делать в это время следующую кворумную запись нельзя.)
+			*/
+		if (quorum)
+		{
+			ReplicatedMergeTreeQuorumEntry quorum_entry;
+			quorum_entry.part_name = part_name;
+			quorum_entry.required_number_of_replicas = quorum;
+			quorum_entry.replicas.insert(storage.replica_name);
+
+			/** В данный момент, этот узел будет содержать информацию о том, что текущая реплика получила кусок.
+				* Когда другие реплики будут получать этот кусок (обычным способом, обрабатывая лог репликации),
+				*  они будут добавлять себя в содержимое этого узла.
+				* Когда в нём будет информация о quorum количестве реплик, этот узел удаляется,
+				*  что говорит о том, что кворум достигнут.
+				*/
+
+			ops.push_back(
+				new zkutil::Op::Create(
+					quorum_status_path,
+					quorum_entry.toString(),
+					acl,
+					zkutil::CreateMode::Persistent));
+		}
+
+		MergeTreeData::Transaction transaction; /// Если не получится добавить кусок в ZK, снова уберем его из рабочего набора.
+		storage.data.renameTempPartAndAdd(part, nullptr, &transaction);
+
+		try
+		{
+			auto code = zookeeper->tryMulti(ops);
+			if (code == ZOK)
+			{
+				transaction.commit();
+				storage.merge_selecting_event.set();
+			}
+			else if (code == ZNODEEXISTS)
+			{
+				/// Если блок с таким ID уже есть в таблице, откатим его вставку.
+				String expected_checksum;
+				if (!block_id.empty() && zookeeper->tryGet(
+					storage.zookeeper_path + "/blocks/" + block_id + "/checksum", expected_checksum))
+				{
+					LOG_INFO(log, "Block with ID " << block_id << " already exists; ignoring it (removing part " << part->name << ")");
+
+					/// Если данные отличались от тех, что были вставлены ранее с тем же ID, бросим исключение.
+					if (expected_checksum != checksum)
+					{
+						if (!insert_id.empty())
+							throw Exception("Attempt to insert block with same ID but different checksum", ErrorCodes::CHECKSUM_DOESNT_MATCH);
+						else
+							throw Exception("Logical error: got ZNODEEXISTS while inserting data, block ID is derived from checksum but checksum doesn't match", ErrorCodes::LOGICAL_ERROR);
+					}
+
+					transaction.rollback();
+				}
+				else if (zookeeper->exists(quorum_status_path))
+				{
+					transaction.rollback();
+
+					throw Exception("Another quorum insert has been already started", ErrorCodes::UNSATISFIED_QUORUM_FOR_PREVIOUS_WRITE);
+				}
+				else
+				{
+					/// Сюда можем попасть также, если узел с кворумом существовал, но потом быстро был удалён.
+
+					throw Exception("Unexpected ZNODEEXISTS while adding block " + toString(part_number) + " with ID " + block_id + ": "
+						+ zkutil::ZooKeeper::error2string(code), ErrorCodes::UNEXPECTED_ZOOKEEPER_ERROR);
+				}
+			}
+			else
+			{
+				throw Exception("Unexpected error while adding block " + toString(part_number) + " with ID " + block_id + ": "
+					+ zkutil::ZooKeeper::error2string(code), ErrorCodes::UNEXPECTED_ZOOKEEPER_ERROR);
+			}
+		}
+		catch (const zkutil::KeeperException & e)
+		{
+			/** Если потерялось соединение, и мы не знаем, применились ли изменения, нельзя удалять локальный кусок:
+				*  если изменения применились, в /blocks/ появился вставленный блок, и его нельзя будет вставить снова.
+				*/
+			if (e.code == ZOPERATIONTIMEOUT ||
+				e.code == ZCONNECTIONLOSS)
+			{
+				transaction.commit();
+				storage.enqueuePartForCheck(part->name);
+			}
+
+			throw;
+		}
+
+		if (quorum)
+		{
+			/// Дожидаемся достижения кворума. TODO Настраиваемый таймаут.
+			LOG_TRACE(log, "Waiting for quorum");
+			zookeeper->waitForDisappear(quorum_status_path);
+			LOG_TRACE(log, "Quorum satisfied");
+		}
+	}
+}
+
+
+}
diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
index 428e8f6ad05..f19280fa8fa 100644
--- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
@@ -6,6 +6,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NOT_FOUND_NODE;
+}
+
+
 ReplicatedMergeTreeCleanupThread::ReplicatedMergeTreeCleanupThread(StorageReplicatedMergeTree & storage_)
 	: storage(storage_),
 	log(&Logger::get(storage.database_name + "." + storage.table_name + " (StorageReplicatedMergeTree, CleanupThread)")),
diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreePartsExchange.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreePartsExchange.cpp
index 3ed08b430be..22b3078237c 100644
--- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreePartsExchange.cpp
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreePartsExchange.cpp
@@ -5,6 +5,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ABORTED;
+}
+
+
 void ReplicatedMergeTreePartsServer::processQuery(const Poco::Net::HTMLForm & params, WriteBuffer & out)
 {
 	if (is_cancelled)
diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index 78d29a3a0ce..f521ca67828 100644
--- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -7,6 +7,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNEXPECTED_NODE_IN_ZOOKEEPER;
+}
+
 
 void ReplicatedMergeTreeQueue::initVirtualParts(const MergeTreeData::DataParts & parts)
 {
@@ -19,16 +24,21 @@ void ReplicatedMergeTreeQueue::initVirtualParts(const MergeTreeData::DataParts &
 
 void ReplicatedMergeTreeQueue::load(zkutil::ZooKeeperPtr zookeeper)
 {
+	auto queue_path = replica_path + "/queue";
+	LOG_DEBUG(log, "Loading queue from " << queue_path);
+
 	std::lock_guard<std::mutex> lock(mutex);
 
-	Strings children = zookeeper->getChildren(replica_path + "/queue");
+	Strings children = zookeeper->getChildren(queue_path);
+	LOG_DEBUG(log, "Having " << children.size() << " queue entries to load.");
+
 	std::sort(children.begin(), children.end());
 
 	std::vector<std::pair<String, zkutil::ZooKeeper::GetFuture>> futures;
 	futures.reserve(children.size());
 
 	for (const String & child : children)
-		futures.emplace_back(child, zookeeper->asyncGet(replica_path + "/queue/" + child));
+		futures.emplace_back(child, zookeeper->asyncGet(queue_path + "/" + child));
 
 	for (auto & future : futures)
 	{
@@ -38,6 +48,10 @@ void ReplicatedMergeTreeQueue::load(zkutil::ZooKeeperPtr zookeeper)
 		entry->znode_name = future.first;
 		insertUnlocked(entry);
 	}
+
+	updateTimesInZooKeeper(zookeeper, true, false);
+
+	LOG_TRACE(log, "Loaded queue");
 }
 
 
@@ -59,13 +73,88 @@ void ReplicatedMergeTreeQueue::insertUnlocked(LogEntryPtr & entry)
 {
 	virtual_parts.add(entry->new_part_name);
 	queue.push_back(entry);
+
+	if (entry->type == LogEntry::GET_PART)
+	{
+		inserts_by_time.insert(entry);
+
+		if (entry->create_time && (!min_unprocessed_insert_time || entry->create_time < min_unprocessed_insert_time))
+			min_unprocessed_insert_time = entry->create_time;
+	}
 }
 
 
-void ReplicatedMergeTreeQueue::insert(LogEntryPtr & entry)
+void ReplicatedMergeTreeQueue::insert(zkutil::ZooKeeperPtr zookeeper, LogEntryPtr & entry)
 {
-	std::lock_guard<std::mutex> lock(mutex);
-	insertUnlocked(entry);
+	time_t prev_min_unprocessed_insert_time;
+
+	{
+		std::lock_guard<std::mutex> lock(mutex);
+		prev_min_unprocessed_insert_time = min_unprocessed_insert_time;
+		insertUnlocked(entry);
+	}
+
+	if (min_unprocessed_insert_time != prev_min_unprocessed_insert_time)
+		updateTimesInZooKeeper(zookeeper, true, false);
+}
+
+
+void ReplicatedMergeTreeQueue::updateTimesOnRemoval(
+	const LogEntryPtr & entry,
+	bool & min_unprocessed_insert_time_changed,
+	bool & max_processed_insert_time_changed)
+{
+	if (entry->type != LogEntry::GET_PART)
+		return;
+
+	inserts_by_time.erase(entry);
+
+	if (inserts_by_time.empty())
+	{
+		min_unprocessed_insert_time = 0;
+		min_unprocessed_insert_time_changed = true;
+	}
+	else if ((*inserts_by_time.begin())->create_time > min_unprocessed_insert_time)
+	{
+		min_unprocessed_insert_time = (*inserts_by_time.begin())->create_time;
+		min_unprocessed_insert_time_changed = true;
+	}
+
+	if (entry->create_time > max_processed_insert_time)
+	{
+		max_processed_insert_time = entry->create_time;
+		max_processed_insert_time_changed = true;
+	}
+}
+
+
+void ReplicatedMergeTreeQueue::updateTimesInZooKeeper(
+	zkutil::ZooKeeperPtr zookeeper,
+	bool min_unprocessed_insert_time_changed,
+	bool max_processed_insert_time_changed)
+{
+	/// Здесь может быть race condition (при одновременном выполнении разных remove).
+	/// Считаем его несущественным (в течение небольшого времени, в ZK будет записано немного отличающееся значение времени).
+	/// Также читаем значения переменных min_unprocessed_insert_time, max_processed_insert_time без синхронизации.
+	zkutil::Ops ops;
+
+	if (min_unprocessed_insert_time_changed)
+		ops.push_back(new zkutil::Op::SetData(
+			replica_path + "/min_unprocessed_insert_time", toString(min_unprocessed_insert_time), -1));
+
+	if (max_processed_insert_time_changed)
+		ops.push_back(new zkutil::Op::SetData(
+			replica_path + "/max_processed_insert_time", toString(max_processed_insert_time), -1));
+
+	if (!ops.empty())
+	{
+		auto code = zookeeper->tryMulti(ops);
+
+		if (code != ZOK)
+			LOG_ERROR(log, "Couldn't set value of nodes for insert times ("
+				<< replica_path << "/min_unprocessed_insert_time, max_processed_insert_time)" << ": "
+				<< zkutil::ZooKeeper::error2string(code) + ". This shouldn't happen often.");
+	}
 }
 
 
@@ -74,57 +163,83 @@ void ReplicatedMergeTreeQueue::remove(zkutil::ZooKeeperPtr zookeeper, LogEntryPt
 	auto code = zookeeper->tryRemove(replica_path + "/queue/" + entry->znode_name);
 
 	if (code != ZOK)
-		LOG_ERROR(log, "Couldn't remove " << replica_path + "/queue/" + entry->znode_name << ": "
-			<< zkutil::ZooKeeper::error2string(code) + ". This shouldn't happen often.");
+		LOG_ERROR(log, "Couldn't remove " << replica_path << "/queue/" << entry->znode_name << ": "
+			<< zkutil::ZooKeeper::error2string(code) << ". This shouldn't happen often.");
 
-	std::lock_guard<std::mutex> lock(mutex);
+	bool min_unprocessed_insert_time_changed = false;
+	bool max_processed_insert_time_changed = false;
 
-	/// Удалим задание из очереди в оперативке.
-	/// Нельзя просто обратиться по заранее сохраненному итератору, потому что задание мог успеть удалить кто-то другой.
-	for (Queue::iterator it = queue.end(); it != queue.begin();)
 	{
-		--it;
-		if (*it == entry)
+		std::lock_guard<std::mutex> lock(mutex);
+
+		/// Удалим задание из очереди в оперативке.
+		/// Нельзя просто обратиться по заранее сохраненному итератору, потому что задание мог успеть удалить кто-то другой.
+		/// Почему просматриваем очередь с конца?
+		///  - потому что задание к выполнению сначала перемещается в конец очереди, чтобы в случае неуспеха оно осталось в конце.
+		for (Queue::iterator it = queue.end(); it != queue.begin();)
 		{
-			queue.erase(it);
-			break;
+			--it;
+			if (*it == entry)
+			{
+				queue.erase(it);
+				break;
+			}
 		}
+
+		updateTimesOnRemoval(entry, min_unprocessed_insert_time_changed, max_processed_insert_time_changed);
 	}
+
+	updateTimesInZooKeeper(zookeeper, min_unprocessed_insert_time_changed, max_processed_insert_time_changed);
 }
 
 
 bool ReplicatedMergeTreeQueue::remove(zkutil::ZooKeeperPtr zookeeper, const String & part_name)
 {
-	std::lock_guard<std::mutex> lock(mutex);
+	LogEntryPtr found;
+
+	bool min_unprocessed_insert_time_changed = false;
+	bool max_processed_insert_time_changed = false;
 
-	for (Queue::iterator it = queue.begin(); it != queue.end();)
 	{
-		if ((*it)->new_part_name == part_name)
+		std::lock_guard<std::mutex> lock(mutex);
+
+		for (Queue::iterator it = queue.begin(); it != queue.end();)
 		{
-			zookeeper->tryRemove(replica_path + "/queue/" + (*it)->znode_name);
-			queue.erase(it++);
-			return true;
+			if ((*it)->new_part_name == part_name)
+			{
+				found = *it;
+				queue.erase(it++);
+				updateTimesOnRemoval(found, min_unprocessed_insert_time_changed, max_processed_insert_time_changed);
+				break;
+			}
+			else
+				++it;
 		}
-		else
-			++it;
 	}
 
-	return false;
+	if (!found)
+		return false;
+
+	zookeeper->tryRemove(replica_path + "/queue/" + found->znode_name);
+	updateTimesInZooKeeper(zookeeper, min_unprocessed_insert_time_changed, max_processed_insert_time_changed);
+
+	return true;
 }
 
 
 bool ReplicatedMergeTreeQueue::pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper, zkutil::EventPtr next_update_event)
 {
-	std::lock_guard<std::mutex> lock(mutex);
+	std::lock_guard<std::mutex> lock(pull_logs_to_queue_mutex);
 
 	String index_str = zookeeper->get(replica_path + "/log_pointer");
 	UInt64 index;
 
+	Strings log_entries = zookeeper->getChildren(zookeeper_path + "/log");
+
 	if (index_str.empty())
 	{
 		/// Если у нас еще нет указателя на лог, поставим указатель на первую запись в нем.
-		Strings entries = zookeeper->getChildren(zookeeper_path + "/log");
-		index = entries.empty() ? 0 : parse<UInt64>(std::min_element(entries.begin(), entries.end())->substr(strlen("log-")));
+		index = log_entries.empty() ? 0 : parse<UInt64>(std::min_element(log_entries.begin(), log_entries.end())->substr(strlen("log-")));
 
 		zookeeper->set(replica_path + "/log_pointer", toString(index));
 	}
@@ -133,46 +248,103 @@ bool ReplicatedMergeTreeQueue::pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper, z
 		index = parse<UInt64>(index_str);
 	}
 
-	UInt64 first_index = index;
+	String min_log_entry = "log-" + padIndex(index);
 
-	size_t count = 0;
-	String entry_str;
-	zkutil::Stat stat;
-	while (zookeeper->tryGet(zookeeper_path + "/log/log-" + padIndex(index), entry_str, &stat))
+	/// Множество записей лога, которые должны быть скопированы в очередь.
+
+	log_entries.erase(
+		std::remove_if(log_entries.begin(), log_entries.end(), [&min_log_entry](const String & entry) { return entry < min_log_entry; }),
+		log_entries.end());
+
+	if (!log_entries.empty())
 	{
-		++count;
-		++index;
+		std::sort(log_entries.begin(), log_entries.end());
 
-		LogEntryPtr entry = LogEntry::parse(entry_str, stat);
+		String last_entry = log_entries.back();
+		if (0 != last_entry.compare(0, strlen("log-"), "log-"))
+			throw Exception("Error in zookeeper data: unexpected node " + last_entry + " in " + zookeeper_path + "/log",
+				ErrorCodes::UNEXPECTED_NODE_IN_ZOOKEEPER);
+
+		UInt64 last_entry_index = parse<UInt64>(last_entry.substr(strlen("log-")));
+
+		LOG_DEBUG(log, "Pulling " << log_entries.size() << " entries to queue: " << log_entries.front() << " - " << log_entries.back());
+
+		std::vector<std::pair<String, zkutil::ZooKeeper::GetFuture>> futures;
+		futures.reserve(log_entries.size());
+
+		for (const String & entry : log_entries)
+			futures.emplace_back(entry, zookeeper->asyncGet(zookeeper_path + "/log/" + entry));
+
+		/// Одновременно добавим все новые записи в очередь и продвинем указатель на лог.
 
-		/// Одновременно добавим запись в очередь и продвинем указатель на лог.
 		zkutil::Ops ops;
-		ops.push_back(new zkutil::Op::Create(
-			replica_path + "/queue/queue-", entry_str, zookeeper->getDefaultACL(), zkutil::CreateMode::PersistentSequential));
+		std::vector<LogEntryPtr> copied_entries;
+		copied_entries.reserve(log_entries.size());
+
+		bool min_unprocessed_insert_time_changed = false;
+
+		for (auto & future : futures)
+		{
+			zkutil::ZooKeeper::ValueAndStat res = future.second.get();
+			copied_entries.emplace_back(LogEntry::parse(res.value, res.stat));
+
+			ops.push_back(new zkutil::Op::Create(
+				replica_path + "/queue/queue-", res.value, zookeeper->getDefaultACL(), zkutil::CreateMode::PersistentSequential));
+
+			const auto & entry = *copied_entries.back();
+			if (entry.type == LogEntry::GET_PART)
+			{
+				if (entry.create_time && (!min_unprocessed_insert_time || entry.create_time < min_unprocessed_insert_time))
+				{
+					min_unprocessed_insert_time = entry.create_time;
+					min_unprocessed_insert_time_changed = true;
+				}
+			}
+		}
+
 		ops.push_back(new zkutil::Op::SetData(
-			replica_path + "/log_pointer", toString(index), -1));
+			replica_path + "/log_pointer", toString(last_entry_index + 1), -1));
+
+		if (min_unprocessed_insert_time_changed)
+			ops.push_back(new zkutil::Op::SetData(
+				replica_path + "/min_unprocessed_insert_time", toString(min_unprocessed_insert_time), -1));
+
 		auto results = zookeeper->multi(ops);
 
-		String path_created = dynamic_cast<zkutil::Op::Create &>(ops[0]).getPathCreated();
-		entry->znode_name = path_created.substr(path_created.find_last_of('/') + 1);
+		/// Сейчас мы успешно обновили очередь в ZooKeeper. Обновим её в оперативке.
 
-		insertUnlocked(entry);
+		try
+		{
+			std::lock_guard<std::mutex> lock(mutex);
+
+			for (size_t i = 0, size = copied_entries.size(); i < size; ++i)
+			{
+				String path_created = dynamic_cast<zkutil::Op::Create &>(ops[i]).getPathCreated();
+				copied_entries[i]->znode_name = path_created.substr(path_created.find_last_of('/') + 1);
+
+				insertUnlocked(copied_entries[i]);
+			}
+
+			last_queue_update = time(0);
+		}
+		catch (...)
+		{
+			/// Если не удалось, то данные в оперативке некорректные. Во избежание возможной дальнейшей порчи данных в ZK, убъёмся.
+			/// Попадание сюда возможно лишь в случае неизвестной логической ошибки.
+			std::terminate();
+		}
+
+		if (!copied_entries.empty())
+			LOG_DEBUG(log, "Pulled " << copied_entries.size() << " entries to queue.");
 	}
 
-	last_queue_update = time(0);
-
 	if (next_update_event)
 	{
 		if (zookeeper->exists(zookeeper_path + "/log/log-" + padIndex(index), nullptr, next_update_event))
 			next_update_event->set();
 	}
 
-	if (!count)
-		return false;
-
-	LOG_DEBUG(log, "Pulled " << count << " entries to queue: log-" << padIndex(first_index) << " - log-" << padIndex(index - 1));
-
-	return true;
+	return !log_entries.empty();
 }
 
 
@@ -224,6 +396,8 @@ void ReplicatedMergeTreeQueue::removeGetsAndMergesInRange(zkutil::ZooKeeperPtr z
 {
 	Queue to_wait;
 	size_t removed_entries = 0;
+	bool min_unprocessed_insert_time_changed = false;
+	bool max_processed_insert_time_changed = false;
 
 	/// Удалим из очереди операции с кусками, содержащимися в удаляемом диапазоне.
 	std::unique_lock<std::mutex> lock(mutex);
@@ -238,6 +412,8 @@ void ReplicatedMergeTreeQueue::removeGetsAndMergesInRange(zkutil::ZooKeeperPtr z
 			if (code != ZOK)
 				LOG_INFO(log, "Couldn't remove " << replica_path + "/queue/" + (*it)->znode_name << ": "
 					<< zkutil::ZooKeeper::error2string(code));
+
+			updateTimesOnRemoval(*it, min_unprocessed_insert_time_changed, max_processed_insert_time_changed);
 			queue.erase(it++);
 			++removed_entries;
 		}
@@ -245,6 +421,8 @@ void ReplicatedMergeTreeQueue::removeGetsAndMergesInRange(zkutil::ZooKeeperPtr z
 			++it;
 	}
 
+	updateTimesInZooKeeper(zookeeper, min_unprocessed_insert_time_changed, max_processed_insert_time_changed);
+
 	LOG_DEBUG(log, "Removed " << removed_entries << " entries from queue. "
 		"Waiting for " << to_wait.size() << " entries that are currently executing.");
 
@@ -518,6 +696,13 @@ void ReplicatedMergeTreeQueue::countMerges(size_t & all_merges, size_t & big_mer
 }
 
 
+void ReplicatedMergeTreeQueue::getInsertTimes(time_t & out_min_unprocessed_insert_time, time_t & out_max_processed_insert_time) const
+{
+	out_min_unprocessed_insert_time = min_unprocessed_insert_time;
+	out_max_processed_insert_time = max_processed_insert_time;
+}
+
+
 String padIndex(Int64 index)
 {
 	String index_str = toString(index);
diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
index 855cd6adbc1..ac48ff1d889 100644
--- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
@@ -9,6 +9,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CANNOT_CLOCK_GETTIME;
+	extern const int REPLICA_IS_ALREADY_ACTIVE;
+}
+
 
 /// Используется для проверки, выставили ли ноду is_active мы, или нет.
 static String generateActiveNodeIdentifier()
@@ -101,22 +107,32 @@ void ReplicatedMergeTreeRestartingThread::run()
 			if (current_time >= prev_time_of_check_delay + static_cast<time_t>(storage.data.settings.check_delay_period))
 			{
 				/// Выясняем отставания реплик.
-				time_t new_absolute_delay = 0;
-				time_t new_relative_delay = 0;
+				time_t absolute_delay = 0;
+				time_t relative_delay = 0;
 
-				/// TODO Ловить здесь исключение.
-				checkReplicationDelays(new_absolute_delay, new_relative_delay);
-
-				absolute_delay.store(new_absolute_delay, std::memory_order_relaxed);
-				relative_delay.store(new_relative_delay, std::memory_order_relaxed);
+				bool error = false;
+				try
+				{
+					storage.getReplicaDelays(absolute_delay, relative_delay);
+					LOG_TRACE(log, "Absolute delay: " << absolute_delay << ". Relative delay: " << relative_delay << ".");
+				}
+				catch (...)
+				{
+					tryLogCurrentException("__PRETTY_FUNCTION__", "Cannot get replica delays");
+					error = true;
+				}
 
 				prev_time_of_check_delay = current_time;
 
 				/// Уступаем лидерство, если относительное отставание больше порога.
-				if (storage.is_leader_node && new_relative_delay > static_cast<time_t>(storage.data.settings.min_relative_delay_to_yield_leadership))
+				if (storage.is_leader_node
+					&& (error || relative_delay > static_cast<time_t>(storage.data.settings.min_relative_delay_to_yield_leadership)))
 				{
-					LOG_INFO(log, "Relative replica delay (" << new_relative_delay << " seconds) is bigger than threshold ("
-						<< storage.data.settings.min_relative_delay_to_yield_leadership << "). Will yield leadership.");
+					if (error)
+						LOG_INFO(log, "Will yield leadership.");
+					else
+						LOG_INFO(log, "Relative replica delay (" << relative_delay << " seconds) is bigger than threshold ("
+							<< storage.data.settings.min_relative_delay_to_yield_leadership << "). Will yield leadership.");
 
 					need_restart = true;
 					continue;
@@ -368,17 +384,4 @@ void ReplicatedMergeTreeRestartingThread::goReadOnlyPermanently()
 }
 
 
-void ReplicatedMergeTreeRestartingThread::checkReplicationDelays(time_t & out_absolute_delay, time_t & out_relative_delay)
-{
-	out_absolute_delay = 0;
-	out_relative_delay = 0;
-
-	auto zookeeper = storage.getZooKeeper();
-
-	// TODO
-
-	LOG_TRACE(log, "Absolute delay: " << out_absolute_delay << ". Relative delay: " << out_relative_delay << ".");
-}
-
-
 }
diff --git a/dbms/src/Storages/StorageBuffer.cpp b/dbms/src/Storages/StorageBuffer.cpp
index e961857f437..3c9151c3cf7 100644
--- a/dbms/src/Storages/StorageBuffer.cpp
+++ b/dbms/src/Storages/StorageBuffer.cpp
@@ -14,6 +14,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int INFINITE_LOOP;
+	extern const int BLOCKS_HAS_DIFFERENT_STRUCTURE;
+}
+
 
 StoragePtr StorageBuffer::create(const std::string & name_, NamesAndTypesListPtr columns_,
 	const NamesAndTypesList & materialized_columns_,
diff --git a/dbms/src/Storages/StorageChunkMerger.cpp b/dbms/src/Storages/StorageChunkMerger.cpp
index 2ed96263139..4cab796a861 100644
--- a/dbms/src/Storages/StorageChunkMerger.cpp
+++ b/dbms/src/Storages/StorageChunkMerger.cpp
@@ -3,11 +3,14 @@
 #include <DB/Storages/StorageChunkRef.h>
 #include <DB/Interpreters/executeQuery.h>
 #include <DB/Interpreters/InterpreterDropQuery.h>
+#include <DB/Interpreters/ExpressionActions.h>
 #include <DB/DataStreams/ConcatBlockInputStream.h>
 #include <DB/DataStreams/AddingDefaultBlockInputStream.h>
 #include <DB/DataStreams/AddingConstColumnBlockInputStream.h>
 #include <DB/DataStreams/narrowBlockInputStreams.h>
 #include <DB/Parsers/ASTIdentifier.h>
+#include <DB/Parsers/ASTSelectQuery.h>
+#include <DB/Parsers/ASTExpressionList.h>
 #include <DB/Parsers/formatAST.h>
 #include <DB/Common/VirtualColumnUtils.h>
 #include <DB/DataTypes/DataTypeString.h>
@@ -16,6 +19,14 @@
 
 namespace DB
 {
+
+namespace ErrorCodes
+{
+	extern const int UNKNOWN_DATABASE;
+	extern const int TYPE_MISMATCH;
+}
+
+
 const int NOTHING_TO_MERGE_PERIOD = 10;
 
 StorageChunkMerger::TableNames StorageChunkMerger::currently_written_groups;
@@ -334,23 +345,9 @@ bool StorageChunkMerger::MergeTask::merge()
 	{
 		merged = maybeMergeSomething();
 	}
-	catch (const Exception & e)
-	{
-		LOG_ERROR(log, "StorageChunkMerger at " << chunk_merger.this_database << "." << chunk_merger.name << " failed to merge: Code: " << e.code() << ", e.displayText() = " << e.displayText() << ", e.what() = " << e.what()
-		<< ", Stack trace:\n\n" << e.getStackTrace().toString());
-	}
-	catch (const Poco::Exception & e)
-	{
-		LOG_ERROR(log, "StorageChunkMerger at " << chunk_merger.this_database << "." << chunk_merger.name << " failed to merge: Poco::Exception. Code: " << ErrorCodes::POCO_EXCEPTION << ", e.code() = " << e.code()
-		<< ", e.displayText() = " << e.displayText() << ", e.what() = " << e.what());
-	}
-	catch (const std::exception & e)
-	{
-		LOG_ERROR(log, "StorageChunkMerger at " << chunk_merger.this_database << "." << chunk_merger.name << " failed to merge: std::exception. Code: " << ErrorCodes::STD_EXCEPTION << ", e.what() = " << e.what());
-	}
 	catch (...)
 	{
-		LOG_ERROR(log, "StorageChunkMerger at " << chunk_merger.this_database << "." << chunk_merger.name << " failed to merge: unknown exception. Code: " << ErrorCodes::UNKNOWN_EXCEPTION);
+		tryLogCurrentException(log, "StorageChunkMerger at " + chunk_merger.this_database + "." + chunk_merger.name + " failed to merge");
 	}
 
 	if (!merged)
diff --git a/dbms/src/Storages/StorageChunkRef.cpp b/dbms/src/Storages/StorageChunkRef.cpp
index 040636dd022..27a5d4d9299 100644
--- a/dbms/src/Storages/StorageChunkRef.cpp
+++ b/dbms/src/Storages/StorageChunkRef.cpp
@@ -7,6 +7,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int UNKNOWN_TABLE;
+}
+
+
 StoragePtr StorageChunkRef::create(const std::string & name_, const Context & context_, const std::string & source_database_name_, const std::string & source_table_name_, bool attach)
 {
 	return (new StorageChunkRef(name_, context_, source_database_name_, source_table_name_, attach))->thisPtr();
diff --git a/dbms/src/Storages/StorageChunks.cpp b/dbms/src/Storages/StorageChunks.cpp
index 139c6f85409..fe3fd5b82df 100644
--- a/dbms/src/Storages/StorageChunks.cpp
+++ b/dbms/src/Storages/StorageChunks.cpp
@@ -15,6 +15,14 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int CHUNK_NOT_FOUND;
+	extern const int DUPLICATE_CHUNK_NAME;
+	extern const int SIZES_OF_MARKS_FILES_ARE_INCONSISTENT;
+}
+
+
 StoragePtr StorageChunks::create(
 	const std::string & path_,
 	const std::string & name_,
diff --git a/dbms/src/Storages/StorageDistributed.cpp b/dbms/src/Storages/StorageDistributed.cpp
index 72edb0f3221..106de8192fe 100644
--- a/dbms/src/Storages/StorageDistributed.cpp
+++ b/dbms/src/Storages/StorageDistributed.cpp
@@ -24,6 +24,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int STORAGE_REQUIRES_PARAMETER;
+}
+
+
 namespace
 {
 	/// select query has database and table names as AST pointers
diff --git a/dbms/src/Storages/StorageFactory.cpp b/dbms/src/Storages/StorageFactory.cpp
index 50ee571929f..59a12090867 100644
--- a/dbms/src/Storages/StorageFactory.cpp
+++ b/dbms/src/Storages/StorageFactory.cpp
@@ -35,6 +35,16 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int TABLE_MUST_NOT_BE_CREATED_MANUALLY;
+	extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+	extern const int BAD_ARGUMENTS;
+	extern const int UNKNOWN_STORAGE;
+	extern const int NO_REPLICA_NAME_GIVEN;
+}
+
+
 static bool endsWith(const std::string & s, const std::string & suffix)
 {
 	return s.size() >= suffix.size() && 0 == strncmp(s.data() + s.size() - suffix.size(), suffix.data(), suffix.size());
diff --git a/dbms/src/Storages/StorageJoin.cpp b/dbms/src/Storages/StorageJoin.cpp
index ee50eefb8ba..916425d3d26 100644
--- a/dbms/src/Storages/StorageJoin.cpp
+++ b/dbms/src/Storages/StorageJoin.cpp
@@ -4,6 +4,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NO_SUCH_COLUMN_IN_TABLE;
+	extern const int INCOMPATIBLE_TYPE_OF_JOIN;
+}
+
 
 StorageJoin::StorageJoin(
 	const String & path_,
diff --git a/dbms/src/Storages/StorageLog.cpp b/dbms/src/Storages/StorageLog.cpp
index df15b885390..2677deda310 100644
--- a/dbms/src/Storages/StorageLog.cpp
+++ b/dbms/src/Storages/StorageLog.cpp
@@ -3,7 +3,6 @@
 #include <DB/Common/escapeForFileName.h>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/IO/ReadBufferFromFile.h>
 #include <DB/IO/WriteBufferFromFile.h>
@@ -35,6 +34,14 @@ namespace DB
 
 using Poco::SharedPtr;
 
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+	extern const int EMPTY_LIST_OF_COLUMNS_PASSED;
+	extern const int DUPLICATE_COLUMN;
+	extern const int SIZES_OF_MARKS_FILES_ARE_INCONSISTENT;
+}
+
 
 class LogBlockInputStream : public IProfilingBlockInputStream
 {
diff --git a/dbms/src/Storages/StorageMaterializedView.cpp b/dbms/src/Storages/StorageMaterializedView.cpp
index 3079bd5974b..3e2f0ab0949 100644
--- a/dbms/src/Storages/StorageMaterializedView.cpp
+++ b/dbms/src/Storages/StorageMaterializedView.cpp
@@ -11,6 +11,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+}
+
+
 StoragePtr StorageMaterializedView::create(
 	const String & table_name_,
 	const String & database_name_,
diff --git a/dbms/src/Storages/StorageMemory.cpp b/dbms/src/Storages/StorageMemory.cpp
index 0d22615f67f..06bf2156f0d 100644
--- a/dbms/src/Storages/StorageMemory.cpp
+++ b/dbms/src/Storages/StorageMemory.cpp
@@ -1,7 +1,6 @@
 #include <map>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/DataStreams/IProfilingBlockInputStream.h>
 
diff --git a/dbms/src/Storages/StorageMerge.cpp b/dbms/src/Storages/StorageMerge.cpp
index 3dd1526264c..de4fc0e7415 100644
--- a/dbms/src/Storages/StorageMerge.cpp
+++ b/dbms/src/Storages/StorageMerge.cpp
@@ -13,6 +13,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ILLEGAL_PREWHERE;
+}
+
+
 StorageMerge::StorageMerge(
 	const std::string & name_,
 	NamesAndTypesListPtr columns_,
diff --git a/dbms/src/Storages/StorageMergeTree.cpp b/dbms/src/Storages/StorageMergeTree.cpp
index 3e1722a7ca8..affb82773c5 100644
--- a/dbms/src/Storages/StorageMergeTree.cpp
+++ b/dbms/src/Storages/StorageMergeTree.cpp
@@ -8,9 +8,17 @@
 #include <DB/Interpreters/InterpreterAlterQuery.h>
 #include <Poco/DirectoryIterator.h>
 
+
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int ABORTED;
+	extern const int BAD_ARGUMENTS;
+}
+
+
 StorageMergeTree::StorageMergeTree(
 	const String & path_,
 	const String & database_name_,
diff --git a/dbms/src/Storages/StorageReplicatedMergeTree.cpp b/dbms/src/Storages/StorageReplicatedMergeTree.cpp
index 49a610128a2..32e160f83e1 100644
--- a/dbms/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/dbms/src/Storages/StorageReplicatedMergeTree.cpp
@@ -1,5 +1,11 @@
+#include <time.h>
 #include <ext/range.hpp>
+
+#include <zkutil/Types.h>
+#include <zkutil/KeeperException.h>
+
 #include <DB/Core/FieldVisitors.h>
+
 #include <DB/Storages/ColumnsDescription.h>
 #include <DB/Storages/StorageReplicatedMergeTree.h>
 #include <DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h>
@@ -9,29 +15,64 @@
 #include <DB/Storages/MergeTree/MergeList.h>
 #include <DB/Storages/MergeTree/MergeTreeWhereOptimizer.h>
 #include <DB/Storages/MergeTree/ReplicatedMergeTreeAddress.h>
+
 #include <DB/Parsers/formatAST.h>
+#include <DB/Parsers/ASTInsertQuery.h>
+
 #include <DB/IO/WriteBufferFromOStream.h>
 #include <DB/IO/ReadBufferFromString.h>
 #include <DB/IO/Operators.h>
+
 #include <DB/Interpreters/InterpreterAlterQuery.h>
-#include <DB/Common/VirtualColumnUtils.h>
-#include <DB/Parsers/ASTInsertQuery.h>
+
 #include <DB/DataStreams/AddingConstColumnBlockInputStream.h>
 #include <DB/DataStreams/RemoteBlockInputStream.h>
 #include <DB/DataStreams/NullBlockOutputStream.h>
 #include <DB/DataStreams/copyData.h>
+
 #include <DB/Common/Macros.h>
+#include <DB/Common/VirtualColumnUtils.h>
 #include <DB/Common/formatReadable.h>
 #include <DB/Common/setThreadName.h>
+
 #include <Poco/DirectoryIterator.h>
-#include <time.h>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NO_ZOOKEEPER;
+	extern const int INCORRECT_DATA;
+	extern const int INCOMPATIBLE_COLUMNS;
+	extern const int REPLICA_IS_ALREADY_EXIST;
+	extern const int NO_SUCH_REPLICA;
+	extern const int NO_REPLICA_HAS_PART;
+	extern const int LOGICAL_ERROR;
+	extern const int TOO_MANY_UNEXPECTED_DATA_PARTS;
+	extern const int ABORTED;
+	extern const int REPLICA_IS_NOT_IN_QUORUM;
+	extern const int TABLE_IS_READ_ONLY;
+	extern const int NOT_FOUND_NODE;
+	extern const int NO_ACTIVE_REPLICAS;
+	extern const int LEADERSHIP_CHANGED;
+	extern const int TABLE_IS_READ_ONLY;
+	extern const int TABLE_WAS_NOT_DROPPED;
+	extern const int PARTITION_ALREADY_EXISTS;
+	extern const int TOO_MUCH_RETRIES_TO_FETCH_PARTS;
+	extern const int RECEIVED_ERROR_FROM_REMOTE_IO_SERVER;
+	extern const int PARTITION_DOESNT_EXIST;
+}
+
 
 const auto ERROR_SLEEP_MS = 1000;
+
+/// Если ждём какого-то события с помощью watch-а, то просыпаться на всякий случай вхолостую раз в указанное время.
+const auto WAIT_FOR_NEW_LOGS_SLEEP_MS = 60 * 1000;
+const auto WAIT_FOR_ALTER_SLEEP_MS = 300 * 1000;
+const auto WAIT_FOR_REPLICA_QUEUE_MS = 10 * 1000;
+
 const auto MERGE_SELECTING_SLEEP_MS = 5 * 1000;
 
 const Int64 RESERVED_BLOCK_NUMBERS = 200;
@@ -74,6 +115,27 @@ const Int64 RESERVED_BLOCK_NUMBERS = 200;
 const auto MAX_AGE_OF_LOCAL_PART_THAT_WASNT_ADDED_TO_ZOOKEEPER = 5 * 60;
 
 
+void StorageReplicatedMergeTree::setZooKeeper(zkutil::ZooKeeperPtr zookeeper)
+{
+	std::lock_guard<std::mutex> lock(current_zookeeper_mutex);
+	current_zookeeper = zookeeper;
+}
+
+zkutil::ZooKeeperPtr StorageReplicatedMergeTree::tryGetZooKeeper()
+{
+	std::lock_guard<std::mutex> lock(current_zookeeper_mutex);
+	return current_zookeeper;
+}
+
+zkutil::ZooKeeperPtr StorageReplicatedMergeTree::getZooKeeper()
+{
+	auto res = tryGetZooKeeper();
+	if (!res)
+		throw Exception("Cannot get ZooKeeper", ErrorCodes::NO_ZOOKEEPER);
+	return res;
+}
+
+
 StorageReplicatedMergeTree::StorageReplicatedMergeTree(
 	const String & zookeeper_path_,
 	const String & replica_name_,
@@ -143,6 +205,8 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
 			throw Exception("Can't create replicated table without ZooKeeper", ErrorCodes::NO_ZOOKEEPER);
 
 		/// Не активируем реплику. Она будет в режиме readonly.
+		LOG_ERROR(log, "No ZooKeeper: table will be in readonly mode.");
+		is_readonly = true;
 		return;
 	}
 
@@ -208,6 +272,7 @@ void StorageReplicatedMergeTree::createNewZooKeeperNodes()
 
 	/// Отслеживание отставания реплик.
 	zookeeper->createIfNotExists(replica_path + "/min_unprocessed_insert_time", "");
+	zookeeper->createIfNotExists(replica_path + "/max_processed_insert_time", "");
 }
 
 
@@ -240,7 +305,7 @@ StoragePtr StorageReplicatedMergeTree::create(
 
 	StoragePtr res_ptr = res->thisPtr();
 
-	if (res->getZooKeeper())
+	if (res->tryGetZooKeeper())
 	{
 		String endpoint_name = "ReplicatedMergeTree:" + res->replica_path;
 		InterserverIOEndpointPtr endpoint = new ReplicatedMergeTreePartsServer(res->data, *res);
@@ -528,7 +593,7 @@ void StorageReplicatedMergeTree::createReplica()
 			zookeeper->create(replica_path + "/queue/queue-", entry, zkutil::CreateMode::PersistentSequential);
 		}
 
-		/// Далее оно будет загружено в переменную queue в методе queue.load.
+		/// Далее оно будет загружено в переменную queue в методе queue.initialize.
 
 		LOG_DEBUG(log, "Copied " << source_queue.size() << " queue entries");
 	}
@@ -667,7 +732,7 @@ void StorageReplicatedMergeTree::checkParts(bool skip_sanity_checks)
 		log_entry.new_part_name = name;
 		log_entry.create_time = tryGetPartCreateTime(zookeeper, replica_path, name);
 
-		/// Полагаемся, что это происходит до загрузки очереди (queue.load).
+		/// Полагаемся, что это происходит до загрузки очереди (queue.initialize).
 		zkutil::Ops ops;
 		removePartFromZooKeeper(name, ops);
 		ops.push_back(new zkutil::Op::Create(
@@ -1182,7 +1247,7 @@ void StorageReplicatedMergeTree::queueUpdatingThread()
 		try
 		{
 			pullLogsToQueue(queue_updating_event);
-			queue_updating_event->wait();
+			queue_updating_event->tryWait(WAIT_FOR_NEW_LOGS_SLEEP_MS);
 		}
 		catch (const zkutil::KeeperException & e)
 		{
@@ -1190,13 +1255,11 @@ void StorageReplicatedMergeTree::queueUpdatingThread()
 				restarting_thread->wakeup();
 
 			tryLogCurrentException(__PRETTY_FUNCTION__);
-
 			queue_updating_event->tryWait(ERROR_SLEEP_MS);
 		}
 		catch (...)
 		{
 			tryLogCurrentException(__PRETTY_FUNCTION__);
-
 			queue_updating_event->tryWait(ERROR_SLEEP_MS);
 		}
 	}
@@ -1653,7 +1716,7 @@ void StorageReplicatedMergeTree::alterThread()
 				/// Важно, что уничтожается parts и merge_blocker перед wait-ом.
 			}
 
-			alter_thread_event->wait();
+			alter_thread_event->tryWait(WAIT_FOR_ALTER_SLEEP_MS);
 		}
 		catch (...)
 		{
@@ -1702,7 +1765,7 @@ void StorageReplicatedMergeTree::removePartAndEnqueueFetch(const String & part_n
 
 	String path_created = dynamic_cast<zkutil::Op::Create &>(ops[0]).getPathCreated();
 	log_entry->znode_name = path_created.substr(path_created.find_last_of('/') + 1);
-	queue.insert(log_entry);
+	queue.insert(zookeeper, log_entry);
 }
 
 
@@ -2265,6 +2328,7 @@ BlockInputStreams StorageReplicatedMergeTree::read(
 		if (settings.select_sequential_consistency)
 		{
 			auto zookeeper = getZooKeeper();
+
 			String last_part;
 			zookeeper->tryGet(zookeeper_path + "/quorum/last_part", last_part);
 
@@ -2311,10 +2375,16 @@ BlockInputStreams StorageReplicatedMergeTree::read(
 }
 
 
-BlockOutputStreamPtr StorageReplicatedMergeTree::write(ASTPtr query, const Settings & settings)
+void StorageReplicatedMergeTree::assertNotReadonly() const
 {
 	if (is_readonly)
 		throw Exception("Table is in readonly mode", ErrorCodes::TABLE_IS_READ_ONLY);
+}
+
+
+BlockOutputStreamPtr StorageReplicatedMergeTree::write(ASTPtr query, const Settings & settings)
+{
+	assertNotReadonly();
 
 	String insert_id;
 	if (query)
@@ -2353,6 +2423,8 @@ bool StorageReplicatedMergeTree::optimize(const Settings & settings)
 void StorageReplicatedMergeTree::alter(const AlterCommands & params,
 	const String & database_name, const String & table_name, Context & context)
 {
+	assertNotReadonly();
+
 	auto zookeeper = getZooKeeper();
 	const MergeTreeMergeBlocker merge_blocker{merger};
 	const auto unreplicated_merge_blocker = unreplicated_merger ?
@@ -2448,7 +2520,7 @@ void StorageReplicatedMergeTree::alter(const AlterCommands & params,
 			if (stat.version != replica_columns_version)
 				continue;
 
-			alter_query_event->wait();
+			alter_query_event->tryWait(WAIT_FOR_ALTER_SLEEP_MS);
 		}
 
 		if (shutdown_called)
@@ -2514,6 +2586,8 @@ void StorageReplicatedMergeTree::dropPartition(ASTPtr query, const Field & field
 		return;
 	}
 
+	assertNotReadonly();
+
 	auto zookeeper = getZooKeeper();
 	String month_name = MergeTreeData::getMonthName(field);
 
@@ -2607,6 +2681,8 @@ void StorageReplicatedMergeTree::dropPartition(ASTPtr query, const Field & field
 
 void StorageReplicatedMergeTree::attachPartition(ASTPtr query, const Field & field, bool unreplicated, bool attach_part, const Settings & settings)
 {
+	assertNotReadonly();
+
 	auto zookeeper = getZooKeeper();
 	String partition;
 
@@ -2712,13 +2788,13 @@ void StorageReplicatedMergeTree::attachPartition(ASTPtr query, const Field & fie
 
 void StorageReplicatedMergeTree::drop()
 {
-	if (is_readonly)
+	auto zookeeper = tryGetZooKeeper();
+
+	if (is_readonly || !zookeeper)
 		throw Exception("Can't drop readonly replicated table (need to drop data in ZooKeeper as well)", ErrorCodes::TABLE_IS_READ_ONLY);
 
 	shutdown();
 
-	auto zookeeper = getZooKeeper();
-
 	if (zookeeper->expired())
 		throw Exception("Table was not dropped because ZooKeeper session has been expired.", ErrorCodes::TABLE_WAS_NOT_DROPPED);
 
@@ -2836,7 +2912,7 @@ void StorageReplicatedMergeTree::waitForReplicaToProcessLogEntry(const String &
 			if (!log_pointer.empty() && parse<UInt64>(log_pointer) > log_index)
 				break;
 
-			event->wait();
+			event->tryWait(WAIT_FOR_REPLICA_QUEUE_MS);
 		}
 	}
 	else if (0 == entry.znode_name.compare(0, strlen("queue-"), "queue-"))
@@ -2881,7 +2957,7 @@ void StorageReplicatedMergeTree::waitForReplicaToProcessLogEntry(const String &
 				if (!log_pointer.empty() && parse<UInt64>(log_pointer) > log_index)
 					break;
 
-				event->wait();
+				event->tryWait(WAIT_FOR_REPLICA_QUEUE_MS);
 			}
 		}
 	}
@@ -2928,7 +3004,7 @@ void StorageReplicatedMergeTree::waitForReplicaToProcessLogEntry(const String &
 
 void StorageReplicatedMergeTree::getStatus(Status & res, bool with_zk_fields)
 {
-	auto zookeeper = getZooKeeper();
+	auto zookeeper = tryGetZooKeeper();
 
 	res.is_leader = is_leader_node;
 	res.is_readonly = is_readonly;
@@ -2988,12 +3064,53 @@ void StorageReplicatedMergeTree::getQueue(LogEntriesData & res, String & replica
 }
 
 
-void StorageReplicatedMergeTree::getReplicaDelays(time_t & out_absolute_delay, time_t & out_relative_delay) const
+void StorageReplicatedMergeTree::getReplicaDelays(time_t & out_absolute_delay, time_t & out_relative_delay)
 {
-	if (!restarting_thread)
-		throw Exception("Table was shutted down or is in readonly mode.", ErrorCodes::TABLE_IS_READ_ONLY);
+	assertNotReadonly();
 
-	restarting_thread->getReplicaDelays(out_absolute_delay, out_relative_delay);
+	/** Абсолютная задержка - задержка отставания текущей реплики от реального времени.
+	  */
+
+	time_t min_unprocessed_insert_time = 0;
+	time_t max_processed_insert_time = 0;
+	queue.getInsertTimes(min_unprocessed_insert_time, max_processed_insert_time);
+
+	time_t current_time = time(0);
+	out_absolute_delay = 0;
+	out_relative_delay = 0;
+
+	if (min_unprocessed_insert_time)
+		out_absolute_delay = current_time - min_unprocessed_insert_time;
+
+	/** Относительная задержка - максимальная разница абсолютной задержки от какой-либо другой реплики,
+	  *  (если эта реплика отстаёт от какой-либо другой реплики, или ноль, иначе).
+	  * Вычисляется только если абсолютная задержка достаточно большая.
+	  */
+
+	if (out_absolute_delay < static_cast<time_t>(data.settings.min_relative_delay_to_yield_leadership))
+		return;
+
+	auto zookeeper = getZooKeeper();
+
+	time_t max_replicas_unprocessed_insert_time = 0;
+	Strings replicas = zookeeper->getChildren(zookeeper_path + "/replicas");
+
+	for (const auto & replica : replicas)
+	{
+		if (replica == replica_name)
+			continue;
+
+		String value;
+		if (!zookeeper->tryGet(zookeeper_path + "/replicas/" + replica + "/min_unprocessed_insert_time", value))
+			continue;
+
+		time_t replica_time = value.empty() ? 0 : parse<time_t>(value);
+		if (replica_time > max_replicas_unprocessed_insert_time)
+			max_replicas_unprocessed_insert_time = replica_time;
+	}
+
+	if (max_replicas_unprocessed_insert_time > min_unprocessed_insert_time)
+		out_relative_delay = max_replicas_unprocessed_insert_time - min_unprocessed_insert_time;
 }
 
 
diff --git a/dbms/src/Storages/StorageStripeLog.cpp b/dbms/src/Storages/StorageStripeLog.cpp
index 2242c6d46ee..54f61f0134b 100644
--- a/dbms/src/Storages/StorageStripeLog.cpp
+++ b/dbms/src/Storages/StorageStripeLog.cpp
@@ -7,7 +7,6 @@
 #include <DB/Common/escapeForFileName.h>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/IO/ReadBufferFromFile.h>
 #include <DB/IO/WriteBufferFromFile.h>
@@ -36,6 +35,12 @@ namespace DB
 
 #define INDEX_BUFFER_SIZE 4096
 
+namespace ErrorCodes
+{
+	extern const int EMPTY_LIST_OF_COLUMNS_PASSED;
+	extern const int CANNOT_CREATE_DIRECTORY;
+}
+
 
 class StripeLogBlockInputStream : public IProfilingBlockInputStream
 {
diff --git a/dbms/src/Storages/StorageTinyLog.cpp b/dbms/src/Storages/StorageTinyLog.cpp
index 52a9689b09a..bce15fde2b5 100644
--- a/dbms/src/Storages/StorageTinyLog.cpp
+++ b/dbms/src/Storages/StorageTinyLog.cpp
@@ -6,7 +6,6 @@
 #include <DB/Common/escapeForFileName.h>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/IO/ReadBufferFromFile.h>
 #include <DB/IO/WriteBufferFromFile.h>
@@ -34,6 +33,14 @@ namespace DB
 
 using Poco::SharedPtr;
 
+namespace ErrorCodes
+{
+	extern const int EMPTY_LIST_OF_COLUMNS_PASSED;
+	extern const int CANNOT_CREATE_DIRECTORY;
+	extern const int CANNOT_READ_ALL_DATA;
+	extern const int DUPLICATE_COLUMN;
+}
+
 
 class TinyLogBlockInputStream : public IProfilingBlockInputStream
 {
diff --git a/dbms/src/Storages/StorageView.cpp b/dbms/src/Storages/StorageView.cpp
index 210c4a37d17..d3df577fd84 100644
--- a/dbms/src/Storages/StorageView.cpp
+++ b/dbms/src/Storages/StorageView.cpp
@@ -9,6 +9,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+}
+
 
 StoragePtr StorageView::create(
 	const String & table_name_,
diff --git a/dbms/src/Storages/System/StorageSystemClusters.cpp b/dbms/src/Storages/System/StorageSystemClusters.cpp
index 43fee761450..5172f5d4eec 100644
--- a/dbms/src/Storages/System/StorageSystemClusters.cpp
+++ b/dbms/src/Storages/System/StorageSystemClusters.cpp
@@ -10,6 +10,7 @@
 namespace DB
 {
 
+
 StorageSystemClusters::StorageSystemClusters(const std::string & name_, Context & context_)
 	: name(name_)
 	, columns{
diff --git a/dbms/src/Storages/System/StorageSystemNumbers.cpp b/dbms/src/Storages/System/StorageSystemNumbers.cpp
index 7a05fdfbbb8..b163c85060f 100644
--- a/dbms/src/Storages/System/StorageSystemNumbers.cpp
+++ b/dbms/src/Storages/System/StorageSystemNumbers.cpp
@@ -1,7 +1,6 @@
 #include <Poco/SharedPtr.h>
 
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 #include <DB/Columns/ColumnsNumber.h>
 #include <DB/DataTypes/DataTypesNumberFixed.h>
 #include <DB/DataStreams/IProfilingBlockInputStream.h>
diff --git a/dbms/src/Storages/System/StorageSystemOne.cpp b/dbms/src/Storages/System/StorageSystemOne.cpp
index 5e92d99517e..f346101e68b 100644
--- a/dbms/src/Storages/System/StorageSystemOne.cpp
+++ b/dbms/src/Storages/System/StorageSystemOne.cpp
@@ -1,5 +1,4 @@
 #include <DB/Common/Exception.h>
-#include <DB/Core/ErrorCodes.h>
 
 #include <DB/Columns/ColumnsNumber.h>
 #include <DB/DataTypes/DataTypesNumberFixed.h>
diff --git a/dbms/src/Storages/System/StorageSystemTables.cpp b/dbms/src/Storages/System/StorageSystemTables.cpp
index 1e4d673c7c8..a08ac735cef 100644
--- a/dbms/src/Storages/System/StorageSystemTables.cpp
+++ b/dbms/src/Storages/System/StorageSystemTables.cpp
@@ -8,6 +8,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int LOGICAL_ERROR;
+}
+
 
 StorageSystemTables::StorageSystemTables(const std::string & name_)
 	: name(name_),
diff --git a/dbms/src/Storages/VirtualColumnFactory.cpp b/dbms/src/Storages/VirtualColumnFactory.cpp
index 58ebb99ee45..581e5886be2 100644
--- a/dbms/src/Storages/VirtualColumnFactory.cpp
+++ b/dbms/src/Storages/VirtualColumnFactory.cpp
@@ -6,6 +6,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int NO_SUCH_COLUMN_IN_TABLE;
+}
+
+
 DataTypePtr VirtualColumnFactory::getType(const String & name)
 {
 	auto res = tryGetType(name);
diff --git a/dbms/src/TableFunctions/TableFunctionFactory.cpp b/dbms/src/TableFunctions/TableFunctionFactory.cpp
index f1df2cd4194..2a8497c7800 100644
--- a/dbms/src/TableFunctions/TableFunctionFactory.cpp
+++ b/dbms/src/TableFunctions/TableFunctionFactory.cpp
@@ -7,6 +7,12 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+	extern const int READONLY;
+	extern const int UNKNOWN_FUNCTION;
+}
+
 
 TableFunctionPtr TableFunctionFactory::get(
 	const String & name,
diff --git a/libs/libcommon/include/common/ErrorHandlers.h b/libs/libcommon/include/common/ErrorHandlers.h
index 31271e75804..5cc1c409448 100644
--- a/libs/libcommon/include/common/ErrorHandlers.h
+++ b/libs/libcommon/include/common/ErrorHandlers.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <Poco/ErrorHandler.h>
-#include <Poco/Net/SocketDefs.h>
 #include <common/logger_useful.h>
+#include <DB/Common/Exception.h>
 
 
 /** ErrorHandler для потоков, который в случае неперехваченного исключения,
@@ -17,21 +17,20 @@ public:
 };
 
 
-/** То же самое, но не завершает работу в случае эксепшена типа Socket is not connected.
-  * Этот эксепшен возникает внутри реализаций Poco::Net::HTTPServer, Poco::Net::TCPServer,
-  *  и иначе его не удаётся перехватить, и сервер завершает работу.
+/** Выводит информацию об исключении в лог.
   */
-class ServerErrorHandler : public KillingErrorHandler
+class ServerErrorHandler : public Poco::ErrorHandler
 {
 public:
-	void exception(const Poco::Exception & e)
-	{
-		if (e.code() == POCO_ENOTCONN)
-			LOG_WARNING(log, "Client has gone away.");
-		else
-			std::terminate();
-	}
+	void exception(const Poco::Exception & e) 	{ logException(); }
+	void exception(const std::exception & e)	{ logException(); }
+	void exception()							{ logException(); }
 
 private:
 	Logger * log = &Logger::get("ServerErrorHandler");
+
+	void logException()
+	{
+		DB::tryLogCurrentException(log);
+	}
 };
diff --git a/libs/libdaemon/include/daemon/Daemon.h b/libs/libdaemon/include/daemon/Daemon.h
new file mode 100644
index 00000000000..b7f0eb71844
--- /dev/null
+++ b/libs/libdaemon/include/daemon/Daemon.h
@@ -0,0 +1,174 @@
+#pragma once
+
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <iostream>
+#include <memory>
+
+#include <Poco/Process.h>
+#include <Poco/ThreadPool.h>
+#include <Poco/TaskNotification.h>
+#include <Poco/NumberFormatter.h>
+#include <Poco/Util/Application.h>
+#include <Poco/Util/ServerApplication.h>
+#include <Poco/Net/SocketAddress.h>
+#include <Poco/FileChannel.h>
+#include <Poco/SyslogChannel.h>
+
+#include <common/Common.h>
+#include <common/logger_useful.h>
+
+#include <daemon/GraphiteWriter.h>
+
+#include <boost/optional.hpp>
+#include <zkutil/ZooKeeperHolder.h>
+
+
+namespace Poco { class TaskManager; }
+
+
+/// \brief Базовый класс для демонов
+///
+/// \code
+/// # Список возможных опций командной строки обрабатываемых демоном:
+/// #    --config-file или --config - имя файла конфигурации. По умолчанию - config.xml
+/// #    --pid-file - имя PID файла. По умолчанию - pid
+/// #    --log-file - имя лог файла
+/// #    --error-file - имя лог файла, в который будут помещаться только ошибки
+/// #    --daemon - запустить в режиме демона; если не указан - логгирование будет вестись на консоль
+/// <daemon_name> --daemon --config-file=localfile.xml --pid-file=pid.pid --log-file=log.log --errorlog-file=error.log
+/// \endcode
+///
+/// Если неперехваченное исключение выкинуто в других потоках (не Task-и), то по-умолчанию
+/// используется KillingErrorHandler, который вызывает std::terminate.
+///
+/// Кроме того, класс позволяет достаточно гибко управлять журналированием. В методе initialize() вызывается метод
+/// buildLoggers() который и строит нужные логгеры. Эта функция ожидает увидеть в конфигурации определённые теги
+/// заключённые в секции "logger".
+/// Если нужно журналирование на консоль, нужно просто не использовать тег "log" или использовать --console.
+/// Теги уровней вывода использовать можно в любом случае
+
+
+class Daemon : public Poco::Util::ServerApplication
+{
+public:
+	Daemon();
+    ~Daemon();
+
+	/// Загружает конфигурацию и "строит" логгеры на запись в файлы
+	void initialize(Poco::Util::Application &);
+
+	/// Читает конфигурацию
+	void reloadConfiguration();
+
+	/// Строит необходимые логгеры
+	void buildLoggers();
+
+	/// Определяет параметр командной строки
+	void defineOptions(Poco::Util::OptionSet& _options);
+
+	/// Заставляет демон завершаться, если хотя бы одна задача завершилась неудачно
+	void exitOnTaskError();
+
+	/// Возвращает TaskManager приложения
+	Poco::TaskManager & getTaskManager() { return *task_manager; }
+
+	/// Завершение демона ("мягкое")
+	void terminate();
+
+	/// Завершение демона ("жёсткое")
+	void kill();
+
+	/// Получен ли сигнал на завершение?
+	bool isCancelled()
+	{
+		return is_cancelled;
+	}
+
+	/// Получение ссылки на экземпляр демона
+	static Daemon & instance()
+	{
+		return dynamic_cast<Daemon &>(Poco::Util::Application::instance());
+	}
+
+	/// Спит заданное количество секунд или до события wakeup
+	void sleep(double seconds);
+
+	/// Разбудить
+	void wakeup();
+
+	/// Закрыть файлы с логами. При следующей записи, будут созданы новые файлы.
+	void closeLogs();
+
+	/// В Graphite компоненты пути(папки) разделяются точкой.
+	/// У нас принят путь формата root_path.hostname_yandex_ru.key
+	/// root_path по умолчанию one_min
+	/// key - лучше группировать по смыслу. Например "meminfo.cached" или "meminfo.free", "meminfo.total"
+	template <class T>
+	void writeToGraphite(const std::string & key, const T & value, time_t timestamp = 0, const std::string & custom_root_path = "")
+	{
+		graphite_writer->write(key, value, timestamp, custom_root_path);
+	}
+
+	template <class T>
+	void writeToGraphite(const GraphiteWriter::KeyValueVector<T> & key_vals, time_t timestamp = 0, const std::string & custom_root_path = "")
+	{
+		graphite_writer->write(key_vals, timestamp, custom_root_path);
+	}
+
+	boost::optional<size_t> getLayer() const
+	{
+		return layer;	/// layer выставляется в классе-наследнике BaseDaemonApplication.
+	}
+
+protected:
+
+	/// Используется при exitOnTaskError()
+	void handleNotification(Poco::TaskFailedNotification *);
+
+	std::unique_ptr<Poco::TaskManager> task_manager;
+
+	/// Создание и автоматическое удаление pid файла.
+	struct PID
+	{
+		std::string file;
+
+		/// Создать объект, не создавая PID файл
+		PID() {}
+
+		/// Создать объект, создать PID файл
+		PID(const std::string & file_) { seed(file_); }
+
+		/// Создать PID файл
+		void seed(const std::string & file_);
+
+		/// Удалить PID файл
+		void clear();
+
+		~PID() { clear(); }
+	};
+
+	PID pid;
+
+	/// Получен ли сигнал на завершение? Этот флаг устанавливается в BaseDaemonApplication.
+	bool is_cancelled = false;
+
+	bool log_to_console = false;
+
+	/// Событие, чтобы проснуться во время ожидания
+	Poco::Event wakeup_event;
+
+	/// Поток, в котором принимается сигнал HUP/USR1 для закрытия логов.
+	Poco::Thread close_logs_thread;
+	std::unique_ptr<Poco::Runnable> close_logs_listener;
+
+	/// Файлы с логами.
+	Poco::AutoPtr<Poco::FileChannel> log_file;
+	Poco::AutoPtr<Poco::FileChannel> error_log_file;
+	Poco::AutoPtr<Poco::SyslogChannel> syslog_channel;
+
+	std::unique_ptr<GraphiteWriter> graphite_writer;
+
+	boost::optional<size_t> layer;
+};
diff --git a/libs/libdaemon/include/daemon/GraphiteWriter.h b/libs/libdaemon/include/daemon/GraphiteWriter.h
new file mode 100644
index 00000000000..8d01131716b
--- /dev/null
+++ b/libs/libdaemon/include/daemon/GraphiteWriter.h
@@ -0,0 +1,82 @@
+#pragma once
+
+#include <string>
+#include <time.h>
+#include <Poco/Net/StreamSocket.h>
+#include <Poco/Net/SocketStream.h>
+#include <Poco/Util/Application.h>
+#include <common/logger_useful.h>
+
+/// пишет в Graphite данные в формате
+/// path value timestamp\n
+/// path может иметь любую вложенность. Директории разделяются с помощью "."
+/// у нас принят следующий формат path - root_path.server_name.sub_path.key
+class GraphiteWriter
+{
+public:
+	GraphiteWriter(const std::string & config_name, const std::string & sub_path = "");
+
+	template <typename T> using KeyValuePair = std::pair<std::string, T>;
+	template <typename T> using KeyValueVector = std::vector<KeyValuePair<T>>;
+
+	template <typename T> void write(const std::string & key, const T & value, 
+									 time_t timestamp = 0, const std::string & custom_root_path = "")
+	{
+		writeImpl(KeyValuePair<T>{ key, value }, timestamp, custom_root_path);
+	}
+
+	template <typename T> void write(const KeyValueVector<T> & key_val_vec, 
+									 time_t timestamp = 0, const std::string & custom_root_path = "")
+	{
+		writeImpl(key_val_vec, timestamp, custom_root_path);
+	}
+
+	/// Для облачных демонов удобней использовать
+	/// путь вида prefix.environment.layer.daemon_name.metrica
+	static const std::string & getPerLayerPath(const std::string & prefix = "one_min");
+	
+	/// возвращает путь root_path.server_name
+	static std::string getPerServerPath(const std::string & server_name, const std::string & root_path = "one_min");
+private:
+	template <typename T>
+	void writeImpl(const T & data, time_t timestamp, const std::string & custom_root_path)
+	{
+		if (!timestamp)
+			timestamp = time(0);
+
+		try
+		{
+			Poco::Net::SocketAddress socket_address(host, port);
+			Poco::Net::StreamSocket socket(socket_address);
+			socket.setSendTimeout(Poco::Timespan(timeout * 1000000));
+			Poco::Net::SocketStream str(socket);
+
+			out(str, data, timestamp, custom_root_path);
+		}
+		catch (const Poco::Exception & e)
+		{
+			LOG_WARNING(&Poco::Util::Application::instance().logger(),
+						"Fail to write to Graphite " << host << ":" << port << ". e.what() = " << e.what() << ", e.message() = " << e.message());
+		}
+	}
+
+	template <typename T>
+	void out(std::ostream & os, const KeyValuePair<T> & key_val, time_t timestamp, const std::string & custom_root_path)
+	{
+		os << (custom_root_path.empty() ? root_path : custom_root_path) << 
+			'.' << key_val.first << ' ' << key_val.second << ' ' << timestamp << '\n';
+	}
+
+	template <typename T>
+	void out(std::ostream & os, const KeyValueVector<T> & key_val_vec, time_t timestamp, const std::string & custom_root_path)
+	{
+		for (const auto & key_val : key_val_vec)
+			out(os, key_val, timestamp, custom_root_path);
+	}
+
+	std::string root_path;
+
+	int port;
+	std::string host;
+	double timeout;
+};
diff --git a/libs/libdaemon/src/Daemon.cpp b/libs/libdaemon/src/Daemon.cpp
new file mode 100644
index 00000000000..0d088fcd05f
--- /dev/null
+++ b/libs/libdaemon/src/Daemon.cpp
@@ -0,0 +1,862 @@
+#include <daemon/Daemon.h>
+
+#include <DB/Common/ConfigProcessor.h>
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/fcntl.h>
+#include <sys/time.h>
+#include <errno.h>
+
+#include <string.h>
+#include <signal.h>
+#include <cxxabi.h>
+#include <execinfo.h>
+#include <ucontext.h>
+
+#include <typeinfo>
+
+#include <common/logger_useful.h>
+#include <common/ErrorHandlers.h>
+
+#include <sys/time.h>
+#include <sys/resource.h>
+
+#include <iostream>
+#include <Poco/Observer.h>
+#include <Poco/Logger.h>
+#include <Poco/AutoPtr.h>
+#include <Poco/SplitterChannel.h>
+#include <Poco/Ext/LevelFilterChannel.h>
+#include <Poco/Ext/ThreadNumber.h>
+#include <Poco/FormattingChannel.h>
+#include <Poco/PatternFormatter.h>
+#include <Poco/ConsoleChannel.h>
+#include <Poco/TaskManager.h>
+#include <Poco/File.h>
+#include <Poco/Path.h>
+#include <Poco/Message.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Poco/Util/XMLConfiguration.h>
+#include <Poco/ScopedLock.h>
+#include <Poco/Exception.h>
+#include <Poco/ErrorHandler.h>
+#include <Poco/NumberFormatter.h>
+#include <Poco/Condition.h>
+#include <Poco/SyslogChannel.h>
+
+#include <DB/Common/Exception.h>
+#include <DB/IO/WriteBufferFromFileDescriptor.h>
+#include <DB/IO/ReadBufferFromFileDescriptor.h>
+#include <DB/IO/ReadHelpers.h>
+#include <DB/IO/WriteHelpers.h>
+
+#include <common/Revision.h>
+
+
+
+using Poco::Logger;
+using Poco::AutoPtr;
+using Poco::Observer;
+using Poco::FormattingChannel;
+using Poco::SplitterChannel;
+using Poco::ConsoleChannel;
+using Poco::FileChannel;
+using Poco::Path;
+using Poco::Message;
+using Poco::Util::AbstractConfiguration;
+
+
+/** Для передачи информации из обработчика сигнала для обработки в другом потоке.
+  * Если при получении сигнала надо делать что-нибудь серьёзное (например, вывести сообщение в лог),
+  *  то передать нужную информацию через pipe в другой поток и сделать там всю работу
+  *  - один из немногих безопасных способов сделать это.
+  */
+struct Pipe
+{
+	union
+	{
+		int fds[2];
+		struct
+		{
+			int read_fd;
+			int write_fd;
+		};
+	};
+
+	Pipe()
+	{
+		if (0 != pipe(fds))
+			DB::throwFromErrno("Cannot create pipe");
+	}
+
+	~Pipe()
+	{
+		close(fds[0]);
+		close(fds[1]);
+	}
+};
+
+
+Pipe signal_pipe;
+
+
+/** Устанавливает обработчик сигнала по умолчанию, и отправляет себе сигнал sig.
+  * Вызывается изнутри пользовательского обработчика сигнала, чтобы записать core dump.
+  */
+static void call_default_signal_handler(int sig)
+{
+	signal(sig, SIG_DFL);
+	kill(getpid(), sig);
+}
+
+
+typedef decltype(Poco::ThreadNumber::get()) ThreadNumber;
+static const size_t buf_size = sizeof(int) + sizeof(siginfo_t) + sizeof(ucontext_t) + sizeof(ThreadNumber);
+
+
+/** Обработчик сигналов HUP / USR1 */
+static void close_logs_signal_handler(int sig, siginfo_t * info, void * context)
+{
+	char buf[buf_size];
+	DB::WriteBufferFromFileDescriptor out(signal_pipe.write_fd, buf_size, buf);
+	DB::writeBinary(sig, out);
+	out.next();
+}
+
+
+/** Обработчик некоторых сигналов. Выводит информацию в лог (если получится).
+  */
+static void fault_signal_handler(int sig, siginfo_t * info, void * context)
+{
+	char buf[buf_size];
+	DB::WriteBufferFromFileDescriptor out(signal_pipe.write_fd, buf_size, buf);
+
+	DB::writeBinary(sig, out);
+	DB::writePODBinary(*info, out);
+	DB::writePODBinary(*reinterpret_cast<const ucontext_t *>(context), out);
+	DB::writeBinary(Poco::ThreadNumber::get(), out);
+
+	out.next();
+
+	/// Время, за которое читающий из pipe поток должен попытаться успеть вывести в лог stack trace.
+	::sleep(10);
+
+	call_default_signal_handler(sig);
+}
+
+
+static bool already_printed_stack_trace = false;
+
+
+/** Получает информацию через pipe.
+  * При получении сигнала HUP / USR1 закрывает лог-файлы.
+  * При получении информации из std::terminate, выводит её в лог.
+  * При получении других сигналов, выводит информацию в лог.
+  */
+class SignalListener : public Poco::Runnable
+{
+public:
+	SignalListener() : log(&Logger::get("Daemon"))
+	{
+	}
+
+	void run()
+	{
+		char buf[buf_size];
+		DB::ReadBufferFromFileDescriptor in(signal_pipe.read_fd, buf_size, buf);
+
+		while (!in.eof())
+		{
+			int sig = 0;
+			DB::readBinary(sig, in);
+
+			if (sig == SIGHUP || sig == SIGUSR1)
+			{
+				LOG_DEBUG(log, "Received signal to close logs.");
+				Daemon::instance().closeLogs();
+				LOG_INFO(log, "Opened new log file after received signal.");
+			}
+			else if (sig == -1)		/// -1 для обозначения std::terminate.
+			{
+				ThreadNumber thread_num;
+				std::string message;
+
+				DB::readBinary(thread_num, in);
+				DB::readBinary(message, in);
+
+				onTerminate(message, thread_num);
+			}
+			else
+			{
+				siginfo_t info;
+				ucontext_t context;
+				ThreadNumber thread_num;
+
+				DB::readPODBinary(info, in);
+				DB::readPODBinary(context, in);
+				DB::readBinary(thread_num, in);
+
+				onFault(sig, info, context, thread_num);
+			}
+		}
+	}
+
+private:
+	Logger * log;
+
+
+	void onTerminate(const std::string & message, ThreadNumber thread_num) const
+	{
+		LOG_ERROR(log, "(from thread " << thread_num << ") " << message);
+	}
+
+	void onFault(int sig, siginfo_t & info, ucontext_t & context, ThreadNumber thread_num) const
+	{
+		LOG_ERROR(log, "########################################");
+		LOG_ERROR(log, "(from thread " << thread_num << ") "
+			<< "Received signal " << strsignal(sig) << " (" << sig << ")" << ".");
+
+		if (sig == SIGSEGV)
+		{
+			/// Выводим информацию об адресе и о причине.
+			if (nullptr == info.si_addr)
+				LOG_ERROR(log, "Address: NULL pointer.");
+			else
+				LOG_ERROR(log, "Address: " << info.si_addr
+					<< (info.si_code == SEGV_ACCERR ? ". Attempted access has violated the permissions assigned to the memory area." : ""));
+		}
+
+		if (already_printed_stack_trace)
+			return;
+
+		void * caller_address = nullptr;
+
+#if defined(__x86_64__)
+		/// Get the address at the time the signal was raised from the RIP (x86-64)
+		caller_address = reinterpret_cast<void *>(context.uc_mcontext.gregs[REG_RIP]);
+#elif defined(__aarch64__)
+		caller_address = reinterpret_cast<void *>(context.uc_mcontext.pc);
+#endif
+
+		static const int max_frames = 50;
+		void * frames[max_frames];
+		int frames_size = backtrace(frames, max_frames);
+
+		if (frames_size >= 2)
+		{
+			/// Overwrite sigaction with caller's address
+			if (caller_address && (frames_size < 3 || caller_address != frames[2]))
+				frames[1] = caller_address;
+
+			char ** symbols = backtrace_symbols(frames, frames_size);
+
+			if (!symbols)
+			{
+				if (caller_address)
+					LOG_ERROR(log, "Caller address: " << caller_address);
+			}
+			else
+			{
+				for (int i = 1; i < frames_size; ++i)
+				{
+					/// Делаем demangling имён. Имя находится в скобках, до символа '+'.
+
+					char * name_start = nullptr;
+					char * name_end = nullptr;
+					char * demangled_name = nullptr;
+					int status = 0;
+
+					if (nullptr != (name_start = strchr(symbols[i], '('))
+						&& nullptr != (name_end = strchr(name_start, '+')))
+					{
+						++name_start;
+						*name_end = '\0';
+						demangled_name = abi::__cxa_demangle(name_start, 0, 0, &status);
+						*name_end = '+';
+					}
+
+					std::stringstream res;
+
+					res << i << ". ";
+
+					if (nullptr != demangled_name && 0 == status)
+					{
+						res.write(symbols[i], name_start - symbols[i]);
+						res << demangled_name << name_end;
+					}
+					else
+						res << symbols[i];
+
+					LOG_ERROR(log, res.rdbuf());
+				}
+			}
+		}
+	}
+};
+
+
+/** Для использования с помощью std::set_terminate.
+  * Собирает чуть больше информации, чем __gnu_cxx::__verbose_terminate_handler,
+  *  и отправляет её в pipe. Другой поток читает из pipe и выводит её в лог.
+  * См. исходники в libstdc++-v3/libsupc++/vterminate.cc
+  */
+static void terminate_handler()
+{
+	static __thread bool terminating = false;
+	if (terminating)
+	{
+		abort();
+		return;
+	}
+
+	terminating = true;
+
+	/// Сюда записываем информацию для логгирования.
+	std::stringstream log;
+
+	std::type_info * t = abi::__cxa_current_exception_type();
+	if (t)
+	{
+		/// Note that "name" is the mangled name.
+		char const * name = t->name();
+		{
+			int status = -1;
+			char * dem = 0;
+
+			dem = abi::__cxa_demangle(name, 0, 0, &status);
+
+		    log << "Terminate called after throwing an instance of " << (status == 0 ? dem : name) << std::endl;
+
+			if (status == 0)
+				free(dem);
+		}
+
+		already_printed_stack_trace = true;
+
+		/// If the exception is derived from std::exception, we can give more information.
+		try
+		{
+			throw;
+		}
+		catch (DB::Exception & e)
+		{
+			log << "Code: " << e.code() << ", e.displayText() = " << e.displayText() << ", e.what() = " << e.what() << std::endl;
+		}
+		catch (Poco::Exception & e)
+		{
+			log << "Code: " << e.code() << ", e.displayText() = " << e.displayText() << ", e.what() = " << e.what() << std::endl;
+		}
+		catch (const std::exception & e)
+		{
+			log << "what(): " << e.what() << std::endl;
+		}
+		catch (...)
+		{
+		}
+
+		log << "Stack trace:\n\n" << StackTrace().toString() << std::endl;
+	}
+	else
+	{
+	    log << "Terminate called without an active exception" << std::endl;
+	}
+
+	static const size_t buf_size = 1024;
+
+	std::string log_message = log.str();
+	if (log_message.size() > buf_size - 16)
+		log_message.resize(buf_size - 16);
+
+	char buf[buf_size];
+	DB::WriteBufferFromFileDescriptor out(signal_pipe.write_fd, buf_size, buf);
+
+	DB::writeBinary(-1, out);
+	DB::writeBinary(Poco::ThreadNumber::get(), out);
+	DB::writeBinary(log_message, out);
+	out.next();
+
+    abort();
+}
+
+
+static std::string createDirectory(const std::string & _path)
+{
+	Poco::Path path(_path);
+	std::string str;
+	for(int j=0;j<path.depth();++j)
+	{
+		str += "/";
+		str += path[j];
+
+		int res = ::mkdir(str.c_str(), 0700);
+		if( res && (errno!=EEXIST) )
+		{
+			throw std::runtime_error(std::string("Can't create dir - ") + str + " - " + strerror(errno));
+		}
+	}
+
+	return str;
+};
+
+
+void Daemon::reloadConfiguration()
+{
+	/** Если программа запущена не в режиме демона, и не указан параметр config-file,
+	  *  то будем использовать параметры из файла config.xml в текущей директории,
+	  *  но игнорировать заданные в нём параметры логгирования.
+	  * (Чтобы при запуске с минимумом параметров, лог выводился в консоль.)
+	  * При этом, параметры логгирования, заданные в командной строке, не игнорируются.
+	  */
+	std::string log_command_line_option = config().getString("logger.log", "");
+	ConfigurationPtr processed_config = ConfigProcessor(false, true).loadConfig(config().getString("config-file", "config.xml"));
+	config().add(processed_config.duplicate(), PRIO_DEFAULT, false);
+	log_to_console = !config().getBool("application.runAsDaemon", false) && log_command_line_option.empty();
+}
+
+
+/** Форматирует по своему.
+  * Некоторые детали невозможно получить, используя только Poco::PatternFormatter.
+  *
+  * Во-первых, используется номер потока не среди потоков Poco::Thread,
+  *  а среди всех потоков, для которых был получен номер (см. ThreadNumber.h)
+  *
+  * Во-вторых, корректно выводится локальная дата и время.
+  * Poco::PatternFormatter плохо работает с локальным временем,
+  *  в ситуациях, когда в ближайшем будущем намечается отмена или введение daylight saving time.
+  *  - см. исходники Poco и http://thread.gmane.org/gmane.comp.time.tz/8883
+  *
+  * Также сделан чуть более эффективным (что имеет мало значения).
+  */
+class OwnPatternFormatter : public Poco::PatternFormatter
+{
+public:
+	enum Options
+	{
+		ADD_NOTHING = 0,
+		ADD_LAYER_TAG = 1 << 0
+	};
+	OwnPatternFormatter(const Daemon & daemon_, Options options_ = ADD_NOTHING) : Poco::PatternFormatter(""), daemon(daemon_), options(options_) {}
+
+	void format(const Message & msg, std::string & text) override
+	{
+		DB::WriteBufferFromString wb(text);
+
+		/// в syslog тэг идет перед сообщением и до первого пробела.
+		if (options & ADD_LAYER_TAG)
+		{
+			boost::optional<size_t> layer = daemon.getLayer();
+			if (layer)
+			{
+				writeCString("layer[", wb);
+				DB::writeIntText(*layer, wb);
+				writeCString("]: ", wb);
+			}
+		}
+
+		/// Выведем время с точностью до миллисекунд.
+		timeval tv;
+		if (0 != gettimeofday(&tv, nullptr))
+			DB::throwFromErrno("Cannot gettimeofday");
+
+		/// Поменяем разделители у даты для совместимости.
+		DB::writeDateTimeText<'.', ':'>(tv.tv_sec, wb);
+
+		int milliseconds = tv.tv_usec / 1000;
+		DB::writeChar('.', wb);
+		DB::writeChar('0' + ((milliseconds / 100) % 10), wb);
+		DB::writeChar('0' + ((milliseconds / 10) % 10), wb);
+		DB::writeChar('0' + (milliseconds % 10), wb);
+
+		writeCString(" [ ", wb);
+		DB::writeIntText(Poco::ThreadNumber::get(), wb);
+		writeCString(" ] <", wb);
+		DB::writeString(getPriorityName(static_cast<int>(msg.getPriority())), wb);
+		writeCString("> ", wb);
+		DB::writeString(msg.getSource(), wb);
+		writeCString(": ", wb);
+		DB::writeString(msg.getText(), wb);
+	}
+
+private:
+	const Daemon & daemon;
+	Options options;
+};
+
+
+/// Для создания и уничтожения unique_ptr, который в заголовочном файле объявлен от incomplete type.
+Daemon::Daemon() = default;
+Daemon::~Daemon() = default;
+
+
+void Daemon::terminate()
+{
+	getTaskManager().cancelAll();
+	ServerApplication::terminate();
+}
+
+void Daemon::kill()
+{
+	pid.clear();
+	Poco::Process::kill(getpid());
+}
+
+void Daemon::sleep(double seconds)
+{
+	wakeup_event.reset();
+	wakeup_event.tryWait(seconds * 1000);
+}
+
+void Daemon::wakeup()
+{
+	wakeup_event.set();
+}
+
+
+/// Строит необходимые логгеры
+void Daemon::buildLoggers()
+{
+	/// Сменим директорию для лога
+	if (config().hasProperty("logger.log") && !log_to_console)
+	{
+		std::string path = createDirectory(config().getString("logger.log"));
+		if (config().getBool("application.runAsDaemon", false)
+			&& chdir(path.c_str()) != 0)
+			throw Poco::Exception("Cannot change directory to " + path);
+	}
+	else
+	{
+		if (config().getBool("application.runAsDaemon", false)
+			&& chdir("/tmp") != 0)
+			throw Poco::Exception("Cannot change directory to /tmp");
+	}
+
+	if (config().hasProperty("logger.errorlog") && !log_to_console)
+		createDirectory(config().getString("logger.errorlog"));
+
+	if (config().hasProperty("logger.log") && !log_to_console)
+	{
+		std::cerr << "Should logs to " << config().getString("logger.log") << std::endl;
+
+		// splitter
+		Poco::AutoPtr<SplitterChannel> split = new SplitterChannel;
+
+		// set up two channel chains
+		Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(*this);
+		pf->setProperty("times", "local");
+		Poco::AutoPtr<FormattingChannel> log = new FormattingChannel(pf);
+		log_file = new FileChannel;
+		log_file->setProperty("path", Poco::Path(config().getString("logger.log")).absolute().toString());
+		log_file->setProperty("rotation", config().getRawString("logger.size", "100M"));
+		log_file->setProperty("archive", "number");
+		log_file->setProperty("compress", config().getRawString("logger.compress", "true"));
+		log_file->setProperty("purgeCount", config().getRawString("logger.count", "1"));
+		log->setChannel(log_file);
+		split->addChannel(log);
+		log_file->open();
+
+		if (config().hasProperty("logger.errorlog"))
+		{
+			std::cerr << "Should error logs to " << config().getString("logger.errorlog") << std::endl;
+			Poco::AutoPtr<Poco::LevelFilterChannel> level = new Poco::LevelFilterChannel;
+			level->setLevel(Message::PRIO_NOTICE);
+			Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(*this);
+			pf->setProperty("times", "local");
+			Poco::AutoPtr<FormattingChannel> errorlog = new FormattingChannel(pf);
+			error_log_file = new FileChannel;
+			error_log_file->setProperty("path", Poco::Path(config().getString("logger.errorlog")).absolute().toString());
+			error_log_file->setProperty("rotation", config().getRawString("logger.size", "100M"));
+			error_log_file->setProperty("archive", "number");
+			error_log_file->setProperty("compress", config().getRawString("logger.compress", "true"));
+			error_log_file->setProperty("purgeCount", config().getRawString("logger.count", "1"));
+			errorlog->setChannel(error_log_file);
+			level->setChannel(errorlog);
+			split->addChannel(level);
+			errorlog->open();
+		}
+
+		if (config().getBool("logger.use_syslog", false) || config().getBool("dynamic_layer_selection", false))
+		{
+			Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(*this, OwnPatternFormatter::ADD_LAYER_TAG);
+			pf->setProperty("times", "local");
+			Poco::AutoPtr<FormattingChannel> log = new FormattingChannel(pf);
+			syslog_channel = new Poco::SyslogChannel(commandName(), Poco::SyslogChannel::SYSLOG_CONS | Poco::SyslogChannel::SYSLOG_PID, Poco::SyslogChannel::SYSLOG_DAEMON);
+			log->setChannel(syslog_channel);
+			split->addChannel(log);
+			syslog_channel->open();
+		}
+
+		split->open();
+		logger().close();
+		logger().setChannel(split);
+	}
+	else
+	{
+		// Выводим на консоль
+		Poco::AutoPtr<ConsoleChannel> file = new ConsoleChannel;
+		Poco::AutoPtr<OwnPatternFormatter> pf = new OwnPatternFormatter(*this);
+		pf->setProperty("times", "local");
+		Poco::AutoPtr<FormattingChannel> log = new FormattingChannel(pf);
+		log->setChannel(file);
+
+		logger().close();
+		logger().setChannel(log);
+		logger().warning("Logging to console");
+	}
+
+	// Уровни для всех
+	logger().setLevel(config().getString("logger.level", "trace"));
+
+	// Прикрутим к корневому логгеру
+	Logger::root().setLevel(logger().getLevel());
+	Logger::root().setChannel(logger().getChannel());
+
+	// Уровни для явно указанных логгеров
+	AbstractConfiguration::Keys levels;
+	config().keys("logger.levels", levels);
+
+	if(!levels.empty())
+		for(AbstractConfiguration::Keys::iterator it = levels.begin(); it != levels.end(); ++it)
+			Logger::get(*it).setLevel(config().getString("logger.levels." + *it, "trace"));
+}
+
+
+void Daemon::closeLogs()
+{
+	if (log_file)
+		log_file->close();
+	if (error_log_file)
+		error_log_file->close();
+
+	if (!log_file)
+		logger().warning("Logging to console but received signal to close log file (ignoring).");
+}
+
+void Daemon::initialize(Application& self)
+{
+	/// В случае падения - сохраняем коры
+	{
+		struct rlimit rlim;
+		if (getrlimit(RLIMIT_CORE, &rlim))
+			throw Poco::Exception("Cannot getrlimit");
+		rlim.rlim_cur = 1024 * 1024 * 1024;		/// 1 GiB. Если больше - они слишком долго пишутся на диск.
+		if (setrlimit(RLIMIT_CORE, &rlim))
+			throw Poco::Exception("Cannot setrlimit");
+	}
+
+	task_manager.reset(new Poco::TaskManager);
+	ServerApplication::initialize(self);
+
+	bool is_daemon = config().getBool("application.runAsDaemon", false);
+
+	if (is_daemon)
+	{
+		/** При создании pid файла и поиске конфигурации, будем интерпретировать относительные пути
+		  * от директории запуска программы.
+		  */
+		std::string path = Poco::Path(config().getString("application.path")).setFileName("").toString();
+		if (0 != chdir(path.c_str()))
+			throw Poco::Exception("Cannot change directory to " + path);
+	}
+
+	/// Считаем конфигурацию
+	reloadConfiguration();
+
+	std::string log_path = config().getString("logger.log", "");
+	if (!log_path.empty())
+		log_path = Poco::Path(log_path).setFileName("").toString();
+
+	if (is_daemon)
+	{
+		/** Переназначим stdout, stderr в отдельные файлы в директориях с логами.
+		  * Некоторые библиотеки пишут в stderr в случае ошибок или в отладочном режиме,
+		  *  и этот вывод иногда имеет смысл смотреть даже когда программа запущена в режиме демона.
+		  * Делаем это до buildLoggers, чтобы ошибки во время инициализации логгера, попали в эти файлы.
+		  */
+		if (!log_path.empty())
+		{
+			std::string stdout_path = log_path + "/stdout";
+			if (!freopen(stdout_path.c_str(), "a+", stdout))
+				throw Poco::OpenFileException("Cannot attach stdout to " + stdout_path);
+
+			std::string stderr_path = log_path + "/stderr";
+			if (!freopen(stderr_path.c_str(), "a+", stderr))
+				throw Poco::OpenFileException("Cannot attach stderr to " + stderr_path);
+		}
+
+		/// Создадим pid-file.
+		if (is_daemon && config().has("pid"))
+			pid.seed(config().getString("pid"));
+	}
+
+	buildLoggers();
+
+	if (is_daemon)
+	{
+		/** Сменим директорию на ту, куда надо писать core файлы.
+		  * Делаем это после buildLoggers, чтобы не менять текущую директорию раньше.
+		  * Это важно, если конфиги расположены в текущей директории.
+		  */
+		Poco::File opt_cores = "/opt/cores";
+
+		std::string core_path = config().getString("core_path",
+			opt_cores.exists() && opt_cores.isDirectory()
+				? "/opt/cores/"
+				: (!log_path.empty()
+					? log_path
+					: "/opt/"));
+
+		if (0 != chdir(core_path.c_str()))
+			throw Poco::Exception("Cannot change directory to " + core_path);
+	}
+
+	/// Ставим terminate_handler
+	std::set_terminate(terminate_handler);
+
+	/// Ставим обработчики сигналов
+	struct sigaction sa;
+	memset(&sa, 0, sizeof(sa));
+	sa.sa_sigaction = fault_signal_handler;
+	sa.sa_flags = SA_SIGINFO;
+
+	{
+		int signals[] = {SIGABRT, SIGSEGV, SIGILL, SIGBUS, SIGSYS, SIGFPE, SIGPIPE, 0};
+
+		if (sigemptyset(&sa.sa_mask))
+			throw Poco::Exception("Cannot set signal handler.");
+
+		for (size_t i = 0; signals[i]; ++i)
+			if (sigaddset(&sa.sa_mask, signals[i]))
+				throw Poco::Exception("Cannot set signal handler.");
+
+		for (size_t i = 0; signals[i]; ++i)
+			if (sigaction(signals[i], &sa, 0))
+				throw Poco::Exception("Cannot set signal handler.");
+	}
+
+	sa.sa_sigaction = close_logs_signal_handler;
+
+	{
+		int signals[] = {SIGHUP, SIGUSR1, 0};
+
+		if (sigemptyset(&sa.sa_mask))
+			throw Poco::Exception("Cannot set signal handler.");
+
+		for (size_t i = 0; signals[i]; ++i)
+			if (sigaddset(&sa.sa_mask, signals[i]))
+				throw Poco::Exception("Cannot set signal handler.");
+
+		for (size_t i = 0; signals[i]; ++i)
+			if (sigaction(signals[i], &sa, 0))
+				throw Poco::Exception("Cannot set signal handler.");
+	}
+
+	/// Ставим ErrorHandler для потоков
+	static KillingErrorHandler killing_error_handler;
+	Poco::ErrorHandler::set(&killing_error_handler);
+
+	/// Выведем ревизию демона
+	Logger::root().information("Starting daemon with revision " + Poco::NumberFormatter::format(Revision::get()));
+
+	close_logs_listener.reset(new SignalListener);
+	close_logs_thread.start(*close_logs_listener);
+
+	graphite_writer.reset(new GraphiteWriter("graphite"));
+}
+
+
+/// Заставляет демон завершаться, если хотя бы одна задача завершилась неудачно
+void Daemon::exitOnTaskError()
+{
+	Observer<Daemon, Poco::TaskFailedNotification> obs(*this, &Daemon::handleNotification);
+	getTaskManager().addObserver(obs);
+}
+
+/// Используется при exitOnTaskError()
+void Daemon::handleNotification(Poco::TaskFailedNotification *_tfn)
+{
+	AutoPtr<Poco::TaskFailedNotification> fn(_tfn);
+	Logger *lg = &(logger());
+	LOG_ERROR(lg, "Task '" << fn->task()->name() << "' failed. Daemon is shutting down. Reason - " << fn->reason().displayText());
+	ServerApplication::terminate();
+}
+
+void Daemon::defineOptions(Poco::Util::OptionSet& _options)
+{
+	Poco::Util::ServerApplication::defineOptions (_options);
+
+	_options.addOption(
+		Poco::Util::Option ("config-file", "C", "load configuration from a given file")
+			.required (false)
+			.repeatable (false)
+			.argument ("<file>")
+			.binding("config-file")
+			);
+
+	_options.addOption(
+		Poco::Util::Option ("log-file", "L", "use given log file")
+			.required (false)
+			.repeatable (false)
+			.argument ("<file>")
+			.binding("logger.log")
+			);
+
+	_options.addOption(
+		Poco::Util::Option ("errorlog-file", "E", "use given log file for errors only")
+			.required (false)
+			.repeatable (false)
+			.argument ("<file>")
+			.binding("logger.errorlog")
+			);
+
+	_options.addOption(
+		Poco::Util::Option ("pid-file", "P", "use given pidfile")
+			.required (false)
+			.repeatable (false)
+			.argument ("<file>")
+			.binding("pid")
+			);
+}
+
+
+void Daemon::PID::seed(const std::string & file_)
+{
+	/// переведём путь в абсолютный
+	file = Poco::Path(file_).absolute().toString();
+
+	int fd = open(file.c_str(),
+		O_CREAT | O_EXCL | O_WRONLY,
+		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+
+	if (-1 == fd)
+	{
+		file.clear();
+		if (EEXIST == errno)
+			throw Poco::Exception("Pid file exists, should not start daemon.");
+		throw Poco::CreateFileException("Cannot create pid file.");
+	}
+
+	try
+	{
+		std::stringstream s;
+		s << getpid();
+		if (static_cast<ssize_t>(s.str().size()) != write(fd, s.str().c_str(), s.str().size()))
+			throw Poco::Exception("Cannot write to pid file.");
+	}
+	catch (...)
+	{
+		close(fd);
+		throw;
+	}
+
+	close(fd);
+}
+
+void Daemon::PID::clear()
+{
+	if (!file.empty())
+	{
+		Poco::File(file).remove();
+		file.clear();
+	}
+}
diff --git a/libs/libdaemon/src/GraphiteWriter.cpp b/libs/libdaemon/src/GraphiteWriter.cpp
new file mode 100644
index 00000000000..4f11659dcd2
--- /dev/null
+++ b/libs/libdaemon/src/GraphiteWriter.cpp
@@ -0,0 +1,86 @@
+#include <daemon/GraphiteWriter.h>
+#include <daemon/Daemon.h>
+#include <Poco/Util/LayeredConfiguration.h>
+#include <Poco/Util/Application.h>
+#include <Poco/Net/DNS.h>
+
+#include <mutex>
+#include <iomanip>
+
+
+GraphiteWriter::GraphiteWriter(const std::string & config_name, const std::string & sub_path)
+{
+	Poco::Util::LayeredConfiguration & config = Poco::Util::Application::instance().config();
+	port = config.getInt(config_name + ".port", 42000);
+	host = config.getString(config_name + ".host", "127.0.0.1");
+	timeout = config.getDouble(config_name + ".timeout", 0.1);
+
+	root_path = config.getString(config_name + ".root_path", "one_min");
+	if (root_path.size())
+		root_path += ".";
+
+	/// То же, что uname -n
+	std::string hostname_in_path = Poco::Net::DNS::hostName();
+
+	/// Заменяем точки на подчёркивания, чтобы Graphite не интерпретировал их, как разделители пути.
+	std::replace(std::begin(hostname_in_path), std::end(hostname_in_path), '.', '_');
+
+	root_path += hostname_in_path + config.getString(config_name + ".hostname_suffix", "");
+
+	if (sub_path.size())
+		root_path += "." + sub_path;
+}
+
+static std::string getPerLayerPathImpl(const std::string prefix)
+{
+	/// Угадываем имя среды по имени машинки
+	/// машинки имеют имена вида example01dt.yandex.ru
+	/// t - test
+	/// dev - development
+	/// никакого суффикса - production
+
+	std::stringstream path_full;
+
+	path_full << prefix << ".";
+
+	std::string hostname = Poco::Net::DNS::hostName();
+	hostname = hostname.substr(0, hostname.find('.'));
+
+	const std::string development_suffix = "dev";
+	if (hostname.back() == 't')
+		path_full << "test.";
+	else if (hostname.size() > development_suffix.size() &&
+			hostname.substr(hostname.size() - development_suffix.size()) == development_suffix)
+		path_full << "development.";
+	else
+		path_full << "production.";
+
+	const Daemon & daemon = Daemon::instance();
+
+	if (daemon.getLayer())
+		path_full << "layer" << std::setfill('0') << std::setw(3) << *daemon.getLayer() << ".";
+
+	/// Когда несколько демонов запускается на одной машине
+	/// к имени демона добавляется цифра.
+	/// Удалим последнюю цифру
+	std::locale locale;
+	std::string command_name = daemon.commandName();
+	if (std::isdigit(command_name.back(), locale))
+		command_name = command_name.substr(0, command_name.size() - 1);
+	path_full << command_name;
+
+	return path_full.str();
+}
+
+const std::string & GraphiteWriter::getPerLayerPath(const std::string & prefix)
+{
+	static std::string path = getPerLayerPathImpl(prefix);	/// thread-safe statics.
+	return path;
+}
+
+std::string GraphiteWriter::getPerServerPath(const std::string & server_name, const std::string & root_path)
+{
+	std::string path = root_path + "." + server_name;
+	std::replace(path.begin() + root_path.size() + 1, path.end(), '.', '_');
+	return path;
+}
diff --git a/libs/libpoco/XML/testsuite/src/NodeIteratorTest.cpp b/libs/libpoco/XML/testsuite/src/NodeIteratorTest.cpp
deleted file mode 100644
index 29c18c36e6f..00000000000
--- a/libs/libpoco/XML/testsuite/src/NodeIteratorTest.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-//
-// NodeIteratorTest.cpp
-//
-// $Id: //poco/1.4/XML/testsuite/src/NodeIteratorTest.cpp#1 $
-//
-// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "NodeIteratorTest.h"
-#include "CppUnit/TestCaller.h"
-#include "CppUnit/TestSuite.h"
-#include "Poco/DOM/NodeIterator.h"
-#include "Poco/DOM/NodeFilter.h"
-#include "Poco/DOM/Document.h"
-#include "Poco/DOM/Element.h"
-#include "Poco/DOM/Text.h"
-#include "Poco/DOM/AutoPtr.h"
-
-
-using Poco::XML::NodeIterator;
-using Poco::XML::NodeFilter;
-using Poco::XML::Element;
-using Poco::XML::Document;
-using Poco::XML::Text;
-using Poco::XML::Node;
-using Poco::XML::AutoPtr;
-using Poco::XML::XMLString;
-
-
-namespace
-{
-	class TestNodeFilter: public NodeFilter
-	{
-		short acceptNode(Node* node)
-		{
-			if (node->innerText() == "text1")
-				return NodeFilter::FILTER_ACCEPT;
-			else
-				return NodeFilter::FILTER_REJECT;
-		}
-	};
-}
-
-
-NodeIteratorTest::NodeIteratorTest(const std::string& name): CppUnit::TestCase(name)
-{
-}
-
-
-NodeIteratorTest::~NodeIteratorTest()
-{
-}
-
-
-void NodeIteratorTest::testShowAll()
-{
-	AutoPtr<Document> pDoc = new Document;
-	AutoPtr<Element> pRoot = pDoc->createElement("root");
-	AutoPtr<Element> pElem1 = pDoc->createElement("elem");
-	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
-	AutoPtr<Text> pText1 = pDoc->createTextNode("text1");
-	AutoPtr<Text> pText2 = pDoc->createTextNode("text2");
-	
-	pElem1->appendChild(pText1);
-	pElem2->appendChild(pText2);
-	pRoot->appendChild(pElem1);
-	pRoot->appendChild(pElem2);
-	pDoc->appendChild(pRoot);
-	
-	NodeIterator it(pRoot, NodeFilter::SHOW_ALL);
-	
-	assert (it.nextNode() == pRoot);
-	assert (it.nextNode() == pElem1);
-	assert (it.nextNode() == pText1);
-	assert (it.nextNode() == pElem2);
-	assert (it.nextNode() == pText2);
-	assert (it.nextNode() == 0);
-	
-	assert (it.previousNode() == pText2);
-	assert (it.previousNode() == pElem2);
-	assert (it.previousNode() == pText1);
-	assert (it.previousNode() == pElem1);
-	assert (it.previousNode() == pRoot);
-	assert (it.previousNode() == 0);
-}
-
-
-void NodeIteratorTest::testShowElements()
-{
-	AutoPtr<Document> pDoc = new Document;
-	AutoPtr<Element> pRoot = pDoc->createElement("root");
-	AutoPtr<Element> pElem1 = pDoc->createElement("elem");
-	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
-	AutoPtr<Text> pText1 = pDoc->createTextNode("text1");
-	AutoPtr<Text> pText2 = pDoc->createTextNode("text2");
-	
-	pElem1->appendChild(pText1);
-	pElem2->appendChild(pText2);
-	pRoot->appendChild(pElem1);
-	pRoot->appendChild(pElem2);
-	pDoc->appendChild(pRoot);
-	
-	NodeIterator it(pRoot, NodeFilter::SHOW_ELEMENT);
-	
-	assert (it.nextNode() == pRoot);
-	assert (it.nextNode() == pElem1);
-	assert (it.nextNode() == pElem2);
-	assert (it.nextNode() == 0);
-	
-	assert (it.previousNode() == pElem2);
-	assert (it.previousNode() == pElem1);
-	assert (it.previousNode() == pRoot);
-	assert (it.previousNode() == 0);
-}
-
-
-void NodeIteratorTest::testFilter()
-{
-	AutoPtr<Document> pDoc = new Document;
-	AutoPtr<Element> pRoot = pDoc->createElement("root");
-	AutoPtr<Element> pElem1 = pDoc->createElement("elem");
-	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
-	AutoPtr<Text> pText1 = pDoc->createTextNode("text1");
-	AutoPtr<Text> pText2 = pDoc->createTextNode("text2");
-	
-	pElem1->appendChild(pText1);
-	pElem2->appendChild(pText2);
-	pRoot->appendChild(pElem1);
-	pRoot->appendChild(pElem2);
-	pDoc->appendChild(pRoot);
-	
-	TestNodeFilter filter;
-	NodeIterator it(pRoot, NodeFilter::SHOW_ELEMENT, &filter);
-	
-	assert (it.nextNode() == pElem1);
-	assert (it.nextNode() == 0);
-	
-	assert (it.previousNode() == pElem1);
-	assert (it.previousNode() == 0);
-}
-
-
-void NodeIteratorTest::testShowNothing()
-{
-	AutoPtr<Document> pDoc = new Document;
-	AutoPtr<Element> pRoot = pDoc->createElement("root");
-	AutoPtr<Element> pElem1 = pDoc->createElement("elem");
-	AutoPtr<Element> pElem2 = pDoc->createElement("elem");
-	AutoPtr<Text> pText1 = pDoc->createTextNode("text1");
-	AutoPtr<Text> pText2 = pDoc->createTextNode("text2");
-	
-	pElem1->appendChild(pText1);
-	pElem2->appendChild(pText2);
-	pRoot->appendChild(pElem1);
-	pRoot->appendChild(pElem2);
-	pDoc->appendChild(pRoot);
-	
-	NodeIterator it(pRoot, 0);
-	
-	assert (it.nextNode() == 0);
-	
-	assert (it.previousNode() == 0);
-}
-
-
-void NodeIteratorTest::setUp()
-{
-}
-
-
-void NodeIteratorTest::tearDown()
-{
-}
-
-
-CppUnit::Test* NodeIteratorTest::suite()
-{
-	CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("NodeIteratorTest");
-
-	CppUnit_addTest(pSuite, NodeIteratorTest, testShowAll);
-	CppUnit_addTest(pSuite, NodeIteratorTest, testShowElements);
-	CppUnit_addTest(pSuite, NodeIteratorTest, testFilter);
-	CppUnit_addTest(pSuite, NodeIteratorTest, testShowNothing);
-
-	return pSuite;
-}
diff --git a/libs/libpoco/Zip/doc/ZIP Spec.txt b/libs/libpoco/Zip/doc/ZIP Spec.txt
deleted file mode 100644
index 4fe38584f91..00000000000
--- a/libs/libpoco/Zip/doc/ZIP Spec.txt	
+++ /dev/null
@@ -1,1636 +0,0 @@
-[Info-ZIP note, 970311:  this file is based on PKWARE's appnote.txt of
- 15 February 1996.  It has been unofficially corrected and extended by
- Info-ZIP without explicit permission by PKWARE.  Although Info-ZIP
- believes the information to be accurate and complete, it is provided
- under a disclaimer similar to the PKWARE disclaimer below, differing
- only in the substitution of "Info-ZIP" for "PKWARE".  In other words,
- use this information at your own risk, but we think it's correct.  As
- of PKZIPW 2.50, two new incompatibilities have been introduced by PKWARE;
- they are noted below.  Note that the NTFS "conflict" is currently not
- real; PKZIPW 2.50 actually tags NTFS files as having come from a FAT
- file system, too.]
-
-
-Disclaimer
-----------
-
-Although PKWARE will attempt to supply current and accurate
-information relating to its file formats, algorithms, and the
-subject programs, the possibility of error can not be eliminated.
-PKWARE therefore expressly disclaims any warranty that the
-information contained in the associated materials relating to the
-subject programs and/or the format of the files created or
-accessed by the subject programs and/or the algorithms used by
-the subject programs, or any other matter, is current, correct or
-accurate as delivered.  Any risk of damage due to any possible
-inaccurate information is assumed by the user of the information.
-Furthermore, the information relating to the subject programs
-and/or the file formats created or accessed by the subject
-programs and/or the algorithms used by the subject programs is
-subject to change without notice.
-
-
-General Format of a ZIP file
-----------------------------
-
-  Files stored in arbitrary order.  Large zipfiles can span multiple
-  diskette media.
-
-  Overall zipfile format:
-
-    [local file header + file data + data_descriptor] . . .
-    [central directory] end of central directory record
-
-
-  A.  Local file header:
-
-	local file header signature     4 bytes  (0x04034b50)
-	version needed to extract       2 bytes
-	general purpose bit flag        2 bytes
-	compression method              2 bytes
-	last mod file time              2 bytes
-	last mod file date              2 bytes
-	crc-32                          4 bytes
-	compressed size                 4 bytes
-	uncompressed size               4 bytes
-	filename length                 2 bytes
-	extra field length              2 bytes
-
-	filename (variable size)
-	extra field (variable size)
-
-
-  B.  Data descriptor:
-
-	data descriptor signature	4 bytes  (0x08074b50)
-	crc-32                          4 bytes
-	compressed size                 4 bytes
-	uncompressed size               4 bytes
-
-      This descriptor exists only if bit 3 of the general
-      purpose bit flag is set (see below).  It is byte aligned
-      and immediately follows the last byte of compressed data.
-      This descriptor is used only when it was not possible to
-      seek in the output zip file, e.g., when the output zip file
-      was standard output or a non seekable device.
-
-  C.  Central directory structure:
-
-      [file header] . . .  end of central dir record
-
-      File header:
-
-	central file header signature   4 bytes  (0x02014b50)
-	version made by                 2 bytes
-	version needed to extract       2 bytes
-	general purpose bit flag        2 bytes
-	compression method              2 bytes
-	last mod file time              2 bytes
-	last mod file date              2 bytes
-	crc-32                          4 bytes
-	compressed size                 4 bytes
-	uncompressed size               4 bytes
-	filename length                 2 bytes
-	extra field length              2 bytes
-	file comment length             2 bytes
-	disk number start               2 bytes
-	internal file attributes        2 bytes
-	external file attributes        4 bytes
-	relative offset of local header 4 bytes
-
-	filename (variable size)
-	extra field (variable size)
-	file comment (variable size)
-
-      End of central dir record:
-
-	end of central dir signature    4 bytes  (0x06054b50)
-	number of this disk             2 bytes
-	number of the disk with the
-	start of the central directory  2 bytes
-	total number of entries in
-	the central dir on this disk    2 bytes
-	total number of entries in
-	the central dir                 2 bytes
-	size of the central directory   4 bytes
-	offset of start of central
-	directory with respect to
-	the starting disk number        4 bytes
-	zipfile comment length          2 bytes
-	zipfile comment (variable size)
-
-
-  D.  Explanation of fields:
-
-      version made by (2 bytes)
-
-	  The upper byte indicates the host system (OS) for the
-	  file.  Software can use this information to determine
-	  the line record format for text files etc.  The current
-	  mappings are:
-
-	  0 - FAT file system (DOS, OS/2, NT)         + PKZIPW 2.50 VFAT, NTFS
-	  1 - Amiga
-	  2 - VMS (VAX or Alpha AXP)
-	  3 - Unix
-	  4 - VM/CMS
-	  5 - Atari
-	  6 - HPFS file system (OS/2, NT 3.x)
-	  7 - Macintosh
-	  8 - Z-System
-	  9 - CP/M
-	  10 - TOPS-20                           [supposedly PKZIPW 2.50 NTFS]
-	  11 - NTFS file system (NT)
-	  12 - SMS/QDOS
-	  13 - Acorn RISC OS
-	  14 - VFAT file system (Win95, NT)
-	  15 - MVS
-	  16 - BeOS (BeBox or PowerMac)
-	  17 - Tandem
-	  18 thru 255 - unused
-
-	  The lower byte indicates the version number of the
-	  software used to encode the file.  The value/10
-	  indicates the major version number, and the value
-	  mod 10 is the minor version number.
-
-      version needed to extract (2 bytes)
-
-	  The minimum software version needed to extract the
-	  file, mapped as above.
-
-      general purpose bit flag: (2 bytes)
-
-	  bit 0: If set, indicates that the file is encrypted.
-
-	  (For Method 6 - Imploding)
-	  bit 1: If the compression method used was type 6,
-		 Imploding, then this bit, if set, indicates
-		 an 8K sliding dictionary was used.  If clear,
-		 then a 4K sliding dictionary was used.
-	  bit 2: If the compression method used was type 6,
-		 Imploding, then this bit, if set, indicates
-		 an 3 Shannon-Fano trees were used to encode the
-		 sliding dictionary output.  If clear, then 2
-		 Shannon-Fano trees were used.
-
-	  (For Method 8 - Deflating)
-	  bit 2  bit 1
-	    0      0    Normal (-en) compression option was used.
-	    0      1    Maximum (-ex) compression option was used.
-	    1      0    Fast (-ef) compression option was used.
-	    1      1    Super Fast (-es) compression option was used.
-
-	  Note:  Bits 1 and 2 are undefined if the compression
-		 method is any other.
-
-	  (For method 8)
-	  bit 3: If this bit is set, the fields crc-32, compressed size
-		 and uncompressed size are set to zero in the local
-		 header.  The correct values are put in the data descriptor
-		 immediately following the compressed data.
-
-	  The upper three bits are reserved and used internally
-	  by the software when processing the zipfile.  The
-	  remaining bits are unused.
-
-      compression method: (2 bytes)
-
-	  (see accompanying documentation for algorithm
-	  descriptions)
-
-	  0 - The file is stored (no compression)
-	  1 - The file is Shrunk
-	  2 - The file is Reduced with compression factor 1
-	  3 - The file is Reduced with compression factor 2
-	  4 - The file is Reduced with compression factor 3
-	  5 - The file is Reduced with compression factor 4
-	  6 - The file is Imploded
-	  7 - Reserved for Tokenizing compression algorithm
-	  8 - The file is Deflated
-	  9 - Reserved for enhanced Deflating
-	 10 - PKWARE Date Compression Library Imploding
-
-      date and time fields: (2 bytes each)
-
-	  The date and time are encoded in standard MS-DOS format.
-	  If input came from standard input, the date and time are
-	  those at which compression was started for this data.
-
-      CRC-32: (4 bytes)
-
-	  The CRC-32 algorithm was generously contributed by
-	  David Schwaderer and can be found in his excellent
-	  book "C Programmers Guide to NetBIOS" published by
-	  Howard W. Sams & Co. Inc.  The 'magic number' for
-	  the CRC is 0xdebb20e3.  The proper CRC pre and post
-	  conditioning is used, meaning that the CRC register
-	  is pre-conditioned with all ones (a starting value
-	  of 0xffffffff) and the value is post-conditioned by
-	  taking the one's complement of the CRC residual.
-	  If bit 3 of the general purpose flag is set, this
-	  field is set to zero in the local header and the correct
-	  value is put in the data descriptor and in the central
-	  directory.
-
-      compressed size: (4 bytes)
-      uncompressed size: (4 bytes)
-
-	  The size of the file compressed and uncompressed,
-	  respectively.  If bit 3 of the general purpose bit flag
-	  is set, these fields are set to zero in the local header
-	  and the correct values are put in the data descriptor and
-	  in the central directory.
-
-      filename length: (2 bytes)
-      extra field length: (2 bytes)
-      file comment length: (2 bytes)
-
-	  The length of the filename, extra field, and comment
-	  fields respectively.  The combined length of any
-	  directory record and these three fields should not
-	  generally exceed 65,535 bytes.  If input came from
-	  standard input, the filename is set to "-" (length one).
-
-
-      disk number start: (2 bytes)
-
-	  The number of the disk on which this file begins.
-
-      internal file attributes: (2 bytes)
-
-	  The lowest bit of this field indicates, if set, that
-	  the file is apparently an ASCII or text file.  If not
-	  set, that the file apparently contains binary data.
-	  The remaining bits are unused in version 1.0.
-
-      external file attributes: (4 bytes)
-
-	  The mapping of the external attributes is
-	  host-system dependent (see 'version made by').  For
-	  MS-DOS, the low order byte is the MS-DOS directory
-	  attribute byte.  If input came from standard input, this
-	  field is set to zero.
-
-      relative offset of local header: (4 bytes)
-
-	  This is the offset from the start of the first disk on
-	  which this file appears, to where the local header should
-	  be found.
-
-      filename: (Variable)
-
-	  The name of the file, with optional relative path.
-	  The path stored should not contain a drive or
-	  device letter, or a leading slash.  All slashes
-	  should be forward slashes '/' as opposed to
-	  backwards slashes '\' for compatibility with Amiga
-	  and Unix file systems etc.  If input came from standard
-	  input, the file name is set to "-" (without the quotes).
-
-      extra field: (Variable)
-
-	  This is for future expansion.  If additional information
-	  needs to be stored in the future, it should be stored
-	  here.  Earlier versions of the software can then safely
-	  skip this file, and find the next file or header.  This
-	  field will be 0 length in version 1.0.
-
-	  In order to allow different programs and different types
-	  of information to be stored in the 'extra' field in .ZIP
-	  files, the following structure should be used for all
-	  programs storing data in this field:
-
-	  header1+data1 + header2+data2 . . .
-
-	  Each header should consist of:
-
-	    Header ID - 2 bytes
-	    Data Size - 2 bytes
-
-	  Note: all fields stored in Intel low-byte/high-byte order.
-
-	  The Header ID field indicates the type of data that is in
-	  the following data block.
-
-	  Header ID's of 0 thru 31 are reserved for use by PKWARE.
-	  The remaining ID's can be used by third party vendors for
-	  proprietary usage.
-
-	  The current Header ID mappings are:
-
-	  0x0007        AV Info
-	  0x0009        OS/2 extended attributes
-	  0x000c        PKWARE VAX/VMS
-	  0x000d        reserved for Unix
-	  0x07c8        Info-ZIP Macintosh
-	  0x2605        ZipIt Macintosh
-	  0x4341        Acorn/SparkFS (David Pilling)
-	  0x4453	Windows NT security descriptor (binary ACL)
-	  0x4704        VM/CMS
-	  0x470f        MVS
-	  0x4b46        FWKCS MD5 (third party, see below)
-	  0x4c41        OS/2 access control list (text ACL)
-	  0x4d49        Info-ZIP VMS (VAX or Alpha)
-	  0x5356        AOS/VS (binary ACL)
-	  0x5455        extended timestamp
-	  0x5855        Info-ZIP Unix (original; also OS/2, NT, etc.)
-	  0x6542        BeOS (BeBox, PowerMac, etc.)
-	  0x756e        ASi Unix
-	  0x7855        Info-ZIP Unix (new)
-	  0xfb4a        SMS/QDOS
-
-	  The Data Size field indicates the size of the following
-	  data block. Programs can use this value to skip to the
-	  next header block, passing over any data blocks that are
-	  not of interest.
-
-	  Note: As stated above, the size of the entire .ZIP file
-		header, including the filename, comment, and extra
-		field should not exceed 64K in size.
-
-	  In case two different programs should appropriate the same
-	  Header ID value, it is strongly recommended that each
-	  program place a unique signature of at least two bytes in
-	  size (and preferably 4 bytes or bigger) at the start of
-	  each data area.  Every program should verify that its
-	  unique signature is present, in addition to the Header ID
-	  value being correct, before assuming that it is a block of
-	  known type.
-
-	  In the following descriptions, note that "Short" means two bytes
-	  and "Long" means four bytes, regardless of their native sizes.
-
-
-	 -OS/2 Extended Attributes Extra Field:
-	  ====================================
-
-	  The following is the layout of the OS/2 extended attributes "extra"
-	  block.  (Last Revision 960922)
-
-	  Note: all fields stored in Intel low-byte/high-byte order.
-
-	  Local-header version:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (OS/2)  0x0009	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  BSize		Long		uncompressed EA data size
-	  CType		Short		compression type
-	  EACRC		Long		CRC value for uncompressed EA data
-	  (var.)	variable	compressed EA data
-
-	  Central-header version:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (OS/2)  0x0009	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  BSize		Long		size of uncompressed local EA data
-
-	  The value of CType is interpreted according to the "compression
-	  method" section above; i.e., 0 for stored, 8 for deflated, etc.
-
-	  The OS/2 extended attribute structure (FEA2LIST) is compressed and
-	  then stored in its entirety within this structure.  There will only
-	  ever be one block of data in the variable-length field.
-
-
-	 -OS/2 Access Control List Extra Field:
-	  ====================================
-
-	  The following is the layout of the OS/2 ACL extra block.
-	  (Last Revision 960922)
-
-	  Local-header version:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (ACL)   0x4c41	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  BSize		Long		uncompressed ACL data size
-	  CType		Short		compression type
-	  EACRC		Long		CRC value for uncompressed ACL data
-	  (var.)	variable	compressed ACL data
-
-	  Central-header version:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (ACL)   0x4c41	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  BSize		Long		size of uncompressed local ACL data
-
-	  The value of CType is interpreted according to the "compression
-	  method" section above; i.e., 0 for stored, 8 for deflated, etc.
-
-	  The uncompressed ACL data consist of a text header of the form
-	  "ACL1:%hX,%hd\n", where the first field is the OS/2 ACCINFO acc_attr
-	  member and the second is acc_count, followed by acc_count strings
-	  of the form "%s,%hx\n", where the first field is acl_ugname (user
-	  group name) and the second acl_access.  This block type will be
-	  extended for other operating systems as needed.
-
-
-	 -Windows NT Security Descriptor Extra Field:
-	  ==========================================
-
-	  The following is the layout of the NT Security Descriptor (another
-	  type of ACL) extra block.  (Last Revision 960922)
-
-	  Local-header version:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (SD)    0x4453	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  BSize		Long		uncompressed SD data size
-	  Version	Byte		version of uncompressed SD data format
-	  CType		Short		compression type
-	  EACRC		Long		CRC value for uncompressed SD data
-	  (var.)	variable	compressed SD data
-
-	  Central-header version:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (SD)    0x4453	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  BSize		Long		size of uncompressed local SD data
-	  Version	Byte		version of uncompressed SD data format
-
-	  The value of CType is interpreted according to the "compression
-	  method" section above; i.e., 0 for stored, 8 for deflated, etc.
-	  Version specifies how the compressed data are to be interpreted
-	  and allows for future expansion of this extra field type.  Currently
-	  only version 0 is defined.
-
-	  For version 0, the compressed data are to be interpreted as a single
-	  valid Windows NT SECURITY_DESCRIPTOR data structure, in self-relative
-	  format.
-
-
-	 -PKWARE VAX/VMS Extra Field:
-	  ==========================
-
-	  The following is the layout of PKWARE's VAX/VMS attributes "extra"
-	  block.  (Last Revision 12/17/91)
-
-	  Note: all fields stored in Intel low-byte/high-byte order.
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (VMS)   0x000c        Short           Tag for this "extra" block type
-	  TSize         Short           Total Data Size for this block
-	  CRC           Long            32-bit CRC for remainder of the block
-	  Tag1          Short           VMS attribute tag value #1
-	  Size1         Short           Size of attribute #1, in bytes
-	  (var.)        Size1           Attribute #1 data
-	  .
-	  .
-	  .
-	  TagN          Short           VMS attribute tage value #N
-	  SizeN         Short           Size of attribute #N, in bytes
-	  (var.)        SizeN           Attribute #N data
-
-	  Rules:
-
-	  1. There will be one or more of attributes present, which will
-	     each be preceded by the above TagX & SizeX values.  These
-	     values are identical to the ATR$C_XXXX and ATR$S_XXXX constants
-	     which are defined in ATR.H under VMS C.  Neither of these values
-	     will ever be zero.
-
-	  2. No word alignment or padding is performed.
-
-	  3. A well-behaved PKZIP/VMS program should never produce more than
-	     one sub-block with the same TagX value.  Also, there will never
-	     be more than one "extra" block of type 0x000c in a particular
-	     directory record.
-
-
-	 -Info-ZIP VMS Extra Field:
-	  ========================
-
-	  The following is the layout of Info-ZIP's VMS attributes extra
-	  block for VAX or Alpha AXP.  The local-header and central-header
-	  versions are identical.  (Last Revision 960922)
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (VMS2)  0x4d49	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  ID		Long		block ID
-	  Flags		Short		info bytes
-	  BSize		Short		uncompressed block size
-	  Reserved	Long		(reserved)
-	  (var.)	variable	compressed VMS file-attributes block
-
-	  The block ID is one of the following unterminated strings:
-
-		"VFAB"		struct FAB
-		"VALL"		struct XABALL
-		"VFHC"		struct XABFHC
-		"VDAT"		struct XABDAT
-		"VRDT"		struct XABRDT
-		"VPRO"		struct XABPRO
-		"VKEY"		struct XABKEY
-		"VMSV"		version (e.g., "V6.1"; truncated at hyphen)
-		"VNAM"		reserved
-
-	  The lower three bits of Flags indicate the compression method.  The
-	  currently defined methods are:
-
-		0	stored (not compressed)
-		1	simple "RLE"
-		2	deflated
-
-	  The "RLE" method simply replaces zero-valued bytes with zero-valued
-	  bits and non-zero-valued bytes with a "1" bit followed by the byte
-	  value.
-
-	  The variable-length compressed data contains only the data corre-
-	  sponding to the indicated structure or string.  Typically multiple
-	  VMS2 extra fields are present (each with a unique block type).
-
-
-	 -Info-ZIP Macintosh Extra Field:
-	  ==============================
-
-	  The following is the layout of the (old) Info-ZIP resource-fork extra
-	  block for Macintosh.  The local-header and central-header versions
-	  are identical.  (Last Revision 960922)
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (Mac)   0x07c8	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  "JLEE"	beLong		extra-field signature
-	  FInfo		16 bytes	Macintosh FInfo structure
-	  CrDat		beLong		HParamBlockRec fileParam.ioFlCrDat
-	  MdDat		beLong		HParamBlockRec fileParam.ioFlMdDat
-	  Flags		beLong		info bits
-	  DirID		beLong		HParamBlockRec fileParam.ioDirID
-	  VolName	28 bytes	volume name (optional)
-
-	  All fields but the first two are in native Macintosh format
-	  (big-endian Motorola order, not little-endian Intel).  The least
-	  significant bit of Flags is 1 if the file is a data fork, 0 other-
-	  wise.  In addition, if this extra field is present, the filename
-	  has an extra 'd' or 'r' appended to indicate data fork or resource
-	  fork.  The 28-byte VolName field may be omitted.
-
-
-	 -ZipIt Macintosh Extra Field:
-	  ===========================
-
-	  The following is the layout of the ZipIt extra block for Macintosh.
-	  The local-header and central-header versions are identical.
-	  (Last Revision 970130)
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (Mac2)  0x2605	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  "ZPIT"	beLong		extra-field signature
-	  FnLen		Byte		length of FileName
-	  FileName	variable	full Macintosh filename
-	  FileType	beLong		four-byte Mac file type string
-	  Creator	beLong		four-byte Mac creator string
-
-
-	 -Acorn SparkFS Extra Field:
-	  =========================
-
-	  The following is the layout of David Pilling's SparkFS extra block
-	  for Acorn RISC OS.  The local-header and central-header versions are
-	  identical.  (Last Revision 960922)
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (Acorn) 0x4341	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  "ARC0"	Long		extra-field signature
-	  LoadAddr	Long		load address or file type
-	  ExecAddr	Long		exec address
-	  Attr		Long		file permissions
-	  Zero		Long		reserved; always zero
-
-	  The following bits of Attr are associated with the given file
-	  permissions:
-
-		bit 0		user-writable ('W')
-		bit 1		user-readable ('R')
-		bit 2		reserved
-		bit 3		locked ('L')
-		bit 4		publicly writable ('w')
-		bit 5		publicly readable ('r')
-		bit 6		reserved
-		bit 7		reserved
-
-
-	 -VM/CMS Extra Field:
-	  ==================
-
-	  The following is the layout of the file-attributes extra block for
-	  VM/CMS.  The local-header and central-header versions are
-	  identical.  (Last Revision 960922)
-
-	  Value		Size		Description
-	  -----		----		-----------
- (VM/CMS) 0x4704	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  flData	variable	file attributes data
-
-	  flData is an uncompressed fldata_t struct.
-
-
-	 -MVS Extra Field:
-	  ===============
-
-	  The following is the layout of the file-attributes extra block for
-	  MVS.  The local-header and central-header versions are identical.
-	  (Last Revision 960922)
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (MVS)   0x470f	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  flData	variable	file attributes data
-
-	  flData is an uncompressed fldata_t struct.
-
-
-	 -Extended Timestamp Extra Field:
-	  ==============================
-
-	  The following is the layout of the extended-timestamp extra block.
-	  (Last Revision 970118)
-
-	  Local-header version:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (time)  0x5455	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  Flags		Byte		info bits
-	  (ModTime)	Long		time of last modification (UTC/GMT)
-	  (AcTime)	Long		time of last access (UTC/GMT)
-	  (CrTime)	Long		time of original creation (UTC/GMT)
-
-	  Central-header version:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (time)  0x5455	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  Flags		Byte		info bits (refers to local header!)
-	  (ModTime)	Long		time of last modification (UTC/GMT)
-
-	  The central-header extra field contains the modification time only,
-	  or no timestamp at all.  TSize is used to flag its presence or
-	  absence.  But note:
-
-	      If "Flags" indicates that Modtime is present in the local header
-	      field, it MUST be present in the central header field, too!
-	      This correspondence is required because the modification time
-	      value may be used to support trans-timezone freshening and
-	      updating operations with zip archives.
-
-	  The time values are in standard Unix signed-long format, indicating
-	  the number of seconds since 1 January 1970 00:00:00.  The times
-	  are relative to Coordinated Universal Time (UTC), also sometimes
-	  referred to as Greenwich Mean Time (GMT).  To convert to local time,
-	  the software must know the local timezone offset from UTC/GMT.
-
-	  The lower three bits of Flags in both headers indicate which time-
-	  stamps are present in the LOCAL extra field:
-
-		bit 0		if set, modification time is present
-		bit 1		if set, access time is present
-		bit 2		if set, creation time is present
-		bits 3-7	reserved for additional timestamps; not set
-
-	  Those times that are present will appear in the order indicated, but
-	  any combination of times may be omitted.  (Creation time may be
-	  present without access time, for example.)  TSize should equal
-	  (1 + 4*(number of set bits in Flags)), as the block is currently
-	  defined.  Other timestamps may be added in the future.
-
-
-	 -Info-ZIP Unix Extra Field (type 1):
-	  ==================================
-
-	  The following is the layout of the old Info-ZIP extra block for
-	  Unix.  It has been replaced by the extended-timestamp extra block
-	  (0x5455) and the Unix type 2 extra block (0x7855).
-	  (Last Revision 970118)
-
-	  Local-header version:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (Unix1) 0x5855	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  ModTime	Long		time of last modification (UTC/GMT)
-	  AcTime	Long		time of last access (UTC/GMT)
-	  UID		Short		Unix user ID
-	  GID		Short		Unix group ID
-
-	  Central-header version:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (Unix1) 0x5855	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  ModTime	Long		time of last modification (GMT/UTC)
-	  AcTime	Long		time of last access (GMT/UTC)
-
-	  The file modification and access times are in standard Unix signed-
-	  long format, indicating the number of seconds since 1 January 1970
-	  00:00:00.  The times are relative to Coordinated Universal Time
-	  (UTC), also sometimes referred to as Greenwich Mean Time (GMT).  To
-	  convert to local time, the software must know the local timezone
-	  offset from UTC/GMT.  The modification time may be used by non-Unix
-	  systems to support inter-timezone freshening and updating of zip
-	  archives.
-
-	  The local-header extra block may optionally contain UID and GID
-	  info for the file.  The local-header TSize value is the only
-	  indication of this.  Note that Unix UIDs and GIDs are usually
-	  specific to a particular machine, and they generally require root
-	  access to restore.
-
-	  This extra field type is obsolete, but it has been in use since
-	  mid-1994.  Therefore future archiving software should continue to
-	  support it.  Some guidelines:
-
-	      An archive member should either contain the old "Unix1"
-	      extra field block or the new extra field types "time" and/or
-	      "Unix2".
-
-	      If both the old "Unix1" block type and one or both of the new
-	      block types "time" and "Unix2" are found, the "Unix1" block
-	      should be considered invalid and ignored.
-
-	      Unarchiving software should recognize both old and new extra
-	      field block types, but the info from new types overrides the
-	      old "Unix1" field.
-
-	      Archiving software should recognize "Unix1" extra fields for
-	      timestamp comparison but never create it for updated, freshened
-	      or new archive members.  When copying existing members to a new
-	      archive, any "Unix1" extra field blocks should be converted to
-	      the new "time" and/or "Unix2" types.
-
-
-	 -Info-ZIP Unix Extra Field (type 2):
-	  ==================================
-
-	  The following is the layout of the new Info-ZIP extra block for
-	  Unix.  (Last Revision 960922)
-
-	  Local-header version:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (Unix2) 0x7855	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  UID		Short		Unix user ID
-	  GID		Short		Unix group ID
-
-	  Central-header version:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (Unix2) 0x7855	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-
-	  The data size of the central-header version is zero; it is used
-	  solely as a flag that UID/GID info is present in the local-header
-	  extra field.  If additional fields are ever added to the local
-	  version, the central version may be extended to indicate this.
-
-	  Note that Unix UIDs and GIDs are usually specific to a particular
-	  machine, and they generally require root access to restore.
-
-
-	 -ASi Unix Extra Field:
-	  ====================
-
-	  The following is the layout of the ASi extra block for Unix.  The
-	  local-header and central-header versions are identical.
-	  (Last Revision 960916)
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (Unix3) 0x756e	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  CRC		Long		CRC-32 of the remaining data
-	  Mode		Short		file permissions
-	  SizDev	Long		symlink'd size OR major/minor dev num
-	  UID		Short		user ID
-	  GID		Short		group ID
-	  (var.)	variable	symbolic link filename
-
-	  Mode is the standard Unix st_mode field from struct stat, containing
-	  user/group/other permissions, setuid/setgid and symlink info, etc.
-
-	  If Mode indicates that this file is a symbolic link, SizDev is the
-	  size of the file to which the link points.  Otherwise, if the file
-	  is a device, SizDev contains the standard Unix st_rdev field from
-	  struct stat (includes the major and minor numbers of the device).
-	  SizDev is undefined in other cases.
-
-	  If Mode indicates that the file is a symbolic link, the final field
-	  will be the name of the file to which the link points.  The file-
-	  name length can be inferred from TSize.
-
-	  [Note that TSize may incorrectly refer to the data size not counting
-	   the CRC; i.e., it may be four bytes too small.]
-
-
-	 -BeOS Extra Field:
-	  ================
-
-	  The following is the layout of the file-attributes extra block for
-	  BeOS.  (Last Revision 970311)
-
-	  Local-header version:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (BeOS)  0x6542	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  Type		Long		file type
-	  Creator	Long		file creator
-
-	  Type and Creator are "longtext" in native BeOS code (that is, un-
-	  signed longs that are typically readable as 4-byte text strings).
-	  This will change during the filesystem rewrite for BeOS DR9 (expected
-	  in spring 1997), probably as follows:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (BeOS)  0x6542	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  BSize		Long		uncompressed file attribute data size
-	  CType		Short		compression type
-	  CRC		Long		CRC value for uncompressed file attribs
-	  Attribs	variable	compressed file attribute data
-
-	  The local extra block is similar to OS/2's since OS/2 EAs are similar
-	  to the file attributes planned for BeOS 1.1DR9, but the implementation
-	  will be different.
-
-	  Central-header version:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (BeOS)  0x6542	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  BSize		Long		size of local EF block data
-
-
-	 -SMS/QDOS Extra Field:
-	  ====================
-
-	  The following is the layout of the file-attributes extra block for
-	  SMS/QDOS.  The local-header and central-header versions are identical.
-	  (Last Revision 960929)
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (QDOS)  0xfb4a	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  LongID	Long		extra-field signature
-	  (ExtraID)	Long		additional signature/flag bytes
-	  QDirect	64 bytes	qdirect structure
-
-	  LongID may be "QZHD" or "QDOS".  In the latter case, ExtraID will
-	  be present.  Its first three bytes are "02\0"; the last byte is
-	  currently undefined.
-
-	  QDirect contains the file's uncompressed directory info (qdirect
-	  struct).  Its elements are in native (big-endian) format:
-
-	  d_length	beLong		file length
-	  d_access	byte		file access type
-	  d_type	byte		file type
-	  d_datalen	beLong		data length
-	  d_reserved	beLong		unused
-	  d_szname	beShort		size of filename
-	  d_name	36 bytes	filename
-	  d_update	beLong		time of last update
-	  d_refdate	beLong		file version number
-	  d_backup	beLong		time of last backup (archive date)
-
-
-	 -AOS/VS Extra Field:
-	  ==================
-
-	  The following is the layout of the extra block for Data General
-	  AOS/VS.  The local-header and central-header versions are identical.
-	  (Last Revision 961125)
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (AOSVS) 0x5356	Short		tag for this extra block type
-	  TSize		Short		total data size for this block
-	  "FCI\0"	Long		extra-field signature
-	  Version	Byte		version of AOS/VS extra block (10 = 1.0)
-	  Fstat		variable	fstat packet
-	  AclBuf	variable	raw ACL data ($MXACL bytes)
-
-	  Fstat contains the file's uncompressed fstat packet, which is one of
-	  the following:
-
-		normal fstat packet		(P_FSTAT struct)
-		DIR/CPD fstat packet		(P_FSTAT_DIR struct)
-		unit (device) fstat packet	(P_FSTAT_UNIT struct)
-		IPC file fstat packet		(P_FSTAT_IPC struct)
-
-	  AclBuf contains the raw ACL data; its length is $MXACL.
-
-
-         -FWKCS MD5 Extra Field:
-          =====================
-
-	  The following is the layout of the optional extra block used by the
-	  FWKCS utility.  There is no local-header version; the following
-	  applies only to the central header.  (Last Revision 961207)
-
-	  Central-header version:
-
-	  Value		Size		Description
-	  -----		----		-----------
-  (MD5)   0x4b46	Short		tag for this extra block type
-	  TSize		Short		total data size for this block (19)
-	  "MD5"		3 bytes		extra-field signature
-	  MD5hash	16 bytes	128-bit MD5 hash of uncompressed data
-
-	  The MD5 hash in this extra block is used to automatically identify
-	  files independent of their filenames; it is an an enhanced contents-
-	  signature.  Adding or removing this block should preserve the PKWARE
-	  AV (Authenticity Verification) signature.
-
-	  ``The MD5 algorithm is being placed in the public domain for review
-	  and possible adoption as a standard.'' (Ron Rivest, MIT Laboratory
-	  for Computer Science and RSA Data Security, Inc., April 1992, RFC
-	  1321, 11.76-77).  FWKCS is a trademark of Frederick W. Kantor.
-
-
-
-      file comment: (Variable)
-
-	  The comment for this file.
-
-      number of this disk: (2 bytes)
-
-	  The number of this disk, which contains central
-	  directory end record.
-
-      number of the disk with the start of the central directory: (2 bytes)
-
-	  The number of the disk on which the central
-	  directory starts.
-
-      total number of entries in the central dir on this disk: (2 bytes)
-
-	  The number of central directory entries on this disk.
-
-      total number of entries in the central dir: (2 bytes)
-
-	  The total number of files in the zipfile.
-
-
-      size of the central directory: (4 bytes)
-
-	  The size (in bytes) of the entire central directory.
-
-      offset of start of central directory with respect to
-      the starting disk number:  (4 bytes)
-
-	  Offset of the start of the central direcory on the
-	  disk on which the central directory starts.
-
-      zipfile comment length: (2 bytes)
-
-	  The length of the comment for this zipfile.
-
-      zipfile comment: (Variable)
-
-	  The comment for this zipfile.
-
-
-  D.  General notes:
-
-      1)  All fields unless otherwise noted are unsigned and stored
-	  in Intel low-byte:high-byte, low-word:high-word order.
-
-      2)  String fields are not null terminated, since the
-	  length is given explicitly.
-
-      3)  Local headers should not span disk boundries.  Also, even
-	  though the central directory can span disk boundries, no
-	  single record in the central directory should be split
-	  across disks.
-
-      4)  The entries in the central directory may not necessarily
-	  be in the same order that files appear in the zipfile.
-
-UnShrinking - Method 1
-----------------------
-
-Shrinking is a Dynamic Ziv-Lempel-Welch compression algorithm
-with partial clearing.  The initial code size is 9 bits, and
-the maximum code size is 13 bits.  Shrinking differs from
-conventional Dynamic Ziv-Lempel-Welch implementations in several
-respects:
-
-1)  The code size is controlled by the compressor, and is not
-    automatically increased when codes larger than the current
-    code size are created (but not necessarily used).  When
-    the decompressor encounters the code sequence 256
-    (decimal) followed by 1, it should increase the code size
-    read from the input stream to the next bit size.  No
-    blocking of the codes is performed, so the next code at
-    the increased size should be read from the input stream
-    immediately after where the previous code at the smaller
-    bit size was read.  Again, the decompressor should not
-    increase the code size used until the sequence 256,1 is
-    encountered.
-
-2)  When the table becomes full, total clearing is not
-    performed.  Rather, when the compresser emits the code
-    sequence 256,2 (decimal), the decompressor should clear
-    all leaf nodes from the Ziv-Lempel tree, and continue to
-    use the current code size.  The nodes that are cleared
-    from the Ziv-Lempel tree are then re-used, with the lowest
-    code value re-used first, and the highest code value
-    re-used last.  The compressor can emit the sequence 256,2
-    at any time.
-
-
-
-Expanding - Methods 2-5
------------------------
-
-The Reducing algorithm is actually a combination of two
-distinct algorithms.  The first algorithm compresses repeated
-byte sequences, and the second algorithm takes the compressed
-stream from the first algorithm and applies a probabilistic
-compression method.
-
-The probabilistic compression stores an array of 'follower
-sets' S(j), for j=0 to 255, corresponding to each possible
-ASCII character.  Each set contains between 0 and 32
-characters, to be denoted as S(j)[0],...,S(j)[m], where m<32.
-The sets are stored at the beginning of the data area for a
-Reduced file, in reverse order, with S(255) first, and S(0)
-last.
-
-The sets are encoded as { N(j), S(j)[0],...,S(j)[N(j)-1] },
-where N(j) is the size of set S(j).  N(j) can be 0, in which
-case the follower set for S(j) is empty.  Each N(j) value is
-encoded in 6 bits, followed by N(j) eight bit character values
-corresponding to S(j)[0] to S(j)[N(j)-1] respectively.  If
-N(j) is 0, then no values for S(j) are stored, and the value
-for N(j-1) immediately follows.
-
-Immediately after the follower sets, is the compressed data
-stream.  The compressed data stream can be interpreted for the
-probabilistic decompression as follows:
-
-
-let Last-Character <- 0.
-loop until done
-    if the follower set S(Last-Character) is empty then
-	read 8 bits from the input stream, and copy this
-	value to the output stream.
-    otherwise if the follower set S(Last-Character) is non-empty then
-	read 1 bit from the input stream.
-	if this bit is not zero then
-	    read 8 bits from the input stream, and copy this
-	    value to the output stream.
-	otherwise if this bit is zero then
-	    read B(N(Last-Character)) bits from the input
-	    stream, and assign this value to I.
-	    Copy the value of S(Last-Character)[I] to the
-	    output stream.
-
-    assign the last value placed on the output stream to
-    Last-Character.
-end loop
-
-
-B(N(j)) is defined as the minimal number of bits required to
-encode the value N(j)-1.
-
-
-The decompressed stream from above can then be expanded to
-re-create the original file as follows:
-
-
-let State <- 0.
-
-loop until done
-    read 8 bits from the input stream into C.
-    case State of
-	0:  if C is not equal to DLE (144 decimal) then
-		copy C to the output stream.
-	    otherwise if C is equal to DLE then
-		let State <- 1.
-
-	1:  if C is non-zero then
-		let V <- C.
-		let Len <- L(V)
-		let State <- F(Len).
-	    otherwise if C is zero then
-		copy the value 144 (decimal) to the output stream.
-		let State <- 0
-
-	2:  let Len <- Len + C
-	    let State <- 3.
-
-	3:  move backwards D(V,C) bytes in the output stream
-	    (if this position is before the start of the output
-	    stream, then assume that all the data before the
-	    start of the output stream is filled with zeros).
-	    copy Len+3 bytes from this position to the output stream.
-	    let State <- 0.
-    end case
-end loop
-
-
-The functions F,L, and D are dependent on the 'compression
-factor', 1 through 4, and are defined as follows:
-
-For compression factor 1:
-    L(X) equals the lower 7 bits of X.
-    F(X) equals 2 if X equals 127 otherwise F(X) equals 3.
-    D(X,Y) equals the (upper 1 bit of X) * 256 + Y + 1.
-For compression factor 2:
-    L(X) equals the lower 6 bits of X.
-    F(X) equals 2 if X equals 63 otherwise F(X) equals 3.
-    D(X,Y) equals the (upper 2 bits of X) * 256 + Y + 1.
-For compression factor 3:
-    L(X) equals the lower 5 bits of X.
-    F(X) equals 2 if X equals 31 otherwise F(X) equals 3.
-    D(X,Y) equals the (upper 3 bits of X) * 256 + Y + 1.
-For compression factor 4:
-    L(X) equals the lower 4 bits of X.
-    F(X) equals 2 if X equals 15 otherwise F(X) equals 3.
-    D(X,Y) equals the (upper 4 bits of X) * 256 + Y + 1.
-
-
-Imploding - Method 6
---------------------
-
-The Imploding algorithm is actually a combination of two distinct
-algorithms.  The first algorithm compresses repeated byte
-sequences using a sliding dictionary.  The second algorithm is
-used to compress the encoding of the sliding dictionary ouput,
-using multiple Shannon-Fano trees.
-
-The Imploding algorithm can use a 4K or 8K sliding dictionary
-size. The dictionary size used can be determined by bit 1 in the
-general purpose flag word; a 0 bit indicates a 4K dictionary
-while a 1 bit indicates an 8K dictionary.
-
-The Shannon-Fano trees are stored at the start of the compressed
-file. The number of trees stored is defined by bit 2 in the
-general purpose flag word; a 0 bit indicates two trees stored, a
-1 bit indicates three trees are stored.  If 3 trees are stored,
-the first Shannon-Fano tree represents the encoding of the
-Literal characters, the second tree represents the encoding of
-the Length information, the third represents the encoding of the
-Distance information.  When 2 Shannon-Fano trees are stored, the
-Length tree is stored first, followed by the Distance tree.
-
-The Literal Shannon-Fano tree, if present is used to represent
-the entire ASCII character set, and contains 256 values.  This
-tree is used to compress any data not compressed by the sliding
-dictionary algorithm.  When this tree is present, the Minimum
-Match Length for the sliding dictionary is 3.  If this tree is
-not present, the Minimum Match Length is 2.
-
-The Length Shannon-Fano tree is used to compress the Length part
-of the (length,distance) pairs from the sliding dictionary
-output.  The Length tree contains 64 values, ranging from the
-Minimum Match Length, to 63 plus the Minimum Match Length.
-
-The Distance Shannon-Fano tree is used to compress the Distance
-part of the (length,distance) pairs from the sliding dictionary
-output. The Distance tree contains 64 values, ranging from 0 to
-63, representing the upper 6 bits of the distance value.  The
-distance values themselves will be between 0 and the sliding
-dictionary size, either 4K or 8K.
-
-The Shannon-Fano trees themselves are stored in a compressed
-format. The first byte of the tree data represents the number of
-bytes of data representing the (compressed) Shannon-Fano tree
-minus 1.  The remaining bytes represent the Shannon-Fano tree
-data encoded as:
-
-    High 4 bits: Number of values at this bit length + 1. (1 - 16)
-    Low  4 bits: Bit Length needed to represent value + 1. (1 - 16)
-
-The Shannon-Fano codes can be constructed from the bit lengths
-using the following algorithm:
-
-1)  Sort the Bit Lengths in ascending order, while retaining the
-    order of the original lengths stored in the file.
-
-2)  Generate the Shannon-Fano trees:
-
-    Code <- 0
-    CodeIncrement <- 0
-    LastBitLength <- 0
-    i <- number of Shannon-Fano codes - 1   (either 255 or 63)
-
-    loop while i >= 0
-	Code = Code + CodeIncrement
-	if BitLength(i) <> LastBitLength then
-	    LastBitLength=BitLength(i)
-	    CodeIncrement = 1 shifted left (16 - LastBitLength)
-	ShannonCode(i) = Code
-	i <- i - 1
-    end loop
-
-
-3)  Reverse the order of all the bits in the above ShannonCode()
-    vector, so that the most significant bit becomes the least
-    significant bit.  For example, the value 0x1234 (hex) would
-    become 0x2C48 (hex).
-
-4)  Restore the order of Shannon-Fano codes as originally stored
-    within the file.
-
-Example:
-
-    This example will show the encoding of a Shannon-Fano tree
-    of size 8.  Notice that the actual Shannon-Fano trees used
-    for Imploding are either 64 or 256 entries in size.
-
-Example:   0x02, 0x42, 0x01, 0x13
-
-    The first byte indicates 3 values in this table.  Decoding the
-    bytes:
-	    0x42 = 5 codes of 3 bits long
-	    0x01 = 1 code  of 2 bits long
-	    0x13 = 2 codes of 4 bits long
-
-    This would generate the original bit length array of:
-    (3, 3, 3, 3, 3, 2, 4, 4)
-
-    There are 8 codes in this table for the values 0 thru 7.  Using the
-    algorithm to obtain the Shannon-Fano codes produces:
-
-				  Reversed     Order     Original
-Val  Sorted   Constructed Code      Value     Restored    Length
----  ------   -----------------   --------    --------    ------
-0:     2      1100000000000000        11       101          3
-1:     3      1010000000000000       101       001          3
-2:     3      1000000000000000       001       110          3
-3:     3      0110000000000000       110       010          3
-4:     3      0100000000000000       010       100          3
-5:     3      0010000000000000       100        11          2
-6:     4      0001000000000000      1000      1000          4
-7:     4      0000000000000000      0000      0000          4
-
-
-The values in the Val, Order Restored and Original Length columns
-now represent the Shannon-Fano encoding tree that can be used for
-decoding the Shannon-Fano encoded data.  How to parse the
-variable length Shannon-Fano values from the data stream is beyond the
-scope of this document.  (See the references listed at the end of
-this document for more information.)  However, traditional decoding
-schemes used for Huffman variable length decoding, such as the
-Greenlaw algorithm, can be succesfully applied.
-
-The compressed data stream begins immediately after the
-compressed Shannon-Fano data.  The compressed data stream can be
-interpreted as follows:
-
-loop until done
-    read 1 bit from input stream.
-
-    if this bit is non-zero then       (encoded data is literal data)
-	if Literal Shannon-Fano tree is present
-	    read and decode character using Literal Shannon-Fano tree.
-	otherwise
-	    read 8 bits from input stream.
-	copy character to the output stream.
-    otherwise                   (encoded data is sliding dictionary match)
-	if 8K dictionary size
-	    read 7 bits for offset Distance (lower 7 bits of offset).
-	otherwise
-	    read 6 bits for offset Distance (lower 6 bits of offset).
-
-	using the Distance Shannon-Fano tree, read and decode the
-	  upper 6 bits of the Distance value.
-
-	using the Length Shannon-Fano tree, read and decode
-	  the Length value.
-
-	Length <- Length + Minimum Match Length
-
-	if Length = 63 + Minimum Match Length
-	    read 8 bits from the input stream,
-	    add this value to Length.
-
-	move backwards Distance+1 bytes in the output stream, and
-	copy Length characters from this position to the output
-	stream.  (if this position is before the start of the output
-	stream, then assume that all the data before the start of
-	the output stream is filled with zeros).
-end loop
-
-Tokenizing - Method 7
---------------------
-
-This method is not used by PKZIP.
-
-Deflating - Method 8
------------------
-
-The Deflate algorithm is similar to the Implode algorithm using
-a sliding dictionary of up to 32K with secondary compression
-from Huffman/Shannon-Fano codes.
-
-The compressed data is stored in blocks with a header describing
-the block and the Huffman codes used in the data block.  The header
-format is as follows:
-
-   Bit 0: Last Block bit     This bit is set to 1 if this is the last
-			     compressed block in the data.
-   Bits 1-2: Block type
-      00 (0) - Block is stored - All stored data is byte aligned.
-	       Skip bits until next byte, then next word = block length,
-	       followed by the ones compliment of the block length word.
-	       Remaining data in block is the stored data.
-
-      01 (1) - Use fixed Huffman codes for literal and distance codes.
-	       Lit Code    Bits             Dist Code   Bits
-	       ---------   ----             ---------   ----
-		 0 - 143    8                 0 - 31      5
-	       144 - 255    9
-	       256 - 279    7
-	       280 - 287    8
-
-	       Literal codes 286-287 and distance codes 30-31 are never
-	       used but participate in the huffman construction.
-
-      10 (2) - Dynamic Huffman codes.  (See expanding Huffman codes)
-
-      11 (3) - Reserved - Flag a "Error in compressed data" if seen.
-
-Expanding Huffman Codes
------------------------
-If the data block is stored with dynamic Huffman codes, the Huffman
-codes are sent in the following compressed format:
-
-   5 Bits: # of Literal codes sent - 257 (257 - 286)
-	   All other codes are never sent.
-   5 Bits: # of Dist codes - 1           (1 - 32)
-   4 Bits: # of Bit Length codes - 4     (4 - 19)
-
-The Huffman codes are sent as bit lengths and the codes are built as
-described in the implode algorithm.  The bit lengths themselves are
-compressed with Huffman codes.  There are 19 bit length codes:
-
-   0 - 15: Represent bit lengths of 0 - 15
-       16: Copy the previous bit length 3 - 6 times.
-	   The next 2 bits indicate repeat length (0 = 3, ... ,3 = 6)
-	      Example:  Codes 8, 16 (+2 bits 11), 16 (+2 bits 10) will
-			expand to 12 bit lengths of 8 (1 + 6 + 5)
-       17: Repeat a bit length of 0 for 3 - 10 times. (3 bits of length)
-       18: Repeat a bit length of 0 for 11 - 138 times (7 bits of length)
-
-The lengths of the bit length codes are sent packed 3 bits per value
-(0 - 7) in the following order:
-
-   16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
-
-The Huffman codes should be built as described in the Implode algorithm
-except codes are assigned starting at the shortest bit length, i.e. the
-shortest code should be all 0's rather than all 1's.  Also, codes with
-a bit length of zero do not participate in the tree construction.  The
-codes are then used to decode the bit lengths for the literal and distance
-tables.
-
-The bit lengths for the literal tables are sent first with the number
-of entries sent described by the 5 bits sent earlier.  There are up
-to 286 literal characters; the first 256 represent the respective 8
-bit character, code 256 represents the End-Of-Block code, the remaining
-29 codes represent copy lengths of 3 thru 258.  There are up to 30
-distance codes representing distances from 1 thru 32k as described
-below.
-
-			     Length Codes
-			     ------------
-      Extra             Extra              Extra              Extra
- Code Bits Length  Code Bits Lengths  Code Bits Lengths  Code Bits Length(s)
- ---- ---- ------  ---- ---- -------  ---- ---- -------  ---- ---- ---------
-  257   0     3     265   1   11,12    273   3   35-42    281   5  131-162
-  258   0     4     266   1   13,14    274   3   43-50    282   5  163-194
-  259   0     5     267   1   15,16    275   3   51-58    283   5  195-226
-  260   0     6     268   1   17,18    276   3   59-66    284   5  227-257
-  261   0     7     269   2   19-22    277   4   67-82    285   0    258
-  262   0     8     270   2   23-26    278   4   83-98
-  263   0     9     271   2   27-30    279   4   99-114
-  264   0    10     272   2   31-34    280   4  115-130
-
-			    Distance Codes
-			    --------------
-      Extra           Extra             Extra               Extra
- Code Bits Dist  Code Bits  Dist   Code Bits Distance  Code Bits Distance
- ---- ---- ----  ---- ---- ------  ---- ---- --------  ---- ---- --------
-   0   0    1      8   3   17-24    16    7  257-384    24   11  4097-6144
-   1   0    2      9   3   25-32    17    7  385-512    25   11  6145-8192
-   2   0    3     10   4   33-48    18    8  513-768    26   12  8193-12288
-   3   0    4     11   4   49-64    19    8  769-1024   27   12 12289-16384
-   4   1   5,6    12   5   65-96    20    9 1025-1536   28   13 16385-24576
-   5   1   7,8    13   5   97-128   21    9 1537-2048   29   13 24577-32768
-   6   2   9-12   14   6  129-192   22   10 2049-3072
-   7   2  13-16   15   6  193-256   23   10 3073-4096
-
-The compressed data stream begins immediately after the
-compressed header data.  The compressed data stream can be
-interpreted as follows:
-
-do
-   read header from input stream.
-
-   if stored block
-      skip bits until byte aligned
-      read count and 1's compliment of count
-      copy count bytes data block
-   otherwise
-      loop until end of block code sent
-	 decode literal character from input stream
-	 if literal < 256
-	    copy character to the output stream
-	 otherwise
-	    if literal = end of block
-	       break from loop
-	    otherwise
-	       decode distance from input stream
-
-	       move backwards distance bytes in the output stream, and
-	       copy length characters from this position to the output
-	       stream.
-      end loop
-while not last block
-
-if data descriptor exists
-   skip bits until byte aligned
-   read crc and sizes
-endif
-
-Decryption
-----------
-
-The encryption used in PKZIP was generously supplied by Roger
-Schlafly.  PKWARE is grateful to Mr. Schlafly for his expert
-help and advice in the field of data encryption.
-
-PKZIP encrypts the compressed data stream.  Encrypted files must
-be decrypted before they can be extracted.
-
-Each encrypted file has an extra 12 bytes stored at the start of
-the data area defining the encryption header for that file.  The
-encryption header is originally set to random values, and then
-itself encrypted, using three, 32-bit keys.  The key values are
-initialized using the supplied encryption password.  After each byte
-is encrypted, the keys are then updated using pseudo-random number
-generation techniques in combination with the same CRC-32 algorithm
-used in PKZIP and described elsewhere in this document.
-
-The following is the basic steps required to decrypt a file:
-
-1) Initialize the three 32-bit keys with the password.
-2) Read and decrypt the 12-byte encryption header, further
-   initializing the encryption keys.
-3) Read and decrypt the compressed data stream using the
-   encryption keys.
-
-
-Step 1 - Initializing the encryption keys
------------------------------------------
-
-Key(0) <- 305419896
-Key(1) <- 591751049
-Key(2) <- 878082192
-
-loop for i <- 0 to length(password)-1
-    update_keys(password(i))
-end loop
-
-
-Where update_keys() is defined as:
-
-
-update_keys(char):
-  Key(0) <- crc32(key(0),char)
-  Key(1) <- Key(1) + (Key(0) & 000000ffH)
-  Key(1) <- Key(1) * 134775813 + 1
-  Key(2) <- crc32(key(2),key(1) >> 24)
-end update_keys
-
-
-Where crc32(old_crc,char) is a routine that given a CRC value and a
-character, returns an updated CRC value after applying the CRC-32
-algorithm described elsewhere in this document.
-
-
-Step 2 - Decrypting the encryption header
------------------------------------------
-
-The purpose of this step is to further initialize the encryption
-keys, based on random data, to render a plaintext attack on the
-data ineffective.
-
-
-Read the 12-byte encryption header into Buffer, in locations
-Buffer(0) thru Buffer(11).
-
-loop for i <- 0 to 11
-    C <- buffer(i) ^ decrypt_byte()
-    update_keys(C)
-    buffer(i) <- C
-end loop
-
-
-Where decrypt_byte() is defined as:
-
-
-unsigned char decrypt_byte()
-    local unsigned short temp
-    temp <- Key(2) | 2
-    decrypt_byte <- (temp * (temp ^ 1)) >> 8
-end decrypt_byte
-
-
-After the header is decrypted,  the last 1 or 2 bytes in Buffer
-should be the high-order word/byte of the CRC for the file being
-decrypted, stored in Intel low-byte/high-byte order, or the high-order
-byte of the file time if bit 3 of the general purpose bit flag is set.
-Versions of PKZIP prior to 2.0 used a 2 byte CRC check; a 1 byte CRC check is
-used on versions after 2.0.  This can be used to test if the password
-supplied is correct or not.
-
-
-Step 3 - Decrypting the compressed data stream
-----------------------------------------------
-
-The compressed data stream can be decrypted as follows:
-
-
-loop until done
-    read a charcter into C
-    Temp <- C ^ decrypt_byte()
-    update_keys(temp)
-    output Temp
-end loop
-
-
-In addition to the above mentioned contributors to PKZIP and PKUNZIP,
-I would like to extend special thanks to Robert Mahoney for suggesting
-the extension .ZIP for this software.
-
-
-References:
-
-    Fiala, Edward R., and Greene, Daniel H., "Data compression with
-       finite windows",  Communications of the ACM, Volume 32, Number 4,
-       April 1989, pages 490-505.
-
-    Held, Gilbert, "Data Compression, Techniques and Applications,
-		    Hardware and Software Considerations",
-       John Wiley & Sons, 1987.
-
-    Huffman, D.A., "A method for the construction of minimum-redundancy
-       codes", Proceedings of the IRE, Volume 40, Number 9, September 1952,
-       pages 1098-1101.
-
-    Nelson, Mark, "LZW Data Compression", Dr. Dobbs Journal, Volume 14,
-       Number 10, October 1989, pages 29-37.
-
-    Nelson, Mark, "The Data Compression Book",  M&T Books, 1991.
-
-    Storer, James A., "Data Compression, Methods and Theory",
-       Computer Science Press, 1988
-
-    Welch, Terry, "A Technique for High-Performance Data Compression",
-       IEEE Computer, Volume 17, Number 6, June 1984, pages 8-19.
-
-    Ziv, J. and Lempel, A., "A universal algorithm for sequential data
-       compression", Communications of the ACM, Volume 30, Number 6,
-       June 1987, pages 520-540.
-
-    Ziv, J. and Lempel, A., "Compression of individual sequences via
-       variable-rate coding", IEEE Transactions on Information Theory,
-       Volume 24, Number 5, September 1978, pages 530-536.
diff --git a/libs/libzkutil/include/zkutil/Increment.h b/libs/libzkutil/include/zkutil/Increment.h
index 37b698d0290..decb71c287f 100644
--- a/libs/libzkutil/include/zkutil/Increment.h
+++ b/libs/libzkutil/include/zkutil/Increment.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <zkutil/ZooKeeper.h>
+#include <zkutil/ZooKeeperHolder.h>
 
 namespace zkutil
 {
@@ -8,10 +8,10 @@ namespace zkutil
 class Increment
 {
 public:
-	Increment(ZooKeeperPtr zk_, const std::string & path_)
-	: zk(zk_), path(path_)
+	Increment(ZooKeeperHolderPtr zk_holder_, const std::string & path_)
+	: zookeeper_holder(zk_holder_), path(path_)
 	{
-		zk->createAncestors(path);
+		zookeeper_holder->getZooKeeper()->createAncestors(path);
 	}
 	
 	size_t get()
@@ -23,16 +23,17 @@ public:
 		zkutil::Stat stat;
 		
 		bool success = false;
+		auto zookeeper = zookeeper_holder->getZooKeeper();
 		do
 		{
-			if (zk->tryGet(path, result_str, &stat))
+			if (zookeeper->tryGet(path, result_str, &stat))
 			{
 				result = std::stol(result_str) + 1;
-				success = zk->trySet(path, std::to_string(result), stat.version) == ZOK;
+				success = zookeeper->trySet(path, std::to_string(result), stat.version) == ZOK;
 			}
 			else
 			{
-				success = zk->tryCreate(path, std::to_string(result), zkutil::CreateMode::Persistent) == ZOK;
+				success = zookeeper->tryCreate(path, std::to_string(result), zkutil::CreateMode::Persistent) == ZOK;
 			}
 		}
 		while (!success);
@@ -40,7 +41,7 @@ public:
 		return result;
 	}
 private:
-	zkutil::ZooKeeperPtr zk;
+	zkutil::ZooKeeperHolderPtr zookeeper_holder;
 	std::string path;
 	Logger * log = &Logger::get("zkutil::Increment");
 };
diff --git a/libs/libzkutil/include/zkutil/KeeperException.h b/libs/libzkutil/include/zkutil/KeeperException.h
index 96fae823c36..f3eb1f3ac55 100644
--- a/libs/libzkutil/include/zkutil/KeeperException.h
+++ b/libs/libzkutil/include/zkutil/KeeperException.h
@@ -2,7 +2,16 @@
 #include <DB/Common/Exception.h>
 #include <zkutil/Types.h>
 #include <DB/Common/ProfileEvents.h>
-#include <DB/Core/ErrorCodes.h>
+
+
+namespace DB
+{
+	namespace ErrorCodes
+	{
+		extern const int KEEPER_EXCEPTION;
+	}
+}
+
 
 namespace zkutil
 {
@@ -34,6 +43,13 @@ public:
 		return code == ZINVALIDSTATE || code == ZSESSIONEXPIRED || code == ZSESSIONMOVED;
 	}
 
+	/// любая ошибка связанная с работой сети, перевыбором мастера
+	/// при этих ошибках надо либо повторить запрос повторно, либо переинициализировать сессию (см. isUnrecoverable())
+	bool isHardwareError() const
+	{
+		return isUnrecoverable() || code == ZCONNECTIONLOSS || code == ZOPERATIONTIMEOUT;
+	}
+
 	const int32_t code;
 
 private:
diff --git a/libs/libzkutil/include/zkutil/Lock.h b/libs/libzkutil/include/zkutil/Lock.h
index aa8e579b686..31486b86c3d 100644
--- a/libs/libzkutil/include/zkutil/Lock.h
+++ b/libs/libzkutil/include/zkutil/Lock.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <zkutil/ZooKeeper.h>
+#include <zkutil/ZooKeeperHolder.h>
 #include <common/logger_useful.h>
 #include <DB/Common/Exception.h>
 
@@ -11,13 +11,22 @@ namespace zkutil
 	public:
 		/// lock_prefix - относительный путь до блокировки в ZK. Начинается со слеша
 		/// lock_name - имя ноды блокировки в ZK
-		Lock(zkutil::ZooKeeperPtr zk, const std::string & lock_prefix_, const std::string & lock_name_, const std::string & lock_message_ = "",
-			 bool create_parent_path = false) :
-			zookeeper(zk), lock_path(lock_prefix_ + "/" + lock_name_), lock_message(lock_message_), log(&Logger::get("zkutil::Lock"))
+		Lock(
+			zkutil::ZooKeeperHolderPtr zookeeper_holder_,
+			const std::string & lock_prefix_,
+			const std::string & lock_name_,
+			const std::string & lock_message_ = "",
+			bool create_parent_path_ = false)
+		:
+			zookeeper_holder(zookeeper_holder_),
+			lock_path(lock_prefix_ + "/" + lock_name_),
+			lock_message(lock_message_),
+			log(&Logger::get("zkutil::Lock"))
 		{
-			if (create_parent_path)
+			auto zookeeper = zookeeper_holder->getZooKeeper();
+			if (create_parent_path_)
 				zookeeper->createAncestors(lock_prefix_);
-			
+
 			zookeeper->createIfNotExists(lock_prefix_, "");
 		}
 
@@ -46,9 +55,7 @@ namespace zkutil
 		std::string status2String(Status status);
 
 		/// проверяет создана ли эфемерная нода и кто ее владелец.
-		/// если мы сами создавали эфемерную ноду, то надо вызывать этот метод, чтобы убедится,
-		/// что сессия с зукипером не порвалось
-		Status check();
+		Status tryCheck() const;
 
 		void unlock();
 
@@ -58,11 +65,14 @@ namespace zkutil
 		const std::string & getPath() { return lock_path; }
 
 	private:
-		Status checkImpl();
-		zkutil::ZooKeeperPtr zookeeper;
+		zkutil::ZooKeeperHolderPtr zookeeper_holder;
+		/// пока храним указатель на хендлер, никто не может переиницализировать сессию с zookeeper
+		using ZooKeeperHandler = zkutil::ZooKeeperHolder::UnstorableZookeeperHandler;
+		std::unique_ptr<ZooKeeperHandler> locked;
+
 		std::string lock_path;
 		std::string lock_message;
 		Logger * log;
-		bool locked = false;
+
 	};
 }
diff --git a/libs/libzkutil/include/zkutil/ZooKeeperHolder.h b/libs/libzkutil/include/zkutil/ZooKeeperHolder.h
new file mode 100644
index 00000000000..d82b74ea68e
--- /dev/null
+++ b/libs/libzkutil/include/zkutil/ZooKeeperHolder.h
@@ -0,0 +1,83 @@
+#pragma once
+
+#include <zkutil/ZooKeeper.h>
+#include <mutex>
+#include <boost/noncopyable.hpp>
+
+namespace zkutil
+{
+class Lock;
+
+class ZooKeeperHolder : public boost::noncopyable
+{
+	friend class zkutil::Lock;
+
+protected:
+	class UnstorableZookeeperHandler;
+
+public:
+	ZooKeeperHolder() = default;
+
+	/// вызывать из одного потока - не thread safe
+	template <class... Args>
+	void init(Args&&... args);
+	/// был ли класс инициализирован
+	bool isInitialized() const { return ptr != nullptr; }
+
+	UnstorableZookeeperHandler getZooKeeper();
+	bool replaceZooKeeperSessionToNewOne();
+
+	bool isSessionExpired() const;
+
+protected:
+	/** Хендлер для подсчета количества используемых ссылок на ZooKeeper
+	*
+	*   Запрещается переинициализировать ZooKeeper пока, хранится хотя бы один хендлер на него.
+	*   Большинство классов должны хранить хендлер на стеке и не хранить как член класса.
+	*   Т.е. хранить holder и запрашивать хендлер перед каждым использованием.
+	*   Поэтому класс специально объявлен, как protected.
+	*
+	*   Исключение - классы, работающие с эфимерными нодами. Пример: zkutil::Lock
+	*
+	*   Как использовать:
+	*   auto zookeeper = zookeeper_holder->getZooKeeper();
+	*   zookeeper->get(path);
+	*/
+	class UnstorableZookeeperHandler
+	{
+	public:
+		UnstorableZookeeperHandler(ZooKeeper::Ptr zk_ptr_);
+
+		explicit operator bool() const { return bool(zk_ptr); }
+		bool operator==(nullptr_t) const { return zk_ptr == nullptr; }
+		bool operator!=(nullptr_t) const { return !(*this == nullptr); }
+
+		/// в случае nullptr методы разыменования кидают исключение,
+		/// с более подробным текстом, чем просто nullptr
+		ZooKeeper * operator->();
+		const ZooKeeper * operator->() const;
+		ZooKeeper & operator*();
+		const ZooKeeper & operator*() const;
+
+	private:
+		ZooKeeper::Ptr zk_ptr;
+	};
+
+private:
+	mutable std::mutex mutex;
+	ZooKeeper::Ptr ptr;
+
+	Logger * log = &Logger::get("ZooKeeperHolder");
+
+	static std::string nullptr_exception_message;
+};
+
+template <class... Args>
+void ZooKeeperHolder::init(Args&&... args)
+{
+	ptr = std::make_shared<ZooKeeper>(std::forward<Args>(args)...);
+}
+
+using ZooKeeperHolderPtr = std::shared_ptr<ZooKeeperHolder>;
+
+}; /*namespace zkutil*/
\ No newline at end of file
diff --git a/libs/libzkutil/src/Lock.cpp b/libs/libzkutil/src/Lock.cpp
index 2eda4a97dc3..d10a3a10f28 100644
--- a/libs/libzkutil/src/Lock.cpp
+++ b/libs/libzkutil/src/Lock.cpp
@@ -4,12 +4,15 @@ using namespace zkutil;
 
 bool Lock::tryLock()
 {
+	auto zookeeper = zookeeper_holder->getZooKeeper();
 	if (locked)
 	{
 		/// проверим, что нода создана и я ее владелец
-		check();
+		if (tryCheck() != Status::LOCKED_BY_ME)
+			locked.reset(nullptr);
 	}
-	else
+
+	if (!locked)
 	{
 		size_t attempt;
 		std::string dummy;
@@ -18,80 +21,92 @@ bool Lock::tryLock()
 		if (code == ZNODEEXISTS)
 		{
 			if (attempt == 0)
-				locked = false;
+				locked.reset(nullptr);
 			else
 			{
 				zkutil::Stat stat;
 				zookeeper->get(lock_path, &stat);
 				if (stat.ephemeralOwner == zookeeper->getClientID())
-					locked = true;
+					locked.reset(new ZooKeeperHandler(zookeeper));
 				else
-					locked = false;
+					locked.reset(nullptr);
 			}
 		}
 		else if (code == ZOK)
 		{
-			locked = true;
+			locked.reset(new ZooKeeperHandler(zookeeper));
 		}
 		else
 		{
 			throw zkutil::KeeperException(code);
 		}
 	}
-	return locked;
+	return bool(locked);
 }
 
 void Lock::unlock()
 {
+	auto zookeeper = zookeeper_holder->getZooKeeper();
+
 	if (locked)
 	{
-		/// проверим, что до сих пор мы владельцы ноды
-		check();
-
-		size_t attempt;
-		int32_t code = zookeeper->tryRemoveWithRetries(lock_path, -1, &attempt);
-		if (attempt)
+		try
 		{
-			if (code != ZOK)
-				throw zkutil::KeeperException(code);
+			if (tryCheck() == Status::LOCKED_BY_ME)
+			{
+				size_t attempt;
+				int32_t code = zookeeper->tryRemoveWithRetries(lock_path, -1, &attempt);
+				if (attempt)
+				{
+					if (code != ZOK)
+						throw zkutil::KeeperException(code);
+				}
+				else
+				{
+					if (code == ZNONODE)
+						LOG_ERROR(log, "Node " << lock_path << " has been already removed. Probably due to network error.");
+					else if (code != ZOK)
+						throw zkutil::KeeperException(code);
+				}
+			}
 		}
-		else
+		catch (const zkutil::KeeperException & e)
 		{
-			if (code == ZNONODE)
-				LOG_ERROR(log, "Node " << lock_path << " has been already removed. Probably due to network error.");
-			else if (code != ZOK)
-				throw zkutil::KeeperException(code);
+			/// если сессия находится в невостанавливаемом состоянии, то эфимерные ноды нам больше не принадлежат
+			/// и лок через таймаут будет отпущен
+			if (!e.isUnrecoverable())
+				throw;
 		}
-		locked = false;
+		locked.reset(nullptr);
 	}
 }
 
-Lock::Status Lock::check()
-{
-	Status status = checkImpl();
-	if ((locked && status != LOCKED_BY_ME) || (!locked && (status != UNLOCKED && status != LOCKED_BY_OTHER)))
-		throw zkutil::KeeperException(std::string("Incompability of local state and state in zookeeper. Local is ") + (locked ? "locked" : "unlocked") + ". Zookeeper state is " + status2String(status));
-	return status;
-}
-
-Lock::Status Lock::checkImpl()
+Lock::Status Lock::tryCheck() const
 {
+	auto zookeeper = zookeeper_holder->getZooKeeper();
+	
+	Status lock_status;
 	Stat stat;
 	std::string dummy;
 	bool result = zookeeper->tryGet(lock_path, dummy, &stat);
 	if (!result)
-		return UNLOCKED;
+		lock_status = UNLOCKED;
 	else
 	{
 		if (stat.ephemeralOwner == zookeeper->getClientID())
 		{
-			return LOCKED_BY_ME;
+			lock_status = LOCKED_BY_ME;
 		}
 		else
 		{
-			return LOCKED_BY_OTHER;
+			lock_status = LOCKED_BY_OTHER;
 		}
 	}
+
+	if (locked && lock_status != LOCKED_BY_ME)
+		LOG_WARNING(log, "Lock is lost. It is normal if session was reinitialized. Path: " << lock_path << "/" << lock_message);
+
+	return lock_status;
 }
 
 std::string Lock::status2String(Status status)
@@ -101,3 +116,4 @@ std::string Lock::status2String(Status status)
 	static const char * names[] = {"Unlocked", "Locked by me", "Locked by other"};
 	return names[status];
 }
+
diff --git a/libs/libzkutil/src/ZooKeeper.cpp b/libs/libzkutil/src/ZooKeeper.cpp
index 589a1494df6..4dc643d6678 100644
--- a/libs/libzkutil/src/ZooKeeper.cpp
+++ b/libs/libzkutil/src/ZooKeeper.cpp
@@ -604,7 +604,7 @@ ZooKeeperPtr ZooKeeper::startNewSession() const
 }
 
 Op::Create::Create(const std::string & path_, const std::string & value_, ACLPtr acl, int32_t flags)
-: path(path_), value(value_), created_path(path.size() + ZooKeeper::SEQUENTIAL_SUFFIX_SIZE)
+	: path(path_), value(value_), created_path(path.size() + ZooKeeper::SEQUENTIAL_SUFFIX_SIZE)
 {
 	zoo_create_op_init(data.get(), path.c_str(), value.c_str(), value.size(), acl, flags, created_path.data(), created_path.size());
 }
diff --git a/libs/libzkutil/src/ZooKeeperHolder.cpp b/libs/libzkutil/src/ZooKeeperHolder.cpp
new file mode 100644
index 00000000000..e55446c41b3
--- /dev/null
+++ b/libs/libzkutil/src/ZooKeeperHolder.cpp
@@ -0,0 +1,69 @@
+#include <zkutil/ZooKeeperHolder.h>
+
+using namespace zkutil;
+
+ZooKeeperHolder::UnstorableZookeeperHandler ZooKeeperHolder::getZooKeeper()
+{
+	std::unique_lock<std::mutex> lock(mutex);
+	return UnstorableZookeeperHandler(ptr);
+}
+
+bool ZooKeeperHolder::replaceZooKeeperSessionToNewOne()
+{
+	std::unique_lock<std::mutex> lock(mutex);
+
+	if (ptr.unique())
+	{
+		ptr = ptr->startNewSession();
+		return true;
+	}
+	else
+	{
+		LOG_ERROR(log, "replaceZooKeeperSessionToNewOne(): Fail to replace zookeeper session to new one because handlers for old zookeeper session still exists.");
+		return false;
+	}
+}
+
+bool ZooKeeperHolder::isSessionExpired() const
+{
+	return ptr ? ptr->expired() : false;
+}
+
+
+std::string ZooKeeperHolder::nullptr_exception_message =
+	"UnstorableZookeeperHandler::zk_ptr is nullptr. "
+	"ZooKeeperHolder should be initialized before sending any request to ZooKeeper";
+
+ZooKeeperHolder::UnstorableZookeeperHandler::UnstorableZookeeperHandler(ZooKeeper::Ptr zk_ptr_)
+: zk_ptr(zk_ptr_)
+{
+}
+
+ZooKeeper * ZooKeeperHolder::UnstorableZookeeperHandler::operator->()
+{
+	if (zk_ptr == nullptr)
+		throw DB::Exception(nullptr_exception_message);
+
+	return zk_ptr.get();
+}
+
+const ZooKeeper * ZooKeeperHolder::UnstorableZookeeperHandler::operator->() const
+{
+	if (zk_ptr == nullptr)
+		throw DB::Exception(nullptr_exception_message);
+	return zk_ptr.get();
+}
+
+ZooKeeper & ZooKeeperHolder::UnstorableZookeeperHandler::operator*()
+{
+	if (zk_ptr == nullptr)
+		throw DB::Exception(nullptr_exception_message);
+	return *zk_ptr;
+}
+
+const ZooKeeper & ZooKeeperHolder::UnstorableZookeeperHandler::operator*() const
+{
+	if (zk_ptr == nullptr)
+		throw DB::Exception(nullptr_exception_message);
+	return *zk_ptr;
+}
\ No newline at end of file
diff --git a/libs/libzkutil/src/tests/zkutil_test_lock.cpp b/libs/libzkutil/src/tests/zkutil_test_lock.cpp
index 6acaeaac4a7..52f8943a2e1 100644
--- a/libs/libzkutil/src/tests/zkutil_test_lock.cpp
+++ b/libs/libzkutil/src/tests/zkutil_test_lock.cpp
@@ -6,10 +6,13 @@ int main()
 
 	try
 	{
-		zkutil::Lock l(std::make_shared<zkutil::ZooKeeper>("localhost:2181"), "/test", "test_lock");
-		std::cout << "check " << l.check() << std::endl;
+		auto zookeeper_holder = std::make_shared<zkutil::ZooKeeperHolder>();
+		zookeeper_holder->init("localhost:2181");
+		
+		zkutil::Lock l(zookeeper_holder, "/test", "test_lock");
+		std::cout << "check " << l.tryCheck() << std::endl;
 		std::cout << "lock tryLock() " << l.tryLock() << std::endl;
-		std::cout << "check " << l.check() << std::endl;
+		std::cout << "check " << l.tryCheck() << std::endl;
 	}
 	catch (const Poco::Exception & e)
 	{
diff --git a/libs/libzkutil/src/tests/zkutil_zookeeper_holder.cpp b/libs/libzkutil/src/tests/zkutil_zookeeper_holder.cpp
new file mode 100644
index 00000000000..a6a8fda93a1
--- /dev/null
+++ b/libs/libzkutil/src/tests/zkutil_zookeeper_holder.cpp
@@ -0,0 +1,33 @@
+#include <zkutil/ZooKeeperHolder.h>
+#include <iostream>
+#include <statdaemons/Test.h>
+
+#include <Poco/Util/Application.h>
+
+int main()
+{
+	Test::initLogger();
+
+	zkutil::ZooKeeperHolder zk_holder;
+	zk_holder.init("localhost:2181");
+
+	{
+		auto zk_handler = zk_holder.getZooKeeper();
+		if (zk_handler)
+		{
+			bool started_new_session = zk_holder.replaceZooKeeperSessionToNewOne();
+			std::cerr << "Started new session: " << started_new_session << "\n";
+			std::cerr << "get / " << zk_handler->get("/") << "\n";
+		}
+	}
+
+	{
+		bool started_new_session = zk_holder.replaceZooKeeperSessionToNewOne();
+		std::cerr << "Started new session: " << started_new_session << "\n";
+		auto zk_handler = zk_holder.getZooKeeper();
+		if (zk_handler != nullptr)
+			std::cerr << "get / " << zk_handler->get("/") << "\n";
+	}
+
+	return 0;
+}