Alexey Milovidov
e97ecb6cf7
Merge branch 'master' into METR-19266
...
Conflicts:
dbms/CMakeLists.txt
dbms/include/DB/Functions/FunctionsArray.h
dbms/include/DB/Functions/FunctionsString.h
dbms/include/DB/Parsers/ExpressionListParsers.h
dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h
dbms/src/Core/ErrorCodes.cpp
dbms/src/Parsers/ASTFunction.cpp
dbms/src/Storages/MergeTree/MergeTreeData.cpp
dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp
dbms/src/Storages/MergeTree/MergeTreeReader.cpp
dbms/src/Storages/StorageLog.cpp
2016-12-10 07:51:36 +03:00
Vladimir Smirnov
d36f52502e
Make it compilable on OS X
...
It's still hackish and dirty, but server and client compies.
Server starts, but throwes meaningless exception on any query.
Client seems to be working fine.
Linux compilation might (but shouldn't) be broken (not tested).
2016-11-01 17:59:21 +01:00
Alexey Arno
924402f33e
dbms: Server: merged from master [#METR-19266]
2016-10-19 18:00:56 +03:00
Alexey Milovidov
63834bf441
Style [#METR-2944].
2016-08-15 23:07:31 +03:00
serebrserg
191d8b9707
METR-22322: add functional test
2016-08-15 19:34:03 +03:00
serebrserg
c8bbb26802
METR-22322: array instead of vector
2016-08-15 15:41:06 +03:00
serebrserg
db5bae495b
METR-22322: rename function, add comments
2016-08-14 15:18:11 +03:00
serebrserg
429b73422f
METR-22322: add geo distance function
2016-08-12 19:51:08 +03:00
