Commit Graph

264 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Alexey Milovidov
3d6057976e Fix bad formatting in clickhouse-client 2020-05-29 23:00:51 +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
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
Alexey Milovidov
8d2e80a5e2 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)/' 2020-05-23 19:42:39 +03:00
Alexey Milovidov
1a67c89c26 Enable mlock by default 2020-05-22 14:31:27 +03:00
Nikolai Kochetov
f7456f8320
Merge pull request #11004 from ClickHouse/remove-experimental-use-processors-flag-2
Remove allow_processors flag from executeQuery()
2020-05-22 10:47:15 +03:00
alexey-milovidov
2d9433242e
Merge pull request #11097 from ClickHouse/azat-memory-tracking-2
Merging #11022
2020-05-21 20:19:59 +03:00
Ilya Yatsishin
0f6410b56f
Merge pull request #11108 from ClickHouse/revert-11099-revert-10908-packager-add-bin
Revert "Revert "Allow to build binaries and tests from deb package build. ""
2020-05-21 19:59:52 +03:00
Alexander Kuzmenkov
f98ffdbc4c
Merge pull request #11087 from azat/context-fwd-decl
[RFC] Forward declaration for Context as much as possible.
2020-05-21 19:43:29 +03:00
Ilya Yatsishin
9dc493e063
Revert "Revert "Allow to build binaries and tests from deb package build. "" 2020-05-21 18:02:52 +03:00
alexey-milovidov
765510d5c3
Merge pull request #10991 from ClickHouse/enable-clang-tidy-for-programs-and-utils
Enable clang-tidy for programs and utils
2020-05-21 15:12:07 +03:00
Ilya Yatsishin
cce805c42c
Revert "Allow to build binaries and tests from deb package build. " 2020-05-21 14:50:12 +03:00
Alexey Milovidov
38f36f6b58 Merge branch 'memory-tracking' of https://github.com/azat/ClickHouse into azat-memory-tracking-2 2020-05-21 13:00:04 +03:00
Ilya Yatsishin
2f7fd3ccfe
Merge pull request #10908 from qoega/packager-add-bin
Allow to build binaries and tests from deb package build.
2020-05-21 09:40:03 +03:00
Azat Khuzhin
09474ebea5 Fix memory tracking for two-level GROUP BY when not all rows read from Aggregator (TCP)
Example of such cases:
- SELECT GROUP BY LIMIT
- SELECT GROUP BY with subsequent MEMORY_LIMIT_EXCEEDED error

And it should be two-level aggregation, since otherwise there will be
only one hashtable which will be cleared correctly, only if you have
two-level GROUP BY some of hashtables will not be cleared since nobody
consume rows.

Before this patch:
    09:39.015292 [ 3070801 ] {609a0610-e377-4132-9cf3-f49454cf3c96} <Information> executeQuery: Read 1000000 rows, 7.63 MiB in 0.707 sec., 1413826 rows/sec., 10.79 MiB/sec.
    09:39.015348 [ 3070801 ] {609a0610-e377-4132-9cf3-f49454cf3c96} <Debug> MemoryTracker: Peak memory usage (for query): 51.93 MiB.
    09:39.015942 [ 3070801 ] {} <Trace> Aggregator: Destroying aggregate states <-- **problem**
    09:39.017057 [ 3070801 ] {} <Trace> Aggregator: Destroying aggregate states <--
    09:39.017961 [ 3070801 ] {} <Debug> MemoryTracker: Peak memory usage (for query): 51.93 MiB.
    09:39.018029 [ 3070801 ] {} <Information> TCPHandler: Processed in 0.711 sec.

