Commit Graph

794 Commits

Author SHA1 Message Date
Yuriy
e91fd22b82 fixed style check 2019-04-01 12:59:49 +03:00
Yuriy
107f33e888 added password check and changed packets serialization 2019-04-01 12:27:39 +03:00
Vitaly Baranov
37b904b8f5
Merge pull request #4808 from vitlibar/kafka-with-protobuf-format
Kafka with protobuf format
2019-03-30 19:00:57 +03:00
Ivan
957d23267b
Minimal implementation of row-level security CLICKHOUSE-4315 (#4792)
For detailed description see the related PR
2019-03-29 23:31:06 +03:00
Vitaly Baranov
08f85804d0 Send query settings before data from client to server.
Apply query settings only for the containing query (client).
2019-03-29 17:39:00 +03:00
Alexey Milovidov
f4b819c692 Added TRUNCATE to the list of suggested keywords in clickhouse-client 2019-03-28 20:52:50 +03:00
proller
7bcf8ec344 Fix install in shared mode 2019-03-27 20:37:38 +03:00
Alexey Milovidov
9bc4632f20 Avoid progress bar flicker 2019-03-26 17:36:56 +03:00
Nikita Lapkov
4a4ff8d5bf Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-03-23 18:45:22 +00:00
alexey-milovidov
b1279c1323
Merge pull request #4743 from azat-archive/clickhouse-client-tty
clickhouse-client: fix --help without tty
2019-03-23 05:54:05 +03:00
Azat Khuzhin
6d8706e692
clickhouse-client: fix --help without tty
stdin_is_not_tty is detected too late when the --help message is
printed, so fix this and do not call ioctl if stdin is not tty.

Before this patch:
  $ clickhouse-client --help < /dev/null

debug build:
  $ dbms/programs/clickhouse-client --help < /dev/null
  Main options:
    --help
  clickhouse-client: ../contrib/boost/libs/program_options/src/options_description.cpp:542:
  void boost::program_options::{anonymous}::format_description(std::ostream&, const string&, unsigned int, unsigned int): Assertion `line_length > first_column_width' failed.
  Aborted (core dumped)

release build:
  $ dbms/programs/clickhouse-client --help < /dev/null
  .... print lots of empty lines and so forth ...

v2: add a test and bsdutils into image for tests
v3: adjust minimal cols to the length of one of the longest arguments,
since with line_length=3 boost will bail anyway (under script(1)
ioctl(TIOCGWINSZ) returnes ws_col=0)
2019-03-23 02:01:32 +03:00
proller
e9af289b4d
Fix link in split mode (#4773) 2019-03-22 22:09:13 +03:00
proller
fce9db12b9 Move Interpreters/Settings* -> Core/Settings* 2019-03-22 15:08:30 +03:00
Mikhail Fandyushin
e986d0eae6 HTTP Accept-Encoding: br; Final fixes 2019-03-21 00:04:35 +03:00
Mikhail Fandyushin
73a9644da2 HTTP Accept-Encoding: br; Expended ZlibCompressionMethod to generic CompressionMethod; Added brotli to CompressionMethod enum 2019-03-21 00:04:35 +03:00
proller
f697df2079
Tests: fix call .sh from .sh (#4732) 2019-03-20 23:04:49 +03:00
Alexey Milovidov
2f7ce49a9c Merge branch 'master' of github.com:yandex/ClickHouse 2019-03-20 00:35:26 +03:00
Alexey Milovidov
6732e4366c Commented out readonly user 2019-03-20 00:34:44 +03:00
proller
78e0b1af5e
Fix compression level detection when network_compression_method in lowercase (#4706) 2019-03-18 17:59:07 +03:00
Yuriy
bfd53e3ccc draft 2019-03-17 10:11:22 +03:00
Alexey Zatelepin
304c67da99 Merge branch 'master' into fix-add-materialized-column-after
Conflicts:
	dbms/src/Interpreters/InterpreterCreateQuery.cpp
	dbms/src/Interpreters/InterpreterDescribeQuery.cpp
	dbms/src/Interpreters/interpretSubquery.cpp
	dbms/src/Storages/ColumnsDescription.cpp
2019-03-17 00:46:53 +03:00
Ivan
8ac3e89628
Merge pull request #4649 from abyss7/iast-as
Implement and use method IAST::as<Derived>()
2019-03-15 23:22:46 +03:00
Alexey Zatelepin
a2debdb724 fix use-after-free [#CLICKHOUSE-3101] 2019-03-15 21:52:45 +03:00
Ivan Lezhankin
61954d855d More reverts 2019-03-15 20:09:14 +03:00
Alexey Zatelepin
b5a0a3fa23 store all kinds of columns in the same list in ColumnsDescription [#CLICKHOUSE-3101] 2019-03-15 19:37:52 +03:00
Ivan Lezhankin
4f6a494af8 Revert references where they were before refactoring. 2019-03-15 19:14:13 +03:00
Ivan Lezhankin
61c24e0844 Overload template method |as<>()| with reference type.
Move promotion logic to a separate class
2019-03-15 16:12:11 +03:00
proller
d243c665d1 libclickhouse.so : dont use debug postfix 2019-03-15 14:38:17 +03:00
Ivan Lezhankin
f64118030a Merge remote-tracking branch 'upstream/master' into iast-as 2019-03-13 17:23:02 +03:00
Alexey Milovidov
1ca16d7882 Fix "bad_alloc" handler clobbering by LLVM library 2019-03-12 22:30:59 +03:00
Alexey Milovidov
9d026ef733 Avoid deadlock on exit if exception was thrown in loadMetadata due to cyclic references in ContextShared that holds BackgroundProcessingPool 2019-03-12 22:30:01 +03:00
proller
9d86f3ce17 clickhouse-split-helper 2019-03-12 16:29:35 +03:00
Ivan Lezhankin
4c1a0ca255 Merge remote-tracking branch 'upstream/master' into iast-as 2019-03-12 15:51:18 +03:00
Ivan Lezhankin
67eefa7b12 Revert wrong replacements of dynamic_cast.
dynamic_cast to intermediate type is not equivalent to typeid_cast
2019-03-12 15:41:57 +03:00
Alexey Milovidov
104b0fd7e5 Fixed build 2019-03-11 22:47:06 +03:00
proller
3cbd3ce285
Build fixes (#4655) 2019-03-11 21:03:32 +03:00
Ivan Lezhankin
d1ead22073 Rename As<…> → as<…> 2019-03-11 16:22:51 +03:00
Ivan Lezhankin
1e9f7847dc Merge remote-tracking branch 'upstream/master' into iast-as 2019-03-11 16:11:22 +03:00
Ivan Lezhankin
a7e838e328 Replace all other casts to method IAST::As<Derived>
Also remove some redundant methods like IsIdentifier() et. al.
2019-03-11 15:49:39 +03:00
Nikita Lapkov
1ea971ddd2 Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-03-10 01:56:41 +00:00
proller
0061df234a
Build fix (split) (#4641) 2019-03-09 21:52:46 +03:00
Ivan Lezhankin
0e325c7a4a Replace const typeid_casts with As<Derived>() method invocations 2019-03-08 12:48:20 +03:00
alexey-milovidov
b72894d693
Merge pull request #4613 from zlobober/host_context
CHYT-67: introduce host context for using CH as a library.
2019-03-07 02:35:15 +03:00
Maxim Akhmedov
15576ca809 Better lifetime of query context in TCP handler. 2019-03-07 00:32:26 +03:00
proller
55cf27da07 Build fix (copier) 2019-03-06 23:07:00 +03:00
Maxim Akhmedov
28bc3fd7d8 Remove accidental modification of unrelated file. 2019-03-06 22:28:48 +03:00
alexey-milovidov
61e82da684
Update TCPHandler.cpp 2019-03-06 21:38:26 +03:00
Maxim Akhmedov
9a56294fdf CHYT-67: introduce host context for using CH as a library. 2019-03-06 19:47:47 +03:00
Nikita Lapkov
12fe175385 Merge remote-tracking branch 'upstream/master' into query-poor-mans-profiler 2019-03-06 10:30:47 +00:00
alexey-milovidov
1df9c1720e
Merge pull request #4426 from Felixoid/graphite-rollup
Graphite rollup: combined rules
2019-03-06 03:10:45 +03:00
proller
d2e18d47fb
Fix link in split mode (#4574) 2019-03-04 20:47:31 +03:00
alexey-milovidov
97cea95f74
Merge pull request #4536 from amosbird/fixedhashtable
A Proper lookup table that uses HashTable's API
2019-03-01 17:47:33 +03:00
Nikita Lapkov
ce4e48d6f4 Merge branch 'master' into query-poor-mans-profiler 2019-03-01 14:22:38 +00:00
Amos Bird
26ab5dd7a7 A Proper lookup table that uses HashTable's API
This is the first step of allowing heterogeneous cells in hash tables.

performance test results are

```

1. HashMap<UInt16, UInt8, TrivialHash, HashTableFixedGrower<16>>;
2. NewLookupMap<UInt16, UInt8>

ResolutionWidth 30000 1 .................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................223550276.46
ResolutionWidth 30000 2 .................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................248772721.24
Best: 2 - 24877272124

ResolutionWidth 100000 1 ..........................................................................................................................................................................................................................................................238498413.99
ResolutionWidth 100000 2 ..........................................................................................................................................................................................................................................................261808889.98
Best: 2 - 26180888998

ResolutionWidth 300000 1 ...................................................................................239307348.81
ResolutionWidth 300000 2 ...................................................................................257592761.30
Best: 2 - 25759276130

ResolutionWidth 1000000 1 .........................240144759.26
ResolutionWidth 1000000 2 .........................257093531.91
Best: 2 - 25709353191

ResolutionWidth 5000000 1 .....241573260.35
ResolutionWidth 5000000 2 .....259314162.79
Best: 2 - 25931416279

ResolutionDepth 30000 1 .................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................217108119.84
ResolutionDepth 30000 2 .................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................249459504.41
Best: 2 - 24945950441

ResolutionDepth 100000 1 ..........................................................................................................................................................................................................................................................229065162.17
ResolutionDepth 100000 2 ..........................................................................................................................................................................................................................................................253769105.64
Best: 2 - 25376910564

ResolutionDepth 300000 1 ...................................................................................233079225.18
ResolutionDepth 300000 2 ...................................................................................256316273.78
Best: 2 - 25631627378

ResolutionDepth 1000000 1 .........................234184633.51
ResolutionDepth 1000000 2 .........................261100491.57
Best: 2 - 26110049157

ResolutionDepth 5000000 1 .....233118795.66
ResolutionDepth 5000000 2 .....252436160.41
Best: 2 - 25243616041

```
2019-03-01 16:47:13 +08:00
alexey-milovidov
918750c3ba
Merge pull request #4535 from yandex/fix-concurrent-alters
Fix deadlock of concurrent SELECTs and DDL queries
2019-03-01 04:10:10 +03:00
Alexey Zatelepin
eee73dac42 Merge branch 'master' into fix-concurrent-alters 2019-02-28 19:19:21 +03:00
chertus
ddf0f11e51 fix ClusterCopier crash cause of ThreadStatus not created 2019-02-28 18:49:03 +03:00
Alexey Zatelepin
0d7ab9e3ea allow acquiring read lock to a table out of order if it was already locked by the same query [#CLICKHOUSE-3789]
this is important in preventing ALTER deadlocks
2019-02-27 21:34:38 +03:00
Alexey Milovidov
3b20ecf36a Merge branch 'master' into fix-bad-parsing-error-message 2019-02-26 13:27:12 +03:00
alexey-milovidov
9d8b91b97a
Merge pull request #4483 from yandex/dont-create-part-log-if-not-defined
Do not create part_log if it is not defined in configuration file
2019-02-24 18:27:50 +03:00
Alexey Milovidov
ac2ea9b198 Added 'query_thread_log' section to configuration file. Now query_thread_log doesn't work without this section. 2019-02-24 02:29:38 +03:00
Alexey Milovidov
0d9c438864 Added a test 2019-02-22 20:16:11 +03:00
Alexey Zatelepin
73f852ae82 manually reset DDLWorker in shared context to prevent reference cycles 2019-02-21 19:41:27 +03:00
Mikhail f. Shiryaev
58a5a9dc0c Fix "only_from_localhost" example 2019-02-21 10:54:06 +01:00
Vitaly Baranov
76aae5f5d0 Add support for settings 'format_schema' in a "INSERT INTO table FORMAT" query. 2019-02-20 05:32:29 +03:00
proller
e20c77e4c6 Add parquet support. Fixes, tests, ... 2019-02-19 23:51:44 +03:00
Alexey Milovidov
11fc35e098 Fixed accidential incompatibility due to wrong implementation of "send_logs_level" setting 2019-02-19 16:27:59 +03:00
alesapin
b2d90d5c10 Add CLI settings for clickhouse-performance-test. 2019-02-18 18:43:58 +03:00
proller
263e69e861
Build fixes (FreeBSD port) (#4397) 2019-02-15 14:46:07 +03:00
Alexey Milovidov
46e8553b1f Config: added clarification 2019-02-14 00:16:40 +03:00
alesapin
af4c4dc1e5 Fix old clients insert query processing with embedded data 2019-02-13 15:54:22 +03:00
Mikhail
4fd289c1f4
Merge branch 'master' into brotli 2019-02-12 22:52:23 +03:00
proller
af29067fa9 Merge remote-tracking branch 'upstream/master' into fix10 2019-02-12 12:51:01 +03:00
alesapin
067ee98852 Forward settings in perf test and fix exception in uniq.xml 2019-02-12 12:13:31 +03:00
proller
428f7ce27b Fix split link of dbms/programs/odbc-bridge 2019-02-12 00:43:29 +03:00
Mikhail
763b3dcf73
Merge branch 'master' into brotli 2019-02-11 23:44:39 +03:00
alesapin
acd8c8bd28 Skip unfulfilled tests in preformance-test 2019-02-11 18:45:41 +03:00
alexey-milovidov
81a184c47f
Merge pull request #4301 from yandex/input-data-in-perf-test
Fix perf-test input data and refactor two tests
2019-02-11 12:52:03 +03:00
alexey-milovidov
4f2b35cb10
Merge pull request #4215 from abyss7/CLICKHOUSE-3729
Report progress from server-side to keep client connections alive
2019-02-11 02:07:57 +03:00
Alexey Milovidov
5ed720b522 Fixed typo 2019-02-11 00:17:52 +03:00
Alexey Milovidov
0861af12a3 Fixed thread names 2019-02-11 00:15:14 +03:00
Alexey Milovidov
a1754f76b5 Added one more keyword for command line completions #4328 2019-02-10 23:30:28 +03:00
alexey-milovidov
0dd618b9ad
Merge pull request #4326 from yandex/duplicate-includes
Removed duplicate includes
2019-02-10 22:31:37 +03:00
Alexey Milovidov
ba3cb83a84 Removed duplicate includes 2019-02-10 20:12:22 +03:00
Alexey Milovidov
58a6accee5 Updated test #4246 2019-02-10 19:55:12 +03:00
Alexey Milovidov
eb39f6b653 Cleanup #4240 2019-02-10 01:38:26 +03:00
Alexey Milovidov
dc863dd8a0 Merge branch 'reduce_max_memory_and_caches_size' of https://github.com/k-lopatin/ClickHouse into k-lopatin-reduce_max_memory_and_caches_size 2019-02-10 01:11:46 +03:00
Nikita Lapkov
b8d78807fe Merge remote-tracking branch 'parent/master' into query-poor-mans-profiler 2019-02-09 21:45:34 +00:00
Alexey Milovidov
5b97abe693 Fixed use after free in clickhouse-client (suggestion thread) 2019-02-08 21:15:54 +03:00
alesapin
0a4c99efe4 More effective 2019-02-07 19:09:06 +03:00
alesapin
15488a21eb Really process single query instead of preparsed multiquery 2019-02-07 19:03:02 +03:00
Ivan Lezhankin
92769a2460 Don't update "arrow" on client-side for nothing 2019-02-07 16:47:16 +03:00
alesapin
48bd750856 Fix perf-test input data and refactor two tests 2019-02-07 16:18:04 +03:00
alesapin
f4e9dab229 Merge branch 'master' of github.com:yandex/ClickHouse 2019-02-06 18:49:10 +03:00
alesapin
3c4f54f6f7 Fix report builder 2019-02-06 18:48:53 +03:00
KochetovNicolai
9f971c276f
Merge pull request #3669 from Enmk/ipv4_and_ipv6_domains
Ipv4 and ipv6 domains
2019-02-06 18:16:58 +03:00
alesapin
3c4b7cb37b Do not report quantilies in perf test if thereis no values. 2019-02-06 16:12:48 +03:00
alesapin
321caa7f5c Enable all metrics in performance test by default 2019-02-06 14:44:00 +03:00
Mikhail Fandyushin
1ee18203ae handle brotli errors; working wersion of BrotliReadBuffer 2019-02-06 02:12:31 +03:00
Nikita Vasilev
a1b0dede07 Data Skipping Indices (#4143)
* made index parser

* added index parsing

* some fixes

* added index interface and factory

* fixed compilation

* ptrs

* added indexParts

* indextypes

* index condition

* IndexCondition

* added indexes in selectexecutor

* fix

* changed comment

* fix

* added granularity

* comments

* fix

* fix

* added writing indexes

* removed indexpart class

* fix

* added setSkipIndexes

* add rw for MergeTreeIndexes

* fixes

* upd error

* fix

* fix

* reading

* test index

* fixed nullptr error

* fixed

* fix

* unique names

* asts -> exprlist

* minmax index

* fix

* fixed select

* fixed merging

* fixed mutation

* working minmax

* removed test index

* fixed style

* added indexes to checkDataPart

* added tests for minmax index

* fixed constructor

* fix style

* fixed includes

* fixed setSkipIndexes

* added indexes meta to zookeeper

* added parsing

* removed throw

* alter cmds parse

* fix

* added alter

* fix

* alters fix

* fix alters

* fix "after"

* fixed alter

* alter fix + test

* fixes

* upd setSkipIndexes

* fixed alter bug with drop all indices

* fix metadata editing

* new test and repl fix

* rm test files

* fixed repl alter

* fix

* fix

* indices

* MTReadStream

* upd test for bug

* fix

* added useful parsers and ast classes

* fix

* fix comments

* replaced columns

* fix

* fixed parsing

* fixed printing

* fix err

* basic IndicesDescription

* go to IndicesDescr

* moved indices

* go to indicesDescr

* fix test minmax_index*

* fixed MT alter

* fixed bug with replMT indices storing in zk

* rename

* refactoring

* docs ru

* docs ru

* docs en

* refactor

* rename tests

* fix docs

* refactoring

* fix

* fix

* fix

* fixed style

* unique idx

* unique

* fix

* better minmax calculation

* upd

* added getBlock

* unique_condition

* added termForAST

* unique

* fixed not

* uniqueCondition::mayBeTrueOnGranule

* fix

* fixed bug with double column

* is always true

* fix

* key set

* spaces

* test

* tests

* fix

* unique

* fix

* fix

* fixed bug with duplicate column

* removed unused data

* fix

* fixes

* __bitSwapLastTwo

* fix
2019-02-05 17:50:25 +03:00
Ivan Lezhankin
8c640f54f8 Fix clang-7 warnings 2019-02-05 13:19:34 +03:00
Mikhail Fandyushin
7e9e34bebf WIP: Reading brotli encoded HTTP messages. First-draft-ugly implementation, but its works 2019-02-05 01:15:08 +03:00
alesapin
e1f4e02766 Add ability to run queries by indexes 2019-02-04 20:37:55 +03:00
Ivan Lezhankin
994926e568 Merge remote-tracking branch 'upstream/master' into CLICKHOUSE-3729 2019-02-04 20:13:50 +03:00
alexey-milovidov
39f8eb571f
Merge pull request #4213 from nvartolomei/nv/http-cancel
Cancel http read only queries if client socket goes away
2019-02-04 17:33:47 +03:00
alexey-milovidov
a29385108a
Update Server.cpp 2019-02-04 15:49:54 +03:00
Vasily Nemkov
2716df8ab2 IPv4 and IPv6 Domain implementation.
Added:
 * IDataTypeDomain interface;
 * method DataTypeFactory::registerDataTypeDomain for registering domains;
 * DataTypeDomainWithSimpleSerialization domain base class with simple serialization/deserialization;
 * Concrete IPv4 and IPv6 domain implementations: DataTypeDomanIPv6 and DataTypeDomanIPv4;

Updated:
 * IDataType text serialization/deserialization methods;
 * IDataType implementation to use domain for text serialization/deserialization;
 * Refactored implementation of the IPv4/IPv6 functions to use formatIPv4/v6 and parseIPv4/v6 from Common/formatIPv6.h;

Tests:
 * Added test cases for IPv4 and IPv6 domains.
 * Updated IPv4/v6 functions tests to validate more cases;
 * Added performance tests for IPv4 and IPv6 related functions;
2019-02-04 12:37:46 +03:00
Lopatin Konstantin
97cb36ac2e Clickhouse server version option support 2019-02-04 12:21:12 +03:00
Nikita Lapkov
5c54bbb750 write traces to trace_log 2019-02-03 21:30:45 +00:00
Lopatin Konstantin
86f226d62e Reduce max memory usage, max memory usage for all querie, mark cache size and uncompressed cache size accordingly to available memory amount 2019-02-04 00:23:17 +03:00
alexey-milovidov
8db13da097
Update HTTPHandler.cpp 2019-02-03 23:40:34 +03:00
alexey-milovidov
450c575c7e
Merge pull request #4230 from bsd-conqueror/missing_password_value
Fixed the issue when --password was used without a value
2019-02-02 20:53:15 +03:00
alexey-milovidov
fb297b78ba
Update ConnectionParameters.h 2019-02-02 20:52:57 +03:00
alexey-milovidov
69c18786cb
Update Client.cpp 2019-02-02 20:50:57 +03:00
alexey-milovidov
2e082d9a9e
Merge pull request #4233 from yurriy/server-help-option
Server help option
2019-02-02 20:49:03 +03:00
alexey-milovidov
a3afe6650f
Merge pull request #4232 from syominsergey/my-branch
"-C" option for client and show problematic file path
2019-02-02 20:47:28 +03:00
Yuriy Baranov
defc6bbcf4 added positional arguments description 2019-02-02 15:37:54 +00:00
Sergei Semin
adfc3bf5b3 fix typo 2019-02-02 17:43:36 +03:00
Sergei Semin
3f92350c2b rename config file parameter name 2019-02-02 17:40:29 +03:00
alexey-milovidov
e3b32ec679
Merge pull request #4231 from fandyushin/queryid
Added Query-Id to http response header
2019-02-02 17:38:13 +03:00
BSD_Conqueror
fbb3fee9af Fixed a mistype 2019-02-02 17:35:51 +03:00
Yuriy Baranov
e6101f3531 removed help message header 2019-02-02 14:33:08 +00:00
Sergei Semin
f3bbb07337 remove extra brackets 2019-02-02 17:29:54 +03:00
Sergei Semin
21cc1f6488 add another option for client configuration file 2019-02-02 17:28:37 +03:00
Yuriy Baranov
a97c8a43a7 moved include outside ssl includes 2019-02-02 14:05:27 +00:00
Sergei Semin
c7b52af1f8 Revert "treat "-C" as "-c" parameter for clickhouse-client"
This reverts commit 6ed2a4d4
2019-02-02 17:01:10 +03:00
Yuriy Baranov
0296c9a941 removed duplicate include 2019-02-02 14:00:33 +00:00
Sergei Semin
959952114c move client creation and run under try to show exception message 2019-02-02 16:49:24 +03:00
BSD_Conqueror
5a7e4c863d Added a comment to explain why '\n' is used as the implicit value for the --password option 2019-02-02 16:43:08 +03:00
Yuriy Baranov
a3d0568739 Added --help/-h to server 2019-02-02 13:24:12 +00:00
BSD_Conqueror
171f54a1f6 Merge branch 'missing_password_value' of https://github.com/bsd-conqueror/ClickHouse into missing_password_value 2019-02-02 16:21:55 +03:00
BSD_Conqueror
d2d11d4e96 Removed code duplication in --password handling 2019-02-02 16:20:51 +03:00
BSD_Conqueror
375be7b881
Merge branch 'master' into missing_password_value 2019-02-02 16:10:38 +03:00
BSD_Conqueror
c0f72d18d0 Fixed the issues with the --password option and the user name in the prompt
- if --password was used without any value, ask for the password in the prompt
- fixed the issue when a blank user name is shown in the prompt if no user was provided
2019-02-02 16:04:08 +03:00
Sergei Semin
6ed2a4d47d treat "-C" as "-c" parameter for clickhouse-client 2019-02-02 15:36:04 +03:00
Mihail Fandyushin
7294b8adf2 Added Query-Id to http response header 2019-02-02 15:24:26 +03:00
Nicolae Vartolomei
3fdc04428e
Cancel http read only queries if client socket goes away
To check the socket status, try to read one byte from socket in a
non-blocking way:
      0 - client closed the connection
   >= 1 - client send more data, we are ignoring this case for now
timeout - normal case, client is waiting for response
    ... - socket broken?

Dirty, but should do the job. Limiting to readonly queries as I don't
want to mess with alter queries / insert select and others.
2019-02-02 12:14:52 +00:00
BSD_Conqueror
baa504f524 Fixed the issue when --password was used without a value 2019-02-02 14:48:06 +03:00
alesapin
937053ee8f
Merge pull request #4220 from yandex/aux_queries_in_perf_test
Add ability to create, fill and drop tables in perftest
2019-02-02 11:15:42 +03:00
Alexey Milovidov
7f8ac2d26b Fixed bad function name 2019-02-02 03:25:12 +03:00
alesapin
7fb2556a23 Add ability to create, fill and drop tables in perftest 2019-02-01 18:10:13 +03:00
Ivan
e22a271034
Fix style 2019-02-01 17:22:27 +03:00
Alexey Milovidov
d263f3d941 Removed listen host override from the example server config 2019-02-01 16:56:20 +03:00
Alexey Milovidov
bf99e785c8 Removed ZooKeeper example config 2019-01-31 21:58:04 +03:00
proller
335de18102 Fix 2019-01-31 20:18:30 +03:00
alesapin
4675c0bd29 Add fs path to result xml 2019-01-31 16:46:43 +03:00
alesapin
6d69eb2341 Merge branch 'split-odbc-bridge' of github.com:yandex/ClickHouse into split-odbc-bridge 2019-01-30 21:48:39 +03:00
alesapin
3ca9c06f79 Remove -rdynamic from odbc-bridge linkage and fix mysql test. Also log config 2019-01-30 21:48:20 +03:00
Alexey Milovidov
de661e154d Removed linking of clickhouse-odbc-bridge to dictionaries 2019-01-30 17:08:42 +03:00
Alexey Milovidov
73a6209eba Merge branch 'master' into split-odbc-bridge 2019-01-30 17:01:06 +03:00
alesapin
3de94798d5
Merge pull request #4171 from yandex/refactor_performance_test
Refactor performance test
2019-01-30 16:54:50 +03:00
alesapin
893b34f31c Rename clear method 2019-01-30 14:48:23 +03:00
alesapin
586c6b3206 Better logging about exception 2019-01-30 14:07:10 +03:00
alesapin
95db9b4d76 Merge master 2019-01-29 23:17:52 +03:00
alesapin
4f97c291e6 Always run clickhouse-odbc-bridge; Integration tests now able to run odbc-bridge from separate binary; add symlink to clickhouse-odbc-bridge in dbms/programs folder; 2019-01-29 20:17:31 +03:00
alesapin
ec88c521f2 Fix headres + sort input files 2019-01-29 13:43:35 +03:00
alesapin
646137b63a Add missed header 2019-01-29 13:05:15 +03:00
proller
5d4c1d9a88 Install fixes 2019-01-28 19:36:39 +03:00
alesapin
3532910023 Fix conflict 2019-01-28 19:25:28 +03:00
alesapin
07b19bd9ea Merge remote-tracking branch 'origin' into refactor_performance_test 2019-01-28 19:23:08 +03:00
alesapin
86aeb4a251 Add normal logging, correct Ctrl+C handling and refactoring 2019-01-28 19:20:29 +03:00
Alexey Milovidov
5330ca16bc Strip clickhouse-odbc-bridge to avoid symbol clash with ODBC drivers #3360 2019-01-28 19:06:07 +03:00
Alexey Milovidov
9b2a5c3dec Merge branch 'master' into split-odbc-bridge 2019-01-28 18:15:18 +03:00
proller
2ab3138eb6 Merge remote-tracking branch 'upstream/master' into fix10 2019-01-28 17:01:06 +03:00
proller
22549cc43b Merge remote-tracking branch 'upstream/master' into fix10 2019-01-28 15:44:25 +03:00
alesapin
1cdb5cfba2 Something runnable 2019-01-28 14:20:44 +03:00
Alexey Milovidov
4e3d9a0f15 Merge branch 'master' of github.com:yandex/ClickHouse into global-thread-pool 2019-01-28 14:20:24 +03:00
Alexey Milovidov
cd326884a5 Addition to prev. revision #4150 2019-01-28 14:18:00 +03:00
Vitaly Baranov
e9721c9548 Add support for absolute format schema paths. 2019-01-27 12:15:32 +03:00
Alexander GQ Gerasiov
aac21c5f57 Fix install of binaries when SPLIT_BINARIES is set. 2019-01-25 23:19:45 +03:00
proller
5328251ff1
Fix build without protobuf, gtest, cppkafka (#4152) 2019-01-25 23:02:03 +03:00
alesapin
0d4b7ff82e Refactoring in performance test (may be build, but doesn't work) 2019-01-25 21:35:16 +03:00
Alexey Milovidov
65f8e4d4a8 Merge branch 'master' into global-thread-pool 2019-01-25 16:33:50 +03:00
alesapin
4e413f4c2d Move classes to separate files 2019-01-25 14:03:02 +03:00
Alexey Milovidov
854817c232 Fixed -Wshadow-field #4005 2019-01-24 22:37:32 +03:00
alexey-milovidov
f96b8e4ed6
Merge pull request #4005 from vitlibar/add-protobuf-output-format
Add protobuf output format
2019-01-24 22:05:23 +03:00
Vitaly Baranov
b7ee466cd7 Added possibility to set 'format_schema_path' parameter in the client config too. 2019-01-24 17:32:01 +03:00
Vitaly Baranov
67fca7e029 Add support for settings 'format_schema' in an output query.
This fixes syntax error when executing 'SELECT ... FORMAT ... SETTINGS format_schema=...'
2019-01-23 22:23:37 +03:00
Ivan Lezhankin
05ab15cc84 Merge IBlockInputStream and IProfilingBlockInputStream into one 2019-01-23 17:48:50 +03:00
alesapin
a96f638cb0 Fixes in performance-test: more correct json, choose main_metric by default, fix params accumulation bug 2019-01-23 14:00:06 +03:00
maiha
6c83beafdd dbms: Fixed misspells in comments 2019-01-23 04:56:53 +09:00
Alexey Milovidov
2eb7b15273 Addition to prev. revision #4103 2019-01-21 19:14:26 +03:00
Alexey Milovidov
c7b95b5175 Miscellaneous changes for PVS-Studio 2019-01-20 02:27:52 +03:00
Alexey Milovidov
17335ab1f1 Fixed some warnings found by PVS-Studio 2019-01-20 01:52:33 +03:00
proller
0939387514
Build fixes (#4076)
Move copy_headers.sh and formath.sh from root.
Debian: use default build dir (obj-x86_64-linux-gnu)
Debian: add test after build (GLIBC_required_version)
cmake: dont run copy headers if already copied
2019-01-18 18:19:53 +03:00
Alexey Milovidov
a7c468da8e Merge remote-tracking branch 'origin/master' into global-thread-pool 2019-01-17 21:57:01 +03:00
Alexey Milovidov
a98e822a10 Attempt to implemnt global thread pool #4018 2019-01-15 21:39:54 +03:00
Alexey Milovidov
f6b9b06307 Attempt to implemnt global thread pool #4018 2019-01-14 22:22:09 +03:00
alexey-milovidov
f5271417ae
Merge pull request #4041 from yandex/compiled_expressions_cache_memory_usage
CLICKHOUSE-4249: Limit compiled expressions cache size
2019-01-11 23:22:52 +03:00
Alexey Milovidov
abcd5a2a49 Attempt to implemnt global thread pool #4018 2019-01-11 22:12:36 +03:00
alesapin
0ba1db8b27 CLICKHOUSE-4249: Limit compiled expressions cache 2019-01-11 22:03:23 +03:00
proller
7cefef6983
Fix linking in all modes (unbundled, split, ...) (#4037) 2019-01-11 19:52:46 +03:00
proller
497b6ec2ad
Better compile with low memory; Fix macos build, add utils/build/build_debian_unbundled_split.sh test script (#4030) 2019-01-11 15:40:19 +03:00
Alexey Milovidov
19f4652959 Fixed bugs found by PVS-Studio 2019-01-09 18:44:20 +03:00
Alexey Milovidov
3221d2bdb8 Added some warnings from clang's -Weverything 2019-01-04 17:22:34 +03:00
Alexey Milovidov
4622f5dc7c Added some warnings from clang's -Weverything 2019-01-04 16:32:08 +03:00
Alexey Milovidov
1d4701b0bc Added some warnings from clang's -Weverything 2019-01-04 15:10:00 +03:00
Alexey Milovidov
e33e5150b7 Miscellaneous [#CLICKHOUSE-2] 2019-01-02 09:44:36 +03:00
proller
300bbdfb43 Fix cyclic lib depend ppart 2: clean 2018-12-28 21:15:26 +03:00
proller
0c78ef8573 Fix cyclic lib depend (make clickhouse_compression lib) 2018-12-28 20:27:53 +03:00
Alexey Milovidov
06095340c7 Slightly better code #3940 2018-12-28 19:45:45 +03:00
alexey-milovidov
d16447c3f4
Merge pull request #3899 from yandex/custom_compression_codecs
Custom compression codecs
2018-12-28 08:29:09 +03:00
alexey-milovidov
0c6e6649b5
Merge pull request #3940 from 4ertus2/minor
Automatically  disable logs in negative tests CLICKHOUSE-4228
2018-12-27 22:53:28 +03:00
chertus
d791da03c7 fix test hint parsing 2018-12-27 17:48:47 +03:00
proller
d9bc934b7d 3908 Fix build client only 2018-12-27 17:32:23 +03:00
chertus
22bb17250f autodisable logs in negative tests CLICKHOUSE-4228 2018-12-27 16:09:11 +03:00
alesapin
9e32de053d
Update Compressor.cpp 2018-12-26 23:53:39 +03:00
alesapin
31f82940e1
Update Compressor.cpp 2018-12-26 19:18:21 +03:00
alesapin
89966db3ba Add multiple codecs to compressor 2018-12-26 18:01:26 +03:00
alesapin
1e771a4aec Fix error codes 2018-12-24 14:34:50 +03:00
Alexey Milovidov
fbee51bb7d Removed redundand code #3785 2018-12-24 00:38:53 +03:00
alexey-milovidov
b9c4ede4fd
Merge pull request #3785 from sergey-v-galtsev/match-process-euid-against-data-owner
Match the process' effective user id against the data owner at the server startup.
2018-12-23 22:28:54 +03:00
proller
bebaf9d861 Fix includes, Faster compile (#3898)
* Fix includes

* Faster compile

* WTFix

* Limit compile and linking jobs according to available memory

* Add comment

* fix

* Remove ALL from copy-headers target

* Freebsd fix

* Better

* cmake: split use libcxx
2018-12-23 17:19:11 +03:00
alesapin
6f7333840a Move header with compression info to another place 2018-12-21 16:25:39 +03:00
alesapin
7c11455bd3 Remove compression settings 2018-12-21 15:17:30 +03:00
alesapin
5b23210062 Merge branch 'master' into custom_compression_codecs 2018-12-21 11:57:21 +03:00
alexey-milovidov
d9e8cd46da
Merge pull request #3879 from yandex/setting-low_cardinality_allow_in_native_format
Added low_cardinality_allow_in_native_format setting.
2018-12-20 21:02:02 +03:00
alesapin
aee6c0a606 Remove dump code 2018-12-20 20:37:02 +03:00
alexey-milovidov
3cefb27e56
Merge pull request #3851 from abyss7/issue-3592
Refactor constant folding
2018-12-20 19:26:02 +03:00
Nikolai Kochetov
fbcf6640c9 Fix style. 2018-12-20 17:54:26 +03:00
Nikolai Kochetov
7b994d983f Fix Native streams headers. 2018-12-20 17:26:54 +03:00
Alexey Milovidov
2ae6b6414c Fixed error in 'compressor' tool: the 'level' parameter wasn't working #1345 2018-12-20 17:16:07 +03:00
proller
bd17982224 Fix clang build 2018-12-20 12:54:28 +03:00
Sergey V. Galtsev
a2042d60bf Resolve conflict with upstream. 2018-12-20 00:16:44 +03:00
proller
6869771ae4 Fix includes 2018-12-19 20:57:51 +03:00
proller
fdd22ad187 Fix includes 2018-12-19 20:56:58 +03:00
Nikolai Kochetov
78321a04a1 Added low_cardinality_allow_in_native_format setting. 2018-12-19 19:47:30 +03:00
alexey-milovidov
3efb01b3f8
Merge pull request #3857 from yandex/fix_odbc_bridge
Do not log from odbc-bridge when there is no console
2018-12-18 03:26:46 +03:00
alesapin
bb1760c468 Remove idiotic if 2018-12-17 23:11:19 +03:00
Ivan Lezhankin
8c8dc333e5 Fix unavailable shard's host:port for testing. 2018-12-17 21:06:50 +03:00
Daniel Dao
9a676329c2
Fix simple typo in ClusterCopier
Signed-off-by: Daniel Dao <dqminh89@gmail.com>
2018-12-17 16:45:44 +00:00
Ivan Lezhankin
1a539b3a6d Merge remote-tracking branch 'upstream/master' into issue-3592 2018-12-17 19:30:20 +03:00
Alexey Milovidov
d7e25e1439 Always build ODBC bridge as a separate binary #3360 2018-12-14 22:28:37 +03:00
alesapin
b00669e012 Print stacktrace on client if corresponding option specified 2018-12-13 20:41:13 +03:00
Sergey V. Galtsev
f9869b7d7e Fix default buffer_size for getUserName(). Use real sysconf(_SC_GETPW_R_SIZE_MAX) value. 2018-12-11 02:36:20 +03:00
Sergey V. Galtsev
c9b984285d Fail on user mismatch under root only. Just warn under non root user. 2018-12-11 02:32:21 +03:00
Sergey V. Galtsev
30acd5000e Fix bad merge. 2018-12-11 02:21:03 +03:00
Sergey V. Galtsev
df9833fd3f Remove no longer used error code. 2018-12-11 02:18:16 +03:00
alexey-milovidov
cea269883c
Merge pull request #3803 from yandex/low-cardinality-native-format-conversion-2
LowCardinality support for old clients, part 2
2018-12-10 21:03:43 +03:00
Sergey V. Galtsev
93df4306af Fix style. 2018-12-10 20:42:33 +03:00
Nikolai Kochetov
1a6127dce4 Remove LowCardinality from NativeBlockOutputStream types for old clients. 2018-12-10 15:09:37 +03:00
Sergey V. Galtsev
42de08f3b9 Move euid check back to Server.cpp.
Use getpwnam_r instead of getpwnam.
Fix style.
2018-12-10 01:15:59 +03:00
alexey-milovidov
0fdb3b9628
Merge branch 'master' into issue-3578 2018-12-07 23:53:34 +03:00
alexey-milovidov
acb4feef26
Merge pull request #3760 from yandex/fix-database-ordinary-load-table-deadlock
Fix database ordinary load table deadlock
2018-12-07 07:13:58 +03:00
Nikolai Kochetov
2bb57ce472 Support insertion into LowCardinality from old native clients. 2018-12-06 17:08:42 +03:00
Ivan Lezhankin
887e1089f1 Merge branch 'master' into kanterov_skip_unused_shards 2018-12-05 18:17:04 +03:00
Nikolai Kochetov
b6d7871a54 Log exception if metadata was'n loaded. 2018-12-05 16:13:41 +03:00
Nikolai Kochetov
5149f35167 Log exception if metadata was'n loaded. 2018-12-05 16:07:03 +03:00
chertus
3db00b7b98 Merge branch 'master' into issue-3578 2018-12-05 14:43:14 +03:00
chertus
a71d03737c send defaults via serialized ColumnsDescription CLICKHOUSE-3578 2018-12-04 23:03:04 +03:00
alexey-milovidov
48b30edcf5
Merge branch 'master' into alter-order-by 2018-12-02 21:06:38 +03:00
Nikolai Kochetov
f7f5ad3952 Fix build. 2018-11-29 11:23:27 +03:00
Nikolai Kochetov
a75430cbf7 Fix build. 2018-11-29 10:58:59 +03:00
proller
c5eb678187 PerformanceTest fix --secure (#3690)
* fix

* PerformanceTest fix --secure

* clean
2018-11-29 00:21:22 +03:00
Gleb Kanterov
75919bd91e Update server/config.xml for tests
- add test_unavailable_shard cluster
2018-11-28 19:46:19 +01:00
Alexey Milovidov
42631ba857 Fixed bad code #3688 2018-11-28 18:31:09 +03:00
Alexey Milovidov
32baabd9b0 Fixed bad code #3688 2018-11-28 18:27:23 +03:00
Alexey Milovidov
4c527b84d2 Fixed build #3688 2018-11-28 17:50:02 +03:00
proller
7e9d053d5d Benchmark: use client config for ssl options 2018-11-28 17:41:51 +03:00
Alexey Zatelepin
1b27fb046d Merge branch 'master' into alter-order-by
Conflicts:
	dbms/programs/server/Server.cpp
2018-11-28 16:47:07 +03:00
proller
107cf2c9b2 Add secure option to clickhouse-benchmark and clickhouse-performance-test 2018-11-28 15:19:01 +03:00
proller
dd2371e071 CLICKHOUSE-4137 DictionaryFactory, DictionarySourceFactory (#3653)
* Split ComplexKeyCacheDictionary to faster compile (part2)

* Dictionaries as lib WIP

* wip

* clean

* Fix build with old capnp

* fix

* wip

* fixes

* fix

* clean

* clean

* clean

* wip

* wip

* wip

* flat

* wip

* cache

* clean

* wip

* faster

* fix style

* fixes

* clean

* clean

* Split CacheDictionary.cpp for faster compile

* fix

* fix

* Less memory usage while compiling

* missing file

* format

* Update registerDictionaries.h

* clean
2018-11-28 14:37:12 +03:00
proller
f1791e94e2
Do not write preprocessed configs to /etc/ (#2443) 2018-11-27 19:11:46 +03:00
Ivan Lezhankin
73aa7f2027 Rename method partition() → alterPartition()
Also fix build with internal shared libraries.
2018-11-26 17:43:40 +03:00
Alexey Zatelepin
d3d9242462 Merge branch 'master' into alter-order-by
Conflicts:
	dbms/src/Parsers/ASTAlterQuery.h
	dbms/src/Parsers/ParserAlterQuery.cpp
	dbms/src/Storages/AlterCommands.cpp
	dbms/src/Storages/AlterCommands.h
2018-11-26 16:01:48 +03:00
Alexey Milovidov
c77930fe30 Whitespaces [#CLICKHOUSE-2] 2018-11-26 03:56:50 +03:00
Alexey Milovidov
141e9799e4 Fixed error with "extractURLParameter" function (read after buffer); improved performance; added support for zero bytes in URLs; renamed Chars_t type [#CLICKHOUSE-2] 2018-11-25 03:08:50 +03:00
Alexey Milovidov
7d6fffff48 More style checks [#CLICKHOUSE-3] 2018-11-24 04:48:06 +03:00
Alexey Milovidov
dbbacf4f87 Added more style checks [#CLICKHOUSE-3] 2018-11-23 21:52:00 +03:00
Alexey Milovidov
15ad4b9b1b Whitespaces [#CLICKHOUSE-2] 2018-11-23 18:56:20 +03:00
alexey-milovidov
ac29388224
Merge pull request #3632 from yandex/fix-low-cardinality-distributed-group-by
Fix low cardinality distributed group by
2018-11-23 16:45:56 +03:00
alexey-milovidov
c6bc4279ee
Merge pull request #3377 from s-mx/CLICKHOUSE-4032
Added support for column COMMENTs in table definition.
2018-11-23 16:43:58 +03:00
Alexey Milovidov
d3bb69be74 More correct documentation + miscellaneous name change #3644 2018-11-23 00:27:52 +03:00
alexey-milovidov
49d2d8a1b8
Merge pull request #3644 from proller/fix4
Add VERSION_INT (ClickHouse version in integer format like 18014009) …
2018-11-23 00:22:19 +03:00
alexey-milovidov
2c2d75cceb
Don't allow exceptions without code (#3645)
* Don't allow exceptions without code #3633

* Don't allow exceptions without code #3633
2018-11-23 00:19:58 +03:00
proller
f410c93fb1 Add VERSION_INT (ClickHouse version in integer format like 18014009) to system.metrics and system.build_options 2018-11-22 21:24:38 +03:00
KochetovNicolai
b8882ddd90
Update config.xml
Fix cluster ports in config.xml
2018-11-22 18:09:55 +03:00
Alexey Milovidov
093557dbde Merge branch 'master' of github.com:yandex/ClickHouse 2018-11-22 18:08:28 +03:00
Alexey Milovidov
e53eb702a1 Usability of client error message when it cannot load data for suggestions [#CLICKHOUSE-2] 2018-11-22 18:07:32 +03:00
Sabyanin Maxim
3a67b505c5 Merge branch 'master' of https://github.com/yandex/ClickHouse into CLICKHOUSE-4032 2018-11-22 16:54:10 +03:00
Nikolai Kochetov
41951a926e Fix test cluster config. 2018-11-22 12:18:13 +03:00
Alexey Milovidov
ab5d76fc42 Fixed error introduced in #3553 and prevent it happening 2018-11-21 23:56:37 +03:00
proller
1d40c2c871 Better link and deps (#3631)
* try fix 1

* Better deps

* fix

* fix

* fix

* Update CMakeLists.txt

* Update CMakeLists.txt

* fix

* fix

* fix

* disable old

* Update find_odbc.cmake
2018-11-21 22:20:27 +03:00
Amos Bird
ab8821255c Remove redundant query context attachment 2018-11-20 22:21:48 +08:00
proller
160ffb2283
Build fixes (clang 7.0.0+) (#3582) 2018-11-16 15:22:51 +03:00
chertus
65d34ca231 do not override current_database in context [CLICKHOUSE-3578] 2018-11-15 18:03:13 +03:00
chertus
0e1044b165 Merge branch 'master' into issue-3578 2018-11-15 13:28:53 +03:00
chertus
ebf3d60186 column defaults without CapNProto [CLICKHOUSE-3578] 2018-11-14 21:20:16 +03:00
Alexey Milovidov
1aa89ed63a Fixed code after review #3553 2018-11-14 04:20:46 +03:00
proller
37a9af5a68 CLICKHOUSE-4109 mlock clickhouse (#3553)
* CLICKHOUSE-4109 mlock clickhouse

* wip

* Fix

* wip

* fix

* fix

* better place

* wip

* clean

* tidy

* fix
2018-11-14 04:11:13 +03:00
Alexey Milovidov
5441b6c3d2 Whitespace [#CLICKHOUSE-3] 2018-11-13 21:54:38 +03:00
Alexey Zatelepin
29b34365e6 Merge branch 'master' into alter-order-by
Conflicts:
	dbms/src/Interpreters/ExpressionAnalyzer.cpp
	dbms/src/Storages/MergeTree/MergeTreeData.cpp
	dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
2018-11-13 16:27:19 +03:00
Alexey Zatelepin
ce1ead5b88 allow arbitrary callbacks in ZooKeeperNodeChange [#CLICKHOUSE-3859] 2018-11-13 16:13:29 +03:00
chertus
9aae1d0d8f fix branches merge mistake 2018-11-12 21:34:43 +03:00
chertus
c1518da50f fix build with CAPNP 2018-11-12 20:29:02 +03:00
chertus
9966f975a3 Merge branch 'master' into issue-3578 2018-11-12 17:58:00 +03:00
chertus
2fe3cdb3f5 restore lost commits [CLICKHOUSE-3578] 2018-11-12 17:52:30 +03:00
proller
5678d1ed98 Build fixes (#3545)
* StorageSystemContributors clean

* Fix

* ARM fixes

* Fix arm compile

* fix

* Fix macos?

* Fix includes

* fix

* fix

* Try fix apple build part 1

* Fix identation

* Fix static libc++ in clang

* fix arm build

* better

* fix

* fix

*  better check-include
2018-11-10 23:09:07 +03:00
chertus
cc005c3ac9 Merge branch 'master' into issue-3578 2018-11-09 13:12:34 +03:00
Sabyanin Maxim
dacd999d4f Merge branch 'master' into CLICKHOUSE-4032 2018-11-06 16:50:07 +03:00