thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-20 05:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,143 Commits 9,332 Branches 1,785 Tags 2.2 GiB
7dbdbff748
Commit Graph

937 Commits

Author SHA1 Message Date
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
Ivan Lezhankin
d846c0a9a6 Report progress from server-side to keep client connections alive. 
This way we make sure that 'receive_timeout' on client-side is triggered only
when there is a real socket read timeout.
 2018-11-06 14:40:06 +03:00
Ivan Lezhankin
f0edecd755 Respect 'receive_timeout' option on client-side. 2018-11-06 14:31:30 +03:00
Amos Bird
d7fe560090
restore query context before polling 2018-11-01 17:14:01 +08:00
Alexey Zatelepin
31bc680ac5 ErrorCodes::SYNTAX_ERROR now causes HTTP_BAD_REQUEST 2018-10-29 21:00:36 +03:00
Sabyanin Maxim
65bd40e290 Merge branch 'master' of github.com:yandex/ClickHouse into CLICKHOUSE-4032 2018-10-27 22:33:52 +03:00
CurtizJ
7963e952f1 rename setting to tcp_keep_alive 2018-10-23 02:02:57 +03:00
proller
abfe675097
Build fixes (#3419) 2018-10-18 22:28:05 +03:00
Sabyanin Maxim
e050bc0428 Merge branch 'master' into CLICKHOUSE-4032 2018-10-14 18:35:45 +03:00
Sabyanin Maxim
ab050c8466 add comment section in column declaration. 
add comment column type in alter method.
add comment section in system.columns.
 2018-10-14 18:30:06 +03:00
Alexey Milovidov
881893da56 Merge branch 'master' of github.com:yandex/ClickHouse 2018-10-13 17:33:53 +03:00
Alexey Milovidov
f720a5bf95 Fixed typos in code #3373 2018-10-13 17:33:43 +03:00
avsharapov
11da23f153 Fix typo in readme 2018-10-13 15:28:08 +03:00
Alexey Milovidov
81a9ab424f Style #3362 2018-10-12 06:11:19 +03:00
Alexey Milovidov
f0db16af20 Whitespaces [#CLICKHOUSE-2] 2018-10-12 00:12:14 +03:00
CurtizJ
3d15ae8eed fix sigint receive 2018-10-11 21:25:05 +03:00
CurtizJ
d46fa0f37f fix incorrect number of iterations 2018-10-11 21:12:28 +03:00
alesapin
8591038748 Fix style and clang build 2018-10-10 11:38:54 +03:00
Alexey Milovidov
0b3a8cb489 Merge branch 'joins' of https://github.com/4ertus2/ClickHouse into 4ertus2-joins 2018-10-10 04:06:06 +03:00
alexey-milovidov
1472e3ae66
Merge pull request #3210 from alex-krash/jdbc-bridge 
External database access unification (jdbc/odbc bridges)
 2018-10-10 02:26:56 +03:00
alexey-milovidov
fe2c4e4102
Update getIdentifierQuote.cpp 2018-10-10 02:19:38 +03:00
Alexandr Krasheninnikov
27f288641e Fix config reference, header inclusion and failed tests 2018-10-09 18:03:41 +03:00
chertus
ec8d3b388d move DumpASTNode to own file, style fixes [CLICKHOUSE-4001] 2018-10-09 17:32:11 +03:00
Alexey Milovidov
25a3cc4dc2 Merge remote-tracking branch 'origin/master' into fix-memory-tracker 2018-10-04 23:49:38 +03:00
Alexandr Krasheninnikov
82200bc16a Added error codes, bridge startup, fixed destructor in XDBC stuff 2018-10-03 15:10:57 +03:00
Alexandr Krasheninnikov
c7fee9374c fix formatting errors according code review 2018-10-03 13:44:43 +03:00
alexey-milovidov
94b0432faa
Merge pull request #3262 from proller/fix17 
Arcadia sync
 2018-10-01 22:00:01 +03:00
alesapin
6017be28f6 CLICKHOUSE-4007: Fix PerfTest substitution function 2018-10-01 19:30:12 +03:00
proller
ca03cd6606 Sync with arcadia 2018-10-01 18:43:48 +03:00
Alexey Milovidov
85ca2006b0 Fixed bug in client (double whitespace) [#CLICKHOUSE-4038] 2018-09-29 22:33:23 +03:00
proller
ec11bef633
Build fixes (#3181) 2018-09-28 17:53:20 +03:00
Alexander Krasheninnikov
ceea4b9b33 New bridge interaction, quote identifier via api 2018-09-28 05:46:33 +03:00
Alexandr Krasheninnikov
4b431264db Implement quote getter from ODBC 2018-09-27 18:23:42 +03:00
Alexey Milovidov
30da8de1b6 Send log message about peak memory usage to client #3230 2018-09-27 00:19:49 +03:00
proller
0047987333 CLICKHOUSE-3885: add partition_key alias (#3166) 
* Allow run integration tests from ctest: cmake .. -DENABLE_TEST_INTEGRATION=1 && ninja && ctest -V -R integration

* CLICKHOUSE-3885: add partition_key alias

* fix

* Update ClusterCopier.cpp

* Better test

* fixing..
 2018-09-21 13:46:58 +03:00
Alexey Milovidov
7d291142ec Less dependencies [#CLICKHOUSE-2] 2018-09-20 23:51:21 +03:00
proller
d752d5d62d Prepare to new poco, build fixes (#3072) 
* WIp

* fix

* fix

* test

* fix poco netssl find

* clean

* fixes

* wip

* wip

* new poco

* fixes

* Fixes

* wip

*  clean

* clean

*     clean

* clean

* Update HTTPHandlerFactory.h
 2018-09-14 22:48:51 +03:00
Alexey Milovidov
136d9d7b18 Added setting names for suggest [#CLICKHOUSE-2] 2018-09-12 04:03:58 +03:00
Alexey Milovidov
54ea7b0b20 Fixed error [#CLICKHOUSE-2] 2018-09-09 06:28:45 +03:00
Alexey Milovidov
a3745a6aa7 Fixed usage of query scope in TCPHandler #2482 2018-09-08 02:22:02 +03:00
chertus
0b35cdae69 refactoring: add some sugar in type checks [CLICKHOUSE-0002] 2018-09-07 17:37:26 +03:00
alesapin
790b4b3eca Fix build 2018-09-06 22:13:49 +03:00
alexey-milovidov
580683310b
Merge pull request #2990 from alesapin/master 
CLICKHOUSE-3800: Add Cache for compiled expression.
 2018-09-06 21:12:08 +03:00
proller
db13ef96d6 Fix ssl init (#3056) 
* Try to fix ../libs/libglibc-compatibility/glibc-compatibility.c:151: multiple definition of `explicit_bzero'
contrib/ssl/crypto/libcrypto.a(explicit_bzero.c.o):../contrib/ssl/crypto/compat/explicit_bzero.c:16: first defined here

* Fix ssl init

* fix

* noncopyable

* clean
 2018-09-06 21:05:33 +03:00
Alexander Sapin
03174e131d Merge remote-tracking branch 'upstream/master' 2018-09-06 12:39:42 +03:00
alexey-milovidov
4f9dd85c5e
Merge pull request #3050 from proller/fix20 
Internal compiler run fixes
 2018-09-06 03:29:10 +03:00
Alexey Milovidov
3c7c2e3853 Revert "Revert "Tidy up thread locals usage across translation units"" 
This reverts commit 509386b14d.
 2018-09-06 00:01:43 +03:00
proller
5877eece58 Internal compiler run fixes 2018-09-05 21:50:17 +03:00
Alexey Milovidov
509386b14d Revert "Tidy up thread locals usage across translation units" 
This reverts commit e28753061f.
 2018-09-05 19:41:34 +03:00
alesapin
16eaeefc6e Fix naming 2018-09-05 15:42:37 +03:00
alesapin
2647c13c6b CLICKHOUSE-3800: Fix naming, move compiled cache size setting to config.xml 2018-09-05 14:37:41 +03:00
Nicolae Vartolomei
e28753061f Tidy up thread locals usage across translation units 
Fixes #3015.
 2018-09-03 22:36:16 +01:00
Alexey Milovidov
3873ab1adb Fixed tests in Sandbox [#CLICKHOUSE-2] 2018-09-03 05:32:29 +03:00
Alexey Milovidov
bc84ca06a6 Addition to prev. revision [#CLICKHOUSE-2] 2018-09-02 23:46:16 +03:00
Alexey Milovidov
243441cb51 Disable leak sanitizer for embedded clang and lld [#CLICKHOUSE-2] 2018-09-02 22:46:09 +03:00
Alexey Milovidov
fc27be314b Avoid temporary nullptr references [#CLICKHOUSE-2] 2018-09-02 06:00:04 +03:00
Alexey Milovidov
f7107f12b4 Merge branch 'master' into extra-warnings 2018-09-02 03:13:36 +03:00
alexey-milovidov
16dc142a05
Merge pull request #3017 from yandex/ubsan-fixes 
Fixes for UBSan.
 2018-09-02 03:12:20 +03:00
Alexey Milovidov
61413ead23 Removed notice in gcc-8 [#CLICKHOUSE-2] 2018-09-02 00:03:06 +03:00
Alexey Milovidov
751cf62262 Added documentation for CurrentMetrics #3010 2018-09-01 22:51:38 +03:00
Alexey Milovidov
c060fde75e Removed notice in gcc-8 [#CLICKHOUSE-2] 2018-09-01 05:22:30 +03:00
Alexey Milovidov
dbd0e2f533 Clarifications #2482 2018-09-01 01:41:42 +03:00
Alexey Milovidov
37438b6750 More thread names #2482 2018-08-31 04:00:09 +03:00
alexey-milovidov
a05cdfbb45
Merge branch 'master' into extra-warnings 2018-08-31 03:03:44 +03:00
Amos Bird
4ae8721a82
ill formated #else breaks client history 2018-08-28 20:05:27 +08:00
Alexey Milovidov
e5a2dd8624 Merge branch 'master' into extra-warnings 2018-08-27 19:19:04 +03:00
proller
3acce3bff9 Build fix (#2944) 
* Build fix

* Better sample build scripts

* zlib apple fix

* fix

* fix

* better so version

* SPLIT_SHARED -> LINK_MODE

* clean
 2018-08-27 17:39:20 +03:00
Alexey Milovidov
e33b1d13aa Enabling -Wzero-as-null-pointer-constant [#CLICKHOUSE-2] 2018-08-26 05:48:48 +03:00
Alexey Milovidov
595bd32f41 Enabling -Wzero-as-null-pointer-constant [#CLICKHOUSE-2] 2018-08-26 04:41:08 +03:00
Alexey Milovidov
625f3fea08 Enabling -Wunused-exception-parameter [#CLICKHOUSE-2] 2018-08-26 04:36:41 +03:00
Alexey Milovidov
29a6a85ccf Enabling -Winconsistent-missing-destructor-override [#CLICKHOUSE-2] 2018-08-26 04:31:12 +03:00
Alexey Milovidov
4754abbc7d Enabling -Wextra-semi [#CLICKHOUSE-2] 2018-08-26 04:14:00 +03:00
Alexey Milovidov
fa6e364f68 Enabling -Wextra-semi [#CLICKHOUSE-2] 2018-08-26 03:51:37 +03:00
Alexey Milovidov
c193d15ef2 Merge branch 'master' into generalize-zookeeper 2018-08-26 03:32:15 +03:00
Alexey Milovidov
93b44fb17c Made suggest case sensitive again. Otherwise there is a glitch when you type SELECT DIS<TAB> #2447 2018-08-25 19:19:00 +03:00
Alexey Milovidov
417cc1ab4d Additions #2447 2018-08-25 19:05:01 +03:00
Alexey Milovidov
24083e3088 Separate files #2447 2018-08-25 16:55:18 +03:00
Alexey Milovidov
9293882206 Allow to disable suggestion; check server revision #2447 2018-08-25 16:41:50 +03:00
Alexey Milovidov
32eb1a7942 Merge branch 'feature/suggestions' of https://github.com/Tezd/ClickHouse into Tezd-feature/suggestions 2018-08-25 16:15:30 +03:00
Alexey Milovidov
3475ef5304 Attempt to generalize ZooKeeper interface [#CLICKHOUSE-2] 2018-08-25 04:58:14 +03:00
alexey-milovidov
eab95e43d1
Merge pull request #2938 from yandex/speed-up-fuzz-tests-2 
Speed up fuzz tests, part 2 #2924
 2018-08-24 14:07:35 +03:00
Amos Bird
26903d6e8f Add schema argument to ODBC table func. 
Useful for datbases like postgres and greenplum.
 2018-08-24 16:18:17 +08:00
Alexey Milovidov
a2fefa1617 Speed up fuzz tests, part 2 #2924 2018-08-24 10:30:53 +03:00
alexey-milovidov
442c501dd0
Merge pull request #2923 from yandex/remove-useless-option-in-clickhouse-local 
Removed useless option --silent from the clickhouse-local, because it was implemented not according to the specs and the options --silent, --verbose, --echo was messed up #1773
 2018-08-24 04:21:52 +03:00
Alexey Milovidov
1437e5cbe3 Fix style [#CLICKHOUSE-2] 2018-08-24 03:07:25 +03:00
Alexey Milovidov
b76b5af044 Fixed bad code in clickhouse-local #2923 2018-08-24 02:59:16 +03:00
Alexey Milovidov
0562ab69e8 Fixed inconsistency between clickhouse-client and clickhouse-local [#CLICKHOUSE-2] 2018-08-23 04:35:19 +03:00
Alexey Milovidov
61f3c4f0d1 Removed useless option --silent from the clickhouse-local, because it was implemented not according to the specs and the options --silent, --verbose, --echo was messed up #1773 2018-08-23 03:14:26 +03:00
Alexey Milovidov
a1d745888d Dummy implementation for non-Linux platforms #2482 2018-08-22 08:56:06 +03:00
Alexey Milovidov
e220a5041f Better location #2877 2018-08-22 06:06:13 +03:00
Alexey Milovidov
3fdff1abea TaskStats: better code #2482 2018-08-22 00:05:30 +03:00
Alexey Milovidov
99d7b8a7ad Allow to quit client while query is in progress by pressing Ctrl+C twice #2877 2018-08-21 21:42:46 +03:00
Alexey Milovidov
a04177290b Miscellaneous #2482 2018-08-21 19:40:54 +03:00
Vladimir Kozbin
cdb7116f37 ISSUES-2629 clickhouse-client: fix reading user from config 2018-08-21 17:04:27 +07:00
Alexey Milovidov
d278cbbed5 Addition to prev. revision #2877 2018-08-21 02:39:41 +03:00
Alexey Milovidov
b98cfe0f66 Addition to prev. revision #2877 2018-08-21 02:30:24 +03:00
Alexey Milovidov
cf224f32c4 Addition to prev. revision #2877 2018-08-21 02:28:27 +03:00
Alexey Milovidov
7fc39611e5 Implemented #2877 in another way 2018-08-21 02:22:20 +03:00
Alexey Milovidov
4cf162914a Example server config: listen to IPv4 (for Travis) [#CLICKHOUSE-2] 2018-08-20 06:47:27 +03:00
Alexey Milovidov
1c9c6f6cfc Moved "TestHint" code to separate file #2744 2018-08-20 06:34:10 +03:00
Alexey Milovidov
b07ad553ef Fixed test #2015 2018-08-20 06:27:16 +03:00
Alexey Milovidov
9e15b49254 Added useful comments that code is totally wrong #2744 2018-08-20 06:21:26 +03:00
Alexey Milovidov
e0f1637506 Moved file to appropriate place; split to cpp #2482 2018-08-20 05:34:00 +03:00
Alexey Milovidov
f1ba2f9a33 Try to fix "query in form data" feature while still tracking limits for external tables (try №2) #2482 2018-08-20 05:23:35 +03:00
Alexey Milovidov
41ec796a67 Little better [#CLICKHOUSE-2] 2018-08-19 23:26:11 +03:00
Alexey Milovidov
ce10e5bd6f Modified example config for running clickhouse-server from the source tree to run tests smoothly [#CLICKHOUSE-2] 2018-08-19 23:21:36 +03:00
Alexey Milovidov
6fb8b4e5cd Opinionated changes #2893 2018-08-19 23:18:31 +03:00
alexey-milovidov
5a30b4790e
Update ColumnInfoHandler.h 2018-08-19 23:13:22 +03:00
alesapin
f6c9587d0a CLICKHOUSE-3878: Move last interaction with ODBC from main code to bridge, split Handlers file on three different, slightly remove copy-paste code 2018-08-19 20:09:54 +03:00
Alexey Milovidov
a6945ba00b Fix according to @ludv1x advise #2482 2018-08-19 08:33:50 +03:00
Alexey Milovidov
aef490d173 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 
Conflicts:
	dbms/src/Common/ODBCBridgeHelper.h
 2018-08-17 00:47:15 +03:00
alesapin
2583abfccf CLICKHOUSE-3878: Conflict fixes 2018-08-16 01:02:36 +03:00
alesapin
6fa4af882f CLICKHOUSE-3878: Build fixes 2018-08-16 01:00:28 +03:00
Alexey Milovidov
acb99b49df Merge branch 'master' into CLICKHOUSE-2910 2018-08-14 23:29:42 +03:00
alesapin
942d9a5fee
Merge branch 'master' into master 2018-08-14 17:09:27 +03:00
proller
a2343890dd Build fixes (#2864) 
* Try fix internal compiler headers path

* Build fixes

* fix

* wip

* clean

* Update arch.cmake
 2018-08-14 16:31:26 +03:00
alesapin
af19d4133d CLICKHOUSE-3878: Move connection string validation to common, remove redundant headers, fix compilation issues 2018-08-14 13:33:41 +03:00
alesapin
76baaf9620 CLICKHOUSE-3878: Remove redundant prefix 2018-08-13 18:00:41 +03:00
alesapin
6fe3f0b13c Merge remote-tracking branch 'upstream/master' 2018-08-13 12:36:27 +03:00
alesapin
53b23e0113 CLICKHOUSE-3878: Add inherited fd's closing function 2018-08-12 15:23:22 +03:00
proller
1e3c637741 Try fix internal compiler headers path 2018-08-11 02:28:33 +03:00
proller
3af99efd65 CLICKHOUSE-3530: Versioned inetrnal compiler headers (#2837) 2018-08-10 22:53:49 +03:00
alesapin
c3588a582c CLICKHOUSE-3878: Add some comments and small readme 2018-08-10 17:46:12 +03:00
alesapin
dde09bd8a5 CLICKHOUSE-3878: Start bridge not like daemon but background child, more explicit logging, fix mutex bug, add SCOPE_EXIT in bridge 2018-08-10 14:42:12 +03:00
alesapin
6d40546a9a CLICKHOUSE-3878: Remove connection string building and validation, change format of columns in request, more convinient exception messages 2018-08-09 15:57:34 +03:00
alesapin
1bedb971d0 Merge fixes 2018-08-08 19:54:09 +03:00
alesapin
46e9dc132a CLICKHOUSE-3878: Remove redundant message 2018-08-08 19:44:41 +03:00
alesapin
b31dd7bf1f CLICKHOUSE-3878: Correct max_block_size handling 2018-08-08 19:41:08 +03:00
alesapin
fe10ccb1f7 CLICKHOUSE-3878: Remove some copypaste 2018-08-08 19:29:09 +03:00
alesapin
92f3beb95b CLICKHOUSE-3878: Better odbc-bridge with ability to handle custom logs and exceptions 2018-08-08 19:15:29 +03:00
Alexey Milovidov
bec5a85030 Fixed test #2813 2018-08-08 05:11:16 +03:00
Alexey Milovidov
5860838776 Fixed inconsistency and bad style #1652 2018-08-08 03:12:40 +03:00
alesapin
dd01eb6b40 CLICKHOUSE-3878: Add odbc-bridge first version 2018-08-07 20:57:44 +03:00
chertus
8fde28deda issues-2813 return error code to OS on query processing error 2018-08-07 13:55:39 +03:00
Alexey Milovidov
387e68b106 Better order of linking [#CLICKHOUSE-2] 2018-08-06 23:12:55 +03:00
Alexey Milovidov
9975960d77 Added max_partition_size_to_drop to config #2782 2018-08-06 20:23:27 +03:00
alexey-milovidov
0ef2a94d46
Merge pull request #2782 from VadimPE/CLICKHOUSE-3714 
CLICKHOUSE-3714 add max_partition_size_to_drop
 2018-08-06 20:20:59 +03:00
Alexey Milovidov
e523f9a2c8 Fixed names [#CLICKHOUSE-2] 2018-08-05 11:54:57 +03:00
Alexey Milovidov
1b1754e598 Fixed build #2794 2018-08-04 00:13:54 +03:00
alexey-milovidov
11a7825ce7
Update Client.cpp 2018-08-03 23:48:43 +03:00
proller
010350a088 Build fixes (#2794) 
* More information in 'Cannot read all data' errors

* Build fixes

* Apple version fix

* Fix

* clean

* New libs fixes

* Freebsd fixes

* macos fix

* Fix macos build

* fix

* fix

* Update CMakeLists.txt

* freebsd fix

* fix

* Update CMakeLists.txt
 2018-08-03 19:39:04 +03:00
VadimPE
6142d9ae6a CLICKHOUSE-3714 fix function names and get partition size 2018-08-03 11:33:57 +03:00
alexey-milovidov
f2d0746056
Update Server.cpp 2018-08-02 23:32:00 +03:00
morty
69f7948bbd Use system tables for formats, engines, functions, collations, types 2018-08-02 17:57:57 +03:00
morty
fac492a3e4 Resolved conflicts 2018-08-02 14:01:52 +03:00
VadimPE
08fe108ba8 CLICKHOUSE-3714 fix methods name 2018-08-02 11:48:57 +03:00
Vadim
034a88a504
Merge branch 'master' into CLICKHOUSE-3714 2018-08-01 20:42:56 +03:00
VadimPE
66d9ba3eb7 CLICKHOUSE-3714 add max_partition_size_to_drop 2018-08-01 20:41:18 +03:00
proller
d72ba2701b CLICKHOUSE-3771 Preparing for new version scheme [WIP] (#2646) 
* CLICKHOUSE-3771: compatible version transfer

* Fix

* Fixed compatibility

* fix

* Auto version update to [1.1.54401] [54398]

* fix auto revision up

* fix

* comments

* clean

* fix

* Send/recieve patch if we can

* fix

* Auto version update to [18.2.0] [54397]

* Client version in query_log

* Update TCPHandler.cpp

* Update Connection.cpp

* Update Defines.h
 2018-08-01 00:36:18 +03:00
alesapin
2db2d208e1 CLICKHOUSE-3863: Add HTTPS support for interserver replication 2018-08-01 00:29:47 +03:00
chertus
5f46894cf0 CLICKHOUSE-2 client testmode fixes: reconnect on clientError, clear expected errors, return error to OS 2018-07-30 21:27:04 +03:00
alexey-milovidov
cac790f08f
Update Client.cpp 2018-07-27 20:37:53 +03:00
chertus
6283c3f572 CLICKHOUSE-2: support negative tests 2018-07-27 20:19:22 +03:00
alexey-milovidov
24b0be2cf0
Merge pull request #2727 from alesapin/CLICKHOUSE-3832 
CLICKHOUSE-3832: Add HTTP Basic authentification in replication protocol
 2018-07-26 20:50:09 +03:00
alesapin
368face3c9 CLICKHOUSE-3832: Fix typo 2018-07-26 19:10:21 +03:00
alesapin
4fb89512b1 CLICKHOUSE-3832: Add error code to exception and change message, also change check for interserver_http_credentials 2018-07-26 19:01:43 +03:00
alesapin
b7f937785d CLICKHOUSE-3832: Remove empty lines 2018-07-26 18:23:16 +03:00
alesapin
6abbfbce87 CLICKHOUSE-3832: Add HTTP Basic authentification in replication protocol 2018-07-26 18:10:57 +03:00
alesapin
175f564137 CLICKHOUSE-3832: Fix bracket 2018-07-26 12:53:59 +03:00
alesapin
c3b4551426 CLICKHOUSE-3832: Add interserver-side authentification. 2018-07-25 19:38:29 +03:00
Alexey Milovidov
7c07f46d50 Style [#CLICKHOUSE-2] 2018-07-24 21:46:23 +03:00
proller
dfa41cdc19 Fix build without readline 2018-07-19 12:29:02 +03:00
proller
51cdec0bec CLICKHOUSE-3771: fixes 2018-07-18 12:48:45 +03:00
chertus
07a782e637 fix wrong defaults at columns tail and some build fixes 2018-07-16 22:28:07 +03:00
chertus
e65c0b436a Merge branch 'master' into issue-3578 2018-07-16 18:28:06 +03:00
chertus
2cddb4b840 send metadata only for affected table 2018-07-16 17:52:02 +03:00
proller
cce2e005c5 Macos default build fixes 2018-07-16 17:16:26 +03:00
chertus
925e4c7dbb backward compatibility 2018-07-16 14:28:22 +03:00
VadimPE
0036e75a92 add example in users.xml 2018-07-15 00:22:29 +03:00
chertus
2c4949dd5d fix build without CAPNP 2018-07-13 16:47:13 +03:00
chertus
4e0d9aa8d4 revert unneeded changes 2018-07-13 15:46:29 +03:00
chertus
c8f71cb539 Merge branch 'master' into issue-3578 2018-07-13 14:30:42 +03:00
chertus
f89e476c0f add option to disable sending metadata 2018-07-12 17:33:57 +03:00
Alexey Milovidov
0352d6916f Updated default clickhouse-client config #1959 2018-07-11 18:58:29 +03:00
chertus
fe1b393e55 defaults for storages with formated input 2018-07-11 15:05:04 +03:00
Alexey Milovidov
abf8cd24d7 Fixed discrepancy [#CLICKHOUSE-2837] 2018-07-10 21:39:32 +03:00
Alexey Milovidov
98f8ae3edb Fixed error with timeouts [#CLICKHOUSE-2837] 2018-07-10 20:40:17 +03:00
chertus
519102b110 defaults for http inserts 2018-07-10 20:20:55 +03:00
chertus
bac1f77620 insert defaults (first working version) 2018-07-10 14:40:33 +03:00
chertus
2e4c2328af metadata in capn proto format (in progress - need apply on client) 2018-07-09 19:31:24 +03:00
chertus
c26ca0232d metadata in capn proto format (in progress) 2018-07-06 18:49:33 +03:00
chertus
e34bc2782e 3578: get ColumnDefaults from context (it's empty now) 2018-07-05 14:01:25 +03:00
chertus
88c4081a82 3578: defaults for input streams (in progress) 2018-07-04 20:02:47 +03:00
Alexey Milovidov
f00f9d1f9a Merge branch 'master' into CLICKHOUSE-2910 2018-07-04 16:29:58 +03:00
Nikolai Kochetov
323578c8b6 Reload client connection params before reconnection. #2580 2018-07-02 20:46:33 +03:00
morty
35c0ab9783 Merge branch 'master' into feature/suggestions 2018-07-02 11:52:45 +03:00
Alexey Milovidov
9845814701 Obfuscator: added heuristic #2518 2018-06-30 22:03:26 +03:00
Alexey Milovidov
394b020869 Fixed potential issue in Obfuscator on illegal UTF-8 source #2518 2018-06-30 02:27:56 +03:00
Alexey Milovidov
e051998e1c Renamed setting "send_logs_level" #2482 2018-06-28 23:11:14 +03:00
alexey-milovidov
3904ba561f
Merge branch 'master' into CLICKHOUSE-2910 2018-06-28 20:47:25 +03:00
Alexey Milovidov
d4eefc414c Merge branch 'query_in_form_data' of https://github.com/stavrolia/ClickHouse into stavrolia-query_in_form_data 2018-06-28 20:34:58 +03:00
morty
492040bd66 Merge branch 'master' into feature/suggestions 2018-06-25 11:22:15 +03:00
proller
e1ae5233df Add // Y_IGNORE tags 2018-06-21 18:24:36 +03:00
Vitaliy Lyudvichenko
1a4157f2a9 clickhouse_common_io does not depend on dbms. [#CLICKHOUSE-2910] 
Get rid of extra linking dependencies for clickhouse_common_io. [#CLICKHOUSE-2910]
 2018-06-21 15:13:56 +03:00
Vitaliy Lyudvichenko
358e4ae9bf Fixed failures in utils, more precise test. [#CLICKHOUSE-2910] 2018-06-20 18:41:15 +03:00
Vitaliy Lyudvichenko
310bb4116e Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-06-19 23:33:11 +03:00
Vitaliy Lyudvichenko
e13ba09004 Rewritten ThreadStatus via adding shared thread state. [#CLICKHOUSE-2910] 
Fixed race condition in SystemLog.
 2018-06-19 23:30:35 +03:00
proller
fbe7df73a2
CLICKHOUSE-3762 Build fixes (#2488) 
CONTRIB-254
 2018-06-19 21:09:09 +03:00
morty
c063d5c5e4 Merge branch 'master' into feature/suggestions 2018-06-19 17:08:27 +03:00
morty
47c6dc1728 Added missing query keywords, preload dictionary names and attributes, fixes and cleanup 2018-06-19 17:07:10 +03:00
Vitaliy Lyudvichenko
392f6e0c6c Print query_id in logs. Add own logging interface. [#CLICKHOUSE-2910] 2018-06-18 16:41:13 +03:00
Alexey Milovidov
3ea8ce1c0a Obfuscator: better default parameter #2518 2018-06-17 02:34:34 +03:00
Alexey Milovidov
2298f1c68b Fixed strange code #2501 2018-06-16 08:54:06 +03:00
Alexey Milovidov
52755f248a Fixed error [#CLICKHOUSE-2] 2018-06-16 06:35:23 +03:00
Alexey Milovidov
d8eb8c8ddf Fixed error [#CLICKHOUSE-2] 2018-06-16 06:31:49 +03:00
alexey-milovidov
d853b28543
Merge pull request #2513 from yandex/trim-exit-string 
Trim exit string
 2018-06-16 05:15:25 +03:00
Alexey Milovidov
e66cdfe429 Fixed error [#CLICKHOUSE-2] 2018-06-16 05:06:51 +03:00
Alexey Milovidov
e6aa58e667 Fixed error [#CLICKHOUSE-2] 2018-06-16 05:04:46 +03:00
Alexey Milovidov
fae4359ee1 Data obfuscator: added documentation [#CLICKHOUSE-2] 2018-06-16 04:45:19 +03:00
Alexey Milovidov
9d137881a9 Data obfuscator: added documentation [#CLICKHOUSE-2] 2018-06-16 04:44:25 +03:00
Alexey Milovidov
914b1fc967 Data obfuscator: development [#CLICKHOUSE-2] 2018-06-16 03:52:27 +03:00
Alexey Milovidov
116c91c9ca Data obfuscator: development [#CLICKHOUSE-2] 2018-06-16 03:50:52 +03:00
Alexey Milovidov
4e02a4c81f Data obfuscator: development [#CLICKHOUSE-2] 2018-06-16 03:27:59 +03:00
Alexey Milovidov
80ed67c8ee Data obfuscator: development [#CLICKHOUSE-2] 2018-06-16 02:54:33 +03:00
Vitaliy Lyudvichenko
a0e9d17bfd Add query_id and host_name to server logs. [#CLICKHOUSE-2910] 2018-06-15 16:49:01 +03:00
Alexey Milovidov
16c16dcc2d Data obfuscator: development [#CLICKHOUSE-2] 2018-06-15 13:42:13 +03:00
Alexey Milovidov
9043e36fa1 Data obfuscator: development [#CLICKHOUSE-2] 2018-06-15 13:03:02 +03:00
Alexey Milovidov
ddd10d956b Data obfuscator: development [#CLICKHOUSE-2] 2018-06-15 12:44:14 +03:00
Alexey Milovidov
108cca6ac1 Data obfuscator: development [#CLICKHOUSE-2] 2018-06-15 12:40:40 +03:00
Alexey Milovidov
47bded3520 Data obfuscator: development [#CLICKHOUSE-2] 2018-06-15 12:21:53 +03:00
Alexey Milovidov
3de1efa2c2 Data obfuscator: development [#CLICKHOUSE-2] 2018-06-15 12:07:42 +03:00
Alexey Milovidov
bd5247864b Data obfuscator: development [#CLICKHOUSE-2] 2018-06-15 11:53:06 +03:00
Alexey Milovidov
43a98634a9 Data obfuscator: development [#CLICKHOUSE-2] 2018-06-15 10:09:54 +03:00
Alexey Milovidov
5fa604db7b Data obfuscator: development [#CLICKHOUSE-2] 2018-06-15 09:27:16 +03:00
Alexey Milovidov
e1b85c84f7 Data obfuscator: development [#CLICKHOUSE-2] 2018-06-15 09:14:39 +03:00
Alexey Milovidov
1c4eb2c586 Data obfuscator: development [#CLICKHOUSE-2] 2018-06-15 08:33:39 +03:00
Nikolai Kochetov
27c6df7e20 Trim exit string before checking. #2510 2018-06-14 22:15:35 +03:00
Vitaliy Lyudvichenko
608895d9ff Disable compression for Log packets. [#CLICKHOUSE-2910] 2018-06-14 18:33:59 +03:00
Vitaliy Lyudvichenko
e5e73d4a9b Add CAP_NET_ADMIN capability check. [#CLICKHOUSE-2910] 2018-06-14 17:58:39 +03:00
Vitaliy Lyudvichenko
4cd230f85c Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-06-14 16:04:00 +03:00
alexey-milovidov
fafecb3c25
Better modularity of formats. (#2492) 
* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development): removed very old tests #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447
 2018-06-10 22:22:49 +03:00
Alexey Milovidov
29bd48fc7a Passing settings to ser/de of data types: development #1710 2018-06-08 05:24:27 +03:00
morty
a1fa590b69 Merge branch 'master' into feature/suggestions 2018-06-07 19:19:55 +03:00
proller
cb65528147 Build fixes (#2481) 
* Build fixes

* fix

* Fix package without compiler

* Better

* fix

* fix

* fix

* Build fix

* fix

* fix

* fix

* Build fix

* Fix test

* test fixes

* test: netcat-openbsd

* Compile fixes

* Update AggregateFunctionStatisticsSimple.h

* Update FunctionsRound.h
 2018-06-07 17:42:38 +03:00
morty
ec10e58df2 Turn off autocompletion if no readline library 2018-06-07 11:58:55 +03:00
proller
095420e158 Build fixes (#2475) 
* Build fixes

* fix

* Fix package without compiler

* Better

* fix

* fix

* fix

* Build fix

* fix

* fix

* fix

* Build fix

* Fix test
 2018-06-07 04:20:53 +03:00
proller
347579ce46 Cmake: mark system includes as SYSTEM (#1449) 
* contrib: cctz as submodule. update cctz.

* pbuilder: add ubuntu bionic, devel

* Cmake: mark system includes as SYSTEM

* Build fixes

* fix

* Fix package without compiler

* Better

* fix

* fix

* fix

* Build fix

* fix

* fix

* fix

* Cmake: Add SYSTEM to includes for external libs
 2018-06-06 23:21:58 +03:00
proller
8ba439a8b7 Build fix (copy-headers) 2018-06-06 22:57:01 +03:00
proller
4dabc18585 Build fix 2018-06-06 22:00:11 +03:00
morty
f99433e09c Merge branch 'master' into feature/suggestions 2018-06-06 21:59:41 +03:00
proller
01a31414eb
Build fixes (#2474) 2018-06-06 21:41:39 +03:00
morty
3e14bdddb0 Load suggestions in different thread 2018-06-06 21:19:17 +03:00
morty
823068f2fe Resolved conflicts 2018-06-06 19:48:33 +03:00
proller
82a4565ebe
Build fixes (#2473) 2018-06-06 19:05:53 +03:00
Alexey Milovidov
51044279e5 Squashed #2471 2018-06-05 23:09:51 +03:00