Commit Graph

424 Commits

Author SHA1 Message Date
Nikolai Kochetov
1319168a3a Merge branch 'master' into processors-2 2019-09-12 16:28:51 +03:00
Amos Bird
93c0880ca7 Fix non-ssl build. 2019-09-12 04:20:27 +08:00
Nikolai Kochetov
038aa82305 Update TCPHandler 2019-09-09 17:57:12 +03:00
Nikolai Kochetov
c9cca3ba8b Merged with master 2019-09-09 16:20:30 +03:00
Yuriy
6700314ce5 destroying context after executeQuery 2019-09-09 04:04:37 +03:00
alexey-milovidov
8389200229
Merge pull request #6832 from CurtizJ/merging_input_function
Merging #5450 (table function input).
2019-09-07 20:16:45 +03:00
filimonov
526afd44ed Make SensitiveDataMasker a singleton. (#6810)
Among other things, it is used to filter logs, which are being written even after the global server context is deinitialized, so we can't keep masker there.
2019-09-06 20:48:27 +03:00
Anton Popov
69da4f30b3
Merge branch 'master' into merging_input_function 2019-09-06 16:20:00 +03:00
Nikolai Kochetov
52305cefbc Merge branch 'merging-aggregated-processors' into processors-2 2019-09-06 15:21:17 +03:00
Alexey Milovidov
a4c1d64aba Allowed to run test with the server run from source tree 2019-09-05 07:50:08 +03:00
CurtizJ
7accc09066 Merge branch 'palasonic-add-input-function' of https://github.com/palasonic1/ClickHouse into merging_input_function 2019-09-04 15:25:20 +03:00
Alexey Milovidov
ece7a05cec Added an example of query masking rules for developers 2019-09-04 02:07:08 +03:00
alexey-milovidov
b2e80b0cd9
Merge branch 'master' into query_masking 2019-09-03 22:58:15 +03:00
alexey-milovidov
5f33fd946f
Merge pull request #6711 from dimarub2000/exception_while_insert
Exception check added in client when sending insertion data.
2019-09-03 21:47:48 +03:00
Dmitry Rubashkin
40a056c79b Better naming. 2019-09-03 16:55:26 +03:00
Dmitry Rubashkin
ede0077df6 fix 2019-09-03 12:38:50 +03:00
Dmitry Rubashkin
d2b9990a2a Unexpected packets received in a better way now. 2019-09-03 12:36:16 +03:00
Nikolai Kochetov
bf0c0ed4f1 Merge branch 'master' into processors-2 2019-09-02 16:02:09 +03:00
Alexey Milovidov
4ebf610808 Disable query profiler with sanitizers 2019-09-01 19:21:54 +03:00
Ivan
b4339f266d
Make a better build scheme (#6500)
* Fix shared build
* Major default libs refactor
* Fix build with gcc_eh
* Link all libraries as a big group.
* Use global interface library as a group
* Build capnproto using our cmake
* Use only internal libunwind
2019-08-28 23:49:37 +03:00
Nikolai Kochetov
4cb52cebea Update max_threads for processors. 2019-08-27 21:37:28 +03:00
Alexey Milovidov
60d660e263 Merge branch 'master' into merge-constraints 2019-08-26 16:13:44 +03:00
alesapin
062034dfd8 Eventually merged with master 2019-08-26 13:07:32 +03:00
Alexey Milovidov
3fef8e92ad Merging CONSTRAINTS support 2019-08-25 00:20:20 +03:00
Gleb Novikov
86fecc7501 Merge branch 'master' into table-constraints 2019-08-20 12:17:56 +03:00
alesapin
e7542810bb Merge with master 2019-08-19 11:20:48 +03:00
alexey-milovidov
29cc99ad58
Merge pull request #6194 from yurriy/mysql
Compatibility with more MySQL clients.
2019-08-18 16:28:13 +03:00
Yuriy
c5b6d1f9bf merged origin/master 2019-08-15 19:48:10 +03:00
Gleb Novikov
d41bb1fc19 Reverted server config.xml 2019-08-14 22:52:39 +03:00
Gleb Novikov
ab1c4139de Added ReplicatedMergeTree support and test for constraints, also added VIOLATED_CONSTRAINT error 2019-08-14 22:51:03 +03:00
Nikita Mikhaylov
e83482b512 metric_log.xml 2019-08-14 20:21:45 +03:00
Nikita Mikhaylov
15bbf080f3 changes after review 2019-08-14 15:54:41 +03:00
alesapin
428c753ed7 Merge with master 2019-08-13 11:37:47 +03:00
Alexey Milovidov
5830526fa1 Slightly better information messages 2019-08-11 23:37:53 +03:00
kreuzerkrieg
112fc71276 adding -Wshadow for GCC 2019-08-09 23:58:16 +03:00
alesapin
2803fcc2ba Make atomic settings 2019-08-09 16:07:19 +03:00
Alexey Milovidov
d256fb9d57 Removed extra verbose logging from MySQL handler 2019-08-07 22:14:58 +03:00
alexey-milovidov
a455bd7355
Merge pull request #6348 from Vxider/master
build fix
2019-08-06 17:24:22 +03:00
Vxider
42287c0b72 format code 2019-08-06 22:04:51 +08:00
Vxider
4d780d99f4 build fix 2019-08-06 22:03:41 +08:00
Vxider
03092d5704 build fix 2019-08-06 00:53:11 +08:00
Vxider
d5fd3c0a8a build fix 2019-08-06 00:25:26 +08:00
Alexey Milovidov
a19d05d6df Fixed minor discrepancies 2019-08-05 19:05:37 +03:00
Alexey Milovidov
8c05766888 Attempt to simplify text log 2019-08-04 18:51:04 +03:00
alexey-milovidov
a0599214ef
Merge pull request #6103 from nikitamikhaylov/system_text_log
Allow to write ClickHouse text logs into system table.
2019-08-04 17:51:34 +03:00
Alexey Milovidov
d8eae1f83a Disable query profiler if we build with test coverage 2019-08-03 23:47:57 +03:00
Alexey Milovidov
06b99e61aa Fixed "unbundled" build 2019-08-03 23:47:57 +03:00
Alexander Rodin
68487d512a Merge if branches with the same status code 2019-08-02 05:11:02 +00:00
Alexander Rodin
5c5b4f4de2 Revert "Replace ifs by cases"
This reverts commit 0c70f78fcb.
2019-08-02 05:07:10 +00:00
Alexander Rodin
0c70f78fcb Replace ifs by cases 2019-08-01 15:23:20 +00:00