After this patch:
    16:24.544030 [ 3087333 ] {79da208a-b3c0-48d4-9943-c974a3cbb6ea} <Information> executeQuery: Read 1000000 rows, 7.63 MiB in 0.599 sec., 1670199 rows/sec., 12.74 MiB/sec.
    16:24.544084 [ 3087333 ] {79da208a-b3c0-48d4-9943-c974a3cbb6ea} <Debug> MemoryTracker: Peak memory usage (for query): 72.11 MiB.
    16:24.544398 [ 3087333 ] {79da208a-b3c0-48d4-9943-c974a3cbb6ea} <Trace> Aggregator: Destroying aggregate states
    16:24.545485 [ 3087333 ] {79da208a-b3c0-48d4-9943-c974a3cbb6ea} <Trace> Aggregator: Destroying aggregate states
    16:24.547053 [ 3087333 ] {} <Debug> MemoryTracker: Peak memory usage (for query): 72.11 MiB.
    16:24.547093 [ 3087333 ] {} <Information> TCPHandler: Processed in 0.603 sec.
2020-05-21 02:06:55 +03:00
Azat Khuzhin
d93b9a57f6 Forward declaration for Context as much as possible.
Now after changing Context.h 488 modules will be recompiled instead of 582.
2020-05-21 01:53:18 +03:00
Nikolai Kochetov
1183bad4d0 Fix build. 2020-05-20 22:01:36 +03:00
alexey-milovidov
07924f0ae1
Merge pull request #11029 from azat/system_tables_lazy_load
Disable system_tables_lazy_load by default
2020-05-20 21:15:09 +03:00
Yatsishin Ilya
f8c870bb28 Merge remote-tracking branch 'origin' into packager-add-bin 2020-05-19 15:07:54 +03:00
alesapin
a416813597
Merge pull request #10777 from NanoBjorn/refactor-reservations
VolumePtr instead of DiskPtr in MergeTreeData*
2020-05-19 13:27:11 +03:00
Yatsishin Ilya
d961707512 add targets dependecies to tests 2020-05-19 10:54:08 +03:00
Azat Khuzhin
ef01eb954f Add note about system_tables_lazy_load into config.xml 2020-05-19 02:41:18 +03:00
Artem Zuikov
97c7447130
Bitonic sort improvements (#10934) 2020-05-19 00:41:23 +03:00
alexey-milovidov
551fbf8519
Update HTTPHandlerFactory.cpp 2020-05-18 22:46:32 +03:00
Artem Zuikov
bfcbc08bba arcadia sync fixes 2020-05-18 15:50:23 +03:00
Artem Zuikov
0fe723acc9
Try to fix arcadia sync (#10959) 2020-05-18 13:26:23 +03:00
alesapin
07cb21ccb7
Merge branch 'master' into refactor-reservations 2020-05-18 11:43:48 +03:00
Alexey Milovidov
f54435e7fd Fix clang-tidy 2020-05-18 11:08:55 +03:00
Alexey Milovidov
b0a5ce7743 Enable clang-tidy for programs and utils 2020-05-18 04:19:50 +03:00
alexey-milovidov
7cf3538840
Merge pull request #10270 from ClickHouse/quota-key-in-client
Support quota_key for Native client
2020-05-17 14:09:40 +03:00
alexey-milovidov
a3346e9331
Merge pull request #10912 from ClickHouse/static-mutate
Static mutate
2020-05-17 09:05:35 +03:00
Alexey Milovidov
f4ac1eec04 Merge branch 'master' into quota-key-in-client 2020-05-17 08:15:13 +03:00
Gleb Novikov
1a25ac6e1f Merge branch 'master' into refactor-reservations 2020-05-16 23:34:45 +03:00
Nikolai Kochetov
caab379602
Merge pull request #10932 from ClickHouse/pulling-executor
Add PullingPipelineExecutor.
2020-05-16 23:09:18 +03:00
tavplubix
cc4ddfd89e
Merge pull request #10901 from ClickHouse/merging_10554
Merging #10554
2020-05-15 23:23:02 +03:00
Nikolai Kochetov
6ac93e9a61 Try simplify code. 2020-05-15 22:20:02 +03:00
Nikolai Kochetov
83a35a7390 try fix tests. 2020-05-15 20:41:12 +03:00
Alexander Tokmakov
833ab950df do not use overloaded comma operator 2020-05-15 16:25:27 +03:00
Alexander Tokmakov
15a827433a fix build 2020-05-15 14:26:51 +03:00