Commit Graph

300 Commits

Author SHA1 Message Date
Ivan Blinkov
e98a91e9f7 Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-12 16:53:00 +03:00
Alexander Kuzmenkov
d0987d56be
Merge pull request #11612 from ClickHouse/benchmark-json
Fix JSON in clickhouse-benchmark; add test.
2020-06-12 00:14:16 +03:00
alexey-milovidov
d5c2008c7d
Merge pull request #11601 from filimonov/fix_client_exit_code
Fix corner case (only) for exit code overflow
2020-06-11 20:57:32 +03:00
alexey-milovidov
e690d0a3ea
Update Client.cpp 2020-06-11 20:57:23 +03:00
alexey-milovidov
615ab071d3
Update Client.cpp 2020-06-11 20:57:03 +03:00
Alexey Milovidov
11c79e1371 Fix JSON in clickhouse-benchmark; add test 2020-06-11 20:53:33 +03:00
alesapin
a39d010f94 Merge branch 'master' into consistent_metadata4 2020-06-11 18:47:41 +03:00
Alexander Kuzmenkov
e354bbc78c
Merge pull request #11588 from ClickHouse/aku/async-log
Add system.asynchronous_metric_log
2020-06-11 16:10:35 +03:00
Mikhail Filimonov
887a24b73a Fix corner case (only) for exit code overflow 2020-06-11 15:08:24 +02:00
Ivan Blinkov
b70ed921ea Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-11 12:22:13 +03:00
Alexander Kuzmenkov
a6648516f4 Add files; flush more often 2020-06-11 00:16:58 +03:00
Alexey Milovidov
fd3ff19868 Fix trivial error in log message #11399 2020-06-10 22:34:23 +03:00
Alexander Kuzmenkov
e4be52f35f Add system.asynchronous_metric_log 2020-06-10 22:17:54 +03:00
alesapin
8be957ecb5 Better checks around metadata 2020-06-10 14:16:31 +03:00
Ivan Blinkov
f872c639ed Try to disable linker options from sentry 2020-06-09 20:44:56 +03:00
Ivan Blinkov
6f7064928f Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-09 19:07:57 +03:00
Ivan Blinkov
966593e0a8 try to completely remove sentry from odbc-bridge 2020-06-09 15:50:18 +03:00
Ivan
47ad338cb2
Refactor CMake build files (#11390)
* Get rid of lib_name.cmake
* Refactor Boost and HyperScan libraries
* Refactor lz4
* Fix build with xxHash
2020-06-09 13:54:49 +03:00
Ivan Blinkov
5b3fef526e Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-09 11:51:29 +03:00
alexey-milovidov
00e7eb91b1
Revert "Autocompletion support for users in client" 2020-06-08 23:13:03 +03:00
alexey-milovidov
a9c783d099
Merge pull request #11497 from azat/client-users-autocomplete
Autocompletion support for users in client
2020-06-08 07:33:57 +03:00
alexey-milovidov
ce4f528b73
Merge branch 'master' into kuskarov-add_syntax_highlighting 2020-06-08 02:14:09 +03:00
Azat Khuzhin
998f35e803 Autocompletion support for users in client 2020-06-08 01:58:41 +03:00
Alexey Milovidov
df19db1509 Added a test for history in clickhouse-client 2020-06-07 20:29:34 +03:00
Alexey Milovidov
9eacaf648b Make syntax highlight to work ok on white background 2020-06-07 00:20:17 +03:00
Alexey Milovidov
3cb2ec6f8f Added an option to disable syntax highlight 2020-06-06 19:59:16 +03:00
Alexey Milovidov
4313a52970 Merge branch 'master' into kuskarov-add_syntax_highlighting 2020-06-06 19:35:47 +03:00
Alexander Kuzmenkov
b14cc1dc56
Merge pull request #11449 from ClickHouse/check-for-incorrect-settings
Added a check for incorrect settings
2020-06-06 00:15:27 +03:00
Ivan Blinkov
653a9afda0 Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-05 22:51:28 +03:00
alexey-milovidov
4ec3048a81
Merge pull request #11457 from azat/complete-dict-names
Complete dictionary names (declared via configuration files) in clickhouse-client
2020-06-05 22:09:34 +03:00
Alexey Milovidov
02e77e3406 Adjust some colors: minimum safe variant 2020-06-05 02:05:37 +03:00
Azat Khuzhin
16a22daf00 Complete dictionary names in clickhouse-client
Since system.tables does not includes all dictionaries (dictionaries
declared via configuration files -- *.xml), and since this are those
dictionaries we should use regular system.dictionaries.name over
system.dictionaries.origin.
2020-06-05 02:00:54 +03:00
Alexey Milovidov
e1b5ee51c1 Better way to plug in the code 2020-06-05 01:45:04 +03:00
Alexey Milovidov
275075b6f7 Revert all changes but save commit history from @kuskarov 2020-06-05 01:44:29 +03:00
Alexey Milovidov
348d2098a4 Merge branch 'add_syntax_highlighting' of https://github.com/kuskarov/ClickHouse into kuskarov-add_syntax_highlighting 2020-06-04 23:57:20 +03:00
Alexey Milovidov
3d68cd4df6 Also check for users.xml elements in config.xml 2020-06-04 23:34:33 +03:00
Alexey Milovidov
02e14f9fe8 Also check for users.xml elements in config.xml 2020-06-04 23:33:19 +03:00
Alexey Milovidov
a89ce20d38 Added a check for incorrect settings 2020-06-04 22:30:30 +03:00
Yatsishin Ilya
f4646c1dad Leave only unit_tests_dbms 2020-06-04 11:26:22 +03:00
Tagir Kuskarov
af9e1c7d86 Merge from master 2020-06-04 05:56:30 +04:00
Tagir Kuskarov
fed90652c9 Move files 2020-06-04 05:04:57 +04:00
Ivan Blinkov
4bd678a3fd Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-02 08:21:30 +03:00
Alexey Milovidov
1bbbfc6e1b Fix \G in clickhouse-client multiline mode #9933 2020-06-02 06:25:19 +03:00
Alexey Milovidov
7989e945e6 Suppress output of cancelled queries in clickhouse-client #9473 2020-06-01 21:58:38 +03:00
Ivan Blinkov
6bd4282727 Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-01 21:49:56 +03:00
alexey-milovidov
19c6e0e5ae
Merge pull request #11307 from ClickHouse/remove-system-tables-lazy-load
Remove "system_tables_lazy_load" option
2020-06-01 16:26:23 +03:00
Ivan Blinkov
fcc7ff0ef9 Merge branch 'master' of github.com:ClickHouse/ClickHouse into sentry 2020-06-01 08:42:03 +03:00
alexey-milovidov
9984e989c1
Merge pull request #11317 from ClickHouse/logger-fmt-2
Preparation for structured logging
2020-06-01 00:11:29 +03:00
Alexey Milovidov
585a5b6f3e Whitespace 2020-05-31 21:49:19 +03:00
Alexey Milovidov
87cf123ef8 Merge branch 'master' into remove-system-tables-lazy-load 2020-05-31 18:06:08 +03:00
alexey-milovidov
3de876b2bc
Merge pull request #11313 from ClickHouse/fix-race-condition-cluster-copier
Fix data race in clickhouse-copier
2020-05-31 17:00:54 +03:00
alexey-milovidov
97d9f218af
Merge pull request #11296 from ClickHouse/fix-false-too-slow
Fix bug with Throttler and query speed estimation
2020-05-31 14:18:29 +03:00
Alexey Milovidov
25f941020b Remove namespace pollution 2020-05-31 00:57:37 +03:00
Alexey Milovidov
26100b64de Remove function parameter 2020-05-30 23:30:08 +03:00
MovElb
142c63e487 done rebase 2020-05-30 23:02:11 +03:00
alexey-milovidov
3eea042d16
Merge pull request #11243 from ClickHouse/remove-experimental-use-processors-flag-4
Remove some code.
2020-05-30 21:05:14 +03:00
Alexey Milovidov
ff8a1c04fb Fix data race in clickhouse-copier 2020-05-30 20:53:55 +03:00
MovElb
b4b5c90343 squash 2020-05-30 20:05:05 +03:00
Alexey Milovidov
6a7ed8881e Fix test 2020-05-30 19:39:34 +03:00
Alexey Milovidov
421a62e978 Merge branch 'master' into fix-false-too-slow 2020-05-30 19:36:55 +03:00
Alexey Milovidov
496fed5ed3 Remove "system_tables_lazy_load" option 2020-05-30 17:24:09 +03:00
Ivan Blinkov
d154415a5b adjust comments 2020-05-30 11:13:04 +03:00
Nikolai Kochetov
134f9f2b5b Fix copier. 2020-05-30 11:07:12 +03:00
Nikolai Kochetov
96568566ee Fix copier. 2020-05-30 10:50:45 +03:00
Nikolai Kochetov
9a3d449da0 Fix copier. 2020-05-30 10:36:00 +03:00
Alexey Milovidov
b79020d0a8 Emit a warning if server was build in debug or with sanitizers 2020-05-30 00:41:33 +03:00
Ivan Blinkov
d033941399 try to fix merge issues 2020-05-29 23:20:28 +03:00
Ivan Blinkov
0386e526b2 grammar 2020-05-29 23:03:59 +03:00
Alexey Milovidov
3d6057976e Fix bad formatting in clickhouse-client 2020-05-29 23:00:51 +03:00
Ivan Blinkov
95ee742ee7 merge master 2020-05-29 22:56:10 +03:00
Ivan Blinkov
4ef322274d Add integration test 2020-05-29 22:53:16 +03:00
Nikolai Kochetov
998a9f4c0b Try fix copier tests. 2020-05-29 12:52:30 +03:00
Alexander Tokmakov
3cff070f89 add context to IDatabase methods 2020-05-28 23:10:45 +03:00
alexey-milovidov
545c9e5bac
Merge pull request #11236 from abyss7/CLICKHOUSE-4856
Build universal ClickHouse binary with ya.make
2020-05-28 15:28:49 +03:00
alexey-milovidov
cbac07f5eb
Merge pull request #11163 from azat/bump-jemalloc
[WIP] Bump jemalloc to 5.2.1
2020-05-28 01:17:26 +03:00
Ivan Lezhankin
2432ea2c4b Build universal binary using ya make 2020-05-28 00:58:46 +03:00
Ivan Blinkov
709b4f42c8 Prototype sending crash reports on segfaults 2020-05-27 22:11:04 +03:00
Ivan
5b858de374
Split programs/server into actual program and library (#11186)
* Split programs/server into actual program and library
2020-05-27 20:52:52 +03:00
Azat Khuzhin
fd64d39166 Fix style check for POPCNT check 2020-05-27 20:23:09 +03:00
Azat Khuzhin
ec894e7cb3 Check for POPCNT instruction 2020-05-27 03:01:16 +03:00
Artem Zuikov
6cc43b743c one more place to remove from 2020-05-25 16:56:57 +03:00
Alexey Milovidov
b99dd3661c Fix bad whitespace 2020-05-24 01:25:25 +03:00
Alexey Milovidov
7e1813825b Return old names of macros 2020-05-24 01:24:01 +03:00
Alexey Milovidov
61cc605ee7 Remove old method 2020-05-24 01:21:29 +03:00
Alexey Milovidov
18febd7b97 find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_[^\_(]+\([^,]+, "[^"]+" << [^<]+ << "[^"]+" << [^<]+ << "[^"]+" << [^<]+ << "[^"]+" << [^<]+ << "[^"]+"\);' | while read file; do perl -pne 's/(LOG_[^\_(]+)\(([^,]+), "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+) << "([^"]+)"\);/${1}_FORMATTED(${2}, "${3}{}${5}{}${7}{}${9}{}${11}", ${4}, ${6}, ${8}, ${10});/' $file > ${file}.tmp; mv ${file}.tmp $file; done 2020-05-23 22:56:05 +03:00
Alexey Milovidov
cd6d3c7509 Progress on task 2020-05-23 22:55:06 +03:00
Alexey Milovidov
f13ccfc8e8 Progress on task 2020-05-23 22:43:13 +03:00
Alexey Milovidov
d5b7883451 find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_[^\_(]+\([^,]+, "[^"]+" << [^<]+ << "[^"]+" << [^<]+ << "[^"]+" << [^<]+ << "[^"]+"\);' | xargs sed -i -r -e 's/(LOG_[^\_(]+)\(([^,]+), "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+) << "([^"]+)"\);/\1_FORMATTED(\2, "\3{}\5{}\7{}\9", \4, \6, \8);/' 2020-05-23 22:41:08 +03:00
Alexey Milovidov
7e2fb9ad65 Apply all transformations again 2020-05-23 22:38:30 +03:00
Alexey Milovidov
29762240de Remove duplicate whitespaces (preparation) 2020-05-23 22:31:54 +03:00
Alexey Milovidov
86b4d5a86f Remove duplicate whitespaces (preparation) 2020-05-23 22:09:06 +03:00
Alexey Milovidov
9d2a0d2dd7 Apply all transformations again 2020-05-23 21:59:49 +03:00
Alexey Milovidov
a2ad11897f Remove duplicate whitespaces (preparation) 2020-05-23 21:53:58 +03:00
Alexey Milovidov
1f13515a65 Make all LOG in single line (preparation) 2020-05-23 21:31:37 +03:00
Alexey Milovidov
3a09f9ca1c find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_[^\W_]+\([^,]+, [^<+)"]+\);' | xargs sed -i -r -e 's/(LOG_[^\W_]+)\(([^,]+), ([^<+)"]+)\);/\1_FORMATTED(\2, \3);/' 2020-05-23 20:29:56 +03:00
Alexey Milovidov
f69cbdcbfc find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+" \+ [^+]+\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), "([^"]+)" \+ ([^+]+)\);/\1_FORMATTED(\2, "\3{}", \4);/' 2020-05-23 20:09:37 +03:00
Alexey Milovidov
533f86278a find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+" << [^<]+ << "[^"]+" << [^<]+ << "[^"]+"\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+) << "([^"]+)"\);/\1_FORMATTED(\2, "\3{}\5{}\7", \4, \6);/' 2020-05-23 20:00:41 +03:00
Alexey Milovidov
8042e5febe find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+" << [^<]+ << "[^"]+" << [^<]+\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+)\);/\1_FORMATTED(\2, "\3{}\5{}", \4, \6);/' 2020-05-23 19:58:15 +03:00
Alexey Milovidov
e391b77d81 find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+" << [^<]+ << "[^"]+"\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), "([^"]+)" << ([^<]+) << "([^"]+)"\);/\1_FORMATTED(\2, "\3{}\5", \4);/' 2020-05-23 19:56:05 +03:00
Alexey Milovidov
ee4ffbc332 find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+" << [^<]+\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), "([^"]+)" << ([^<]+)\);/\1_FORMATTED(\2, "\3{}", \4);/' 2020-05-23 19:47:56 +03:00