Commit Graph

945 Commits

Author SHA1 Message Date
alesapin
3ffa9fa972 Resolve conflict 2019-09-04 15:44:12 +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
alesapin
e7308c1f21 Merge branch 'master' into ObjatieGroba-feature_multiple_disks 2019-09-03 11:02:32 +03:00
Alexey Milovidov
402599a38c Merge branch 'master' into time-zone-configuration 2019-09-02 18:13:54 +03:00
Nikolai Kochetov
bf0c0ed4f1 Merge branch 'master' into processors-2 2019-09-02 16:02:09 +03:00
alesapin
e7ee9b7a67 Merge master 2019-09-02 11:46:00 +03:00
Alexey Milovidov
4ebf610808 Disable query profiler with sanitizers 2019-09-01 19:21:54 +03:00
alesapin
6f30338c08 Fixes 2019-08-30 21:31:35 +03:00
Alexey Milovidov
ace08fa344 Merge branch 'master' into time-zone-configuration 2019-08-30 19:27:08 +03:00
Dmitry Rubashkin
876847f3f7 Now stacked logs are received in appropriate way. 2019-08-29 20:30:16 +03:00
alesapin
1813b96f82 Finally build, possible trash. 2019-08-29 19:17:47 +03:00
Dmitry Rubashkin
4bd79c47dc Now send_logs_level won't affect catching exception. Test added. 2019-08-29 15:36:06 +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
Dmitry Rubashkin
4b7f5f20c1 Exception check added when sending data by parts. 2019-08-28 20:52:17 +03:00
Alexey Milovidov
cf57a88495 Added a way to forbid static initialization of a class 2019-08-28 20:13:29 +03:00
Alexey Milovidov
10b878b30b Disable Poco::AbstractConfiguration substitutions in query in clickhouse-client 2019-08-28 18:06:30 +03:00
dimarub2000
6fe40a0d90
Merge branch 'master' into perfomance_test_help_size 2019-08-28 16:38:54 +03:00
Alexey Milovidov
3db38c690e Changes to Benchmark after merge 2019-08-28 03:15:08 +03:00
alexey-milovidov
44424651b0
Merge pull request #6343 from dimarub2000/benchmark_comparison_mode
[WIP] Clickhouse-benchmark comparison mode
2019-08-28 02:38:07 +03:00
Nikolai Kochetov
4cb52cebea Update max_threads for processors. 2019-08-27 21:37:28 +03:00
alesapin
106b9717cd Refactoring of immutable settings 2019-08-27 16:14:19 +03:00
Alexey Milovidov
60d660e263 Merge branch 'master' into merge-constraints 2019-08-26 16:13:44 +03:00
Dmitry Rubashkin
4f89dcc80d Try to fix 2019-08-26 15:47:19 +03:00
alesapin
062034dfd8 Eventually merged with master 2019-08-26 13:07:32 +03:00
Alexey Milovidov
2a3e0eb1f1 Merge branch 'master' into merge-constraints 2019-08-26 04:30:31 +03:00
Alexey Milovidov
3fef8e92ad Merging CONSTRAINTS support 2019-08-25 00:20:20 +03:00
Alexey Milovidov
cdd6dca517 Remove Compiler 2019-08-24 00:10:26 +03:00
alexey-milovidov
44d3e1e837
Update Client.cpp 2019-08-23 23:35:36 +03:00
alexey-milovidov
13f59d3f6c
Update Client.cpp 2019-08-23 23:13:08 +03:00
dimarub2000
859d97e8fd Renaming 2019-08-23 18:47:27 +03:00
dimarub2000
a367f94923 Fix after review 2019-08-23 16:19:12 +03:00
Alexey Milovidov
4366791b63 Merge branch 'table-constraints' of https://github.com/NanoBjorn/ClickHouse into NanoBjorn-table-constraints 2019-08-23 07:49:10 +03:00
alexey-milovidov
70a61cc7be
Merge pull request #6609 from dimarub2000/clickhouse_obfuscator_symlink
Clickhouse obfuscator symlink
2019-08-22 22:53:45 +03:00
Dmitry Rubashkin
e9d813bff7 Minor fixes 2019-08-22 17:30:18 +03:00
Dmitry Rubashkin
095124dcba setOptionsDescription() function added 2019-08-22 17:03:37 +03:00
dimarub2000
b5e08fa929 Tried to fix 2019-08-21 14:12:58 +03:00
Dmitry Rubashkin
bd5dabb15c --help size fixed 2019-08-21 13:32:20 +03:00
alesapin
eb5e052855 merge and fixes 2019-08-21 13:09:29 +03:00
alesapin
70ca7f4156 Merge with master 2019-08-21 11:57:35 +03:00
dimarub2000
086dd815ac T_test.h added, some fixes 2019-08-21 11:53:41 +03:00
alexey-milovidov
308baa182e
Merge branch 'master' into table-constraints 2019-08-21 06:33:08 +03:00
Alexey Milovidov
8966520801 Added "assert_cast" function as a replacement for static_cast for columns 2019-08-21 05:28:04 +03:00
proller
4f1c9ee197 CLICKHOUSE-3885 copier: use partition_key in check query 2019-08-20 21:05:01 +03:00
Gleb Novikov
86fecc7501 Merge branch 'master' into table-constraints 2019-08-20 12:17:56 +03:00
alesapin
a85cdc91a6 Merge branch 'master' into ObjatieGroba-feature_multiple_disks 2019-08-19 11:34:02 +03:00
alesapin
e7542810bb Merge with master 2019-08-19 11:20:48 +03:00
Георгий Кондратьев
c70d585169 DEVTOOLS-5755 Remove odbc-bridge.cpp from clickhouse-lib
odbc-bridge.cpp defines main() so it should not be included in clickhouse-lib.
2019-08-19 05:13:39 +00:00
alexey-milovidov
29cc99ad58
Merge pull request #6194 from yurriy/mysql
Compatibility with more MySQL clients.
2019-08-18 16:28:13 +03:00
alexey-milovidov
a70bfa13d4
Merge pull request #6467 from nikitamikhaylov/system_metric_log
system.metric_log table
2019-08-16 02:28:53 +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
alesapin
bccf62100f Revert check 2019-08-14 18:25:57 +03:00
Nikita Mikhaylov
15bbf080f3 changes after review 2019-08-14 15:54:41 +03:00
akuzm
6bcfe51edf
In performance test, do not read query log for queries we didn't run. (#6427) 2019-08-14 14:04:11 +03:00
alesapin
949890ee90 Merged 2019-08-14 12:46:30 +03:00
alesapin
5b85373c56 Fix stupid bug 2019-08-13 14:58:59 +03:00
alesapin
7b1039568c Revert old changed 2019-08-13 14:24:18 +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
alexey-milovidov
838c5e535f
Merge pull request #6433 from yandex/prevent-stack-overflow-in-parser
Fixed possible stack overflow in parser
2019-08-10 23:58:54 +03:00
Alexey Milovidov
0a9787c7f3 Fixed possible stack overflow in parser 2019-08-10 19:38:25 +03:00
kreuzerkrieg
112fc71276 adding -Wshadow for GCC 2019-08-09 23:58:16 +03:00
dimarub2000
9caa69ce88 Minor fixes 2019-08-09 18:18:21 +03:00
dimarub2000
2ce2bba496 Minor fixes 2019-08-09 18:08:10 +03:00
alesapin
2803fcc2ba Make atomic settings 2019-08-09 16:07:19 +03:00
dimarub2000
9d2c9c8c2a Minor style and logic fixes 2019-08-09 16:00:47 +03:00
dimarub2000
b2cbc1a747 Fixed some const's and added --confidence option. 2019-08-09 13:46:57 +03:00
Alexey Milovidov
86f321a7cd Whitespaces 2019-08-09 02:55:08 +03:00
alesapin
a03fcd9f12 Make settings values atomic to avoid race conditions 2019-08-08 22:29:56 +03:00
dimarub2000
b780072a9d raw data relative_analize 2019-08-08 21:49:29 +03:00
alesapin
e0d18c0fe8 Merge branch 'master' into merge_tree_settings_alter 2019-08-08 18:16:22 +03:00
Alexey Milovidov
d256fb9d57 Removed extra verbose logging from MySQL handler 2019-08-07 22:14:58 +03:00
alesapin
ea17d033ec Merge branch 'master' into merge_tree_settings_alter 2019-08-07 14:02:22 +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
dimarub2000
4f89f8f4dd random generator is now one for thread 2019-08-06 16:19:06 +03:00
alesapin
52b9658bcf Merge with master 2019-08-06 15:55:12 +03:00
dimarub2000
02878c233a True randomness 2019-08-06 15:54:33 +03:00
dimarub2000
a5009c6759 --cumulative option added, and time statistics fixed 2019-08-06 13:54:35 +03:00
dimarub2000
3ea83e35d7 Multiple hosts and ports 2019-08-05 21:38:08 +03:00
Vxider
03092d5704 build fix 2019-08-06 00:53:11 +08:00
Nikolai Kochetov
e361d336bb
Merge pull request #6239 from yandex/processors-and-output-formats
Processors and output formats
2019-08-05 19:45:17 +03: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
dimarub2000
cc3900817c Clickhouse-benchmark comparison mode 2019-08-05 16:00:27 +03:00
Nikolai Kochetov
b0b7ed791d Merge branch 'master' into processors-and-output-formats 2019-08-04 19:47:26 +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
Nikolai Kochetov
599f3ddf6e Merged with master. 2019-08-04 15:35:21 +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